[ros-diffs] [mf] 20408: commit patch of bugzilla entry 1073 to to compile Explorer in a Wine environment

commit patch of bugzilla entry 1073 to to compile Explorer in a Wine
environment
Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine
Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h
  _____  

Modified: trunk/reactos/subsys/system/explorer/Makefile.Wine
--- trunk/reactos/subsys/system/explorer/Makefile.Wine	2005-12-28
22:46:09 UTC (rev 20407)
+++ trunk/reactos/subsys/system/explorer/Makefile.Wine	2005-12-28
22:52:35 UTC (rev 20408)
@@ -5,7 +5,7 @@

 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)
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.h
--- trunk/reactos/subsys/system/explorer/utility/shellclasses.h
2005-12-28 22:46:09 UTC (rev 20407)
+++ trunk/reactos/subsys/system/explorer/utility/shellclasses.h
2005-12-28 22:52:35 UTC (rev 20408)
@@ -843,7 +843,7 @@

 };
 
 
-#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 @@
 	CtxMenuInterfaces _cm_ifs;
 };
 
+
 extern HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND
hwndParent, int cidl,
 
LPCITEMIDLIST* ppidl, int x, int y, CtxMenuInterfaces& cm_ifs);