From 5163752e8e7064c83041d5fe9b1b21bbd56900bf Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 21 Nov 2002 23:45:31 +0000 Subject: [PATCH] Handle the COORD <-> DWORD conversion the canonical way. --- dlls/kernel/console.c | 11 +++++++---- include/wincon.h | 12 ++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c index 7cbb40b494f..934476b7a29 100644 --- a/dlls/kernel/console.c +++ b/dlls/kernel/console.c @@ -796,10 +796,13 @@ DWORD WINAPI GetConsoleTitleW(LPWSTR title, DWORD size) #undef GetLargestConsoleWindowSize DWORD WINAPI GetLargestConsoleWindowSize(HANDLE hConsoleOutput) { - COORD c; - c.X = 80; - c.Y = 24; - return *(DWORD *)&c; + union { + COORD c; + DWORD w; + } x; + x.c.X = 80; + x.c.Y = 24; + return x.w; } #endif /* defined(__i386__) */ diff --git a/include/wincon.h b/include/wincon.h index e538af6d83c..b94da20d81e 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -180,12 +180,12 @@ DWORD WINAPI GetLargestConsoleWindowSize(HANDLE); inline static COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) { - COORD c; - DWORD dw = GetLargestConsoleWindowSize(h); - - c.X = LOWORD(dw); - c.Y = HIWORD(dw); - return c; + union { + COORD c; + DWORD dw; + } u; + u.dw = GetLargestConsoleWindowSize(h); + return u.c; } #define GetLargestConsoleWindowSize(h) __wine_GetLargestConsoleWindowSize_wrapper(h)