From 9756db83c9064841e3a1ddbd3997db17517a8fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 14 Mar 2015 15:37:00 +0000
Subject: [PATCH] [FMIFS]: Reorganize a bit the inclusions, and always compile
 the DLL in UNICODE.

svn path=/trunk/; revision=66705
---
 reactos/dll/win32/fmifs/CMakeLists.txt | 2 +-
 reactos/dll/win32/fmifs/init.c         | 2 ++
 reactos/dll/win32/fmifs/precomp.h      | 9 ++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/reactos/dll/win32/fmifs/CMakeLists.txt b/reactos/dll/win32/fmifs/CMakeLists.txt
index 13a61eb37d2..5289094d51a 100644
--- a/reactos/dll/win32/fmifs/CMakeLists.txt
+++ b/reactos/dll/win32/fmifs/CMakeLists.txt
@@ -18,7 +18,7 @@ add_library(fmifs SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/fmifs.def)
 
-set_module_type(fmifs win32dll ENTRYPOINT InitializeFmIfs 12)
+set_module_type(fmifs win32dll UNICODE ENTRYPOINT InitializeFmIfs 12)
 add_importlibs(fmifs kernel32 ntdll)
 add_pch(fmifs precomp.h SOURCE)
 add_dependencies(fmifs psdk)
diff --git a/reactos/dll/win32/fmifs/init.c b/reactos/dll/win32/fmifs/init.c
index b23497e6e62..0fe8bc051cf 100644
--- a/reactos/dll/win32/fmifs/init.c
+++ b/reactos/dll/win32/fmifs/init.c
@@ -11,6 +11,8 @@
 #include "precomp.h"
 
 #include <winreg.h>
+
+#define NTOS_MODE_USER
 #include <ndk/cmfuncs.h>
 #include <ndk/obfuncs.h>
 
diff --git a/reactos/dll/win32/fmifs/precomp.h b/reactos/dll/win32/fmifs/precomp.h
index d76fb772846..0d2218f47f8 100644
--- a/reactos/dll/win32/fmifs/precomp.h
+++ b/reactos/dll/win32/fmifs/precomp.h
@@ -13,16 +13,15 @@
 
 /* INCLUDES ******************************************************************/
 
-#define WIN32_NO_STATUS
-#define NTOS_MODE_USER
-#define UNICODE
-#define _UNICODE
-
 #include <stdio.h>
 
+#define WIN32_NO_STATUS
+
 /* PSDK/NDK Headers */
 #include <windef.h>
 #include <winbase.h>
+
+#define NTOS_MODE_USER
 #include <ndk/rtlfuncs.h>
 
 /* FMIFS Public Header */