wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Francois Gouget : oleaut32: Fix the Var*FromStr() prototypes.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 1e627d11875d00045ecb761b32220fbafb4807e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e627d11875d00045ecb761b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:15:09 2021 +0200 oleaut32: Fix the Var*FromStr() prototypes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 2 +- dlls/oleaut32/vartype.c | 35 ++++++++++++++++++----------------- include/oleauto.h | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e627d11875d00045ecb…

1 0

Francois Gouget : oleaut32/tests: Add more VarParseNumFromStr() tests.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 54ee0e9bfd70072f00ac2c330ddf853b3439cde8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ee0e9bfd70072f00ac2c33… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:16:08 2021 +0200 oleaut32/tests: Add more VarParseNumFromStr() tests. Check how it handles currency signs and spaces before and after the digits. Check the combination of thousands separators, spaces and commas. Check handling of regular vs. non-breaking spaces since the latter are often used in some locales. And check what happens in the French locale where spaces and thousands separators are identical and the currency sign comes after the digits and, quite often, a space. Check handling of multi-character currency symbols. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 480 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 460 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54ee0e9bfd70072f00ac…

1 0

Francois Gouget : oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 627988565b0d77d88d5c2ba0b1419569274afa2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=627988565b0d77d88d5c2ba0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:16:06 2021 +0200 oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8492a720855..1fec6c33134 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1262,21 +1262,27 @@ static void test_VariantCopyInd(void) "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08x\n", hres); } -static HRESULT (WINAPI *pVarParseNumFromStr)(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); /* Macros for converting and testing the result of VarParseNumFromStr */ #define FAILDIG 255 -static HRESULT convert_str( const char *str, INT dig, ULONG flags, +static HRESULT wconvert_str( const OLECHAR *str, INT dig, ULONG flags, NUMPARSE *np, BYTE rgb[128], LCID lcid ) { - OLECHAR buff[128]; - MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); memset( rgb, FAILDIG, 128 ); memset( np, 255, sizeof(*np) ); np->cDig = dig; np->dwInFlags = flags; - return pVarParseNumFromStr( buff, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); + return pVarParseNumFromStr( str, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); +} + +static HRESULT convert_str( const char *str, INT dig, ULONG flags, + NUMPARSE *np, BYTE rgb[128], LCID lcid ) +{ + OLECHAR buff[128]; + MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); + return wconvert_str(buff, dig, flags, np, rgb, lcid); } static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, @@ -1293,6 +1299,8 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON } } +#define WCONVERTN(str,dig,flags) hres = wconvert_str( str, dig, flags, &np, rgb, lcid ) +#define WCONVERT(str,flags) WCONVERTN(str,sizeof(rgb),flags) #define CONVERTN(str,dig,flags) hres = convert_str( str, dig, flags, &np, rgb, lcid ) #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) @@ -1307,7 +1315,6 @@ static void test_VarParseNumFromStr(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); NUMPARSE np; BYTE rgb[128]; - WCHAR str[128]; /** No flags **/ @@ -1731,10 +1738,9 @@ static void test_VarParseNumFromStr(void) EXPECT(1,NUMPRS_STD,NUMPRS_DECIMAL,4,0,-1); EXPECT2(1,0); - str[0] = 0x0660; - str[1] = 0; - hres = pVarParseNumFromStr(str, lcid, LOCALE_NOUSEROVERRIDE, &np, rgb); - ok(hres == DISP_E_TYPEMISMATCH, "VarParseNumFromStr returned %08x\n", hres); + /* Arabic numerals are not allowed "0" */ + WCONVERT(L"\x660", NUMPRS_STD); + EXPECTFAIL; } static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*);

1 0

Jacek Caban : include: Declare NTSTATUS in propvarutils.h.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 7a797bf6c360bf1c5c42c179b942e437e7cc4ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a797bf6c360bf1c5c42c179… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 16 17:01:57 2021 +0200 include: Declare NTSTATUS in propvarutils.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/propvarutil.h b/include/propvarutil.h index 511e503a109..55b64abbe4f 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -22,6 +22,11 @@ #include <shtypes.h> #include <shlwapi.h> +#ifndef WINE_NTSTATUS_DECLARED +#define WINE_NTSTATUS_DECLARED +typedef LONG NTSTATUS; +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Jacek Caban : include: Fix C++ InitPropVariantFromGUIDAsBuffer implementation.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 92a0405d9a2fce080e98b1a6ec09ca88bc2d243e URL: https://source.winehq.org/git/wine.git/?a=commit;h=92a0405d9a2fce080e98b1a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 16 17:01:49 2021 +0200 include: Fix C++ InitPropVariantFromGUIDAsBuffer implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/propvarutil.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/propvarutil.h b/include/propvarutil.h index 972cf48a019..511e503a109 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -178,7 +178,11 @@ inline HRESULT InitPropVariantFromString(PCWSTR psz, PROPVARIANT *ppropvar) inline HRESULT InitPropVariantFromGUIDAsBuffer(REFGUID guid, PROPVARIANT *ppropvar) { +#ifdef __cplusplus + return InitPropVariantFromBuffer(&guid, sizeof(GUID), ppropvar); +#else return InitPropVariantFromBuffer(guid, sizeof(GUID), ppropvar); +#endif } inline BOOL IsPropVariantVector(REFPROPVARIANT propvar)

1 0

Hugh McMaster : reg: Support use of registry views when exporting registry data.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: fcf79426147adf0d9f1d80b0cf24d0b6abd8bf59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf79426147adf0d9f1d80b0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 15 23:36:12 2021 +1000 reg: Support use of registry views when exporting registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 26 ++++++++++++++++++++------ programs/reg/tests/export.c | 10 +++++----- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 79f6997ce35..e8b7e22c6dd 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -225,7 +225,7 @@ static void export_key_name(HANDLE hFile, WCHAR *name) free(buf); } -static int export_registry_data(HANDLE hFile, HKEY hkey, WCHAR *path) +static int export_registry_data(HANDLE hFile, HKEY hkey, WCHAR *path, REGSAM sam) { LONG rc; DWORD max_value_len = 256, value_len; @@ -284,9 +284,9 @@ static int export_registry_data(HANDLE hFile, HKEY hkey, WCHAR *path) if (rc == ERROR_SUCCESS) { subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); - if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ, &subkey)) + if (!RegOpenKeyExW(hkey, subkey_name, 0, KEY_READ|sam, &subkey)) { - export_registry_data(hFile, subkey, subkey_path); + export_registry_data(hFile, subkey, subkey_path, sam); RegCloseKey(subkey); } free(subkey_path); @@ -349,6 +349,7 @@ int reg_export(int argc, WCHAR *argvW[]) HKEY root, hkey; WCHAR *path, *key_name; BOOL overwrite_file = FALSE; + REGSAM sam = 0; HANDLE hFile; int i, ret; @@ -368,13 +369,26 @@ int reg_export(int argc, WCHAR *argvW[]) if (is_char(*str, 'y') && !str[1]) overwrite_file = TRUE; - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else goto invalid; } - if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + + if (RegOpenKeyExW(root, path, 0, KEY_READ|sam, &hkey)) { output_message(STRING_KEY_NONEXIST); return 1; @@ -384,7 +398,7 @@ int reg_export(int argc, WCHAR *argvW[]) hFile = get_file_handle(argvW[3], overwrite_file); export_file_header(hFile); - ret = export_registry_data(hFile, hkey, key_name); + ret = export_registry_data(hFile, hkey, key_name, sam); export_newline(hFile); CloseHandle(hFile); diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 0a460e08bcb..7d352519690 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -528,8 +528,8 @@ static void test_registry_view_win64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", registry_view_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -546,7 +546,7 @@ static void test_registry_view_win64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); } @@ -571,7 +571,7 @@ static void test_registry_view_wow64(void) ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); @@ -581,7 +581,7 @@ static void test_registry_view_wow64(void) verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r);

1 0

Hugh McMaster : reg/tests: Use correct file and line arguments with delete_file().
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 0b5ba1d0be04f7c6bc0e53e9a28984cf2941b4bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5ba1d0be04f7c6bc0e53e9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 15 23:36:11 2021 +1000 reg/tests: Use correct file and line arguments with delete_file(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 31a75566fae..0a460e08bcb 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -50,7 +50,7 @@ BOOL compare_export_(const char *file, unsigned line, const char *filename, todo_wine_if (todo & TODO_REG_COMPARE) lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); - ret = delete_file(filename); + ret = delete_file_(file, line, filename); exit: HeapFree(GetProcessHeap(), 0, fbuf);

1 0

Hugh McMaster : reg/tests: Split 'export' syntax tests into a separate function.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 959ea6677ea0571c5042a5ec5bec33fb5a5f1dc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=959ea6677ea0571c5042a5ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 15 23:36:10 2021 +1000 reg/tests: Split 'export' syntax tests into a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 79135b0efb0..31a75566fae 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -168,12 +168,9 @@ const char *escaped_null_test = /* Unit tests */ -static void test_export(void) +static void test_command_syntax(void) { - LONG err; - DWORD r, dword, type, size; - HKEY hkey, subkey; - BYTE hex[4], buffer[8]; + DWORD r; delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); @@ -210,6 +207,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE, &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* This test fails because the registry key doesn't exist */ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -224,6 +222,16 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:64 /reg:64", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +static void test_export(void) +{ + LONG err; + DWORD r, dword, type, size; + HKEY hkey, subkey; + BYTE hex[4], buffer[8]; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test registry export with an empty key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -591,6 +599,7 @@ START_TEST(export) return; } + test_command_syntax(); test_export(); /* Check if reg.exe is running with elevated privileges */

1 0

Hugh McMaster : reg/tests: Test use of registry views when exporting registry data.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: fee692178cebd33220027ad6038f6acd8185b77f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fee692178cebd33220027ad6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 15 23:36:09 2021 +1000 reg/tests: Test use of registry views when exporting registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 165 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index af00262212b..79135b0efb0 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -216,6 +216,15 @@ 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); + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /reg:32 /reg:32", &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 /reg:32 /reg:64", &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 /reg:64 /reg:64", &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, 0, &hkey); @@ -429,6 +438,150 @@ static void test_export(void) delete_tree(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void create_test_key(REGSAM sam) +{ + HKEY hkey, subkey; + DWORD dword = 0x100; + + add_key(HKEY_LOCAL_MACHINE, KEY_BASE, sam, &hkey); + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + add_key(hkey, "Subkey1", sam, &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + close_key(subkey); + + close_key(hkey); +} + +static const char *registry_view_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n" + "[HKEY_LOCAL_MACHINE\\" KEY_BASE "\\Subkey1]\r\n" + "\"Binary\"=hex:11,22,33,44\r\n" + "\"Undefined hex\"=hex(100):25,50,41,54,48,25,00\r\n\r\n"; + +static void test_registry_view_win32(void) +{ + DWORD r; + BOOL is_wow64, is_win32; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (32-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 64-bit registry view, which doesn't exist on 32-bit Windows */ + create_test_key(KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_win64(void) +{ + DWORD r; + BOOL is_wow64, is_win64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", registry_view_test, TODO_REG_COMPARE), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try exporting from the 64-bit registry view (64-bit Windows) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + +static void test_registry_view_wow64(void) +{ + DWORD r; + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + /* Try exporting from the 32-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try exporting from the 64-bit registry view (WOW64) */ + create_test_key(KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:64", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("file.reg", registry_view_test, 0), "compare_export() failed\n"); + + run_reg_exe("reg export HKEY_LOCAL_MACHINE\\" KEY_BASE " file.reg /y /reg:32", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + delete_tree(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); +} + START_TEST(export) { DWORD r; @@ -439,4 +592,16 @@ START_TEST(export) } test_export(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); }

1 0

Nikolay Sivov : mf/session: Use better failure code for rendering node service requests.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 64e1e4d62d66c22c5925f0e790db5228ea798aa8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64e1e4d62d66c22c5925f0e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 12 15:21:20 2021 +0300 mf/session: Use better failure code for rendering node service requests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index df7a987bc55..91d8f0cac87 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1975,12 +1975,12 @@ static BOOL session_audio_renderer_test_func(IMFMediaSink *sink) static HRESULT session_get_renderer_node_service(struct media_session *session, p_renderer_node_test_func node_test_func, REFGUID service, REFIID riid, void **obj) { + HRESULT hr = E_NOINTERFACE; IMFStreamSink *stream_sink; IMFTopologyNode *node; IMFCollection *nodes; IMFMediaSink *sink; unsigned int i = 0; - HRESULT hr = E_FAIL; if (session->presentation.current_topology) {

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021