February 2021 - Wine-Commits

Alexandre Julliard : esent: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: b3bb24ef31df51cb1597f2ed80591b1685ed11a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bb24ef31df51cb1597f2ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:43:45 2021 +0100 esent: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/esent/Makefile.in | 5 +---- dlls/esent/esent_main.c | 37 ------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/esent/Makefile.in b/dlls/esent/Makefile.in index b789ee2a65c..c06056b22af 100644 --- a/dlls/esent/Makefile.in +++ b/dlls/esent/Makefile.in @@ -1,6 +1,3 @@ MODULE = esent.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - esent_main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/esent/esent_main.c b/dlls/esent/esent_main.c deleted file mode 100644 index f555676f422..00000000000 --- a/dlls/esent/esent_main.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2015 Jacek Caban 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 "windows.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(esent); - -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 Feb. 18, 2021

Feb. 18, 2021

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

Feb. 18, 2021

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 : msvcrt40: Remove DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

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 : ntdll: Check the prefer-native flag in the PE header for default load order.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 37600028fca8fc7c78b7374dc45513930e0161e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37600028fca8fc7c78b7374d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:11:22 2021 +0100 ntdll: Check the prefer-native flag in the PE header for default load order. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 16 +++++++-------- dlls/ntdll/unix/loader.c | 52 +++++++++++++++++++++++++++++------------------- dlls/ntdll/unixlib.h | 4 ++-- 3 files changed, 42 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37600028fca8fc7c78b7…

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: wine Branch: master Commit: 717dd6cee400f806f3432129ff8f048ef061e830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717dd6cee400f806f3432129… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Feb 17 21:59:33 2021 +0100 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/po/nl.po b/po/nl.po index 27ef0b5aaba..d727b541ffa 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6043,7 +6043,7 @@ msgstr "Geen MDI-kindvenster.\n" #: dlls/kernel32/winerror.mc:2628 msgid "Popup menu already active.\n" -msgstr "Popup-menu reeds actief.\n" +msgstr "Pop-up menu reeds actief.\n" #: dlls/kernel32/winerror.mc:2633 msgid "No scrollbars.\n" @@ -8102,7 +8102,7 @@ msgstr "client" #: dlls/oleacc/oleacc.rc:42 msgid "popup menu" -msgstr "popupmenu" +msgstr "pop-up menu" #: dlls/oleacc/oleacc.rc:43 msgid "menu item" @@ -12961,7 +12961,7 @@ msgstr "&Verwijder dubbelen" #: programs/conhost/conhost.rc:65 msgid "Popup menu" -msgstr "Popup menu" +msgstr "Pop-up menu" #: programs/conhost/conhost.rc:66 msgid "&Control" @@ -13021,7 +13021,7 @@ msgstr "H&oogte :" #: programs/conhost/conhost.rc:111 msgid "End of program" -msgstr "Programma is beëindigd" +msgstr "Einde programma" #: programs/conhost/conhost.rc:112 msgid "&Close console" @@ -13029,7 +13029,7 @@ msgstr "&Console afsluiten" #: programs/conhost/conhost.rc:114 msgid "Edition" -msgstr "Versie" +msgstr "Modus" #: programs/conhost/conhost.rc:120 msgid "Console parameters" @@ -16108,7 +16108,8 @@ msgstr "" #: programs/wineboot/wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." msgstr "" -"De Wine configuratie in %s wordt bijgewerkt, even geduld alstublieft..." +"De Wine configuratie in %s wordt bijgewerkt.\n" +"Even geduld alstublieft..." #: programs/winecfg/winecfg.rc:140 msgid "" @@ -16205,7 +16206,7 @@ msgid "" msgstr "" "Elke DLL (Dynamic Link Library) kan apart worden ingesteld op " "'ingebouwd' (de versie van Wine) of 'windows' (afkomstig van Windows of " -"meegeleverd met een programma." +"meegeleverd met een programma)." #: programs/winecfg/winecfg.rc:193 msgid "&New override for library:"

1 0

Alexandre Julliard : mapistub: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

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

Feb. 18, 2021

Module: wine Branch: master Commit: 0708c658f6a742aef9a373c8007c9c5d34d3a0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0708c658f6a742aef9a373c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 11:43:59 2021 +0100 feclient: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/feclient/Makefile.in | 5 +---- dlls/feclient/main.c | 44 -------------------------------------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in index 0ca446d3620..ce3fb7e491e 100644 --- a/dlls/feclient/Makefile.in +++ b/dlls/feclient/Makefile.in @@ -1,6 +1,3 @@ MODULE = feclient.dll -EXTRADLLFLAGS = -mno-cygwin - -C_SRCS = \ - main.c +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/feclient/main.c b/dlls/feclient/main.c deleted file mode 100644 index ef49494da7c..00000000000 --- a/dlls/feclient/main.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * feclient API - * - * Copyright 2016 Michael Müller - * - * 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(feclient); - -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 Feb. 18, 2021

Feb. 18, 2021

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

Feb. 18, 2021

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