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

Matteo Bruni : d3dx9/tests: Fix expected values when mipmaps on cube maps are not supported.
by Alexandre Julliard May 1, 2014

May 1, 2014

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 May 1, 2014

May 1, 2014

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

Erich E. Hoover : user32: Reduce the minimum Set[System] Timer from 15 ms to 10 ms.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: b5bd529769696f2b4e4f7d6389f2dc21da5acd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5bd529769696f2b4e4f7d638… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu May 1 07:41:57 2014 -0600 user32: Reduce the minimum Set[System]Timer from 15 ms to 10 ms. --- dlls/user32/message.c | 8 ++------ dlls/user32/tests/msg.c | 26 ++++++++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1e93c8d..be5d995 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4439,9 +4439,7 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ - timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); SERVER_START_REQ( set_win_timer ) { @@ -4474,9 +4472,7 @@ UINT_PTR WINAPI SetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - /* MSDN states that the minimum timeout should be USER_TIMER_MINIMUM (10.0 ms), but testing - * indicates that the true minimum is closer to 15.6 ms. */ - timeout = min( max( 15, timeout ), USER_TIMER_MAXIMUM ); + timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM ); SERVER_START_REQ( set_win_timer ) { diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6406190..66b9c7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8390,8 +8390,8 @@ static VOID CALLBACK tfunc(HWND hwnd, UINT uMsg, UINT_PTR id, DWORD dwTime) } #define TIMER_ID 0x19 -#define TIMER_COUNT_EXPECTED 64 -#define TIMER_COUNT_TOLERANCE 9 +#define TIMER_COUNT_EXPECTED 100 +#define TIMER_COUNT_TOLERANCE 10 static int count = 0; static void CALLBACK callback_count(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) @@ -8442,8 +8442,9 @@ static void test_timers(void) ok( KillTimer(info.hWnd, TIMER_ID), "KillTimer failed\n"); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * ±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(info.hWnd, TIMER_ID, 0, callback_count); @@ -8452,8 +8453,9 @@ static void test_timers(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3 */, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); @@ -8473,7 +8475,9 @@ static void test_timers(void) syscount++; DispatchMessageA(&msg); } - ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(syscount-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE + || broken(abs(syscount-64) < TIMER_COUNT_TOLERANCE) /* most common */ + || broken(syscount > 4000 && syscount < 12000) /* win2k3sp0 */, "did not get expected count for minimum timeout (%d != ~%d).\n", syscount, TIMER_COUNT_EXPECTED); todo_wine ok(count == 0, "did not get expected count for callback timeout (%d != 0).\n", @@ -8507,8 +8511,9 @@ static void test_timers_no_wnd(void) ok(count == 1, "killing replaced timer did not work (%i).\n", count); /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, - * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is - * some measurement error between test runs we're allowing for ±8 counts (~2 ms). + * which occurs sometimes, but most testing on the VMs indicates a minimum timeout closer to + * 15.6 ms. Since there is some measurement error between test runs we are allowing for + * ±9 counts (~4 ms) around the expected value. */ count = 0; id = SetTimer(NULL, 0, 0, callback_count); @@ -8516,7 +8521,8 @@ static void test_timers_no_wnd(void) start = GetTickCount(); while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); - ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE, + ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ + || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id);

1 0

Matteo Bruni : d3dx9/tests: Release the device when skipping some tests.
by Alexandre Julliard May 1, 2014

May 1, 2014

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

Piotr Caban : oleacc: Add tests for default client accessible object.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 7c029e02aed77b88a3e0342a071a91359c7614d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c029e02aed77b88a3e0342a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:56:44 2014 +0200 oleacc: Add tests for default client accessible object. --- dlls/oleacc/tests/Makefile.in | 2 +- dlls/oleacc/tests/main.c | 114 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/Makefile.in b/dlls/oleacc/tests/Makefile.in index 2b0157d..7773ba9 100644 --- a/dlls/oleacc/tests/Makefile.in +++ b/dlls/oleacc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = oleacc.dll -IMPORTS = ole32 oleacc user32 +IMPORTS = ole32 oleacc oleaut32 user32 C_SRCS = \ main.c diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index c5c50b8..0162d72 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -215,6 +215,11 @@ static LRESULT WINAPI test_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARA { switch(msg) { case WM_GETOBJECT: + if(lparam == OBJID_QUERYCLASSNAMEIDX) { + ok(!wparam, "wparam = %lx\n", wparam); + return 0; + } + ok(wparam==0xffffffff || broken(wparam==0x8000), "wparam = %lx\n", wparam); if(lparam == (DWORD)OBJID_CURSOR) return E_UNEXPECTED; @@ -274,6 +279,114 @@ static void test_AccessibleObjectFromWindow(void) DestroyWindow(hwnd); } +static void test_default_client_accessible_object(void) +{ + static const WCHAR testW[] = {'t','e','s','t',' ','t',' ','&','j','u','n','k',0}; + static const WCHAR shortcutW[] = {'A','l','t','+','t',0}; + + IAccessible *acc; + HWND chld, hwnd; + HRESULT hr; + VARIANT vid, v; + BSTR str; + LONG l; + + hwnd = CreateWindowA("oleacc_test", "test &t &junk", WS_OVERLAPPEDWINDOW, + 0, 0, 0, 0, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindow failed\n"); + chld = CreateWindowA("static", "message", WS_CHILD, + 0, 0, 0, 0, hwnd, NULL, NULL, NULL); + ok(chld != NULL, "CreateWindow failed\n"); + + hr = CreateStdAccessibleObject(NULL, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == E_FAIL, "got %x\n", hr); + + hr = CreateStdAccessibleObject(hwnd, OBJID_CLIENT, &IID_IAccessible, (void**)&acc); + ok(hr == S_OK, "got %x\n", hr); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 1, "l = %d\n", l); + + V_VT(&vid) = VT_I4; + V_I4(&vid) = CHILDID_SELF; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, testW), "name = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + V_I4(&vid) = 1; + str = (void*)0xdeadbeef; + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + ok(!str, "str != NULL\n"); + V_I4(&vid) = CHILDID_SELF; + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDescription(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (void*)0xdeadbeef; + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == (STATE_SYSTEM_FOCUSABLE|STATE_SYSTEM_INVISIBLE) || + broken(V_I4(&v) == STATE_SYSTEM_INVISIBLE), "V_I4(&v) = %x\n", V_I4(&v)); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accHelp(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + hr = IAccessible_get_accKeyboardShortcut(acc, vid, &str); + ok(hr == S_OK, "got %x\n", hr); + ok(!lstrcmpW(str, shortcutW), "str = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hr = IAccessible_get_accDefaultAction(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + ok(!str, "str != NULL\n"); + + DestroyWindow(hwnd); + + hr = IAccessible_get_accChildCount(acc, &l); + ok(hr == S_OK, "got %x\n", hr); + ok(l == 0, "l = %d\n", l); + + hr = IAccessible_get_accName(acc, vid, &str); + ok(hr == E_INVALIDARG, "got %x\n", hr); + + hr = IAccessible_get_accValue(acc, vid, &str); + ok(hr == S_FALSE, "got %x\n", hr); + + hr = IAccessible_get_accRole(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == ROLE_SYSTEM_CLIENT, "V_I4(&v) = %d\n", V_I4(&v)); + + hr = IAccessible_get_accState(acc, vid, &v); + ok(hr == S_OK, "got %x\n", hr); + ok(V_VT(&v) == VT_I4, "V_VT(&v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == STATE_SYSTEM_INVISIBLE, "V_I4(&v) = %x\n", V_I4(&v)); + + IAccessible_Release(acc); +} + START_TEST(main) { int argc; @@ -304,6 +417,7 @@ START_TEST(main) test_getroletext(); test_LresultFromObject(argv[0]); test_AccessibleObjectFromWindow(); + test_default_client_accessible_object(); unregister_window_class(); CoUninitialize();

1 0

Alexandre Julliard : comctl32/imagelist: Correctly resize the alpha flags when clearing the image list.
by Alexandre Julliard May 1, 2014

May 1, 2014

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

Piotr Caban : oleacc: Add Client_get_accChildCount implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: 99d0590b012f7890f0d314a6ebf479dc0c2ed016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d0590b012f7890f0d314a6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:17 2014 +0200 oleacc: Add Client_get_accChildCount implementation. --- dlls/oleacc/client.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index e7ff812..5e5ee6f 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -120,8 +120,15 @@ static HRESULT WINAPI Client_get_accParent(IAccessible *iface, IDispatch **ppdis static HRESULT WINAPI Client_get_accChildCount(IAccessible *iface, LONG *pcountChildren) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%p)\n", This, pcountChildren); - return E_NOTIMPL; + HWND cur; + + TRACE("(%p)->(%p)\n", This, pcountChildren); + + *pcountChildren = 0; + for(cur = GetWindow(This->hwnd, GW_CHILD); cur; cur = GetWindow(cur, GW_HWNDNEXT)) + (*pcountChildren)++; + + return S_OK; } static HRESULT WINAPI Client_get_accChild(IAccessible *iface,

1 0

Huw Davies : shlwapi/tests: Fix win8 test failures.
by Alexandre Julliard May 1, 2014

May 1, 2014

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

Piotr Caban : oleacc: Add Client_get_accName implementation.
by Alexandre Julliard May 1, 2014

May 1, 2014

Module: wine Branch: master Commit: a5f78530ddf45b7773a11af92117993abfb9c8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5f78530ddf45b7773a11af92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 1 16:14:24 2014 +0200 oleacc: Add Client_get_accName implementation. --- dlls/oleacc/Makefile.in | 2 +- dlls/oleacc/client.c | 25 +++++++++++++++++++++++-- dlls/oleacc/main.c | 11 +++++++++++ dlls/oleacc/oleacc_private.h | 1 + 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in index d33f867..778791e 100644 --- a/dlls/oleacc/Makefile.in +++ b/dlls/oleacc/Makefile.in @@ -1,6 +1,6 @@ MODULE = oleacc.dll IMPORTLIB = oleacc -IMPORTS = ole32 user32 uuid +IMPORTS = uuid oleaut32 ole32 user32 C_SRCS = \ client.c \ diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c index 5e5ee6f..30673d3 100644 --- a/dlls/oleacc/client.c +++ b/dlls/oleacc/client.c @@ -142,8 +142,29 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface, static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName) { Client *This = impl_from_Client(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); - return E_NOTIMPL; + WCHAR name[1024]; + UINT i, len; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName); + + *pszName = NULL; + if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd)) + return E_INVALIDARG; + + len = SendMessageW(This->hwnd, WM_GETTEXT, sizeof(name)/sizeof(WCHAR), (LPARAM)name); + if(!len) + return S_FALSE; + + for(i=0; i<len; i++) { + if(name[i] == '&') { + len--; + memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR)); + break; + } + } + + *pszName = SysAllocStringLen(name, len); + return *pszName ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 63dfe99..2777a38 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -70,6 +70,17 @@ const char *debugstr_variant(const VARIANT *v) } } +int convert_child_id(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I4: + return V_I4(v); + default: + FIXME("unhandled child ID variant type: %d\n", V_VT(v)); + return -1; + } +} + HRESULT WINAPI CreateStdAccessibleObject( HWND hwnd, LONG idObject, REFIID riidInterface, void** ppvObject ) { diff --git a/dlls/oleacc/oleacc_private.h b/dlls/oleacc/oleacc_private.h index dbb0f8c..ebbab4c 100644 --- a/dlls/oleacc/oleacc_private.h +++ b/dlls/oleacc/oleacc_private.h @@ -21,6 +21,7 @@ HRESULT create_client_object(HWND, const IID*, void**) DECLSPEC_HIDDEN; const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN; +int convert_child_id(VARIANT *v) DECLSPEC_HIDDEN; static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) {

1 0

Piotr Caban : oleaut32: Handle VariantCopy errors in VariantChangeTypeEx.
by Alexandre Julliard May 1, 2014

May 1, 2014

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