Extended winefile for an optional shell namespace mode.

programs/winefile/Makefile.in

@@ -4,7 +4,9 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = winefile.exe
 APPMODE   = gui
-IMPORTS   = shell32 comctl32 user32 gdi32 kernel32
+IMPORTS   = shell32 comctl32 ole32 user32 gdi32 kernel32
+EXTRADEFS = -D__WINE__
+EXTRALIBS = $(LIBUUID)
 
 C_SRCS = \
 	license.c \

programs/winefile/resource.h

@@ -58,9 +58,6 @@
 #define	ID_HELP_USING					0xE144
 #define	ID_HELP 					0xE146
 
-/* range for drive bar command ids: 0x9000..0x90FF */
-#define	ID_DRIVE_FIRST					0x9001
-
 
 /* winefile extensions */
 #define	ID_ABOUT_WINE					0x8000
@@ -70,6 +67,10 @@
 #define	ID_VIEW_FULLSCREEN				0x8004
 #define	ID_PREFERED_SIZES				0x8005
 
-#ifdef __linux__
+/* range for drive bar command ids: 0x9000..0x90FF */
+#ifdef __WINE__
 #define	ID_DRIVE_UNIX_FS				0x9000
 #endif
+#define	ID_DRIVE_SHELL_NS			0x9001
+
+#define	ID_DRIVE_FIRST				0x9002

programs/winefile/winefile.h

@@ -109,10 +109,21 @@ enum IMAGE {
 #define	Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt))
 
 
+#ifndef _NO_EXTENSIONS
+#define	_SHELL_FOLDERS
+
+#include <objbase.h>
+#include <shlobj.h>
+#endif
+
+
 typedef struct
 {
   HANDLE	hInstance;
   HACCEL	haccel;
+  ATOM			hframeClass;
+  HWND			hwndParent;
+
   HWND		hMainWnd;
   HMENU		hMenuFrame;
   HMENU		hWindowsMenu;
@@ -133,6 +144,12 @@ typedef struct
   BOOL		prescan_node;	/*TODO*/
 
   UINT		wStringTableOffset;
+
+#ifdef _SHELL_FOLDERS
+  IShellFolder*	iDesktop;
+  IMalloc*		iMalloc;
+  UINT			cfStrFName;
+#endif
 } WINEFILE_GLOBALS;
 
 extern WINEFILE_GLOBALS Globals;