mirror of
https://github.com/reactos/reactos.git
synced 2025-06-12 01:08:30 +00:00
[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 svn path=/trunk/; revision=61764
This commit is contained in:
parent
946e9d16fe
commit
2fab6263e9
4 changed files with 4 additions and 7 deletions
|
@ -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)
|
||||||
|
|
|
@ -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};
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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>
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue