Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 23:38:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FUSION]

Browse source 
* 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=61764
This commit is contained in:
Amine Khaldi 2014-01-23 11:22:13 +00:00
parent 946e9d16fe
commit 2fab6263e9
4 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/fusion/CMakeLists.txt
View file

@ -15,7 +15,7 @@ list(APPEND SOURCE
add_library(fusion SHARED ${SOURCE} version.rc) add_library(fusion SHARED ${SOURCE} version.rc)
set_module_type(fusion win32dll) 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_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.0.3705 FOR all)
add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all) add_cd_file(TARGET fusion DESTINATION reactos/Microsoft.NET/Framework/v1.1.4322 FOR all)

2
reactos/dll/win32/fusion/asmcache.c
View file

@ -20,8 +20,6 @@
#include "fusionpriv.h" #include "fusionpriv.h"
#include <corerror.h>
static const WCHAR cache_mutex_nameW[] = 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}; {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0};

2
reactos/dll/win32/fusion/asmname.c
View file

@ -21,7 +21,7 @@
#include "fusionpriv.h" #include "fusionpriv.h"
#include <assert.h> #include <assert.h>
#include <corerror.h> #include <winuser.h>
typedef struct { typedef struct {
IAssemblyName IAssemblyName_iface; IAssemblyName IAssemblyName_iface;

5
reactos/dll/win32/fusion/fusionpriv.h
View file

@ -31,13 +31,12 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#define INITGUID
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winver.h> #include <winver.h>
#include <ole2.h> #include <objbase.h>
#include <fusion.h> #include <fusion.h>
#include <corerror.h>
#include <wine/unicode.h> #include <wine/unicode.h>