April 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : user32: Allow the default desktop name to be specified on a per-app basis.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 9359ff6fe0fc7f4e5986394069c42bc89f1190ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9359ff6fe0fc7f4e598639406… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 17:22:04 2008 +0200 user32: Allow the default desktop name to be specified on a per-app basis. --- dlls/user32/user_main.c | 59 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 01b396d..77913a8 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -154,6 +154,61 @@ static void palette_init(void) /*********************************************************************** + * get_default_desktop + * + * Get the name of the desktop to use for this app if not specified explicitly. + */ +static const WCHAR *get_default_desktop(void) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + static const WCHAR explorerW[] = {'\\','E','x','p','l','o','r','e','r',0}; + static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'A','p','p','D','e','f','a','u','l','t','s',0}; + static WCHAR buffer[MAX_PATH + sizeof(explorerW)/sizeof(WCHAR)]; + WCHAR *p, *appname = buffer; + const WCHAR *ret = defaultW; + DWORD len; + HKEY tmpkey, appkey; + + len = (GetModuleFileNameW( 0, buffer, MAX_PATH )); + if (!len || len >= MAX_PATH) return ret; + if ((p = strrchrW( appname, '/' ))) appname = p + 1; + if ((p = strrchrW( appname, '\\' ))) appname = p + 1; + p = appname + strlenW(appname); + strcpyW( p, explorerW ); + + /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\Explorer */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, app_defaultsW, &tmpkey )) + { + if (RegOpenKeyW( tmpkey, appname, &appkey )) appkey = 0; + RegCloseKey( tmpkey ); + if (appkey) + { + len = sizeof(buffer); + if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; + RegCloseKey( appkey ); + if (ret && strcmpiW( ret, defaultW )) return ret; + ret = defaultW; + } + } + + memcpy( buffer, app_defaultsW, 13 * sizeof(WCHAR) ); /* copy only software\\wine */ + strcpyW( buffer + 13, explorerW ); + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, buffer, &appkey )) + { + len = sizeof(buffer); + if (!RegQueryValueExW( appkey, desktopW, 0, NULL, (LPBYTE)buffer, &len )) ret = buffer; + RegCloseKey( appkey ); + } + return ret; +} + + +/*********************************************************************** * winstation_init * * Connect to the process window station and desktop. @@ -161,7 +216,6 @@ static void palette_init(void) static void winstation_init(void) { static const WCHAR WinSta0[] = {'W','i','n','S','t','a','0',0}; - static const WCHAR Default[] = {'D','e','f','a','u','l','t',0}; STARTUPINFOW info; WCHAR *winstation = NULL, *desktop = NULL, *buffer = NULL; @@ -200,7 +254,8 @@ static void winstation_init(void) } if (buffer || !GetThreadDesktop( GetCurrentThreadId() )) { - handle = CreateDesktopW( desktop ? desktop : Default, NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); + handle = CreateDesktopW( desktop ? desktop : get_default_desktop(), + NULL, NULL, 0, DESKTOP_ALL_ACCESS, NULL ); if (handle) SetThreadDesktop( handle ); } HeapFree( GetProcessHeap(), 0, buffer );

1 0

Kai Blin : ws2_32: Work around the host name resolving to 127.x.x. x when using that for binding.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 1bcbe8651acbdf21ceb1cf42bd53e57fa39bdef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcbe8651acbdf21ceb1cf42b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Thu Apr 24 13:45:10 2008 +0200 ws2_32: Work around the host name resolving to 127.x.x.x when using that for binding. --- dlls/ws2_32/socket.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a06aabf..1fe0034 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3,7 +3,7 @@ * * Copyright (C) 1993,1994,1996,1997 John Brezak, Erik Bos, Alex Korobka. * Copyright (C) 2005 Marcus Meissner - * Copyright (C) 2006 Kai Blin + * Copyright (C) 2006-2008 Kai Blin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -359,6 +359,8 @@ static const int ws_eai_map[][2] = { 0, 0 } }; +static const char magic_loopback_addr[] = {127, 12, 34, 56}; + static inline DWORD NtStatusToWSAError( const DWORD status ) { /* We only need to cover the status codes set by server async request handling */ @@ -1427,6 +1429,18 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) } } #endif + if (name->sa_family == WS_AF_INET) + { + struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; + if (memcmp(&in4->sin_addr, &magic_loopback_addr, 4) == 0) + { + /* Trying to bind to the default host interface, using + * INADDR_ANY instead*/ + WARN("Trying to bind to magic IP address, using " + "INADDR_ANY instead.\n"); + in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); + } + } if (bind(fd, &uaddr.addr, uaddrlen) < 0) { int loc_errno = errno; @@ -3230,6 +3244,13 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) #else LeaveCriticalSection( &csWSgetXXXbyYYY ); #endif + if (retval->h_addr_list[0][0] == 127 && + strcmp(name, "localhost") != 0) + { + /* hostname != "localhost" but has loopback address. replace by our + * special address.*/ + memcpy(retval->h_addr_list[0], magic_loopback_addr, 4); + } TRACE( "%s ret %p\n", debugstr_a(name), retval ); return retval; }

1 0

Stefan Dösinger : d3d9: Make the offscreen format test a bit more tolerant.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 27a29a2f6a58271f583bb0bbd88a8c16531ee121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a29a2f6a58271f583bb0bbd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 23 22:25:05 2008 +0200 d3d9: Make the offscreen format test a bit more tolerant. --- dlls/d3d9/tests/visual.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4fe3cd9..2c224e8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8445,6 +8445,7 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) IDirect3DSurface9 *backbuffer = NULL, *offscreen = NULL; IDirect3D9 *d3d = NULL; DWORD color; + DWORD r0, g0, b0, r1, g1, b1; int fmt_index; static const float quad[][5] = { @@ -8568,7 +8569,18 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) if(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3DRTYPE_TEXTURE, fmt) == D3D_OK) { /* Compare the color of the center quad with our expectation */ color = getPixelColor(device, 320, 240); - ok(color == test_formats[fmt_index].resultColorBlending, "Offscreen failed for %s: Got color %#08x, expected %#08x.\n", test_formats[fmt_index].fmtName, color, test_formats[fmt_index].resultColorBlending); + r0 = (color & 0x00ff0000) >> 16; + g0 = (color & 0x0000ff00) >> 8; + b0 = (color & 0x000000ff) >> 0; + + r1 = (test_formats[fmt_index].resultColorBlending & 0x00ff0000) >> 16; + g1 = (test_formats[fmt_index].resultColorBlending & 0x0000ff00) >> 8; + b1 = (test_formats[fmt_index].resultColorBlending & 0x000000ff) >> 0; + + ok(r0 >= max(r1, 1) - 1 && r0 <= r1 + 1 && + g0 >= max(g1, 1) - 1 && g0 <= g1 + 1 && + b0 >= max(b1, 1) - 1 && b0 <= b1 + 1, + "Offscreen failed for %s: Got color %#08x, expected %#08x.\n", test_formats[fmt_index].fmtName, color, test_formats[fmt_index].resultColorBlending); } else { /* No pixel shader blending is supported so expected garbage.The type of 'garbage' depends on the driver version and OS. * E.g. on G16R16 ati reports (on old r9600 drivers) 0x00ffffff and on modern ones 0x002010ff which is also what Nvidia

1 0

Alexandre Julliard : services.exe: Make the changed status event an auto-reset event.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: ea746219860cc10389f04fec933ba27abe04c70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea746219860cc10389f04fec9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 13:53:02 2008 +0200 services.exe: Make the changed status event an auto-reset event. --- programs/services/services.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 5c9896e..c61b8dd 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -691,7 +691,7 @@ DWORD service_start(struct service_entry *service, DWORD service_argc, LPCWSTR * service->control_mutex = CreateMutexW(NULL, TRUE, NULL); if (!service->status_changed_event) - service->status_changed_event = CreateEventW(NULL, TRUE, FALSE, NULL); + service->status_changed_event = CreateEventW(NULL, FALSE, FALSE, NULL); name = service_get_pipe_name(); service->control_pipe = CreateNamedPipeW(name, PIPE_ACCESS_DUPLEX,

1 0

Alexandre Julliard : services.exe: Don' t reject config changes if the display name corresponds to the service being changed .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: af972cb1e414de53ae073d4af61c2885957b8925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af972cb1e414de53ae073d4af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 13:53:21 2008 +0200 services.exe: Don't reject config changes if the display name corresponds to the service being changed. --- programs/services/rpc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index f12aa82..3f6ee40 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -479,7 +479,7 @@ DWORD svcctl_ChangeServiceConfigW( DWORD dwPasswordSize, LPCWSTR lpDisplayName) { - struct service_entry new_entry; + struct service_entry new_entry, *entry; struct sc_service_handle *service; DWORD err; @@ -501,7 +501,8 @@ DWORD svcctl_ChangeServiceConfigW( } if (lpDisplayName != NULL && - scmdatabase_find_service_by_displayname(service->service_entry->db, lpDisplayName)) + (entry = scmdatabase_find_service_by_displayname(service->service_entry->db, lpDisplayName)) && + (entry != service->service_entry)) { service_unlock(service->service_entry); return ERROR_DUPLICATE_SERVICE_NAME;

1 0

Alexandre Julliard : wine.inf: Fix the service type of the spooler service.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 981f31bedf5090393b50733c09e035ddba74f934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981f31bedf5090393b50733c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 13:53:33 2008 +0200 wine.inf: Fix the service type of the spooler service. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index e2057ad..5a610d4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2682,7 +2682,7 @@ ErrorControl=1 Description="Loads files to memory for later printing" DisplayName="Print Spooler" ServiceBinary="%11%\spoolsv.exe" -ServiceType=1 +ServiceType=0x110 StartType=4 ErrorControl=1 LoadOrderGroup="SpoolerGroup"

1 0

Alexandre Julliard : explorer: Allow specifying a default size for each desktop using the HKCU\Software\Wine\Explorer\Desktops registry key .
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: eb7f5dd5710134ec04a182eb9995806ee3c50099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb7f5dd5710134ec04a182eb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 24 16:24:46 2008 +0200 explorer: Allow specifying a default size for each desktop using the HKCU\Software\Wine\Explorer\Desktops registry key. --- programs/explorer/desktop.c | 67 ++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 23 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index e19b4c4..93ea000 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -111,24 +111,31 @@ static BOOL parse_size( const WCHAR *size, unsigned int *width, unsigned int *he return !*end; } -/* retrieve the default desktop size from the X11 driver config */ -/* FIXME: this is for backwards compatibility, should probably be changed */ -static BOOL get_default_desktop_size( unsigned int *width, unsigned int *height ) +/* retrieve the default desktop size from the registry */ +static BOOL get_default_desktop_size( const WCHAR *name, unsigned int *width, unsigned int *height ) { - static const WCHAR keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', - 'X','1','1',' ','D','r','i','v','e','r',0}; - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + static const WCHAR desktop_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'E','x','p','l','o','r','e','r','\\', + 'D','e','s','k','t','o','p','s',0}; HKEY hkey; WCHAR buffer[64]; DWORD size = sizeof(buffer); - BOOL ret = FALSE; - - /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ - if (RegOpenKeyW( HKEY_CURRENT_USER, keyW, &hkey )) return FALSE; - if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) - ret = parse_size( buffer, width, height ); - RegCloseKey( hkey ); - return ret; + BOOL found = FALSE; + + *width = 800; + *height = 600; + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer\Desktops */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, desktop_keyW, &hkey )) + { + if (!RegQueryValueExW( hkey, name, 0, NULL, (LPBYTE)buffer, &size )) + { + found = TRUE; + if (!parse_size( buffer, width, height )) *width = *height = 0; + } + RegCloseKey( hkey ); + } + return found; } static void initialize_display_settings( HWND desktop ) @@ -218,21 +225,35 @@ void manage_desktop( WCHAR *arg ) if (*arg == '=' || *arg == ',') { arg++; + name = arg; if ((p = strchrW( arg, ',' ))) *p++ = 0; if (!p || !parse_size( p, &width, &height )) - { - width = 800; - height = 600; - } - name = arg; - xwin = create_desktop( name, width, height ); + get_default_desktop_size( name, &width, &height ); } - else if (get_default_desktop_size( &width, &height )) + else /* check for the X11 driver key for backwards compatibility (to be removed) */ { - name = defaultW; - xwin = create_desktop( name, width, height ); + static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; + static const WCHAR x11_keyW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'X','1','1',' ','D','r','i','v','e','r',0}; + HKEY hkey; + WCHAR buffer[64]; + DWORD size = sizeof(buffer); + + width = height = 0; + /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver */ + if (!RegOpenKeyW( HKEY_CURRENT_USER, x11_keyW, &hkey )) + { + if (!RegQueryValueExW( hkey, desktopW, 0, NULL, (LPBYTE)buffer, &size )) + { + name = defaultW; + if (!parse_size( buffer, &width, &height )) width = height = 0; + } + RegCloseKey( hkey ); + } } + if (name && width && height) xwin = create_desktop( name, width, height ); + if (!xwin) using_root = TRUE; /* using the root window */ /* create the desktop window */

1 0

Paul Vriens : user32/tests: Skip tests if function is not implemented.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: a3512ab8aba9c2d8b6bc39c22342c14c63322ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3512ab8aba9c2d8b6bc39c22… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 24 13:07:57 2008 +0200 user32/tests: Skip tests if function is not implemented. --- dlls/user32/tests/broadcast.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/broadcast.c b/dlls/user32/tests/broadcast.c index 67e767e..786df7d 100644 --- a/dlls/user32/tests/broadcast.c +++ b/dlls/user32/tests/broadcast.c @@ -95,7 +95,7 @@ static BOOL init_procs(void) return TRUE; } -static void test_parameters(PBROADCAST broadcast) +static void test_parameters(PBROADCAST broadcast, const char *functionname) { LONG ret; DWORD recips; @@ -103,6 +103,11 @@ static void test_parameters(PBROADCAST broadcast) SetLastError(0xcafebabe); recips = BSM_APPLICATIONS; ret = broadcast( 0x80000000, &recips, WM_NULL, 0, 0 ); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("%s is not implemented\n", functionname); + return; + } ok(GetLastError() == ERROR_INVALID_PARAMETER, "Last error: %08x\n", GetLastError()); ok(!ret, "Returned: %d\n", ret); @@ -321,11 +326,11 @@ START_TEST(broadcast) return; trace("Running BroadcastSystemMessageA tests\n"); - test_parameters(pBroadcastA); + test_parameters(pBroadcastA, "BroadcastSystemMessageA"); if (pBroadcastW) { trace("Running BroadcastSystemMessageW tests\n"); - test_parameters(pBroadcastW); + test_parameters(pBroadcastW, "BroadcastSystemMessageW"); } else skip("No BroadcastSystemMessageW, skipping\n");

1 0

Paul Vriens : oleaut32/tests: Skip a test on win9x.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 27fd7c1b3c0303d4502ca93ca9deb83a12af9b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fd7c1b3c0303d4502ca93ca… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Apr 24 12:05:58 2008 +0200 oleaut32/tests: Skip a test on win9x. --- dlls/oleaut32/tests/varformat.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index 399aeb7..2b60c96 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -431,6 +431,14 @@ static void test_VarWeekdayName(void) CHECKPTR(VarWeekdayName); + SetLastError(0xdeadbeef); + GetLocaleInfoW(LOCALE_USER_DEFAULT, 0, NULL, 0); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("GetLocaleInfoW is not implemented\n"); + return; + } + /* Initialize days' names */ for (day = 0; day <= 6; ++day) {

1 0

Kusanagi Kouichi : imm32: Fix a meaningless test.
by Alexandre Julliard 24 Apr '08

24 Apr '08

Module: wine Branch: master Commit: 83ae4a92e52ff7dabafad0336d587a026a1678aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ae4a92e52ff7dabafad0336… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Thu Apr 24 08:32:03 2008 +0900 imm32: Fix a meaningless test. ImmSetCompositionString generates WM_IME_COMPOSITION. Therefore test always fails if messages are not flushed. --- dlls/imm32/tests/imm32.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index a5d09ca..591feb3 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -191,16 +191,13 @@ static int test_ImmNotifyIME(void) { "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " "the composition string being canceled is empty.\n"); + ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); msg_spy_flush_msgs(); - ImmSetCompositionString(imc, SCS_SETSTR, string, sizeof(string), NULL, 0); ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); - todo_wine - { - ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " - "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " - "the composition string being canceled is non empty.\n"); - } + ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " + "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " + "the composition string being canceled is non empty.\n"); /* behavior differs between win9x and NT */ ret = ImmGetCompositionString(imc, GCS_COMPSTR, resstr, sizeof(resstr));

1 0