Separate wineps out of Wine's core.

Make.rules.in

@@ -140,6 +140,7 @@ DLLS = \
 	win87em \
 	windebug \
 	wineoss.drv \
+	wineps \
 	wing \
 	wininet \
 	winmm \

Makefile.in

@@ -37,7 +37,6 @@ LIBSUBDIRS = \
 	graphics \
 	graphics/enhmetafiledrv \
 	graphics/metafiledrv \
-	graphics/psdrv \
 	graphics/win16drv \
 	if1632 \
 	library \
@@ -105,7 +104,6 @@ LIBOBJS = \
 	graphics/graphics.o \
 	graphics/enhmetafiledrv/enhmetafiledrv.o \
 	graphics/metafiledrv/metafiledrv.o \
-	graphics/psdrv/psdrv.o \
 	graphics/win16drv/win16drv.o \
 	if1632/if1632.o \
 	loader/loader.o \

configure

@@ -6239,6 +6239,7 @@ dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
 dlls/windebug/Makefile
+dlls/wineps/Makefile
 dlls/wing/Makefile
 dlls/wininet/Makefile
 dlls/winmm/Makefile
@@ -6262,7 +6263,6 @@ files/Makefile
 graphics/Makefile
 graphics/enhmetafiledrv/Makefile
 graphics/metafiledrv/Makefile
-graphics/psdrv/Makefile
 graphics/ttydrv/Makefile
 graphics/win16drv/Makefile
 graphics/x11drv/Makefile
@@ -6473,6 +6473,7 @@ dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
 dlls/windebug/Makefile
+dlls/wineps/Makefile
 dlls/wing/Makefile
 dlls/wininet/Makefile
 dlls/winmm/Makefile
@@ -6496,7 +6497,6 @@ files/Makefile
 graphics/Makefile
 graphics/enhmetafiledrv/Makefile
 graphics/metafiledrv/Makefile
-graphics/psdrv/Makefile
 graphics/ttydrv/Makefile
 graphics/win16drv/Makefile
 graphics/x11drv/Makefile

configure.in

@@ -1033,6 +1033,7 @@ dlls/win32s/Makefile
 dlls/win87em/Makefile
 dlls/winaspi/Makefile
 dlls/windebug/Makefile
+dlls/wineps/Makefile
 dlls/wing/Makefile
 dlls/wininet/Makefile
 dlls/winmm/Makefile
@@ -1056,7 +1057,6 @@ files/Makefile
 graphics/Makefile
 graphics/enhmetafiledrv/Makefile
 graphics/metafiledrv/Makefile
-graphics/psdrv/Makefile
 graphics/ttydrv/Makefile
 graphics/win16drv/Makefile
 graphics/x11drv/Makefile

dlls/Makefile.in

@@ -75,7 +75,6 @@ EXTRADLLNAMES = \
 	commdlg \
 	compobj \
 	ddeml \
-	dispdib \
 	dplay \
 	gdi \
 	keyboard \
@@ -183,7 +182,7 @@ libdplayx.@LIBEXT@ libdplay.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
 libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
 	$(RM) $@ && $(LN_S) dsound/libdsound.@LIBEXT@ $@
 
-libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@: gdi/libgdi32.@LIBEXT@
+libgdi32.@LIBEXT@ libgdi.@LIBEXT@: gdi/libgdi32.@LIBEXT@
 	$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
 
 libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@

dlls/gdi/gdi_main.c

@@ -8,7 +8,6 @@
 
 #include "gdi.h"
 #include "global.h"
-#include "psdrv.h"
 #include "tweak.h"
 #include "win16drv.h"
 
@@ -35,7 +34,7 @@ BOOL WINAPI MAIN_GdiInit(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved
     if (!WIN16DRV_Init()) return FALSE;
 
     /* PSDRV initialization */
-    if(!PSDRV_Init()) return FALSE;
+    if (!LoadLibraryA( "wineps" )) return FALSE;
 
     return TRUE;
 }

dlls/wineps/.cvsignore

@@ -0,0 +1,4 @@
+Makefile
+libwineps.so.1.0
+wineps.spec.c
+wineps16.spec.c

dlls/wineps/Makefile.in

@@ -1,9 +1,12 @@
-DEFS      = @DLLFLAGS@ -D__WINE__
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
-MODULE    = psdrv
+MODULE    = wineps
+SOVERSION = 1.0
+ALTNAMES  = wineps16
+
+SPEC_SRCS = wineps.spec wineps16.spec
 
 C_SRCS = \
 	afm.c \
@@ -23,8 +26,6 @@ C_SRCS = \
 	ps.c \
 	text.c
 
-all: $(MODULE).o
-
-@MAKE_RULES@
+@MAKE_DLL_RULES@
 
 ### Dependencies:

dlls/wineps/init.c

@@ -221,15 +221,35 @@ static LOGFONTA DefaultLogFont = {
  * Initializes font metrics and registers driver. Called from GDI_Init()
  *
  */
-BOOL PSDRV_Init(void)
+BOOL WINAPI PSDRV_Init( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 {
-    TRACE("\n");
-    PSDRV_Heap = HeapCreate(0, 0x10000, 0);
-    PSDRV_GetFontMetrics();
-    PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
-    return DRIVER_RegisterDriver( "WINEPS", &PSDRV_Funcs );
+    static int process_count = 0;
+
+    TRACE("(0x%4x, 0x%08lx, %p)\n", hinst, reason, reserved);
+   
+    switch(reason) {
+	case DLL_PROCESS_ATTACH:
+	    if (!process_count++) {
+		/* FIXME: return FALSE if we fail any of these steps */
+		PSDRV_Heap = HeapCreate(0, 0x10000, 0);
+		PSDRV_GetFontMetrics();
+		PSDRV_DefaultFont = CreateFontIndirectA(&DefaultLogFont);
+		DRIVER_RegisterDriver( "WINEPS", &PSDRV_Funcs );
+	    }
+	break;
+	case DLL_PROCESS_DETACH:
+            if (!--process_count) {
+		DeleteObject( PSDRV_DefaultFont );
+		HeapDestroy( PSDRV_Heap );
+		DRIVER_UnregisterDriver( "WINEPS" );
+	    }
+	break;
+    }
+ 
+    return TRUE;
 }
 
+
 /**********************************************************************
  *	     PSDRV_CreateDC
  */

dlls/wineps/psdrv.h

@@ -251,7 +251,7 @@ extern AFM *PSDRV_FindAFMinList(FONTFAMILY *head, char *name);
 extern void PSDRV_AddAFMtoList(FONTFAMILY **head, AFM *afm);
 extern void PSDRV_FreeAFMList( FONTFAMILY *head );
 
-extern BOOL PSDRV_Init(void);
+extern BOOL WINAPI PSDRV_Init(HINSTANCE hinst, DWORD reason, LPVOID reserved);
 extern HFONT16 PSDRV_FONT_SelectObject( DC *dc, HFONT16 hfont, FONTOBJ *font);
 extern HPEN PSDRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen );
 extern HBRUSH PSDRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush,

dlls/wineps/wineps.spec

@@ -0,0 +1,4 @@
+name	wineps
+type	win32
+init	PSDRV_Init
+

dlls/wineps/wineps16.spec

@@ -1,4 +1,4 @@
-name    wineps
+name    wineps16
 type    win16
 
 13 pascal16 DeviceMode(word word str str) PSDRV_DeviceMode16

graphics/psdrv/.cvsignore

@@ -1 +0,0 @@
-Makefile

if1632/.cvsignore

@@ -1,10 +1,4 @@
+*.spec.c
 Makefile
 call16.s
-comm.spec.c
-dispdib.spec.c
-kernel.spec.c
-system.spec.c
 thunk.glue.c
-toolhelp.spec.c
-wineps.spec.c
-wprocs.spec.c

if1632/Makefile.in

@@ -7,6 +7,7 @@ MODULE    = if1632
 
 SPEC_SRCS = \
 	comm.spec \
+	dispdib.spec \
 	kernel.spec \
 	system.spec \
 	toolhelp.spec \

loader/main.c

@@ -49,7 +49,6 @@
 #include "thread.h"
 #include "task.h"
 #include "debugtools.h"
-#include "psdrv.h"
 #include "win16drv.h"
 #include "callback.h"
 #include "server.h"