mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 17:06:29 +00:00
[FUSION]
* Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 svn path=/trunk/; revision=61357
This commit is contained in:
parent
c4d6d656ed
commit
92cf82554d
|
@ -18,32 +18,9 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
//#include <stdio.h>
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winuser.h"
|
||||
//#include "winver.h"
|
||||
//#include "wincrypt.h"
|
||||
#include <winreg.h>
|
||||
#include <shlwapi.h>
|
||||
//#include "dbghelp.h"
|
||||
//#include "ole2.h"
|
||||
#include <fusion.h>
|
||||
#include <corerror.h>
|
||||
|
||||
#include "fusionpriv.h"
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(fusion);
|
||||
#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};
|
||||
|
|
|
@ -18,31 +18,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winuser.h"
|
||||
#include <ole2.h>
|
||||
//#include "guiddef.h"
|
||||
#include <fusion.h>
|
||||
//#include "corerror.h"
|
||||
#include "fusionpriv.h"
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#include <wine/list.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(fusion);
|
||||
|
||||
typedef struct _tagASMNAME
|
||||
{
|
||||
struct list entry;
|
||||
|
|
|
@ -18,29 +18,10 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <assert.h>
|
||||
|
||||
#define COBJMACROS
|
||||
#define INITGUID
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winuser.h"
|
||||
#include <ole2.h>
|
||||
//#include "guiddef.h"
|
||||
#include <fusion.h>
|
||||
#include <corerror.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
#include "fusionpriv.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(fusion);
|
||||
#include <assert.h>
|
||||
#include <corerror.h>
|
||||
|
||||
typedef struct {
|
||||
IAssemblyName IAssemblyName_iface;
|
||||
|
|
|
@ -18,27 +18,12 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
#include "fusionpriv.h"
|
||||
|
||||
#include <stdarg.h>
|
||||
//#include <stdio.h>
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winuser.h"
|
||||
#include <winver.h>
|
||||
#include <wincrypt.h>
|
||||
#include <dbghelp.h>
|
||||
#include <ole2.h>
|
||||
#include <fusion.h>
|
||||
#include <corhdr.h>
|
||||
|
||||
#include "fusionpriv.h"
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
|
||||
#define TableFromToken(tk) (TypeFromToken(tk) >> 24)
|
||||
#define TokenFromTable(idx) (idx << 24)
|
||||
|
||||
|
|
|
@ -18,24 +18,7 @@
|
|||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define COBJMACROS
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
//#include "winuser.h"
|
||||
#include <ole2.h>
|
||||
#include <fusion.h>
|
||||
#include <wine/debug.h>
|
||||
#include <wine/unicode.h>
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(fusion);
|
||||
|
||||
#include "fusionpriv.h"
|
||||
|
||||
/******************************************************************
|
||||
* InitializeFusion (FUSION.@)
|
||||
|
|
|
@ -21,12 +21,28 @@
|
|||
#ifndef __WINE_FUSION_PRIVATE__
|
||||
#define __WINE_FUSION_PRIVATE__
|
||||
|
||||
//#include <stdarg.h>
|
||||
#include <stdarg.h>
|
||||
|
||||
//#include "windef.h"
|
||||
//#include "winbase.h"
|
||||
//#include "winuser.h"
|
||||
#define WIN32_NO_STATUS
|
||||
#define _INC_WINDOWS
|
||||
#define COM_NO_WINDOWS_H
|
||||
|
||||
#define COBJMACROS
|
||||
#define NONAMELESSUNION
|
||||
#define NONAMELESSSTRUCT
|
||||
|
||||
#define INITGUID
|
||||
|
||||
#include <windef.h>
|
||||
#include <winbase.h>
|
||||
#include <winver.h>
|
||||
#include <ole2.h>
|
||||
#include <fusion.h>
|
||||
|
||||
#include <wine/unicode.h>
|
||||
|
||||
#include <wine/debug.h>
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(fusion);
|
||||
|
||||
#include <pshpack1.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue