[akhaldi] 61764: [FUSION] * 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:22:13 2014
New Revision: 61764

URL: http://svn.reactos.org/svn/reactos?rev=61764&view=rev
Log:
[FUSION]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
* Improve the GUIDs situation.
CORE-7716

Modified:
    trunk/reactos/dll/win32/fusion/CMakeLists.txt
    trunk/reactos/dll/win32/fusion/asmcache.c
    trunk/reactos/dll/win32/fusion/asmname.c
    trunk/reactos/dll/win32/fusion/fusionpriv.h

Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeLists...
==============================================================================
--- trunk/reactos/dll/win32/fusion/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/CMakeLists.txt	[iso-8859-1] Thu Jan 23 11:22:13 2014
@@ -15,7 +15,7 @@

add_library(fusion SHARED ${SOURCE} version.rc)
 set_module_type(fusion win32dll)
-target_link_libraries(fusion wine)
+target_link_libraries(fusion uuid wine)
 add_importlibs(fusion advapi32 dbghelp shlwapi user32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.0.3705 FOR all)
 add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)

Modified: trunk/reactos/dll/win32/fusion/asmcache.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmcache.c...
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmcache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmcache.c	[iso-8859-1] Thu Jan 23 11:22:13 2014
@@ -20,8 +20,6 @@

#include "fusionpriv.h"

-#include <corerror.h>
-
 static const WCHAR cache_mutex_nameW[] =
     {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0};

Modified: trunk/reactos/dll/win32/fusion/asmname.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c?...
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmname.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmname.c	[iso-8859-1] Thu Jan 23 11:22:13 2014
@@ -21,7 +21,7 @@
 #include "fusionpriv.h"

#include <assert.h>
-#include <corerror.h>
+#include <winuser.h>

typedef struct {
     IAssemblyName IAssemblyName_iface;

Modified: trunk/reactos/dll/win32/fusion/fusionpriv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/fusionpriv...
==============================================================================
--- trunk/reactos/dll/win32/fusion/fusionpriv.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/fusionpriv.h	[iso-8859-1] Thu Jan 23 11:22:13 2014
@@ -31,13 +31,12 @@
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT

-#define INITGUID
-
 #include <windef.h>
 #include <winbase.h>
 #include <winver.h>
-#include <ole2.h>
+#include <objbase.h>
 #include <fusion.h>
+#include <corerror.h>

#include <wine/unicode.h>