[GDIPLUS]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
* Improve the GUIDs situation.
CORE-7716

svn path=/trunk/; revision=61765

reactos/dll/win32/gdiplus/CMakeLists.txt

@@ -22,12 +22,13 @@ list(APPEND SOURCE
     pen.c
     region.c
     stringformat.c
+    guid.c
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/gdiplus.def)
 
 add_library(gdiplus SHARED ${SOURCE} gdiplus.rc)
 set_module_type(gdiplus win32dll)
-target_link_libraries(gdiplus uuid wine)
+target_link_libraries(gdiplus wine)
 add_delay_importlibs(gdiplus windowscodecs)
 add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll)
 add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all)

reactos/dll/win32/gdiplus/gdiplus_private.h

@@ -29,12 +29,10 @@
 #define NONAMELESSUNION
 #define COBJMACROS
 
-#define INITGUID
-
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <ole2.h>
+#include <objbase.h>
 #include <wincodecsdk.h>
 #include <gdiplus.h>
 
@@ -457,4 +455,4 @@ GpStatus gdip_format_string(HDC hdc,
 
 void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* __WINE_GP_PRIVATE_H_ */

reactos/dll/win32/gdiplus/guid.c

@@ -0,0 +1,17 @@
+/* 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 <wingdi.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <wincodecsdk.h>
+#include <gdiplus.h>
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

reactos/dll/win32/gdiplus/image.c

@@ -20,6 +20,7 @@
 #include "gdiplus_private.h"
 
 #include <assert.h>
+#include <ole2.h>
 #include <olectl.h>
 
 #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24)