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

Henri Verbeet : d3d8/tests: Use a separate device for depth_buffer_test().
by Alexandre Julliard April 17, 2014

April 17, 2014

Module: wine Branch: master Commit: 8cd5f7fdca2915fa53af12aba0c77d59a99c8ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd5f7fdca2915fa53af12aba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 17 08:21:22 2014 +0200 d3d8/tests: Use a separate device for depth_buffer_test(). --- dlls/d3d8/tests/visual.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 06faa6c..f390ea7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2570,8 +2570,19 @@ static void depth_clamp_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); } -static void depth_buffer_test(IDirect3DDevice8 *device) +static void depth_buffer_test(void) { + IDirect3DSurface8 *backbuffer, *rt1, *rt2, *rt3; + IDirect3DSurface8 *depth_stencil; + IDirect3DDevice8 *device; + unsigned int i, j; + D3DVIEWPORT8 vp; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct vertex quad1[] = { { -1.0, 1.0, 0.33f, 0xff00ff00}, @@ -2601,12 +2612,15 @@ static void depth_buffer_test(IDirect3DDevice8 *device) {0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, }; - IDirect3DSurface8 *backbuffer, *rt1, *rt2, *rt3; - IDirect3DSurface8 *depth_stencil; - unsigned int i, j; - D3DVIEWPORT8 vp; - D3DCOLOR 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; + } vp.X = 0; vp.Y = 0; @@ -2702,6 +2716,11 @@ static void depth_buffer_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(rt3); IDirect3DSurface8_Release(rt2); IDirect3DSurface8_Release(rt1); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } /* Test that partial depth copies work the way they're supposed to. The clear @@ -4841,7 +4860,6 @@ START_TEST(visual) p8_texture_test(device_ptr); texop_test(device_ptr); - depth_buffer_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4849,6 +4867,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + depth_buffer_test(); depth_buffer2_test(); intz_test(); shadow_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for intz_test().
by Alexandre Julliard April 17, 2014

April 17, 2014

Module: wine Branch: master Commit: e43d7c4f8a3354e19983bccc0a42d3ce854c8f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e43d7c4f8a3354e19983bccc0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 17 08:21:20 2014 +0200 d3d8/tests: Use a separate device for intz_test(). --- dlls/d3d8/tests/visual.c | 73 ++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 8c8fe97..82c596f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2805,8 +2805,20 @@ static void depth_buffer2_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(rt1); } -static void intz_test(IDirect3DDevice8 *device) +static void intz_test(void) { + IDirect3DSurface8 *original_rt, *rt; + IDirect3DTexture8 *texture; + IDirect3DDevice8 *device; + IDirect3DSurface8 *ds; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + DWORD ps; + UINT i; + static const DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ @@ -2821,7 +2833,7 @@ static void intz_test(IDirect3DDevice8 *device) 0x40000001, 0x80080000, 0xa0aa0002, /* +mov r0.w, c2.z */ 0x0000ffff, /* end */ }; - struct + static const struct { float x, y, z; float s0, t0, p0; @@ -2848,7 +2860,7 @@ static void intz_test(IDirect3DDevice8 *device) { -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; - struct + static const struct { UINT x, y; D3DCOLOR color; @@ -2865,45 +2877,41 @@ static void intz_test(IDirect3DDevice8 *device) {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)}, }; - IDirect3DSurface8 *original_ds, *original_rt, *rt; - IDirect3DTexture8 *texture; - IDirect3DSurface8 *ds; - IDirect3D8 *d3d8; - D3DCAPS8 caps; - HRESULT hr; - DWORD ps; - UINT i; + 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), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) { skip("No pixel shader 1.1 support, skipping INTZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No unconditional NP2 texture support, skipping INTZ test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); - - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); - if (FAILED(hr)) + if (FAILED(hr = IDirect3D8_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"); - return; + IDirect3DDevice8_Release(device); + goto done; } - IDirect3D8_Release(d3d8); - hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); - ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateTexture(device, 640, 480, 1, D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture); @@ -3120,21 +3128,16 @@ static void intz_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); - ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DSurface8_Release(original_ds); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 1, NULL); - ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); IDirect3DTexture8_Release(texture); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, ps); ok(SUCCEEDED(hr), "DeletePixelShader failed, hr %#x.\n", hr); - IDirect3DSurface8_Release(original_rt); IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void shadow_test(void) @@ -4821,7 +4824,6 @@ START_TEST(visual) texop_test(device_ptr); depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); - intz_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4829,6 +4831,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + intz_test(); shadow_test(); multisample_copy_rects_test(); zenable_test();

1 0

Henri Verbeet : d3d8/tests: Use a separate device for shadow_test().
by Alexandre Julliard April 17, 2014

April 17, 2014

Module: wine Branch: master Commit: 527882d4e23d07f7815a5594054002198aa1bcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527882d4e23d07f7815a55940… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 17 08:21:19 2014 +0200 d3d8/tests: Use a separate device for shadow_test(). --- dlls/d3d8/tests/visual.c | 62 +++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 7a2c932..8c8fe97 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3137,8 +3137,18 @@ static void intz_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(rt); } -static void shadow_test(IDirect3DDevice8 *device) +static void shadow_test(void) { + IDirect3DSurface8 *original_rt, *rt; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + DWORD ps; + UINT i; + static const DWORD ps_code[] = { 0xffff0101, /* ps_1_1 */ @@ -3153,7 +3163,7 @@ static void shadow_test(IDirect3DDevice8 *device) 0x40000001, 0x80080000, 0xa0aa0002, /* +mov r0.w, c2.z */ 0x0000ffff, /* end */ }; - struct + static const struct { D3DFORMAT format; const char *name; @@ -3168,7 +3178,7 @@ static void shadow_test(IDirect3DDevice8 *device) {D3DFMT_D24X4S4, "D3DFMT_D24X4S4"}, {D3DFMT_D16, "D3DFMT_D16"}, }; - struct + static const struct { float x, y, z; float s0, t0, p0; @@ -3181,7 +3191,7 @@ static void shadow_test(IDirect3DDevice8 *device) { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f}, { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f}, }; - struct + static const struct { UINT x, y; D3DCOLOR color; @@ -3198,27 +3208,27 @@ static void shadow_test(IDirect3DDevice8 *device) {240, 60, D3DCOLOR_ARGB(0x00, 0x00, 0x00, 0x00)}, }; - IDirect3DSurface8 *original_ds, *original_rt, *rt; - IDirect3D8 *d3d8; - D3DCAPS8 caps; - HRESULT hr; - DWORD ps; - UINT i; + 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), "GetDeviceCaps failed, hr %#x.\n", hr); if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) { skip("No pixel shader 1.1 support, skipping shadow test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); - hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); - ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateRenderTarget(device, 1024, 1024, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); @@ -3268,9 +3278,9 @@ static void shadow_test(IDirect3DDevice8 *device) IDirect3DSurface8 *ds; unsigned int j; - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, format); - if (FAILED(hr)) continue; + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, format))) + continue; hr = IDirect3DDevice8_CreateTexture(device, 1024, 1024, 1, D3DUSAGE_DEPTHSTENCIL, format, D3DPOOL_DEFAULT, &texture); @@ -3335,19 +3345,15 @@ static void shadow_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); } - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, ps); ok(SUCCEEDED(hr), "DeletePixelShader failed, hr %#x.\n", hr); - - hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); - ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); - IDirect3DSurface8_Release(original_ds); - IDirect3DSurface8_Release(original_rt); IDirect3DSurface8_Release(rt); - - IDirect3D8_Release(d3d8); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void multisample_copy_rects_test(void) @@ -4816,7 +4822,6 @@ START_TEST(visual) depth_buffer_test(device_ptr); depth_buffer2_test(device_ptr); intz_test(device_ptr); - shadow_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4824,6 +4829,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + shadow_test(); multisample_copy_rects_test(); zenable_test(); resz_test();

1 0

Marcus Meissner : server: Use longer int in bitshift operation (Coverity).
by Alexandre Julliard April 17, 2014

April 17, 2014

Module: wine Branch: master Commit: 3068d827da90cf753fae9d2955cf04bbd5256fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068d827da90cf753fae9d295… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 17 07:38:18 2014 +0200 server: Use longer int in bitshift operation (Coverity). --- server/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index 896ce0f..b310e93 100644 --- a/server/thread.c +++ b/server/thread.c @@ -450,10 +450,10 @@ affinity_t get_thread_affinity( struct thread *thread ) if (!sched_getaffinity( thread->unix_tid, sizeof(set), &set )) for (i = 0; i < 8 * sizeof(mask); i++) - if (CPU_ISSET( i, &set )) mask |= 1 << i; + if (CPU_ISSET( i, &set )) mask |= (affinity_t)1 << i; } #endif - if (!mask) mask = ~0; + if (!mask) mask = ~(affinity_t)0; return mask; }

1 0

Henri Verbeet : d3d8/tests: Use a separate device for depth_buffer2_test() .
by Alexandre Julliard April 17, 2014

April 17, 2014

Module: wine Branch: master Commit: f798db55c8c596e8817826fb23f743edf344ddaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f798db55c8c596e8817826fb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 17 08:21:21 2014 +0200 d3d8/tests: Use a separate device for depth_buffer2_test(). --- dlls/d3d8/tests/visual.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 82c596f..06faa6c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2707,8 +2707,19 @@ static void depth_buffer_test(IDirect3DDevice8 *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(IDirect3DDevice8 *device) +static void depth_buffer2_test(void) { + IDirect3DSurface8 *backbuffer, *rt1, *rt2; + IDirect3DSurface8 *depth_stencil; + IDirect3DDevice8 *device; + unsigned int i, j; + D3DVIEWPORT8 vp; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + static const struct vertex quad[] = { { -1.0, 1.0, 0.66f, 0xffff0000}, @@ -2717,12 +2728,15 @@ static void depth_buffer2_test(IDirect3DDevice8 *device) { 1.0, -1.0, 0.66f, 0xffff0000}, }; - IDirect3DSurface8 *backbuffer, *rt1, *rt2; - IDirect3DSurface8 *depth_stencil; - unsigned int i, j; - D3DVIEWPORT8 vp; - D3DCOLOR 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; + } vp.X = 0; vp.Y = 0; @@ -2803,6 +2817,11 @@ static void depth_buffer2_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(backbuffer); IDirect3DSurface8_Release(rt2); IDirect3DSurface8_Release(rt1); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void intz_test(void) @@ -4823,7 +4842,6 @@ START_TEST(visual) p8_texture_test(device_ptr); texop_test(device_ptr); depth_buffer_test(device_ptr); - depth_buffer2_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4831,6 +4849,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + depth_buffer2_test(); intz_test(); shadow_test(); multisample_copy_rects_test();

1 0

Piotr Caban : msvcrt: Fix compilation errors on Mingw.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: e70bf5f8c647b65a6075302881d7a71eeea92264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70bf5f8c647b65a607530288… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 16 16:15:07 2014 +0200 msvcrt: Fix compilation errors on Mingw. --- dlls/msvcrt/data.c | 14 +++---- dlls/msvcrt/dir.c | 28 ++++++------- dlls/msvcrt/errno.c | 10 ++--- dlls/msvcrt/file.c | 10 ++--- dlls/msvcrt/heap.c | 6 +-- dlls/msvcrt/math.c | 12 +++--- dlls/msvcrt/misc.c | 2 +- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 106 +++++++++++++++++++++++------------------------ dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/string.c | 42 +++++++++---------- dlls/msvcrt/wcs.c | 10 ++--- 12 files changed, 122 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70bf5f8c647b65a60753…

1 0

Piotr Caban : msvcr100: Move functions implementation to msvcrt.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: beeea28a5336f3a55e137070e55978a7082559ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=beeea28a5336f3a55e137070e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 16 16:15:21 2014 +0200 msvcr100: Move functions implementation to msvcrt. --- dlls/msvcr100/msvcr100.c | 471 ------------------------------------------- dlls/msvcr100/msvcr100.spec | 62 +++--- dlls/msvcr110/msvcr110.spec | 60 +++--- dlls/msvcr70/msvcr70.spec | 6 +- dlls/msvcr71/msvcr71.spec | 6 +- dlls/msvcr80/msvcr80.spec | 52 ++--- dlls/msvcr90/msvcr90.spec | 58 +++--- dlls/msvcrt/cpp.c | 51 +++++ dlls/msvcrt/errno.c | 24 +++ dlls/msvcrt/file.c | 102 +++++++++- dlls/msvcrt/heap.c | 90 +++++++++ dlls/msvcrt/mbcs.c | 5 + dlls/msvcrt/misc.c | 69 +++++++ dlls/msvcrt/msvcrt.spec | 31 +++ dlls/msvcrt/string.c | 13 ++ dlls/msvcrt/time.c | 22 ++ dlls/msvcrt/wcs.c | 32 +++ 17 files changed, 560 insertions(+), 594 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beeea28a5336f3a55e137…

1 0

Huw Davies : wineps: Always initialize the Windows page type.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: ef08f69efc50bf39925c9fb7be3739e99c935e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef08f69efc50bf39925c9fb7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 16 11:58:01 2014 +0100 wineps: Always initialize the Windows page type. --- dlls/wineps.drv/ppd.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index adb6a21..520355a 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -816,26 +816,13 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) tuple.value = NULL; } - else if(!strcmp("*PageSize", tuple.key)) { + else if(!strcmp("*PageSize", tuple.key)) + { page = get_pagesize( ppd, tuple.option, TRUE ); if(!page->Name) { - int i; - page->Name = tuple.option; tuple.option = NULL; - - for(i = 0; PageTrans[i].PSName; i++) { - if(!strcmp(PageTrans[i].PSName, page->Name)) { /* case ? */ - page->WinPage = PageTrans[i].WinPage; - break; - } - } - if(!page->WinPage) { - TRACE("Can't find Windows page type for '%s' - using %u\n", - page->Name, UserPageType); - page->WinPage = UserPageType++; - } } if(!page->FullName) { if(tuple.opttrans) { @@ -851,7 +838,24 @@ PPD *PSDRV_ParsePPD( const WCHAR *fname, HANDLE printer ) page->InvocationString = tuple.value; tuple.value = NULL; } - } + if (!page->WinPage) + { + int i; + for (i = 0; PageTrans[i].PSName; i++) + { + if (!strcmp( PageTrans[i].PSName, page->Name )) + { + page->WinPage = PageTrans[i].WinPage; + break; + } + } + if (!page->WinPage) + { + TRACE( "Can't find Windows page type for %s - using %u\n", debugstr_a(page->Name), UserPageType ); + page->WinPage = UserPageType++; + } + } + } else if(!strcmp("*DefaultPageSize", tuple.key)) {

1 0

Alistair Leslie-Hughes : sdbinst: New stub program.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: e838f0c285c43202d6ea8952f15a67fa19a4342f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e838f0c285c43202d6ea8952f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 16 13:59:17 2014 +1000 sdbinst: New stub program. --- configure | 2 ++ configure.ac | 1 + programs/sdbinst/Makefile.in | 5 +++++ programs/sdbinst/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index fae5c0a..2f2c76b 100755 --- a/configure +++ b/configure @@ -1348,6 +1348,7 @@ enable_rpcss enable_rundll32 enable_sc enable_schtasks +enable_sdbinst enable_secedit enable_servicemodelreg enable_services @@ -17366,6 +17367,7 @@ wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install wine_fn_config_program schtasks enable_schtasks install +wine_fn_config_program sdbinst enable_sdbinst install wine_fn_config_program secedit enable_secedit install wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services clean,install diff --git a/configure.ac b/configure.ac index 7e463b9..46602d6 100644 --- a/configure.ac +++ b/configure.ac @@ -3344,6 +3344,7 @@ WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16,[install]) WINE_CONFIG_PROGRAM(rundll32,,[install]) WINE_CONFIG_PROGRAM(sc,,[install]) WINE_CONFIG_PROGRAM(schtasks,,[install]) +WINE_CONFIG_PROGRAM(sdbinst,,[install]) WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[clean,install]) diff --git a/programs/sdbinst/Makefile.in b/programs/sdbinst/Makefile.in new file mode 100644 index 0000000..460dd8f --- /dev/null +++ b/programs/sdbinst/Makefile.in @@ -0,0 +1,5 @@ +MODULE = sdbinst.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/sdbinst/main.c b/programs/sdbinst/main.c new file mode 100644 index 0000000..ce67660 --- /dev/null +++ b/programs/sdbinst/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sdbinst); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jacek Caban : secur32: Fixed schannel tests on Windows 8.1.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: 293c53e22f14e3016e88f7fff26e2c954f99c3d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=293c53e22f14e3016e88f7fff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 16 12:40:08 2014 +0200 secur32: Fixed schannel tests on Windows 8.1. --- dlls/secur32/tests/schannel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index fa61f4a..078aec7 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -809,7 +809,8 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_CONNECTION_INFO, (void*)&conn_info); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_CONNECTION_INFO) failed: %08x\n", status); if(status == SEC_E_OK) { - ok(conn_info.dwCipherStrength == 128, "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); + ok(conn_info.dwCipherStrength == 128 || conn_info.dwCipherStrength == 168, + "conn_info.dwCipherStrength = %d\n", conn_info.dwCipherStrength); ok(conn_info.dwHashStrength >= 128, "conn_info.dwHashStrength = %d\n", conn_info.dwHashStrength); }

1 0