wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

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: 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

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

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

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: 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: 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: Use malloc() instead of HeapAlloc().
by Alexandre Julliard 23 Feb '21

23 Feb '21

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

Zebediah Figura : winegstreamer: Use wide-char string literals.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 1fb0b500b42fb2e56e5ddc5e65828fb97c464c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fb0b500b42fb2e56e5ddc5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 22 16:53:45 2021 -0600 winegstreamer: Use wide-char string literals. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 24 ++++++++---------------- dlls/winegstreamer/main.c | 18 +++++------------- dlls/winegstreamer/mfplat.c | 2 +- 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 84e6bcd61e4..acfd3b3ae4c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -89,7 +89,6 @@ static inline struct parser *impl_from_strmbase_filter(struct strmbase_filter *i return CONTAINING_RECORD(iface, struct parser, filter); } -static const WCHAR wcsInputPinName[] = {'i','n','p','u','t',' ','p','i','n',0}; static const IMediaSeekingVtbl GST_Seeking_Vtbl; static const IQualityControlVtbl GSTOutPin_QualityControl_Vtbl; @@ -1007,7 +1006,6 @@ static const struct strmbase_sink_ops sink_ops = static BOOL decodebin_parser_filter_init_gst(struct parser *filter) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = filter->wg_parser; unsigned int i, stream_count; WCHAR source_name[20]; @@ -1015,7 +1013,7 @@ static BOOL decodebin_parser_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1108,7 +1106,7 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, wcsInputPinName, &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &sink_ops, NULL); object->init_gst = decodebin_parser_filter_init_gst; object->source_query_accept = decodebin_parser_source_query_accept; @@ -1587,10 +1585,9 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = static BOOL wave_parser_filter_init_gst(struct parser *filter) { - static const WCHAR source_name[] = {'o','u','t','p','u','t',0}; struct wg_parser *parser = filter->wg_parser; - if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), source_name)) + if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), L"output")) return FALSE; return TRUE; @@ -1625,7 +1622,6 @@ static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1641,7 +1637,7 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &wave_parser_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_filter_init_gst; object->source_query_accept = wave_parser_source_query_accept; object->source_get_media_type = wave_parser_source_get_media_type; @@ -1668,7 +1664,6 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = static BOOL avi_splitter_filter_init_gst(struct parser *filter) { - static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; struct wg_parser *parser = filter->wg_parser; uint32_t i, stream_count; WCHAR source_name[20]; @@ -1676,7 +1671,7 @@ static BOOL avi_splitter_filter_init_gst(struct parser *filter) stream_count = unix_funcs->wg_parser_get_stream_count(parser); for (i = 0; i < stream_count; ++i) { - swprintf(source_name, ARRAY_SIZE(source_name), formatW, i); + swprintf(source_name, ARRAY_SIZE(source_name), L"Stream %02u", i); if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, i), source_name)) return FALSE; } @@ -1713,7 +1708,6 @@ static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1729,7 +1723,7 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &avi_splitter_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"input pin", &avi_splitter_sink_ops, NULL); object->init_gst = avi_splitter_filter_init_gst; object->source_query_accept = avi_splitter_source_query_accept; object->source_get_media_type = avi_splitter_source_get_media_type; @@ -1761,10 +1755,9 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = static BOOL mpeg_splitter_filter_init_gst(struct parser *filter) { - static const WCHAR source_name[] = {'A','u','d','i','o',0}; struct wg_parser *parser = filter->wg_parser; - if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), source_name)) + if (!create_pin(filter, unix_funcs->wg_parser_get_stream(parser, 0), L"Audio")) return FALSE; return TRUE; @@ -1822,7 +1815,6 @@ static const struct strmbase_filter_ops mpeg_splitter_ops = HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) { - static const WCHAR sink_name[] = {'I','n','p','u','t',0}; struct parser *object; if (!parser_init_gstreamer()) @@ -1838,7 +1830,7 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) } strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); - strmbase_sink_init(&object->sink, &object->filter, sink_name, &mpeg_splitter_sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, L"Input", &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; object->init_gst = mpeg_splitter_filter_init_gst; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 6f3be9095d6..ae26745773b 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,15 +31,6 @@ LONG object_locks; WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); -static const WCHAR wGstreamer_Splitter[] = -{'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; -static const WCHAR wave_parserW[] = -{'W','a','v','e',' ','P','a','r','s','e','r',0}; -static const WCHAR avi_splitterW[] = -{'A','V','I',' ','S','p','l','i','t','t','e','r',0}; -static const WCHAR mpeg_splitterW[] = -{'M','P','E','G','-','I',' ','S','t','r','e','a','m',' ','S','p','l','i','t','t','e','r',0}; - const struct unix_funcs *unix_funcs = NULL; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) @@ -336,11 +327,12 @@ HRESULT WINAPI DllRegisterServer(void) &IID_IFilterMapper2, (void **)&mapper))) return hr; - IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, avi_splitterW, NULL, NULL, NULL, &reg_avi_splitter); + IFilterMapper2_RegisterFilter(mapper, &CLSID_AviSplitter, L"AVI Splitter", NULL, NULL, NULL, &reg_avi_splitter); IFilterMapper2_RegisterFilter(mapper, &CLSID_decodebin_parser, - wGstreamer_Splitter, NULL, NULL, NULL, &reg_decodebin_parser); - IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, mpeg_splitterW, NULL, NULL, NULL, &reg_mpeg_splitter); - IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, wave_parserW, NULL, NULL, NULL, &reg_wave_parser); + L"GStreamer splitter filter", NULL, NULL, NULL, &reg_decodebin_parser); + IFilterMapper2_RegisterFilter(mapper, &CLSID_MPEG1Splitter, + L"MPEG-I Stream Splitter", NULL, NULL, NULL, &reg_mpeg_splitter); + IFilterMapper2_RegisterFilter(mapper, &CLSID_WAVEParser, L"Wave Parser", NULL, NULL, NULL, &reg_wave_parser); IFilterMapper2_Release(mapper); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 439fc2ee5ed..22581eb7311 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -446,7 +446,7 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -static WCHAR audio_converterW[] = {'A','u','d','i','o',' ','C','o','n','v','e','r','t','e','r',0}; +static WCHAR audio_converterW[] = L"Audio Converter"; static const GUID *audio_converter_supported_types[] = { &MFAudioFormat_PCM,

1 0

Alistair Leslie-Hughes : msado15: Add helper function to create CommandText interface.
by Alexandre Julliard 23 Feb '21

23 Feb '21

Module: wine Branch: master Commit: 0949cb4552bb9435211fff5b6404d9bcae5d2358 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0949cb4552bb9435211fff5b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 23 07:58:34 2021 +1100 msado15: Add helper function to create CommandText interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/command.c | 1 + dlls/msado15/connection.c | 83 +++++++++++++++++++++++++++--------------- dlls/msado15/main.c | 1 + dlls/msado15/msado15_private.h | 2 + dlls/msado15/stream.c | 1 + 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index d19108a1a25..9a56ced25ac 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -20,6 +20,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 500be033199..d55c0d18a35 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -264,61 +264,90 @@ static HRESULT WINAPI connection_Close( _Connection *iface ) return S_OK; } -static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, - LONG options, _Recordset **record_set ) +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) { - struct connection *connection = impl_from_Connection( iface ); HRESULT hr; IOpenRowset *openrowset; - IDBCreateCommand *create_command = NULL; - ICommand *cmd = NULL; - ICommandText *comand_text = NULL; - DBROWCOUNT affected; - IUnknown *rowset = NULL; - _Recordset *recordset = NULL; - ADORecordsetConstruction *construct; + ICommandText *command_text; + ICommand *cmd; + IDBCreateCommand *create_command; - FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); - - if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); - - hr = IUnknown_QueryInterface(connection->session, &IID_IOpenRowset, (void**)&openrowset); + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); if (FAILED(hr)) return hr; hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + IOpenRowset_Release(openrowset); if (FAILED(hr)) - goto done; + return hr; hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + IDBCreateCommand_Release(create_command); if (FAILED(hr)) - goto done; + return hr; - hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = ICommand_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); + ICommand_Release(cmd); if (FAILED(hr)) { FIXME("Currently only ICommandText interface is support\n"); - goto done; + return hr; + } + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, command); + if (FAILED(hr)) + { + ICommandText_Release(command_text); + return hr; } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, command); + *cmd_text = command_text; + + return S_OK; +} + +static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARIANT *records_affected, + LONG options, _Recordset **record_set ) +{ + struct connection *connection = impl_from_Connection( iface ); + HRESULT hr; + ICommandText *comand_text; + DBROWCOUNT affected; + IUnknown *rowset; + _Recordset *recordset; + ADORecordsetConstruction *construct; + + FIXME( "%p, %s, %p, 0x%08x, %p Semi-stub\n", iface, debugstr_w(command), records_affected, options, record_set ); + + if (connection->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + + hr = create_command_text(connection->session, command, &comand_text); if (FAILED(hr)) - goto done; + return hr; hr = ICommandText_Execute(comand_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); + ICommandText_Release(comand_text); if (FAILED(hr)) - goto done; + return hr; hr = Recordset_create( (void**)&recordset); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + return hr; + } hr = _Recordset_QueryInterface(recordset, &IID_ADORecordsetConstruction, (void**)&construct); if (FAILED(hr)) - goto done; + { + IUnknown_Release(rowset); + _Recordset_Release(recordset); + return hr; + } ADORecordsetConstruction_put_Rowset(construct, rowset); ADORecordsetConstruction_Release(construct); + IUnknown_Release(rowset); if (records_affected) { @@ -329,12 +358,6 @@ static HRESULT WINAPI connection_Execute( _Connection *iface, BSTR command, VARI _Recordset_put_CursorLocation(recordset, connection->location); *record_set = recordset; -done: - if (rowset) IUnknown_Release(rowset); - if (comand_text) ICommandText_Release(comand_text); - if (cmd) ICommand_Release(cmd); - if (create_command) IDBCreateCommand_Release(create_command); - if (openrowset) IOpenRowset_Release(openrowset); return hr; } diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 770a02fc59d..0b8de1f9117 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -22,6 +22,7 @@ #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h" diff --git a/dlls/msado15/msado15_private.h b/dlls/msado15/msado15_private.h index f6c60f0304c..dd98c382e2b 100644 --- a/dlls/msado15/msado15_private.h +++ b/dlls/msado15/msado15_private.h @@ -26,6 +26,8 @@ HRESULT Connection_create( void ** ) DECLSPEC_HIDDEN; HRESULT Recordset_create( void ** ) DECLSPEC_HIDDEN; HRESULT Stream_create( void ** ) DECLSPEC_HIDDEN; +HRESULT create_command_text(IUnknown *session, BSTR command, ICommandText **cmd_text) DECLSPEC_HIDDEN; + static inline void *heap_realloc_zero( void *mem, SIZE_T len ) { if (!mem) return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index c6add70b1bc..b40f664dcf1 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -21,6 +21,7 @@ #include "winbase.h" #define COBJMACROS #include "objbase.h" +#include "msdasc.h" #include "msado15_backcompat.h" #include "wine/debug.h"

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
92
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 February 2021