From cc4da88563d7edb6571f87ddc686169a4302c854 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 27 Aug 2005 09:27:09 +0000
Subject: [PATCH] Explicitly import kernel32 in tests that use it.

---
 dlls/comctl32/tests/Makefile.in | 2 +-
 dlls/crypt32/tests/Makefile.in  | 2 +-
 dlls/gdi/tests/Makefile.in      | 2 +-
 dlls/iphlpapi/tests/Makefile.in | 2 +-
 dlls/lzexpand/tests/Makefile.in | 2 +-
 dlls/mapi32/tests/Makefile.in   | 2 +-
 dlls/msacm/tests/Makefile.in    | 2 +-
 dlls/mshtml/tests/Makefile.in   | 2 +-
 dlls/msvcrt/tests/Makefile.in   | 2 +-
 dlls/msvcrtd/tests/Makefile.in  | 2 +-
 dlls/netapi32/tests/Makefile.in | 2 +-
 dlls/oleaut32/tests/Makefile.in | 2 +-
 dlls/rpcrt4/tests/Makefile.in   | 2 +-
 dlls/secur32/tests/Makefile.in  | 2 +-
 dlls/shell32/tests/Makefile.in  | 2 +-
 dlls/shlwapi/tests/Makefile.in  | 2 +-
 dlls/urlmon/tests/Makefile.in   | 2 +-
 dlls/user/tests/Makefile.in     | 2 +-
 dlls/version/tests/Makefile.in  | 2 +-
 dlls/wininet/tests/Makefile.in  | 2 +-
 dlls/winsock/tests/Makefile.in  | 2 +-
 programs/winetest/Makefile.in   | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in
index ae0099f4db1..161a8edb8bb 100644
--- a/dlls/comctl32/tests/Makefile.in
+++ b/dlls/comctl32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = comctl32.dll
-IMPORTS   = comctl32 ole32 shlwapi user32 gdi32 advapi32
+IMPORTS   = comctl32 ole32 shlwapi user32 gdi32 advapi32 kernel32
 
 CTESTS = \
 	dpa.c \
diff --git a/dlls/crypt32/tests/Makefile.in b/dlls/crypt32/tests/Makefile.in
index 8257fe62a6c..0a709db1056 100644
--- a/dlls/crypt32/tests/Makefile.in
+++ b/dlls/crypt32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = crypt32.dll
-IMPORTS   = crypt32
+IMPORTS   = crypt32 kernel32
 
 CTESTS = \
 	cert.c \
diff --git a/dlls/gdi/tests/Makefile.in b/dlls/gdi/tests/Makefile.in
index 8d3ef6e3141..2e2a05436a3 100644
--- a/dlls/gdi/tests/Makefile.in
+++ b/dlls/gdi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = gdi32.dll
-IMPORTS   = user32 gdi32
+IMPORTS   = user32 gdi32 kernel32
 
 CTESTS = \
 	bitmap.c \
diff --git a/dlls/iphlpapi/tests/Makefile.in b/dlls/iphlpapi/tests/Makefile.in
index 0f1b423006f..4bdac82aa53 100644
--- a/dlls/iphlpapi/tests/Makefile.in
+++ b/dlls/iphlpapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = iphlpapi.dll
-IMPORTS   = iphlpapi
+IMPORTS   = iphlpapi kernel32
 
 CTESTS = \
 	iphlpapi.c
diff --git a/dlls/lzexpand/tests/Makefile.in b/dlls/lzexpand/tests/Makefile.in
index b098fa2d2fd..b2ce11b5c45 100644
--- a/dlls/lzexpand/tests/Makefile.in
+++ b/dlls/lzexpand/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = lz32.dll
-IMPORTS   = lz32
+IMPORTS   = lz32 kernel32
 
 CTESTS = \
 	lzexpand_main.c
diff --git a/dlls/mapi32/tests/Makefile.in b/dlls/mapi32/tests/Makefile.in
index 626788715aa..80ebd8619b0 100644
--- a/dlls/mapi32/tests/Makefile.in
+++ b/dlls/mapi32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mapi32.dll
-IMPORTS   = mapi32
+IMPORTS   = mapi32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/msacm/tests/Makefile.in b/dlls/msacm/tests/Makefile.in
index e05eba7f14c..890f1d68496 100644
--- a/dlls/msacm/tests/Makefile.in
+++ b/dlls/msacm/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msacm32.dll
-IMPORTS   = msacm32
+IMPORTS   = msacm32 kernel32
 
 CTESTS = \
 	msacm.c
diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in
index cf86e7e1cc8..ed9e90e8c22 100644
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = mshtml.dll
-IMPORTS   = ole32 user32 urlmon
+IMPORTS   = ole32 user32 urlmon kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in
index e418531fc91..2681d61495b 100644
--- a/dlls/msvcrt/tests/Makefile.in
+++ b/dlls/msvcrt/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrt.dll
-IMPORTS   = msvcrt
+IMPORTS   = msvcrt kernel32
 MODCFLAGS = @BUILTINFLAG@
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt -I$(SRCDIR)/..
 
diff --git a/dlls/msvcrtd/tests/Makefile.in b/dlls/msvcrtd/tests/Makefile.in
index da9732d98cb..d4fc1c1b0e3 100644
--- a/dlls/msvcrtd/tests/Makefile.in
+++ b/dlls/msvcrtd/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrtd.dll
-IMPORTS   = msvcrt
+IMPORTS   = msvcrt kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
 
diff --git a/dlls/netapi32/tests/Makefile.in b/dlls/netapi32/tests/Makefile.in
index d474fd5b9b1..94f19717624 100644
--- a/dlls/netapi32/tests/Makefile.in
+++ b/dlls/netapi32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = netapi32.dll
-IMPORTS   = netapi32 advapi32
+IMPORTS   = netapi32 advapi32 kernel32
 
 CTESTS = \
 	access.c \
diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in
index dd376fb1454..dbd80667737 100644
--- a/dlls/oleaut32/tests/Makefile.in
+++ b/dlls/oleaut32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = oleaut32.dll
-IMPORTS   = oleaut32 ole32 gdi32
+IMPORTS   = oleaut32 ole32 gdi32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in
index d7a130fcaae..710b5efd73d 100644
--- a/dlls/rpcrt4/tests/Makefile.in
+++ b/dlls/rpcrt4/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = rpcrt4.dll
-IMPORTS   = rpcrt4
+IMPORTS   = rpcrt4 kernel32
 
 CTESTS = \
 	generated.c \
diff --git a/dlls/secur32/tests/Makefile.in b/dlls/secur32/tests/Makefile.in
index 1a399962e74..07abcad2c2c 100644
--- a/dlls/secur32/tests/Makefile.in
+++ b/dlls/secur32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = secur32.dll
-IMPORTS   = secur32
+IMPORTS   = secur32 kernel32
 
 CTESTS = \
 	main.c
diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in
index 0d9bf008929..0cdf1386514 100644
--- a/dlls/shell32/tests/Makefile.in
+++ b/dlls/shell32/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shell32.dll
-IMPORTS   = shell32 ole32 oleaut32 shlwapi advapi32
+IMPORTS   = shell32 ole32 oleaut32 shlwapi advapi32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/shlwapi/tests/Makefile.in b/dlls/shlwapi/tests/Makefile.in
index c7c831d6eb6..b865c9d5bed 100644
--- a/dlls/shlwapi/tests/Makefile.in
+++ b/dlls/shlwapi/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = shlwapi.dll
-IMPORTS   = shlwapi advapi32 ole32 oleaut32
+IMPORTS   = shlwapi advapi32 ole32 oleaut32 kernel32
 
 CTESTS = \
 	clist.c \
diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in
index 7e3048b2f0c..de76bb65524 100644
--- a/dlls/urlmon/tests/Makefile.in
+++ b/dlls/urlmon/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = urlmon.dll
-IMPORTS   = urlmon user32
+IMPORTS   = urlmon user32 kernel32
 EXTRALIBS = -luuid
 
 CTESTS = \
diff --git a/dlls/user/tests/Makefile.in b/dlls/user/tests/Makefile.in
index 12bab2e263e..6614ad470f6 100644
--- a/dlls/user/tests/Makefile.in
+++ b/dlls/user/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = user32.dll
-IMPORTS   = user32 gdi32 advapi32
+IMPORTS   = user32 gdi32 advapi32 kernel32
 
 CTESTS = \
 	class.c \
diff --git a/dlls/version/tests/Makefile.in b/dlls/version/tests/Makefile.in
index 01ec220d59f..6b4c47641e8 100644
--- a/dlls/version/tests/Makefile.in
+++ b/dlls/version/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = version.dll
-IMPORTS   = version
+IMPORTS   = version kernel32
 
 CTESTS = \
 	info.c
diff --git a/dlls/wininet/tests/Makefile.in b/dlls/wininet/tests/Makefile.in
index 072981b32cc..c2759d33b16 100644
--- a/dlls/wininet/tests/Makefile.in
+++ b/dlls/wininet/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = wininet.dll
-IMPORTS   = wininet
+IMPORTS   = wininet kernel32
 
 CTESTS = \
 	generated.c \
diff --git a/dlls/winsock/tests/Makefile.in b/dlls/winsock/tests/Makefile.in
index dae48eb07c3..8ef1464f3bc 100644
--- a/dlls/winsock/tests/Makefile.in
+++ b/dlls/winsock/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = ws2_32.dll
-IMPORTS   = ws2_32
+IMPORTS   = ws2_32 kernel32
 
 CTESTS = \
 	protocol.c \
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 468aff5c4c4..e43b5eb4081 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -4,7 +4,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winetest.exe
 APPMODE   = -mconsole
-IMPORTS   = comctl32 user32 gdi32 wsock32
+IMPORTS   = comctl32 user32 gdi32 wsock32 kernel32
 
 C_SRCS = \
 	gui.c \