[MAPI32]

* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61409

reactos/dll/win32/mapi32/CMakeLists.txt

@@ -10,11 +10,12 @@ list(APPEND SOURCE
     sendmail.c
     util.c
     stubs.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def)
 
 add_library(mapi32 SHARED ${SOURCE} version.rc)
 set_module_type(mapi32 win32dll)
-target_link_libraries(mapi32 wine)
+target_link_libraries(mapi32 uuid wine)
 add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all)

reactos/dll/win32/mapi32/guid.c

@@ -0,0 +1,15 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <mapiguid.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/dll/win32/mapi32/precomp.h

@@ -16,7 +16,6 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <initguid.h>
 #include <mapival.h>
 #include <mapiutil.h>