[INCLUDE] Rename <ddk/imm.h> as <ddk/immdev.h> (#4321)

- Rename <ddk/imm.h> as <ddk/immdev.h>.
- Delete sdk/include/reactos/wine/imm.h (this header is confusing and nonsense).
- Changes related to it.
CORE-11700

dll/win32/imm32/precomp.h

@@ -27,7 +27,7 @@
 #include <winver.h>
 
 #include <imm.h>
-#include <ddk/imm.h>
+#include <ddk/immdev.h>
 
 #define NTOS_MODE_USER
 #include <ndk/umtypes.h>

modules/rostests/apitests/imm32/precomp.h

@@ -4,7 +4,7 @@
 #define WIN32_NO_STATUS
 #include <windows.h>
 #include <imm.h>
-#include <ddk/imm.h>
+#include <ddk/immdev.h>
 #include <pseh/pseh2.h>
 #include <ndk/umtypes.h>
 #include <ndk/pstypes.h>

modules/rostests/winetests/imm32/imm32.c

@@ -24,7 +24,11 @@
 #include "winuser.h"
 #include "wingdi.h"
 #include "imm.h"
+#ifdef __REACTOS__
+#include "ddk/immdev.h"
+#else
 #include "ddk/imm.h"
+#endif
 
 static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD);
 static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM);

sdk/include/ddk/immdev.h

@@ -1,29 +1,22 @@
+/*
+ * PROJECT:     ReactOS headers
+ * LICENSE:     LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
+ * PURPOSE:     Providing DDK-compatible <immdev.h> and IME/IMM development helper
+ * COPYRIGHT:   Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
+ */
 
-#ifndef _WINE_IMM_H_
-#define _WINE_IMM_H_
+#ifndef _IMMDEV_
+#define _IMMDEV_
+
+#pragma once
 
 #include <wingdi.h>
+#include <imm.h>
 
-#ifdef WINE_NO_UNICODE_MACROS
-# define WINELIB_NAME_AW(func) \
-    func##_must_be_suffixed_with_W_or_A_in_this_context \
-    func##_must_be_suffixed_with_W_or_A_in_this_context
-#else  /* WINE_NO_UNICODE_MACROS */
-# ifdef UNICODE
-#  define WINELIB_NAME_AW(func) func##W
-# else
-#  define WINELIB_NAME_AW(func) func##A
-# endif
-#endif  /* WINE_NO_UNICODE_MACROS */
-
-#ifdef WINE_NO_UNICODE_MACROS
-# define DECL_WINELIB_TYPE_AW(type)  /* nothing */
-#else
-# define DECL_WINELIB_TYPE_AW(type)  typedef WINELIB_NAME_AW(type) type;
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-#include <psdk/imm.h>
-
 /* wParam for WM_IME_CONTROL */
 #define IMC_GETCONVERSIONMODE           0x0001
 #define IMC_GETSENTENCEMODE             0x0003
@@ -52,7 +45,7 @@ typedef struct _tagINPUTCONTEXT {
     HIMCC               hMsgBuf;
     DWORD               fdwInit;
     DWORD               dwReserve[3];
-} INPUTCONTEXT, *LPINPUTCONTEXT;
+} INPUTCONTEXT, *PINPUTCONTEXT, *LPINPUTCONTEXT;
 
 #ifdef _WIN64
 C_ASSERT(offsetof(INPUTCONTEXT, hWnd) == 0x0);
@@ -197,4 +190,8 @@ typedef struct IME_STATE
 C_ASSERT(sizeof(IME_STATE) == 0x18);
 #endif
 
-#endif /* _WINE_IMM_H_ */
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
+#endif  /* ndef _IMMDEV_ */

sdk/include/reactos/wine/imm.h

@@ -1,2 +0,0 @@
-
-#include "ddk/imm.h"

win32ss/user/user32/misc/imm.c

@@ -11,7 +11,7 @@
 
 #include <user32.h>
 #include <strsafe.h>
-#include <ddk/imm.h>
+#include <ddk/immdev.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(user32);