wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

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

19 Feb '21

Module: wine Branch: master Commit: e31f9e375faf538c6066e78b2a71daf9b3bf6a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31f9e375faf538c6066e78b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:55:03 2021 +0100 wdscore: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wdscore/Makefile.in | 5 +---- dlls/wdscore/wdscore_main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 8bfc6d1210c..20ba1d3b1c9 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,6 +1,3 @@ MODULE = wdscore.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - wdscore_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/wdscore/wdscore_main.c b/dlls/wdscore/wdscore_main.c deleted file mode 100644 index 52e4fb4531c..00000000000 --- a/dlls/wdscore/wdscore_main.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2017 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(wdscore); - -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 : vulkan-1: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 290c9a4d6372cee046768eccd8fa49050a294f68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=290c9a4d6372cee046768ecc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:50 2021 +0100 vulkan-1: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/Makefile.in | 5 +---- dlls/vulkan-1/vulkan.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in index 0ec2877c692..a4a10bc8e93 100644 --- a/dlls/vulkan-1/Makefile.in +++ b/dlls/vulkan-1/Makefile.in @@ -2,9 +2,6 @@ MODULE = vulkan-1.dll IMPORTS = winevulkan IMPORTLIB = vulkan-1 -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - vulkan.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c deleted file mode 100644 index d3b35603a17..00000000000 --- a/dlls/vulkan-1/vulkan.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Wine Vulkan loader implementation - * - * Copyright 2018 Roderick Colenbrander - * - * 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(vulkan); - -BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - /* Prefer native as it provides more functionality. */ - return FALSE; - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinst); - return TRUE; - } - return TRUE; -}

1 0

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

19 Feb '21

Module: wine Branch: master Commit: 210298e4d09c29695cfab336a8b7ffb88baa44a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=210298e4d09c29695cfab336… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:35 2021 +0100 utildll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/utildll/Makefile.in | 5 +---- dlls/utildll/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/utildll/Makefile.in b/dlls/utildll/Makefile.in index 5bd9a6fa0e0..6a04261eeae 100644 --- a/dlls/utildll/Makefile.in +++ b/dlls/utildll/Makefile.in @@ -1,6 +1,3 @@ MODULE = utildll.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/utildll/main.c b/dlls/utildll/main.c deleted file mode 100644 index e0487944340..00000000000 --- a/dlls/utildll/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Utility Functions - * - * Copyright 2019 Alex Henrie - * - * 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(utildll); - -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 : svrapi: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 547d34d0cd44f9b74dbb485642561abe0c455ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547d34d0cd44f9b74dbb4856… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:18 2021 +0100 svrapi: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/svrapi/Makefile.in | 5 +---- dlls/svrapi/svrapi_main.c | 46 ---------------------------------------------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/dlls/svrapi/Makefile.in b/dlls/svrapi/Makefile.in index c9467f28d97..4ebcc804cda 100644 --- a/dlls/svrapi/Makefile.in +++ b/dlls/svrapi/Makefile.in @@ -1,6 +1,3 @@ MODULE = svrapi.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - svrapi_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/svrapi/svrapi_main.c b/dlls/svrapi/svrapi_main.c deleted file mode 100644 index 8c7b007fc5a..00000000000 --- a/dlls/svrapi/svrapi_main.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -* Part of NETAPI on Windows 9x -* -* Copyright 2006 Konstantin Petrov -* -* 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 "winerror.h" -#include "svrapi.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(svrapi); - -/*********************************************************************** - * DllMain (SVRAPI.init) - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) -{ - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); - - switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /*prefer native version*/ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - return TRUE; -}

1 0

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

19 Feb '21

Module: wine Branch: master Commit: 3d7261eb9c0a8bd66d8a0385d5dd0b928347f73c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d7261eb9c0a8bd66d8a0385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:54:02 2021 +0100 strmdll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmdll/Makefile.in | 5 +---- dlls/strmdll/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in index f710169b6ab..e224b6f4a51 100644 --- a/dlls/strmdll/Makefile.in +++ b/dlls/strmdll/Makefile.in @@ -1,8 +1,5 @@ MODULE = strmdll.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/strmdll/main.c b/dlls/strmdll/main.c deleted file mode 100644 index 1278fc2b781..00000000000 --- a/dlls/strmdll/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2018 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(strmdll); - -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 : srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: 63b2ee515d30829e0353545a4fa11c83d838dfbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b2ee515d30829e0353545a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:37 2021 +0100 srvcli: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srvcli/Makefile.in | 4 +--- dlls/srvcli/main.c | 41 ----------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/srvcli/Makefile.in b/dlls/srvcli/Makefile.in index 716cc1b3867..22c1230b769 100644 --- a/dlls/srvcli/Makefile.in +++ b/dlls/srvcli/Makefile.in @@ -1,5 +1,3 @@ MODULE = srvcli.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srvcli/main.c b/dlls/srvcli/main.c deleted file mode 100644 index 0df8e00d0fa..00000000000 --- a/dlls/srvcli/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(srvcli); - -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 : srclient: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

Module: wine Branch: master Commit: d428965cf27b0ed9bb04d0382e15835e328562af URL: https://source.winehq.org/git/wine.git/?a=commit;h=d428965cf27b0ed9bb04d038… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:53:24 2021 +0100 srclient: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srclient/Makefile.in | 5 +---- dlls/srclient/main.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in index 48aab4dd67c..1d2391bf582 100644 --- a/dlls/srclient/Makefile.in +++ b/dlls/srclient/Makefile.in @@ -1,6 +1,3 @@ MODULE = srclient.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c deleted file mode 100644 index 98832a97585..00000000000 --- a/dlls/srclient/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(srclient); - -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 : sfc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 19 Feb '21

19 Feb '21

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 19 Feb '21

19 Feb '21

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 19 Feb '21

19 Feb '21

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

← Newer
1
...
26
27
28
29
30
31
32
...
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