June 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : d3drm: Store animated frame pointer in animation object.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 9b35d5c6d47d1956ff687c5f4440876e03266b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b35d5c6d47d1956ff687c5f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 27 11:17:11 2017 +0300 d3drm: Store animated frame pointer in animation object. 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 | 37 +++++++++++++++++++++++++++++++------ dlls/d3drm/tests/d3drm.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index f2a6131..802a171 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -213,6 +213,7 @@ struct d3drm_animation IDirect3DRMAnimation IDirect3DRMAnimation_iface; LONG ref; IDirect3DRM *d3drm; + IDirect3DRMFrame3 *frame; }; struct d3drm_wrap diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 5969b50..c95c5df 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -3277,9 +3277,21 @@ static HRESULT WINAPI d3drm_animation1_DeleteKey(IDirect3DRMAnimation *iface, D3 static HRESULT WINAPI d3drm_animation1_SetFrame(IDirect3DRMAnimation *iface, IDirect3DRMFrame *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation(iface); + HRESULT hr = D3DRM_OK; - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (frame) + { + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&animation->frame); + if (SUCCEEDED(hr)) + IDirect3DRMFrame3_Release(animation->frame); + } + else + animation->frame = NULL; + + return hr; } static HRESULT WINAPI d3drm_animation1_SetTime(IDirect3DRMAnimation *iface, D3DVALUE time) @@ -3335,9 +3347,13 @@ static HRESULT WINAPI d3drm_animation2_DeleteKey(IDirect3DRMAnimation2 *iface, D static HRESULT WINAPI d3drm_animation2_SetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 *frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + animation->frame = frame; + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_SetTime(IDirect3DRMAnimation2 *iface, D3DVALUE time) @@ -3356,9 +3372,18 @@ static D3DRMANIMATIONOPTIONS WINAPI d3drm_animation2_GetOptions(IDirect3DRMAnima static HRESULT WINAPI d3drm_animation2_GetFrame(IDirect3DRMAnimation2 *iface, IDirect3DRMFrame3 **frame) { - FIXME("iface %p, frame %p.\n", iface, frame); + struct d3drm_animation *animation = impl_from_IDirect3DRMAnimation2(iface); - return E_NOTIMPL; + TRACE("iface %p, frame %p.\n", iface, frame); + + if (!frame) + return D3DRMERR_BADVALUE; + + *frame = animation->frame; + if (*frame) + IDirect3DRMFrame3_AddRef(*frame); + + return D3DRM_OK; } static HRESULT WINAPI d3drm_animation2_DeleteKeyByID(IDirect3DRMAnimation2 *iface, DWORD id) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ff1aadd..051f8cb 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6707,6 +6707,8 @@ static void test_animation(void) IDirect3DRMAnimation2 *animation2; IDirect3DRMAnimation *animation; IDirect3DRMObject *obj, *obj2; + IDirect3DRMFrame3 *frame3; + IDirect3DRMFrame *frame; IDirect3DRM *d3drm1; HRESULT hr; @@ -6738,6 +6740,42 @@ static void test_animation(void) IDirect3DRMObject_Release(obj); IDirect3DRMObject_Release(obj2); + /* Set animated frame, get it back. */ + hr = IDirect3DRM_CreateFrame(d3drm1, NULL, &frame); + ok(SUCCEEDED(hr), "Failed to create a frame, hr %#x.\n", hr); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame, 1); + hr = IDirect3DRMAnimation_SetFrame(animation, frame); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame, 1); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, NULL); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DRMAnimation2_GetFrame(animation2, &frame3); + ok(SUCCEEDED(hr), "Failed to get the frame, %#x.\n", hr); + ok(frame3 != (void *)frame, "Unexpected interface pointer.\n"); + CHECK_REFCOUNT(frame, 2); + + IDirect3DRMFrame3_Release(frame3); + + hr = IDirect3DRMAnimation_SetFrame(animation, NULL); + ok(SUCCEEDED(hr), "Failed to reset frame, hr %#x.\n", hr); + + hr = IDirect3DRMFrame_QueryInterface(frame, &IID_IDirect3DRMFrame3, (void **)&frame3); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMFrame3, hr %#x.\n", hr); + + CHECK_REFCOUNT(frame3, 2); + hr = IDirect3DRMAnimation2_SetFrame(animation2, frame3); + ok(SUCCEEDED(hr), "Failed to set a frame, hr %#x.\n", hr); + CHECK_REFCOUNT(frame3, 2); + + IDirect3DRMFrame3_Release(frame3); + IDirect3DRMFrame_Release(frame); + IDirect3DRMAnimation2_Release(animation2); IDirect3DRMAnimation_Release(animation);

1 0

Alistair Leslie-Hughes : dsound: Free MMDevice on Release.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: a731eaa705dc844f484f4e8153e73ddb9dcade52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a731eaa705dc844f484f4e815… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jun 25 10:42:46 2017 +0000 dsound: Free MMDevice on Release. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e8c10a7..a8b20b1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -232,7 +232,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device) IAudioRenderClient_Release(device->render); if(device->volume) IAudioStreamVolume_Release(device->volume); - + if(device->mmdevice) + IMMDevice_Release(device->mmdevice); HeapFree(GetProcessHeap(), 0, device->tmp_buffer); HeapFree(GetProcessHeap(), 0, device->cp_buffer); HeapFree(GetProcessHeap(), 0, device->buffer);

1 0

Hugh McMaster : regedit/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: a9726d0b902e3d48b7c1c96029a2a7fe891f6af2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9726d0b902e3d48b7c1c9602… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:31:15 2017 +0000 regedit/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index ba372b4..c293f4a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1001,6 +1001,17 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine28e"); verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, TODO_REG_DATA); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine29a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine29b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine29a"); + todo_wine verify_reg_nonexist(hkey, "Wine29b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 3d47e94f44817a58693678b72aa33166f38cd1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d47e94f44817a58693678b72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:48 2017 +0000 reg/tests: Test whether EOF invalidates a hex data line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9735f59..8d9dbfa 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2073,6 +2073,22 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine61a"); todo_wine verify_reg_nonexist(hkey, "Wine61b"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,69,6e,65,20\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3331,6 +3347,22 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine61a"); todo_wine verify_reg_nonexist(hkey, "Wine61b"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 09b600cdaf01452b91055716532f9f8f6fb8d4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b600cdaf01452b910557165… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:40 2017 +0000 reg/tests: Test whether a forward slash can be used as a concatenation marker. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fea7403..9735f59 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2063,6 +2063,16 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3311,6 +3321,16 @@ static void test_unicode_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 72ecfe55074b826632722e9b695a324e67a20cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ecfe55074b826632722e9b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:12 2017 +0000 reg/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0d69d44..49d810f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -892,7 +892,7 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT3\n\n" @@ -1953,6 +1953,54 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine57i"); todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58a\"=hex(2):4c,69,6e,65,20,\\\n" + "@=\"Default value 1\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58a"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58b\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58c\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58c"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58d\"=hex(2):4c,69,6e,65,20,\\\n\n" + "@=\"Default value 4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58e\"=hex(2):4c,69,6e,65,20\\\n" + "@=\"Default value 5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58e"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2002,7 +2050,7 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" @@ -3091,6 +3139,54 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine57i"); todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "@=\"Default value 1\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58a"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58b\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58b"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58c"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58d\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "@=\"Default value 4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58d"); + todo_wine verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "@=\"Default value 5\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58e"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test backslashes with whitespace variations and comma placement.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 5e0d406120e00e8415df1fd789cfaac169f74065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0d406120e00e8415df1fd78… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:05:45 2017 +0000 reg/tests: Test backslashes with whitespace variations and comma placement. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 6262635..5076ad1 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1822,6 +1822,28 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine52k"); todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53b\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53c\"=hex(2):25,48,4f,4d,45,25,5c, \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53d\"=hex(2):25,48,4f,4d,45,25,5c \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53e\"=hex(2):25,48,4f,4d,45,25,5c,\\\t ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53f\"=hex(2):25,48,4f,4d,45,25,5c\\\t ;comment\n" + " 25,50,41,54,48,25,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53b"); + todo_wine verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53d"); + todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53f"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2829,6 +2851,28 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine52k"); todo_wine verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53b\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53c\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00, \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53d\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00 \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53e\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53f\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,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, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53b"); + todo_wine verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53d"); + todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + todo_wine verify_reg_nonexist(hkey, "Wine53f"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Alexandre Julliard : winetest: Don' t require a tag or email address when only running a few tests.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 8e3d381419319b32692086947aae97471aad460a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e3d381419319b32692086947… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 19:12:23 2017 +0200 winetest: Don't require a tag or email address when only running a few tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index c8ff102..bfac17b 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1405,6 +1405,12 @@ int main( int argc, char *argv[] ) SetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", "0" ); } + if (nb_filters && !exclude_tests) + { + run_tests( logname, outdir ); + exit(0); + } + while (!tag) { if (!interactive) report (R_FATAL, "Please specify a tag (-t option) if "

1 0

Zebediah Figura : msi: Send the correct UI messages upon calling MsiDoAction().
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: a388906a1a963b77125dc0f184484c0993b9fb49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a388906a1a963b77125dc0f18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:00 2017 -0500 msi: Send the correct UI messages upon calling MsiDoAction(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 218 ++++++++++++++++++++++++----------------------- dlls/msi/msi.rc | 140 ++++++++++++++++++++++++++++++ dlls/msi/package.c | 73 +++++++++------- dlls/msi/resource.h | 140 ++++++++++++++++++++++++++++++ dlls/msi/tests/format.c | 1 + dlls/msi/tests/package.c | 2 +- 6 files changed, 437 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a388906a1a963b77125dc…

1 0

Zebediah Figura : msi/tests: Add tests for external UI callback.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 358ed0d8367338c05fdafa86fb322f04f0313e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=358ed0d8367338c05fdafa86f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 27 00:05:34 2017 -0500 msi/tests: Add tests for external UI callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 240 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 146d1fc..1196412 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <assert.h> #include <stdio.h> #include <windows.h> #include <msidefs.h> @@ -841,18 +842,27 @@ static UINT package_from_db(MSIHANDLE hdb, MSIHANDLE *handle) return ERROR_SUCCESS; } -static void create_test_file(const CHAR *name) +static void create_file_data(LPCSTR name, LPCSTR data) { HANDLE file; DWORD written; file = CreateFileA(name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n", name); - WriteFile(file, name, strlen(name), &written, NULL); + if (file == INVALID_HANDLE_VALUE) + return; + + WriteFile(file, data, strlen(data), &written, NULL); WriteFile(file, "\n", strlen("\n"), &written, NULL); + CloseHandle(file); } +static void create_test_file(const CHAR *name) +{ + create_file_data(name, name); +} + typedef struct _tagVS_VERSIONINFO { WORD wLength; @@ -9179,6 +9189,232 @@ static void test_externalui(void) DeleteFileA(msifile); } +struct externalui_message { + UINT message; + int field_count; + char field[4][100]; + int match[4]; /* should we test for a match */ + int optional; +}; + +static struct externalui_message *sequence; +static int sequence_count, sequence_size; + +static void add_message(const struct externalui_message *msg) +{ + if (!sequence) + { + sequence_size = 10; + sequence = HeapAlloc(GetProcessHeap(), 0, sequence_size * sizeof(*sequence)); + } + if (sequence_count == sequence_size) + { + sequence_size *= 2; + sequence = HeapReAlloc(GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence)); + } + + assert(sequence); + + sequence[sequence_count++] = *msg; +} + +static void flush_sequence(void) +{ + HeapFree(GetProcessHeap(), 0, sequence); + sequence = NULL; + sequence_count = sequence_size = 0; +} + +static void ok_sequence_(const struct externalui_message *expected, const char *context, BOOL todo, + const char *file, int line) +{ + static const struct externalui_message end_of_sequence = {0}; + const struct externalui_message *actual; + int failcount = 0; + int i; + + add_message(&end_of_sequence); + + actual = sequence; + + while (expected->message && actual->message) + { + if (expected->message == actual->message) + { + if (expected->field_count != actual->field_count) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", + context, expected->message, expected->field_count, actual->field_count); + failcount++; + } + + for (i = 0; i <= actual->field_count; i++) + { + if (expected->match[i] && strcmp(expected->field[i], actual->field[i])) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: in msg 0x%08x field %d: expected \"%s\", got \"%s\"\n", + context, expected->message, i, expected->field[i], actual->field[i]); + failcount++; + } + } + + expected++; + actual++; + } + else + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg 0x%08x was expected, but got msg 0x%08x instead\n", + context, expected->message, actual->message); + failcount++; + if (todo) + goto done; + expected++; + actual++; + } + } + + if (expected->message || actual->message) + { + todo_wine_if (todo) + ok_(file, line) (FALSE, "%s: the msg sequence is not complete: expected %08x - actual %08x\n", + context, expected->message, actual->message); + failcount++; + } + + if(todo && !failcount) /* succeeded yet marked todo */ + { + todo_wine + ok_(file, line)(TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); + } + +done: + flush_sequence(); +} + +#define ok_sequence(exp, contx, todo) \ + ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) + +static const struct externalui_message empty_sequence[] = { + {0} +}; + +static const struct externalui_message openpackage_nonexistent_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static const struct externalui_message openpackage_sequence[] = { + {INSTALLMESSAGE_INITIALIZE, -1}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {1, 1, 1, 1}}, + {INSTALLMESSAGE_INFO|MB_ICONHAND, 0, {""}, {0}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "0", "1033", "1252"}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_COMMONDATA, 3, {"", "1", "", ""}, {0, 1, 0, 0}}, + {0} +}; + +static const struct externalui_message doaction_costinitialize_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "CostInitialize", "", ""}, {0, 1, 0, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", ""}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "CostInitialize", "1"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message doaction_custom_sequence[] = { + {INSTALLMESSAGE_ACTIONSTART, 3, {"", "custom", "", ""}, {0, 1, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "1"}, {0, 1, 1}}, + {INSTALLMESSAGE_INFO, 2, {"", "custom", "0"}, {0, 1, 1}}, + {0} +}; + +static const struct externalui_message closehandle_sequence[] = { + {INSTALLMESSAGE_TERMINATE, -1}, + {0} +}; + +static INT CALLBACK externalui_message_callback(void *context, UINT message, MSIHANDLE hrecord) +{ + struct externalui_message msg; + char buffer[100]; + DWORD length = 100; + int i; + + msg.message = message; + msg.field_count = MsiRecordGetFieldCount(hrecord); + for (i = 0; i <= msg.field_count; i++) + { + length = 100; + MsiRecordGetStringA(hrecord, i, buffer, &length); + memcpy(msg.field[i], buffer, length+1); + } + + add_message(&msg); + + return 1; +} + +static void test_externalui_message(void) +{ + /* test that events trigger the correct sequence of messages */ + + INSTALLUI_HANDLER_RECORD prev; + const struct externalui_message *sequence = NULL; + MSIHANDLE hdb, hpkg; + UINT r; + + r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS, &sequence, &prev); + + flush_sequence(); + + CoInitialize(NULL); + + hdb = create_package_db(); + ok(hdb, "failed to create database\n"); + + create_file_data("forcecodepage.idt", "\r\n\r\n1252\t_ForceCodepage\r\n"); + r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d", r); + + r = MsiOpenPackageA(NULL, &hpkg); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok_sequence(empty_sequence, "MsiOpenPackage with NULL db", FALSE); + + r = MsiOpenPackageA("nonexistent", &hpkg); + ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", r); + ok_sequence(openpackage_nonexistent_sequence, "MsiOpenPackage with nonexistent db", TRUE); + + r = package_from_db(hdb, &hpkg); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + DeleteFileA(msifile); + return; + } + ok(r == ERROR_SUCCESS, "failed to create package %u\n", r); + ok_sequence(openpackage_sequence, "MsiOpenPackage with valid db", TRUE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "CostInitialize"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); + + /* Test a standard action */ + r = MsiDoActionA(hpkg, "custom"); + ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); + ok_sequence(doaction_custom_sequence, "MsiDoAction(\"custom\")", TRUE); + + /* close the package */ + MsiCloseHandle(hpkg); + ok_sequence(closehandle_sequence, "MsiCloseHandle()", TRUE); + + CoUninitialize(); + DeleteFileA(msifile); + DeleteFileA("forcecodepage.idt"); +} + START_TEST(package) { STATEMGRSTATUS status; @@ -9237,6 +9473,8 @@ START_TEST(package) test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); test_externalui(); + if (pMsiSetExternalUIRecord) + test_externalui_message(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0