February 2021 - Wine-Commits

Alexandre Julliard : fntcache: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 7df6c7edfe44699970f096b72fe9c59cbf19d09d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7df6c7edfe44699970f096b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:05:44 2021 +0100 fntcache: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fntcache/Makefile.in | 2 +- dlls/fntcache/main.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/fntcache/Makefile.in b/dlls/fntcache/Makefile.in index 8e791a35e34..167bc28bcff 100644 --- a/dlls/fntcache/Makefile.in +++ b/dlls/fntcache/Makefile.in @@ -1,7 +1,7 @@ MODULE = fntcache.dll IMPORTS = advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/fntcache/main.c b/dlls/fntcache/main.c index f579c4ebf3a..0f8508652f2 100644 --- a/dlls/fntcache/main.c +++ b/dlls/fntcache/main.c @@ -25,30 +25,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontcache); -static HINSTANCE hInst; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; -/*********************************************************************** - * DllMain (fntcache.@) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - hInst = hinstDLL; - break; - } - - return TRUE; -} - static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, void *event_data, void *context ) { SERVICE_STATUS status;

1 0

Zebediah Figura : winegstreamer: Don't export DllMain().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 0058ab07e54a15e5483ec688217b82e31b64cdb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0058ab07e54a15e5483ec688… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:48 2021 -0600 winegstreamer: Don't export DllMain(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/winegstreamer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/winegstreamer.spec b/dlls/winegstreamer/winegstreamer.spec index d96cb873569..b16365d0c9f 100644 --- a/dlls/winegstreamer/winegstreamer.spec +++ b/dlls/winegstreamer/winegstreamer.spec @@ -1,4 +1,3 @@ -@ stdcall -private DllMain(long long ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Zebediah Figura : winegstreamer: Use malloc() instead of HeapAlloc().
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 672272e95ab03f1957aa8a631f9d01c1e2cd7a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=672272e95ab03f1957aa8a63… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:46 2021 -0600 winegstreamer: Use malloc() instead of HeapAlloc(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 5 ++- dlls/winegstreamer/gst_private.h | 1 - dlls/winegstreamer/gstdemux.c | 26 +++++++-------- dlls/winegstreamer/media_source.c | 67 ++++++++++++++------------------------- dlls/winegstreamer/mfplat.c | 9 +++--- 5 files changed, 42 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=672272e95ab03f1957aa…

1 0

Alexandre Julliard : glu32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 3712ae0c7049f03c73d5a0fbc905d15a45cbbd4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3712ae0c7049f03c73d5a0fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:01 2021 +0100 glu32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 2 +- dlls/glu32/glu.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in index 587191229f8..45bf40dee38 100644 --- a/dlls/glu32/Makefile.in +++ b/dlls/glu32/Makefile.in @@ -2,7 +2,7 @@ MODULE = glu32.dll IMPORTLIB = glu32 IMPORTS = opengl32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ geom.c \ diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 9305b90d308..8b045ea4438 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -276,19 +276,3 @@ GLboolean WINAPI wine_gluCheckExtension( const GLubyte *extName, const GLubyte * } return GLU_FALSE; } - -/*********************************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, LPVOID reserved ) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( instance ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : gpkcsp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 6a31fdf024aab7f4b888b8cbcbf779fd9ea512c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a31fdf024aab7f4b888b8cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:06 2021 +0100 gpkcsp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gpkcsp/Makefile.in | 2 +- dlls/gpkcsp/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/gpkcsp/Makefile.in b/dlls/gpkcsp/Makefile.in index fbd4008eb0b..49efda4ebd1 100644 --- a/dlls/gpkcsp/Makefile.in +++ b/dlls/gpkcsp/Makefile.in @@ -1,6 +1,6 @@ MODULE = gpkcsp.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c index 52d9112825e..4e890fafbe7 100644 --- a/dlls/gpkcsp/main.c +++ b/dlls/gpkcsp/main.c @@ -25,21 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gpkcsp); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -} - /***************************************************** * DllRegisterServer (GPKCSP.@) */

1 0

Alexandre Julliard : faultrep: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: f0f7bb703af4e7858891300d56886ce690a1701d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f7bb703af4e7858891300d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:05:35 2021 +0100 faultrep: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/faultrep/Makefile.in | 2 +- dlls/faultrep/faultrep.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/faultrep/Makefile.in b/dlls/faultrep/Makefile.in index 70cd1ff438a..f82b9c89ed5 100644 --- a/dlls/faultrep/Makefile.in +++ b/dlls/faultrep/Makefile.in @@ -2,6 +2,6 @@ MODULE = faultrep.dll IMPORTLIB = faultrep IMPORTS = advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = faultrep.c diff --git a/dlls/faultrep/faultrep.c b/dlls/faultrep/faultrep.c index 6d1aba9de8b..e45f3e0a2d1 100644 --- a/dlls/faultrep/faultrep.c +++ b/dlls/faultrep/faultrep.c @@ -103,19 +103,3 @@ EFaultRepRetVal WINAPI ReportFault(LPEXCEPTION_POINTERS pep, DWORD dwOpt) FIXME("%p 0x%x stub\n", pep, dwOpt); return frrvOk; } - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : initpki: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 1f95149727a852f0d09dccdbe00126049339609e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f95149727a852f0d09dccdb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:10 2021 +0100 initpki: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/initpki/Makefile.in | 2 +- dlls/initpki/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/initpki/Makefile.in b/dlls/initpki/Makefile.in index c1d2ffcbab1..c578820e7f6 100644 --- a/dlls/initpki/Makefile.in +++ b/dlls/initpki/Makefile.in @@ -1,6 +1,6 @@ MODULE = initpki.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/initpki/main.c b/dlls/initpki/main.c index b7260f37ee0..b4f5f486cd8 100644 --- a/dlls/initpki/main.c +++ b/dlls/initpki/main.c @@ -25,21 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(initpki); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -} - /***************************************************** * DllRegisterServer (INITPKI.@) */

1 0

Alexandre Julliard : fontsub: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 7a24a471d3bfbd7cc67097c1cca00cd5a473ab6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a24a471d3bfbd7cc67097c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:05:48 2021 +0100 fontsub: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fontsub/Makefile.in | 2 +- dlls/fontsub/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/fontsub/Makefile.in b/dlls/fontsub/Makefile.in index c1b36e65175..7ce57d27cdf 100644 --- a/dlls/fontsub/Makefile.in +++ b/dlls/fontsub/Makefile.in @@ -1,6 +1,6 @@ MODULE = fontsub.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index a0a6032d051..17bc0c7cc70 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -25,21 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(fontsub); -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding,

1 0

Hugh McMaster : regedit/tests: Add tests for forward and back slashes in key and value names.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: ee579a0f1dfe78f505e98af1f4adee020f2ddc37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee579a0f1dfe78f505e98af1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 22:24:05 2021 +1100 regedit/tests: Add tests for forward and back slashes in key and value names. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 43 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 34acd18228b..f9c12afb880 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -677,9 +677,19 @@ static void test_basic_import(void) verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); + /* Test forward and back slashes */ + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n"); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_basic_import_unicode(void) @@ -1090,9 +1100,19 @@ static void test_basic_import_unicode(void) verify_reg(hkey, "Wine22h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine22i", REG_NONE, NULL, 0, 0); + /* Test forward and back slashes */ + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"count/up\"=\"one/two/three\"\n" + "\"\\\\foo\\\\bar\"=\"\"\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\n\n"); + verify_reg(hkey, "count/up", REG_SZ, "one/two/three", 14, 0); + verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); + verify_key(hkey, "https://winehq.org"); + close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } static void test_basic_import_31(void) @@ -3544,6 +3564,13 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; + const char *slashes_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"count/up\"=\"one/two/three\"\r\n" + "\"\\\\foo\\\\bar\"=\"\"\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\https://winehq.org]\r\n\r\n"; + delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); @@ -3698,6 +3725,18 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Test registry export with forward and back slashes */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "https://winehq.org", &subkey); + close_key(subkey); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\\foo\\bar", REG_SZ, "", 1); + close_key(hkey); + + run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); + ok(compare_export("file.reg", slashes_test, TODO_REG_COMPARE), "compare_export() failed\n"); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); } START_TEST(regedit)

1 0

Hugh McMaster : regedit/tests: Use delete_key() and delete_tree() where possible.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

Module: wine Branch: master Commit: 294be8b7a2f13dc112a1e763ac47674f1a2d3a4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=294be8b7a2f13dc112a1e763… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 22:24:03 2021 +1100 regedit/tests: Use delete_key() and delete_tree() where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 7e84c4c9a2f..ad9e0a2bffb 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -492,7 +492,7 @@ static void test_basic_import(void) open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + delete_key(hkey, "Subkey\"1"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" @@ -500,7 +500,7 @@ static void test_basic_import(void) open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + delete_key(hkey, "Subkey/2"); /* Test the accepted range of the hex-based data types */ exec_import_str("REGEDIT4\n\n" @@ -902,7 +902,7 @@ static void test_basic_import_unicode(void) open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + delete_key(hkey, "Subkey\"1"); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" @@ -910,7 +910,7 @@ static void test_basic_import_unicode(void) open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + delete_key(hkey, "Subkey/2"); /* Test the accepted range of the hex-based data types */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3424,7 +3424,6 @@ error: static void test_export(void) { - LONG lr; HKEY hkey, subkey; DWORD dword; BYTE hex[4]; @@ -3567,9 +3566,7 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); - - lr = delete_tree(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS, "delete_tree() failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); /* Test the export order of registry keys */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); @@ -3580,7 +3577,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -3593,7 +3589,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with empty hex data */ @@ -3610,7 +3605,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export after importing alternative registry data types */ @@ -3627,7 +3621,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with embedded null characters */ @@ -3646,7 +3639,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -3675,7 +3667,6 @@ static void test_export(void) run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0