winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
February 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
915 discussions
Start a n
N
ew thread
Alexandre Julliard : msvcp60: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: a770fc8a3a227e4fe6b19abad41fd0723273ce46 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a770fc8a3a227e4fe6b19aba…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:26 2021 +0100 msvcp60: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/Makefile.in | 2 +- dlls/msvcp60/main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msvcp60/Makefile.in b/dlls/msvcp60/Makefile.in index 5271fc21e20..b43395b44d1 100644 --- a/dlls/msvcp60/Makefile.in +++ b/dlls/msvcp60/Makefile.in @@ -3,7 +3,7 @@ EXTRADEFS = -D_MSVCP_VER=60 PARENTSRC = ../msvcp90 IMPORTS = msvcrt -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ exception.c \ diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 4f7b11be8a7..ab9a6a3179d 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -86,8 +86,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); _Init_locks__Init_locks_ctor(NULL);
1
0
0
0
Alexandre Julliard : msvcirt: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: 4ea044a6c712ccb7cc078c28397b2f3b2fca4ee7 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=4ea044a6c712ccb7cc078c28…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:20 2021 +0100 msvcirt: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/Makefile.in | 2 +- dlls/msvcirt/msvcirt.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msvcirt/Makefile.in b/dlls/msvcirt/Makefile.in index 619a3dd66dd..1dee2b24c02 100644 --- a/dlls/msvcirt/Makefile.in +++ b/dlls/msvcirt/Makefile.in @@ -3,7 +3,7 @@ EXTRADEFS = -D_MSVCIRT PARENTSRC = ../msvcp90 IMPORTS = msvcrt -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ exception.c \ diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 4d0dc1521f6..db4b736d272 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -5211,8 +5211,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); init_exception(inst);
1
0
0
0
Alexandre Julliard : msscript.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: 8a74df64836fff539e71b3e26708d8ae1290aa92 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8a74df64836fff539e71b3e2…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:14 2021 +0100 msscript.ocx: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/Makefile.in | 2 +- dlls/msscript.ocx/msscript.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 304b924f931..28b0dd1c132 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -3,7 +3,7 @@ RC_SRCS = msscript.rc IDL_SRCS = msscript.idl IMPORTS = gdi32 user32 ole32 oleaut32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 70dc05f61e0..15d15ab4349 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -4013,8 +4013,6 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) TRACE("(%p %d %p)\n", instance, reason, reserved); switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: msscript_instance = instance; DisableThreadLibraryCalls(instance);
1
0
0
0
Alexandre Julliard : msident: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: 3debf592ab396a49edd6ae153602348d81ea6266 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=3debf592ab396a49edd6ae15…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:08 2021 +0100 msident: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msident/Makefile.in | 2 +- dlls/msident/msident.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in index 433d454ecc3..87c6d4ab3e7 100644 --- a/dlls/msident/Makefile.in +++ b/dlls/msident/Makefile.in @@ -1,6 +1,6 @@ MODULE = msident.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msident.c diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c index 8b9842f9603..b075dcfcc16 100644 --- a/dlls/msident/msident.c +++ b/dlls/msident/msident.c @@ -283,8 +283,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) switch(fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: msident_instance = hInstDLL; DisableThreadLibraryCalls(hInstDLL);
1
0
0
0
Alexandre Julliard : msftedit: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: cd6cc5695860d883cb4b4f3da9a853c3236e70cf URL:
https://source.winehq.org/git/wine.git/?a=commit;h=cd6cc5695860d883cb4b4f3d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:23:01 2021 +0100 msftedit: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msftedit/Makefile.in | 2 +- dlls/msftedit/msftedit_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msftedit/Makefile.in b/dlls/msftedit/Makefile.in index 3e76523118f..56687570054 100644 --- a/dlls/msftedit/Makefile.in +++ b/dlls/msftedit/Makefile.in @@ -1,7 +1,7 @@ MODULE = msftedit.dll IMPORTS = uuid riched20 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ msftedit_main.c diff --git a/dlls/msftedit/msftedit_main.c b/dlls/msftedit/msftedit_main.c index fbad7182a5b..5c7d9268e8c 100644 --- a/dlls/msftedit/msftedit_main.c +++ b/dlls/msftedit/msftedit_main.c @@ -46,8 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) switch(reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: /* explicitly load riched20 since it creates the window classes at dll attach time */ richedit = LoadLibraryW( L"riched20.dll" );
1
0
0
0
Alexandre Julliard : msctf: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: 8b5bf20c4ab80f950726e7aac97d1ae194fb5ce9 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8b5bf20c4ab80f950726e7aa…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:56 2021 +0100 msctf: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/Makefile.in | 2 +- dlls/msctf/msctf.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index a3c7e0c6fad..fd4314b77ac 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -1,7 +1,7 @@ MODULE = msctf.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ categorymgr.c \ diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index c6e3a2ca597..56a36cb23c8 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -556,8 +556,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: MSCTF_hinstance = hinst; tlsIndex = TlsAlloc();
1
0
0
0
Alexandre Julliard : mscoree: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: ce90e69eeb330656c066e232bf6b5ac93ea30245 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ce90e69eeb330656c066e232…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:51 2021 +0100 mscoree: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/Makefile.in | 2 +- dlls/mscoree/mscoree_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 5302e45e1a1..a36e11ee3ac 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -1,7 +1,7 @@ MODULE = mscoree.dll IMPORTS = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ assembly.c \ diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 4679d79e662..59cb17a0357 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -224,8 +224,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: runtimehost_init(); DisableThreadLibraryCalls(hinstDLL);
1
0
0
0
Alexandre Julliard : localspl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: ade15558dbb87fbceb3e59fc9385ebf86a928723 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ade15558dbb87fbceb3e59fc…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 11:40:32 2021 +0100 localspl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/Makefile.in | 3 +-- dlls/localspl/localmon.c | 18 +++++++++++++ dlls/localspl/localspl_main.c | 55 ---------------------------------------- dlls/localspl/localspl_private.h | 4 --- dlls/localspl/provider.c | 16 +++--------- 5 files changed, 22 insertions(+), 74 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index abff68a499b..4b0ec9509d0 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -1,11 +1,10 @@ MODULE = localspl.dll IMPORTS = spoolss user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ localmon.c \ - localspl_main.c \ provider.c RC_SRCS = localspl.rc diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 19a74566503..d4346505319 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -81,6 +81,24 @@ static struct list xcv_handles = LIST_INIT( xcv_handles ); static const WCHAR WinNT_CV_PortsW[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Ports"; static const WCHAR WinNT_CV_WindowsW[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; +static HINSTANCE LOCALSPL_hInstance; + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + LOCALSPL_hInstance = hinstDLL; + break; + } + return TRUE; +} /****************************************************************** * does_port_exist (internal) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c deleted file mode 100644 index 48db9c31a6f..00000000000 --- a/dlls/localspl/localspl_main.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Implementation of the Local Printprovider/ Printmonitor/ Prontprocessor - * - * Copyright 2006-2009 Detlef Riekenberg - * - * 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> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" -#include "localspl_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(localspl); - - -HINSTANCE LOCALSPL_hInstance = NULL; - -/***************************************************** - * 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 ); - LOCALSPL_hInstance = hinstDLL; - setup_provider(); - break; - } - return TRUE; -} diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index f27005c16de..ed44b1413c9 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -23,10 +23,6 @@ #include <windef.h> -/* ## DLL-wide Globals ## */ -extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN; -void setup_provider(void) DECLSPEC_HIDDEN; - /* ## Resource-ID ## */ #define IDS_LOCALPORT 500 #define IDS_LOCALMONITOR 507 diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 93a457ab0ba..7dde72d323d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -99,8 +99,6 @@ typedef struct { static struct list monitor_handles = LIST_INIT( monitor_handles ); static monitor_t * pm_localport; -static const PRINTPROVIDOR * pprovider = NULL; - static const WCHAR fmt_driversW[] = L"System\\CurrentControlSet\\control\\Print\\Environments\\%s\\Drivers%s"; static const WCHAR fmt_printprocessorsW[] = @@ -2508,12 +2506,7 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, return TRUE; } -/***************************************************** - * setup_provider [internal] - */ -void setup_provider(void) -{ - static const PRINTPROVIDOR backend = { +static const PRINTPROVIDOR backend = { fpOpenPrinter, NULL, /* fpSetJob */ NULL, /* fpGetJob */ @@ -2600,10 +2593,7 @@ void setup_provider(void) NULL, /* fpFlushPrinter */ NULL, /* fpSendRecvBidiData */ NULL /* fpAddDriverCatalog */ - }; - pprovider = &backend; - -} +}; /***************************************************** * InitializePrintProvidor (localspl.@) @@ -2631,7 +2621,7 @@ BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, { TRACE("(%p, %u, %s)\n", pPrintProvidor, cbPrintProvidor, debugstr_w(pFullRegistryPath)); - memcpy(pPrintProvidor, pprovider, + memcpy(pPrintProvidor, &backend, (cbPrintProvidor < sizeof(PRINTPROVIDOR)) ? cbPrintProvidor : sizeof(PRINTPROVIDOR)); return TRUE;
1
0
0
0
Alexandre Julliard : joy.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: ec9a3d99062504c5b249fbd1e62cb4359cc03836 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=ec9a3d99062504c5b249fbd1…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:43 2021 +0100 joy.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/Makefile.in | 2 +- dlls/joy.cpl/main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index d1b0e45552e..db6883bb121 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,7 +1,7 @@ MODULE = joy.cpl IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 66ac58f7038..3ea417843f4 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -47,9 +47,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); hcpl = hdll;
1
0
0
0
Alexandre Julliard : inetcpl.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard
26 Feb '21
26 Feb '21
Module: wine Branch: master Commit: 735fc0e725e26adbdc7ebdf9a4ac72a6615344e6 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=735fc0e725e26adbdc7ebdf9…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:31 2021 +0100 inetcpl.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/Makefile.in | 2 +- dlls/inetcpl.cpl/inetcpl.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 972c66697a8..f7f241b7b1f 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -2,7 +2,7 @@ MODULE = inetcpl.cpl IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui wininet ole32 urlmon shell32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ connections.c \ diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index e2178e1fac6..b4dbe848677 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -50,9 +50,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); hcpl = hdll;
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
92
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
Results per page:
10
25
50
100
200