diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 79b589dbb29..4ef34ab5297 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -372,8 +372,9 @@ libx11drv.@LIBEXT@: x11drv/libx11drv.@LIBEXT@ # Inter-dll dependencies (only necessary for .so) +advapi32/libadvapi32.so: libkernel32.so avifil32/libavifil32.so: libmsvfw32.so libkernel32.so -comctl32/libcomctl32.so: libuser32.so libgdi32.so +comctl32/libcomctl32.so: libuser32.so libgdi32.so libkernel32.so commdlg/libcomdlg32.so: libshell32.so libshlwapi.so libcomctl32.so libuser32.so libwinspool.drv.so libgdi32.so libkernel32.so crtdll/libcrtdll.so: libkernel32.so ddraw/libddraw.so: libole32.so libuser32.so libx11drv.so libgdi32.so libkernel32.so @@ -382,15 +383,20 @@ dplay/libdplay.so: libdplayx.so dplayx/libdplayx.so: libole32.so libadvapi32.so libkernel32.so dsound/libdsound.so: libwinmm.so libkernel32.so gdi/libgdi32.so: libkernel32.so -msacm/libmsacm32.so: libwinmm.so +icmp/libicmp.so: libkernel32.so +imagehlp/libimagehlp.so: libkernel32.so +lzexpand/liblz32.so: libkernel32.so +mpr/libmpr.so: libkernel32.so +msacm/libmsacm32.so: libwinmm.so libkernel32.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 +richedit/libriched32.so: libuser32.so libkernel32.so +serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so +setupapi/libsetupapi.so: libkernel32.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 @@ -399,9 +405,11 @@ urlmon/liburlmon.so: libole32.so user/libuser32.so: libgdi32.so libkernel32.so version/libversion.so: liblz32.so libkernel32.so win32s/libw32skrnl.so: libkernel32.so -wineps/libwineps.so: libgdi32.so +winaspi/libwnaspi32.so: libkernel32.so +wineps/libwineps.so: libgdi32.so libkernel32.so +wininet/libwininet.so: libkernel32.so winmm/joystick/libjoystick.drv.so: libwinmm.so libuser32.so -winmm/libwinmm.so: libuser32.so +winmm/libwinmm.so: libuser32.so libkernel32.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 @@ -410,8 +418,8 @@ 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 +winsock/libws2_32.so: libuser32.so libkernel32.so +winspool/libwinspool.drv.so: libgdi32.so libadvapi32.so libkernel32.so wow32/libwow32.so: libkernel32.so wsock32/libwsock32.so: libws2_32.so x11drv/libx11drv.so: libuser32.so libgdi32.so libkernel32.so diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 36c0103599d..0b22ab35e74 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = advapi32 SOVERSION = 1.0 +IMPORTS = kernel32 C_SRCS = \ advapi.c \ diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index c84993bbadf..1fed46199e9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -1,6 +1,9 @@ name advapi32 type win32 +import kernel32.dll +import ntdll.dll + @ stub AbortSystemShutdownA @ stub AbortSystemShutdownW @ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) AccessCheck diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index fc0c88fd4d0..fc79f99b854 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = comctl32 SOVERSION = 1.0 WRCEXTRA = -s -p$(MODULE) -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 kernel32 C_SRCS = \ animate.c \ diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index ce1db46d730..1368321a38c 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -5,6 +5,7 @@ rsrc comctl32 import user32.dll import gdi32.dll +import kernel32.dll # Functions exported by the Win95 comctl32.dll # (these need to have these exact ordinals, because some win95 dlls diff --git a/dlls/icmp/Makefile.in b/dlls/icmp/Makefile.in index 9ff7cb2bcfe..f77e49cb20c 100644 --- a/dlls/icmp/Makefile.in +++ b/dlls/icmp/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = icmp SOVERSION = 1.0 +IMPORTS = kernel32 C_SRCS = icmp_main.c diff --git a/dlls/icmp/icmp.spec b/dlls/icmp/icmp.spec index dd9d4ac7771..0e30d902866 100644 --- a/dlls/icmp/icmp.spec +++ b/dlls/icmp/icmp.spec @@ -1,6 +1,8 @@ name icmp type win32 +import kernel32.dll + @ stdcall IcmpCloseHandle(ptr) IcmpCloseHandle @ stdcall IcmpCreateFile() IcmpCreateFile @ stub IcmpParseReplies diff --git a/dlls/imagehlp/Makefile.in b/dlls/imagehlp/Makefile.in index e869d7427eb..b0c2befccb8 100644 --- a/dlls/imagehlp/Makefile.in +++ b/dlls/imagehlp/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = imagehlp SOVERSION = 1.0 +IMPORTS = kernel32 C_SRCS = \ access.c \ diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 0a5c0bc27a3..d403ff657c4 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -2,6 +2,8 @@ name imagehlp type win32 init IMAGEHLP_LibMain +import kernel32.dll + @ stdcall BindImage(str str str) BindImage @ stdcall BindImageEx(long str str str ptr) BindImageEx @ stdcall CheckSumMappedFile(ptr long ptr ptr) CheckSumMappedFile diff --git a/dlls/lzexpand/Makefile.in b/dlls/lzexpand/Makefile.in index a773a623d67..d5ef1ca2351 100644 --- a/dlls/lzexpand/Makefile.in +++ b/dlls/lzexpand/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = lz32 SOVERSION = 1.0 ALTNAMES = lzexpand +IMPORTS = kernel32 C_SRCS = \ lzexpand_main.c diff --git a/dlls/lzexpand/lz32.spec b/dlls/lzexpand/lz32.spec index f16c335498b..828d18f0540 100644 --- a/dlls/lzexpand/lz32.spec +++ b/dlls/lzexpand/lz32.spec @@ -1,6 +1,8 @@ name lz32 type win32 +import kernel32.dll + @ stdcall CopyLZFile(long long) CopyLZFile @ stdcall GetExpandedNameA(str ptr) GetExpandedNameA @ stdcall GetExpandedNameW(wstr ptr) GetExpandedNameW diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index 5879a1cd6be..b6e312e0926 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mpr SOVERSION = 1.0 +IMPORTS = kernel32 C_SRCS = \ auth.c \ diff --git a/dlls/mpr/mpr.spec b/dlls/mpr/mpr.spec index 26e9b8aff57..efe28d03942 100644 --- a/dlls/mpr/mpr.spec +++ b/dlls/mpr/mpr.spec @@ -1,6 +1,8 @@ name mpr type win32 +import kernel32.dll + # ordinal exports 1 stub @ 2 stub @ diff --git a/dlls/msacm/Makefile.in b/dlls/msacm/Makefile.in index bdcde277dc1..9a41981d89d 100644 --- a/dlls/msacm/Makefile.in +++ b/dlls/msacm/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = msacm32 SOVERSION = 1.0 ALTNAMES = msacm -IMPORTS = winmm +IMPORTS = winmm kernel32 C_SRCS = \ driver.c \ diff --git a/dlls/msacm/msacm32.spec b/dlls/msacm/msacm32.spec index 5ef2e46cbaf..9687de7e355 100644 --- a/dlls/msacm/msacm32.spec +++ b/dlls/msacm/msacm32.spec @@ -3,6 +3,7 @@ type win32 init MSACM32_LibMain import winmm.dll +import kernel32.dll 1 stub XRegThunkEntry 2 stdcall acmDriverAddA(ptr long long long long) acmDriverAddA diff --git a/dlls/richedit/Makefile.in b/dlls/richedit/Makefile.in index dcc38fc1d65..d4a8c6ea6ea 100644 --- a/dlls/richedit/Makefile.in +++ b/dlls/richedit/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = riched32 SOVERSION = 1.0 -IMPORTS = user32 +IMPORTS = user32 kernel32 C_SRCS = \ charlist.c \ diff --git a/dlls/richedit/riched32.spec b/dlls/richedit/riched32.spec index 799a141f76e..b0c06fbd859 100644 --- a/dlls/richedit/riched32.spec +++ b/dlls/richedit/riched32.spec @@ -3,5 +3,6 @@ type win32 init RICHED32_LibMain import user32.dll +import kernel32.dll 2 stdcall DllGetVersion (ptr) RICHED32_DllGetVersion diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 85bf55398c2..5ae497df19d 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = serialui SOVERSION = 1.0 -IMPORTS = user32 +IMPORTS = user32 advapi32 kernel32 C_SRCS = \ confdlg.c diff --git a/dlls/serialui/serialui.spec b/dlls/serialui/serialui.spec index 4b69485f12b..c6d3d067b79 100644 --- a/dlls/serialui/serialui.spec +++ b/dlls/serialui/serialui.spec @@ -4,6 +4,8 @@ init SERIALUI_LibMain rsrc serialui_rc import user32.dll +import advapi32.dll +import kernel32.dll 2 stdcall EnumPropPages(ptr ptr ptr) SERIALUI_EnumPropPages 3 stdcall drvCommConfigDialog(ptr long ptr) SERIALUI_CommConfigDialog diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 90a0428ad44..b850029945e 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = setupapi SOVERSION = 1.0 ALTNAMES = setupx +IMPORTS = kernel32 C_SRCS = \ setupx_main.c \ diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 8e8bf1df4ef..4b5cf0921aa 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -1,6 +1,8 @@ name setupapi type win32 +import kernel32.dll + # almost all functions are commented out for now. Ordinals are from setupapi.dll 4.0 # 45 stdcall SetupAddInstallSectionToDiskSpaceListA() SetupAddInstallSectionToDiskSpaceListA diff --git a/dlls/winaspi/Makefile.in b/dlls/winaspi/Makefile.in index 347c1478f7a..f935ce85426 100644 --- a/dlls/winaspi/Makefile.in +++ b/dlls/winaspi/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = wnaspi32 SOVERSION = 1.0 ALTNAMES = winaspi +IMPORTS = kernel32 C_SRCS = \ aspi.c \ diff --git a/dlls/winaspi/wnaspi32.spec b/dlls/winaspi/wnaspi32.spec index 043584be887..6c1a86ad5b9 100644 --- a/dlls/winaspi/wnaspi32.spec +++ b/dlls/winaspi/wnaspi32.spec @@ -2,6 +2,8 @@ name wnaspi32 type win32 init WNASPI32_LibMain +import kernel32.dll + 1 stdcall GetASPI32SupportInfo() GetASPI32SupportInfo 2 cdecl SendASPI32Command(ptr) SendASPI32Command 4 stdcall GetASPI32DLLVersion() GetASPI32DLLVersion diff --git a/dlls/wineps/Makefile.in b/dlls/wineps/Makefile.in index 354368bacfc..b5f57554b48 100644 --- a/dlls/wineps/Makefile.in +++ b/dlls/wineps/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = wineps SOVERSION = 1.0 ALTNAMES = wineps16 -IMPORTS = gdi32 +IMPORTS = gdi32 kernel32 C_SRCS = \ afm.c \ diff --git a/dlls/wineps/wineps.spec b/dlls/wineps/wineps.spec index e3d5bb89aa7..4fc1eb88fce 100644 --- a/dlls/wineps/wineps.spec +++ b/dlls/wineps/wineps.spec @@ -3,3 +3,4 @@ type win32 init PSDRV_Init import gdi32.dll +import kernel32.dll diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index b9f5c4b4619..cb1e1f7f0b0 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -4,6 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wininet SOVERSION = 1.0 +IMPORTS = kernel32 C_SRCS = \ http.c \ diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 2e028fbbba9..d6442f92435 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -2,6 +2,8 @@ name wininet type win32 init WININET_LibMain +import kernel32.dll + @ stub InternetInitializeAutoProxyDll @ stub ShowCertificate @ stub CommitUrlCacheEntryA diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 8f888738bf3..e9907b5f3fa 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = winmm SOVERSION = 1.0 ALTNAMES = mmsystem sound -IMPORTS = user32 +IMPORTS = user32 kernel32 C_SRCS = \ joystick.c \ diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 83565177115..68446516520 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -4,6 +4,7 @@ init WINMM_LibMain rsrc winmm_res import user32.dll +import kernel32.dll # ordinal exports 1 stdcall @(ptr long long) PlaySoundA diff --git a/dlls/winsock/Makefile.in b/dlls/winsock/Makefile.in index 37955f31217..f7f195c019b 100644 --- a/dlls/winsock/Makefile.in +++ b/dlls/winsock/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = ws2_32 SOVERSION = 1.0 ALTNAMES = winsock -IMPORTS = user32 +IMPORTS = user32 kernel32 C_SRCS = \ async.c \ diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec index 0a6289a7fb2..725204e7814 100644 --- a/dlls/winsock/ws2_32.spec +++ b/dlls/winsock/ws2_32.spec @@ -7,6 +7,7 @@ type win32 init WSOCK32_LibMain import user32.dll +import kernel32.dll # EXPORTS *********** 1 stdcall accept(long ptr ptr) WSOCK32_accept diff --git a/dlls/winspool/Makefile.in b/dlls/winspool/Makefile.in index 25f3bfb1733..2525288a3f8 100644 --- a/dlls/winspool/Makefile.in +++ b/dlls/winspool/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winspool.drv SOVERSION = 1.0 -IMPORTS = gdi32 +IMPORTS = gdi32 advapi32 kernel32 C_SRCS = \ info.c \ diff --git a/dlls/winspool/winspool.drv.spec b/dlls/winspool/winspool.drv.spec index c4aa42c9015..1e57f9fa768 100644 --- a/dlls/winspool/winspool.drv.spec +++ b/dlls/winspool/winspool.drv.spec @@ -4,6 +4,8 @@ file winspool.drv init WINSPOOL_EntryPoint import gdi32.dll +import advapi32.dll +import kernel32.dll 101 stub ADVANCEDSETUPDIALOG 102 stub AbortPrinter