October 2013 - Wine-commits

Dmitry Timoshkov : user32/tests: Fix class tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 74f205462b2277322210bdaf72cc1fc7a5caa75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f205462b2277322210bdaf7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:14 2013 +0900 user32/tests: Fix class tests compilation with __WINESRC__ defined. --- dlls/user32/tests/class.c | 78 ++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74f205462b2277322210b…

1 0

Dmitry Timoshkov : user32/tests: Fix clipboard tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 5eb648c8f088b8ea6b036e19ef39a76f561e6b56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb648c8f088b8ea6b036e19e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:18 2013 +0900 user32/tests: Fix clipboard tests compilation with __WINESRC__ defined. --- dlls/user32/tests/clipboard.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index e2e727c..d9ebb23 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -282,7 +282,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA break; } - return DefWindowProc(hwnd, msg, wp, lp); + return DefWindowProcA(hwnd, msg, wp, lp); } static DWORD WINAPI clipboard_thread(void *param) @@ -307,14 +307,14 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - r = PostMessage(win, WM_USER, 0, 0); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0; } static void test_messages(void) { - WNDCLASS cls; + WNDCLASSA cls; HWND win; MSG msg; HANDLE thread; @@ -324,25 +324,25 @@ static void test_messages(void) memset(&cls, 0, sizeof(cls)); cls.lpfnWndProc = clipboard_wnd_proc; - cls.hInstance = GetModuleHandle(0); + cls.hInstance = GetModuleHandleA(NULL); cls.lpszClassName = "clipboard_test"; - RegisterClass(&cls); + RegisterClassA(&cls); - win = CreateWindow("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + win = CreateWindowA("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); ok(win != NULL, "CreateWindow failed: %d\n", GetLastError()); thread = CreateThread(NULL, 0, clipboard_thread, (void*)win, 0, &tid); ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); - while(GetMessage(&msg, NULL, 0, 0)) { + while(GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread); - UnregisterClass("clipboard_test", GetModuleHandle(0)); + UnregisterClassA("clipboard_test", GetModuleHandleA(NULL)); DeleteCriticalSection(&clipboard_cs); }

1 0

Dmitry Timoshkov : user32/tests: Fix combobox tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 3e3eb805d87fc36530778fa2a4b620ae10b56be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3eb805d87fc36530778fa2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:22 2013 +0900 user32/tests: Fix combobox tests compilation with __WINESRC__ defined. --- dlls/user32/tests/combo.c | 124 ++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e3eb805d87fc36530778…

1 0

Dmitry Timoshkov : user32/tests: Fix cursor and icon tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 76037001699951da4a2a604d768a69af43c1ac5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=76037001699951da4a2a604d7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:26 2013 +0900 user32/tests: Fix cursor and icon tests compilation with __WINESRC__ defined. --- dlls/user32/tests/cursoricon.c | 64 ++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76037001699951da4a2a6…

1 0

Dmitry Timoshkov : user32/tests: Fix DCE tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: 6d00d0472653120ac7fb0f10dc76b7e126182acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d00d0472653120ac7fb0f10d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:30 2013 +0900 user32/tests: Fix DCE tests compilation with __WINESRC__ defined. --- dlls/user32/tests/dce.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index f75e6b3..78c1af2 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -581,7 +581,7 @@ START_TEST(dce) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(0); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "cache_class";

1 0

Dmitry Timoshkov : user32/tests: Fix DDE tests compilation with __WINESRC__ defined.
by Alexandre Julliard 23 Oct '13

23 Oct '13

Module: wine Branch: master Commit: ad638a32d7e5f065a10b4a69b0851b4c2ee03bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad638a32d7e5f065a10b4a69b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 23 14:53:34 2013 +0900 user32/tests: Fix DDE tests compilation with __WINESRC__ defined. --- dlls/user32/tests/dde.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index e5d5554..4a50c39 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -53,7 +53,7 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); min_timeout = 10; } @@ -80,7 +80,7 @@ static void create_dde_window(HWND *hwnd, LPCSTR name, WNDPROC wndproc) static void destroy_dde_window(HWND *hwnd, LPCSTR name) { DestroyWindow(*hwnd); - UnregisterClass(name, GetModuleHandleA(0)); + UnregisterClassA(name, GetModuleHandleA(NULL)); } static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) @@ -255,7 +255,7 @@ static void test_msg_server(HANDLE hproc, HANDLE hthread) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } destroy_dde_window(&hwnd, "dde_server"); @@ -825,10 +825,10 @@ static void test_ddeml_server(HANDLE hproc) /* set up DDE server */ server_pid = 0; - res = DdeInitialize(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); + res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); - server = DdeCreateStringHandle(server_pid, "TestDDEServer", CP_WINANSI); + server = DdeCreateStringHandleA(server_pid, "TestDDEServer", CP_WINANSI); ok(server != NULL, "Expected non-NULL string handle\n"); hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); @@ -836,7 +836,7 @@ static void test_ddeml_server(HANDLE hproc) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); @@ -1074,7 +1074,7 @@ static void test_msg_client(void) flush_events(); - item = GlobalAddAtom("request"); + item = GlobalAddAtomA("request"); ok(item != 0, "Expected non-NULL item\n"); /* WM_DDE_REQUEST, bad clipboard format */ @@ -2672,7 +2672,7 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) { - while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } ret = DdeUninitialize(server_pid); @@ -2686,7 +2686,7 @@ START_TEST(dde) int argc; char **argv; char buffer[MAX_PATH]; - STARTUPINFO startup; + STARTUPINFOA startup; PROCESS_INFORMATION proc; DWORD dde_inst = 0xdeadbeef; @@ -2715,7 +2715,7 @@ START_TEST(dde) return; } - ZeroMemory(&startup, sizeof(STARTUPINFO)); + ZeroMemory(&startup, sizeof(STARTUPINFOA)); sprintf(buffer, "%s dde ddeml", argv[0]); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW;

1 0

Piotr Caban : msvcrt: Don' t output __ptr64 when UNDNAME_NO_MS_KEYWORDS is used.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: d218d82af4658e94208e12db89c03f514fe52996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d218d82af4658e94208e12db8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 22 16:47:06 2013 +0200 msvcrt: Don't output __ptr64 when UNDNAME_NO_MS_KEYWORDS is used. --- dlls/msvcrt/tests/cpp.c | 1 + dlls/msvcrt/undname.c | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 037c88f..c8ff25d 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -1320,6 +1320,7 @@ static void test_demangle(void) "?_dispatch(a)_impl_Engine@SalomeApp@@$R4CE(a)BA@PPPPPPPM(a)7AE_NAAVomniCallHandle@@@Z"}, /* 126 */ {"?_Doraise(a)bad_cast@std@@MEBAXXZ", "protected: virtual void __cdecl std::bad_cast::_Doraise(void)", NULL, 0x60}, /* 127 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & ptr64 cdecl std::operator*=(class std::complex<float> & ptr64,class std::complex<float> const & ptr64)", NULL, 1}, +/* 128 */ {"??Xstd@@YAAEAV?$complex(a)M@0(a)AEAV10@AEBV10@@Z", "class std::complex<float> & std::operator*=(class std::complex<float> &,class std::complex<float> const &)", NULL, 2}, }; int i, num_test = (sizeof(test)/sizeof(test[0])); char* name; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 7cd8468..beaec4f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -406,9 +406,12 @@ static BOOL get_modifier(struct parsed_symbol *sym, const char **ret, const char *ptr_modif = NULL; if (*sym->current == 'E') { - *ptr_modif = "__ptr64"; - if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) - *ptr_modif = *ptr_modif + 2; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + *ptr_modif = "__ptr64"; + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + *ptr_modif = *ptr_modif + 2; + } sym->current++; } switch (*sym->current++) @@ -431,10 +434,13 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, if (*sym->current == 'E') { - if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) - ptr_modif = " ptr64"; - else - ptr_modif = " __ptr64"; + if (!(sym->flags & UNDNAME_NO_MS_KEYWORDS)) + { + if (sym->flags & UNDNAME_NO_LEADING_UNDERSCORES) + ptr_modif = " ptr64"; + else + ptr_modif = " __ptr64"; + } sym->current++; }

1 0

Jacek Caban : crypt32: Don't access context after releaseContext call.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 9adff9d02639cf21f4740deb853c6e35dc33b1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adff9d02639cf21f4740deb8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 22 12:29:34 2013 +0200 crypt32: Don't access context after releaseContext call. --- dlls/crypt32/context.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 9c26439..90d1afd 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -111,10 +111,12 @@ void Context_Release(context_t *context) assert(ref >= 0); if (!ref) { + WINECRYPT_CERTSTORE *store = context->store; + /* This is the last reference, but the context still may be in a store. * We release our store reference, but leave it up to store to free or keep the context. */ - context->store->vtbl->releaseContext(context->store, context); - context->store->vtbl->release(context->store, 0); + store->vtbl->releaseContext(store, context); + store->vtbl->release(store, 0); } }

1 0

Alexandre Julliard : imm32: Retrieve the graphics driver name from the registry.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: d85b22cbca7f29ee6a80eb1a886e180ab57454cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85b22cbca7f29ee6a80eb1a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 16:15:01 2013 +0200 imm32: Retrieve the graphics driver name from the registry. --- dlls/imm32/imm.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 4738103..35c16f0 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -32,8 +32,8 @@ #include "ddk/imm.h" #include "winnls.h" #include "winreg.h" -#include "wine/gdi_driver.h" #include "wine/list.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); @@ -245,6 +245,38 @@ static void IMM_FreeThreadData(void) } } +static HMODULE load_graphics_driver(void) +{ + 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 key_pathW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\','{',0}; + static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; + static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + + HMODULE ret = 0; + HKEY hkey; + DWORD size; + WCHAR path[MAX_PATH]; + WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); + + if (!guid_atom) return 0; + memcpy( key, key_pathW, sizeof(key_pathW) ); + if (!GlobalGetAtomNameW( guid_atom, key + strlenW(key), 40 )) return 0; + strcatW( key, displayW ); + if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; + size = sizeof(path); + if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); + RegCloseKey( hkey ); + TRACE( "%s %p\n", debugstr_w(path), ret ); + return ret; +} + /* ImmHkl loading and freeing */ #define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} static ImmHkl *IMM_GetImmHkl(HKL hkl) @@ -265,13 +297,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) ptr->hkl = hkl; if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); - if (!ptr->hIME) - { - HDC hdc = GetDC( 0 ); - GetModuleHandleExW( GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, - (LPCWSTR)__wine_get_driver_module( hdc ), &ptr->hIME ); - ReleaseDC( 0, hdc ); - } + if (!ptr->hIME) ptr->hIME = load_graphics_driver(); if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire);

1 0

Alexandre Julliard : explorer: Store the graphics driver name for the desktop in the registry.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: a6c7f6a4bad1c4eed36c2f061265980186e8eea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6c7f6a4bad1c4eed36c2f061… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 22 16:14:36 2013 +0200 explorer: Store the graphics driver name for the desktop in the registry. --- programs/explorer/desktop.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 3ea3e60..d85483c 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -633,24 +633,49 @@ static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, un return found; } -static void initialize_display_settings( HWND desktop ) +static void set_desktop_guid( HWND desktop, 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','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '{','%','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_CSTR guid_str; + RPC_WSTR guid_str; ATOM guid_atom; - DEVMODEW dmW; + HKEY hkey; + WCHAR key[sizeof(device_keyW)/sizeof(WCHAR) + 39]; UuidCreate( &guid ); - UuidToStringA( &guid, &guid_str ); - WINE_TRACE( "display guid %s\n", guid_str ); + UuidToStringW( &guid, &guid_str ); + TRACE( "display guid %s\n", debugstr_w(guid_str) ); - guid_atom = GlobalAddAtomA( (LPCSTR)guid_str ); + guid_atom = GlobalAddAtomW( guid_str ); SetPropW( desktop, display_device_guid_propW, ULongToHandle(guid_atom) ); + sprintfW( key, device_keyW, guid_str ); + RpcStringFreeW( &guid_str ); - RpcStringFreeA( &guid_str ); + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, + REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) + { + WCHAR path[MAX_PATH]; + + GetModuleFileNameW( driver, path, MAX_PATH ); + RegSetValueExW( hkey, driverW, 0, REG_SZ, (BYTE *)path, (strlenW(path) + 1) * sizeof(WCHAR) ); + RegCloseKey( hkey ); + } + else ERR( "failed to create %s\n", debugstr_w(key) ); +} + +static void initialize_display_settings(void) +{ + DEVMODEW dmW; /* Store current display mode in the registry */ if (EnumDisplaySettingsExW( NULL, ENUM_CURRENT_SETTINGS, &dmW, 0 )) @@ -760,6 +785,7 @@ void manage_desktop( WCHAR *arg ) ReleaseDC( hwnd, hdc ); SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); + set_desktop_guid( hwnd, 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), @@ -767,7 +793,7 @@ void manage_desktop( WCHAR *arg ) SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); - initialize_display_settings( hwnd ); + initialize_display_settings(); initialize_appbar(); initialize_systray( graphics_driver, using_root ); if (!using_root) initialize_launchers( hwnd );

1 0