wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Hugh McMaster : regedit/tests: Test whether registry keys ending with trailing backslashes are imported and created.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 506d4fd052aeb2d877c74110337a4b58068d94dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=506d4fd052aeb2d877c741103… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:51 2017 +0000 regedit/tests: Test whether registry keys ending with trailing backslashes are imported and created. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 41 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e85e2a7..b6f1a2e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1488,7 +1488,7 @@ static void test_import_with_whitespace(void) static void test_key_creation_and_deletion(void) { - HKEY hkey; + HKEY hkey, subkey; LONG lr; exec_import_str("REGEDIT4\n\n" @@ -1526,6 +1526,45 @@ static void test_key_creation_and_deletion(void) lr = RegDeleteKeyA(hkey, "Subkey1d\t"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n"); + verify_key(hkey, "Subkey1e\\"); + verify_key(hkey, "Subkey1e"); + lr = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + lr = RegDeleteKeyA(hkey, "Subkey1e"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n"); + verify_key(hkey, "Subkey1f\\\\"); + verify_key(hkey, "Subkey1f\\"); + verify_key(hkey, "Subkey1f"); + lr = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + lr = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n"); + verify_key(hkey, "Subkey1g\\\\\\\\"); + verify_key(hkey, "Subkey1g\\\\"); + verify_key(hkey, "Subkey1g\\"); + verify_key(hkey, "Subkey1g"); + lr = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", lr); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + lr = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", lr); + /* Test key deletion. We start by creating some registry keys. */ exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n"

1 0

Hugh McMaster : reg/tests: Test whether the "0x" prefix is valid when importing hex data.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 554d996c01fc54a000580d1dd899ebf336255ead URL: http://source.winehq.org/git/wine.git/?a=commit;h=554d996c01fc54a000580d1dd… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:42 2017 +0000 reg/tests: Test whether the "0x" prefix is valid when importing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0c17f37..7906f8d 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1782,7 +1782,9 @@ static void test_import(void) "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" - "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n" + "\"Wine47j\"=hex(0x2):56,61,6c,75,65,00\n" + "\"Wine47k\"=hex(x2)::56,61,6c,75,65,00\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); @@ -1793,6 +1795,8 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg_nonexist(hkey, "Wine47i"); + todo_wine verify_reg_nonexist(hkey, "Wine47j"); + todo_wine verify_reg_nonexist(hkey, "Wine47k"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3116,7 +3120,9 @@ static void test_unicode_import(void) "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" - "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n" + "\"Wine47j\"=hex(0x2):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine47k\"=hex(x2):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); @@ -3127,6 +3133,8 @@ static void test_unicode_import(void) todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg_nonexist(hkey, "Wine47i"); + todo_wine verify_reg_nonexist(hkey, "Wine47j"); + todo_wine verify_reg_nonexist(hkey, "Wine47k"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Test whether registry keys ending with trailing backslashes are imported and created.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: c50a1d9431deb759d45a542b7ff3ac90bc941879 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c50a1d9431deb759d45a542b7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:45:34 2017 +0000 reg/tests: Test whether registry keys ending with trailing backslashes are imported and created. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 316a3f6..0c17f37 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1645,6 +1645,48 @@ static void test_import(void) err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1e\\"); + todo_wine verify_key(hkey, "Subkey1e"); + err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1e"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1f\\\\"); + todo_wine verify_key(hkey, "Subkey1f\\"); + todo_wine verify_key(hkey, "Subkey1f"); + err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1g\\\\\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\"); + todo_wine verify_key(hkey, "Subkey1g"); + err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + /* Test key deletion. We start by creating some registry keys. */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -2936,6 +2978,48 @@ static void test_unicode_import(void) todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1e\\"); + todo_wine verify_key(hkey, "Subkey1e"); + err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1e"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1f\\\\"); + todo_wine verify_key(hkey, "Subkey1f\\"); + todo_wine verify_key(hkey, "Subkey1f"); + err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(hkey, "Subkey1g\\\\\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\\\"); + todo_wine verify_key(hkey, "Subkey1g\\"); + todo_wine verify_key(hkey, "Subkey1g"); + err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + todo_wine verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + /* Test key deletion. We start by creating some registry keys. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n"

1 0

Nikolay Sivov : d3drm: Store face color.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 88220785b3daf1cfda1bd7e5cb3eb58e84e7da23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88220785b3daf1cfda1bd7e5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 4 10:43:12 2017 +0300 d3drm: Store face color. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/face.c | 72 ++++++++++++++++++++++++++++------------------ dlls/d3drm/tests/d3drm.c | 12 ++++++++ 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index e3ee75a..1ce29e5 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -120,6 +120,7 @@ struct d3drm_face IDirect3DRMFace IDirect3DRMFace_iface; IDirect3DRMFace2 IDirect3DRMFace2_iface; LONG ref; + D3DCOLOR color; }; struct d3drm_mesh_builder diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c index 49284f0..95e6e58 100644 --- a/dlls/d3drm/face.c +++ b/dlls/d3drm/face.c @@ -214,19 +214,45 @@ static HRESULT WINAPI d3drm_face1_AddVertexAndNormalIndexed(IDirect3DRMFace *ifa return E_NOTIMPL; } +static HRESULT WINAPI d3drm_face2_SetColorRGB(IDirect3DRMFace2 *iface, D3DVALUE red, D3DVALUE green, D3DVALUE blue) +{ + struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); + + TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); + + d3drm_set_color(&face->color, red, green, blue, 1.0f); + + return D3DRM_OK; +} + static HRESULT WINAPI d3drm_face1_SetColorRGB(IDirect3DRMFace *iface, - D3DVALUE r, D3DVALUE g, D3DVALUE b) + D3DVALUE red, D3DVALUE green, D3DVALUE blue) { - FIXME("iface %p, r %.8e, g %.8e, b %.8e stub!\n", iface, r, g, b); + struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); - return E_NOTIMPL; + TRACE("iface %p, red %.8e, green %.8e, blue %.8e.\n", iface, red, green, blue); + + return d3drm_face2_SetColorRGB(&face->IDirect3DRMFace2_iface, red, green, blue); +} + +static HRESULT WINAPI d3drm_face2_SetColor(IDirect3DRMFace2 *iface, D3DCOLOR color) +{ + struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); + + TRACE("iface %p, color 0x%08x.\n", iface, color); + + face->color = color; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_face1_SetColor(IDirect3DRMFace *iface, D3DCOLOR color) { - FIXME("iface %p, color 0x%08x stub!\n", iface, color); + struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); - return E_NOTIMPL; + TRACE("iface %p, color 0x%08x.\n", iface, color); + + return d3drm_face2_SetColor(&face->IDirect3DRMFace2_iface, color); } static HRESULT WINAPI d3drm_face1_SetTexture(IDirect3DRMFace *iface, IDirect3DRMTexture *texture) @@ -332,11 +358,22 @@ static int WINAPI d3drm_face1_GetTextureCoordinateIndex(IDirect3DRMFace *iface, return 0; } +static D3DCOLOR WINAPI d3drm_face2_GetColor(IDirect3DRMFace2 *iface) +{ + struct d3drm_face *face = impl_from_IDirect3DRMFace2(iface); + + TRACE("iface %p.\n", iface); + + return face->color; +} + static D3DCOLOR WINAPI d3drm_face1_GetColor(IDirect3DRMFace *iface) { - FIXME("iface %p stub!\n", iface); + struct d3drm_face *face = impl_from_IDirect3DRMFace(iface); - return 0; + TRACE("iface %p.\n", iface); + + return d3drm_face2_GetColor(&face->IDirect3DRMFace2_iface); } static const struct IDirect3DRMFaceVtbl d3drm_face1_vtbl = @@ -446,20 +483,6 @@ static HRESULT WINAPI d3drm_face2_AddVertexAndNormalIndexed(IDirect3DRMFace2 *if return E_NOTIMPL; } -static HRESULT WINAPI d3drm_face2_SetColorRGB(IDirect3DRMFace2 *iface, D3DVALUE r, D3DVALUE g, D3DVALUE b) -{ - FIXME("iface %p, r %.8e, g %.8e, b %.8e stub!\n", iface, r, g, b); - - return E_NOTIMPL; -} - -static HRESULT WINAPI d3drm_face2_SetColor(IDirect3DRMFace2 *iface, D3DCOLOR color) -{ - FIXME("iface %p, color 0x%08x stub!\n", iface, color); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3drm_face2_SetTexture(IDirect3DRMFace2 *iface, IDirect3DRMTexture3 *texture) { FIXME("iface %p, texture %p stub!\n", iface, texture); @@ -563,13 +586,6 @@ static int WINAPI d3drm_face2_GetTextureCoordinateIndex(IDirect3DRMFace2 *iface, return 0; } -static D3DCOLOR WINAPI d3drm_face2_GetColor(IDirect3DRMFace2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return 0; -} - static const struct IDirect3DRMFace2Vtbl d3drm_face2_vtbl = { d3drm_face2_QueryInterface, diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5cccb43..5fea2f0 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -781,6 +781,7 @@ static void test_Face(void) IDirect3DRMFaceArray *array1; D3DRMLOADMEMORY info; D3DVECTOR v1[4], n1[4], v2[4], n2[4]; + D3DCOLOR color; DWORD count; int icount; @@ -963,6 +964,17 @@ static void test_Face(void) IDirect3DRMFaceArray_Release(array1); } + /* Setting face color. */ + hr = IDirect3DRMFace2_SetColor(face2, 0x1f180587); + ok(SUCCEEDED(hr), "Failed to set face color, hr %#x.\n", hr); + color = IDirect3DRMFace2_GetColor(face2); + ok(color == 0x1f180587, "Unexpected color %8x.\n", color); + + hr = IDirect3DRMFace2_SetColorRGB(face2, 0.5f, 0.5f, 0.5f); + ok(SUCCEEDED(hr), "Failed to set color, hr %#x.\n", hr); + color = IDirect3DRMFace2_GetColor(face2); + ok(color == 0xff7f7f7f, "Unexpected color %8x.\n", color); + IDirect3DRMFace2_Release(face2); IDirect3DRMMeshBuilder3_Release(MeshBuilder3); IDirect3DRM3_Release(d3drm3);

1 0

Nikolay Sivov : d3drm: Store frame traversal options.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 3276e7eebe83c55846a6769c48c01be2b6d97e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3276e7eebe83c55846a6769c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 4 10:43:11 2017 +0300 d3drm: Store frame traversal options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/frame.c | 28 ++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index e4ffd2b..e3ee75a 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -76,6 +76,7 @@ struct d3drm_frame IDirect3DRMLight **lights; D3DRMMATRIX4D transform; D3DCOLOR scenebackground; + DWORD traversal_options; }; struct d3drm_viewport diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index a2643fb..f6b0a1f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2666,18 +2666,33 @@ static HRESULT WINAPI d3drm_frame3_InverseTransformVectors(IDirect3DRMFrame3 *if return E_NOTIMPL; } -static HRESULT WINAPI d3drm_frame3_SetTraversalOptions(IDirect3DRMFrame3 *iface, DWORD flags) +static HRESULT WINAPI d3drm_frame3_SetTraversalOptions(IDirect3DRMFrame3 *iface, DWORD options) { - FIXME("iface %p, flags %#x stub!\n", iface, flags); + static const DWORD supported_options = D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE; + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, options %#x.\n", iface, options); + + if (options & ~supported_options) + return D3DRMERR_BADVALUE; + + frame->traversal_options = options; + + return D3DRM_OK; } -static HRESULT WINAPI d3drm_frame3_GetTraversalOptions(IDirect3DRMFrame3 *iface, DWORD *flags) +static HRESULT WINAPI d3drm_frame3_GetTraversalOptions(IDirect3DRMFrame3 *iface, DWORD *options) { - FIXME("iface %p, flags %p stub!\n", iface, flags); + struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); - return E_NOTIMPL; + TRACE("iface %p, options %p.\n", iface, options); + + if (!options) + return D3DRMERR_BADVALUE; + + *options = frame->traversal_options; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_frame3_SetSceneFogMethod(IDirect3DRMFrame3 *iface, DWORD flags) @@ -2991,6 +3006,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I object->d3drm = d3drm; object->ref = 1; d3drm_set_color(&object->scenebackground, 0.0f, 0.0f, 0.0f, 1.0f); + object->traversal_options = D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE; d3drm_object_init(&object->obj, classname); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 3613b57..5cccb43 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -987,9 +987,10 @@ static void test_Frame(void) IDirect3DRMLight *light1; IDirect3DRMLight *light_tmp; IDirect3DRMLightArray *light_array; + IDirect3DRMFrame3 *frame3; + DWORD count, options; ULONG ref, ref2; D3DCOLOR color; - DWORD count; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -1315,6 +1316,42 @@ static void test_Frame(void) color = IDirect3DRMFrame_GetSceneBackground(pFrameP1); ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + /* Traversal options. */ + hr = IDirect3DRMFrame_QueryInterface(pFrameP2, &IID_IDirect3DRMFrame3, (void **)&frame3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3 interface, hr %#x.\n", hr); + + hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = 0; + hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options); + ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr); + ok(options == (D3DRMFRAME_RENDERENABLE | D3DRMFRAME_PICKENABLE), "Unexpected default options %#x.\n", options); + + hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0); + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, 0xf0000000 | D3DRMFRAME_PICKENABLE); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + options = 0xf; + hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options); + ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr); + ok(options == 0, "Unexpected traversal options %#x.\n", options); + + hr = IDirect3DRMFrame3_SetTraversalOptions(frame3, D3DRMFRAME_PICKENABLE); + ok(SUCCEEDED(hr), "Failed to set traversal options, hr %#x.\n", hr); + + options = 0; + hr = IDirect3DRMFrame3_GetTraversalOptions(frame3, &options); + ok(SUCCEEDED(hr), "Failed to get traversal options, hr %#x.\n", hr); + ok(options == D3DRMFRAME_PICKENABLE, "Unexpected traversal options %#x.\n", options); + + IDirect3DRMFrame3_Release(frame3); + /* Cleanup */ IDirect3DRMFrame_Release(pFrameP2); CHECK_REFCOUNT(pFrameC, 1);

1 0

Jactry Zeng : ucrtbase: Implement wcstoull and _wcstoull_l.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: ca7ef97994ac96b1b4ab5586cc8ba414dc7cdec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7ef97994ac96b1b4ab5586c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jul 3 14:11:20 2017 +0800 ucrtbase: Implement wcstoull and _wcstoull_l. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index 29b7a4c..e055c21 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -63,7 +63,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) ucrtbase._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) ucrtbase._wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) ucrtbase._wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) ucrtbase._wcstoull_l @ stub _wcstoumax_l @ cdecl _wctomb_l(ptr long ptr) ucrtbase._wctomb_l @ cdecl _wctomb_s_l(ptr ptr long long ptr) ucrtbase._wctomb_s_l @@ -114,7 +114,7 @@ @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s @ cdecl wcstoul(wstr ptr long) ucrtbase.wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) ucrtbase.wcstoull @ stub wcstoumax @ cdecl wctob(long) ucrtbase.wctob @ cdecl wctomb(ptr long) ucrtbase.wctomb diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5a2f9c9..15cfe60 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1900,7 +1900,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ stub _wcstoumax_l @ cdecl _wcsupr(wstr) ntdll._wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @@ -2480,7 +2480,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) MSVCRT__wcstoui64 @ stub wcstoumax @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 5c6093c..9690d4d 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1593,7 +1593,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcr120._wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcr120._wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) msvcr120._wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) msvcr120._wcstoull_l @ stub _wcstoumax_l @ cdecl _wcsupr(wstr) msvcr120._wcsupr @ cdecl _wcsupr_l(wstr ptr) msvcr120._wcsupr_l @@ -2142,7 +2142,7 @@ @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcr120.wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) msvcr120.wcstoull @ stub wcstoumax @ cdecl wcsxfrm(ptr wstr long) msvcr120.wcsxfrm @ cdecl wctob(long) msvcr120.wctob diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5d13712..a27a2c6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2049,7 +2049,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ stub _wcstoull_l +@ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ stub _wcstoumax_l @ cdecl _wcsupr(wstr) ntdll._wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @@ -2587,7 +2587,7 @@ @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -@ stub wcstoull +@ cdecl -ret64 wcstoull(wstr ptr long) MSVCRT__wcstoui64 @ stub wcstoumax @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm @ cdecl wctob(long) MSVCRT_wctob

1 0

Alistair Leslie-Hughes : msvcp120/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 4eb71bc33ad5ea02126910d5572627bd166e00b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb71bc33ad5ea02126910d55… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:28 2017 +0000 msvcp120/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 52 +++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index d70c0df..0e3293f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -130,16 +130,6 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__setmbcp)(int); static int (__cdecl *p_isleadbyte)(int); @@ -899,27 +889,27 @@ static void test_tr2_sys__File_size(void) ok(SetEndOfFile(file), "SetEndOfFile failed\n"); CloseHandle(file); val = p_tr2_sys__File_size("tr2_test_dir/f1"); - ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); + ok(val == 7, "file_size is %s\n", wine_dbgstr_longlong(val)); val = p_tr2_sys__File_size_wchar(testW); - ok(val == 7, "file_size is %s\n", debugstr_longlong(val)); + ok(val == 7, "file_size is %s\n", wine_dbgstr_longlong(val)); file = CreateFileA("tr2_test_dir/f2", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); CloseHandle(file); val = p_tr2_sys__File_size("tr2_test_dir/f2"); - ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); val = p_tr2_sys__File_size("tr2_test_dir"); - ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); errno = 0xdeadbeef; val = p_tr2_sys__File_size("tr2_test_dir/not_exists_file"); - ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; val = p_tr2_sys__File_size(NULL); - ok(val == 0, "file_size is %s\n", debugstr_longlong(val)); + ok(val == 0, "file_size is %s\n", wine_dbgstr_longlong(val)); ok(errno == 0xdeadbeef, "errno = %d\n", errno); ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); @@ -1238,8 +1228,8 @@ static void test_tr2_sys__Rename(void) CloseHandle(file); ret = p_tr2_sys__Rename("tr2_test_dir\\f1", "tr2_test_dir\\f1_rename"); ok(ret == ERROR_ALREADY_EXISTS, "test_tr2_sys__Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); - ok(p_tr2_sys__File_size("tr2_test_dir\\f1") == 7, "test_tr2_sys__Rename(): expect: 7, got %s\n", debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1"))); - ok(p_tr2_sys__File_size("tr2_test_dir\\f1_rename") == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n",debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1_rename"))); + ok(p_tr2_sys__File_size("tr2_test_dir\\f1") == 7, "test_tr2_sys__Rename(): expect: 7, got %s\n", wine_dbgstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1"))); + ok(p_tr2_sys__File_size("tr2_test_dir\\f1_rename") == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n",wine_dbgstr_longlong(p_tr2_sys__File_size("tr2_test_dir\\f1_rename"))); ret = p_tr2_sys__Rename_wchar(testW, testW2); ok(ret == ERROR_SUCCESS, "tr2_sys__Rename_wchar(): expect: ERROR_SUCCESS, got %d\n", ret); @@ -1270,19 +1260,19 @@ static void test_tr2_sys__Statvfs(void) p_tr2_sys__Statvfs(&info, NULL); ok(info.available == 0, "test_tr2_sys__Statvfs(): info.available expect: %d, got %s\n", - 0, debugstr_longlong(info.available)); + 0, wine_dbgstr_longlong(info.available)); ok(info.capacity == 0, "test_tr2_sys__Statvfs(): info.capacity expect: %d, got %s\n", - 0, debugstr_longlong(info.capacity)); + 0, wine_dbgstr_longlong(info.capacity)); ok(info.free == 0, "test_tr2_sys__Statvfs(): info.free expect: %d, got %s\n", - 0, debugstr_longlong(info.free)); + 0, wine_dbgstr_longlong(info.free)); p_tr2_sys__Statvfs(&info, "not_exist"); ok(info.available == 0, "test_tr2_sys__Statvfs(): info.available expect: %d, got %s\n", - 0, debugstr_longlong(info.available)); + 0, wine_dbgstr_longlong(info.available)); ok(info.capacity == 0, "test_tr2_sys__Statvfs(): info.capacity expect: %d, got %s\n", - 0, debugstr_longlong(info.capacity)); + 0, wine_dbgstr_longlong(info.capacity)); ok(info.free == 0, "test_tr2_sys__Statvfs(): info.free expect: %d, got %s\n", - 0, debugstr_longlong(info.free)); + 0, wine_dbgstr_longlong(info.free)); } static void test_tr2_sys__Stat(void) @@ -1395,14 +1385,14 @@ static void test_tr2_sys__Last_write_time(void) p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); todo_wine ok(last_write_time == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), "last_write_time should have changed: %s\n", - debugstr_longlong(last_write_time)); + wine_dbgstr_longlong(last_write_time)); errno = 0xdeadbeef; last_write_time = p_tr2_sys__Last_write_time("not_exist"); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); - ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + ok(last_write_time == 0, "expect 0 got %s\n", wine_dbgstr_longlong(last_write_time)); last_write_time = p_tr2_sys__Last_write_time(NULL); - ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + ok(last_write_time == 0, "expect 0 got %s\n", wine_dbgstr_longlong(last_write_time)); p_tr2_sys__Last_write_time_set("not_exist", newtime); errno = 0xdeadbeef; @@ -1559,8 +1549,8 @@ static void test_tr2_sys__Link(void) ok(DeleteFileA("f1"), "expect f1 to exist\n"); ok(p_tr2_sys__File_size("f1_link") == p_tr2_sys__File_size("tr2_test_dir/f1_link") && p_tr2_sys__File_size("tr2_test_dir/f1_link") == p_tr2_sys__File_size("tr2_test_dir/f1_link_link"), - "tr2_sys__Link(): expect links' size are equal, got %s\n", debugstr_longlong(p_tr2_sys__File_size("tr2_test_dir/f1_link_link"))); - ok(p_tr2_sys__File_size("f1_link") == 7, "tr2_sys__Link(): expect f1_link's size equals to 7, got %s\n", debugstr_longlong(p_tr2_sys__File_size("f1_link"))); + "tr2_sys__Link(): expect links' size are equal, got %s\n", wine_dbgstr_longlong(p_tr2_sys__File_size("tr2_test_dir/f1_link_link"))); + ok(p_tr2_sys__File_size("f1_link") == 7, "tr2_sys__Link(): expect f1_link's size equals to 7, got %s\n", wine_dbgstr_longlong(p_tr2_sys__File_size("f1_link"))); file = CreateFileA("f1_link", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); @@ -1581,7 +1571,7 @@ static void test_tr2_sys__Link(void) ok(info1.nFileIndexHigh == info2.nFileIndexHigh && info1.nFileIndexLow == info2.nFileIndexLow, "tr2_sys__Link(): test %d expect two files equivalent\n", i+1); - ok(p_tr2_sys__File_size("f1_link") == 20, "tr2_sys__Link(): expect f1_link's size equals to 20, got %s\n", debugstr_longlong(p_tr2_sys__File_size("f1_link"))); + ok(p_tr2_sys__File_size("f1_link") == 20, "tr2_sys__Link(): expect f1_link's size equals to 20, got %s\n", wine_dbgstr_longlong(p_tr2_sys__File_size("f1_link"))); ok(DeleteFileA("f1_link"), "expect f1_link to exist\n"); ok(DeleteFileA("tr2_test_dir/f1_link"), "expect tr2_test_dir/f1_link to exist\n"); @@ -1637,7 +1627,7 @@ static void test_tr2_sys__Symlink(void) todo_wine_if(tests[i].is_todo) ok(ret == tests[i].last_error, "tr2_sys__Symlink(): test %d expect: %d, got %d\n", i+1, tests[i].last_error, ret); if(ret == ERROR_SUCCESS) - ok(p_tr2_sys__File_size(tests[i].new_path) == 0, "tr2_sys__Symlink(): expect 0, got %s\n", debugstr_longlong(p_tr2_sys__File_size(tests[i].new_path))); + ok(p_tr2_sys__File_size(tests[i].new_path) == 0, "tr2_sys__Symlink(): expect 0, got %s\n", wine_dbgstr_longlong(p_tr2_sys__File_size(tests[i].new_path))); } ok(DeleteFileA("f1"), "expect f1 to exist\n");

1 0

Alistair Leslie-Hughes : msvcp60/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 8332f9b762336a469c70d020a7fc80830d87967b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8332f9b762336a469c70d020a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:01 2017 +0000 msvcp60/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index a79d51b..087aa2c 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -480,19 +480,6 @@ static basic_string_wchar* (__thiscall *p_basic_string_wchar_ctor_cstr_alloc)(ba static const wchar_t* (__thiscall *p_basic_string_wchar_cstr)(basic_string_wchar*); static void (__thiscall *p_basic_string_wchar_dtor)(basic_string_wchar*); -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - /* return a different string if called up to 4 times in the same ok() */ - static char string[4][17]; - static int which; - - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string[which & 3], "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string[which & 3], "%lx", (unsigned long)ll); - return string[which++ & 3]; -} - /* Emulate a __thiscall */ #ifdef __i386__ @@ -1439,7 +1426,7 @@ static void test_istream_tellg(void) ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", debugstr_longlong(tpos.pos)); + ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -1464,7 +1451,7 @@ static void test_istream_tellg(void) ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", debugstr_longlong(tpos.pos)); + ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); @@ -1491,7 +1478,7 @@ static void test_istream_tellg(void) rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", - debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); + wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1514,7 +1501,7 @@ static void test_istream_tellg(void) rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", - debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); + wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);

1 0

Alistair Leslie-Hughes : msvcp90/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: c36987fa7619c4e318fdc07ee0d88585dbb944fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36987fa7619c4e318fdc07ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 29 00:44:16 2017 +0000 msvcp90/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/ios.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 91c546e..c1d6589 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -531,19 +531,6 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, invalid_parameter++; } -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - /* return a different string if called up to 4 times in the same ok() */ - static char string[4][17]; - static int which; - - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string[which & 3], "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string[which & 3], "%lx", (unsigned long)ll); - return string[which++ & 3]; -} - /* Emulate a __thiscall */ #ifdef __i386__ @@ -1839,7 +1826,7 @@ static void test_istream_tellg(void) if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ ok(spos.off == tpos.off, "tell doesn't match seek, seek = %ld tell = %ld\n", spos.off, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", debugstr_longlong(tpos.pos)); + ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_stringstream_char_vbase_dtor, &ss); @@ -1866,7 +1853,7 @@ static void test_istream_tellg(void) if (tests[i].telloff_ss != -1 && spos.off != -1) /* check if tell == seek but only if not hit EOF */ ok(spos.off == tpos.off, "tell doesn't match seek, seek = %ld tell = %ld\n", spos.off, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); - ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", debugstr_longlong(tpos.pos)); + ok(tpos.pos == 0, "wrong position, expected = 0 found = %s\n", wine_dbgstr_longlong(tpos.pos)); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); @@ -1893,7 +1880,7 @@ static void test_istream_tellg(void) rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", - debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); + wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state); @@ -1916,7 +1903,7 @@ static void test_istream_tellg(void) rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", - debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); + wine_dbgstr_longlong(tests[i].tellpos), wine_dbgstr_longlong(tpos.pos)); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); ok(tpos.off == tests[i].telloff_fs, "wrong offset, expected %ld found %ld\n", tests[i].telloff_fs, tpos.off); ok(tpos.state == 0, "wrong state, expected = 0 found = %d\n", tpos.state);

1 0

Alistair Leslie-Hughes : msvcp110/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 04 Jul '17

04 Jul '17

Module: wine Branch: master Commit: 542126db3044b6675c7567e0af79aa8c859c9989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542126db3044b6675c7567e0a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 3 22:29:20 2017 +0000 msvcp110/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp110/tests/msvcp110.c b/dlls/msvcp110/tests/msvcp110.c index 500d3cb..36e929f 100644 --- a/dlls/msvcp110/tests/msvcp110.c +++ b/dlls/msvcp110/tests/msvcp110.c @@ -30,16 +30,6 @@ typedef unsigned char MSVCP_bool; #define TICKSPERSEC 10000000 #define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) -static inline const char* debugstr_longlong(ULONGLONG ll) -{ - static char string[17]; - if (sizeof(ll) > sizeof(unsigned long) && ll >> 32) - sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll); - else - sprintf(string, "%lx", (unsigned long)ll); - return string; -} - static int (__cdecl *p_tr2_sys__Make_dir)(char const*); static MSVCP_bool (__cdecl *p_tr2_sys__Remove_dir)(char const*); static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); @@ -96,7 +86,7 @@ static void test_tr2_sys__Last_write_time(void) p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); ok(last_write_time != p_tr2_sys__Last_write_time("tr2_test_dir/f1"), "last_write_time should have changed: %s\n", - debugstr_longlong(last_write_time)); + wine_dbgstr_longlong(last_write_time)); /* test the formula */ file = CreateFileA("tr2_test_dir/f1", 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -108,7 +98,7 @@ static void test_tr2_sys__Last_write_time(void) last_write_time -= TICKS_1601_TO_1970; last_write_time /= TICKSPERSEC; ok(newtime-margin_of_error<=last_write_time && last_write_time<=newtime+margin_of_error, - "don't fit the formula, last_write_time is %s\n", debugstr_longlong(last_write_time)); + "don't fit the formula, last_write_time is %s\n", wine_dbgstr_longlong(last_write_time)); newtime = 0; p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); @@ -122,7 +112,7 @@ static void test_tr2_sys__Last_write_time(void) last_write_time -= TICKS_1601_TO_1970; last_write_time /= TICKSPERSEC; ok(newtime-margin_of_error<=last_write_time && last_write_time<=newtime+margin_of_error, - "don't fit the formula, last_write_time is %s\n", debugstr_longlong(last_write_time)); + "don't fit the formula, last_write_time is %s\n", wine_dbgstr_longlong(last_write_time)); newtime = 123456789; p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); @@ -136,14 +126,14 @@ static void test_tr2_sys__Last_write_time(void) last_write_time -= TICKS_1601_TO_1970; last_write_time /= TICKSPERSEC; ok(newtime-margin_of_error<=last_write_time && last_write_time<=newtime+margin_of_error, - "don't fit the formula, last_write_time is %s\n", debugstr_longlong(last_write_time)); + "don't fit the formula, last_write_time is %s\n", wine_dbgstr_longlong(last_write_time)); errno = 0xdeadbeef; last_write_time = p_tr2_sys__Last_write_time("not_exist"); ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); - ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + ok(last_write_time == 0, "expect 0 got %s\n", wine_dbgstr_longlong(last_write_time)); last_write_time = p_tr2_sys__Last_write_time(NULL); - ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + ok(last_write_time == 0, "expect 0 got %s\n", wine_dbgstr_longlong(last_write_time)); p_tr2_sys__Last_write_time_set("not_exist", newtime); errno = 0xdeadbeef;

1 0

← Newer
1
...
56
57
58
59
60
61
62
63
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017