February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Remove some redundant includes.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 18b6115d53b7da0741d40cad05bb1066676911d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b6115d53b7da0741d40cad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:47 2021 -0600 winegstreamer: Remove some redundant includes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/audioconvert.c | 1 - dlls/winegstreamer/gst_private.h | 8 ++------ dlls/winegstreamer/gstdemux.c | 5 ----- dlls/winegstreamer/main.c | 1 - dlls/winegstreamer/media_source.c | 10 ---------- dlls/winegstreamer/mfplat.c | 5 ----- dlls/winegstreamer/wg_parser.c | 1 - 7 files changed, 2 insertions(+), 29 deletions(-) diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c index 304e1c8b067..33350fb3566 100644 --- a/dlls/winegstreamer/audioconvert.c +++ b/dlls/winegstreamer/audioconvert.c @@ -21,7 +21,6 @@ #include "mfapi.h" #include "mferror.h" -#include "mfidl.h" #include "ks.h" #include "ksmedia.h" diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 3a5445a27ce..55a62361966 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -21,6 +21,7 @@ #ifndef __GST_PRIVATE_INCLUDED__ #define __GST_PRIVATE_INCLUDED__ +#include <assert.h> #include <stdarg.h> #include <stdbool.h> #include <stdint.h> @@ -29,13 +30,8 @@ #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "winuser.h" #include "dshow.h" -#include "strmif.h" -#include "mfobjects.h" +#include "mfidl.h" #include "wine/debug.h" #include "wine/strmbase.h" diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 985183b0a35..e9e7c3a0f9f 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -23,14 +23,9 @@ #include "gst_private.h" #include "gst_guids.h" -#include "vfwmsgs.h" #include "amvideo.h" -#include "wine/debug.h" - -#include <assert.h> #include <limits.h> - #include "dvdmedia.h" #include "mmreg.h" #include "ks.h" diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index ae26745773b..d5c06bf3279 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -21,7 +21,6 @@ #include "gst_private.h" #include "winternl.h" #include "rpcproxy.h" -#include "wine/debug.h" #include "initguid.h" #include "gst_guids.h" diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index f72b4ff2fd0..3260175f45a 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -20,19 +20,9 @@ #include "gst_private.h" -#include <assert.h> -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSUNION - #include "mfapi.h" #include "mferror.h" -#include "mfidl.h" -#include "mfobjects.h" -#include "wine/debug.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index e6913d099b0..602fa631a43 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -19,12 +19,7 @@ #include "gst_private.h" -#include <assert.h> -#include <stdarg.h> - -#include "gst_private.h" #include "mfapi.h" -#include "mfidl.h" #include "ks.h" #include "ksmedia.h" diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a7b3e6348cf..94f677538c7 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -30,7 +30,6 @@ #include "gst_private.h" #include "winternl.h" -#include <assert.h> #include <gst/gst.h> #include <gst/video/video.h> #include <gst/audio/audio.h>

1 0

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

23 Feb '21

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: Rename gstdemux.c to quartz_parser.c.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 3f5df70ec6af21825bcd918281595c1a1c96ef73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f5df70ec6af21825bcd9182… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:49 2021 -0600 winegstreamer: Rename gstdemux.c to quartz_parser.c. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 2 +- dlls/winegstreamer/Makefile.in | 2 +- dlls/winegstreamer/{gstdemux.c => quartz_parser.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 7c8cfee24ea..d1bc8658e02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -114,7 +114,7 @@ F: dlls/qdvd/ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ -F: dlls/winegstreamer/gstdemux.c +F: dlls/winegstreamer/quartz_parser.c F: dlls/wineqtdecoder/ DirectWrite diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 996818fa457..b8b18330e3d 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -10,13 +10,13 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ audioconvert.c \ filter.c \ - gstdemux.c \ main.c \ media_source.c \ mediatype.c \ mfplat.c \ pin.c \ qualitycontrol.c \ + quartz_parser.c \ seeking.c \ wg_parser.c diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/quartz_parser.c similarity index 100% rename from dlls/winegstreamer/gstdemux.c rename to dlls/winegstreamer/quartz_parser.c

1 0

Zebediah Figura : winegstreamer: Link to strmbase.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: da28c6bb4b3fcdf4871f264a630a95f3c7d3e307 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da28c6bb4b3fcdf4871f264a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:50 2021 -0600 winegstreamer: Link to strmbase. This reverts abdaa6f21f672c882ab60583d822789154cefecf. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index b8b18330e3d..4d5dece64b3 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,23 +1,17 @@ MODULE = winegstreamer.dll -IMPORTS = strmiids uuid ole32 mfuuid +IMPORTS = strmbase strmiids uuid ole32 mfuuid DELAYIMPORTS = mfplat EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) -PARENTSRC = ../strmbase EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ audioconvert.c \ - filter.c \ main.c \ media_source.c \ - mediatype.c \ mfplat.c \ - pin.c \ - qualitycontrol.c \ quartz_parser.c \ - seeking.c \ wg_parser.c IDL_SRCS = \

1 0

Damjan Jovanovic : wldap32: Implement setting the LDAP_OPT_REFERRALS option.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 99fb4b17f3ee36e5dc9775c7446ba7b2d13d0827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99fb4b17f3ee36e5dc9775c7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Feb 18 18:49:25 2021 +0200 wldap32: Implement setting the LDAP_OPT_REFERRALS option. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index cf948bf037c..388432a442c 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -497,11 +497,20 @@ ULONG CDECL ldap_set_optionW( WLDAP32_LDAP *ld, int option, void *value ) controlarrayfreeU( ctrlsU ); return ret; } + case WLDAP32_LDAP_OPT_REFERRALS: + { + void *openldap_referral = LDAP_OPT_ON; + if (value == LDAP_OPT_OFF) + openldap_referral = LDAP_OPT_OFF; + else + FIXME("upgrading referral value %p to LDAP_OPT_ON (OpenLDAP lacks sufficient granularity)\n", value); + return map_error( ldap_set_option( ld->ld, option, openldap_referral )); + break; + } case WLDAP32_LDAP_OPT_DEREF: case WLDAP32_LDAP_OPT_DESC: case WLDAP32_LDAP_OPT_ERROR_NUMBER: case WLDAP32_LDAP_OPT_PROTOCOL_VERSION: - case WLDAP32_LDAP_OPT_REFERRALS: case WLDAP32_LDAP_OPT_SIZELIMIT: case WLDAP32_LDAP_OPT_TIMELIMIT: return map_error( ldap_set_option( ld->ld, option, value ));

1 0

Hugh McMaster : regedit/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 8a43d29ef494eca3a36c4202e494656982e47c1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a43d29ef494eca3a36c4202… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 22:24:00 2021 +1100 regedit/tests: Check for elevated privileges before cleaning up the Windows 3.1 test key and running unit tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 66b95624455..de4ddfa76a3 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1094,15 +1094,12 @@ static void test_basic_import_unicode(void) static void test_basic_import_31(void) { HKEY hkey; + DWORD dispos; LONG lr; - lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, - "RegDeleteKeyA failed: %d\n", lr); - /* Check if regedit.exe is running with elevated privileges */ lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ, NULL, &hkey, NULL); + KEY_READ|KEY_SET_VALUE, NULL, &hkey, &dispos); if (lr == ERROR_ACCESS_DENIED) { win_skip("regedit.exe is not running with elevated privileges; " @@ -1110,6 +1107,9 @@ static void test_basic_import_31(void) return; } + if (dispos == REG_OPENED_EXISTING_KEY) + delete_value(hkey, NULL); + /* Test simple value */ exec_import_str("REGEDIT\r\n" "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n");

1 0

Hugh McMaster : regedit/tests: Ensure test key is fully removed before each sequence begins.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: c86e62442ffbfa412d7729c4c7c3ef3512f95d72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c86e62442ffbfa412d7729c4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 22:24:01 2021 +1100 regedit/tests: Ensure test key is fully removed before each sequence begins. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 57 ++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index de4ddfa76a3..3b78951bfa9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -273,9 +273,8 @@ static void test_basic_import(void) char buffer[256]; BYTE hex[8]; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, - "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -685,8 +684,8 @@ static void test_basic_import_unicode(void) char buffer[256]; BYTE hex[8]; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1155,12 +1154,11 @@ static void test_basic_import_31(void) static void test_invalid_import(void) { - LONG lr; HKEY hkey; DWORD dword = 0x8; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1661,12 +1659,11 @@ static void test_invalid_import(void) static void test_invalid_import_unicode(void) { - LONG lr; HKEY hkey; DWORD dword = 0x8; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2227,12 +2224,11 @@ static void test_invalid_import_31(void) static void test_comments(void) { - LONG lr; HKEY hkey; DWORD dword; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2466,12 +2462,11 @@ static void test_comments(void) static void test_comments_unicode(void) { - LONG lr; HKEY hkey; DWORD dword; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2711,8 +2706,8 @@ static void test_import_with_whitespace(void) LONG lr; DWORD dword; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); @@ -2859,8 +2854,8 @@ static void test_import_with_whitespace_unicode(void) LONG lr; DWORD dword; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); @@ -3006,8 +3001,8 @@ static void test_key_creation_and_deletion(void) HKEY hkey, subkey; LONG lr; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); @@ -3146,8 +3141,8 @@ static void test_key_creation_and_deletion_unicode(void) HKEY hkey, subkey; LONG lr; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); @@ -3288,8 +3283,8 @@ static void test_value_deletion(void) DWORD dword = 0x8; BYTE hex[4] = {0x11, 0x22, 0x33, 0x44}; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); @@ -3342,8 +3337,8 @@ static void test_value_deletion_unicode(void) DWORD dword = 0x8; BYTE hex[4] = {0x11, 0x22, 0x33, 0x44}; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"); @@ -3527,8 +3522,8 @@ static void test_export(void) "\"Wine4g\"=\"Value2\"\r\n" "\"Wine4h\"=\"abc\"\r\n\r\n"; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); /* Test registry export with an empty key */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey);

1 0

Hugh McMaster : regedit/tests: Replace RegCloseKey() with the helper function close_key().
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: a3b1743ced4e7e760de47ec0b81f84d3e5e1b6e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b1743ced4e7e760de47ec0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 22:24:02 2021 +1100 regedit/tests: Replace RegCloseKey() with the helper function close_key(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 103 ++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b1743ced4e7e760de4…

1 0

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

23 Feb '21

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

Hugh McMaster : regedit/tests: Add additional tests with embedded NUL characters.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 704bd45da5a718fbf7be7b5d07bfcb7dfc831ab3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=704bd45da5a718fbf7be7b5d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 22:24:04 2021 +1100 regedit/tests: Add additional tests with embedded NUL characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index ad9e0a2bffb..34acd18228b 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1649,7 +1649,7 @@ static void test_invalid_import(void) "\"Wine33c\"=\"Value1\\0\n" "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine33e\"=\"Value3\\0Value4\n" - "\"Wine33f\"=\"\\0Value4\n\n"); + "\"Wine33f\"=\"\\0Value5\n\n"); verify_reg_nonexist(hkey, "Wine33a"); verify_reg_nonexist(hkey, "Wine33b"); verify_reg_nonexist(hkey, "Wine33c"); @@ -1657,6 +1657,21 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine33e"); verify_reg_nonexist(hkey, "Wine33f"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine34a\"=\"\\0\"\n" + "\"Wine34b\"=\"\\0\\0\"\n" + "\"Wine34c\"=\"Value1\\0\"\n" + "\"Wine34d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine34e\"=\"Value3\\0Value4\"\n" + "\"Wine34f\"=\"\\0Value5\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine34a"); + todo_wine verify_reg_nonexist(hkey, "Wine34b"); + todo_wine verify_reg_nonexist(hkey, "Wine34c"); + todo_wine verify_reg_nonexist(hkey, "Wine34d"); + todo_wine verify_reg_nonexist(hkey, "Wine34e"); + todo_wine verify_reg_nonexist(hkey, "Wine34f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -2160,7 +2175,7 @@ static void test_invalid_import_unicode(void) "\"Wine33c\"=\"Value1\\0\n" "\"Wine33d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine33e\"=\"Value3\\0Value4\n" - "\"Wine33f\"=\"\\0Value4\n\n"); + "\"Wine33f\"=\"\\0Value5\n\n"); verify_reg_nonexist(hkey, "Wine33a"); verify_reg_nonexist(hkey, "Wine33b"); verify_reg_nonexist(hkey, "Wine33c"); @@ -2168,6 +2183,21 @@ static void test_invalid_import_unicode(void) verify_reg_nonexist(hkey, "Wine33e"); verify_reg_nonexist(hkey, "Wine33f"); + exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine34a\"=\"\\0\"\n" + "\"Wine34b\"=\"\\0\\0\"\n" + "\"Wine34c\"=\"Value1\\0\"\n" + "\"Wine34d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine34e\"=\"Value3\\0Value4\"\n" + "\"Wine34f\"=\"\\0Value5\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Wine34a"); + todo_wine verify_reg_nonexist(hkey, "Wine34b"); + todo_wine verify_reg_nonexist(hkey, "Wine34c"); + todo_wine verify_reg_nonexist(hkey, "Wine34d"); + todo_wine verify_reg_nonexist(hkey, "Wine34e"); + todo_wine verify_reg_nonexist(hkey, "Wine34f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0