Alexandre Julliard : user32: Avoid including winuser16.h in 32-bit files.
Alexandre Julliard
julliard at winehq.org
Tue Dec 22 09:58:57 CST 2009
Module: wine
Branch: master
Commit: ce05f498437a591faa94958f32ea95ee7276e784
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce05f498437a591faa94958f32ea95ee7276e784
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Dec 22 12:50:07 2009 +0100
user32: Avoid including winuser16.h in 32-bit files.
---
dlls/user32/defwnd.c | 3 ++-
dlls/user32/desktop.c | 1 -
dlls/user32/dialog.c | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c
index 39e27b3..ae104e2 100644
--- a/dlls/user32/defwnd.c
+++ b/dlls/user32/defwnd.c
@@ -33,7 +33,6 @@
#include "user_private.h"
#include "controls.h"
#include "wine/unicode.h"
-#include "wine/winuser16.h"
#include "wine/server.h"
#include "wine/exception.h"
#include "wine/debug.h"
@@ -44,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win);
#define KEYDATA_ALT 0x2000
#define KEYDATA_PREVSTATE 0x4000
+#define DRAG_FILE 0x454C4946
+
static short iF10Key = 0;
static short iMenuSysKey = 0;
static const WCHAR imm32W[] = { 'i','m','m','3','2','\0' };
diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c
index df4ac70..ea9bded 100644
--- a/dlls/user32/desktop.c
+++ b/dlls/user32/desktop.c
@@ -31,7 +31,6 @@
#include "winbase.h"
#include "wingdi.h"
#include "controls.h"
-#include "wine/winuser16.h"
static HBRUSH hbrushPattern;
static HBITMAP hbitmapWallPaper;
diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c
index a7040ea..021955b 100644
--- a/dlls/user32/dialog.c
+++ b/dlls/user32/dialog.c
@@ -34,7 +34,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
-#include "wine/winuser16.h"
#include "wine/unicode.h"
#include "controls.h"
#include "win.h"
@@ -566,7 +565,7 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
size.cx = rect.right - rect.left;
size.cy = rect.bottom - rect.top;
- if (template.x == CW_USEDEFAULT16)
+ if (template.x == (SHORT)0x8000 /*CW_USEDEFAULT16*/)
{
pos.x = pos.y = CW_USEDEFAULT;
}
More information about the wine-cvs
mailing list