Patch for wine-staging to make fortnite work

fortnite-fix.patch

diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 2f5343e643..a0405750e6 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -15,63 +15,63 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LIBSOURCE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
                         'AC_SUBST' => 1,
-                        'sinclude' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'LT_INIT' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_FC_FREEFORM' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         'AM_CONDITIONAL' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        '_m4_warn' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        '_AM_COND_ELSE' => 1,
+                        'sinclude' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        'include' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_INIT' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_NLS' => 1,
+                        'm4_pattern_forbid' => 1,
                         'm4_include' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AH_OUTPUT' => 1,
                         '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_NLS' => 1,
-                        'AM_PATH_GUILE' => 1,
+                        'AC_CONFIG_FILES' => 1,
                         'AM_PROG_FC_C_O' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'LT_INIT' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AC_CONFIG_LINKS' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_SUBST_TRACE' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_FC_SRCEXT' => 1,
+                        'AM_PATH_GUILE' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_SILENT_RULES' => 1
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        '_m4_warn' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AC_INIT' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'include' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AH_OUTPUT' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index 6746ca7dbd..76cc9035dd 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -3,6 +3,7 @@ IMPORTLIB = dbghelp
 EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="\"${bindir}\""
 DELAYIMPORTS = version
 EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS)
+IMPORTS = psapi
 
 C_SRCS = \
 	coff.c \
diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in
index 87f6177aad..94d5db9e6c 100644
--- a/dlls/dxdiagn/Makefile.in
+++ b/dlls/dxdiagn/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = dxdiagn.dll
-IMPORTS   = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound
+IMPORTS   = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound psapi
 
 C_SRCS = \
 	container.c \
diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c
index 080f3f28de..2dd42a328b 100644
--- a/dlls/kernel32/debugger.c
+++ b/dlls/kernel32/debugger.c
@@ -454,7 +454,8 @@ BOOL WINAPI DebugBreakProcess(HANDLE hProc)
  */
 BOOL WINAPI IsDebuggerPresent(void)
 {
-    return NtCurrentTeb()->Peb->BeingDebugged;
+    WARN("DEBUGGER CHECK");
+    return FALSE;
 }
 
 /***********************************************************************
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index b047b10cd3..67f4543ef9 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -2626,12 +2626,15 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL
     }
 
     /* last chance exception */
-
     status = send_debug_event( rec, FALSE, context );
     if (status != DBG_CONTINUE)
     {
-        if (rec->ExceptionFlags & EH_STACK_INVALID)
+        if (rec->ExceptionFlags & EH_STACK_INVALID){
             ERR("Exception frame is not in stack limits => unable to dispatch exception.\n");
+            TRACE( "codeTEST=%x flags=%x addr=%p ip=%lx tid=%04x\n",
+               rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,
+               context->Rip, GetCurrentThreadId() );
+	    }
         else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION)
             ERR("Process attempted to continue execution after noncontinuable exception.\n");
         else
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index f187d55f16..3879bd7ad0 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -2,3 +2,5 @@ MODULE    = psapi.dll
 IMPORTLIB = psapi
 
 RC_SRCS = version.rc
+
+C_SRCS = psapi_main2.c
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index d6116f8c64..2f7010d653 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -1,26 +1,26 @@
-@ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet
-@ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers
-@ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA
-@ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW
-@ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules
-@ stdcall EnumProcessModulesEx(long ptr long ptr long) kernel32.K32EnumProcessModulesEx
-@ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses
-@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA
-@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW
-@ stdcall GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA
-@ stdcall GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW
-@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA
-@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW
-@ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA
-@ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW
-@ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA
-@ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW
-@ stdcall GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation
-@ stdcall GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo
-@ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA
-@ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW
-@ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo
-@ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges
-@ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch
-@ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet
-@ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx
+@ stdcall EmptyWorkingSet(long)
+@ stdcall EnumDeviceDrivers(ptr long ptr)
+@ stdcall EnumPageFilesA(ptr ptr)
+@ stdcall EnumPageFilesW(ptr ptr)
+@ stdcall EnumProcessModules(long ptr long ptr)
+@ stdcall EnumProcessModulesEx(long ptr long ptr long)
+@ stdcall EnumProcesses(ptr long ptr)
+@ stdcall GetDeviceDriverBaseNameA(ptr ptr long)
+@ stdcall GetDeviceDriverBaseNameW(ptr ptr long)
+@ stdcall GetDeviceDriverFileNameA(ptr ptr long)
+@ stdcall GetDeviceDriverFileNameW(ptr ptr long)
+@ stdcall GetMappedFileNameA(long ptr ptr long)
+@ stdcall GetMappedFileNameW(long ptr ptr long)
+@ stdcall GetModuleBaseNameA(long long ptr long)
+@ stdcall GetModuleBaseNameW(long long ptr long)
+@ stdcall GetModuleFileNameExA(long long ptr long)
+@ stdcall GetModuleFileNameExW(long long ptr long)
+@ stdcall GetModuleInformation(long long ptr long)
+@ stdcall GetPerformanceInfo(ptr long)
+@ stdcall GetProcessImageFileNameA(long ptr long)
+@ stdcall GetProcessImageFileNameW(long ptr long)
+@ stdcall GetProcessMemoryInfo(long ptr long)
+@ stdcall GetWsChanges(long ptr long)
+@ stdcall InitializeProcessForWsWatch(long)
+@ stdcall QueryWorkingSet(long ptr long)
+@ stdcall QueryWorkingSetEx(long ptr long)
diff --git a/dlls/psapi/psapi_bak.spec b/dlls/psapi/psapi_bak.spec
new file mode 100644
index 0000000000..d6116f8c64
--- /dev/null
+++ b/dlls/psapi/psapi_bak.spec
@@ -0,0 +1,26 @@
+@ stdcall EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet
+@ stdcall EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers
+@ stdcall EnumPageFilesA(ptr ptr) kernel32.K32EnumPageFilesA
+@ stdcall EnumPageFilesW(ptr ptr) kernel32.K32EnumPageFilesW
+@ stdcall EnumProcessModules(long ptr long ptr) kernel32.K32EnumProcessModules
+@ stdcall EnumProcessModulesEx(long ptr long ptr long) kernel32.K32EnumProcessModulesEx
+@ stdcall EnumProcesses(ptr long ptr) kernel32.K32EnumProcesses
+@ stdcall GetDeviceDriverBaseNameA(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameA
+@ stdcall GetDeviceDriverBaseNameW(ptr ptr long) kernel32.K32GetDeviceDriverBaseNameW
+@ stdcall GetDeviceDriverFileNameA(ptr ptr long) kernel32.K32GetDeviceDriverFileNameA
+@ stdcall GetDeviceDriverFileNameW(ptr ptr long) kernel32.K32GetDeviceDriverFileNameW
+@ stdcall GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA
+@ stdcall GetMappedFileNameW(long ptr ptr long) kernel32.K32GetMappedFileNameW
+@ stdcall GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA
+@ stdcall GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW
+@ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA
+@ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW
+@ stdcall GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation
+@ stdcall GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo
+@ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA
+@ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW
+@ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo
+@ stdcall GetWsChanges(long ptr long) kernel32.K32GetWsChanges
+@ stdcall InitializeProcessForWsWatch(long) kernel32.K32InitializeProcessForWsWatch
+@ stdcall QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet
+@ stdcall QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx
diff --git a/dlls/psapi/psapi_main2.c b/dlls/psapi/psapi_main2.c
new file mode 100644
index 0000000000..61a03b6604
--- /dev/null
+++ b/dlls/psapi/psapi_main2.c
@@ -0,0 +1,166 @@
+#include "psapi.h"
+
+//#include "windef.h"
+//#include "winbase.h"
+//#include "winreg.h"
+//#include "winnt.h"
+//#include "winternl.h"
+//#include "winnls.h"
+#include <windows.h>
+
+BOOL  WINAPI EnumProcesses(DWORD* one, DWORD two, DWORD* three)
+{
+  return K32EnumProcesses(one, two, three);
+}
+
+
+BOOL  WINAPI EnumProcessModules(HANDLE one, HMODULE* two, DWORD three, LPDWORD four)
+{
+  return K32EnumProcessModules(one, two, three, four);
+}
+
+
+BOOL  WINAPI EnumProcessModulesEx(HANDLE one, HMODULE* two, DWORD three, LPDWORD four, DWORD five)
+{
+  return K32EnumProcessModulesEx(one, two, three, four, five);
+}
+
+
+DWORD WINAPI GetModuleBaseNameA(HANDLE one, HMODULE two, LPSTR three, DWORD four)
+{
+  return K32GetModuleBaseNameA(one, two, three, four);
+}
+
+
+DWORD WINAPI GetModuleBaseNameW(HANDLE one, HMODULE two, LPWSTR three, DWORD four)
+{
+  return K32GetModuleBaseNameW(one, two, three, four);
+}
+
+
+DWORD WINAPI GetModuleFileNameExA(HANDLE one, HMODULE two, LPSTR three, DWORD four)
+{
+  return K32GetModuleFileNameExA(one, two, three, four);
+}
+
+
+DWORD WINAPI GetModuleFileNameExW(HANDLE one, HMODULE two, LPWSTR three, DWORD four)
+{
+  return K32GetModuleFileNameExW(one, two, three, four);
+}
+
+
+BOOL  WINAPI GetModuleInformation(HANDLE one, HMODULE two, LPMODULEINFO three, DWORD four)
+{
+  return K32GetModuleInformation(one, two, three, four);
+}
+
+
+BOOL  WINAPI EmptyWorkingSet(HANDLE one)
+{
+  return K32EmptyWorkingSet(one);
+}
+
+
+BOOL  WINAPI QueryWorkingSet(HANDLE one, PVOID two, DWORD three)
+{
+  return K32QueryWorkingSet(one, two, three);
+}
+
+
+BOOL  WINAPI QueryWorkingSetEx(HANDLE one, PVOID two, DWORD three)
+{
+  return K32QueryWorkingSetEx(one, two, three);
+}
+
+
+BOOL  WINAPI InitializeProcessForWsWatch(HANDLE one)
+{
+  return K32InitializeProcessForWsWatch(one);
+}
+
+
+BOOL  WINAPI GetWsChanges(HANDLE one, PPSAPI_WS_WATCH_INFORMATION two, DWORD three)
+{
+  return K32GetWsChanges(one, two, three);
+}
+
+
+DWORD WINAPI GetMappedFileNameW(HANDLE one, LPVOID two, LPWSTR three, DWORD four)
+{
+  return K32GetMappedFileNameW(one, two, three, four);
+}
+
+
+DWORD WINAPI GetMappedFileNameA(HANDLE one, LPVOID two, LPSTR three, DWORD four)
+{
+  return K32GetMappedFileNameA(one, two, three, four);
+}
+
+
+BOOL  WINAPI EnumDeviceDrivers(LPVOID* one, DWORD two, LPDWORD three)
+{
+  return K32EnumDeviceDrivers(one, two, three);
+}
+
+
+DWORD WINAPI GetDeviceDriverBaseNameA(LPVOID one, LPSTR two, DWORD three)
+{
+  return K32GetDeviceDriverBaseNameA(one, two, three);
+}
+
+
+DWORD WINAPI GetDeviceDriverBaseNameW(LPVOID one, LPWSTR two, DWORD three)
+{
+  return K32GetDeviceDriverBaseNameW(one, two, three);
+}
+
+
+DWORD WINAPI GetDeviceDriverFileNameA(LPVOID one, LPSTR two, DWORD three)
+{
+  return K32GetDeviceDriverFileNameA(one, two, three);
+}
+
+
+DWORD WINAPI GetDeviceDriverFileNameW(LPVOID one, LPWSTR two, DWORD three)
+{
+  return K32GetDeviceDriverFileNameW(one, two, three);
+}
+
+
+BOOL  WINAPI GetProcessMemoryInfo(HANDLE one, PPROCESS_MEMORY_COUNTERS two, DWORD three)
+{
+  return K32GetProcessMemoryInfo(one, two, three);
+}
+
+
+BOOL  WINAPI GetPerformanceInfo(PPERFORMANCE_INFORMATION one, DWORD two)
+{
+  return K32GetPerformanceInfo(one, two);
+}
+
+
+BOOL  WINAPI EnumPageFilesA(PENUM_PAGE_FILE_CALLBACKA one, LPVOID two)
+{
+  return K32EnumPageFilesA(one, two);
+}
+
+
+BOOL  WINAPI EnumPageFilesW(PENUM_PAGE_FILE_CALLBACKW one, LPVOID two)
+{
+  return K32EnumPageFilesW(one, two);
+}
+
+
+DWORD WINAPI GetProcessImageFileNameA(HANDLE one, LPSTR two, DWORD three)
+{
+  return K32GetProcessImageFileNameA(one, two, three);
+}
+
+
+DWORD WINAPI GetProcessImageFileNameW(HANDLE one, LPWSTR two, DWORD three)
+{
+  return K32GetProcessImageFileNameW(one, two, three);
+}
+
+
diff --git a/include/psapi.h b/include/psapi.h
index c7663f856d..86b5e1f874 100644
--- a/include/psapi.h
+++ b/include/psapi.h
@@ -25,6 +25,14 @@
 #define PSAPI_VERSION 2
 #endif
 
+/*#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnt.h"
+#include "winternl.h"
+#include "winnls.h"*/
+#include <windows.h>
+
 typedef struct _MODULEINFO {
   LPVOID lpBaseOfDll;
   DWORD SizeOfImage;
@@ -83,36 +91,6 @@ typedef BOOL (*PENUM_PAGE_FILE_CALLBACKW) (LPVOID, PENUM_PAGE_FILE_INFORMATION,
 extern "C" {
 #endif
 
-#if PSAPI_VERSION > 1
-#define EnumProcesses               K32EnumProcesses
-#define EnumProcessModules          K32EnumProcessModules
-#define EnumProcessModulesEx        K32EnumProcessModulesEx
-#define GetModuleBaseNameA          K32GetModuleBaseNameA
-#define GetModuleBaseNameW          K32GetModuleBaseNameW
-#define GetModuleFileNameExA        K32GetModuleFileNameExA
-#define GetModuleFileNameExW        K32GetModuleFileNameExW
-#define GetModuleInformation        K32GetModuleInformation
-#define EmptyWorkingSet             K32EmptyWorkingSet
-#define QueryWorkingSet             K32QueryWorkingSet
-#define QueryWorkingSetEx           K32QueryWorkingSetEx
-#define InitializeProcessForWsWatch K32InitializeProcessForWsWatch
-#define GetWsChanges                K32GetWsChanges
-#define GetWsChangesEx              K32GetWsChangesEx
-#define GetMappedFileNameW          K32GetMappedFileNameW
-#define GetMappedFileNameA          K32GetMappedFileNameA
-#define EnumDeviceDrivers           K32EnumDeviceDrivers
-#define GetDeviceDriverBaseNameA    K32GetDeviceDriverBaseNameA
-#define GetDeviceDriverBaseNameW    K32GetDeviceDriverBaseNameW
-#define GetDeviceDriverFileNameA    K32GetDeviceDriverFileNameA
-#define GetDeviceDriverFileNameW    K32GetDeviceDriverFileNameW
-#define GetProcessMemoryInfo        K32GetProcessMemoryInfo
-#define GetPerformanceInfo          K32GetPerformanceInfo
-#define EnumPageFilesW              K32EnumPageFilesW
-#define EnumPageFilesA              K32EnumPageFilesA
-#define GetProcessImageFileNameA    K32GetProcessImageFileNameA
-#define GetProcessImageFileNameW    K32GetProcessImageFileNameW
-#endif
-
 BOOL  WINAPI EnumProcesses(DWORD*, DWORD, DWORD*);
 BOOL  WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD);
 BOOL  WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD);
diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in
index ec53cdb7df..fcc5f4e97f 100644
--- a/programs/taskkill/Makefile.in
+++ b/programs/taskkill/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = taskkill.exe
 APPMODE   = -mconsole -municode
-IMPORTS   = user32
+IMPORTS   = user32 psapi
 
 C_SRCS = taskkill.c
 
diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in
index 194a30c0fc..fdc0a82530 100644
--- a/programs/winedbg/Makefile.in
+++ b/programs/winedbg/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winedbg.exe
 APPMODE   = -mconsole
-IMPORTS   = dbghelp advapi32
+IMPORTS   = dbghelp advapi32 psapi
 DELAYIMPORTS = comdlg32 shell32 comctl32 user32 gdi32
 EXTRALIBS = $(POLL_LIBS)