Revert "[USER32] Load IMM table (reactos#3215)"

This reverts commit cbbb341.

Author: vgalnt

win32ss/user/user32/include/immtable.h

@@ -57,8 +57,6 @@
 #include <wine/unicode.h>
 #include <wine/debug.h>
 
-#include <winnls32.h>
-
 /* Internal User32 Headers */
 #include "user32p.h"
 

win32ss/user/user32/include/user32.h

@@ -17,24 +17,31 @@
 #include "resource.h"
 #include "ntwrapper.h"
 
-#define IMM_RETURN_VOID(retval) /* empty */
-#define IMM_RETURN_NONVOID(retval) return (retval)
 
-/* typedef FN_... */
-#undef DEFINE_IMM_ENTRY
-#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \
-    typedef type (WINAPI *FN_##name)params;
-#include "immtable.h"
-
-/* define Imm32ApiTable */
 typedef struct
 {
-#undef DEFINE_IMM_ENTRY
-#define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \
-    FN_##name p##name;
-#include "immtable.h"
+    BOOL (WINAPI* pImmIsIME) (HKL);
+    LRESULT (WINAPI* pImmEscapeA) (HKL, HIMC, UINT, LPVOID);
+    LRESULT (WINAPI* pImmEscapeW) (HKL, HIMC, UINT, LPVOID);
+    LONG (WINAPI* pImmGetCompositionStringA) (HIMC, DWORD, LPVOID, DWORD);
+    LONG (WINAPI* pImmGetCompositionStringW) (HIMC, DWORD, LPVOID, DWORD);
+    BOOL (WINAPI* pImmGetCompositionFontA) (HIMC, LPLOGFONTA);
+    BOOL (WINAPI* pImmGetCompositionFontW) (HIMC, LPLOGFONTW);
+    BOOL (WINAPI* pImmSetCompositionFontA)(HIMC, LPLOGFONTA);
+    BOOL (WINAPI* pImmSetCompositionFontW)(HIMC, LPLOGFONTW);
+    BOOL (WINAPI* pImmGetCompositionWindow) (HIMC, LPCOMPOSITIONFORM);
+    BOOL (WINAPI* pImmSetCompositionWindow) (HIMC, LPCOMPOSITIONFORM);
+    HIMC (WINAPI* pImmAssociateContext) (HWND, HIMC);
+    BOOL (WINAPI* pImmReleaseContext) (HWND, HIMC);
+    HIMC (WINAPI* pImmGetContext) (HWND);
+    HWND (WINAPI* pImmGetDefaultIMEWnd) (HWND);
+    BOOL (WINAPI* pImmNotifyIME) (HIMC, DWORD, DWORD, DWORD);
+    BOOL (WINAPI* pImmRegisterClient) (PVOID, HINSTANCE);
+    UINT (WINAPI* pImmProcessKey) (HWND, HKL, UINT, LPARAM, DWORD);
+
 } Imm32ApiTable;
 
+
 /* global variables */
 extern HINSTANCE User32Instance;
 #define user32_module User32Instance
@@ -54,8 +61,6 @@ extern HINSTANCE ghmodUserApiHook;
 extern HICON hIconSmWindows, hIconWindows;
 extern Imm32ApiTable gImmApiEntries;
 
-#define IMM_FN(name) gImmApiEntries.p##name
-
 #define IS_ATOM(x) \
   (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))