ChangeSet ID:	14873
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2004/12/15 04:52:57

Modified files:
	dlls/winspool  : winspool.drv.spec 
	dlls/msimg32   : msimg32_main.c msimg32.spec 
	dlls/dciman32  : dciman_main.c dciman32.spec 
	dlls/advpack   : advpack.spec advpack.c 

Log message:
	It makes no sense to export the dll entry point as stub.

Patch: http://cvs.winehq.org/patch.py?id=14873

Old revision  New revision  Changes     Path
 1.24          1.25          +0 -1       wine/dlls/winspool/winspool.drv.spec
 1.9           1.10          +12 -0      wine/dlls/msimg32/msimg32_main.c
 1.10          1.11          +1 -1       wine/dlls/msimg32/msimg32.spec
 1.7           1.8           +12 -0      wine/dlls/dciman32/dciman_main.c
 1.10          1.11          +1 -1       wine/dlls/dciman32/dciman32.spec
 1.3           1.4           +1 -1       wine/dlls/advpack/advpack.spec
 1.5           1.6           +5 -2       wine/dlls/advpack/advpack.c

Index: wine/dlls/winspool/winspool.drv.spec
diff -u -p wine/dlls/winspool/winspool.drv.spec:1.24 wine/dlls/winspool/winspool.drv.spec:1.25
--- wine/dlls/winspool/winspool.drv.spec:1.24	Fri May 24 04:39:53 2013
+++ wine/dlls/winspool/winspool.drv.spec	Fri May 24 04:39:53 2013
@@ -107,7 +107,6 @@
 @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr)
 @ stdcall GetPrinterDriverW(long str long ptr long ptr)
 @ stdcall GetPrinterW(long long ptr long ptr)
-@ stub InitializeDll
 @ stdcall OpenPrinterA(str ptr ptr)
 @ stdcall OpenPrinterW(wstr ptr ptr)
 @ stub PlayGdiScriptOnPrinterIC

Index: wine/dlls/msimg32/msimg32_main.c
diff -u -p wine/dlls/msimg32/msimg32_main.c:1.9 wine/dlls/msimg32/msimg32_main.c:1.10
--- wine/dlls/msimg32/msimg32_main.c:1.9	Fri May 24 04:39:53 2013
+++ wine/dlls/msimg32/msimg32_main.c	Fri May 24 04:39:53 2013
@@ -26,6 +26,18 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msimg32);
 
+/***********************************************************************
+ *           DllInitialize (MSIMG32.@)
+ *
+ * MSIMG32 initialisation routine.
+ */
+BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
+{
+    if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst );
+    return TRUE;
+}
+
+
 /******************************************************************************
  *           vSetDdrawflag   (MSIMG32.@)
  */

Index: wine/dlls/msimg32/msimg32.spec
diff -u -p wine/dlls/msimg32/msimg32.spec:1.10 wine/dlls/msimg32/msimg32.spec:1.11
--- wine/dlls/msimg32/msimg32.spec:1.10	Fri May 24 04:39:53 2013
+++ wine/dlls/msimg32/msimg32.spec	Fri May 24 04:39:53 2013
@@ -1,5 +1,5 @@
 @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend
-@ stub DllInitialize
+@ stdcall DllInitialize(long long ptr) DllMain
 @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill
 @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt
 @ stdcall vSetDdrawflag()

Index: wine/dlls/dciman32/dciman_main.c
diff -u -p wine/dlls/dciman32/dciman_main.c:1.7 wine/dlls/dciman32/dciman_main.c:1.8
--- wine/dlls/dciman32/dciman_main.c:1.7	Fri May 24 04:39:53 2013
+++ wine/dlls/dciman32/dciman_main.c	Fri May 24 04:39:53 2013
@@ -28,6 +28,18 @@
 #include "wine/debug.h"
 
 /***********************************************************************
+ *           DllEntryPoint (DCIMAN32.@)
+ *
+ * DCIMAN32 initialisation routine.
+ */
+BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
+{
+    if (reason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls( inst );
+    return TRUE;
+}
+
+
+/***********************************************************************
  *		DCIOpenProvider (DCIMAN32.@)
  */
 HDC WINAPI

Index: wine/dlls/dciman32/dciman32.spec
diff -u -p wine/dlls/dciman32/dciman32.spec:1.10 wine/dlls/dciman32/dciman32.spec:1.11
--- wine/dlls/dciman32/dciman32.spec:1.10	Fri May 24 04:39:53 2013
+++ wine/dlls/dciman32/dciman32.spec	Fri May 24 04:39:53 2013
@@ -11,7 +11,7 @@
 @ stub    DCISetClipList
 @ stub    DCISetDestination
 @ stub    DCISetSrcDestClip
-@ stub    DllEntryPoint
+@ stdcall DllEntryPoint(long long ptr) DllMain
 @ stub    GetDCRegionData
 @ stub    GetWindowRegionData
 @ stub    WinWatchClose

Index: wine/dlls/advpack/advpack.spec
diff -u -p wine/dlls/advpack/advpack.spec:1.3 wine/dlls/advpack/advpack.spec:1.4
--- wine/dlls/advpack/advpack.spec:1.3	Fri May 24 04:39:53 2013
+++ wine/dlls/advpack/advpack.spec	Fri May 24 04:39:53 2013
@@ -3,7 +3,7 @@
 @ stub CloseINFEngine
 @ stub DelNode
 @ stub DelNodeRunDLL32
-@ stub DllMain
+@ stdcall DllMain(long long ptr)
 @ stdcall DoInfInstall(ptr)
 @ stub ExecuteCab
 @ stub ExtractFiles

Index: wine/dlls/advpack/advpack.c
diff -u -p wine/dlls/advpack/advpack.c:1.5 wine/dlls/advpack/advpack.c:1.6
--- wine/dlls/advpack/advpack.c:1.5	Fri May 24 04:39:53 2013
+++ wine/dlls/advpack/advpack.c	Fri May 24 04:39:53 2013
@@ -31,6 +31,9 @@
 WINE_DEFAULT_DEBUG_CHANNEL(advpack);
 
 
+/***********************************************************************
+ *           DllMain (ADVPACK.@)
+ */
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
     TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved);
@@ -42,7 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,
 }
 
 /***********************************************************************
- *		LaunchINFSection  (SETUPAPI.@)
+ *		LaunchINFSection  (ADVPACK.@)
  */
 void WINAPI LaunchINFSection( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
 {
@@ -50,7 +53,7 @@ void WINAPI LaunchINFSection( HWND hWnd,
 }
 
 /***********************************************************************
- *		LaunchINFSectionEx  (SETUPAPI.@)
+ *		LaunchINFSectionEx  (ADVPACK.@)
  */
 void WINAPI LaunchINFSectionEx( HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show )
 {