November 2019 - Wine-commits

Zhiyi Zhang : d3d9/tests: Add a test for stencil reference value truncation.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: ee5d3beda5eb4bfebedaec0b4c96919fd4d52370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5d3beda5eb4bfebedaec0b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 28 21:32:27 2019 +0430 d3d9/tests: Add a test for stencil reference value truncation. With suggestions by Paul Gofman. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c67a27c87f680f60c52c4d531c1adbaac417324b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 136 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 39 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bfe4551e49..1ba1b1c441 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10890,33 +10890,37 @@ static void stencil_cull_test(void) D3DCAPS9 caps; HWND window; HRESULT hr; - static const float quad1[] = + static const struct { - -1.0, -1.0, 0.1, - 0.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - }; - static const float quad2[] = + struct vec3 position; + } + quad1[] = { - 0.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - }; - static const float quad3[] = + {{-1.0f, -1.0f, 0.1f}}, + {{ 0.0f, -1.0f, 0.1f}}, + {{-1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + }, + quad2[] = { - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 1.0, 0.1, - }; - static const float quad4[] = + {{ 0.0f, -1.0f, 0.1f}}, + {{ 1.0f, -1.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + {{ 1.0f, 0.0f, 0.1f}}, + }, + quad3[] = + { + {{ 0.0f, 0.0f, 0.1f}}, + {{ 1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 1.0f, 0.1f}}, + {{ 1.0f, 1.0f, 0.1f}}, + }, + quad4[] = { - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 1.0, 0.1, + {{-1.0f, 0.0f, 0.1f}}, + {{ 0.0f, 0.0f, 0.1f}}, + {{-1.0f, 1.0f, 0.1f}}, + {{ 0.0f, 1.0f, 0.1f}}, }; struct { @@ -10989,40 +10993,40 @@ static void stencil_cull_test(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TWOSIDEDSTENCILMODE, TRUE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad2, sizeof(*quad2)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad2, sizeof(*quad2)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad3, sizeof(*quad3)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad3, sizeof(*quad3)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CCW); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_cw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad4, sizeof(*quad4)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, 0 /* MinIndex */, 4 /* NumVerts */, - 1 /* PrimCount */, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(float) * 3); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_ccw, D3DFMT_INDEX16, quad4, sizeof(*quad4)); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -11087,6 +11091,60 @@ static void stencil_cull_test(void) color = getPixelColor(device, 480, 60); ok(color == 0x00000080, "CW triangle, twoside TRUE, cull cw, culled, has color 0x%08x, expected 0x00000080\n", color); + /* Test for reference truncation. */ + /* 1st pass: set stencil. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_STENCIL, 0x00ff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFAIL, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILZFAIL, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILPASS, D3DSTENCILOP_REPLACE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0x1cc); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_ALWAYS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, TRUE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_CW); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitiveUP(device, D3DPT_TRIANGLELIST, + 0, 4, 1, indices_cw, D3DFMT_INDEX16, quad1, sizeof(*quad1)); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* 2nd pass: draw image. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILREF, 0xdb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILMASK, 0x0f); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILFUNC, D3DCMP_LESS); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, painter, sizeof(painter[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 280, 360); + todo_wine ok(color == 0x000000f0, "Got unexpected colour 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);

1 0

Zhang Shuai : dssenh/tests: Add keylength tests for enhanced and schannel providers.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 9c641c38794ae4d51ee058d22f83d2fcbea127d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c641c38794ae4d51ee058d2… Author: Zhang Shuai <wxsxsdz(a)gmail.com> Date: Fri Nov 22 08:38:59 2019 +0000 dssenh/tests: Add keylength tests for enhanced and schannel providers. Signed-off-by: Zhang Shuai <wxsxsdz(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b62f592f5f..aa99acded0 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -261,7 +261,7 @@ static const struct keylength_test dssDH_keylength[] = { }; static const struct keylength_test dssENH_keylength[] = { - /* min 512 max 1024 (AT_KEYEXCHANGE max 4096), increment by 64*/ + /* min 512 max 1024 (AT_KEYEXCHANGE, CALG_DH_EPHEM, CALG_DH_SF max 4096), increment by 64*/ {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_KEYEXCHANGE, 512 << 16, TRUE}, {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ @@ -285,12 +285,16 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_EPHEM, 768 << 16, TRUE}, {CALG_DH_EPHEM, 1024 << 16, TRUE}, {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 1088 << 16, TRUE}, + {CALG_DH_EPHEM, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DH_SF, 512 << 16, TRUE}, {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ {CALG_DH_SF, 768 << 16, TRUE}, {CALG_DH_SF, 1024 << 16, TRUE}, {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 1088 << 16, TRUE}, + {CALG_DH_SF, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */

1 0

Francois Gouget : userenv/tests: Windows 10 1809 changed GetUserProfileDirectory().
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 8ec8a56a24dabc56d6a244268822e7bedc2fe785 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec8a56a24dabc56d6a24426… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:25:20 2019 +0100 userenv/tests: Windows 10 1809 changed GetUserProfileDirectory(). It is no longer possible to get the required buffer size in the ANSI version, and the Unicode one requires a NULL buffer. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/userenv/tests/userenv.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index f6cfcc79ec..a91edeef26 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -303,7 +303,7 @@ static void test_get_profiles_dir(void) static void test_get_user_profile_dir(void) { BOOL ret; - DWORD error, len; + DWORD error, len, len2; HANDLE token; char *dirA; WCHAR *dirW; @@ -351,18 +351,23 @@ static void test_get_user_profile_dir(void) ret = GetUserProfileDirectoryA( token, dirA, &len ); error = GetLastError(); ok(!ret, "expected failure\n"); - ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); - ok(len, "expected len > 0\n"); - HeapFree( GetProcessHeap(), 0, dirA ); - - dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); - SetLastError( 0xdeadbeef ); - ret = GetUserProfileDirectoryA( token, dirA, &len ); - ok(ret, "expected success %u\n", GetLastError()); - ok(len, "expected len > 0\n"); - ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); - trace("%s\n", dirA); HeapFree( GetProcessHeap(), 0, dirA ); + if (error == ERROR_INSUFFICIENT_BUFFER) + { + ok(len, "expected len > 0\n"); + + dirA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryA( token, dirA, &len ); + ok(ret, "expected success %u\n", GetLastError()); + ok(len, "expected len > 0\n"); + ok(lstrlenA( dirA ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenA( dirA ), len ); + trace("%s\n", dirA); + HeapFree( GetProcessHeap(), 0, dirA ); + } + else + ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, + "unexpected error %u\n", error); SetLastError( 0xdeadbeef ); ret = GetUserProfileDirectoryW( NULL, NULL, NULL ); @@ -400,6 +405,19 @@ static void test_get_user_profile_dir(void) ok(lstrlenW( dirW ) == len - 1, "length mismatch %d != %d - 1\n", lstrlenW( dirW ), len ); HeapFree( GetProcessHeap(), 0, dirW ); + len2 = 0; + dirW = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 32 * sizeof(WCHAR) ); + SetLastError( 0xdeadbeef ); + ret = GetUserProfileDirectoryW( token, dirW, &len2 ); + error = GetLastError(); + ok(!ret, "expected failure\n"); + HeapFree( GetProcessHeap(), 0, dirW ); + if (error == ERROR_INSUFFICIENT_BUFFER) + ok(len2 == len, "expected %d, got %d\n", len, len2); + else + ok(broken(error == ERROR_INVALID_PARAMETER) /* win10 1809+ */, + "unexpected error %u\n", error); + CloseHandle( token ); }

1 0

Zebediah Figura : quartz/tests: Relax some more timings.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 239a6392a74bdd71c96b5a63c7a02057b193879b URL: https://source.winehq.org/git/wine.git/?a=commit;h=239a6392a74bdd71c96b5a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 13:09:05 2019 -0600 quartz/tests: Relax some more timings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 4b233dbcff..ca4503117a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3163,7 +3163,7 @@ todo_wine check_filter_state(graph, State_Paused); Sleep(600); - start_time += 600 * 10000; + start_time += 550 * 10000; hr = IMediaFilter_Run(filter, 0); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); @@ -3929,12 +3929,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop)); @@ -3947,12 +3947,12 @@ static void test_graph_seeking(void) hr = IMediaSeeking_GetCurrentPosition(seeking, &time); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(time - 1334 * 10000) < 40 * 10000, + ok(abs(time - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(time)); current = stop = 0xdeadbeef; hr = IMediaSeeking_GetPositions(seeking, &current, &stop); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(abs(current - 1334 * 10000) < 40 * 10000, + ok(abs(current - 1334 * 10000) < 80 * 10000, "Expected about 1334ms, got %s.\n", wine_dbgstr_longlong(current)); ok(stop == 8000 * 10000, "Got time %s.\n", wine_dbgstr_longlong(stop));

1 0

Zebediah Figura : quartz/tests: Fix some tests on w7u.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 190fb605c34ac1365076dff0a6560ddb42ca1ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=190fb605c34ac1365076dff0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 22 13:19:18 2019 -0600 quartz/tests: Fix some tests on w7u. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 22ddb63746..568d74a26a 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -1048,9 +1048,9 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 4); + memset(data, 0x55, IMediaSample_GetSize(sample)); - hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 4); + hr = IMediaSample_SetActualDataLength(sample, IMediaSample_GetSize(sample)); ok(hr == S_OK, "Got hr %#x.\n", hr); start_time = 0; @@ -1350,6 +1350,10 @@ static void test_connect_pin(void) { vih.bmiHeader.biBitCount = 24; hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + /* w7u is also rather buggy with its allocator. Requesting a size of + * 32 * 16 * 4 succeeds and returns that size from SetProperties(), but + * the actual samples only have a size of 32 * 16 * 3. */ + req_props.cbBuffer = 32 * 16 * 3; } ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface);

1 0

Jeff Smith : ucrtbase: Correct day-of-week range for strftime.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: bb3c3e8fec616c31a8b7731c61a1ddff4379a77e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb3c3e8fec616c31a8b7731c… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 18:28:10 2019 -0600 ucrtbase: Correct day-of-week range for strftime. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 2 ++ dlls/ucrtbase/tests/misc.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 127a2164b8..84e725747f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1405,6 +1405,8 @@ static MSVCRT_size_t strftime_impl(STRFTIME_CHAR *str, MSVCRT_size_t max, return 0; break; case 'u': + if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6)) + goto einval_error; tmp = mstm->tm_wday ? mstm->tm_wday : 7; if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c242546a80..93a78a5de7 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -959,11 +959,11 @@ static void test_strftime(void) {"%#R", "0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%T", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#T", "0:0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, - {"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }, FALSE, TRUE}, + {"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }}, {"%u", "7", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, {"%u", "1", { 0, 0, 0, 1, 0, 117, 1, 0, 0 }}, {"%u", "6", { 0, 0, 0, 1, 0, 117, 6, 0, 0 }}, - {"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }, TRUE}, + {"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }}, {"%h", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%I", "", { 0, 0, -1, 1, 0, 70, 4, 0, 0 }}, {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},

1 0

Vijay Kiran Kamuju : tapi/tests: Add initial tests for lineInitialize.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 15e30b9c02cc9c031d5fe83c600aaf7999d2a339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e30b9c02cc9c031d5fe83c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Nov 16 22:52:28 2019 +0100 tapi/tests: Add initial tests for lineInitialize. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/tapi32/tests/Makefile.in | 5 ++++ dlls/tapi32/tests/tapi.c | 62 +++++++++++++++++++++++++++++++++++++++++++ include/tapi.h | 2 +- 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 22e0932b00..dc23826900 100755 --- a/configure +++ b/configure @@ -20841,6 +20841,7 @@ wine_fn_config_makefile dlls/system.drv16 enable_win16 wine_fn_config_makefile dlls/t2embed enable_t2embed wine_fn_config_makefile dlls/t2embed/tests enable_tests wine_fn_config_makefile dlls/tapi32 enable_tapi32 +wine_fn_config_makefile dlls/tapi32/tests enable_tests wine_fn_config_makefile dlls/taskschd enable_taskschd wine_fn_config_makefile dlls/taskschd/tests enable_tests wine_fn_config_makefile dlls/tdh enable_tdh diff --git a/configure.ac b/configure.ac index bbea41416a..fe2816ca7b 100644 --- a/configure.ac +++ b/configure.ac @@ -3696,6 +3696,7 @@ WINE_CONFIG_MAKEFILE(dlls/system.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/t2embed) WINE_CONFIG_MAKEFILE(dlls/t2embed/tests) WINE_CONFIG_MAKEFILE(dlls/tapi32) +WINE_CONFIG_MAKEFILE(dlls/tapi32/tests) WINE_CONFIG_MAKEFILE(dlls/taskschd) WINE_CONFIG_MAKEFILE(dlls/taskschd/tests) WINE_CONFIG_MAKEFILE(dlls/tdh) diff --git a/dlls/tapi32/tests/Makefile.in b/dlls/tapi32/tests/Makefile.in new file mode 100644 index 0000000000..126eed1c85 --- /dev/null +++ b/dlls/tapi32/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = tapi32.dll +IMPORTS = tapi32 + +C_SRCS = \ + tapi.c diff --git a/dlls/tapi32/tests/tapi.c b/dlls/tapi32/tests/tapi.c new file mode 100644 index 0000000000..13772c8c7d --- /dev/null +++ b/dlls/tapi32/tests/tapi.c @@ -0,0 +1,62 @@ +/* + * TAPI32 API tests + * + * Copyright 2019 Vijay Kiran Kamuju + * + * 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 <stdarg.h> + +#include "tapi.h" + +#include "wine/test.h" + +static void CALLBACK line_callback(DWORD hDev, DWORD dwMsg, DWORD_PTR dwInst, DWORD_PTR param1, DWORD_PTR param2, DWORD_PTR param3) +{ +} + +static void test_lineInitialize(void) +{ + ULONG ret; + DWORD dev; + HLINEAPP lnApp; + + ret = lineInitialize(NULL, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, NULL, NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), NULL, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, NULL); + todo_wine ok(ret == LINEERR_INVALPOINTER, "Expected return value LINEERR_INVALPOINTER, got %x.\n", ret); + + ret = lineInitialize(&lnApp, GetModuleHandleA(NULL), line_callback, NULL, &dev); + ok(!ret, "unexpected return value, got %u.\n", ret); + + ret = lineShutdown(NULL); + todo_wine ok(ret == LINEERR_INVALAPPHANDLE, "Expected return value LINEERR_INVALAPPHANDLE, got %x.\n", ret); + + ret = lineShutdown(lnApp); + ok(!ret, "unexpected return value, got %u.\n", ret); +} + +START_TEST(tapi) +{ + test_lineInitialize(); +} diff --git a/include/tapi.h b/include/tapi.h index 52ec619aef..535ca67a42 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -761,7 +761,7 @@ typedef struct linemessage_tag { DWORD_PTR dwParam3; } LINEMESSAGE, *LPLINEMESSAGE; -typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD, DWORD, DWORD, DWORD); +typedef void (CALLBACK *LINECALLBACK)(DWORD, DWORD, DWORD_PTR, DWORD_PTR, DWORD_PTR, DWORD_PTR); typedef struct _PHONEAPP { int dummy;

1 0

Conor McCarthy : winedbg: Use correct CALL operand size when fetching the delta.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: f9e1a8276433e3d50c2377c686f270884fd80719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e1a8276433e3d50c2377c6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Nov 23 01:15:55 2019 +1000 winedbg: Use correct CALL operand size when fetching the delta. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_x86_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 2346bc4d1f..5b95cefa36 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -356,14 +356,14 @@ static BOOL fetch_value(const char* addr, unsigned sz, int* value) switch (sz) { - case 8: + case 1: if (!dbg_read_memory(addr, &value8, sizeof(value8))) return FALSE; *value = value8; break; - case 16: + case 2: if (!dbg_read_memory(addr, &value16, sizeof(value16))) return FALSE; *value = value16; - case 32: + case 4: if (!dbg_read_memory(addr, value, sizeof(*value))) return FALSE; break; default: return FALSE;

1 0

Conor McCarthy : winedbg: Add support for x86_64 indirect function call targets.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 26df43d8ca8b38203bd52d6cabeb6c53bbf9c3c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26df43d8ca8b38203bd52d6c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Nov 23 01:15:56 2019 +1000 winedbg: Add support for x86_64 indirect function call targets. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_x86_64.c | 95 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 5b95cefa36..83cbb3c05c 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -269,6 +269,9 @@ static struct dbg_internal_var be_x86_64_ctx[] = #define f_mod(b) ((b)>>6) #define f_reg(b) (((b)>>3)&0x7) #define f_rm(b) ((b)&0x7) +#define f_sib_b(b) ((b)&0x7) +#define f_sib_i(b) (((b)>>3)&0x7) +#define f_sib_s(b) ((b)>>6) static BOOL be_x86_64_is_step_over_insn(const void* insn) { @@ -371,6 +374,81 @@ static BOOL fetch_value(const char* addr, unsigned sz, int* value) return TRUE; } +static BOOL add_fixed_displacement(const void* insn, BYTE mod, DWORD64* addr) +{ + LONG delta = 0; + + if (mod == 1) + { + if (!fetch_value(insn, 1, &delta)) + return FALSE; + } + else if (mod == 2) + { + if (!fetch_value(insn, sizeof(delta), &delta)) + return FALSE; + } + *addr += delta; + return TRUE; +} + +static BOOL evaluate_sib_address(const void* insn, BYTE mod, DWORD64* addr) +{ + BYTE ch; + BYTE scale; + DWORD64 loc; + + if (!dbg_read_memory(insn, &ch, sizeof(ch))) return FALSE; + + switch (f_sib_b(ch)) + { + case 0x00: loc = dbg_context.ctx.Rax; break; + case 0x01: loc = dbg_context.ctx.Rcx; break; + case 0x02: loc = dbg_context.ctx.Rdx; break; + case 0x03: loc = dbg_context.ctx.Rbx; break; + case 0x04: loc = dbg_context.ctx.Rsp; break; + case 0x05: + loc = dbg_context.ctx.Rbp; + if (mod == 0) + { + loc = 0; + mod = 2; + } + break; + case 0x06: loc = dbg_context.ctx.Rsi; break; + case 0x07: loc = dbg_context.ctx.Rdi; break; + } + + scale = f_sib_s(ch); + switch (f_sib_i(ch)) + { + case 0x00: loc += dbg_context.ctx.Rax << scale; break; + case 0x01: loc += dbg_context.ctx.Rcx << scale; break; + case 0x02: loc += dbg_context.ctx.Rdx << scale; break; + case 0x03: loc += dbg_context.ctx.Rbx << scale; break; + case 0x04: break; + case 0x05: loc += dbg_context.ctx.Rbp << scale; break; + case 0x06: loc += dbg_context.ctx.Rsi << scale; break; + case 0x07: loc += dbg_context.ctx.Rdi << scale; break; + } + + if (!add_fixed_displacement((const char*)insn + 1, mod, &loc)) + return FALSE; + + *addr = loc; + return TRUE; +} + +static BOOL load_indirect_target(DWORD64* dst) +{ + ADDRESS64 addr; + + addr.Mode = AddrModeFlat; + addr.Segment = dbg_context.ctx.SegDs; + addr.Offset = *dst; + return dbg_read_memory(memory_to_linear_addr(&addr), &dst, sizeof(dst)); +} + static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) { BYTE ch; @@ -418,8 +496,12 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) case 0x04: case 0x44: case 0x84: - WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) (SIB bytes) at %p\n", ch, insn); - return FALSE; + { + evaluate_sib_address((const char*)insn + 2, f_mod(ch), &dst); + if (!load_indirect_target(&dst)) return FALSE; + callee->Offset = dst; + return TRUE; + } case 0x05: /* addr32 */ if (f_reg(ch) == 0x2) { @@ -446,12 +528,13 @@ static BOOL be_x86_64_is_func_call(const void* insn, ADDRESS64* callee) case 0x07: dst = dbg_context.ctx.Rdi; break; } if (f_mod(ch) != 0x03) - WINE_FIXME("Unsupported yet call insn (0xFF 0x%02x) at %p\n", ch, insn); - else { - callee->Offset = dst; + if (!add_fixed_displacement((const char*)insn + 2, f_mod(ch), &dst)) + return FALSE; + if (!load_indirect_target(&dst)) return FALSE; } - break; + callee->Offset = dst; + return TRUE; } else WINE_FIXME("Unsupported yet call insn (rex=0x%02x 0xFF 0x%02x) at %p\n", rex, ch, insn);

1 0

Hans Leidekker : winhttp: Use wide character string literals.
by Alexandre Julliard 22 Nov '19

22 Nov '19

Module: wine Branch: master Commit: 5bf055a62d63bee2ab63f9f0359e129247965af4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bf055a62d63bee2ab63f9f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 22 16:32:24 2019 +0100 winhttp: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/request.c | 333 +++++++++++++++-------------------------- dlls/winhttp/session.c | 67 +++------ dlls/winhttp/url.c | 26 ++-- dlls/winhttp/winhttp_private.h | 8 - 5 files changed, 155 insertions(+), 285 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bf055a62d63bee2ab63…

1 0