February 2021 - Wine-commits

Zebediah Figura : quartz: Inline the WndNotify structure into struct filter_graph.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 99c098728994c8c57540eaff60752204021ece5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c098728994c8c57540eaff… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:11 2021 -0600 quartz: Inline the WndNotify structure into struct filter_graph. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 61 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 25aa78433b9..a060ee840db 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -42,13 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct { - HWND hWnd; /* Target window */ - UINT msg; /* User window message */ - LONG_PTR instance; /* User data */ - int disabled; /* Disabled messages posting */ -} WndNotify; - struct media_event { struct list entry; @@ -113,9 +106,11 @@ struct filter_graph struct list media_events; HANDLE media_event_handle; + HWND media_event_window; + UINT media_event_message; + LPARAM media_event_lparam; HANDLE hEventCompletion; int CompletionStatus; - WndNotify notif; int nRenderers; int EcCompleteCount; int HandleEcComplete; @@ -141,6 +136,7 @@ struct filter_graph unsigned int needs_async_run : 1; unsigned int got_ec_complete : 1; + unsigned int media_events_disabled : 1; }; struct enum_filters @@ -317,8 +313,8 @@ static BOOL queue_media_event(struct filter_graph *graph, LONG code, list_add_tail(&graph->media_events, &event->entry); SetEvent(graph->media_event_handle); - if (graph->notif.hWnd) - PostMessageW(graph->notif.hWnd, graph->notif.msg, 0, graph->notif.instance); + if (graph->media_event_window) + PostMessageW(graph->media_event_window, graph->media_event_message, 0, graph->media_event_lparam); return TRUE; } @@ -4826,44 +4822,47 @@ static HRESULT WINAPI MediaEvent_FreeEventParams(IMediaEventEx *iface, LONG lEvC } /*** IMediaEventEx methods ***/ -static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, OAHWND hwnd, LONG lMsg, - LONG_PTR lInstanceData) +static HRESULT WINAPI MediaEvent_SetNotifyWindow(IMediaEventEx *iface, + OAHWND window, LONG message, LONG_PTR lparam) { - struct filter_graph *This = impl_from_IMediaEventEx(iface); + struct filter_graph *graph = impl_from_IMediaEventEx(iface); - TRACE("(%p/%p)->(%08lx, %d, %08lx)\n", This, iface, hwnd, lMsg, lInstanceData); + TRACE("graph %p, window %#Ix, message %#x, lparam %#Ix.\n", graph, window, message, lparam); - This->notif.hWnd = (HWND)hwnd; - This->notif.msg = lMsg; - This->notif.instance = lInstanceData; + graph->media_event_window = (HWND)window; + graph->media_event_message = message; + graph->media_event_lparam = lparam; return S_OK; } -static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG lNoNotifyFlags) +static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG flags) { - struct filter_graph *This = impl_from_IMediaEventEx(iface); + struct filter_graph *graph = impl_from_IMediaEventEx(iface); - TRACE("(%p/%p)->(%d)\n", This, iface, lNoNotifyFlags); + TRACE("graph %p, flags %#x.\n", graph, flags); - if ((lNoNotifyFlags != 0) && (lNoNotifyFlags != 1)) - return E_INVALIDARG; + if (flags & ~AM_MEDIAEVENT_NONOTIFY) + { + WARN("Invalid flags %#x, returning E_INVALIDARG.\n", flags); + return E_INVALIDARG; + } - This->notif.disabled = lNoNotifyFlags; + graph->media_events_disabled = flags; return S_OK; } -static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, LONG *lplNoNotifyFlags) +static HRESULT WINAPI MediaEvent_GetNotifyFlags(IMediaEventEx *iface, LONG *flags) { - struct filter_graph *This = impl_from_IMediaEventEx(iface); + struct filter_graph *graph = impl_from_IMediaEventEx(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, lplNoNotifyFlags); + TRACE("graph %p, flags %p.\n", graph, flags); - if (!lplNoNotifyFlags) - return E_POINTER; + if (!flags) + return E_POINTER; - *lplNoNotifyFlags = This->notif.disabled; + *flags = graph->media_events_disabled; return S_OK; } @@ -5246,7 +5245,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, { if (++graph->EcCompleteCount == graph->nRenderers) { - if (graph->notif.disabled) + if (graph->media_events_disabled) SetEvent(graph->media_event_handle); else queue_media_event(graph, EC_COMPLETE, S_OK, 0); @@ -5259,7 +5258,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG code, { FIXME("EC_REPAINT is not handled.\n"); } - else if (!graph->notif.disabled) + else if (!graph->media_events_disabled) { queue_media_event(graph, code, param1, param2); }

1 0

Zebediah Figura : quartz: Clear pending events when disabling notifications.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: aab10e6ca79ccdbaad3109a97afd57226c29bea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aab10e6ca79ccdbaad3109a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:12 2021 -0600 quartz: Clear pending events when disabling notifications. Based on a patch by Anton Baskanov. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 28 ++++++++++++++++++++-------- dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a060ee840db..8909ba64024 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -319,6 +319,19 @@ static BOOL queue_media_event(struct filter_graph *graph, LONG code, return TRUE; } +static void flush_media_events(struct filter_graph *graph) +{ + struct list *cursor; + + while ((cursor = list_head(&graph->media_events))) + { + struct media_event *event = LIST_ENTRY(cursor, struct media_event, entry); + + list_remove(&event->entry); + free(event); + } +} + static struct filter_graph *impl_from_IUnknown(IUnknown *iface) { return CONTAINING_RECORD(iface, struct filter_graph, IUnknown_inner); @@ -443,14 +456,7 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) if (This->pSite) IUnknown_Release(This->pSite); - while ((cursor = list_head(&This->media_events))) - { - struct media_event *event = LIST_ENTRY(cursor, struct media_event, entry); - - list_remove(&event->entry); - free(event); - } - + flush_media_events(This); CloseHandle(This->media_event_handle); This->cs.DebugInfo->Spare[0] = 0; @@ -4850,6 +4856,12 @@ static HRESULT WINAPI MediaEvent_SetNotifyFlags(IMediaEventEx *iface, LONG flags graph->media_events_disabled = flags; + if (flags) + { + flush_media_events(graph); + ResetEvent(graph->media_event_handle); + } + return S_OK; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 6288e3095dd..5d22ba410af 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5215,10 +5215,10 @@ static void test_set_notify_flags(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(flags == AM_MEDIAEVENT_NONOTIFY, "Got flags %#x\n", flags); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); - todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5282,7 +5282,7 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Anton Baskanov : quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent().
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d293200f7f1b6771ab49ac2d3e2cd68d34d42812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d293200f7f1b6771ab49ac2d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Feb 18 16:58:13 2021 -0600 quartz: Reset the event if the queue was empty in IMediaEvent::GetEvent(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 4 +--- dlls/quartz/tests/filtergraph.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 8909ba64024..131e022b0ba 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4744,6 +4744,7 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, if (!(entry = list_head(&graph->media_events))) { + ResetEvent(graph->media_event_handle); LeaveCriticalSection(&graph->cs); return E_ABORT; } @@ -4754,9 +4755,6 @@ static HRESULT WINAPI MediaEvent_GetEvent(IMediaEventEx *iface, LONG *code, *param2 = event->param2; free(event); - if (list_empty(&graph->media_events)) - ResetEvent(graph->media_event_handle); - LeaveCriticalSection(&graph->cs); return S_OK; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 5d22ba410af..81b13255382 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5260,7 +5260,7 @@ static void test_set_notify_flags(void) hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventEx_SetNotifyFlags(media_event, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5474,7 +5474,7 @@ static void test_events(void) hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz: Remove EC_COMPLETE from the queue when starting the graph.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 1b2d528b02dad14ae92263fbde46876898f10c6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b2d528b02dad14ae92263fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 16:58:14 2021 -0600 quartz: Remove EC_COMPLETE from the queue when starting the graph. Based on a patch by Anton Baskanov. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 12 ++++++++++++ dlls/quartz/tests/filtergraph.c | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 131e022b0ba..a8c6cc3391c 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1690,6 +1690,7 @@ static void update_render_count(struct filter_graph *graph) /* Perform the paused -> running transition. The caller must hold graph->cs. */ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_start) { + struct media_event *event, *next; REFERENCE_TIME stream_stop; struct filter *filter; HRESULT hr = S_OK; @@ -1697,6 +1698,17 @@ static HRESULT graph_start(struct filter_graph *graph, REFERENCE_TIME stream_sta graph->EcCompleteCount = 0; update_render_count(graph); + LIST_FOR_EACH_ENTRY_SAFE(event, next, &graph->media_events, struct media_event, entry) + { + if (event->code == EC_COMPLETE) + { + list_remove(&event->entry); + free(event); + } + } + if (list_empty(&graph->media_events)) + ResetEvent(graph->media_event_handle); + if (graph->defaultclock && !graph->refClock) IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 81b13255382..4822b65a7a6 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5249,7 +5249,7 @@ static void test_set_notify_flags(void) hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, (LONG_PTR)&filter.IBaseFilter_iface); @@ -5298,9 +5298,9 @@ static void test_set_notify_flags(void) DestroyWindow(window); } -#define check_events(a, b, c, d) check_events_(__LINE__, a, b, c, d) +#define check_events(a, b, c) check_events_(__LINE__, a, b, c) static void check_events_(unsigned int line, IMediaEventEx *media_event, - int expected_ec_complete_count, int expected_ec_status_count, BOOL todo) + int expected_ec_complete_count, int expected_ec_status_count) { int ec_complete_count = 0; int ec_status_count = 0; @@ -5320,7 +5320,7 @@ static void check_events_(unsigned int line, IMediaEventEx *media_event, ok(hr == S_OK, "Got hr %#x.\n", hr); } ok(hr == E_ABORT, "Got hr %#x.\n", hr); - todo_wine_if(todo) ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, + ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, "Expected %d EC_COMPLETE events.\n", expected_ec_complete_count); ok_(__FILE__, line)(ec_status_count == expected_ec_status_count, "Expected %d EC_STATUS events.\n", expected_ec_status_count); @@ -5378,7 +5378,7 @@ static void test_events(void) hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 0, 2, FALSE); + check_events(media_event, 0, 2); hr = IMediaControl_Pause(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5391,12 +5391,12 @@ static void test_events(void) hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 0, 2, FALSE); + check_events(media_event, 0, 2); hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 0, 0, FALSE); + check_events(media_event, 0, 0); /* Pausing and then running the graph clears pending EC_COMPLETE events. * This remains true even with default handling canceled. */ @@ -5415,7 +5415,7 @@ static void test_events(void) hr = IMediaControl_Stop(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 1, 2, FALSE); + check_events(media_event, 1, 2); hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5433,7 +5433,7 @@ static void test_events(void) hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 0, 2, TRUE); + check_events(media_event, 0, 2); hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5448,7 +5448,7 @@ static void test_events(void) hr = IMediaControl_Pause(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 1, 2, FALSE); + check_events(media_event, 1, 2); hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -5465,7 +5465,7 @@ static void test_events(void) hr = IMediaControl_Run(media_control); ok(hr == S_OK, "Got hr %#x.\n", hr); - check_events(media_event, 0, 2, TRUE); + check_events(media_event, 0, 2); /* GetEvent() resets the event object if there are no events available. */

1 0

Alexandre Julliard : netutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: b236dc6b6df11ab809734fac1279332c7ea362da URL: https://source.winehq.org/git/wine.git/?a=commit;h=b236dc6b6df11ab809734fac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:46:51 2021 +0100 netutils: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netutils/Makefile.in | 4 +--- dlls/netutils/main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/netutils/Makefile.in b/dlls/netutils/Makefile.in index 21589e07b8b..8b16b2eb178 100644 --- a/dlls/netutils/Makefile.in +++ b/dlls/netutils/Makefile.in @@ -1,5 +1,3 @@ MODULE = netutils.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/netutils/main.c b/dlls/netutils/main.c deleted file mode 100644 index 503e0ef7bfb..00000000000 --- a/dlls/netutils/main.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * - * Copyright (C) 2020 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netutils); - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - TRACE("(%p, %u, %p)\n", instance, reason, 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 : npptools: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 3fe970ccebcf96a30f9a36e9bfb2e75ac9b462b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fe970ccebcf96a30f9a36e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:48:03 2021 +0100 npptools: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/npptools/Makefile.in | 5 +---- dlls/npptools/main.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/npptools/Makefile.in b/dlls/npptools/Makefile.in index 64ff9691aa6..4aa7f466fac 100644 --- a/dlls/npptools/Makefile.in +++ b/dlls/npptools/Makefile.in @@ -1,6 +1,3 @@ MODULE = npptools.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/npptools/main.c b/dlls/npptools/main.c deleted file mode 100644 index ad2b8931556..00000000000 --- a/dlls/npptools/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * - * Copyright 2014 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -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 : odbcbcp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 6ba59cf0ff37b5257d8b40b265170538403f30e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ba59cf0ff37b5257d8b40b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:48:19 2021 +0100 odbcbcp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbcbcp/Makefile.in | 5 +---- dlls/odbcbcp/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/odbcbcp/Makefile.in b/dlls/odbcbcp/Makefile.in index c0269cb5a9e..7d3497852d1 100644 --- a/dlls/odbcbcp/Makefile.in +++ b/dlls/odbcbcp/Makefile.in @@ -1,6 +1,3 @@ MODULE = odbcbcp.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/odbcbcp/main.c b/dlls/odbcbcp/main.c deleted file mode 100644 index 2dfe6d0bab6..00000000000 --- a/dlls/odbcbcp/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2019 Louis Lenders - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(odbcbcp); - -BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, LPVOID reserved) -{ - TRACE("(%p, %d, %p)\n", dll, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(dll); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : olethk32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: b0c277f68d3c7e3ed659fae112f72db1a4e3aec4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c277f68d3c7e3ed659fae1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:49:18 2021 +0100 olethk32: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/olethk32/Makefile.in | 4 +--- dlls/olethk32/main.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/olethk32/Makefile.in b/dlls/olethk32/Makefile.in index 6888b46c3df..124ae2cd60c 100644 --- a/dlls/olethk32/Makefile.in +++ b/dlls/olethk32/Makefile.in @@ -1,7 +1,5 @@ MODULE = olethk32.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/olethk32/main.c b/dlls/olethk32/main.c deleted file mode 100644 index 13de72eb197..00000000000 --- a/dlls/olethk32/main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2007 Stefan Leichter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(olethk32); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_WINE_PREATTACH) - return FALSE; /* prefer native version */ - - if (fdwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hinstDLL); - - return TRUE; -}

1 0

Alexandre Julliard : photometadatahandler: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 2ede93eebda988f69770457430376387eb2325b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ede93eebda988f697704574… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:49:36 2021 +0100 photometadatahandler: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/photometadatahandler/Makefile.in | 5 +---- dlls/photometadatahandler/main.c | 39 ----------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/dlls/photometadatahandler/Makefile.in b/dlls/photometadatahandler/Makefile.in index c791b4c6365..d25dfea500b 100644 --- a/dlls/photometadatahandler/Makefile.in +++ b/dlls/photometadatahandler/Makefile.in @@ -1,8 +1,5 @@ MODULE = photometadatahandler.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = photometadatahandler.rc diff --git a/dlls/photometadatahandler/main.c b/dlls/photometadatahandler/main.c deleted file mode 100644 index 7a9878d32ee..00000000000 --- a/dlls/photometadatahandler/main.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * PhotoMetadataHandler implementation - * - * Copyright 2012 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -}

1 0

Alexandre Julliard : regapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 1028fdfebda06139059abd783571d5248a0b71b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1028fdfebda06139059abd78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:49:59 2021 +0100 regapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/regapi/Makefile.in | 5 +---- dlls/regapi/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/regapi/Makefile.in b/dlls/regapi/Makefile.in index 4d8d773f9af..ce76b50a91f 100644 --- a/dlls/regapi/Makefile.in +++ b/dlls/regapi/Makefile.in @@ -1,6 +1,3 @@ MODULE = regapi.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/regapi/main.c b/dlls/regapi/main.c deleted file mode 100644 index 1164e92102a..00000000000 --- a/dlls/regapi/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * regapi implementation - * - * Copyright 2011 Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(regapi); - -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; - default: - break; - } - - return TRUE; -}

1 0