From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Wed, 28 Dec 2005 22:52:35 +0000 (+0000)
Subject: commit patch of bugzilla entry 1073 to to compile Explorer in a Wine environment
X-Git-Tag: backups/expat-rbuild@40467~732
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=09a72082c72cdd975596116692ff3bc74182af9f

commit patch of bugzilla entry 1073 to to compile Explorer in a Wine environment

svn path=/trunk/; revision=20408
---

diff --git a/reactos/subsys/system/explorer/Makefile.Wine b/reactos/subsys/system/explorer/Makefile.Wine
index 70e36d058e6..c4d51b3f6e0 100644
--- a/reactos/subsys/system/explorer/Makefile.Wine
+++ b/reactos/subsys/system/explorer/Makefile.Wine
@@ -5,7 +5,7 @@ SRCDIR    = .
 MODULE    = explorer.exe
 APPMODE   = gui
 IMPORTS   = shell32 comctl32 msimg32 ole32 user32 gdi32 kernel32 advapi32 oleaut32
-EXTRADEFS = -D__WINE__ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -D__MINGW32__
+EXTRADEFS = -D__WINE__ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -D__MINGW32__ -DCINTERFACE
 EXTRA_OBJS = notifyhook.dll libexpat.dll
 EXTRALIBS = $(LIBUUID)
 
diff --git a/reactos/subsys/system/explorer/utility/shellclasses.h b/reactos/subsys/system/explorer/utility/shellclasses.h
index e3f902e268b..3b23981550b 100644
--- a/reactos/subsys/system/explorer/utility/shellclasses.h
+++ b/reactos/subsys/system/explorer/utility/shellclasses.h
@@ -843,7 +843,7 @@ struct ShellPath : public SShellPtr<ITEMIDLIST>
 };
 
 
-#ifdef __WINE__	// Wine doesn't know of unnamed union members and uses some macros instead.
+#if defined(__WINE__) && defined(NONAMELESSUNION)	// Wine doesn't know of unnamed union members and uses some macros instead.
 #define	UNION_MEMBER(x) DUMMYUNIONNAME.##x
 #else
 #define	UNION_MEMBER(x) x
@@ -1160,5 +1160,6 @@ protected:
 	CtxMenuInterfaces _cm_ifs;
 };
 
+
 extern HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParent, int cidl,
 										LPCITEMIDLIST* ppidl, int x, int y, CtxMenuInterfaces& cm_ifs);