September 2017 - Wine-commits

Nikolay Sivov : shell32: Added remaining Application() properties.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 3014fb16179ff0e93d4d4a2e5fa86674228a6881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3014fb16179ff0e93d4d4a2e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:39:42 2017 +0300 shell32: Added remaining Application() properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 23 ++++++++++++++++------- dlls/shell32/tests/shelldispatch.c | 23 ++++++++++++++++++++++- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index c489eb6..24843f0 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -292,7 +292,10 @@ static HRESULT WINAPI FolderItemVerbImpl_Invoke(FolderItemVerb *iface, static HRESULT WINAPI FolderItemVerbImpl_get_Application(FolderItemVerb *iface, IDispatch **disp) { - FIXME("(%p, %p)\n", iface, disp); + TRACE("(%p, %p)\n", iface, disp); + + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -474,7 +477,10 @@ static HRESULT WINAPI FolderItemVerbsImpl_get_Count(FolderItemVerbs *iface, LONG static HRESULT WINAPI FolderItemVerbsImpl_get_Application(FolderItemVerbs *iface, IDispatch **disp) { - FIXME("(%p, %p)\n", iface, disp); + TRACE("(%p, %p)\n", iface, disp); + + if (disp) + *disp = NULL; return E_NOTIMPL; } @@ -1764,13 +1770,16 @@ static HRESULT WINAPI ShellDispatch_Invoke(IShellDispatch6 *iface, return hr; } -static HRESULT WINAPI ShellDispatch_get_Application(IShellDispatch6 *iface, - IDispatch **ppid) +static HRESULT WINAPI ShellDispatch_get_Application(IShellDispatch6 *iface, IDispatch **disp) { - FIXME("(%p,%p)\n", iface, ppid); + TRACE("(%p,%p)\n", iface, disp); - *ppid = NULL; - return E_NOTIMPL; + if (!disp) + return E_INVALIDARG; + + *disp = (IDispatch *)iface; + IDispatch_AddRef(*disp); + return S_OK; } static HRESULT WINAPI ShellDispatch_get_Parent(IShellDispatch6 *iface, IDispatch **disp) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index fa7e8dc..a9c5549 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -131,6 +131,12 @@ static void test_namespace(void) ok(SUCCEEDED(r), "Failed to create ShellDispatch object: %#x.\n", r); disp = NULL; + r = IShellDispatch_get_Application(sd, &disp); + ok(r == S_OK, "Failed to get application pointer, hr %#x.\n", r); + ok(disp == (IDispatch *)sd, "Unexpected application pointer %p.\n", disp); + IDispatch_Release(disp); + + disp = NULL; r = IShellDispatch_get_Parent(sd, &disp); ok(r == S_OK, "Failed to get Shell object parent, hr %#x.\n", r); ok(disp == (IDispatch *)sd, "Unexpected parent pointer %p.\n", disp); @@ -1226,7 +1232,7 @@ static void test_ParseName(void) static void test_Verbs(void) { - FolderItemVerbs *verbs; + FolderItemVerbs *verbs, *verbs2; WCHAR pathW[MAX_PATH]; FolderItemVerb *verb; IShellDispatch *sd; @@ -1265,6 +1271,16 @@ if (0) { /* crashes on some systems */ hr = FolderItem_Verbs(item, &verbs); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = FolderItem_Verbs(item, &verbs2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(verbs2 != verbs, "Unexpected verbs pointer.\n"); + FolderItemVerbs_Release(verbs2); + + disp = (void *)0xdeadbeef; + hr = FolderItemVerbs_get_Application(verbs, &disp); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(disp == NULL, "Unexpected application pointer.\n"); + disp = (void *)0xdeadbeef; hr = FolderItemVerbs_get_Parent(verbs, &disp); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); @@ -1303,6 +1319,11 @@ if (0) { /* crashes on winxp/win2k3 */ ok(hr == E_NOTIMPL, "got %#x.\n", hr); ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + disp = (void *)0xdeadbeef; + hr = FolderItemVerb_get_Application(verb, &disp); + ok(hr == E_NOTIMPL, "got %#x.\n", hr); + ok(disp == NULL, "Unexpected parent pointer %p.\n", disp); + SysFreeString(str); FolderItemVerb_Release(verb); }

1 0

Nikolay Sivov : d2d1: Improve figure bounds updating for quadratic beziers.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: e6c18792f19bd417e8c8f85762a2fd2fa5b739b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6c18792f19bd417e8c8f8576… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 18 10:40:46 2017 +0300 d2d1: Improve figure bounds updating for quadratic beziers. 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/d2d1/geometry.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 637078e..a958898 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -2956,6 +2956,11 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1Geometr for (i = 0; i < bezier_count; ++i) { + D2D1_RECT_F bezier_bounds; + + d2d_rect_get_bezier_bounds(&bezier_bounds, &figure->vertices[figure->vertex_count - 1], + &beziers[i].point1, &beziers[i].point2); + figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_BEZIER; if (!d2d_figure_add_bezier_control(figure, &beziers[i].point1)) { @@ -2970,6 +2975,8 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_AddQuadraticBeziers(ID2D1Geometr geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; return; } + + d2d_rect_union(&figure->bounds, &bezier_bounds); } geometry->u.path.segment_count += bezier_count;

1 0

Hugh McMaster : reg/tests: Use a helper function to create registry keys.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: f40ef077f503d28107633b6ba40fadf6d5073a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40ef077f503d28107633b6ba… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:38 2017 +0000 reg/tests: Use a helper function to create registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9d5eee9..7f055dc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -118,6 +118,16 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke RegCloseKey(hkey); } +#define add_key(k,p,s) add_key_(__LINE__,k,p,s) +static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey) +{ + LONG err; + + err = RegCreateKeyExA(hkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_WRITE, NULL, subkey, NULL); + lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); +} + static void test_add(void) { HKEY hkey; @@ -516,8 +526,7 @@ static void test_delete(void) run_reg_exe("reg delete /?", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL); - ok(err == ERROR_SUCCESS, "got %d\n", err); + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); err = RegSetValueExA(hkey, "foo", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); ok(err == ERROR_SUCCESS, "got %d\n" ,err); @@ -528,8 +537,7 @@ static void test_delete(void) err = RegSetValueExA(hkey, "", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); ok(err == ERROR_SUCCESS, "got %d\n" ,err); - err = RegCreateKeyExA(hkey, "subkey", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hsubkey, NULL); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); + add_key(hkey, "subkey", &hsubkey); RegCloseKey(hsubkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /v bar /f", &r); @@ -577,8 +585,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); /* Create a test key */ - err = RegCreateKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &key, NULL); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + add_key(HKEY_CURRENT_USER, KEY_BASE, &key); run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), @@ -612,8 +619,7 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); /* Create a test subkey */ - err = RegCreateKeyExA(key, "Subkey", 0, NULL, 0, KEY_ALL_ACCESS, NULL, &subkey, NULL); - ok(err == ERROR_SUCCESS, "got %d\n", err); + add_key(key, "Subkey", &subkey); err = RegSetValueExA(subkey, "Test", 0, REG_SZ, (BYTE *)world, sizeof(world)); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Use a helper function to add registry values.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 733350b9264b35604d42e7a656f43e7a24951a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=733350b9264b35604d42e7a65… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:39 2017 +0000 reg/tests: Use a helper function to add registry values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7f055dc..3b6216f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -128,6 +128,16 @@ static void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *sub lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err); } +#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s) +static void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, + const void *data, size_t size) +{ + LONG err; + + err = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size); + lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err); +} + static void test_add(void) { HKEY hkey; @@ -527,15 +537,9 @@ static void test_delete(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); - - err = RegSetValueExA(hkey, "foo", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); - - err = RegSetValueExA(hkey, "bar", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); - - err = RegSetValueExA(hkey, "", 0, REG_DWORD, (LPBYTE)&deadbeef, sizeof(deadbeef)); - ok(err == ERROR_SUCCESS, "got %d\n" ,err); + add_value(hkey, "foo", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, "bar", REG_DWORD, &deadbeef, sizeof(deadbeef)); + add_value(hkey, NULL, REG_DWORD, &deadbeef, sizeof(deadbeef)); add_key(hkey, "subkey", &hsubkey); RegCloseKey(hsubkey); @@ -591,14 +595,9 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */), "got exit code %d, expected 0\n", r); - err = RegSetValueExA(key, "Test", 0, REG_SZ, (BYTE *)hello, sizeof(hello)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(key, "Wine", 0, REG_DWORD, (BYTE *)&dword1, sizeof(dword1)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(key, NULL, 0, REG_SZ, (BYTE *)empty1, sizeof(empty1)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + add_value(key, "Test", REG_SZ, hello, sizeof(hello)); + add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1)); + add_value(key, NULL, REG_SZ, empty1, sizeof(empty1)); run_reg_exe("reg query HKCU\\" KEY_BASE, &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -620,15 +619,9 @@ static void test_query(void) /* Create a test subkey */ add_key(key, "Subkey", &subkey); - - err = RegSetValueExA(subkey, "Test", 0, REG_SZ, (BYTE *)world, sizeof(world)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(subkey, "Wine", 0, REG_DWORD, (BYTE *)&dword2, sizeof(dword2)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - - err = RegSetValueExA(subkey, NULL, 0, REG_SZ, (BYTE *)empty2, sizeof(empty2)); - ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + add_value(subkey, "Test", REG_SZ, world, sizeof(world)); + add_value(subkey, "Wine", REG_DWORD, &dword2, sizeof(dword2)); + add_value(subkey, NULL, REG_SZ, empty2, sizeof(empty2)); err = RegCloseKey(subkey); ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Use a helper function to write registry files.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 08a7836ef384d222f298077192f393ae8576f1c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a7836ef384d222f29807719… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:39 2017 +0000 reg/tests: Use a helper function to write registry files. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 52 +++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 3b6216f..1857545 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -731,23 +731,33 @@ static BOOL write_reg_file(const char *value, char *tmp_name) return ret; } +static BOOL write_file(const void *str, DWORD size) +{ + HANDLE file; + BOOL ret; + DWORD written; + + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); + + return ret; +} + #define test_import_str(c,r) test_import_str_(__LINE__,c,r) static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) { - HANDLE regfile; - DWORD written; BOOL ret; - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (!write_file(file_contents, strlen(file_contents))) return FALSE; - ret = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); - lok(ret, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); @@ -761,9 +771,7 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r { int lenA, len, memsize; WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL ret; + BOOL ret = FALSE; lenA = strlen(file_contents); @@ -773,26 +781,16 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if (regfile == INVALID_HANDLE_VALUE) - { - HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; - } - - ret = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(ret, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!write_file(wstr, memsize)) + goto exit; run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); lok(ret, "DeleteFile failed: %u\n", GetLastError()); +exit: + HeapFree(GetProcessHeap(), 0, wstr); return ret; }

1 0

Hugh McMaster : reg/tests: Combine and rename the test_import_*str functions.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: bfe5fed0b3e628a859eb53d906a104c28a3ce6a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe5fed0b3e628a859eb53d90… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:40 2017 +0000 reg/tests: Combine and rename the test_import_*str functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 50 +++++++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1857545..c41d284 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -750,47 +750,37 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -#define test_import_str(c,r) test_import_str_(__LINE__,c,r) -static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc) -{ - BOOL ret; - - if (!write_file(file_contents, strlen(file_contents))) - return FALSE; - - run_reg_exe("reg import test.reg", rc); - - ret = DeleteFileA("test.reg"); - lok(ret, "DeleteFile failed: %u\n", GetLastError()); - - return ret; -} +#define test_import_str(c,r) import_reg(__LINE__,c,FALSE,r) +#define test_import_wstr(c,r) import_reg(__LINE__,c,TRUE,r) -#define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) -static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc) { - int lenA, len, memsize; - WCHAR *wstr; - BOOL ret = FALSE; + int lenA; + BOOL ret; - lenA = strlen(file_contents); + lenA = strlen(contents); - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); - memsize = len * sizeof(WCHAR); - wstr = HeapAlloc(GetProcessHeap(), 0, memsize); - if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); + if (unicode) + { + int len = MultiByteToWideChar(CP_UTF8, 0, contents, lenA, NULL, 0); + int size = len * sizeof(WCHAR); + WCHAR *wstr = HeapAlloc(GetProcessHeap(), 0, size); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, contents, lenA, wstr, len); + + ret = write_file(wstr, size); + HeapFree(GetProcessHeap(), 0, wstr); + } + else + ret = write_file(contents, lenA); - if (!write_file(wstr, memsize)) - goto exit; + if (!ret) return FALSE; run_reg_exe("reg import test.reg", rc); ret = DeleteFileA("test.reg"); lok(ret, "DeleteFile failed: %u\n", GetLastError()); -exit: - HeapFree(GetProcessHeap(), 0, wstr); return ret; }

1 0

Hugh McMaster : reg/tests: Test the placement of the overwrite file flag [ /y].
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: f886f9f3d8878245d9ad2c021ecac15495c7bb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f886f9f3d8878245d9ad2c021… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:41 2017 +0000 reg/tests: Test the placement of the overwrite file flag [/y]. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index c41d284..f4ab824 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4213,7 +4213,8 @@ static void test_import_31(void) static void test_export(void) { LONG err; - DWORD r; + DWORD r, os_version, major_version, minor_version; + HKEY hkey; err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4250,6 +4251,36 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* Test registry export with an empty key */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + os_version = GetVersion(); + major_version = LOBYTE(LOWORD(os_version)); + minor_version = HIBYTE(LOWORD(os_version)); + + if (major_version > 5 || (major_version == 5 && minor_version == 2)) + { + run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + } + else /* Windows XP (32-bit) and older */ + win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); + + err = DeleteFileA("file.reg"); + todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError()); + + err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } START_TEST(reg)

1 0

Hugh McMaster : reg/tests: Compare registry export data with expected data.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 9ce39bd2136bbd411000e542b5b865c13b20adff URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce39bd2136bbd411000e542b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:41 2017 +0000 reg/tests: Compare registry export data with expected 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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f4ab824..c069154 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4210,11 +4210,55 @@ static void test_import_31(void) ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } +#define compare_export(f,e) compare_export_(__LINE__,f,e) +static BOOL compare_export_(unsigned line, const char *filename, const char *expected) +{ + FILE *fp; + long file_size; + WCHAR *fbuf = NULL, *wstr = NULL; + size_t len; + BOOL ret = FALSE; + + fp = fopen(filename, "rb"); + if (!fp) return FALSE; + + if (fseek(fp, 0, SEEK_END)) goto error; + file_size = ftell(fp); + if (file_size == -1) goto error; + rewind(fp); + + fbuf = HeapAlloc(GetProcessHeap(), 0, file_size + sizeof(WCHAR)); + if (!fbuf) goto error; + + fread(fbuf, file_size, 1, fp); + fbuf[file_size/sizeof(WCHAR)] = 0; + fclose(fp); + + len = MultiByteToWideChar(CP_UTF8, 0, expected, -1, NULL, 0); + wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!wstr) goto exit; + MultiByteToWideChar(CP_UTF8, 0, expected, -1, wstr, len); + + lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); + ret = TRUE; + +exit: + HeapFree(GetProcessHeap(), 0, fbuf); + HeapFree(GetProcessHeap(), 0, wstr); + return ret; + +error: + fclose(fp); + return FALSE; +} + static void test_export(void) { LONG err; DWORD r, os_version, major_version, minor_version; HKEY hkey; + const char *empty_key_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); @@ -4276,6 +4320,8 @@ static void test_export(void) else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); + todo_wine ok(compare_export("file.reg", empty_key_test), "compare_export() failed\n"); + err = DeleteFileA("file.reg"); todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());

1 0

Hugh McMaster : regedit/tests: Use a helper function to write registry files.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: 77442049624ee74c7c6540e2154286d1129b9c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77442049624ee74c7c6540e21… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:42 2017 +0000 regedit/tests: Use a helper function to write registry files. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 52 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 60f93c9..1f2284f 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -48,23 +48,33 @@ static BOOL run_regedit_exe_(unsigned line, const char *cmd) return (ret != WAIT_TIMEOUT); } +static BOOL write_file(const void *str, DWORD size) +{ + HANDLE file; + BOOL ret; + DWORD written; + + file = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Failed to create registry file\n"); + if (file == INVALID_HANDLE_VALUE) + return FALSE; + + ret = WriteFile(file, str, size, &written, NULL); + ok(ret, "WriteFile failed: %u\n", GetLastError()); + CloseHandle(file); + + return ret; +} + #define exec_import_str(c) r_exec_import_str(__LINE__, c) static BOOL r_exec_import_str(unsigned line, const char *file_contents) { - HANDLE regfile; - DWORD written; BOOL br; - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (!write_file(file_contents, strlen(file_contents))) return FALSE; - br = WriteFile(regfile, file_contents, strlen(file_contents), &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - run_regedit_exe("regedit.exe /s test.reg"); br = DeleteFileA("test.reg"); @@ -78,9 +88,7 @@ static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) { int lenA, len, memsize; WCHAR *wstr; - HANDLE regfile; - DWORD written; - BOOL br; + BOOL br = FALSE; lenA = strlen(file_contents); @@ -90,26 +98,16 @@ static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) if (!wstr) return FALSE; MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); - regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); - lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if (regfile == INVALID_HANDLE_VALUE) - { - HeapFree(GetProcessHeap(), 0, wstr); - return FALSE; - } - - br = WriteFile(regfile, wstr, memsize, &written, NULL); - lok(br, "WriteFile failed: %u\n", GetLastError()); - CloseHandle(regfile); - - HeapFree(GetProcessHeap(), 0, wstr); + if (!write_file(wstr, memsize)) + goto exit; run_regedit_exe("regedit.exe /s test.reg"); br = DeleteFileA("test.reg"); lok(br, "DeleteFile failed: %u\n", GetLastError()); +exit: + HeapFree(GetProcessHeap(), 0, wstr); return br; }

1 0

Hugh McMaster : regedit/tests: Combine and rename the r_exec_import_*str functions.
by Alexandre Julliard 18 Sep '17

18 Sep '17

Module: wine Branch: master Commit: ee11f6fff5f6332f58ce51a844cedab6719e57ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee11f6fff5f6332f58ce51a84… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 18 08:27:43 2017 +0000 regedit/tests: Combine and rename the r_exec_import_*str functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 +++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 1f2284f..5912c25 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -67,48 +67,38 @@ static BOOL write_file(const void *str, DWORD size) return ret; } -#define exec_import_str(c) r_exec_import_str(__LINE__, c) -static BOOL r_exec_import_str(unsigned line, const char *file_contents) -{ - BOOL br; - - if (!write_file(file_contents, strlen(file_contents))) - return FALSE; - - run_regedit_exe("regedit.exe /s test.reg"); - - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); +#define exec_import_str(c) import_reg(__LINE__,c,FALSE) +#define exec_import_wstr(c) import_reg(__LINE__,c,TRUE) - return br; -} - -#define exec_import_wstr(c) r_exec_import_wstr(__LINE__, c) -static BOOL r_exec_import_wstr(unsigned line, const char *file_contents) +static BOOL import_reg(unsigned line, const char *contents, BOOL unicode) { - int lenA, len, memsize; - WCHAR *wstr; - BOOL br = FALSE; + int lenA; + BOOL ret; - lenA = strlen(file_contents); + lenA = strlen(contents); - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); - memsize = len * sizeof(WCHAR); - wstr = HeapAlloc(GetProcessHeap(), 0, memsize); - if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); + if (unicode) + { + int len = MultiByteToWideChar(CP_UTF8, 0, contents, lenA, NULL, 0); + int size = len * sizeof(WCHAR); + WCHAR *wstr = HeapAlloc(GetProcessHeap(), 0, size); + if (!wstr) return FALSE; + MultiByteToWideChar(CP_UTF8, 0, contents, lenA, wstr, len); + + ret = write_file(wstr, size); + HeapFree(GetProcessHeap(), 0, wstr); + } + else + ret = write_file(contents, lenA); - if (!write_file(wstr, memsize)) - goto exit; + if (!ret) return FALSE; run_regedit_exe("regedit.exe /s test.reg"); - br = DeleteFileA("test.reg"); - lok(br, "DeleteFile failed: %u\n", GetLastError()); + ret = DeleteFileA("test.reg"); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); -exit: - HeapFree(GetProcessHeap(), 0, wstr); - return br; + return ret; } #define TODO_REG_TYPE (0x0001u)

1 0