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

Piotr Caban : msvcr80: Remove remaining forwards to msvcrt.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: bd92ead3f7923bae9b38b8dbfc3461f87d64d5ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd92ead3f7923bae9b38b8dbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 18 19:30:41 2014 +0200 msvcr80: Remove remaining forwards to msvcrt. --- dlls/msvcr80/msvcr80.spec | 128 ++++++++++++++++++++++----------------------- tools/make_specfiles | 1 - 2 files changed, 64 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd92ead3f7923bae9b38b…

1 0

Alexandre Julliard : Release 1.7.17.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: c73bd869ec24e33d277c087b3836025e771fabc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c73bd869ec24e33d277c087b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 20:54:11 2014 +0200 Release 1.7.17. --- ANNOUNCE | 719 ++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 392 insertions(+), 348 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c73bd869ec24e33d277c0…

1 0

Tag wine-1.7.17 : Alexandre Julliard : Release 1.7.17
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: refs/tags/wine-1.7.17 Tag: 818ae8899ac5c30ce0d926d3efbc91f497e09307 URL: http://source.winehq.org/git/wine.git/?a=tag;h=818ae8899ac5c30ce0d926d3efbc… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 20:54:11 2014 +0200 Release 1.7.17

1 0

Henri Verbeet : d3d8/tests: Use a separate device for p8_texture_test().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 9166b74039bd735c7ad67bc9a985213f430c38ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9166b74039bd735c7ad67bc9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 18 08:15:55 2014 +0200 d3d8/tests: Use a separate device for p8_texture_test(). --- dlls/d3d8/tests/visual.c | 99 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a731fa0..4801bae 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2075,75 +2075,79 @@ static void alpha_test(IDirect3DDevice8 *device) } } -static void p8_texture_test(IDirect3DDevice8 *device) +static void p8_texture_test(void) { - IDirect3D8 *d3d = NULL; - HRESULT hr; - IDirect3DTexture8 *texture = NULL, *texture2 = NULL; - D3DLOCKED_RECT lr; - unsigned char *data; + IDirect3DTexture8 *texture, *texture2; + IDirect3DDevice8 *device; PALETTEENTRY table[256]; + unsigned char *data; + D3DLOCKED_RECT lr; + IDirect3D8 *d3d; D3DCOLOR color; + ULONG refcount; D3DCAPS8 caps; + HWND window; + HRESULT hr; UINT i; - float quad[] = { - -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, - -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, - 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, - 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, + + static const float quad[] = + { + -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - float quad2[] = { - -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, - -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, - 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, - 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, + static const float quad2[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, }; - IDirect3DDevice8_GetDirect3D(device, &d3d); - - if(IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_P8) != D3D_OK) { - skip("D3DFMT_P8 textures not supported\n"); - goto out; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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; } - hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, - D3DPOOL_MANAGED, &texture2); - ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); - if(!texture2) { - skip("Failed to create D3DFMT_P8 texture\n"); - goto out; + if (IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_P8) != D3D_OK) + { + skip("D3DFMT_P8 textures not supported.\n"); + IDirect3DDevice8_Release(device); + goto done; } + hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, D3DPOOL_MANAGED, &texture2); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture8_LockRect(texture2, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture8_LockRect failed, hr = %08x\n", hr); data = lr.pBits; *data = 1; - hr = IDirect3DTexture8_UnlockRect(texture2, 0); ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, - D3DPOOL_MANAGED, &texture); - ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); - if(!texture) { - skip("Failed to create D3DFMT_P8 texture\n"); - goto out; - } - + hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture8_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture8_LockRect failed, hr = %08x\n", hr); data = lr.pBits; *data = 1; - hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); @@ -2276,15 +2280,13 @@ static void p8_texture_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); } - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); - -out: - if(texture) IDirect3DTexture8_Release(texture); - if(texture2) IDirect3DTexture8_Release(texture2); + IDirect3DTexture8_Release(texture); + IDirect3DTexture8_Release(texture2); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D8_Release(d3d); + DestroyWindow(window); } static void texop_test(void) @@ -4875,14 +4877,13 @@ START_TEST(visual) skip("No vs.1.1 support\n"); } - p8_texture_test(device_ptr); - refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + p8_texture_test(); texop_test(); depth_buffer_test(); depth_buffer2_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for cnd_test().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: af8cd4a7af776a6c68b328ed51affcf5836ff8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8cd4a7af776a6c68b328ed5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 18 08:15:56 2014 +0200 d3d8/tests: Use a separate device for cnd_test(). --- dlls/d3d8/tests/visual.c | 56 +++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4801bae..6158dee 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -909,13 +909,19 @@ static void fog_with_shader_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeleteVertexShader(device, pixel_shader[1]); } -static void cnd_test(IDirect3DDevice8 *device) +static void cnd_test(void) { - DWORD shader_11, shader_12, shader_13, shader_14; - DWORD shader_11_coissue, shader_12_coissue, shader_13_coissue, shader_14_coissue; DWORD shader_11_coissue_2, shader_12_coissue_2, shader_13_coissue_2, shader_14_coissue_2; - HRESULT hr; + DWORD shader_11_coissue, shader_12_coissue, shader_13_coissue, shader_14_coissue; + DWORD shader_11, shader_12, shader_13, shader_14; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; DWORD color; + HWND window; + HRESULT hr; + /* ps 1.x shaders are rather picky with writemasks and source swizzles. * The dp3 is used to copy r0.r to all components of r1, then copy r1.a to * r0.a. Essentially it does a mov r0.a, r0.r, which isn't allowed as-is @@ -1091,29 +1097,29 @@ static void cnd_test(IDirect3DDevice8 *device) static const float quad1[] = { -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 1.0f, - 0.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 0.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 0.0f }; static const float quad2[] = { 0.0f, -1.0f, 0.1f, 0.0f, 0.0f, 1.0f, - 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 0.0f }; static const float quad3[] = { 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 1.0f, - 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 0.0f }; static const float quad4[] = { -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, 1.0f, - 0.0f, 0.0f, 0.1f, 1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 0.0f }; static const float test_data_c1[4] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -1121,7 +1127,26 @@ static void cnd_test(IDirect3DDevice8 *device) static const float test_data_c1_coi[4] = {0.0f, 1.0f, 0.0f, 0.0f}; static const float test_data_c2_coi[4] = {1.0f, 0.0f, 1.0f, 1.0f}; - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0f, 0); + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 4)) + { + skip("No ps_1_4 support, skipping tests.\n"); + IDirect3DDevice8_Release(device); + goto done; + } + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear returned %08x\n", hr); hr = IDirect3DDevice8_CreatePixelShader(device, shader_code_11, &shader_11); @@ -1359,9 +1384,6 @@ static void cnd_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice8_EndScene returned %08x\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(hr == D3D_OK, "IDirect3DDevice8_SetPixelShader returned %08x\n", hr); - /* 1.4 shader */ color = getPixelColor(device, 158, 118); ok(color == 0x00ffffff, "pixel 158, 118 has color %08x, expected 0x00ffffff\n", color); @@ -1429,6 +1451,11 @@ static void cnd_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeletePixelShader(device, shader_13); IDirect3DDevice8_DeletePixelShader(device, shader_12); IDirect3DDevice8_DeletePixelShader(device, shader_11); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void z_range_test(IDirect3DDevice8 *device) @@ -4866,11 +4893,7 @@ START_TEST(visual) { test_scalar_instructions(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) - { fog_with_shader_test(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) - cnd_test(device_ptr); - } } else { @@ -4883,6 +4906,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + cnd_test(); p8_texture_test(); texop_test(); depth_buffer_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for fog_with_shader_test ().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: f693254d2ce0daac544f143a84246a943f4d03a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f693254d2ce0daac544f143a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 18 08:15:57 2014 +0200 d3d8/tests: Use a separate device for fog_with_shader_test(). --- dlls/d3d8/tests/visual.c | 76 +++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 6158dee..2e6d6d2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -634,16 +634,24 @@ static void fog_test(IDirect3DDevice8 *device) * vertex fog with foggy vertex shader, non-linear * fog with shader, non-linear fog with foggy shader, * linear table fog with foggy shader */ -static void fog_with_shader_test(IDirect3DDevice8 *device) +static void fog_with_shader_test(void) { + /* Fill the null-shader entry with the FVF (SetVertexShader is "overloaded" on d3d8...) */ + DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE, 0, 0}; + DWORD pixel_shader[2] = {0, 0}; + IDirect3DDevice8 *device; + unsigned int i, j; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + HWND window; HRESULT hr; - DWORD color; union { float f; DWORD i; } start, end; - unsigned int i, j; /* Basic vertex shader without fog computation ("non foggy") */ static const DWORD vertex_shader_code1[] = @@ -685,10 +693,6 @@ static void fog_with_shader_test(IDirect3DDevice8 *device) D3DVSD_END() }; static const float vs_constant[4] = {-1.25f, 0.0f, -0.9f, 0.0f}; - /* Fill the null-shader entry with the FVF (SetVertexShader is "overloaded" on d3d8...) */ - DWORD vertex_shader[3] = {D3DFVF_XYZ | D3DFVF_DIFFUSE, 0, 0}; - DWORD pixel_shader[2] = {0, 0}; - /* This reference data was collected on a nVidia GeForce 7600GS * driver version 84.19 DirectX version 9.0c on Windows XP */ static const struct test_data_t @@ -816,12 +820,44 @@ static void fog_with_shader_test(IDirect3DDevice8 *device) {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, }; + static const D3DMATRIX identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; - /* NOTE: changing these values will not affect the tests with foggy vertex shader, - * as the values are hardcoded in the shader constant */ + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1) || caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No vs_1_1 / ps_1_1 support, skipping tests.\n"); + IDirect3DDevice8_Release(device); + goto done; + } + + /* NOTE: changing these values will not affect the tests with foggy vertex + * shader, as the values are hardcoded in the shader constant. */ start.f = 0.1f; end.f = 0.9f; + /* Some of the tests seem to depend on the projection matrix explicitly + * being set to an identity matrix, even though that's the default. + * (AMD Radeon HD 6310, Windows 7) */ + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &identity); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vertex_shader_code1, &vertex_shader[1], 0); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); hr = IDirect3DDevice8_CreateVertexShader(device, decl, vertex_shader_code2, &vertex_shader[2], 0); @@ -873,7 +909,7 @@ static void fog_with_shader_test(IDirect3DDevice8 *device) quad[2].z = 0.001f + j / 10.02f; quad[3].z = 0.001f + j / 10.02f; - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); hr = IDirect3DDevice8_BeginScene(device); @@ -896,17 +932,14 @@ static void fog_with_shader_test(IDirect3DDevice8 *device) } } - /* Reset states */ - hr = IDirect3DDevice8_SetVertexShader(device, 0); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "SetPixelShader failed (%08x)\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(hr == D3D_OK, "Turning off fog calculations failed (%08x)\n", hr); - IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[1]); IDirect3DDevice8_DeleteVertexShader(device, vertex_shader[2]); IDirect3DDevice8_DeleteVertexShader(device, pixel_shader[1]); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void cnd_test(void) @@ -4890,15 +4923,9 @@ START_TEST(visual) alpha_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) - { test_scalar_instructions(device_ptr); - if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) - fog_with_shader_test(device_ptr); - } else - { skip("No vs.1.1 support\n"); - } refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4906,6 +4933,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + fog_with_shader_test(); cnd_test(); p8_texture_test(); texop_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for test_scalar_instructions().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: b2ab6822345af253b911f9e48119e9435d53698e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2ab6822345af253b911f9e48… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 18 08:15:58 2014 +0200 d3d8/tests: Use a separate device for test_scalar_instructions(). --- dlls/d3d8/tests/visual.c | 51 +++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 2e6d6d2..51cdb95 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1712,8 +1712,18 @@ out: ok(SUCCEEDED(hr), "Failed to enable z writes, hr %#x.\n", hr); } -static void test_scalar_instructions(IDirect3DDevice8 *device) +static void test_scalar_instructions(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + DWORD shader; + HWND window; + HRESULT hr; + static const struct vec3 quad[] = { {-1.0f, -1.0f, 0.0f}, @@ -1814,10 +1824,25 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) {"log_test", log_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, {"logp_test", logp_test, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0xff), D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00)}, }; - unsigned int i; - DWORD shader; - DWORD color; - HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1)) + { + skip("No vs_1_1 support, skipping tests.\n"); + IDirect3DDevice8_Release(device); + goto done; + } for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) { @@ -1849,6 +1874,12 @@ static void test_scalar_instructions(IDirect3DDevice8 *device) hr = IDirect3DDevice8_DeleteVertexShader(device, shader); ok(SUCCEEDED(hr), "%s: Failed to delete vertex shader, hr %#x.\n", test_data[i].name, hr); } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void offscreen_test(IDirect3DDevice8 *device) @@ -4881,7 +4912,6 @@ START_TEST(visual) IDirect3DDevice8 *device_ptr; IDirect3D8 *d3d; ULONG refcount; - D3DCAPS8 caps; HWND window; HRESULT hr; @@ -4910,9 +4940,6 @@ START_TEST(visual) goto cleanup; } - hr = IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); - ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - test_sanity(device_ptr); depth_clamp_test(device_ptr); lighting_test(device_ptr); @@ -4922,17 +4949,13 @@ START_TEST(visual) offscreen_test(device_ptr); alpha_test(device_ptr); - if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) - test_scalar_instructions(device_ptr); - else - skip("No vs.1.1 support\n"); - refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + test_scalar_instructions(); fog_with_shader_test(); cnd_test(); p8_texture_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for alpha_test().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 18ba1bce7164997ffba5605d553885a4c8d16e42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ba1bce7164997ffba5605d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 18 08:15:59 2014 +0200 d3d8/tests: Use a separate device for alpha_test(). --- dlls/d3d8/tests/visual.c | 91 ++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 51cdb95..3b8f92d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2005,54 +2005,64 @@ out: } } -static void alpha_test(IDirect3DDevice8 *device) +static void alpha_test(void) { - HRESULT hr; + IDirect3DSurface8 *backbuffer, *offscreen, *depthstencil; IDirect3DTexture8 *offscreenTexture; - IDirect3DSurface8 *backbuffer = NULL, *offscreen = NULL, *depthstencil = NULL; - DWORD color; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; - struct vertex quad1[] = + static const struct vertex quad1[] = { - {-1.0f, -1.0f, 0.1f, 0x4000ff00}, - {-1.0f, 0.0f, 0.1f, 0x4000ff00}, - { 1.0f, -1.0f, 0.1f, 0x4000ff00}, - { 1.0f, 0.0f, 0.1f, 0x4000ff00}, + {-1.0f, -1.0f, 0.1f, 0x4000ff00}, + {-1.0f, 0.0f, 0.1f, 0x4000ff00}, + { 1.0f, -1.0f, 0.1f, 0x4000ff00}, + { 1.0f, 0.0f, 0.1f, 0x4000ff00}, }; - struct vertex quad2[] = + static const struct vertex quad2[] = { - {-1.0f, 0.0f, 0.1f, 0xc00000ff}, - {-1.0f, 1.0f, 0.1f, 0xc00000ff}, - { 1.0f, 0.0f, 0.1f, 0xc00000ff}, - { 1.0f, 1.0f, 0.1f, 0xc00000ff}, + {-1.0f, 0.0f, 0.1f, 0xc00000ff}, + {-1.0f, 1.0f, 0.1f, 0xc00000ff}, + { 1.0f, 0.0f, 0.1f, 0xc00000ff}, + { 1.0f, 1.0f, 0.1f, 0xc00000ff}, }; - static const float composite_quad[][5] = { + static const float composite_quad[][5] = + { { 0.0f, -1.0f, 0.1f, 0.0f, 1.0f}, { 0.0f, 1.0f, 0.1f, 0.0f, 0.0f}, { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.1f, 1.0f, 0.0f}, }; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(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; + } + /* Clear the render target with alpha = 0.5 */ - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x80ff0000, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x80ff0000, 1.0f, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture); - ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr); + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &depthstencil); - ok(hr == D3D_OK, "IDirect3DDevice8_GetDepthStencilSurface failed, hr = %#08x\n", hr); - + ok(SUCCEEDED(hr), "Failed to get depth/stencil buffer, hr %#x.\n", hr); hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - ok(hr == D3D_OK, "Can't get back buffer, hr = %#08x\n", hr); - if(!backbuffer) { - goto out; - } + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DTexture8_GetSurfaceLevel(offscreenTexture, 0, &offscreen); ok(hr == D3D_OK, "Can't get offscreen surface, hr = %#08x\n", hr); - if(!offscreen) { - goto out; - } hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); ok(hr == D3D_OK, "SetVertexShader failed, hr = %#08x\n", hr); @@ -2126,8 +2136,6 @@ static void alpha_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, composite_quad, sizeof(float) * 5); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); @@ -2150,20 +2158,15 @@ static void alpha_test(IDirect3DDevice8 *device) IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - out: - /* restore things */ - if(backbuffer) { - IDirect3DSurface8_Release(backbuffer); - } - if(offscreenTexture) { - IDirect3DTexture8_Release(offscreenTexture); - } - if(offscreen) { - IDirect3DSurface8_Release(offscreen); - } - if(depthstencil) { - IDirect3DSurface8_Release(depthstencil); - } + IDirect3DSurface8_Release(backbuffer); + IDirect3DTexture8_Release(offscreenTexture); + IDirect3DSurface8_Release(offscreen); + IDirect3DSurface8_Release(depthstencil); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void p8_texture_test(void) @@ -4947,7 +4950,6 @@ START_TEST(visual) fog_test(device_ptr); z_range_test(device_ptr); offscreen_test(device_ptr); - alpha_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4955,6 +4957,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + alpha_test(); test_scalar_instructions(); fog_with_shader_test(); cnd_test();

1 0

Nikolay Sivov : wscript: Ignore 'nologo' switch.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 389992fdfa2361cd24a18722b4aa9542a9fe6ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=389992fdfa2361cd24a18722b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 18 10:29:52 2014 +0400 wscript: Ignore 'nologo' switch. --- programs/wscript/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index cebabed..b232949 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -339,6 +339,7 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri static BOOL set_host_properties(const WCHAR *prop) { + static const WCHAR nologoW[] = {'n','o','l','o','g','o',0}; static const WCHAR iactive[] = {'i',0}; static const WCHAR batch[] = {'b',0}; @@ -354,6 +355,8 @@ static BOOL set_host_properties(const WCHAR *prop) wshInteractive = VARIANT_TRUE; else if(strcmpiW(prop, batch) == 0) wshInteractive = VARIANT_FALSE; + else if(strcmpiW(prop, nologoW) == 0) + WINE_FIXME("ignored %s switch\n", debugstr_w(nologoW)); else return FALSE; return TRUE;

1 0

Nikolay Sivov : shlwapi: Fix UrlEscapeW() for non-ASCII range.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 462b2feb3504a31355bb162513ce82043a8d43b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462b2feb3504a31355bb16251… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 18 01:39:13 2014 +0400 shlwapi: Fix UrlEscapeW() for non-ASCII range. --- dlls/shlwapi/tests/url.c | 120 ++++++++++++++++++++++++++-------------------- dlls/shlwapi/url.c | 74 ++++++++++++---------------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f53a545..857ed15 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -297,7 +297,9 @@ static const TEST_URL_ESCAPE TEST_ESCAPE[] = { {"ftp://fo/o(a)bar.baz/fo#o\\bar", 0, 0, S_OK, "ftp://fo/o(a)bar.baz/fo#o\\bar"}, {"ftp://localhost/o(a)bar.baz/fo#o\\bar", 0, 0, S_OK, "ftp://localhost/o(a)bar.baz/fo#o\\bar"}, {"ftp:///fo/o(a)bar.baz/foo/bar", 0, 0, S_OK, "ftp:///fo/o(a)bar.baz/foo/bar"}, - {"ftp:////fo/o(a)bar.baz/foo/bar", 0, 0, S_OK, "ftp:////fo/o(a)bar.baz/foo/bar"} + {"ftp:////fo/o(a)bar.baz/foo/bar", 0, 0, S_OK, "ftp:////fo/o(a)bar.baz/foo/bar"}, + + {"ftp\x1f\1end/", 0, 0, S_OK, "ftp%1F%01end/"} }; /* ################ */ @@ -779,34 +781,6 @@ static void test_UrlGetPart(void) } /* ########################### */ - -static void test_url_escape(const char *szUrl, DWORD dwFlags, HRESULT dwExpectReturn, const char *szExpectUrl) -{ - CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; - DWORD dwEscaped; - WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; - WCHAR *urlW, *expected_urlW; - dwEscaped=INTERNET_MAX_URL_LENGTH; - - ok(pUrlEscapeA(szUrl, szReturnUrl, &dwEscaped, dwFlags) == dwExpectReturn, - "UrlEscapeA didn't return 0x%08x from \"%s\"\n", dwExpectReturn, szUrl); - ok(strcmp(szReturnUrl,szExpectUrl)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", szExpectUrl, szReturnUrl, szUrl); - - if (pUrlEscapeW) { - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(szUrl); - expected_urlW = GetWideString(szExpectUrl); - ok(pUrlEscapeW(urlW, ret_urlW, &dwEscaped, dwFlags) == dwExpectReturn, - "UrlEscapeW didn't return 0x%08x from \"%s\"\n", dwExpectReturn, szUrl); - WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); - ok(lstrcmpW(ret_urlW, expected_urlW)==0, - "Expected \"%s\", but got \"%s\" from \"%s\" flags %08x\n", - szExpectUrl, szReturnUrl, szUrl, dwFlags); - FreeWideString(urlW); - FreeWideString(expected_urlW); - } -} - static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, HRESULT dwExpectReturn, HRESULT dwExpectReturnAlt, const char *szExpectUrl, BOOL todo) { CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; @@ -850,18 +824,15 @@ static void test_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, H } -static void test_UrlEscape(void) +static void test_UrlEscapeA(void) { - static const WCHAR out[] = { 'f','o','o','%','2','0','b','a','r',0 }; - DWORD size = 0; HRESULT ret; unsigned int i; char empty_string[] = ""; - WCHAR overwrite[] = { 'f','o','o',' ','b','a','r',0,0,0 }; if (!pUrlEscapeA) { - win_skip("UrlEscapeA noz found\n"); + win_skip("UrlEscapeA not found\n"); return; } @@ -891,26 +862,68 @@ static void test_UrlEscape(void) ok(size == 34, "got %d, expected %d\n", size, 34); ok(empty_string[0] == 127, "String has changed, empty_string[0] = %d\n", empty_string[0]); - if(pUrlEscapeW) { - WCHAR wc; - - size = sizeof(overwrite)/sizeof(WCHAR); - ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); - ok(ret == S_OK, "got %x, expected S_OK\n", ret); - ok(size == 9, "got %d, expected 9\n", size); - ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); - - size = 1; - wc = 127; - ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); - ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); - ok(size == 10, "got %d, expected 10\n", size); - ok(wc == 127, "String has changed, wc = %d\n", wc); + for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { + CHAR ret_url[INTERNET_MAX_URL_LENGTH]; + + size = INTERNET_MAX_URL_LENGTH; + ret = pUrlEscapeA(TEST_ESCAPE[i].url, ret_url, &size, TEST_ESCAPE[i].flags); + ok(ret == TEST_ESCAPE[i].expectret, "UrlEscapeA returned 0x%08x instead of 0x%08x for \"%s\"\n", + ret, TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].url); + ok(!strcmp(ret_url, TEST_ESCAPE[i].expecturl), "Expected \"%s\", but got \"%s\" for \"%s\"\n", + TEST_ESCAPE[i].expecturl, ret_url, TEST_ESCAPE[i].url); + } +} + +static void test_UrlEscapeW(void) +{ + static const WCHAR naW[] = {'f','t','p',31,255,250,0x2122,'e','n','d','/',0}; + static const WCHAR naescapedW[] = {'f','t','p','%','1','F','%','F','F','%','F','A',0x2122,'e','n','d','/',0}; + static const WCHAR out[] = {'f','o','o','%','2','0','b','a','r',0}; + WCHAR overwrite[] = {'f','o','o',' ','b','a','r',0,0,0}; + WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; + DWORD size = 0; + HRESULT ret; + WCHAR wc; + int i; + + if (!pUrlEscapeW) { + win_skip("UrlEscapeW not found\n"); + return; } - for(i=0; i<sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { - test_url_escape(TEST_ESCAPE[i].url, TEST_ESCAPE[i].flags, - TEST_ESCAPE[i].expectret, TEST_ESCAPE[i].expecturl); + size = sizeof(overwrite)/sizeof(WCHAR); + ret = pUrlEscapeW(overwrite, overwrite, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == S_OK, "got %x, expected S_OK\n", ret); + ok(size == 9, "got %d, expected 9\n", size); + ok(!lstrcmpW(overwrite, out), "got %s, expected %s\n", wine_dbgstr_w(overwrite), wine_dbgstr_w(out)); + + size = 1; + wc = 127; + ret = pUrlEscapeW(overwrite, &wc, &size, URL_ESCAPE_SPACES_ONLY); + ok(ret == E_POINTER, "got %x, expected %x\n", ret, E_POINTER); + ok(size == 10, "got %d, expected 10\n", size); + ok(wc == 127, "String has changed, wc = %d\n", wc); + + /* non-ASCII range */ + size = sizeof(ret_urlW)/sizeof(WCHAR); + ret = pUrlEscapeW(naW, ret_urlW, &size, 0); + ok(ret == S_OK, "got %x, expected S_OK\n", ret); + ok(!lstrcmpW(naescapedW, ret_urlW), "got %s, expected %s\n", wine_dbgstr_w(ret_urlW), wine_dbgstr_w(naescapedW)); + + for (i = 0; i < sizeof(TEST_ESCAPE)/sizeof(TEST_ESCAPE[0]); i++) { + + WCHAR *urlW, *expected_urlW; + + size = INTERNET_MAX_URL_LENGTH; + urlW = GetWideString(TEST_ESCAPE[i].url); + expected_urlW = GetWideString(TEST_ESCAPE[i].expecturl); + ret = pUrlEscapeW(urlW, ret_urlW, &size, TEST_ESCAPE[i].flags); + ok(ret == TEST_ESCAPE[i].expectret, "UrlEscapeW returned 0x%08x instead of 0x%08x for %s\n", + ret, TEST_ESCAPE[i].expectret, wine_dbgstr_w(urlW)); + ok(!lstrcmpW(ret_urlW, expected_urlW), "Expected %s, but got %s for %s flags %08x\n", + wine_dbgstr_w(expected_urlW), wine_dbgstr_w(ret_urlW), wine_dbgstr_w(urlW), TEST_ESCAPE[i].flags); + FreeWideString(urlW); + FreeWideString(expected_urlW); } } @@ -1548,7 +1561,8 @@ START_TEST(url) test_UrlGetPart(); test_UrlCanonicalizeA(); test_UrlCanonicalizeW(); - test_UrlEscape(); + test_UrlEscapeA(); + test_UrlEscapeW(); test_UrlCombine(); test_UrlCreateFromPath(); test_UrlIs(); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 11589e4..ba2f241 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -986,57 +986,43 @@ HRESULT WINAPI UrlEscapeA( #define WINE_URL_STOP_ON_HASH 0x20 #define WINE_URL_STOP_ON_QUESTION 0x40 -static inline BOOL URL_NeedEscapeW(WCHAR ch, DWORD dwFlags, DWORD int_flags) +static inline BOOL URL_NeedEscapeW(WCHAR ch, DWORD flags, DWORD int_flags) { + if (flags & URL_ESCAPE_SPACES_ONLY) + return ch == ' '; - if (isalnumW(ch)) - return FALSE; - - if(dwFlags & URL_ESCAPE_SPACES_ONLY) { - if(ch == ' ') - return TRUE; - else - return FALSE; - } - - if ((dwFlags & URL_ESCAPE_PERCENT) && (ch == '%')) + if ((flags & URL_ESCAPE_PERCENT) && (ch == '%')) return TRUE; - if (ch <= 31 || ch >= 127) + if (ch <= 31 || (ch >= 127 && ch <= 255) ) return TRUE; - else { - switch (ch) { - case ' ': - case '<': - case '>': - case '\"': - case '{': - case '}': - case '|': - case '\\': - case '^': - case ']': - case '[': - case '`': - case '&': - return TRUE; - - case '/': - if (int_flags & WINE_URL_ESCAPE_SLASH) return TRUE; - return FALSE; - - case '?': - if (int_flags & WINE_URL_ESCAPE_QUESTION) return TRUE; - return FALSE; - - case '#': - if (int_flags & WINE_URL_ESCAPE_HASH) return TRUE; - return FALSE; + if (isalnumW(ch)) + return FALSE; - default: - return FALSE; - } + switch (ch) { + case ' ': + case '<': + case '>': + case '\"': + case '{': + case '}': + case '|': + case '\\': + case '^': + case ']': + case '[': + case '`': + case '&': + return TRUE; + case '/': + return !!(int_flags & WINE_URL_ESCAPE_SLASH); + case '?': + return !!(int_flags & WINE_URL_ESCAPE_QUESTION); + case '#': + return !!(int_flags & WINE_URL_ESCAPE_HASH); + default: + return FALSE; } }

1 0