October 2013 - Wine-commits

Nikolay Sivov : winetest: Added a simple script to test referrer header.
by Alexandre Julliard 17 Oct '13

17 Oct '13

Module: tools Branch: master Commit: c4dea4a950ef0cdcb74d9b9989ad8edde0d97e9f URL: http://source.winehq.org/git/tools.git/?a=commit;h=c4dea4a950ef0cdcb74d9b99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 09:48:10 2013 +0400 winetest: Added a simple script to test referrer header. --- winetest/tests/referer.php | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/winetest/tests/referer.php b/winetest/tests/referer.php new file mode 100644 index 0000000..aa9d2f1 --- /dev/null +++ b/winetest/tests/referer.php @@ -0,0 +1,6 @@ +<?php + if (strlen($_SERVER['HTTP_REFERER'])) + echo $_SERVER['HTTP_REFERER']; + else + echo "no referer set"; +?>

1 0

Piotr Caban : comctl32: Fix UDM_GETPOS behaviour on out of range values.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: e58af930ff2b54e543fceaa35148596e864be220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58af930ff2b54e543fceaa35… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:34:51 2013 +0200 comctl32: Fix UDM_GETPOS behaviour on out of range values. --- dlls/comctl32/updown.c | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 2373031..0761774 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -482,6 +482,25 @@ static LRESULT UPDOWN_KeyPressed(UPDOWN_INFO *infoPtr, int key) return 0; } +static int UPDOWN_GetPos(UPDOWN_INFO *infoPtr, BOOL *err) +{ + BOOL succ = UPDOWN_GetBuddyInt(infoPtr); + int val = infoPtr->CurVal; + + if(!UPDOWN_InBounds(infoPtr, val)) { + if((infoPtr->MinVal < infoPtr->MaxVal && val < infoPtr->MinVal) + || (infoPtr->MinVal > infoPtr->MaxVal && val > infoPtr->MinVal)) + val = infoPtr->MinVal; + else + val = infoPtr->MaxVal; + + succ = FALSE; + } + + if(err) *err = !succ; + return val; +} + static int UPDOWN_SetPos(UPDOWN_INFO *infoPtr, int pos) { int ret = infoPtr->CurVal; @@ -1090,8 +1109,11 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETPOS: { - BOOL ret = UPDOWN_GetBuddyInt (infoPtr); - return MAKELONG(infoPtr->CurVal, ret ? 0 : 1); + BOOL err; + int pos; + + pos = UPDOWN_GetPos(infoPtr, &err); + return MAKELONG(pos, err); } case UDM_SETPOS: { @@ -1119,9 +1141,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L case UDM_GETPOS32: { - BOOL ret = UPDOWN_GetBuddyInt (infoPtr); - if ((LPBOOL)lParam) *((LPBOOL)lParam) = !ret; - return infoPtr->CurVal; + return UPDOWN_GetPos(infoPtr, (BOOL*)lParam); } case UDM_SETPOS32: {

1 0

Piotr Caban : comctl32/tests: Add more updown control value tests.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 20019a77bc43b55b8a19dd1d60b541f0d367ffe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20019a77bc43b55b8a19dd1d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 16 16:35:01 2013 +0200 comctl32/tests: Add more updown control value tests. --- dlls/comctl32/tests/updown.c | 44 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 24d1a6a..188e346 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -373,12 +373,14 @@ static void test_updown_pos(void) /* there's no attempt to update buddy Edit if text didn't change */ SetWindowTextA(g_edit, "50"); - updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT, g_edit); + updown = create_updown_control(UDS_ALIGNRIGHT | UDS_SETBUDDYINT | UDS_ARROWKEYS, g_edit); /* test sequence only on 5.8x versions */ r = SendMessage(updown, UDM_GETPOS32, 0, 0); if (r) { + UDACCEL accel; + flush_sequences(sequences, NUM_MSG_SEQUENCES); r = SendMessage(updown, UDM_SETPOS, 0, 50); @@ -386,6 +388,46 @@ static void test_updown_pos(void) ok_sequence(sequences, EDIT_SEQ_INDEX, test_updown_pos_nochange_seq, "test updown pos, no change", FALSE); + + SendMessage(updown, UDM_SETRANGE, 0, MAKELONG(1, 40)); + r = SendMessage(updown, UDM_GETRANGE, 0, 0); + expect(1, LOWORD(r)); + expect(40, HIWORD(r)); + + accel.nSec = 0; + accel.nInc = 5; + r = SendMessage(updown, UDM_SETACCEL, 1, (LPARAM)&accel); + expect(TRUE, r); + + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(40, LOWORD(r)); + expect(1, HIWORD(r)); + + r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(0, 0)); + expect(40, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(2, 0)); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(g_edit, WM_KEYDOWN, VK_UP, 0); + expect(0, r); + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_SETPOS, 0, MAKELONG(50, 0)); + expect(1, LOWORD(r)); + expect(0, HIWORD(r)); + + r = SendMessage(updown, UDM_GETPOS, 0, 0); + expect(40, LOWORD(r)); + expect(0, HIWORD(r)); } DestroyWindow(updown);

1 0

Qian Hong : atl90: Add a WinSxS manifest resource.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 9a02c62d7764c73e611e9ea79551aa2480616966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a02c62d7764c73e611e9ea79… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 17 01:06:04 2013 +0800 atl90: Add a WinSxS manifest resource. --- dlls/atl90/Makefile.in | 2 ++ dlls/atl90/atl90.manifest | 5 +++++ dlls/atl90/atl90.rc | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 92b5d44..738b15b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -4,4 +4,6 @@ EXTRADEFS = -D_ATL_VER=_ATL_VER_90 C_SRCS = atl90.c +RC_SRCS = atl90.rc + @MAKE_DLL_RULES@ diff --git a/dlls/atl90/atl90.manifest b/dlls/atl90/atl90.manifest new file mode 100644 index 0000000..45714c8 --- /dev/null +++ b/dlls/atl90/atl90.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.VC90.ATL" version="9.0.30729.6161" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/> + <file name="atl90.dll"/> +</assembly> diff --git a/dlls/atl90/atl90.rc b/dlls/atl90/atl90.rc new file mode 100644 index 0000000..b21e747 --- /dev/null +++ b/dlls/atl90/atl90.rc @@ -0,0 +1,22 @@ +/* + * Resource file for atl90 + * + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: atl90.manifest */ +WINE_MANIFEST 24 atl90.manifest

1 0

Dmitry Timoshkov : gdi32/tests: Fix pen tests compilation with __WINESRC__ defined.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: f81c2e1caf598df5661ba20f7ee41181750c9dc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f81c2e1caf598df5661ba20f7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 16 14:31:49 2013 +0900 gdi32/tests: Fix pen tests compilation with __WINESRC__ defined. --- dlls/gdi32/tests/pen.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f81c2e1caf598df5661ba…

1 0

Gerald Pfeifer : winefile: Remove redundant check in format_bytes().
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: f0392519916fb12f807a8e20299b426e6d43f866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0392519916fb12f807a8e202… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 15 22:34:59 2013 +0200 winefile: Remove redundant check in format_bytes(). --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 3b30255..4729436 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2658,7 +2658,7 @@ static void format_bytes(LPWSTR buffer, LONGLONG bytes) fBytes = ((float)bytes)/1048576.f+.5f; resid = IDS_UNIT_MB; } - else if (bytes >= 1024) /* 1 kB */ + else /* bytes >= 1024 */ /* 1 kB */ { fBytes = ((float)bytes)/1024.f+.5f; resid = IDS_UNIT_KB;

1 0

Michael Stefaniuc : dxgi/tests: Compile with -D__WINESRC__.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 22af120a7a3f7f4fc8fb234f4d514a37fa59afa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22af120a7a3f7f4fc8fb234f4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 16 09:46:57 2013 +0200 dxgi/tests: Compile with -D__WINESRC__. --- dlls/dxgi/tests/Makefile.in | 1 - dlls/dxgi/tests/device.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 02888af..08d2db1 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = dxgi.dll IMPORTS = dxgi user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ device.c diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d492a95..9be59db 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -308,7 +308,7 @@ static void test_createswapchain(IDXGIDevice *device) IDXGISwapChain *swapchain; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; - WNDCLASS wc = {0}; + WNDCLASSA wc = {0}; UINT i; const struct refresh_rates refresh_list[] = @@ -321,10 +321,10 @@ static void test_createswapchain(IDXGIDevice *device) }; - wc.lpfnWndProc = DefWindowProc; + wc.lpfnWndProc = DefWindowProcA; wc.lpszClassName = "dxgi_test_wc"; - RegisterClass(&wc); + RegisterClassA(&wc); creation_desc.OutputWindow = 0; creation_desc.BufferDesc.Width = 800; @@ -338,7 +338,7 @@ static void test_createswapchain(IDXGIDevice *device) creation_desc.SampleDesc.Quality = 0; creation_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; creation_desc.BufferCount = 1; - creation_desc.OutputWindow = CreateWindow("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); + creation_desc.OutputWindow = CreateWindowA("dxgi_test_wc", "dxgi_test", 0, 0, 0, 0, 0, 0, 0, 0, 0); creation_desc.Windowed = TRUE; creation_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; creation_desc.Flags = 0;

1 0

Lauri Kenttä : readme: Update Finnish translation.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 623230b3ccc0591eef2791fa846c216d22a653cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=623230b3ccc0591eef2791fa8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 16 11:29:52 2013 +0300 readme: Update Finnish translation. --- documentation/README.fi | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/documentation/README.fi b/documentation/README.fi index 780cf43..15b8302 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -52,6 +52,7 @@ Tietoa NetBSD:lle: Tietoa Mac OS X:lle: Winen onnistuneeseen kääntämiseen x86:lla tarvitaan Xcode 2.4 tai uudempi. + Mac-ajuri vaatii OS X 10.6:n tai uudemman, ja sitä ei käännetä 10.5:ssä. Tuetut tiedostojärjestelmät:

1 0

Alexandre Julliard : explorer: Set the final size of the desktop window only after it has been created.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 1f9c541b58360559f2f8a6db9d876ada4dcc2b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9c541b58360559f2f8a6db9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:01:32 2013 +0200 explorer: Set the final size of the desktop window only after it has been created. --- programs/explorer/desktop.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 5503787..49bbbe9 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -744,10 +744,7 @@ void manage_desktop( WCHAR *arg ) /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, - GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), - GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), - 0, 0, 0, NULL ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, NULL ); /* create the HWND_MESSAGE parent */ msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, @@ -763,7 +760,9 @@ void manage_desktop( WCHAR *arg ) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); - ShowWindow( hwnd, SW_SHOW ); + SetWindowPos( hwnd, 0, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), + SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings( hwnd );

1 0

Alexandre Julliard : explorer: Create the driver desktop window after the window handle is created.
by Alexandre Julliard 16 Oct '13

16 Oct '13

Module: wine Branch: master Commit: 13149b67d3972c5babc8b5c368ffba85a5c5c2c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13149b67d3972c5babc8b5c36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 16 12:13:50 2013 +0200 explorer: Create the driver desktop window after the window handle is created. --- dlls/winex11.drv/desktop.c | 1 + dlls/winex11.drv/window.c | 19 ++++++++----------- dlls/winex11.drv/x11drv.h | 3 ++- programs/explorer/desktop.c | 32 +++++++++++++++++--------------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 39b9965..7a1bb92 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -171,6 +171,7 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } + if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); X11DRV_init_desktop( win, width, height ); return TRUE; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 17859f8..a76e80d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1651,16 +1651,19 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) /* initialize the desktop window id in the desktop manager process */ -static BOOL create_desktop_win_data( Display *display, HWND hwnd ) +BOOL create_desktop_win_data( Window win ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + Display *display = thread_data->display; struct x11drv_win_data *data; - if (!(data = alloc_win_data( display, hwnd ))) return FALSE; - data->whole_window = root_window; + if (!(data = alloc_win_data( display, GetDesktopWindow() ))) return FALSE; + data->whole_window = win; data->managed = TRUE; - SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); - set_initial_wm_hints( display, root_window ); + SetPropA( data->hwnd, whole_window_prop, (HANDLE)win ); + set_initial_wm_hints( display, win ); release_win_data( data ); + if (thread_data->clip_window) XReparentWindow( display, thread_data->clip_window, win, 0, 0 ); return TRUE; } @@ -1719,12 +1722,6 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; - if (root_window != DefaultRootWindow( gdi_display )) - { - /* the desktop win data can't be created lazily */ - if (!create_desktop_win_data( data->display, hwnd )) return FALSE; - } - /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask | FocusChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3b235ca..98386ce 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -639,7 +639,8 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; -BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; +extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddOneMode(unsigned int width, unsigned int height, unsigned int bpp, unsigned int freq) DECLSPEC_HIDDEN; unsigned int X11DRV_Settings_GetModeCount(void) DECLSPEC_HIDDEN; diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 49bbbe9..694f3f6 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -552,23 +552,15 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR static BOOL create_desktop( const WCHAR *name, unsigned int width, unsigned int height ) { static const WCHAR rootW[] = {'r','o','o','t',0}; - HDESK desktop; BOOL ret = FALSE; BOOL (CDECL *create_desktop_func)(unsigned int, unsigned int); - desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); - if (!desktop) - { - WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); - ExitProcess( 1 ); - } /* magic: desktop "root" means use the root window */ if (graphics_driver && strcmpiW( name, rootW )) { create_desktop_func = (void *)GetProcAddress( graphics_driver, "wine_create_desktop" ); if (create_desktop_func) ret = create_desktop_func( width, height ); } - SetThreadDesktop( desktop ); return ret; } @@ -703,8 +695,8 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) /* main desktop management function */ void manage_desktop( WCHAR *arg ) { - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; + HDESK desktop = 0; MSG msg; HDC hdc; HWND hwnd, msg_hwnd; @@ -737,10 +729,15 @@ void manage_desktop( WCHAR *arg ) if (!get_default_desktop_size( name, &width, &height )) width = height = 0; } - hdc = CreateDCW( displayW, NULL, NULL, NULL ); - graphics_driver = __wine_get_driver_module( hdc ); - - if (name && width && height) using_root = !create_desktop( name, width, height ); + if (name && width && height) + { + if (!(desktop = CreateDesktopW( name, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ))) + { + WINE_ERR( "failed to create desktop %s error %d\n", wine_dbgstr_w(name), GetLastError() ); + ExitProcess( 1 ); + } + SetThreadDesktop( desktop ); + } /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, @@ -750,13 +747,18 @@ void manage_desktop( WCHAR *arg ) msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 100, 100, 0, 0, 0, NULL ); - DeleteDC( hdc ); - if (hwnd == GetDesktopWindow()) { HMODULE shell32; void (WINAPI *pShellDDEInit)( BOOL ); + if (desktop) + { + hdc = GetDC( hwnd ); + graphics_driver = __wine_get_driver_module( hdc ); + using_root = !create_desktop( name, width, height ); + ReleaseDC( hwnd, hdc ); + } SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name );

1 0