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

Jacek Caban : jscript: Represent NULL VT_UNKNOWN VARIANT as NULL VT_DISPATCH.
by Alexandre Julliard 19 Mar '14

19 Mar '14

Module: wine Branch: master Commit: 5cf20ceffd2a2906b6b1c8b06d276e8436d746b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf20ceffd2a2906b6b1c8b06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 19 13:15:14 2014 +0100 jscript: Represent NULL VT_UNKNOWN VARIANT as NULL VT_DISPATCH. --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 87bad26..a324c96 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -327,6 +327,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) *r = jsval_disp(disp); return S_OK; } + }else { + *r = jsval_disp(NULL); + return S_OK; } /* fall through */ default: diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 0db3660..a92282a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1156,7 +1156,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[3]; + VARIANT args[4]; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1190,6 +1190,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_INT(args+1) = 22; V_VT(args+2) = VT_UNKNOWN; V_UNKNOWN(args+2) = (IUnknown*)&testObj; + V_VT(args+3) = VT_UNKNOWN; + V_UNKNOWN(args+3) = NULL; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -2140,10 +2142,12 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" + " ok(getVT(nullunk) === 'VT_DISPATCH', 'getVT(nullunk) = ' + getVT(nullunk));" + " ok(nullunk === null, 'nullunk !== null');" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Henri Verbeet : d3d9/tests: Use a separate device for intz_test().
by Alexandre Julliard 18 Mar '14

18 Mar '14

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 18 Mar '14

18 Mar '14

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

Henri Verbeet : d3d9/tests: Use a separate device for depth_buffer2_test() .
by Alexandre Julliard 18 Mar '14

18 Mar '14

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

Henri Verbeet : d3d9/tests: Use a separate device for depth_buffer_test().
by Alexandre Julliard 18 Mar '14

18 Mar '14

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 dp3_alpha_test().
by Alexandre Julliard 18 Mar '14

18 Mar '14

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

Dmitry Timoshkov : schedsvc: Replace external trace statements by internal versions.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: 0e802b9c92b83f578f4901c53889d5a30f316957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e802b9c92b83f578f4901c53… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Mar 18 17:42:52 2014 +0900 schedsvc: Replace external trace statements by internal versions. --- dlls/schedsvc/schedsvc.c | 48 +++++++++++++++++++++++----------------------- dlls/schedsvc/svc_main.c | 8 ++++---- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 6ce8064..988430d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); HRESULT __cdecl SchRpcHighestVersion(DWORD *version) { - WINE_TRACE("%p\n", version); + TRACE("%p\n", version); *version = MAKELONG(3, 1); return S_OK; @@ -170,8 +170,8 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl DWORD disposition; HRESULT hr; - WINE_TRACE("%s,%s,%#x,%s,%u,%u,%p,%p,%p\n", wine_dbgstr_w(path), wine_dbgstr_w(xml), flags, - wine_dbgstr_w(sddl), task_logon_type, n_creds, creds, actual_path, xml_error_info); + TRACE("%s,%s,%#x,%s,%u,%u,%p,%p,%p\n", debugstr_w(path), debugstr_w(xml), flags, + debugstr_w(sddl), task_logon_type, n_creds, creds, actual_path, xml_error_info); *actual_path = NULL; *xml_error_info = NULL; @@ -282,7 +282,7 @@ HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, UL WCHAR *full_name; HRESULT hr; - WINE_TRACE("%s,%s,%p,%p\n", wine_dbgstr_w(path), wine_dbgstr_w(languages), n_languages, xml); + TRACE("%s,%s,%p,%p\n", debugstr_w(path), debugstr_w(languages), n_languages, xml); full_name = get_full_name(path, NULL); if (!full_name) return E_OUTOFMEMORY; @@ -299,7 +299,7 @@ HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD f WCHAR *full_name; HRESULT hr; - WINE_TRACE("%s,%s,%#x\n", wine_dbgstr_w(path), wine_dbgstr_w(sddl), flags); + TRACE("%s,%s,%#x\n", debugstr_w(path), debugstr_w(sddl), flags); if (flags) return E_INVALIDARG; @@ -314,61 +314,61 @@ HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD f HRESULT __cdecl SchRpcSetSecurity(const WCHAR *path, const WCHAR *sddl, DWORD flags) { - WINE_FIXME("%s,%s,%#x: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(sddl), flags); + FIXME("%s,%s,%#x: stub\n", debugstr_w(path), debugstr_w(sddl), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcGetSecurity(const WCHAR *path, DWORD flags, WCHAR **sddl) { - WINE_FIXME("%s,%#x,%p: stub\n", wine_dbgstr_w(path), flags, sddl); + FIXME("%s,%#x,%p: stub\n", debugstr_w(path), flags, sddl); return E_NOTIMPL; } HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { - WINE_FIXME("%s,%#x,%p,%u,%p,%p: stub\n", wine_dbgstr_w(path), flags, start_index, n_requested, n_names, names); + FIXME("%s,%#x,%p,%u,%p,%p: stub\n", debugstr_w(path), flags, start_index, n_requested, n_names, names); return E_NOTIMPL; } HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_index, DWORD n_requested, DWORD *n_names, TASK_NAMES *names) { - WINE_FIXME("%s,%#x,%p,%u,%p,%p: stub\n", wine_dbgstr_w(path), flags, start_index, n_requested, n_names, names); + FIXME("%s,%#x,%p,%u,%p,%p: stub\n", debugstr_w(path), flags, start_index, n_requested, n_names, names); return E_NOTIMPL; } HRESULT __cdecl SchRpcEnumInstances(const WCHAR *path, DWORD flags, DWORD *n_guids, GUID **guids) { - WINE_FIXME("%s,%#x,%p,%p: stub\n", wine_dbgstr_w(path), flags, n_guids, guids); + FIXME("%s,%#x,%p,%p: stub\n", debugstr_w(path), flags, n_guids, guids); return E_NOTIMPL; } HRESULT __cdecl SchRpcGetInstanceInfo(GUID guid, WCHAR **path, DWORD *task_state, WCHAR **action, WCHAR **info, DWORD *n_instances, GUID **instances, DWORD *pid) { - WINE_FIXME("%s,%p,%p,%p,%p,%p,%p,%p: stub\n", wine_dbgstr_guid(&guid), path, task_state, action, - info, n_instances, instances, pid); + FIXME("%s,%p,%p,%p,%p,%p,%p,%p: stub\n", wine_dbgstr_guid(&guid), path, task_state, action, + info, n_instances, instances, pid); return E_NOTIMPL; } HRESULT __cdecl SchRpcStopInstance(GUID guid, DWORD flags) { - WINE_FIXME("%s,%#x: stub\n", wine_dbgstr_guid(&guid), flags); + FIXME("%s,%#x: stub\n", wine_dbgstr_guid(&guid), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcStop(const WCHAR *path, DWORD flags) { - WINE_FIXME("%s,%#x: stub\n", wine_dbgstr_w(path), flags); + FIXME("%s,%#x: stub\n", debugstr_w(path), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcRun(const WCHAR *path, DWORD n_args, const WCHAR **args, DWORD flags, DWORD session_id, const WCHAR *user, GUID *guid) { - WINE_FIXME("%s,%u,%p,%#x,%#x,%s,%p: stub\n", wine_dbgstr_w(path), n_args, args, flags, - session_id, wine_dbgstr_w(user), guid); + FIXME("%s,%u,%p,%#x,%#x,%s,%p: stub\n", debugstr_w(path), n_args, args, flags, + session_id, debugstr_w(user), guid); return E_NOTIMPL; } @@ -377,7 +377,7 @@ HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) WCHAR *full_name; HRESULT hr = S_OK; - WINE_TRACE("%s,%#x\n", wine_dbgstr_w(path), flags); + TRACE("%s,%#x\n", debugstr_w(path), flags); if (flags) return E_INVALIDARG; @@ -400,38 +400,38 @@ HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) HRESULT __cdecl SchRpcRename(const WCHAR *path, const WCHAR *name, DWORD flags) { - WINE_FIXME("%s,%s,%#x: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(name), flags); + FIXME("%s,%s,%#x: stub\n", debugstr_w(path), debugstr_w(name), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcScheduledRuntimes(const WCHAR *path, SYSTEMTIME *start, SYSTEMTIME *end, DWORD flags, DWORD n_requested, DWORD *n_runtimes, SYSTEMTIME **runtimes) { - WINE_FIXME("%s,%p,%p,%#x,%u,%p,%p: stub\n", wine_dbgstr_w(path), start, end, flags, - n_requested, n_runtimes, runtimes); + FIXME("%s,%p,%p,%#x,%u,%p,%p: stub\n", debugstr_w(path), start, end, flags, + n_requested, n_runtimes, runtimes); return E_NOTIMPL; } HRESULT __cdecl SchRpcGetLastRunInfo(const WCHAR *path, SYSTEMTIME *last_runtime, DWORD *last_return_code) { - WINE_FIXME("%s,%p,%p: stub\n", wine_dbgstr_w(path), last_runtime, last_return_code); + FIXME("%s,%p,%p: stub\n", debugstr_w(path), last_runtime, last_return_code); return E_NOTIMPL; } HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled, DWORD *task_state) { - WINE_FIXME("%s,%#x,%p,%p: stub\n", wine_dbgstr_w(path), flags, enabled, task_state); + FIXME("%s,%#x,%p,%p: stub\n", debugstr_w(path), flags, enabled, task_state); return E_NOTIMPL; } HRESULT __cdecl SchRpcGetNumberOfMissedRuns(const WCHAR *path, DWORD *runs) { - WINE_FIXME("%s,%p: stub\n", wine_dbgstr_w(path), runs); + FIXME("%s,%p: stub\n", debugstr_w(path), runs); return E_NOTIMPL; } HRESULT __cdecl SchRpcEnableTask(const WCHAR *path, DWORD enabled) { - WINE_FIXME("%s,%u: stub\n", wine_dbgstr_w(path), enabled); + FIXME("%s,%u: stub\n", debugstr_w(path), enabled); return E_NOTIMPL; } diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 95872cd..8c451c9 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -101,7 +101,7 @@ static void schedsvc_update_status(DWORD state) static void WINAPI schedsvc_handler(DWORD control) { - WINE_TRACE("%#x\n", control); + TRACE("%#x\n", control); switch (control) { @@ -124,7 +124,7 @@ static RPC_STATUS RPC_init(void) WCHAR transport[] = SCHEDSVC_TRANSPORT; RPC_STATUS status; - WINE_TRACE("using %s\n", wine_dbgstr_w(transport)); + TRACE("using %s\n", debugstr_w(transport)); status = RpcServerUseProtseqEpW(transport, 0, NULL, NULL); if (status != RPC_S_OK) @@ -173,7 +173,7 @@ static void RPC_finish(void) void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) { - WINE_TRACE("starting Task Scheduler Service\n"); + TRACE("starting Task Scheduler Service\n"); if (RPC_init() != RPC_S_OK) return; @@ -193,7 +193,7 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) RPC_finish(); schedsvc_update_status(SERVICE_STOPPED); - WINE_TRACE("exiting Task Scheduler Service\n"); + TRACE("exiting Task Scheduler Service\n"); } void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len)

1 0

Jacek Caban : mshtml: Fixed tests on old IEs and improved results on IE11.
by Alexandre Julliard 18 Mar '14

18 Mar '14

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

Frédéric Delanoy : user32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 18 Mar '14

18 Mar '14

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

Piotr Caban : msvcrt: Fix p__p___mb_cur_max tests.
by Alexandre Julliard 18 Mar '14

18 Mar '14

Module: wine Branch: master Commit: c4f935d449c316f0f34665d739b97212f6de4fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f935d449c316f0f34665d73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 18 12:56:43 2014 +0100 msvcrt: Fix p__p___mb_cur_max tests. --- dlls/msvcrt/tests/locale.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index d8a1876..6ef07ec 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -785,10 +785,8 @@ static void test__Gettnames(void) static void test___mb_cur_max_func(void) { int mb_cur_max; - CPINFO cp; setlocale(LC_ALL, "C"); - GetCPInfo(CP_ACP, &cp); /* for newer Windows */ if(!p___mb_cur_max_func) @@ -812,13 +810,7 @@ static void test___mb_cur_max_func(void) win_skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); - if (cp.MaxCharSize != 1) { - todo_wine ok(mb_cur_max == cp.MaxCharSize, "mb_cur_max = %d, expected %d\n", - mb_cur_max, cp.MaxCharSize); - } - else { - ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); - } + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); /* some old Windows don't set chinese */ if (!setlocale(LC_ALL, "chinese"))

1 0