Skip to content
Snippets Groups Projects
Commit 6c9d83aa authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Added imports of user32/gdi32/kernel32 wherever necessary.

parent aa25b620
No related branches found
No related tags found
No related merge requests found
Showing
with 77 additions and 48 deletions
......@@ -42,14 +42,9 @@ $(ALTNAMES:%=lib%.a): lib$(MODULE).a
# Rules for checking that no imports are missing
IMPORTLIBS = $(IMPORTS:%=$(DLLDIR)/lib%.$(LIBEXT))
checklink:: lib$(MODULE).$(LIBEXT) $(IMPORTLIBS)
checklink:: lib$(MODULE).$(LIBEXT)
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -l$(MODULE) -L$(TOPOBJDIR) -lwine -lwine_unicode $(EXTRALIBS) $(LIBS) && $(RM) checklink
$(IMPORTLIBS): dummy
@cd $(DLLDIR) && $(MAKE) `basename $@`
# Rules for installation
.PHONY: install_so install_a
......
......@@ -114,6 +114,7 @@ EXTRADLLNAMES = \
win87em \
winaspi \
windebug \
wineps16 \
wing \
winsock \
wprocs
......@@ -212,7 +213,7 @@ libdplayx.@LIBEXT@: dplayx/libdplayx.@LIBEXT@
libdsound.@LIBEXT@: dsound/libdsound.@LIBEXT@
$(RM) $@ && $(LN_S) dsound/libdsound.@LIBEXT@ $@
libgdi32.@LIBEXT@ libgdi.@LIBEXT@ libdispdib.@LIBEXT@ libwing.@LIBEXT@: gdi/libgdi32.@LIBEXT@
libgdi32.@LIBEXT@ libdispdib.@LIBEXT@ libgdi.@LIBEXT@ libwing.@LIBEXT@: gdi/libgdi32.@LIBEXT@
$(RM) $@ && $(LN_S) gdi/libgdi32.@LIBEXT@ $@
libicmp.@LIBEXT@: icmp/libicmp.@LIBEXT@
......@@ -224,14 +225,14 @@ libimagehlp.@LIBEXT@: imagehlp/libimagehlp.@LIBEXT@
libimm32.@LIBEXT@: imm32/libimm32.@LIBEXT@
$(RM) $@ && $(LN_S) imm32/libimm32.@LIBEXT@ $@
libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libsystem.@LIBEXT@ \
libstress.@LIBEXT@ libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \
libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@
$(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@
libjoystick.drv.@LIBEXT@: winmm/joystick/libjoystick.drv.@LIBEXT@
$(RM) $@ && $(LN_S) winmm/joystick/libjoystick.drv.@LIBEXT@ $@
libkernel32.@LIBEXT@ libcomm.@LIBEXT@ libkernel.@LIBEXT@ libstress.@LIBEXT@ \
libsystem.@LIBEXT@ libtoolhelp.@LIBEXT@ libwin87em.@LIBEXT@ libwindebug.@LIBEXT@ \
libwprocs.@LIBEXT@: kernel/libkernel32.@LIBEXT@
$(RM) $@ && $(LN_S) kernel/libkernel32.@LIBEXT@ $@
liblz32.@LIBEXT@ liblzexpand.@LIBEXT@: lzexpand/liblz32.@LIBEXT@
$(RM) $@ && $(LN_S) lzexpand/liblz32.@LIBEXT@ $@
......@@ -271,7 +272,8 @@ libmsvfw32.@LIBEXT@ libmsvideo.@LIBEXT@: msvideo/libmsvfw32.@LIBEXT@
libodbc32.@LIBEXT@: odbc32/libodbc32.@LIBEXT@
$(RM) $@ && $(LN_S) odbc32/libodbc32.@LIBEXT@ $@
libole32.@LIBEXT@ libole2.@LIBEXT@ libole2conv.@LIBEXT@ libole2nls.@LIBEXT@ libole2prox.@LIBEXT@ libole2thk.@LIBEXT@ libstorage.@LIBEXT@ libcompobj.@LIBEXT@: ole32/libole32.@LIBEXT@
libole32.@LIBEXT@ libcompobj.@LIBEXT@ libole2.@LIBEXT@ libole2conv.@LIBEXT@ \
libole2nls.@LIBEXT@ libole2prox.@LIBEXT@ libole2thk.@LIBEXT@ libstorage.@LIBEXT@: ole32/libole32.@LIBEXT@
$(RM) $@ && $(LN_S) ole32/libole32.@LIBEXT@ $@
liboleaut32.@LIBEXT@ libole2disp.@LIBEXT@ libtypelib.@LIBEXT@: oleaut32/liboleaut32.@LIBEXT@
......@@ -328,7 +330,8 @@ libttydrv.@LIBEXT@: ttydrv/libttydrv.@LIBEXT@
liburlmon.@LIBEXT@: urlmon/liburlmon.@LIBEXT@
$(RM) $@ && $(LN_S) urlmon/liburlmon.@LIBEXT@ $@
libuser32.@LIBEXT@ libuser.@LIBEXT@ libkeyboard.@LIBEXT@ libddeml.@LIBEXT@ libdisplay.@LIBEXT@ libmouse.@LIBEXT@: user/libuser32.@LIBEXT@
libuser32.@LIBEXT@ libddeml.@LIBEXT@ libdisplay.@LIBEXT@ libkeyboard.@LIBEXT@ \
libmouse.@LIBEXT@ libuser.@LIBEXT@: user/libuser32.@LIBEXT@
$(RM) $@ && $(LN_S) user/libuser32.@LIBEXT@ $@
libversion.@LIBEXT@ libver.@LIBEXT@: version/libversion.@LIBEXT@
......@@ -340,7 +343,7 @@ libw32skrnl.@LIBEXT@ libw32sys.@LIBEXT@ libwin32s16.@LIBEXT@: win32s/libw32skrnl
libwineoss.drv.@LIBEXT@: winmm/wineoss/libwineoss.drv.@LIBEXT@
$(RM) $@ && $(LN_S) winmm/wineoss/libwineoss.drv.@LIBEXT@ $@
libwineps.@LIBEXT@: wineps/libwineps.@LIBEXT@
libwineps.@LIBEXT@ libwineps16.@LIBEXT@: wineps/libwineps.@LIBEXT@
$(RM) $@ && $(LN_S) wineps/libwineps.@LIBEXT@ $@
libwininet.@LIBEXT@: wininet/libwininet.@LIBEXT@
......@@ -369,33 +372,48 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@
# Inter-dll dependencies (only necessary for .so)
avifil32/libavifil32.so: libmsvfw32.so libwinmm.so
commdlg/libcomdlg32.so: libwinspool.drv.so
dinput/libdinput.so: libuser32.so
ddraw/libddraw.so: libx11drv.so
dplayx/libdplayx.so: libole32.so
dsound/libdsound.so: libwinmm.so
msvideo/libmsvfw32.so: libwinmm.so
ole32/libole32.so: librpcrt4.so libkernel32.so
oleaut32/liboleaut32.so: libole32.so libcomctl32.so
olecli/libolecli32.so: libolesvr32.so libole32.so
olepro32/libolepro32.so: liboleaut32.so libole32.so
opengl32/libopengl32.so: libx11drv.so libgdi32.so
shell32/libshell32.so: libole32.so libshlwapi.so
avifil32/libavifil32.so: libmsvfw32.so libkernel32.so
comctl32/libcomctl32.so: libuser32.so libgdi32.so
commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libwinspool.drv.so libuser32.so libgdi32.so libkernel32.so
crtdll/libcrtdll.so: libkernel32.so
ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so
dinput/libdinput.so: libuser32.so libkernel32.so
dplay/libdplay.so: libdplayx.so
dplayx/libdplayx.so: libole32.so libadvapi32.so libkernel32.so
dsound/libdsound.so: libwinmm.so libkernel32.so
msacm/libmsacm32.so: libwinmm.so
msvideo/libmsvfw32.so: libwinmm.so libuser32.so libgdi32.so libkernel32.so
ole32/libole32.so: libadvapi32.so libuser32.so libgdi32.so librpcrt4.so libkernel32.so
oleaut32/liboleaut32.so: libole32.so libgdi32.so libkernel32.so
olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
olepro32/libolepro32.so: liboleaut32.so
opengl32/libopengl32.so: libx11drv.so
richedit/libriched32.so: libuser32.so
serialui/libserialui.so: libuser32.so
shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so
shfolder/libshfolder.so: libshell32.so
shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libkernel32.so
ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
urlmon/liburlmon.so: libole32.so
version/libversion.so: liblz32.so
user/libuser32.so: libgdi32.so
version/libversion.so: liblz32.so libkernel32.so
win32s/libw32skrnl.so: libkernel32.so
winmm/joystick/libjoystick.drv.so: libwinmm.so
winmm/mcianim/libmcianim.drv.so: libwinmm.so
winmm/mciavi/libmciavi.drv.so: libwinmm.so
winmm/mcicda/libmcicda.drv.so: libwinmm.so
winmm/mciseq/libmciseq.drv.so: libwinmm.so
winmm/mciwave/libmciwave.drv.so: libwinmm.so
winmm/midimap/libmidimap.drv.so: libwinmm.so
winmm/wavemap/libmsacm.drv.so: libwinmm.so
winmm/wineoss/libwineoss.drv.so: libwinmm.so
wineps/libwineps.so: libgdi32.so
winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so
winmm/libwinmm.so: libuser32.so
winmm/mcianim/libmcianim.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/mciavi/libmciavi.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/mcicda/libmcicda.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/mciseq/libmciseq.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/mciwave/libmciwave.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/midimap/libmidimap.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/wavemap/libmsacm.drv.so: libwinmm.so libuser32.so libkernel32.so
winmm/wineoss/libwineoss.drv.so: libwinmm.so libuser32.so libkernel32.so
winsock/libws2_32.so: libuser32.so
winspool/libwinspool.drv.so: libgdi32.so
wow32/libwow32.so: libkernel32.so
wsock32/libwsock32.so: libws2_32.so
x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so
$(DLLFILES): dummy
@cd `dirname $@` && $(MAKE)
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = avifil32
SOVERSION = 1.0
ALTNAMES = avifile
IMPORTS = msvfw32 winmm
IMPORTS = msvfw32 kernel32
C_SRCS = \
avifile.c
......
name avifil32
type win32
import msvfw32.dll
import msvfw32.dll
import kernel32.dll
@ stub AVIBuildFilter
@ stub AVIBuildFilterA
......
......@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = comctl32
SOVERSION = 1.0
WRCEXTRA = -s -p$(MODULE)
IMPORTS = user32 gdi32
C_SRCS = \
animate.c \
......
......@@ -3,6 +3,9 @@ type win32
init COMCTL32_LibMain
rsrc comctl32
import user32.dll
import gdi32.dll
# Functions exported by the Win95 comctl32.dll
# (these need to have these exact ordinals, because some win95 dlls
# import comctl32.dll by ordinal)
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = comdlg32
SOVERSION = 1.0
ALTNAMES = commdlg
IMPORTS = winspool.drv
IMPORTS = shell32 shlwapi comctl32 user32 winspool.drv gdi32 kernel32
WRCEXTRA = -s -pcomdlg32
C_SRCS = \
......
......@@ -8,6 +8,8 @@ import shlwapi.dll
import comctl32.dll
import user32.dll
import winspool.drv
import gdi32.dll
import kernel32.dll
0 stub ArrowBtnWndProc
1 stdcall ChooseColorA(ptr) ChooseColorA
......
......@@ -4,6 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = crtdll
SOVERSION = 1.0
IMPORTS = kernel32
C_SRCS = \
crtdll_main.c \
......
......@@ -3,7 +3,8 @@ name crtdll
type win32
init CRTDLL_Init
import ntdll
import kernel32.dll
import ntdll.dll
@ cdecl ??2@YAPAXI@Z(long) CRTDLL_new
@ cdecl ??3@YAXPAX@Z(long) CRTDLL_delete
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = ddraw
SOVERSION = 1.0
IMPORTS = x11drv
IMPORTS = ole32 user32 x11drv gdi32 kernel32
MESA_SRCS = \
d3dcommon.c \
......
name ddraw
type win32
import kernel32.dll
import user32.dll
import ole32.dll
import user32.dll
import x11drv.dll
import gdi32.dll
import kernel32.dll
@ stub DDHAL32_VidMemAlloc
@ stub DDHAL32_VidMemFree
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dinput
SOVERSION = 1.0
IMPORTS = user32
IMPORTS = user32 kernel32
C_SRCS = \
dinput_main.c
......
......@@ -2,6 +2,7 @@ name dinput
type win32
import user32.dll
import kernel32.dll
@ stdcall DirectInputCreateA(long long ptr ptr) DirectInputCreateA
@ stub DirectInputCreateW
......
......@@ -4,6 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dplay
SOVERSION = 1.0
IMPORTS = dplayx
C_SRCS = dplay_main.c
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dplayx
SOVERSION = 1.0
IMPORTS = ole32
IMPORTS = ole32 advapi32 kernel32
C_SRCS = \
dpclassfactory.c \
......
......@@ -3,6 +3,8 @@ type win32
init DPLAYX_LibMain
import ole32.dll
import advapi32.dll
import kernel32.dll
1 stdcall DirectPlayCreate(ptr ptr ptr) DirectPlayCreate
2 stdcall DirectPlayEnumerateA(ptr ptr) DirectPlayEnumerateA
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dsound
SOVERSION = 1.0
IMPORTS = winmm
IMPORTS = winmm kernel32
C_SRCS = \
dsound_main.c
......
name dsound
type win32
import winmm
import kernel32
0 stub DirectSoundUnknown
1 stdcall DirectSoundCreate(ptr ptr ptr) DirectSoundCreate
......
......@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = msacm32
SOVERSION = 1.0
ALTNAMES = msacm
IMPORTS = winmm
C_SRCS = \
driver.c \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment