February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Don't make the pad caps writable in pad_added_cb().
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 2492bda6e1f82a170db60f25080444f36ab239dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2492bda6e1f82a170db60f25… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 23 16:07:02 2021 -0600 winegstreamer: Don't make the pad caps writable in pad_added_cb(). There is no need. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 341ca182749..a2eaf1958d6 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1000,7 +1000,7 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) if (gst_pad_is_linked(pad)) return; - caps = gst_caps_make_writable(gst_pad_query_caps(pad, NULL)); + caps = gst_pad_query_caps(pad, NULL); name = gst_structure_get_name(gst_caps_get_structure(caps, 0)); if (!(stream = create_stream(parser)))

1 0

Zebediah Figura : winegstreamer: Rename gst_base_src_perform_seek() to src_perform_seek().
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 1649389edca12d2998f72a159b2bbbf247176163 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1649389edca12d2998f72a15… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 23 16:07:03 2021 -0600 winegstreamer: Rename gst_base_src_perform_seek() to src_perform_seek(). Avoid polluting the GStreamer namespace. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a2eaf1958d6..f76ca903b80 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1387,7 +1387,7 @@ static GstBusSyncReply bus_handler_cb(GstBus *bus, GstMessage *msg, gpointer use return GST_BUS_DROP; } -static gboolean gst_base_src_perform_seek(struct wg_parser *parser, GstEvent *event) +static gboolean src_perform_seek(struct wg_parser *parser, GstEvent *event) { BOOL thread = !!parser->push_thread; GstSeekType cur_type, stop_type; @@ -1444,7 +1444,7 @@ static gboolean src_event_cb(GstPad *pad, GstObject *parent, GstEvent *event) switch (event->type) { case GST_EVENT_SEEK: - ret = gst_base_src_perform_seek(parser, event); + ret = src_perform_seek(parser, event); break; case GST_EVENT_FLUSH_START:

1 0

Alexandre Julliard : ntdsapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 9f9d1e6675c3cf102b1a345058bb926b1bfd6b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f9d1e6675c3cf102b1a3450… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:01 2021 +0100 ntdsapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdsapi/Makefile.in | 2 +- dlls/ntdsapi/ntdsapi.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index afe29a38fa6..e2f1eca4865 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -2,7 +2,7 @@ MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ ntdsapi.c diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 929b9944846..2438197a7a3 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -27,25 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdsapi); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %d, %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; -} - /*********************************************************************** * DsBindA (NTDSAPI.@) */

1 0

Alexandre Julliard : ntprint: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 2e35f400f8b27d10a9796d458c14dfd227c49f30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e35f400f8b27d10a9796d45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:05 2021 +0100 ntprint: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntprint/Makefile.in | 2 +- dlls/ntprint/ntprint.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index 29edde3bc4b..55644dcfc7a 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntprint.dll IMPORTS = winspool -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ ntprint.c diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 100385725c8..6a4cb57c7f6 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -39,25 +39,6 @@ typedef struct { DWORD installed; /* Number of installed Monitors */ } monitorinfo_t; -/***************************************************** - * DllMain - */ -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 ); - break; - } - return TRUE; -} - /***************************************************** * PSetupCreateMonitorInfo [NTPRINT.@] *

1 0

Alexandre Julliard : pdh: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 918a41e4835c4b2d5351c370b16395d0c2f002fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=918a41e4835c4b2d5351c370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 20:54:50 2021 +0100 pdh: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/Makefile.in | 2 +- dlls/pdh/pdh_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index d3ce7a4e13e..59e0442a4d0 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,7 +1,7 @@ MODULE = pdh.dll IMPORTLIB = pdh -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ pdh_main.c diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index d3bf6ab8706..73d4fef2a14 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -67,25 +67,6 @@ static inline WCHAR *pdh_strdup_aw( const char *src ) return dst; } -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; - case DLL_PROCESS_DETACH: - if (lpvReserved) break; - DeleteCriticalSection(&pdh_handle_cs); - break; - } - - return TRUE; -} - union value { LONG longvalue;

1 0

Alexandre Julliard : pidgen: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 4394b4250b2f94174b5d786ea5db218a590ac04a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4394b4250b2f94174b5d786e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:08 2021 +0100 pidgen: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pidgen/Makefile.in | 2 +- dlls/pidgen/main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/pidgen/Makefile.in b/dlls/pidgen/Makefile.in index 5923cb25786..d737fff8119 100644 --- a/dlls/pidgen/Makefile.in +++ b/dlls/pidgen/Makefile.in @@ -1,6 +1,6 @@ MODULE = pidgen.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 35af226ffd2..dc0c50c83ae 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -24,25 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidgen); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("(%p, %d, %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; -} - int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) { FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8);

1 0

Alexandre Julliard : printui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 790ab8d24cc58f81870ecbac0128a56c9d7d7620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=790ab8d24cc58f81870ecbac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:12 2021 +0100 printui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/printui/Makefile.in | 2 +- dlls/printui/printui.c | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index 8e76c7c29ff..263cc95ccfa 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,7 +1,7 @@ MODULE = printui.dll IMPORTS = shell32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ printui.c diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index f35107fa0b2..09f527bfb0a 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -210,26 +210,6 @@ static BOOL parse_rundll(context_t * cx) return TRUE; } -/***************************************************** - * DllMain - */ -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 ); - break; - } - return TRUE; -} - - /***************************************************** * PrintUIEntryW [printui.@] * Commandline-Interface for using printui.dll with rundll32.exe

1 0

Alexandre Julliard : prntvpt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 88313bd112ea9908e393fd5cc76c35102cbadc98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88313bd112ea9908e393fd5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:16 2021 +0100 prntvpt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/Makefile.in | 2 +- dlls/prntvpt/main.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 452faa4fbf5..09818bc7b74 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -2,7 +2,7 @@ MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c \ diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 197fb54022c..d6ad0cff46a 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -43,21 +43,6 @@ static WCHAR *heap_strdupW(const WCHAR *src) return dst; } -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %d, %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; -} - HRESULT WINAPI PTReleaseMemory(PVOID mem) { heap_free(mem);

1 0

Alexandre Julliard : pstorec: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 6c2e20bad4ca95925b301b74578b8d726aa16449 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2e20bad4ca95925b301b74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:20 2021 +0100 pstorec: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pstorec/Makefile.in | 2 +- dlls/pstorec/pstorec.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index f8009e21a22..dd4dd616a33 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,7 +1,7 @@ MODULE = pstorec.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ pstorec.c diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 02cd803c116..65debd3e6f4 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -43,21 +43,6 @@ static inline PStore_impl *impl_from_IPStore(IPStore *iface) return CONTAINING_RECORD(iface, PStore_impl, IPStore_iface); } -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("%p %x %p\n", hinst, fdwReason, fImpLoad); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - break; - } - return TRUE; -} - /************************************************************************** * IPStore->QueryInterface */

1 0

Alexandre Julliard : query: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 24 Feb '21

24 Feb '21

Module: wine Branch: master Commit: 0e3df155303c905a1fca243fad81e73c73eb0c32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e3df155303c905a1fca243f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 24 10:28:23 2021 +0100 query: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/query/Makefile.in | 2 +- dlls/query/query_main.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 075a645d508..d2c06c4a262 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,7 +1,7 @@ MODULE = query.dll IMPORTS = uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ query_main.c diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index b93973addea..4312d483fc2 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -36,19 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(query); -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -} - /*********************************************************************** * DllGetClassObject (QUERY.@) */

1 0