Module: wine Branch: master Commit: 5e640271f2d36a19912a164673d6774ccccc8c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e640271f2d36a19912a164673...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Dec 23 20:19:43 2009 +0100
user32: Remove the no longer used WIN_ISWIN32 flag.
---
dlls/user32/controls.h | 6 +++--- dlls/user32/msg16.c | 4 ++-- dlls/user32/win.c | 10 ++++------ dlls/user32/win.h | 3 +-- dlls/user32/wnd16.c | 4 ++-- 5 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index ae964b8..e8c7bdb 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -96,7 +96,7 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); + HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); HICON (*alloc_icon_handle)(UINT); @@ -114,7 +114,7 @@ struct wow_handlers32 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); - HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); + HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL); HWND (*get_win_handle)(HWND); WNDPROC (*alloc_winproc)(WNDPROC,BOOL); struct tagDIALOGINFO *(*get_dialog_info)(HWND,BOOL); @@ -133,7 +133,7 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE
/* 16-bit support */ extern struct wow_handlers32 wow_handlers32 DECLSPEC_HIDDEN; -extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT) DECLSPEC_HIDDEN; +extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,BOOL) DECLSPEC_HIDDEN; extern void free_module_classes(HINSTANCE16) DECLSPEC_HIDDEN; extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 698fb61..cbaab4b 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2571,13 +2571,13 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, /*********************************************************************** * create_window16 */ -HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, UINT flags ) +HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, BOOL unicode ) { /* map to module handle */ if (instance && !((ULONG_PTR)instance >> 16)) instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) ));
- return wow_handlers32.create_window( cs, className, instance, flags ); + return wow_handlers32.create_window( cs, className, instance, unicode ); }
diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 6ce524c..f37f8f4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1069,14 +1069,13 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) * * Implementation of CreateWindowEx(). */ -HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, UINT flags ) +HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) { INT cx, cy, style, sw = SW_SHOW; LRESULT result; RECT rect; WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; - BOOL unicode = (flags & WIN_ISUNICODE) != 0; MDICREATESTRUCTW mdi_cs; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; @@ -1217,7 +1216,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, wndPtr->hIcon = 0; wndPtr->hIconSmall = 0; wndPtr->hSysMenu = 0; - wndPtr->flags |= (flags & WIN_ISWIN32);
wndPtr->min_pos.x = wndPtr->min_pos.y = -1; wndPtr->max_pos.x = wndPtr->max_pos.y = -1; @@ -1465,11 +1463,11 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, WCHAR bufferW[256]; if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, FALSE ); } /* Note: we rely on the fact that CREATESTRUCTA and */ /* CREATESTRUCTW have the same layout. */ - return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, FALSE ); }
@@ -1497,7 +1495,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, cs.lpszClass = className; cs.dwExStyle = exStyle;
- return wow_handlers.create_window( &cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); + return wow_handlers.create_window( &cs, className, instance, TRUE ); }
diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f764d89..bd8381e 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -71,7 +71,6 @@ typedef struct tagWND #define WIN_NCACTIVATED 0x0004 /* last WM_NCACTIVATE was positive */ #define WIN_ISMDICLIENT 0x0008 /* Window is an MDIClient */ #define WIN_ISDIALOG 0x0010 /* Window is a dialog */ -#define WIN_ISWIN32 0x0020 /* Understands Win32 messages */ #define WIN_ISUNICODE 0x0040 /* Window is Unicode */ #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0080 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */
@@ -87,7 +86,7 @@ extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPE extern BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; extern LRESULT WIN_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void WIN_DestroyThreadWindows( HWND hwnd ) DECLSPEC_HIDDEN; -extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, UINT flags ) DECLSPEC_HIDDEN; +extern HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode ) DECLSPEC_HIDDEN; extern BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL ) DECLSPEC_HIDDEN; extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; extern LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOOL unicode ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 9509bd0..7cca331 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -1892,13 +1892,13 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className,
if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), 0 ); + hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), FALSE ); } else { if (!GlobalGetAtomNameA( LOWORD(className), buffer, sizeof(buffer) )) return 0; cs.lpszClass = buffer; - hwnd = create_window16( (CREATESTRUCTW *)&cs, (LPCWSTR)className, HINSTANCE_32(instance), 0 ); + hwnd = create_window16( (CREATESTRUCTW *)&cs, (LPCWSTR)className, HINSTANCE_32(instance), FALSE ); } return HWND_16( hwnd ); }
-
Alexandre Julliard