[akhaldi] 61765: [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

Author: akhaldi
Date: Thu Jan 23 11:25:09 2014
New Revision: 61765

URL: http://svn.reactos.org/svn/reactos?rev=61765&view=rev
Log:
[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

Added:
    trunk/reactos/dll/win32/gdiplus/guid.c   (with props)
Modified:
    trunk/reactos/dll/win32/gdiplus/CMakeLists.txt
    trunk/reactos/dll/win32/gdiplus/gdiplus_private.h
    trunk/reactos/dll/win32/gdiplus/image.c

Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeList...
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt	[iso-8859-1] Thu Jan 23 11:25:09 2014
@@ -22,12 +22,13 @@
     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)

Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_p...
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h	[iso-8859-1] Thu Jan 23 11:25:09 2014
@@ -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 @@

void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN;

-#endif
+#endif /* __WINE_GP_PRIVATE_H_ */

Added: trunk/reactos/dll/win32/gdiplus/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/guid.c?re...
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/guid.c	(added)
+++ trunk/reactos/dll/win32/gdiplus/guid.c	[iso-8859-1] Thu Jan 23 11:25:09 2014
@@ -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 */

Propchange: trunk/reactos/dll/win32/gdiplus/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/gdiplus/image.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?r...
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/image.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/image.c	[iso-8859-1] Thu Jan 23 11:25:09 2014
@@ -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)