February 2021 - Wine-Commits

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

Feb. 23, 2021

Module: wine Branch: master Commit: cbcf26468d862576d66b2c5cd0aaca343bf0c8c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbcf26468d862576d66b2c5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:52 2021 +0100 msnet32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msnet32/Makefile.in | 2 +- dlls/msnet32/msnet_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index 4ec8226c94b..7365debcbba 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,5 +1,5 @@ MODULE = msnet32.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = msnet_main.c diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 8303b8f1730..d765c202631 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -28,22 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msnet); -/*********************************************************************** - * DllMain (MSNET32.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} - /*********************************************************************** * @ (MSNET32.57) */

1 0

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

Feb. 23, 2021

Module: wine Branch: master Commit: 882454539edf30fa69c9cfe16c98f6f8d46e8d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=882454539edf30fa69c9cfe1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:48 2021 +0100 msisip: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msisip/Makefile.in | 2 +- dlls/msisip/main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/msisip/Makefile.in b/dlls/msisip/Makefile.in index c19f18373ef..dd9b6ed5150 100644 --- a/dlls/msisip/Makefile.in +++ b/dlls/msisip/Makefile.in @@ -1,7 +1,7 @@ MODULE = msisip.dll IMPORTS = crypt32 ole32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c index 11893f149c3..6324542428a 100644 --- a/dlls/msisip/main.c +++ b/dlls/msisip/main.c @@ -28,22 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msisip); -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; -} - static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000, { 0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }};

1 0

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

Feb. 23, 2021

Module: wine Branch: master Commit: 986c0a8cbba1af78b0bd9fbd300abd4abcd7853b URL: https://source.winehq.org/git/wine.git/?a=commit;h=986c0a8cbba1af78b0bd9fbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:36 2021 +0100 mgmtapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mgmtapi/Makefile.in | 2 +- dlls/mgmtapi/mgmtapi.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/mgmtapi/Makefile.in b/dlls/mgmtapi/Makefile.in index 0093f745f8c..f179c88c658 100644 --- a/dlls/mgmtapi/Makefile.in +++ b/dlls/mgmtapi/Makefile.in @@ -1,5 +1,5 @@ MODULE = mgmtapi.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = mgmtapi.c diff --git a/dlls/mgmtapi/mgmtapi.c b/dlls/mgmtapi/mgmtapi.c index 06c540a527e..ea4a40832b0 100644 --- a/dlls/mgmtapi/mgmtapi.c +++ b/dlls/mgmtapi/mgmtapi.c @@ -23,21 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mgmtapi); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - BOOL WINAPI SnmpMgrTrapListen(HANDLE *available) { FIXME("stub: %p\n", available);

1 0

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

Feb. 23, 2021

Module: wine Branch: master Commit: 4e31bcc11a3f41273b6597ab140aece55f6315d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e31bcc11a3f41273b6597ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:32 2021 +0100 mfplay: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/Makefile.in | 2 +- dlls/mfplay/player.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/mfplay/Makefile.in b/dlls/mfplay/Makefile.in index 401c0c7d64d..539240ceadc 100644 --- a/dlls/mfplay/Makefile.in +++ b/dlls/mfplay/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplay.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ player.c diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d75ccfb1069..1e4f1f561f4 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -26,20 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - HRESULT WINAPI MFPCreateMediaPlayer(const WCHAR *url, BOOL start_playback, MFP_CREATION_OPTIONS options, IMFPMediaPlayerCallback *callback, HWND hwnd, IMFPMediaPlayer **player) {

1 0

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

Feb. 23, 2021

Module: wine Branch: master Commit: 987ca1f1ffd3874028c8dbe07e923338d0875159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=987ca1f1ffd3874028c8dbe0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:21 2021 +0100 loadperf: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/loadperf/Makefile.in | 2 +- dlls/loadperf/loadperf_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/loadperf/Makefile.in b/dlls/loadperf/Makefile.in index 9258ec06353..5ca8959ebd1 100644 --- a/dlls/loadperf/Makefile.in +++ b/dlls/loadperf/Makefile.in @@ -1,7 +1,7 @@ MODULE = loadperf.dll IMPORTLIB = loadperf -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ loadperf_main.c diff --git a/dlls/loadperf/loadperf_main.c b/dlls/loadperf/loadperf_main.c index 54901a739af..c58f46f4204 100644 --- a/dlls/loadperf/loadperf_main.c +++ b/dlls/loadperf/loadperf_main.c @@ -31,22 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(loadperf); -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; -} - static WCHAR *strdupAW(const char *str) { WCHAR *ret = NULL;

1 0

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

Feb. 23, 2021

Module: wine Branch: master Commit: fe0d233f55ee5bb844ad96ff61063a6daa7579a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe0d233f55ee5bb844ad96ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:17 2021 +0100 itircl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itircl/Makefile.in | 2 +- dlls/itircl/itircl_main.c | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/itircl/Makefile.in b/dlls/itircl/Makefile.in index 6e360ebeb44..11eff81d3e0 100644 --- a/dlls/itircl/Makefile.in +++ b/dlls/itircl/Makefile.in @@ -1,6 +1,6 @@ MODULE = itircl.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ itircl_main.c diff --git a/dlls/itircl/itircl_main.c b/dlls/itircl/itircl_main.c index e35bbba3359..d105b6608d5 100644 --- a/dlls/itircl/itircl_main.c +++ b/dlls/itircl/itircl_main.c @@ -27,22 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(itircl); -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 (ITIRCL.@) */

1 0

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

Feb. 23, 2021

Module: wine Branch: master Commit: e0ff40332f570d35bc6d685a21c6c263af049ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ff40332f570d35bc6d685a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 10:06:44 2021 +0100 msasn1: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/Makefile.in | 2 +- dlls/msasn1/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/msasn1/Makefile.in b/dlls/msasn1/Makefile.in index b57eda7793b..18d6d92526c 100644 --- a/dlls/msasn1/Makefile.in +++ b/dlls/msasn1/Makefile.in @@ -1,7 +1,7 @@ MODULE = msasn1.dll IMPORTLIB = msasn1 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index fc867e7b815..2ebaa8c485c 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -29,21 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msasn1); -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; -} - ASN1module_t WINAPI ASN1_CreateModule(ASN1uint32_t ver, ASN1encodingrule_e rule, ASN1uint32_t flags, ASN1uint32_t pdu, const ASN1GenericFun_t encoder[], const ASN1GenericFun_t decoder[], const ASN1FreeFun_t freemem[],

1 0

Zebediah Figura : winegstreamer: Link to strmbase.
by Alexandre Julliard Feb. 23, 2021

Feb. 23, 2021

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 Feb. 23, 2021

Feb. 23, 2021

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

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

Feb. 23, 2021

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