October 2013 - Wine-commits

André Hentschel : rsaenh/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 4a8452dfdb8705d16d3f035fefb08c1bb668e4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8452dfdb8705d16d3f035fe… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:08 2013 +0200 rsaenh/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/rsaenh/tests/Makefile.in | 1 - dlls/rsaenh/tests/rsaenh.c | 166 ++++++++++++++++++++-------------------- 2 files changed, 83 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a8452dfdb8705d16d3f0…

1 0

André Hentschel : sti/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: c39eac6332b1bc0198fca4a54b4ccff8c4aa0c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39eac6332b1bc0198fca4a54… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:12 2013 +0200 sti/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/sti/tests/Makefile.in | 1 - dlls/sti/tests/sti.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in index 008b5be..fc01d8e 100644 --- a/dlls/sti/tests/Makefile.in +++ b/dlls/sti/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS TESTDLL = sti.dll IMPORTS = uuid ole32 diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 9c5e3c7..fa4db8c 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -86,7 +86,7 @@ static void test_version_flag_versus_aw(void) if (pStiCreateInstance) { PSTIW pStiW; - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -100,7 +100,7 @@ static void test_version_flag_versus_aw(void) } else ok(0, "could not create StillImageA, hr = 0x%X\n", hr); - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -121,7 +121,7 @@ static void test_version_flag_versus_aw(void) if (pStiCreateInstanceA) { PSTIA pStiA; - hr = pStiCreateInstanceA(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); + hr = pStiCreateInstanceA(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiA, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -142,7 +142,7 @@ static void test_version_flag_versus_aw(void) if (pStiCreateInstanceW) { PSTIW pStiW; - hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, NULL); + hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, NULL); if (SUCCEEDED(hr)) { IUnknown *pUnknown; @@ -175,7 +175,7 @@ static void test_stillimage_aggregation(void) But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown come back to the outer object calling this function? */ - hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, &aggregator); + hr = pStiCreateInstanceW(GetModuleHandleA(NULL), STI_VERSION_REAL, &pStiW, &aggregator); if (SUCCEEDED(hr)) { IStillImageW *pStiW2 = NULL; @@ -240,7 +240,7 @@ static void test_launch_app_registry(void) return; } - hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); + hr = pStiCreateInstance(GetModuleHandleA(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { hr = IStillImage_RegisterLaunchApplication(pStiW, appName, appName);

1 0

Frédéric Delanoy : kernel32: Use BOOL type where appropriate.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 7ab78b4e03c5263ab4f3d258f419f66b5eb875d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab78b4e03c5263ab4f3d258f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 24 00:40:22 2013 +0200 kernel32: Use BOOL type where appropriate. --- dlls/kernel32/console.c | 26 +++++++++++++------------- dlls/kernel32/environ.c | 4 ++-- dlls/kernel32/except.c | 2 +- dlls/kernel32/sync.c | 4 ++-- dlls/kernel32/time.c | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 9f2f528..4f0ed09 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2272,7 +2272,7 @@ static int CONSOLE_WriteChars(HANDLE hCon, LPCWSTR lpBuffer, int nc, COORD* pos) * WriteConsoleOutput helper: handles passing to next line (+scrolling if necessary) * */ -static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) +static BOOL next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) { SMALL_RECT src; CHAR_INFO ci; @@ -2281,7 +2281,7 @@ static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) csbi->dwCursorPosition.X = 0; csbi->dwCursorPosition.Y++; - if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return 1; + if (csbi->dwCursorPosition.Y < csbi->dwSize.Y) return TRUE; src.Top = 1; src.Bottom = csbi->dwSize.Y - 1; @@ -2296,8 +2296,8 @@ static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) csbi->dwCursorPosition.Y--; if (!ScrollConsoleScreenBufferW(hCon, &src, NULL, dst, &ci)) - return 0; - return 1; + return FALSE; + return TRUE; } /****************************************************************** @@ -2308,13 +2308,13 @@ static int next_line(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi) * handled * */ -static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, - DWORD mode, LPCWSTR ptr, int len) +static BOOL write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, + DWORD mode, LPCWSTR ptr, int len) { int blk; /* number of chars to write on current line */ int done; /* number of chars already written */ - if (len <= 0) return 1; + if (len <= 0) return TRUE; if (mode & ENABLE_WRAP_AT_EOL_OUTPUT) /* writes remaining on next line */ { @@ -2323,9 +2323,9 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, blk = min(len - done, csbi->dwSize.X - csbi->dwCursorPosition.X); if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return 0; + return FALSE; if (csbi->dwCursorPosition.X == csbi->dwSize.X && !next_line(hCon, csbi)) - return 0; + return FALSE; } } else @@ -2342,11 +2342,11 @@ static int write_block(HANDLE hCon, CONSOLE_SCREEN_BUFFER_INFO* csbi, csbi->dwCursorPosition.X = pos; if (CONSOLE_WriteChars(hCon, ptr + done, blk, &csbi->dwCursorPosition) != blk) - return 0; + return FALSE; } } - return 1; + return TRUE; } /*********************************************************************** @@ -2491,7 +2491,7 @@ BOOL WINAPI WriteConsoleA(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0; xstring = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); - if (!xstring) return 0; + if (!xstring) return FALSE; MultiByteToWideChar(GetConsoleOutputCP(), 0, lpBuffer, nNumberOfCharsToWrite, xstring, n); @@ -3009,7 +3009,7 @@ unsigned CONSOLE_GetNumHistoryEntries(void) */ BOOL CONSOLE_GetEditionMode(HANDLE hConIn, int* mode) { - unsigned ret = FALSE; + unsigned ret = 0; SERVER_START_REQ(get_console_input_info) { req->handle = console_handle_unmap(hConIn); diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index e6634a2..b6b3124 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -247,7 +247,7 @@ BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value ) if (!name) { SetLastError(ERROR_ENVVAR_NOT_FOUND); - return 0; + return FALSE; } RtlCreateUnicodeStringFromAsciiz( &us_name, name ); @@ -280,7 +280,7 @@ BOOL WINAPI SetEnvironmentVariableW( LPCWSTR name, LPCWSTR value ) if (!name) { SetLastError(ERROR_ENVVAR_NOT_FOUND); - return 0; + return FALSE; } RtlInitUnicodeString(&us_name, name); diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index 49e5c25..77ec91d 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -346,7 +346,7 @@ EXIT: * * returns TRUE for the two first conditions, FALSE for the last */ -static int start_debugger_atomic(PEXCEPTION_POINTERS epointers) +static BOOL start_debugger_atomic(PEXCEPTION_POINTERS epointers) { static HANDLE hRunOnce /* = 0 */; diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index a0ccbb6..5b7f810 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); /* check if current version is NT or Win95 */ -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); } @@ -1467,7 +1467,7 @@ BOOL WINAPI WaitNamedPipeA (LPCSTR name, DWORD nTimeOut) if (!MultiByteToWideChar( CP_ACP, 0, name, -1, buffer, MAX_PATH )) { SetLastError( ERROR_FILENAME_EXCED_RANGE ); - return 0; + return FALSE; } return WaitNamedPipeW( buffer, nTimeOut ); } diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index a1875f4..77c71cb 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -67,9 +67,9 @@ static const int MonthLengths[2][12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { - return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0) ? 1 : 0; + return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); } /***********************************************************************

1 0

Frédéric Delanoy : kernel32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: f56e9ebe38423d549c8cb77e17dc213011a0c04c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56e9ebe38423d549c8cb77e1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 24 00:40:23 2013 +0200 kernel32/tests: Use BOOL type where appropriate. --- dlls/kernel32/tests/alloc.c | 52 ++++++++++++++++++++++------------------- dlls/kernel32/tests/file.c | 24 +++++++++--------- dlls/kernel32/tests/locale.c | 2 +- dlls/kernel32/tests/path.c | 11 ++++---- dlls/kernel32/tests/process.c | 8 +++--- 5 files changed, 51 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f56e9ebe38423d549c8cb…

1 0

Frédéric Delanoy : mciqtz32: Use BOOL type where appropriate.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 2e9aa0c5998f3a95686b00ed03eb034cb08f40f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e9aa0c5998f3a95686b00ed0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 24 00:40:25 2013 +0200 mciqtz32: Use BOOL type where appropriate. --- dlls/mciqtz32/mciqtz.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index eb77929..e25af89 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -261,7 +261,7 @@ err: if (wma->uninit) CoUninitialize(); - wma->uninit = 0; + wma->uninit = FALSE; return MCIERR_INTERNAL; }

1 0

Ken Thomases : winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 35f0cf26b0225f31d662c834d55997a7a4bf3c59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35f0cf26b0225f31d662c834d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Oct 23 20:13:10 2013 -0500 winemac: Send WM_CANCELMODE when keyboard layout changes from Cocoa side. The standard keyboard shortcut for switching the keyboard layout is Command- Space, but the Mac driver never sees the Space key press. So, Wine only sees a press and release of Alt, which puts focus on the menu bar. This prevents that focus change. --- dlls/winemac.drv/keyboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index d4a3090..1fffa22 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -905,6 +905,8 @@ void macdrv_keyboard_changed(const macdrv_event *event) thread_data->dead_key_state = 0; macdrv_compute_keyboard_layout(thread_data); + + SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); }

1 0

Daniel Lehman : kernel32: Don't use depth in RtlInterlockedFlushSList.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 0669a8aca2dec4eaf6632e368832a8aec1c48ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0669a8aca2dec4eaf6632e368… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Oct 22 22:47:26 2013 -0700 kernel32: Don't use depth in RtlInterlockedFlushSList. Depth wraps around at 65536 but list supports more elements. --- dlls/kernel32/tests/sync.c | 18 +++++++++++++++++- dlls/ntdll/rtl.c | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index b98d7c4..84c44e0 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -244,8 +244,9 @@ static void test_slist(void) } item1, item2, item3, *pitem; SLIST_HEADER slist_header; - PSLIST_ENTRY entry; + PSLIST_ENTRY entry, next; USHORT size; + int i; VOID (WINAPI *pInitializeSListHead)(PSLIST_HEADER); USHORT (WINAPI *pQueryDepthSList)(PSLIST_HEADER); @@ -323,6 +324,21 @@ static void test_slist(void) } ok(((struct item*)entry)->value == 2, "item 2 not in front of list\n"); ok(((struct item*)entry->Next)->value == 1, "item 1 not at the back of list\n"); + + for (i = 0; i < 65536; i++) + { + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + pInterlockedPushEntrySList(&slist_header, entry); + } + + entry = pInterlockedFlushSList(&slist_header); + ok(entry != NULL, "not flushed\n"); + while (entry) + { + next = entry->Next; + HeapFree(GetProcessHeap(), 0, entry); + entry = next; + } } static void test_event(void) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index abf2ba8..8f6f386 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1080,7 +1080,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) SLIST_HEADER old, new; #ifdef _WIN64 - if (!list->Header16.Depth) return NULL; + if (!list->Header16.NextEntry) return NULL; new.s.Alignment = new.s.Region = 0; new.Header16.HeaderType = 1; /* we use the 16-byte header */ do @@ -1090,7 +1090,7 @@ PSLIST_ENTRY WINAPI RtlInterlockedFlushSList(PSLIST_HEADER list) } while (!interlocked_cmpxchg128((__int64 *)list, new.s.Region, new.s.Alignment, (__int64 *)&old)); return (SLIST_ENTRY *)((ULONG_PTR)old.Header16.NextEntry << 4); #else - if (!list->s.Depth) return NULL; + if (!list->s.Next.Next) return NULL; new.Alignment = 0; do {

1 0

Alexandre Julliard : winemac: Don' t try to set the app icon before GDI is properly initialized.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: e4a43cfa1f44b4458bd347ce473846daa18f9326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a43cfa1f44b4458bd347ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 16:48:12 2013 +0200 winemac: Don't try to set the app icon before GDI is properly initialized. --- dlls/winemac.drv/macdrv_main.c | 15 --------------- dlls/winemac.drv/window.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index df45bb5..5cdd13c 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -91,20 +91,6 @@ const char* debugstr_cf(CFTypeRef t) /*********************************************************************** - * set_app_icon - */ -static void set_app_icon(void) -{ - CFArrayRef images = create_app_icon_images(); - if (images) - { - macdrv_set_application_icon(images); - CFRelease(images); - } -} - - -/*********************************************************************** * get_config_key * * Get a config key from either the app-specific or the default config @@ -208,7 +194,6 @@ static BOOL process_attach(void) return FALSE; } - set_app_icon(); macdrv_clipboard_process_attach(); return TRUE; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 007d5b0..4e132fa 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -929,6 +929,20 @@ void activate_on_following_focus(void) } +/*********************************************************************** + * set_app_icon + */ +static void set_app_icon(void) +{ + CFArrayRef images = create_app_icon_images(); + if (images) + { + macdrv_set_application_icon(images); + CFRelease(images); + } +} + + /********************************************************************** * CreateDesktopWindow (MACDRV.@) */ @@ -968,6 +982,7 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) SERVER_END_REQ; } + set_app_icon(); return TRUE; }

1 0

Alexandre Julliard : user32: Register classes once the graphics driver has been loaded, except for the desktop class.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: fe441a0682ce21ba2d379c3c343efb00094f9ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe441a0682ce21ba2d379c3c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 17:40:37 2013 +0200 user32: Register classes once the graphics driver has been loaded, except for the desktop class. --- dlls/user32/class.c | 18 +++++++++++++----- dlls/user32/controls.h | 3 ++- dlls/user32/desktop.c | 2 +- dlls/user32/driver.c | 3 +++ dlls/user32/message.c | 2 +- dlls/user32/user_main.c | 2 ++ dlls/user32/win.c | 2 -- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 333cb76..e03272f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -369,7 +369,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, descr->style, 0, descr->extra ))) return; - classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); + if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); classPtr->hbrBackground = descr->brush; classPtr->winproc = BUILTIN_WINPROC( descr->proc ); release_class_ptr( classPtr ); @@ -381,7 +381,6 @@ static void register_builtin( const struct builtin_class_descr *descr ) */ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) { - register_builtin( &DESKTOP_builtin_class ); register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); register_builtin( &COMBOLBOX_builtin_class ); @@ -391,7 +390,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte register_builtin( &LISTBOX_builtin_class ); register_builtin( &MDICLIENT_builtin_class ); register_builtin( &MENU_builtin_class ); - register_builtin( &MESSAGE_builtin_class ); register_builtin( &SCROLL_builtin_class ); register_builtin( &STATIC_builtin_class ); return TRUE; @@ -399,15 +397,25 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte /*********************************************************************** - * CLASS_RegisterBuiltinClasses + * register_builtin_classes */ -void CLASS_RegisterBuiltinClasses(void) +void register_builtin_classes(void) { InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); } /*********************************************************************** + * register_desktop_class + */ +void register_desktop_class(void) +{ + register_builtin( &DESKTOP_builtin_class ); + register_builtin( &MESSAGE_builtin_class ); +} + + +/*********************************************************************** * get_class_winproc */ WNDPROC get_class_winproc( CLASS *class ) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 32e9815..3ce804f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -139,7 +139,8 @@ extern ULONG_PTR set_icon_param( HICON handle, ULONG_PTR param ) DECLSPEC_HIDDEN struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( LPCWSTR name ) DECLSPEC_HIDDEN; -extern void CLASS_RegisterBuiltinClasses(void) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; +extern void register_desktop_class(void) DECLSPEC_HIDDEN; extern WNDPROC get_class_winproc( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; extern struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 2204b77..563a214 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -48,7 +48,7 @@ const struct builtin_class_descr DESKTOP_builtin_class = CS_DBLCLKS, /* style */ WINPROC_DESKTOP, /* proc */ 0, /* extra */ - IDC_ARROW, /* cursor */ + 0, /* cursor */ (HBRUSH)(COLOR_BACKGROUND+1) /* brush */ }; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 18778cd..192eebe 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -28,6 +28,7 @@ #include "wine/gdi_driver.h" #include "user_private.h" +#include "controls.h" static USER_DRIVER null_driver, lazy_load_driver; @@ -119,6 +120,8 @@ static const USER_DRIVER *load_driver(void) } else LdrAddRefDll( 0, graphics_driver ); + register_builtin_classes(); + DeleteDC( hdc ); return driver; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d09e5dd..4fc87ad 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -290,7 +290,7 @@ const struct builtin_class_descr MESSAGE_builtin_class = 0, /* style */ WINPROC_MESSAGE, /* proc */ 0, /* extra */ - IDC_ARROW, /* cursor */ + 0, /* cursor */ 0 /* brush */ }; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e74ac19..d08a93c 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -262,6 +262,8 @@ static void winstation_init(void) if (handle) SetThreadDesktop( handle ); } HeapFree( GetProcessHeap(), 0, buffer ); + + register_desktop_class(); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d506fee..30a7c6f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1391,8 +1391,6 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } } - CLASS_RegisterBuiltinClasses(); - /* Find the parent window */ parent = cs->hwndParent;

1 0

Alexandre Julliard : user32: Set the display device property on the desktop window as soon as it is created .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: f5113d2d56ceee2502f65183512985a76569c5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5113d2d56ceee2502f651835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 17:41:28 2013 +0200 user32: Set the display device property on the desktop window as soon as it is created. --- dlls/user32/desktop.c | 33 +++++++++++++++++++++++++++++++-- programs/explorer/desktop.c | 22 ++++++++-------------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 563a214..bc91252 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "wine/unicode.h" static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper; @@ -97,8 +98,36 @@ static void init_wallpaper( const WCHAR *wallpaper ) */ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - if (message == WM_NCCREATE) return TRUE; - return 0; /* all other messages are ignored */ + static const WCHAR display_device_guid_propW[] = { + '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', + 'd','e','v','i','c','e','_','g','u','i','d',0 }; + static const WCHAR guid_formatW[] = { + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; + + switch (message) + { + case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + const GUID *guid = cs->lpCreateParams; + + if (guid) + { + ATOM atom; + WCHAR buffer[37]; + + sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + atom = GlobalAddAtomW( buffer ); + SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); + } + return TRUE; + } + default: + return 0; /* all other messages are ignored */ + } } /*********************************************************************** diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d85483c..a3bfb5c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -633,11 +633,8 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static void set_desktop_guid( HWND desktop, HMODULE driver ) +static void set_desktop_guid( HWND desktop, GUID *guid, HMODULE driver ) { - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; static const WCHAR device_keyW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -646,18 +643,11 @@ static void set_desktop_guid( HWND desktop, HMODULE driver ) '{','%','s','}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - GUID guid; RPC_WSTR guid_str; - ATOM guid_atom; HKEY hkey; WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; - UuidCreate( &guid ); - UuidToStringW( &guid, &guid_str ); - TRACE( "display guid %s\n", debugstr_w(guid_str) ); - - guid_atom = GlobalAddAtomW( guid_str ); - SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); + UuidToStringW( guid, &guid_str ); sprintfW( key, device_keyW, guid_str ); RpcStringFreeW( &guid_str ); @@ -724,6 +714,7 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; + GUID guid; MSG msg; HDC hdc; HWND hwnd, msg_hwnd; @@ -766,9 +757,12 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } + UuidCreate( &guid ); + TRACE( "display guid %s\n", debugstr_guid(&guid) ); + /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, NULL ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); /* create the HWND_MESSAGE parent */ msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, @@ -785,7 +779,7 @@ void manage_desktop( WCHAR *arg ) ReleaseDC( hwnd, hdc ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); - set_desktop_guid( hwnd, graphics_driver ); + set_desktop_guid( hwnd, &guid, graphics_driver ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN),

1 0