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

Henri Verbeet : d3d9/tests: Use a separate device for texop_range_test().
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: 91d3dcffd75e8944b30c3401392aa175076248ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d3dcffd75e8944b30c34013… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:05 2014 +0100 d3d9/tests: Use a separate device for texop_range_test(). --- dlls/d3d9/tests/visual.c | 67 +++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 21c9d17..e8b0e79 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10700,37 +10700,61 @@ static void yuv_layout_test(IDirect3DDevice9 *device) IDirect3D9_Release(d3d); } -static void texop_range_test(IDirect3DDevice9 *device) +static void texop_range_test(void) { - static const struct { + IDirect3DTexture9 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + + static const struct + { float x, y, z; D3DCOLOR diffuse; - } quad[] = { + } + quad[] = + { {-1.0f, -1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)}, {-1.0f, 1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)}, { 1.0f, -1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)}, { 1.0f, 1.0f, 0.1f, D3DCOLOR_ARGB(0xff, 0xff, 0xff, 0xff)} }; - HRESULT hr; - IDirect3DTexture9 *texture; - D3DLOCKED_RECT locked_rect; - D3DCAPS9 caps; - DWORD color; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } /* We need ADD and SUBTRACT operations */ hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); - if (!(caps.TextureOpCaps & D3DTEXOPCAPS_ADD)) { - skip("D3DTOP_ADD is not supported, skipping value range test\n"); - return; + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_ADD)) + { + skip("D3DTOP_ADD is not supported, skipping value range test.\n"); + IDirect3DDevice9_Release(device); + goto done; } - if (!(caps.TextureOpCaps & D3DTEXOPCAPS_SUBTRACT)) { - skip("D3DTEXOPCAPS_SUBTRACT is not supported, skipping value range test\n"); - return; + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_SUBTRACT)) + { + skip("D3DTEXOPCAPS_SUBTRACT is not supported, skipping value range test.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(SUCCEEDED(hr), "SetFVF failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); /* Stage 1: result = diffuse(=1.0) + diffuse * stage 2: result = result - tfactor(= 0.5) */ @@ -10749,6 +10773,8 @@ static void texop_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_SUBTRACT); ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear device, hr %#x.\n\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "BeginScene failed with 0x%08x\n", hr); hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); @@ -10803,13 +10829,12 @@ static void texop_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed with 0x%08x\n", hr); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void alphareplicate_test(void) @@ -15724,11 +15749,11 @@ START_TEST(visual) else skip("No ps_1_1 support\n"); texop_test(device_ptr); - texop_range_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + texop_range_test(); alphareplicate_test(); dp3_alpha_test(); depth_buffer_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for dp3_alpha_test().
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: ad81149953f58223a949f192157737a05cc2e006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad81149953f58223a949f1921… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:55 2014 +0100 d3d9/tests: Use a separate device for dp3_alpha_test(). --- dlls/d3d9/tests/visual.c | 54 +++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 44dedba..893d7b1 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10853,23 +10853,42 @@ static void alphareplicate_test(IDirect3DDevice9 *device) { } -static void dp3_alpha_test(IDirect3DDevice9 *device) { - HRESULT hr; +static void dp3_alpha_test(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; DWORD color; - struct vertex quad[] = { - { -1.0, -1.0, 0.1, 0x408080c0 }, - { 1.0, -1.0, 0.1, 0x408080c0 }, - { -1.0, 1.0, 0.1, 0x408080c0 }, - { 1.0, 1.0, 0.1, 0x408080c0 }, + HWND window; + HRESULT hr; + + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, 0x408080c0}, + {-1.0f, 1.0f, 0.1f, 0x408080c0}, + { 1.0f, -1.0f, 0.1f, 0x408080c0}, + { 1.0f, 1.0f, 0.1f, 0x408080c0}, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); - if (!(caps.TextureOpCaps & D3DTEXOPCAPS_DOTPRODUCT3)) { + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_DOTPRODUCT3)) + { skip("D3DTOP_DOTPRODUCT3 not supported\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); @@ -10904,6 +10923,8 @@ static void dp3_alpha_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0xffffffff); ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); @@ -10920,12 +10941,11 @@ static void dp3_alpha_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void zwriteenable_test(IDirect3DDevice9 *device) { @@ -15687,11 +15707,11 @@ START_TEST(visual) texop_test(device_ptr); texop_range_test(device_ptr); alphareplicate_test(device_ptr); - dp3_alpha_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + dp3_alpha_test(); depth_buffer_test(); depth_buffer2_test(); depth_blit_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for depth_buffer_test().
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: 34e9d94d812d19776286583bd72e1398ed32579d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e9d94d812d19776286583bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:54 2014 +0100 d3d9/tests: Use a separate device for depth_buffer_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fd8eb6d..44dedba 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11736,7 +11736,7 @@ done: DestroyWindow(window); } -static void depth_buffer_test(IDirect3DDevice9 *device) +static void depth_buffer_test(void) { static const struct vertex quad1[] = { @@ -11768,11 +11768,25 @@ static void depth_buffer_test(IDirect3DDevice9 *device) }; IDirect3DSurface9 *backbuffer, *rt1, *rt2, *rt3; + IDirect3DDevice9 *device; unsigned int i, j; D3DVIEWPORT9 vp; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + vp.X = 0; vp.Y = 0; vp.Width = 640; @@ -11864,6 +11878,11 @@ static void depth_buffer_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt3); IDirect3DSurface9_Release(rt2); IDirect3DSurface9_Release(rt1); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* Test that partial depth copies work the way they're supposed to. The clear @@ -15669,11 +15688,11 @@ START_TEST(visual) texop_range_test(device_ptr); alphareplicate_test(device_ptr); dp3_alpha_test(device_ptr); - depth_buffer_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + depth_buffer_test(); depth_buffer2_test(); depth_blit_test(); intz_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for intz_test().
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: 424e069edc3b3a1ca902c25f8dac6f5b4ceb10e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=424e069edc3b3a1ca902c25f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:51 2014 +0100 d3d9/tests: Use a separate device for intz_test(). --- dlls/d3d9/tests/visual.c | 61 ++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 13d363b..f970c34 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12099,7 +12099,7 @@ static void depth_blit_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(ds1); } -static void intz_test(IDirect3DDevice9 *device) +static void intz_test(void) { static const DWORD ps_code[] = { @@ -12158,45 +12158,51 @@ static void intz_test(IDirect3DDevice9 *device) {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; - IDirect3DSurface9 *original_ds, *original_rt, *rt; + IDirect3DSurface9 *original_rt, *rt; IDirect3DTexture9 *texture; IDirect3DPixelShader9 *ps; + IDirect3DDevice9 *device; IDirect3DSurface9 *ds; - IDirect3D9 *d3d9; + IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; UINT i; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')))) + { + skip("No INTZ support, skipping INTZ test.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(2, 0)) { skip("No pixel shader 2.0 support, skipping INTZ test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No unconditional NP2 texture support, skipping INTZ test.\n"); - return; - } - - hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); - - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); - if (FAILED(hr)) - { - skip("No INTZ support, skipping INTZ test.\n"); - return; + IDirect3DDevice9_Release(device); + goto done; } - IDirect3D9_Release(d3d9); - hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); - ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture, NULL); @@ -12396,18 +12402,15 @@ static void intz_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); - ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(original_ds); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture9_Release(texture); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); IDirect3DPixelShader9_Release(ps); - IDirect3DSurface9_Release(original_rt); IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void shadow_test(void) @@ -15631,11 +15634,11 @@ START_TEST(visual) depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); depth_blit_test(device_ptr); - intz_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + intz_test(); shadow_test(); fp_special_test(); depth_bounds_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for depth_blit_test().
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: 421f925d5eae559b6bc2979715d2e6b00a6818f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421f925d5eae559b6bc297971… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:52 2014 +0100 d3d9/tests: Use a separate device for depth_blit_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f970c34..3065614 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11963,7 +11963,7 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt1); } -static void depth_blit_test(IDirect3DDevice9 *device) +static void depth_blit_test(void) { static const struct vertex quad1[] = { @@ -11988,12 +11988,26 @@ static void depth_blit_test(IDirect3DDevice9 *device) }; IDirect3DSurface9 *backbuffer, *ds1, *ds2, *ds3; + IDirect3DDevice9 *device; RECT src_rect, dst_rect; unsigned int i, j; D3DVIEWPORT9 vp; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + vp.X = 0; vp.Y = 0; vp.Width = 640; @@ -12097,6 +12111,11 @@ static void depth_blit_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(ds3); IDirect3DSurface9_Release(ds2); IDirect3DSurface9_Release(ds1); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void intz_test(void) @@ -15633,11 +15652,11 @@ START_TEST(visual) dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); - depth_blit_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + depth_blit_test(); intz_test(); shadow_test(); fp_special_test();

1 0

Austin English : kernel32: Improve GetNumaHighestNodeNumber stub.
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: 77bd74fa2515e8babb6cda2653a12adad65191dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=77bd74fa2515e8babb6cda265… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 18 10:47:09 2014 -0700 kernel32: Improve GetNumaHighestNodeNumber stub. --- dlls/kernel32/process.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 60156aa..3ff47e1 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3911,9 +3911,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK */ BOOL WINAPI GetNumaHighestNodeNumber(PULONG highestnode) { - FIXME("(%p): stub\n", highestnode); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + *highestnode = 0; + FIXME("(%p): semi-stub\n", highestnode); + return TRUE; } /**********************************************************************

1 0

Frédéric Delanoy : user32/tests: Use BOOL type where appropriate.
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: 9b1a2d8f4fc46c3ac7f832a9ec83f696447f3b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b1a2d8f4fc46c3ac7f832a9e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Mar 18 08:33:31 2014 +0100 user32/tests: Use BOOL type where appropriate. --- dlls/user32/tests/win.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d693172..69f3270 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5899,7 +5899,7 @@ static void run_NCRedrawLoop(UINT flags) ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); flush_events( FALSE ); - while(PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE) != 0) + while (PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE)) { if (msg.message == WM_PAINT) loopcount++; if (loopcount >= 100) break; @@ -7063,7 +7063,7 @@ static void create_window_tree(HWND parent, HWND *window, int size) struct window_attributes { char class_name[128]; - int is_visible, is_enabled, is_groupbox, is_httransparent, is_extransparent; + BOOL is_visible, is_enabled, is_groupbox, is_httransparent, is_extransparent; }; static void get_window_attributes(HWND hwnd, struct window_attributes *attrs)

1 0

Jacek Caban : mshtml: Fixed tests on old IEs and improved results on IE11.
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: a6908473b68a8946a5c7dd0b0cb94193542febc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6908473b68a8946a5c7dd0b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 18 11:41:56 2014 +0100 mshtml: Fixed tests on old IEs and improved results on IE11. --- dlls/mshtml/tests/htmldoc.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ed72685..313fb78 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1211,7 +1211,8 @@ static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void return E_NOINTERFACE; } - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + trace("Binding::QI(%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -2666,13 +2667,15 @@ static HRESULT WINAPI CustomDocHostUIHandler_QueryInterface(IDocHostUIHandler2 * return S_OK; } + *ppv = NULL; + if(IsEqualGUID(&IID_IOleCommandTarget, riid)) return E_NOINTERFACE; - else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) + if(IsEqualGUID(&IID_IDocHostShowUI, riid)) return E_NOINTERFACE; /* TODO */ - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + trace("CustomDocHostUIHandler::QI(%s)\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -2971,11 +2974,15 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; + case 83: + case 102: case 134: /* TODO */ + case 135: case 136: /* TODO */ case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ + case 178: return E_NOTIMPL; default: @@ -3036,7 +3043,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(ind == 0, "Lower bound = %d\n", ind); hres = SafeArrayGetUBound(sa, 1, &ind); ok(hres == S_OK, "SafeArrayGetUBound failed: %x\n", hres); - ok(ind == 7 || broken(ind == 5), "Upper bound = %d\n", ind); + ok(ind == 7 || ind == 8 /* IE11 */ ||broken(ind == 5), "Upper bound = %d\n", ind); ind = 0; SafeArrayGetElement(sa, &ind, &var); @@ -4869,7 +4876,7 @@ static HRESULT WINAPI WebBrowser_put_TheaterMode(IWebBrowser2 *iface, VARIANT_BO static HRESULT WINAPI WebBrowser_get_AddressBar(IWebBrowser2 *iface, VARIANT_BOOL *Value) { - ok(0, "unexpected call\n"); + trace("get_AddressBar: ignoring\n"); /* Some old IEs call it */ return E_NOTIMPL; } @@ -5242,7 +5249,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid)) return E_NOINTERFACE; /* ? */ else - ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); + trace("QI(%s)\n", wine_dbgstr_guid(riid)); if(*ppv) return S_OK; @@ -5804,8 +5811,12 @@ static void test_download(DWORD flags) CLEAR_CALLED(UpdateUI); CLEAR_CALLED(Exec_UPDATECOMMANDS); CLEAR_CALLED(Exec_SETTITLE); - if(flags & DWL_EXPECT_HISTUPDATE) - CHECK_CALLED(Exec_Explorer_38); + if(flags & DWL_EXPECT_HISTUPDATE) { + if(flags & DWL_FROM_HISTORY) + CHECK_CALLED_BROKEN(Exec_Explorer_38); /* Some old IEs don't call it. */ + else + CHECK_CALLED(Exec_Explorer_38); + } todo_wine CHECK_CALLED_BROKEN(UpdateBackForwardState); } if(!is_js && !is_extern) {

1 0

Henri Verbeet : d3d9/tests: Use a separate device for depth_buffer2_test() .
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: 38e2f4ca05030fd2d88735c241cd72f6326b6663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38e2f4ca05030fd2d88735c24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 18 09:37:53 2014 +0100 d3d9/tests: Use a separate device for depth_buffer2_test(). --- dlls/d3d9/tests/visual.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3065614..fd8eb6d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11869,7 +11869,7 @@ static void depth_buffer_test(IDirect3DDevice9 *device) /* Test that partial depth copies work the way they're supposed to. The clear * on rt2 only needs a partial copy of the onscreen depth/stencil buffer, and * the following draw should only copy back the part that was modified. */ -static void depth_buffer2_test(IDirect3DDevice9 *device) +static void depth_buffer2_test(void) { static const struct vertex quad[] = { @@ -11880,11 +11880,25 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) }; IDirect3DSurface9 *backbuffer, *rt1, *rt2; + IDirect3DDevice9 *device; unsigned int i, j; D3DVIEWPORT9 vp; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + vp.X = 0; vp.Y = 0; vp.Width = 640; @@ -11961,6 +11975,11 @@ static void depth_buffer2_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(rt2); IDirect3DSurface9_Release(rt1); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void depth_blit_test(void) @@ -15651,11 +15670,11 @@ START_TEST(visual) alphareplicate_test(device_ptr); dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); - depth_buffer2_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + depth_buffer2_test(); depth_blit_test(); intz_test(); shadow_test();

1 0

Jacek Caban : vbscript: Allow creating RegExp object by new expression.
by Alexandre Julliard March 18, 2014

March 18, 2014

Module: wine Branch: master Commit: f123556f0701f5c1c36e24d4de74886e2deeb0a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f123556f0701f5c1c36e24d4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 18 15:52:13 2014 +0100 vbscript: Allow creating RegExp object by new expression. --- dlls/vbscript/interp.c | 11 +++++++++++ dlls/vbscript/tests/lang.vbs | 12 ++++++++++++ dlls/vbscript/tests/regexp.vbs | 6 ++++++ dlls/vbscript/vbregexp.c | 36 ++++++++++++++++++++++++------------ dlls/vbscript/vbscript.h | 2 ++ 5 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 066d675..bc3e940 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -975,8 +975,19 @@ static HRESULT interp_new(exec_ctx_t *ctx) VARIANT v; HRESULT hres; + static const WCHAR regexpW[] = {'r','e','g','e','x','p',0}; + TRACE("%s\n", debugstr_w(arg)); + if(!strcmpiW(arg, regexpW)) { + V_VT(&v) = VT_DISPATCH; + hres = create_regexp(&V_DISPATCH(&v)); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); + } + for(class_desc = ctx->script->classes; class_desc; class_desc = class_desc->next) { if(!strcmpiW(class_desc->name, arg)) break; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 612c615..d3e8318 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1132,4 +1132,16 @@ Call testarrarg(1, "VT_I2*") Call testarrarg(false, "VT_BOOL*") Call testarrarg(Empty, "VT_EMPTY*") +' It's allowed to declare non-builtin RegExp class... +class RegExp + public property get Global() + Call ok(false, "Global called") + Global = "fail" + end property +end class + +' ...but there is no way to use it because builtin instance is always created +set x = new RegExp +Call ok(x.Global = false, "x.Global = " & x.Global) + reportSuccess() diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 72fa108..0354fb7 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -168,4 +168,10 @@ Call ok(submatch.Count = 2, "submatch.Count = " & submatch.Count) Call ok(submatch.Item(0) = "a", "submatch.Item(0) = " & submatch.Item(0)) Call ok(submatch.Item(1) = "b", "submatch.Item(0) = " & submatch.Item(1)) +Set x = new regexp +Call ok(x.Pattern = "", "RegExp.Pattern = " & x.Pattern) +Call ok(x.IgnoreCase = false, "RegExp.IgnoreCase = " & x.IgnoreCase) +Call ok(x.Global = false, "RegExp.Global = " & x.Global) +Call ok(x.Multiline = false, "RegExp.Multiline = " & x.Multiline) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index ada364f..0a399b9 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1599,29 +1599,41 @@ static IRegExpVtbl RegExpVtbl = { RegExp_Replace }; -HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +HRESULT create_regexp(IDispatch **ret) { - RegExp2 *ret; + RegExp2 *regexp; HRESULT hres; - TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); - hres = init_regexp_typeinfo(RegExp2_tid); if(FAILED(hres)) return hres; - ret = heap_alloc_zero(sizeof(*ret)); - if(!ret) + regexp = heap_alloc_zero(sizeof(*regexp)); + if(!regexp) return E_OUTOFMEMORY; - ret->IRegExp2_iface.lpVtbl = &RegExp2Vtbl; - ret->IRegExp_iface.lpVtbl = &RegExpVtbl; + regexp->IRegExp2_iface.lpVtbl = &RegExp2Vtbl; + regexp->IRegExp_iface.lpVtbl = &RegExpVtbl; + regexp->ref = 1; + heap_pool_init(&regexp->pool); - ret->ref = 1; - heap_pool_init(&ret->pool); + *ret = (IDispatch*)&regexp->IRegExp2_iface; + return S_OK; +} + +HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, void **ppv) +{ + IDispatch *regexp; + HRESULT hres; + + TRACE("(%p %s %p)\n", pUnkOuter, debugstr_guid(riid), ppv); + + hres = create_regexp(&regexp); + if(FAILED(hres)) + return hres; - hres = IRegExp2_QueryInterface(&ret->IRegExp2_iface, riid, ppv); - IRegExp2_Release(&ret->IRegExp2_iface); + hres = IDispatch_QueryInterface(regexp, riid, ppv); + IDispatch_Release(regexp); return hres; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 94139bb..bf7a17c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -382,6 +382,8 @@ static inline BOOL is_int32(double d) return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; } +HRESULT create_regexp(IDispatch**) DECLSPEC_HIDDEN; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0