February 2021 - Wine-commits

Alexandre Julliard : winedump: Print the "prefer native" Wine flag.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: e27c7e0648c05a28e550254e295abfb7ea9049b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e27c7e0648c05a28e550254e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:11:33 2021 +0100 winedump: Print the "prefer native" Wine flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/output.c | 36 ++++++++++-------------------------- tools/winedump/pe.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 29 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index bbbb1ac0397..5911f22f6c8 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -234,41 +234,25 @@ void output_c_preamble (void) puts ("Creating a forwarding DLL"); fputs ("\nHMODULE hDLL=0; /* DLL to call */\n\n", cfile); - } - fprintf (cfile, - "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void " - "*reserved)\n{\n" + fprintf (cfile, + "BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)\n{\n" " TRACE(\"(%%p, %%u, %%p)\\n\", instance, reason, reserved);\n\n" " switch (reason)\n" " {\n" - " case DLL_WINE_PREATTACH:\n" - " return FALSE; /* prefer native version */\n" - " case DLL_PROCESS_ATTACH:\n"); - - if (globals.forward_dll) - fprintf (cfile, + " case DLL_PROCESS_ATTACH:\n" " hDLL = LoadLibraryA(\"%s\");\n" - " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n", - globals.forward_dll, globals.forward_dll); - else - fprintf (cfile, - " DisableThreadLibraryCalls(instance);\n"); - - fprintf (cfile, - " break;\n"); - - if (globals.forward_dll) - fprintf (cfile, + " TRACE(\"Forwarding DLL (%s) loaded (%%p)\\n\", hDLL);\n" + " DisableThreadLibraryCalls(instance);\n" + " break;\n" " case DLL_PROCESS_DETACH:\n" " FreeLibrary(hDLL);\n" " TRACE(\"Forwarding DLL (%s) freed\\n\");\n" - " break;\n", - globals.forward_dll); - - fprintf (cfile, + " break;\n" " }\n\n" - " return TRUE;\n}\n"); + " return TRUE;\n}\n", + globals.forward_dll, globals.forward_dll, globals.forward_dll); + } } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 19ccd172da2..aa679103e59 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -45,8 +45,14 @@ #include "winbase.h" #include "winedump.h" +#define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ + static const IMAGE_NT_HEADERS32* PE_nt_headers; +static const char builtin_signature[] = "Wine builtin DLL"; +static const char fakedll_signature[] = "Wine placeholder DLL"; +static int is_builtin; + const char *get_machine_str(int mach) { switch (mach) @@ -95,13 +101,13 @@ static const IMAGE_NT_HEADERS32 *get_nt_header( void ) const IMAGE_DOS_HEADER *dos; dos = PRD(0, sizeof(*dos)); if (!dos) return NULL; + is_builtin = (dos->e_lfanew >= sizeof(*dos) + 32 && + !memcmp( dos + 1, builtin_signature, sizeof(builtin_signature) )); return PRD(dos->e_lfanew, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER)); } void print_fake_dll( void ) { - static const char builtin_signature[] = "Wine builtin DLL"; - static const char fakedll_signature[] = "Wine placeholder DLL"; const IMAGE_DOS_HEADER *dos; dos = PRD(0, sizeof(*dos) + 32); @@ -214,7 +220,8 @@ static inline void print_subsys(const char *title, WORD value) static inline void print_dllflags(const char *title, WORD value) { printf(" %-34s 0x%04X\n", title, value); -#define X(f,s) if (value & f) printf(" %s\n", s) +#define X(f,s) do { if (value & f) printf(" %s\n", s); } while(0) + if (is_builtin) X(IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE, "PREFER_NATIVE (Wine extension)"); X(IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA, "HIGH_ENTROPY_VA"); X(IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE, "DYNAMIC_BASE"); X(IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY, "FORCE_INTEGRITY");

1 0

Alexandre Julliard : msvcrt40: Remove DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: a4ca6f19a3538c4a17b7c0653d625ed5bef660eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ca6f19a3538c4a17b7c065… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:46:36 2021 +0100 msvcrt40: Remove DLL_WINE_PREATTACH. The functions are mostly implemented now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt40/Makefile.in | 5 ----- dlls/msvcrt40/msvcrt40.c | 37 ------------------------------------- 2 files changed, 42 deletions(-) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 576d651c702..1d5dc02627c 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,6 +1 @@ MODULE = msvcrt40.dll - -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - msvcrt40.c diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c deleted file mode 100644 index 122166d1dbf..00000000000 --- a/dlls/msvcrt40/msvcrt40.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * msvcrt40 main file - * - * Copyright (C) 2007 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" - -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -}

1 0

Alexandre Julliard : normaliz: Remove DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 077bb664edb38bbabade7a2a2c2fc043b0cb492c URL: https://source.winehq.org/git/wine.git/?a=commit;h=077bb664edb38bbabade7a2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:58:09 2021 +0100 normaliz: Remove DLL_WINE_PREATTACH. The functions are implemented now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/normaliz/Makefile.in | 5 ----- dlls/normaliz/normaliz.c | 50 ----------------------------------------------- 2 files changed, 55 deletions(-) diff --git a/dlls/normaliz/Makefile.in b/dlls/normaliz/Makefile.in index 444c1687a1c..89d7dba795d 100644 --- a/dlls/normaliz/Makefile.in +++ b/dlls/normaliz/Makefile.in @@ -1,7 +1,2 @@ MODULE = normaliz.dll IMPORTLIB = normaliz - -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - normaliz.c diff --git a/dlls/normaliz/normaliz.c b/dlls/normaliz/normaliz.c deleted file mode 100644 index e6d06c51933..00000000000 --- a/dlls/normaliz/normaliz.c +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Normaliz DLL. - * - * Copyright 2011 Thomas Mullaly - * - * 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 - */ - -/* All calls to this DLL are forwarded to kernel32. On Windows XP this DLL actually contains - * the implementations for the functions it exports, but, starting with Vista these - * functions have been moved into kernel32. - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(normaliz); - -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

Alexandre Julliard : adsldpc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: c9b909b572784cffb244a61fd1913ad325e7d8b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b909b572784cffb244a61f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:40:17 2021 +0100 adsldpc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldpc/Makefile.in | 5 +---- dlls/adsldpc/main.c | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/dlls/adsldpc/Makefile.in b/dlls/adsldpc/Makefile.in index bcee0d4962a..0ba2453a18b 100644 --- a/dlls/adsldpc/Makefile.in +++ b/dlls/adsldpc/Makefile.in @@ -1,6 +1,3 @@ MODULE = adsldpc.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/adsldpc/main.c b/dlls/adsldpc/main.c deleted file mode 100644 index f9df390e068..00000000000 --- a/dlls/adsldpc/main.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Active Directory Services Lightweight Directory Provider C - * - * Copyright 2017 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(adsldpc); - -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 : bluetoothapis: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 724de1a6a95a6f654c7b913ddd6d75dd1c5b422a URL: https://source.winehq.org/git/wine.git/?a=commit;h=724de1a6a95a6f654c7b913d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:40:33 2021 +0100 bluetoothapis: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bluetoothapis/Makefile.in | 5 +---- dlls/bluetoothapis/main.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/dlls/bluetoothapis/Makefile.in b/dlls/bluetoothapis/Makefile.in index d73ca872594..51b2871d81d 100644 --- a/dlls/bluetoothapis/Makefile.in +++ b/dlls/bluetoothapis/Makefile.in @@ -1,6 +1,3 @@ MODULE = bluetoothapis.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/bluetoothapis/main.c b/dlls/bluetoothapis/main.c deleted file mode 100644 index b035248b5ff..00000000000 --- a/dlls/bluetoothapis/main.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Bluetooth APIs - * - * Copyright 2015 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, void *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 : cryptdll: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: c8a804cf54038850908d8581d382acbe829aa2a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8a804cf54038850908d8581… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:41:20 2021 +0100 cryptdll: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptdll/Makefile.in | 5 +---- dlls/cryptdll/cryptdll.c | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/cryptdll/Makefile.in b/dlls/cryptdll/Makefile.in index 7fd574e526f..e473c311083 100644 --- a/dlls/cryptdll/Makefile.in +++ b/dlls/cryptdll/Makefile.in @@ -2,7 +2,4 @@ MODULE = cryptdll.dll IMPORTLIB = cryptdll IMPORTS = advapi32 -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - cryptdll.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/cryptdll/cryptdll.c b/dlls/cryptdll/cryptdll.c deleted file mode 100644 index 963a2684e08..00000000000 --- a/dlls/cryptdll/cryptdll.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2005 Ulrich Czekalla (for CodeWeavers) - * - * 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 <stdlib.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(cryptdll); - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%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 : d3d8thk: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: b5ab0b3e76a6f39feca497c8a7b358978d4ada0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5ab0b3e76a6f39feca497c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:41:48 2021 +0100 d3d8thk: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8thk/Makefile.in | 5 +---- dlls/d3d8thk/d3d8thk_main.c | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 46 deletions(-) diff --git a/dlls/d3d8thk/Makefile.in b/dlls/d3d8thk/Makefile.in index b84c8d171f1..3b406cb30d9 100644 --- a/dlls/d3d8thk/Makefile.in +++ b/dlls/d3d8thk/Makefile.in @@ -1,8 +1,5 @@ MODULE = d3d8thk.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - d3d8thk_main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/d3d8thk/d3d8thk_main.c b/dlls/d3d8thk/d3d8thk_main.c deleted file mode 100644 index 1d89cb48720..00000000000 --- a/dlls/d3d8thk/d3d8thk_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright 2020 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(d3d8thk); - -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 : d3dcompiler: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 0b22f87be68a5d3608bbc9e9bbbe1a1a6c1788f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b22f87be68a5d3608bbc9e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:42:33 2021 +0100 d3dcompiler: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_33/Makefile.in | 3 +-- dlls/d3dcompiler_34/Makefile.in | 3 +-- dlls/d3dcompiler_35/Makefile.in | 3 +-- dlls/d3dcompiler_36/Makefile.in | 3 +-- dlls/d3dcompiler_37/Makefile.in | 3 +-- dlls/d3dcompiler_38/Makefile.in | 3 +-- dlls/d3dcompiler_39/Makefile.in | 3 +-- dlls/d3dcompiler_40/Makefile.in | 3 +-- dlls/d3dcompiler_41/Makefile.in | 3 +-- dlls/d3dcompiler_42/Makefile.in | 3 +-- dlls/d3dcompiler_43/Makefile.in | 3 +-- dlls/d3dcompiler_43/main.c | 40 ---------------------------------------- dlls/d3dcompiler_46/Makefile.in | 3 +-- dlls/d3dcompiler_47/Makefile.in | 3 +-- 14 files changed, 13 insertions(+), 66 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index 926f38d8745..2c0460ea0a4 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=33 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index cf8dc1112ea..b342df17677 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=34 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 07bae8f801d..43e76ea4a5e 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=35 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index a654b7a7cf0..a7f1d2fef8b 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=36 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index 8dfb36fdf89..898e1b0e52e 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=37 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index 6042b0d4706..7c8f996db74 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=38 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 9690d08793c..c0672d72a33 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 46cd563793b..bb8e3387066 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=40 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index f19e1392113..dd72016c0b9 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=41 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 25a02dcbcea..938be9afb4f 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=42 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 8464113cd15..58a17aa6ac4 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,14 +1,13 @@ MODULE = d3dcompiler_43.dll EXTRADEFS = -DD3D_COMPILER_VERSION=43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_43/main.c b/dlls/d3dcompiler_43/main.c deleted file mode 100644 index 3404655ac8e..00000000000 --- a/dlls/d3dcompiler_43/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 "d3dcompiler_private.h" - -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 6f32986af1e..24c9acfc014 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -3,14 +3,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index df9cde05ca9..44bec38d8d2 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -4,14 +4,13 @@ IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ asmparser.c \ blob.c \ bytecodewriter.c \ compiler.c \ - main.c \ preproc.c \ reflection.c \ utils.c

1 0

Alexandre Julliard : d3dim: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 5a99feea38ddc08bf2d31518ab4d4b0777372a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a99feea38ddc08bf2d31518… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:42:47 2021 +0100 d3dim: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dim/Makefile.in | 4 +--- dlls/d3dim/d3dim_main.c | 37 ------------------------------------- dlls/d3dim700/Makefile.in | 5 +---- dlls/d3dim700/d3dim700_main.c | 42 ------------------------------------------ 4 files changed, 2 insertions(+), 86 deletions(-) diff --git a/dlls/d3dim/Makefile.in b/dlls/d3dim/Makefile.in index 1acc05440cc..f62573b513d 100644 --- a/dlls/d3dim/Makefile.in +++ b/dlls/d3dim/Makefile.in @@ -1,7 +1,5 @@ MODULE = d3dim.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = d3dim_main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/d3dim/d3dim_main.c b/dlls/d3dim/d3dim_main.c deleted file mode 100644 index 4651d5dc11f..00000000000 --- a/dlls/d3dim/d3dim_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2006 Alexandre Julliard - * - * 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" - -/*********************************************************************** - * DllMain (D3DIM.@) - */ -BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( inst ); - break; - } - return TRUE; -} diff --git a/dlls/d3dim700/Makefile.in b/dlls/d3dim700/Makefile.in index 12a28ae475a..f2106dd977e 100644 --- a/dlls/d3dim700/Makefile.in +++ b/dlls/d3dim700/Makefile.in @@ -1,8 +1,5 @@ MODULE = d3dim700.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - d3dim700_main.c +EXTRADLLFLAGS = -Wb,--prefer-native RC_SRCS = version.rc diff --git a/dlls/d3dim700/d3dim700_main.c b/dlls/d3dim700/d3dim700_main.c deleted file mode 100644 index 18a211ccc74..00000000000 --- a/dlls/d3dim700/d3dim700_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright 2020 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(d3dim700); - -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 : dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: wine Branch: master Commit: 146ff01f5465ba4d6c769ac452a00e8a6a4b112d URL: https://source.winehq.org/git/wine.git/?a=commit;h=146ff01f5465ba4d6c769ac4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:43:26 2021 +0100 dcomp: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dcomp/Makefile.in | 5 ++--- dlls/dcomp/main.c | 44 -------------------------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/dcomp/Makefile.in b/dlls/dcomp/Makefile.in index 436b88993ab..c02907f3373 100644 --- a/dlls/dcomp/Makefile.in +++ b/dlls/dcomp/Makefile.in @@ -1,9 +1,8 @@ MODULE = dcomp.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ - device.c \ - main.c + device.c RC_SRCS = version.rc diff --git a/dlls/dcomp/main.c b/dlls/dcomp/main.c deleted file mode 100644 index b0b911a9bf5..00000000000 --- a/dlls/dcomp/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * DirectComposition Library - * - * Copyright 2020 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(dcomp); - -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