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

Andrey Gusev : ext-ms-win-security-cryptui-l1-1-0: Add dll.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 9f16e42e209f1afb6918ee8821a42f0438cf9c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f16e42e209f1afb6918ee882… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jul 6 15:15:22 2017 +0300 ext-ms-win-security-cryptui-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-security-cryptui-l1-1-0/Makefile.in | 1 + .../ext-ms-win-security-cryptui-l1-1-0.spec | 5 +++++ tools/make_specfiles | 4 ++++ 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 9933c41..cb3668d 100755 --- a/configure +++ b/configure @@ -1209,6 +1209,7 @@ enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 +enable_ext_ms_win_security_cryptui_l1_1_0 enable_faultrep enable_fltlib enable_fltmgr_sys @@ -18280,6 +18281,7 @@ wine_fn_config_dll ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_r wine_fn_config_dll ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_dll ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_dll ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 +wine_fn_config_dll ext-ms-win-security-cryptui-l1-1-0 enable_ext_ms_win_security_cryptui_l1_1_0 wine_fn_config_dll faultrep enable_faultrep implib wine_fn_config_test dlls/faultrep/tests faultrep_test wine_fn_config_dll fltlib enable_fltlib diff --git a/configure.ac b/configure.ac index 12fd6c2..d8309ea 100644 --- a/configure.ac +++ b/configure.ac @@ -3111,6 +3111,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) +WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0) WINE_CONFIG_DLL(faultrep,,[implib]) WINE_CONFIG_TEST(dlls/faultrep/tests) WINE_CONFIG_DLL(fltlib) diff --git a/dlls/ext-ms-win-security-cryptui-l1-1-0/Makefile.in b/dlls/ext-ms-win-security-cryptui-l1-1-0/Makefile.in new file mode 100644 index 0000000..60023fc --- /dev/null +++ b/dlls/ext-ms-win-security-cryptui-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-security-cryptui-l1-1-0.dll diff --git a/dlls/ext-ms-win-security-cryptui-l1-1-0/ext-ms-win-security-cryptui-l1-1-0.spec b/dlls/ext-ms-win-security-cryptui-l1-1-0/ext-ms-win-security-cryptui-l1-1-0.spec new file mode 100644 index 0000000..6cd45fd --- /dev/null +++ b/dlls/ext-ms-win-security-cryptui-l1-1-0/ext-ms-win-security-cryptui-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub CertSelectionGetSerializedBlob +@ stdcall CryptUIDlgCertMgr(ptr) cryptui.CryptUIDlgCertMgr +@ stdcall CryptUIDlgSelectCertificateA(ptr) cryptui.CryptUIDlgSelectCertificateA +@ stdcall CryptUIDlgSelectCertificateFromStore(ptr ptr wstr wstr long long ptr) cryptui.CryptUIDlgSelectCertificateFromStore +@ stdcall CryptUIDlgViewCertificateW(ptr ptr) cryptui.CryptUIDlgViewCertificateW diff --git a/tools/make_specfiles b/tools/make_specfiles index de1a33a..85eb1ff 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -148,6 +148,10 @@ my @dll_groups = "ext-ms-win-security-credui-l1-1-0", ], [ + "cryptui", + "ext-ms-win-security-cryptui-l1-1-0", + ], + [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", ],

1 0

André Hentschel : vcomp/tests: Test more arguments with a callback.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 3d69e4ec498c6ab77c0129bb3fa3f73aea0aeca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d69e4ec498c6ab77c0129bb3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 5 22:11:43 2017 +0200 vcomp/tests: Test more arguments with a callback. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 165d710..154744b 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -539,13 +539,21 @@ static void CDECL fork_ptr_cb(LONG *a, LONG *b, LONG *c, LONG *d, LONG *e) InterlockedIncrement(e); } -static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d, UINT_PTR e) +static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d, + UINT_PTR e, UINT_PTR f, UINT_PTR g, UINT_PTR h, + UINT_PTR i, UINT_PTR j, UINT_PTR k) { ok(a == 1, "expected a == 1, got %p\n", (void *)a); ok(b == MAXUINT_PTR - 2, "expected b == MAXUINT_PTR - 2, got %p\n", (void *)b); ok(c == 3, "expected c == 3, got %p\n", (void *)c); ok(d == MAXUINT_PTR - 4, "expected d == MAXUINT_PTR - 4, got %p\n", (void *)d); ok(e == 5, "expected e == 5, got %p\n", (void *)e); + ok(f == 6, "expected f == 6, got %p\n", (void *)f); + ok(g == 7, "expected g == 7, got %p\n", (void *)g); + ok(h == 8, "expected h == 8, got %p\n", (void *)h); + ok(i == 9, "expected i == 9, got %p\n", (void *)i); + ok(j == 10, "expected j == 10, got %p\n", (void *)j); + ok(k == 11, "expected k == 11, got %p\n", (void *)k); } #ifdef __i386__ @@ -581,8 +589,10 @@ static void test_vcomp_fork(void) ok(d == 7, "expected d == 7, got %d\n", d); ok(e == 8, "expected e == 8, got %d\n", e); - p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), - (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); + p_vcomp_fork(TRUE, 11, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), + (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5, + (UINT_PTR)6, (UINT_PTR)7, (UINT_PTR)8, (UINT_PTR)9, + (UINT_PTR)10, (UINT_PTR)11); #ifdef __i386__ {

1 0

Zebediah Figura : msi: Add a basic internal UI implementation.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 48237e249b76f5ad883ec073e352f850994e06cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=48237e249b76f5ad883ec073e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 5 23:31:52 2017 -0500 msi: Add a basic internal UI implementation. 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/msi.c | 11 +++- dlls/msi/msi_main.c | 2 +- dlls/msi/package.c | 139 ++++++++++++++++++++++++++++++++---------------- dlls/msi/tests/format.c | 20 +++++-- dlls/msi/tests/msi.c | 18 +++++++ 5 files changed, 136 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48237e249b76f5ad883ec…

1 0

Zebediah Figura : msi/tests: Work around test failures on Windows.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: c83b8e0a16b496144e99266d745db22c67d69ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83b8e0a16b496144e99266d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 5 23:31:51 2017 -0500 msi/tests: Work around test failures on Windows. 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 | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 58e932f..291bcb2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9335,6 +9335,18 @@ static const struct externalui_message closehandle_sequence[] = { {0} }; +static INT CALLBACK externalui_message_string_callback(void *context, UINT message, LPCSTR string) +{ + struct externalui_message msg; + + msg.message = message; + msg.field_count = 0; + strcpy(msg.field[0], string); + add_message(&msg); + + return 1; +} + static INT CALLBACK externalui_message_callback(void *context, UINT message, MSIHANDLE hrecord) { struct externalui_message msg; @@ -9343,12 +9355,19 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI int i; msg.message = message; + if (message == INSTALLMESSAGE_TERMINATE) + { + /* trying to access the record seems to hang on some versions of Windows */ + msg.field_count = -1; + add_message(&msg); + return 1; + } 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); + memcpy(msg.field[i], buffer, min(100, length+1)); } add_message(&msg); @@ -9361,11 +9380,12 @@ 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); + /* processing SHOWDIALOG with a record handler causes a crash on XP */ + MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL); + r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, NULL, &prev); flush_sequence(); @@ -9401,7 +9421,7 @@ static void test_externalui_message(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); - /* Test a standard action */ + /* Test a custom 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\")", FALSE);

1 0

Hugh McMaster : regedit: Hex data lines may be terminated by a semicolon.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 7b95ddcb04ac83bdc5614a5049cbbb82b7f2e306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b95ddcb04ac83bdc5614a504… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:43 2017 +0000 regedit: Hex data lines may be terminated by a semicolon. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 ++ programs/regedit/tests/regedit.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index cddebf7..9fe0cb8 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -303,6 +303,8 @@ static BOOL convert_hex_csv_to_hex(struct parser *parser, WCHAR **str) *str = end + 1; return TRUE; } + else if (*end == ';') + return TRUE; return FALSE; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 1b3efc8..8a07fb7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -364,7 +364,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine10b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); verify_reg(hkey, "Wine10c", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); verify_reg(hkey, "Wine10d", REG_NONE, "V\0a\0l\0u", 8, 0); - todo_wine verify_reg(hkey, "Wine10e", REG_NONE, "V\0a\0l\0u", 8, 0); + verify_reg(hkey, "Wine10e", REG_NONE, "V\0a\0l\0u", 8, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -394,10 +394,10 @@ static void test_basic_import(void) size = sizeof(buffer); memset(buffer, '-', size); lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE *)&buffer, &size); - todo_wine ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - todo_wine ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); + ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); - todo_wine ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); + ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -419,7 +419,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine12b", REG_BINARY, hex, sizeof(hex), 0); verify_reg(hkey, "Wine12c", REG_BINARY, hex, sizeof(hex), 0); verify_reg(hkey, "Wine12d", REG_BINARY, hex, 6, 0); - todo_wine verify_reg(hkey, "Wine12e", REG_BINARY, hex, 6, 0); + verify_reg(hkey, "Wine12e", REG_BINARY, hex, 6, 0); /* Test import with subkeys */ exec_import_str("REGEDIT4\n\n" @@ -518,7 +518,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine18b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); verify_reg(hkey, "Wine18c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); - todo_wine verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, 0); + verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -538,7 +538,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine19b", 0x100, "%PATH%", 7, 0); verify_reg(hkey, "Wine19c", 0x100, "%PATH%", 7, 0); verify_reg(hkey, "Wine19d", 0x100, "%PATH", 5, 0); - todo_wine verify_reg(hkey, "Wine19e", 0x100, "%PATH", 5, 0); + verify_reg(hkey, "Wine19e", 0x100, "%PATH", 5, 0); /* Test null-termination of REG_EXPAND_SZ and REG_MULTI_SZ data*/ exec_import_str("REGEDIT4\n\n" @@ -1314,7 +1314,7 @@ static void test_comments(void) " 63,6f,6e,\\;comment\n" " 63,61,74,;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit/tests: Add some more tests for importing hex data.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 23c93d30263c6ac23b69d4ffbce07a71e3d153a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c93d30263c6ac23b69d4ffb… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:27 2017 +0000 regedit/tests: Add some more tests for importing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 67 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index c1dc01a..1b3efc8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -500,6 +500,73 @@ static void test_basic_import(void) if (lr == ERROR_SUCCESS) verify_reg(hkey, "Wine17", REG_MULTI_SZ, "Line ", 6, TODO_REG_SIZE | TODO_REG_DATA); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine18a\"=hex(7):4c,69,6e,65,00,00\n" + "\"Wine18b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine18c\"=hex(7):4c,69,6e,65,20,\\;comment\n" + " 63,6f,6e,63,61,74,\\\n" + " 65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine18d\"=hex(7):4c,69,6e,65,20,\\;comment\n" + " 63,6f,6e,63,61,74,\n" + " 65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine18e\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg(hkey, "Wine18a", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine18b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine18c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + todo_wine verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine19a\"=hex(100):25,50,41,54,48,25,00\n" + "\"Wine19b\"=hex(100):25,50,41,\\\n" + " 54,48,25,00\n" + "\"Wine19c\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\\\n" + " 25,00\n" + "\"Wine19d\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\n" + " 25,00\n" + "\"Wine19e\"=hex(100):25,50,41,\\;comment\n" + " 54,48,;comment\n" + " 25,00\n"); + verify_reg(hkey, "Wine19a", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine19b", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine19c", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine19d", 0x100, "%PATH", 5, 0); + todo_wine verify_reg(hkey, "Wine19e", 0x100, "%PATH", 5, 0); + + /* Test null-termination of REG_EXPAND_SZ and REG_MULTI_SZ data*/ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine20a\"=hex(7):4c,69,6e,65\n" + "\"Wine20b\"=hex(7):4c,69,6e,65,\n" + "\"Wine20c\"=hex(7):4c,69,6e,65,00\n" + "\"Wine20d\"=hex(7):4c,69,6e,65,00,\n" + "\"Wine20e\"=hex(7):4c,69,6e,65,00,00\n" + "\"Wine20f\"=hex(7):4c,69,6e,65,00,00,\n\n"); + verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20c", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20d", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20e", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine20f", REG_MULTI_SZ, "Line\0", 6, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine21a\"=hex(2):25,50,41,54,48,25\n" + "\"Wine21b\"=hex(2):25,50,41,54,48,25,\n" + "\"Wine21c\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine21d\"=hex(2):25,50,41,54,48,25,00,\n\n"); + verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Francois Gouget : ws2_32/tests: A spelling fix in a comment.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 32c6d8729588339f44eca4f67a48add0c2be4204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c6d8729588339f44eca4f67… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 6 12:21:57 2017 +0200 ws2_32/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f3ba11c..2790fea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1643,7 +1643,7 @@ todo_wine ok(k == 99, "Expected 99, got %d\n", k); } } - else /* <= 2003 the tests differ between TCP and UDP, UDP silenty accepts */ + else /* <= 2003 the tests differ between TCP and UDP, UDP silently accepts */ { SetLastError(0xdeadbeef); k = 99;

1 0

Hugh McMaster : reg/tests: Add some more tests for importing hex data.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 25de5c925597808ed3d473f49622e1619fdbd5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=25de5c925597808ed3d473f49… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 08:17:56 2017 +0000 reg/tests: Add some more tests for 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 | 171 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25de5c925597808ed3d47…

1 0

Hugh McMaster : reg/tests: Add another test for "0x" prefixes in the hex data type.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 48a2105e03b774f882d3a3e2d40eab8ee2d97db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a2105e03b774f882d3a3e2d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 08:17:46 2017 +0000 reg/tests: Add another test for "0x" prefixes in the hex data type. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7906f8d..20acd85 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1784,7 +1784,8 @@ static void test_import(void) "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"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); + "\"Wine47k\"=hex(0X2):56,61,6c,75,65,00\n" + "\"Wine47l\"=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); @@ -1797,6 +1798,7 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine47i"); todo_wine verify_reg_nonexist(hkey, "Wine47j"); todo_wine verify_reg_nonexist(hkey, "Wine47k"); + todo_wine verify_reg_nonexist(hkey, "Wine47l"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3122,7 +3124,8 @@ static void test_unicode_import(void) "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"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); + "\"Wine47k\"=hex(0X2):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine47l\"=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); @@ -3135,6 +3138,7 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine47i"); todo_wine verify_reg_nonexist(hkey, "Wine47j"); todo_wine verify_reg_nonexist(hkey, "Wine47k"); + todo_wine verify_reg_nonexist(hkey, "Wine47l"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ data if the parsed hex data does not end in a null-terminating character.
by Alexandre Julliard July 6, 2017

July 6, 2017

Module: wine Branch: master Commit: 3908296237b0a325c694b7dc3a6893d4fd3bc355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3908296237b0a325c694b7dc3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:58 2017 +0000 regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ data if the parsed hex data does not end in a null-terminating character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 19 ++++++++++++++----- programs/regedit/tests/regedit.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9fe0cb8..9680bd2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -848,13 +848,22 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; } - if (!parser->is_unicode && (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ)) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) { - void *tmp = parser->data; + BYTE *data = parser->data; - parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); - parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, tmp); + if (data[parser->data_size - 1] != 0x00) + { + data[parser->data_size] = 0x00; + parser->data_size++; + } + + if (!parser->is_unicode) + { + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); + parser->data_size *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, data); + } } set_state(parser, SET_VALUE); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 8a07fb7..7389781 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -388,7 +388,7 @@ static void test_basic_import(void) lr = RegQueryValueExA(hkey, "Wine11d", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine11e */ size = sizeof(buffer); @@ -396,7 +396,7 @@ static void test_basic_import(void) lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); exec_import_str("REGEDIT4\n\n" @@ -517,8 +517,8 @@ static void test_basic_import(void) verify_reg(hkey, "Wine18a", REG_MULTI_SZ, "Line\0", 6, 0); verify_reg(hkey, "Wine18b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); verify_reg(hkey, "Wine18c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); - verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, 0); + verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -549,8 +549,8 @@ static void test_basic_import(void) "\"Wine20d\"=hex(7):4c,69,6e,65,00,\n" "\"Wine20e\"=hex(7):4c,69,6e,65,00,00\n" "\"Wine20f\"=hex(7):4c,69,6e,65,00,00,\n\n"); - verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); - verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20c", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20d", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20e", REG_MULTI_SZ, "Line\0", 6, 0); @@ -562,8 +562,8 @@ static void test_basic_import(void) "\"Wine21b\"=hex(2):25,50,41,54,48,25,\n" "\"Wine21c\"=hex(2):25,50,41,54,48,25,00\n" "\"Wine21d\"=hex(2):25,50,41,54,48,25,00,\n\n"); - verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); - verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1314,7 +1314,7 @@ static void test_comments(void) " 63,6f,6e,\\;comment\n" " 63,61,74,;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0