From 7418d39f5ab9b21b1ed2943943ef6e429e096d39 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Wed, 17 Apr 2002 16:51:47 +0000 Subject: [PATCH] Export a few more 16-bit GDI functions. Finished wineps separation. --- Makefile.in | 5 +---- dlls/Makefile.in | 7 +------ dlls/gdi/gdi32.spec | 7 ++++++- dlls/wineps/Makefile.in | 4 +++- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile.in b/Makefile.in index ef3d6e64aca..ea5210d56be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,7 +40,7 @@ LIBRARIES = \ unicode/libwine_unicode.$(LIBEXT) # Dlls that we need to link against (should go away) -LINKABLE_DLLS = winspool.drv user32.dll gdi32.dll kernel32.dll ntdll.dll +LINKABLE_DLLS = user32.dll gdi32.dll kernel32.dll ntdll.dll # Libraries symlinks to create at the top level LIBSYMLINKS = \ @@ -120,9 +120,6 @@ libwine_unicode.$(LIBEXT): unicode/libwine_unicode.$(LIBEXT) libwine_uuid.a: ole/libwine_uuid.a $(RM) $@ && $(LN_S) ole/libwine_uuid.a $@ -libwinspool.drv.$(LIBEXT): dlls/winspool.drv$(DLLEXT) - $(RM) $@ && $(LN_S) dlls/winspool.drv$(DLLEXT) $@ - libuser32.dll.$(LIBEXT): dlls/user32.dll$(DLLEXT) $(RM) $@ && $(LN_S) dlls/user32.dll$(DLLEXT) $@ diff --git a/dlls/Makefile.in b/dlls/Makefile.in index d36ccad609e..49ef3e64b2f 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -751,9 +751,7 @@ winedos/winedos.dll$(DLLEXT): dummy user32.dll$(DLLEXT) kernel32.dll$(DLLEXT) \ @cd winedos && $(MAKE) winedos.dll$(DLLEXT) wineps/wineps.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \ - winspool.drv$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) \ - libuser32.dll.$(LIBEXT) libgdi32.dll.$(LIBEXT) libwinspool.drv.$(LIBEXT) libkernel32.dll.$(LIBEXT) \ - libntdll.dll.$(LIBEXT) + winspool.drv$(DLLEXT) advapi32.dll$(DLLEXT) kernel32.dll$(DLLEXT) ntdll.dll$(DLLEXT) @cd wineps && $(MAKE) wineps.dll$(DLLEXT) wininet/wininet.dll$(DLLEXT): dummy shlwapi.dll$(DLLEXT) user32.dll$(DLLEXT) \ @@ -832,9 +830,6 @@ x11drv/x11drv.dll$(DLLEXT): dummy user32.dll$(DLLEXT) gdi32.dll$(DLLEXT) \ # Special targets for dlls that we need to link to -libwinspool.drv.$(LIBEXT): winspool/winspool.drv$(DLLEXT) - $(RM) $@ && $(LN_S) winspool/winspool.drv$(DLLEXT) $@ - libntdll.dll.$(LIBEXT): ntdll/ntdll.dll$(DLLEXT) $(RM) $@ && $(LN_S) ntdll/ntdll.dll$(DLLEXT) $@ diff --git a/dlls/gdi/gdi32.spec b/dlls/gdi/gdi32.spec index 5c632a0ac13..426fff29e46 100644 --- a/dlls/gdi/gdi32.spec +++ b/dlls/gdi/gdi32.spec @@ -422,6 +422,11 @@ debug_channels (bitblt bitmap clipping dc ddraw driver enhmetafile font gdi ################################################################ # Wine extensions: Win16 functions that are needed by other dlls # -@ stdcall CreateMetaFile16(str) CreateMetaFile16 +@ stdcall CloseJob16(long) CloseJob16 @ stdcall CloseMetaFile16(long) CloseMetaFile16 +@ stdcall CreateMetaFile16(str) CreateMetaFile16 +@ stdcall DrvGetPrinterData16(str str ptr ptr long ptr) DrvGetPrinterData16 +@ stdcall DrvSetPrinterData16(str str long ptr long) DrvSetPrinterData16 +@ stdcall OpenJob16(str str long) OpenJob16 @ stdcall SetDCHook(long ptr long) SetDCHook +@ stdcall WriteSpool16(long ptr long) WriteSpool16 diff --git a/dlls/wineps/Makefile.in b/dlls/wineps/Makefile.in index dbe2ba40ddb..77c3a4bca23 100644 --- a/dlls/wineps/Makefile.in +++ b/dlls/wineps/Makefile.in @@ -4,10 +4,12 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineps.dll ALTNAMES = wineps16.dll -IMPORTS = user32.dll gdi32.dll winspool.drv kernel32.dll ntdll.dll EXTRALIBS = @CUPSLIBS@ EXTRAINCL = @FREETYPEINCL@ +LDDLLFLAGS = @LDDLLFLAGS@ +SYMBOLFILE = $(MODULE).tmp.o + FONTMETRICS = \ AvantGarde_Book \ AvantGarde_BookOblique \ -- GitLab