February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Reimplement the media source on top of the wg_parser object.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: f9c43fc9fa6e68ac0b886fd03e0425c8862aaa68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9c43fc9fa6e68ac0b886fd0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 18 17:01:27 2021 -0600 winegstreamer: Reimplement the media source on top of the wg_parser object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 1 - dlls/winegstreamer/audioconvert.c | 12 - dlls/winegstreamer/gst_cbs.c | 235 ------------- dlls/winegstreamer/gst_cbs.h | 110 ------ dlls/winegstreamer/gst_private.h | 8 +- dlls/winegstreamer/gstdemux.c | 19 -- dlls/winegstreamer/main.c | 2 - dlls/winegstreamer/media_source.c | 699 +++++++++----------------------------- dlls/winegstreamer/mfplat.c | 460 +++++++++---------------- dlls/winegstreamer/wg_parser.c | 12 +- 10 files changed, 337 insertions(+), 1221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9c43fc9fa6e68ac0b88…

1 0

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

Feb. 19, 2021

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

Alexandre Julliard : rtutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 5d4148e80b0c5ef743d82686d63865d6ac9a6eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4148e80b0c5ef743d82686… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:51:22 2021 +0100 rtutils: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtutils/Makefile.in | 3 +-- dlls/rtutils/main.c | 47 ----------------------------------------------- 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index d778852c9d4..f34937337af 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,8 +1,7 @@ MODULE = rtutils.dll IMPORTLIB = rtutils -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ - main.c \ tracing.c diff --git a/dlls/rtutils/main.c b/dlls/rtutils/main.c deleted file mode 100644 index 009101a5517..00000000000 --- a/dlls/rtutils/main.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * rtutils main - * - * Copyright 2009 Alexander Scott-Johns - * - * 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(rtutils); - -/*********************************************************************** - * DllMain (RTUTILS.@) - */ -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; -}

1 0

Alexandre Julliard : samlib: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 597db385cadca1c6ad690648ae21074419bc793a URL: https://source.winehq.org/git/wine.git/?a=commit;h=597db385cadca1c6ad690648… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:51:35 2021 +0100 samlib: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/samlib/Makefile.in | 5 +---- dlls/samlib/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/samlib/Makefile.in b/dlls/samlib/Makefile.in index 1ca2a4a6604..6b4a15f25e4 100644 --- a/dlls/samlib/Makefile.in +++ b/dlls/samlib/Makefile.in @@ -1,6 +1,3 @@ MODULE = samlib.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/samlib/main.c b/dlls/samlib/main.c deleted file mode 100644 index a1af3c986fd..00000000000 --- a/dlls/samlib/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010 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(samlib); - -/***************************************************** - * 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; -}

1 0

Alexandre Julliard : olethk32: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

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 : sfc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: f9ca7b59a41b096da2b3a6a3d11419a0f2adf424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9ca7b59a41b096da2b3a6a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:07 2021 +0100 sfc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sfc/Makefile.in | 4 +--- dlls/sfc/sfc_main.c | 54 ---------------------------------------------------- 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/dlls/sfc/Makefile.in b/dlls/sfc/Makefile.in index 942d801f3ed..3a557a4b6f2 100644 --- a/dlls/sfc/Makefile.in +++ b/dlls/sfc/Makefile.in @@ -2,6 +2,4 @@ MODULE = sfc.dll IMPORTLIB = sfc IMPORTS = sfc_os -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = sfc_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sfc/sfc_main.c b/dlls/sfc/sfc_main.c deleted file mode 100644 index 58957c89371..00000000000 --- a/dlls/sfc/sfc_main.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Implementation of the System File Checker (Windows File Protection) - * - * Copyright 2006 Detlef Riekenberg - * - * This file contains only stubs to get the localspl.dll up and running - * - * 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 - */ - -/* - * Moved to sfc_os.dll since XP - * - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(sfc); - -/****************************************************************** - * 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; -}

1 0

Alexandre Julliard : scarddlg: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 2f206a4388ec8141be4a3a1c22ca40501d808bf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f206a4388ec8141be4a3a1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:52:03 2021 +0100 scarddlg: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scarddlg/Makefile.in | 5 +---- dlls/scarddlg/main.c | 48 ----------------------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/dlls/scarddlg/Makefile.in b/dlls/scarddlg/Makefile.in index 5b69e5d4074..0a5f1dd9b16 100644 --- a/dlls/scarddlg/Makefile.in +++ b/dlls/scarddlg/Makefile.in @@ -1,6 +1,3 @@ MODULE = scarddlg.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/scarddlg/main.c b/dlls/scarddlg/main.c deleted file mode 100644 index c39782e0fed..00000000000 --- a/dlls/scarddlg/main.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Implementation of the SCardDlg Interface - * - * Copyright 2011 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 "winuser.h" -#include "wfext.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(scarddlg); - -/***************************************************** - * 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; -}

1 0

Alexandre Julliard : sas: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 9d7a681d9bcb216809b4a0af09faee0a57cb21b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7a681d9bcb216809b4a0af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:51:48 2021 +0100 sas: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sas/Makefile.in | 5 +---- dlls/sas/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/sas/Makefile.in b/dlls/sas/Makefile.in index 9a3a8de5030..a21e053b6c4 100644 --- a/dlls/sas/Makefile.in +++ b/dlls/sas/Makefile.in @@ -1,6 +1,3 @@ MODULE = sas.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/sas/main.c b/dlls/sas/main.c deleted file mode 100644 index a7e9b8b8476..00000000000 --- a/dlls/sas/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 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(sas); - -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID lpv) -{ - TRACE("(%p, %d, %p)\n", hInstDLL, reason, lpv); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : resutils: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

Module: wine Branch: master Commit: 170c5526ca0aae0f788e9100e5628aab8908a2c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=170c5526ca0aae0f788e9100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:50:16 2021 +0100 resutils: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/resutils/Makefile.in | 5 +---- dlls/resutils/resutils.c | 48 ----------------------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) diff --git a/dlls/resutils/Makefile.in b/dlls/resutils/Makefile.in index f5c43f88d1f..1d6c0777d01 100644 --- a/dlls/resutils/Makefile.in +++ b/dlls/resutils/Makefile.in @@ -1,7 +1,4 @@ MODULE = resutils.dll IMPORTLIB = resutils -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - resutils.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/resutils/resutils.c b/dlls/resutils/resutils.c deleted file mode 100644 index b9e3c66fa1a..00000000000 --- a/dlls/resutils/resutils.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * resutils main - * - * Copyright 2006 Benjamin Arai (Google) - * - * 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(resutils); - -/*********************************************************************** - * DllMain (RESUTILS.@) - * - */ -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; -}

1 0

Alexandre Julliard : photometadatahandler: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 19, 2021

Feb. 19, 2021

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