system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-06 19:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed GetLargestConsoleWindowSize return type for Winelib apps.

Browse source
This commit is contained in:
Alexandre Julliard 2000-11-25 21:46:30 +00:00
parent 1852ce8018
commit 3bf456bb44
3 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/kernel/kernel32.spec
View file

@ -357,7 +357,7 @@ debug_channels (comm debugstr dll int resource stress thunk toolhelp win32)
336 stdcall GetHandleInformation(long ptr) GetHandleInformation 336 stdcall GetHandleInformation(long ptr) GetHandleInformation
337 stub GetLSCallbackTarget 337 stub GetLSCallbackTarget
338 stub GetLSCallbackTemplate 338 stub GetLSCallbackTemplate
339 stdcall GetLargestConsoleWindowSize(long) WIN32_GetLargestConsoleWindowSize 339 stdcall GetLargestConsoleWindowSize(long) GetLargestConsoleWindowSize
340 stdcall GetLastError() GetLastError 340 stdcall GetLastError() GetLastError
341 stdcall GetLocalTime(ptr) GetLocalTime 341 stdcall GetLocalTime(ptr) GetLocalTime
342 stdcall GetLocaleInfoA(long long ptr long) GetLocaleInfoA 342 stdcall GetLocaleInfoA(long long ptr long) GetLocaleInfoA

17
include/wincon.h
View file

@ -137,7 +137,22 @@ typedef struct tagINPUT_RECORD
#define MENU_EVENT 0x08 #define MENU_EVENT 0x08
#define FOCUS_EVENT 0x10 #define FOCUS_EVENT 0x10
COORD WINAPI GetLargestConsoleWindowSize(HANDLE); #ifdef __i386__
/* Note: this should return a COORD, but calling convention for returning
* structures is different between Windows and gcc on i386. */
DWORD WINAPI GetLargestConsoleWindowSize(HANDLE);
inline static COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h)
{
DWORD dw = GetLargestConsoleWindowSize(h);
return *(COORD *)&dw;
}
#define GetLargestConsoleWindowSize(h) __wine_GetLargestConsoleWindowSize_wrapper(h)
#else /* __i386__ */
COORD WINAPI GetLargestConsoleWindowSize(HANDLE);
#endif /* __i386__ */
BOOL WINAPI ReadConsoleOutputCharacterA(HANDLE,LPSTR,DWORD,COORD,LPDWORD); BOOL WINAPI ReadConsoleOutputCharacterA(HANDLE,LPSTR,DWORD,COORD,LPDWORD);
BOOL WINAPI ReadConsoleOutputCharacterW(HANDLE,LPWSTR,DWORD,COORD,LPDWORD); BOOL WINAPI ReadConsoleOutputCharacterW(HANDLE,LPWSTR,DWORD,COORD,LPDWORD);
#define ReadConsoleOutputCharacter WINELIB_NAME_AW(ReadConsoleOutputCharacter) #define ReadConsoleOutputCharacter WINELIB_NAME_AW(ReadConsoleOutputCharacter)

21
win32/console.c
View file

@ -511,7 +511,20 @@ BOOL WINAPI SetConsoleActiveScreenBuffer(
/*********************************************************************** /***********************************************************************
* GetLargestConsoleWindowSize (KERNEL32.226) * GetLargestConsoleWindowSize (KERNEL32.226)
*
* Note: this should return a COORD, but calling convention for returning
* structures is different between Windows and gcc on i386.
*/ */
#ifdef __i386__
#undef GetLargestConsoleWindowSize
DWORD WINAPI GetLargestConsoleWindowSize( HANDLE hConsoleOutput )
{
COORD c;
c.X = 80;
c.Y = 24;
return *(DWORD *)&c;
}
#else /* __i386__ */
COORD WINAPI GetLargestConsoleWindowSize( HANDLE hConsoleOutput ) COORD WINAPI GetLargestConsoleWindowSize( HANDLE hConsoleOutput )
{ {
COORD c; COORD c;
@ -519,13 +532,7 @@ COORD WINAPI GetLargestConsoleWindowSize( HANDLE hConsoleOutput )
c.Y = 24; c.Y = 24;
return c; return c;
} }
#endif /* __i386__ */
/* gcc doesn't return structures the same way as dwords */
DWORD WINAPI WIN32_GetLargestConsoleWindowSize( HANDLE hConsoleOutput )
{
COORD c = GetLargestConsoleWindowSize( hConsoleOutput );
return *(DWORD *)&c;
}
/*********************************************************************** /***********************************************************************
* FreeConsole (KERNEL32.267) * FreeConsole (KERNEL32.267)