May 2014 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9/tests: Release the device when skipping some tests.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 96e9a70661aabc69e8429d9511fe88465e87163e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e9a70661aabc69e8429d951… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:38 2014 +0200 d3dx9/tests: Release the device when skipping some tests. --- dlls/d3dx9_36/tests/shader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 80c0f64..694540c 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6131,6 +6131,7 @@ static void test_registerset(void) || caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) { skip("Skipping: Test requires VS >= 3 and PS >= 3.\n"); + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); return; @@ -6435,6 +6436,7 @@ static void test_registerset_defaults(void) || caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) { skip("Skipping: Test requires VS >= 3 and PS >= 3.\n"); + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd); return;

1 0

Matteo Bruni : d3dx9/tests: Don' t fail a test if volume textures are not supported.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 8ca7617d4de43bdca4fd8c15a987f851553122b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca7617d4de43bdca4fd8c15a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:39 2014 +0200 d3dx9/tests: Don't fail a test if volume textures are not supported. --- dlls/d3dx9_36/tests/volume.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 860a20b..53260c1 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -83,7 +83,6 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) set_box(&dst_box, 0, 0, 4, 1, 0, 4); hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 16, NULL, &src_box, D3DX_DEFAULT, 0); - ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#x, expected %#x\n", hr, D3D_OK); if (FAILED(hr)) { win_skip("D3DXLoadVolumeFromMemory failed with error %#x, skipping some tests.\n", hr);

1 0

Matteo Bruni : d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 2a8dae52aa5cccea2974aec168a198e5a2ed5032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a8dae52aa5cccea2974aec16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:40 2014 +0200 d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported. --- dlls/d3dx9_36/tests/texture.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 16cb0e5..fb73bfb 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -402,6 +402,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) size = 284; mipmaps = 20; expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 10 : 9; + expected = caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP ? expected : 1; hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected); @@ -409,6 +410,7 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) size = 63; mipmaps = 9; expected = caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2 ? 7 : 6; + expected = caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP ? expected : 1; hr = D3DXCheckCubeTextureRequirements(device, &size, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);

1 0

Matteo Bruni : d3dx9/tests: Take MaxVolumeExtent into account in some tests.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: c1bf61e56c9cd32615bbc308fa9c5207db2b0fc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1bf61e56c9cd32615bbc308f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 1 18:37:41 2014 +0200 d3dx9/tests: Take MaxVolumeExtent into account in some tests. --- dlls/d3dx9_36/tests/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index fb73bfb..6322c70 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -471,9 +471,9 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) IDirect3DDevice9_GetDeviceCaps(device, &caps); - if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP) || (caps.MaxVolumeExtent < 256)) { - skip("No volume textures support\n"); + skip("Limited or no volume textures support.\n"); return; } @@ -560,7 +560,7 @@ static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) height = 143; depth = 55; mipmaps = 20; - expected = caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 ? 10 : 9; + expected = (caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2 && caps.MaxVolumeExtent >= 512) ? 10 : 9; hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); ok(mipmaps == expected, "Returned mipmaps %d, expected %d\n", mipmaps, expected);

1 0

Huw Davies : shlwapi/tests: Fix win8 test failures.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: ddf861da00497f7c04d40af466bcb73647546f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf861da00497f7c04d40af46… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 09:29:30 2014 +0100 shlwapi/tests: Fix win8 test failures. --- dlls/shlwapi/tests/ordinal.c | 43 +++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 676c431..6833095 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -289,14 +289,15 @@ static void test_GetAcceptLanguagesA(void) When the buffer is large enough, the default language is returned When the buffer is too small for that fallback, win7_32 and w2k8_64 - and above fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), but - recent os succeed and return a partial result while - older os succeed and overflow the buffer */ + fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 fails + with HRESULT_FROM_WIN32(ERROR_MORE_DATA), other versions succeed and + return a partial result while older os succeed and overflow the buffer */ ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize)), "==_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); if (exactsize > 1) { @@ -307,7 +308,8 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize - 1)), "-1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); } @@ -318,15 +320,16 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len)), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == 1)), "=1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); len = maxlen; hr = pGetAcceptLanguagesA( NULL, &len); /* w2k3 and below: E_FAIL and untouched len, - since w2k8: S_OK and needed size (excluding 0) */ - ok( ((hr == S_OK) && (len == exactsize)) || + since w2k8: S_OK and needed size (excluding 0), win8 S_OK and size including 0. */ + ok( ((hr == S_OK) && ((len == exactsize) || (len == exactsize + 1))) || ((hr == E_FAIL) && (len == maxlen)), "NULL,max #%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -349,7 +352,8 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=2: got 0x%x with %d and %s\n", hr, len, buffer); len = 1; @@ -357,20 +361,21 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); /* When the buffer is too small, win7_32 and w2k8_64 and above fail with - HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), other versions succeed - and return a partial 0 terminated result while other versions + HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 ERROR_CANNOT_COPY, + other versions succeed and return a partial 0 terminated result while other versions fail with E_INVALIDARG and return a partial unterminated result */ ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len), + ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=1: got 0x%x with %d and %s\n", hr, len, buffer); len = 0; memset(buffer, '#', maxlen); buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); - /* w2k3 and below: E_FAIL, since w2k8: E_INVALIDARG */ - ok((hr == E_FAIL) || (hr == E_INVALIDARG), - "got 0x%x (expected E_FAIL or E_INVALIDARG)\n", hr); + /* w2k3 and below: E_FAIL, since w2k8: E_INVALIDARG, win8 ERROR_CANNOT_COPY */ + ok((hr == E_FAIL) || (hr == E_INVALIDARG) || (hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)), + "got 0x%x\n", hr); memset(buffer, '#', maxlen); buffer[maxlen] = 0; @@ -2290,7 +2295,9 @@ static void test_IUnknown_QueryServiceExec(void) /* null source pointer */ hr = pIUnknown_QueryServiceExec(NULL, &dummy_serviceid, &dummy_groupid, 0, 0, 0, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL || + hr == E_NOTIMPL, /* win 8 */ + "got 0x%08x\n", hr); /* expected trace: IUnknown_QueryServiceExec( ptr1, serviceid, groupid, arg1, arg2, arg3, arg4); @@ -2406,7 +2413,9 @@ static void test_IUnknown_ProfferService(void) /* null source pointer */ hr = pIUnknown_ProfferService(NULL, &dummy_serviceid, 0, 0); - ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(hr == E_FAIL || + hr == E_NOTIMPL, /* win 8 */ + "got 0x%08x\n", hr); /* expected trace: IUnknown_ProfferService( ptr1, serviceid, arg1, arg2);

1 0

Alexandre Julliard : user32: Don' t bother returning a value from the SetWindowRgn driver entry point.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 6a0f3df68cb22ca341a0ca2dd642d426c74e5cf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f3df68cb22ca341a0ca2dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 12:31:14 2014 +0200 user32: Don't bother returning a value from the SetWindowRgn driver entry point. --- dlls/user32/driver.c | 7 +++---- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/window.c | 4 +--- dlls/winex11.drv/window.c | 3 +-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 672f194..e0bc38c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -457,9 +457,8 @@ static void CDECL nulldrv_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { } -static int CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL nulldrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return 1; } static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon ) @@ -757,9 +756,9 @@ static void CDECL loaderdrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, load_driver()->pSetLayeredWindowAttributes( hwnd, key, alpha, flags ); } -static int CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +static void CDECL loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { - return load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); + load_driver()->pSetWindowRgn( hwnd, hrgn, redraw ); } static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO *info, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f2345e8..2bb869a 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -105,7 +105,7 @@ typedef struct tagUSER_DRIVER { void (CDECL *pSetFocus)(HWND); void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); void (CDECL *pSetParent)(HWND,HWND,HWND); - int (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); + void (CDECL *pSetWindowRgn)(HWND,HRGN,BOOL); void (CDECL *pSetWindowIcon)(HWND,UINT,HICON); void (CDECL *pSetWindowStyle)(HWND,INT,STYLESTRUCT*); void (CDECL *pSetWindowText)(HWND,LPCWSTR); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 6ef227c..e61a517 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1374,7 +1374,7 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) * * Assign specified region to window (for non-rectangular windows) */ -int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) +void CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) { struct macdrv_win_data *data; @@ -1393,8 +1393,6 @@ int CDECL macdrv_SetWindowRgn(HWND hwnd, HRGN hrgn, BOOL redraw) if (procid != GetCurrentProcessId()) SendMessageW(hwnd, WM_MACDRV_SET_WIN_REGION, 0, 0); } - - return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d98b9f6..77cf304 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2435,7 +2435,7 @@ done: * * Assign specified region to window (for non-rectangular windows) */ -int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) +void CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { struct x11drv_win_data *data; @@ -2448,7 +2448,6 @@ int CDECL X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) { SendMessageW( hwnd, WM_X11DRV_SET_WIN_REGION, 0, 0 ); } - return TRUE; }

1 0

Thomas Faber : qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 8365eb8753db51ab078080afe423301885644a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8365eb8753db51ab078080afe… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu May 1 13:48:00 2014 +0200 qmgr: Register WINE_REGISTRY resource in DllRegisterServer instead of a nonexistent inf file. --- dlls/qmgr/qmgr_main.c | 77 ++----------------------------------------------- 1 file changed, 3 insertions(+), 74 deletions(-) diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 051c3a5..97c206a 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -28,6 +28,7 @@ #include "winreg.h" #include "advpub.h" #include "olectl.h" +#include "rpcproxy.h" #include "winsvc.h" #include "bits.h" @@ -41,9 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); /* Handle to the base address of this DLL */ static HINSTANCE hInst; -/* Other GUIDs used by this module */ -DEFINE_GUID(CLSID_BackgroundCopyQMgr, 0x69AD4AEE, 0x51BE, 0x439b, 0xA9,0x2C, 0x86,0xAE,0x49,0x0E,0x8B,0x30); - /* Entry point for DLL */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -62,81 +60,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } -static HRESULT init_register_strtable(STRTABLEA *strtable) -{ -#define CLSID_EXPANSION_ENTRY(id) { "CLSID_" #id, &CLSID_ ## id } - static const struct { - const char *name; - const CLSID *clsid; - } expns[] = { - CLSID_EXPANSION_ENTRY(BackgroundCopyQMgr), - CLSID_EXPANSION_ENTRY(BackgroundCopyManager) - }; -#undef CLSID_EXPANSION_ENTRY - static STRENTRYA pse[sizeof expns / sizeof expns[0]]; - DWORD i; - - strtable->cEntries = sizeof pse / sizeof pse[0]; - strtable->pse = pse; - for (i = 0; i < strtable->cEntries; i++) { - static const char dummy_sample[] = "{12345678-1234-1234-1234-123456789012}"; - const CLSID *clsid = expns[i].clsid; - pse[i].pszName = qmgr_strdup(expns[i].name); - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, sizeof dummy_sample); - if (!pse[i].pszName || !pse[i].pszValue) - return E_OUTOFMEMORY; - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], - clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], - clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); - } - - return S_OK; -} - -static void cleanup_register_strtable(STRTABLEA *strtable) -{ - DWORD i; - for (i = 0; i < strtable->cEntries; i++) { - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszName); - HeapFree(GetProcessHeap(), 0, strtable->pse[i].pszValue); - if (!strtable->pse[i].pszName || !strtable->pse[i].pszValue) - return; - } -} - -/* Use an INF file to register or unregister the DLL */ -static HRESULT register_server(BOOL do_register) -{ - HRESULT hr; - STRTABLEA strtable; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - TRACE("(%x)\n", do_register); - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hr = init_register_strtable(&strtable); - if (SUCCEEDED(hr)) - hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", - &strtable); - cleanup_register_strtable(&strtable); - - if (FAILED(hr)) - ERR("RegInstall failed: %08x\n", hr); - - return hr; -} - HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources(hInst); } HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources(hInst); }

1 0

Huw Davies : ole32/tests: Fix win8 test failures.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: dcfd901c83a8ac413bf913ada38211d2e60183c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd901c83a8ac413bf913ada… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 1 11:12:56 2014 +0100 ole32/tests: Fix win8 test failures. --- dlls/ole32/tests/hglobalstream.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b509fb5..cf9fedf 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -261,14 +261,17 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); - /* IStream_Seek -- seek wraps position/size on integer overflow */ + /* IStream_Seek -- seek wraps position/size on integer overflow, but not on win8 */ ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + if (SUCCEEDED(hr)) + ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + else + ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); hr = IStream_Commit(pStream, STGC_DEFAULT);

1 0

Piotr Caban : oleaut32: Handle VariantCopy errors in VariantChangeTypeEx.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: d1469144e9a5e300223703cb69d32e6e6c25b28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1469144e9a5e300223703cb6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 12:14:27 2014 +0200 oleaut32: Handle VariantCopy errors in VariantChangeTypeEx. --- dlls/oleaut32/tests/vartype.c | 7 +++++++ dlls/oleaut32/variant.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ea5065f..b873d82 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -6269,6 +6269,13 @@ static void test_ChangeType_keep_dst(void) hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); ok(V_VT(&v2) == VT_INT && V_INT(&v2) == 4, "VariantChangeTypeEx changed dst variant\n"); + V_VT(&v2) = 0xff; /* incorrect variant type */ + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_INT); + ok(hres == DISP_E_TYPEMISMATCH, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); + hres = VariantChangeTypeEx(&v2, &v1, 0, 0, VT_BSTR); + ok(hres == DISP_E_BADVARTYPE, "VariantChangeTypeEx returns %08x\n", hres); + ok(V_VT(&v2) == 0xff, "VariantChangeTypeEx changed dst variant\n"); SysFreeString(bstr); } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 053903e..c3bd225 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1042,7 +1042,7 @@ HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc, if (SUCCEEDED(res)) { V_VT(&vTmp) = vt; - VariantCopy(pvargDest, &vTmp); + res = VariantCopy(pvargDest, &vTmp); } VariantClear(&vTmp); VariantClear(&vSrcDeref);

1 0

Alexandre Julliard : comctl32/imagelist: Correctly resize the alpha flags when clearing the image list.
by Alexandre Julliard 01 May '14

01 May '14

Module: wine Branch: master Commit: 1dd04884d754427723377a2fed5b58e5ebb6d3b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dd04884d754427723377a2fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 1 17:19:54 2014 +0200 comctl32/imagelist: Correctly resize the alpha flags when clearing the image list. --- dlls/comctl32/imagelist.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index eedf7c5..dfdb46a 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -2376,6 +2376,12 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; + if (himl->has_alpha) + { + HeapFree( GetProcessHeap(), 0, himl->has_alpha ); + himl->has_alpha = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->cMaxImage ); + } + hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); DeleteObject (himl->hbmImage);

1 0