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

Piotr Caban : msvcr90: Share the source code with msvcrt.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: a6e53eaed215447af648cce63e0b68fe234ceaa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6e53eaed215447af648cce63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 16 16:15:41 2014 +0200 msvcr90: Share the source code with msvcrt. --- dlls/msvcr90/Makefile.in | 32 +- dlls/msvcr90/msvcr90.c | 199 ---- dlls/msvcr90/msvcr90.spec | 2418 ++++++++++++++++++++++----------------------- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/main.c | 4 + dlls/msvcrt/msvcrt.h | 1 + tools/make_specfiles | 1 - 7 files changed, 1245 insertions(+), 1412 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6e53eaed215447af648c…

1 0

Dmitry Timoshkov : ole32/tests: Add more tests for PropVariantClear.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: 7de7fc653b1eb44d9937f31d037451c8d1048f2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de7fc653b1eb44d9937f31d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:09:42 2014 +0900 ole32/tests: Add more tests for PropVariantClear. --- dlls/ole32/tests/propvariant.c | 51 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 9e0f66b..7477b6a 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -184,28 +184,71 @@ static void test_validtypes(void) HRESULT hr; unsigned int i; - memset(&propvar, 0, sizeof(propvar)); + memset(&propvar, 0x55, sizeof(propvar)); + hr = PropVariantClear(&propvar); + ok(hr == STG_E_INVALIDPARAMETER, "expected STG_E_INVALIDPARAMETER, got %08x\n", hr); +todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "expected 0, got %#x/%#x\n", + U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); for (i = 0; i < sizeof(valid_types)/sizeof(valid_types[0]); i++) { VARTYPE vt; + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i; hr = PropVariantClear(&propvar); expect(hr, vt); + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_ARRAY; hr = PropVariantClear(&propvar); expect(hr, vt); - + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_VECTOR; hr = PropVariantClear(&propvar); expect(hr, vt); - + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + + memset(&propvar, 0x55, sizeof(propvar)); + U(propvar).pszVal = NULL; vt = propvar.vt = i | VT_BYREF; hr = PropVariantClear(&propvar); expect(hr, vt); - + if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); + else +todo_wine + ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", + i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); } }

1 0

Dmitry Timoshkov : ole32: PropVariantClear should always reset contents of the passed in PROPVARIANT.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: 0946c154fa851c92425e4b90f8951ebb5baba781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0946c154fa851c92425e4b90f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:10:28 2014 +0900 ole32: PropVariantClear should always reset contents of the passed in PROPVARIANT. --- dlls/ole32/ole2.c | 11 ++++++++--- dlls/ole32/tests/propvariant.c | 27 ++++----------------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 407ae38..ed454cd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2919,7 +2919,10 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ hr = PROPVARIANT_ValidateType(pvar->vt); if (FAILED(hr)) + { + memset(pvar, 0, sizeof(*pvar)); return hr; + } switch(pvar->vt) { @@ -3006,12 +3009,14 @@ HRESULT WINAPI PropVariantClear(PROPVARIANT * pvar) /* [in/out] */ } } else + { WARN("Invalid/unsupported type %d\n", pvar->vt); + hr = STG_E_INVALIDPARAMETER; + } } - ZeroMemory(pvar, sizeof(*pvar)); - - return S_OK; + memset(pvar, 0, sizeof(*pvar)); + return hr; } /*********************************************************************** diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 7477b6a..d8d027f 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -187,9 +187,7 @@ static void test_validtypes(void) memset(&propvar, 0x55, sizeof(propvar)); hr = PropVariantClear(&propvar); ok(hr == STG_E_INVALIDPARAMETER, "expected STG_E_INVALIDPARAMETER, got %08x\n", hr); -todo_wine ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); -todo_wine ok(U(propvar).uhVal.QuadPart == 0, "expected 0, got %#x/%#x\n", U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -202,25 +200,16 @@ todo_wine vt = propvar.vt = i; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); memset(&propvar, 0x55, sizeof(propvar)); U(propvar).pszVal = NULL; - vt = propvar.vt = i | VT_ARRAY; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -229,11 +218,7 @@ todo_wine vt = propvar.vt = i | VT_VECTOR; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); @@ -242,11 +227,7 @@ todo_wine vt = propvar.vt = i | VT_BYREF; hr = PropVariantClear(&propvar); expect(hr, vt); - if (hr == S_OK) /* FIXME: Remove once Wine is fixed */ - ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", - i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); - else -todo_wine + ok(propvar.vt == 0, "expected 0, got %d\n", propvar.vt); ok(U(propvar).uhVal.QuadPart == 0, "%u: expected 0, got %#x/%#x\n", i, U(propvar).uhVal.u.LowPart, U(propvar).uhVal.u.HighPart); }

1 0

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

April 16, 2014

Module: wine Branch: master Commit: b17ff75649634f67aff2bcf386072fa143ec50e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17ff75649634f67aff2bcf38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:22 2014 +0200 d3d8/tests: Use a separate device for fog_special_test(). --- dlls/d3d8/tests/visual.c | 67 +++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e3e33e2..702c299 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3879,8 +3879,23 @@ static void zenable_test(IDirect3DDevice8 *device) } } -static void fog_special_test(IDirect3DDevice8 *device) +static void fog_special_test(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + DWORD ps, vs; + HWND window; + HRESULT hr; + union + { + float f; + DWORD d; + } conv; + static const struct { struct vec3 position; @@ -3889,8 +3904,8 @@ static void fog_special_test(IDirect3DDevice8 *device) quad[] = { {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, - {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} }; static const struct @@ -3931,16 +3946,23 @@ static void fog_special_test(IDirect3DDevice8 *device) 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff }; - union + 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, + }}}; + + 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))) { - float f; - DWORD d; - } conv; - DWORD color; - HRESULT hr; - unsigned int i; - DWORD ps, vs; - D3DCAPS8 caps; + 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); @@ -3965,6 +3987,14 @@ static void fog_special_test(IDirect3DDevice8 *device) ps = 0; } + /* The table fog 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_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); @@ -3978,7 +4008,7 @@ static void fog_special_test(IDirect3DDevice8 *device) for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) { - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); if (!tests[i].vs) @@ -4034,16 +4064,15 @@ static void fog_special_test(IDirect3DDevice8 *device) ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); } - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); - ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); if (vs) IDirect3DDevice8_DeleteVertexShader(device, vs); if (ps) IDirect3DDevice8_DeletePixelShader(device, ps); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void volume_dxt5_test(void) @@ -4759,7 +4788,6 @@ START_TEST(visual) multisample_copy_rects_test(device_ptr); zenable_test(device_ptr); resz_test(device_ptr); - fog_special_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4767,6 +4795,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + fog_special_test(); volume_dxt5_test(); volume_v16u16_test(); add_dirty_rect_test();

1 0

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

April 16, 2014

Module: wine Branch: master Commit: d93cbeca511856aad65675f24ad5ee9f079160f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93cbeca511856aad65675f24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:21 2014 +0200 d3d8/tests: Use a separate device for volume_dxt5_test(). --- dlls/d3d8/tests/visual.c | 52 ++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index ce4de4a..e3e33e2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4046,14 +4046,18 @@ static void fog_special_test(IDirect3DDevice8 *device) IDirect3DDevice8_DeletePixelShader(device, ps); } -static void volume_dxt5_test(IDirect3DDevice8 *device) +static void volume_dxt5_test(void) { - HRESULT hr; - IDirect3D8 *d3d8; IDirect3DVolumeTexture8 *texture; + IDirect3DDevice8 *device; D3DLOCKED_BOX box; + IDirect3D8 *d3d; unsigned int i; - DWORD color; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + static const char texture_data[] = { /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ @@ -4070,26 +4074,33 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) quads[] = { {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, - {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, - {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5); - IDirect3D8_Release(d3d8); - if (FAILED(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("Volume dxt5 textures are not supported, skipping test.\n"); - return; + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) + { + skip("Volume DXT5 textures are not supported, skipping test.\n"); + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, @@ -4115,7 +4126,7 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); hr = IDirect3DDevice8_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); @@ -4135,11 +4146,12 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); IDirect3DVolumeTexture8_Release(texture); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void volume_v16u16_test(void) @@ -4748,7 +4760,6 @@ START_TEST(visual) zenable_test(device_ptr); resz_test(device_ptr); fog_special_test(device_ptr); - volume_dxt5_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4756,6 +4767,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + volume_dxt5_test(); volume_v16u16_test(); add_dirty_rect_test(); }

1 0

Dmitry Timoshkov : kernel32: Add a workaround for broken apps that pass negative values to ReadConsole.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: e03a3fe509d525708556c6f310025db9a8cba279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03a3fe509d525708556c6f31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 16 17:09:02 2014 +0900 kernel32: Add a workaround for broken apps that pass negative values to ReadConsole. --- dlls/kernel32/console.c | 12 ++++++++++-- dlls/kernel32/tests/console.c | 10 ++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 9d47bf4..303b638 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -34,6 +34,7 @@ #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <limits.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -1614,9 +1615,10 @@ BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfC } if ((ret = ReadConsoleW(hConsoleInput, ptr, nNumberOfCharsToRead, &ncr, NULL))) + { ncr = WideCharToMultiByte(GetConsoleCP(), 0, ptr, ncr, lpBuffer, nNumberOfCharsToRead, NULL, NULL); - - if (lpNumberOfCharsRead) *lpNumberOfCharsRead = ncr; + if (lpNumberOfCharsRead) *lpNumberOfCharsRead = ncr; + } HeapFree(GetProcessHeap(), 0, ptr); return ret; @@ -1637,6 +1639,12 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, TRACE("(%p,%p,%d,%p,%p)\n", hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved); + if (nNumberOfCharsToRead > INT_MAX) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + if (!GetConsoleMode(hConsoleInput, &mode)) return FALSE; if ((fd = get_console_bare_fd(hConsoleInput)) != -1) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 52dcaac..5928e8c 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2566,8 +2566,6 @@ static void test_ReadConsole(void) ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); -if (0) /* FIXME: uncomment once Wine doesn't hang forever */ -{ bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadFile(std_input, buf, -128, &bytes, NULL); @@ -2580,18 +2578,14 @@ if (0) /* FIXME: uncomment once Wine doesn't hang forever */ ret = ReadConsoleA(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); - ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes); -} + ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); -if (0) /* FIXME: uncomment once Wine doesn't hang forever */ -{ bytes = 0xdeadbeef; SetLastError(0xdeadbeef); ret = ReadConsoleW(std_input, buf, -128, &bytes, NULL); ok(!ret, "expected 0, got %u\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "expected ERROR_NOT_ENOUGH_MEMORY, got %d\n", GetLastError()); - ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, %#x\n", bytes); -} + ok(bytes == 0xdeadbeef, "expected 0xdeadbeef, got %#x\n", bytes); } START_TEST(console)

1 0

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

April 16, 2014

Module: wine Branch: master Commit: b2d85738489612ca29497a962b57ebe76ab52857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2d85738489612ca29497a962… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:25 2014 +0200 d3d8/tests: Use a separate device for multisample_copy_rects_test(). --- dlls/d3d8/tests/visual.c | 47 +++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index df3da7c..7a2c932 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3350,25 +3350,35 @@ static void shadow_test(IDirect3DDevice8 *device) IDirect3D8_Release(d3d8); } -static void multisample_copy_rects_test(IDirect3DDevice8 *device) +static void multisample_copy_rects_test(void) { - IDirect3DSurface8 *original_ds, *original_rt, *ds, *ds_plain, *rt, *readback; + IDirect3DSurface8 *ds, *ds_plain, *rt, *readback; RECT src_rect = {64, 64, 128, 128}; POINT dst_point = {96, 96}; D3DLOCKED_RECT locked_rect; - IDirect3D8 *d3d8; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; D3DCOLOR color; + ULONG refcount; + HWND window; HRESULT hr; - hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); - ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); - hr = IDirect3D8_CheckDeviceMultiSampleType(d3d8, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES); - IDirect3D8_Release(d3d8); - if (FAILED(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; + } + + if (FAILED(IDirect3D8_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled CopyRects test.\n"); - return; + IDirect3DDevice8_Release(device); + goto done; } hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, @@ -3383,11 +3393,6 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); - hr = IDirect3DDevice8_GetRenderTarget(device, &original_rt); - ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); - ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); @@ -3418,15 +3423,15 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) hr = IDirect3DSurface8_UnlockRect(readback); ok(SUCCEEDED(hr), "Failed to unlock readback surface, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, original_rt, original_ds); - ok(SUCCEEDED(hr), "Failed to restore original render target, hr %#x.\n", hr); - - IDirect3DSurface8_Release(original_ds); - IDirect3DSurface8_Release(original_rt); IDirect3DSurface8_Release(readback); IDirect3DSurface8_Release(ds_plain); IDirect3DSurface8_Release(ds); IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void resz_test(void) @@ -4812,7 +4817,6 @@ START_TEST(visual) depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); - multisample_copy_rects_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4820,6 +4824,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + multisample_copy_rects_test(); zenable_test(); resz_test(); fog_special_test();

1 0

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

April 16, 2014

Module: wine Branch: master Commit: 36f5debb88072d1c2caaf2f2d9a1a3cd6a7ee43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f5debb88072d1c2caaf2f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 16 08:55:24 2014 +0200 d3d8/tests: Use a separate device for zenable_test(). --- dlls/d3d8/tests/visual.c | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 05f576e..df3da7c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -3755,8 +3755,18 @@ done: DestroyWindow(window); } -static void zenable_test(IDirect3DDevice8 *device) +static void zenable_test(void) { + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + UINT x, y; + UINT i, j; + static const struct { struct vec4 position; @@ -3769,11 +3779,16 @@ static void zenable_test(IDirect3DDevice8 *device) {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, }; - D3DCOLOR color; - D3DCAPS8 caps; - HRESULT hr; - UINT x, y; - UINT i, j; + + 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_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); @@ -3878,15 +3893,17 @@ static void zenable_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetPixelShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, 0); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); hr = IDirect3DDevice8_DeletePixelShader(device, ps); ok(SUCCEEDED(hr), "Failed to delete pixel shader, hr %#x.\n", hr); hr = IDirect3DDevice8_DeleteVertexShader(device, vs); ok(SUCCEEDED(hr), "Failed to delete vertex shader, hr %#x.\n", hr); } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); } static void fog_special_test(void) @@ -4796,7 +4813,6 @@ START_TEST(visual) intz_test(device_ptr); shadow_test(device_ptr); multisample_copy_rects_test(device_ptr); - zenable_test(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); @@ -4804,6 +4820,7 @@ cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + zenable_test(); resz_test(); fog_special_test(); volume_dxt5_test();

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: d01a5533d0838df8490d9b784f3901f703577a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01a5533d0838df8490d9b784… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 15 23:35:38 2014 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 516ad2e..6edb9c0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -11737,6 +11737,10 @@ msgid "" "Provides DLL registration services.\n" "\n" msgstr "" +"Utilitário de Registro de DLL do Wine\n" +"\n" +"Fornece serviços de registro de DLL.\n" +"\n" #: regsvr32.rc:40 msgid "" @@ -11751,54 +11755,65 @@ msgid "" " [/n] Do not call DllRegisterServer. This option must be used with [/i].\n" "\n" msgstr "" +"Uso:\n" +" regsvr32 [/u] [/s] [/n] [/i[:cmdline]] arquivo\n" +"\n" +"Opções:\n" +" [/u] Remove o registro de um servidor.\n" +" [/s] Modo silencioso (nenhuma mensagem será exibida).\n" +" [/i] Executa DllInstall, passando o parâmetro opcional [cmdline].\n" +"\tQuando é usado com [/u] a operação DllInstall é chamada com modo de " +"desinstalação.\n" +" [/n] Não executar DllRegisterServer. Essa opção deve ser usada com [/i].\n" +"\n" #: regsvr32.rc:41 msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" +"regsvr32: Parâmetro inválido ou não reconhecido [%1]\n" +"\n" #: regsvr32.rc:42 -#, fuzzy -#| msgid "Failed to open '%1'\n" msgid "regsvr32: Failed to load DLL '%1'\n" -msgstr "Falha ao abrir '%1'\n" +msgstr "regsvr32: Falha ao carregar a DLL '%1'\n" #: regsvr32.rc:43 msgid "regsvr32: %1 not implemented in DLL '%2'\n" -msgstr "" +msgstr "regsvr32: %1 não implementado na DLL '%2'\n" #: regsvr32.rc:44 msgid "regsvr32: Failed to register DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao registrar DLL '%1'\n" #: regsvr32.rc:45 msgid "regsvr32: Successfully registered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' registrada com sucesso\n" #: regsvr32.rc:46 msgid "regsvr32: Failed to unregister DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao remover o registro da DLL '%1'\n" #: regsvr32.rc:47 msgid "regsvr32: Successfully unregistered DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Registro da DLL '%1' removido com sucesso\n" #: regsvr32.rc:48 msgid "regsvr32: Failed to install DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao instalar DLL '%1'\n" #: regsvr32.rc:49 msgid "regsvr32: Successfully installed DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' instalada com sucesso\n" #: regsvr32.rc:50 msgid "regsvr32: Failed to uninstall DLL '%1'\n" -msgstr "" +msgstr "regsvr32: Falha ao desinstalar DLL '%1'\n" #: regsvr32.rc:51 msgid "regsvr32: Successfully uninstalled DLL '%1'\n" -msgstr "" +msgstr "regsvr32: DLL '%1' desinstalada com sucesso\n" #: start.rc:55 msgid ""

1 0

Hermès Bélusca-Maïto : shell32: Automatically expand CPL applet path string.
by Alexandre Julliard April 16, 2014

April 16, 2014

Module: wine Branch: master Commit: a08160680be1a3164e882fcc41504f115ba62f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a08160680be1a3164e882fcc4… Author: Hermès Bélusca-Maïto <hermes.belusca(a)sfr.fr> Date: Wed Apr 9 15:27:31 2014 +0200 shell32: Automatically expand CPL applet path string. --- dlls/shell32/control.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index fe392e3..b393154 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -62,6 +62,7 @@ void Control_UnloadApplet(CPlApplet* applet) CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) { CPlApplet* applet; + DWORD len; unsigned i; CPLINFO info; NEWCPLINFOW newinfo; @@ -69,21 +70,30 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) if (!(applet = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*applet)))) return applet; - if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { - WARN("Cannot allocate memory for applet path\n"); + len = ExpandEnvironmentStringsW(cmd, NULL, 0); + if (len > 0) + { + if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)))) + { + WARN("Cannot allocate memory for applet path\n"); + goto theError; + } + ExpandEnvironmentStringsW(cmd, applet->cmd, len+1); + } + else + { + WARN("Cannot expand applet path\n"); goto theError; } - lstrcpyW(applet->cmd, cmd); - applet->hWnd = hWnd; - if (!(applet->hModule = LoadLibraryW(cmd))) { - WARN("Cannot load control panel applet %s\n", debugstr_w(cmd)); + if (!(applet->hModule = LoadLibraryW(applet->cmd))) { + WARN("Cannot load control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; } if (!(applet->proc = (APPLET_PROC)GetProcAddress(applet->hModule, "CPlApplet"))) { - WARN("Not a valid control panel applet %s\n", debugstr_w(cmd)); + WARN("Not a valid control panel applet %s\n", debugstr_w(applet->cmd)); goto theError; } if (!applet->proc(hWnd, CPL_INIT, 0L, 0L)) {

1 0