Uncomment out DisableThreadLibraryCalls in DllMain and add the

kernel32 imports that it requires.
This commit is contained in:
Alexandre Julliard 2005-08-29 15:11:37 +00:00
parent 37871ce3f1
commit bba5423d0f
10 changed files with 19 additions and 6 deletions

View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dinput8.dll MODULE = dinput8.dll
IMPORTLIB = libdinput8.$(IMPLIBEXT) IMPORTLIB = libdinput8.$(IMPLIBEXT)
IMPORTS = dinput IMPORTS = dinput kernel32
EXTRALIBS = -luuid EXTRALIBS = -luuid
C_SRCS = \ C_SRCS = \

View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = dplay.dll MODULE = dplay.dll
IMPORTLIB = libdplay.$(IMPLIBEXT) IMPORTLIB = libdplay.$(IMPLIBEXT)
IMPORTS = dplayx IMPORTS = dplayx kernel32
C_SRCS = dplay_main.c C_SRCS = dplay_main.c

View File

@ -4,6 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = newdev.dll MODULE = newdev.dll
IMPORTLIB = libnewdev.$(IMPLIBEXT) IMPORTLIB = libnewdev.$(IMPLIBEXT)
IMPORTS = kernel32
C_SRCS = main.c C_SRCS = main.c

View File

@ -2087,6 +2087,16 @@ NTSTATUS WINAPI NtUnloadDriver( const UNICODE_STRING *DriverServiceName )
} }
/******************************************************************
* DllMain (NTDLL.@)
*/
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
{
if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst );
return TRUE;
}
/****************************************************************** /******************************************************************
* __wine_init_windows_dir (NTDLL.@) * __wine_init_windows_dir (NTDLL.@)
* *

View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = olepro32.dll MODULE = olepro32.dll
IMPORTLIB = libolepro32.$(IMPLIBEXT) IMPORTLIB = libolepro32.$(IMPLIBEXT)
IMPORTS = oleaut32 IMPORTS = oleaut32 kernel32
C_SRCS = olepro32stubs.c C_SRCS = olepro32stubs.c

View File

@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = rsabase.dll MODULE = rsabase.dll
IMPORTLIB = librsabase.$(IMPLIBEXT) IMPORTLIB = librsabase.$(IMPLIBEXT)
IMPORTS = rsaenh IMPORTS = rsaenh kernel32
SUBDIRS = tests SUBDIRS = tests

View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = shfolder.dll MODULE = shfolder.dll
IMPORTLIB = libshfolder.$(IMPLIBEXT) IMPORTLIB = libshfolder.$(IMPLIBEXT)
IMPORTS = shell32 IMPORTS = shell32 kernel32
C_SRCS = shfolder_main.c C_SRCS = shfolder_main.c

View File

@ -3,6 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = stdole2.tlb MODULE = stdole2.tlb
IMPORTS = kernel32
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
RC_TLB = std_ole_v2.tlb RC_TLB = std_ole_v2.tlb

View File

@ -3,6 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = stdole32.tlb MODULE = stdole32.tlb
IMPORTS = kernel32
RC_SRCS = rsrc.rc RC_SRCS = rsrc.rc
RC_TLB = std_ole_v1.tlb RC_TLB = std_ole_v1.tlb

View File

@ -24,6 +24,6 @@
BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
{ {
/* if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst ); */ if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst );
return TRUE; return TRUE;
} }