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

svn path=/trunk/; revision=20408
This commit is contained in:
Martin Fuchs
2005-12-28 22:52:35 +00:00
parent 53980699e3
commit 09a72082c7
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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)
@@ -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);