Changelog:
* reactivate WINELIB extensions in winefile, now using the macro WINELIB
instead of __WINE__
--
Martin Fuchs
martin-fuchs@xxxxxxx
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/programs/winefile/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in 4 Oct 2003 04:21:19 -0000 1.4
+++ Makefile.in 12 Dec 2003 23:09:40 -0000
@@ -6,6 +6,8 @@
APPMODE = gui
IMPORTS = shell32 comctl32 ole32 user32 gdi32 kernel32
EXTRALIBS = $(LIBUUID)
+EXTRADEFS = -DWINELIB
+EXTRARCFLAGS = -DWINELIB
C_SRCS = \
license.c \
Index: resource.h
===================================================================
RCS file: /home/wine/wine/programs/winefile/resource.h,v
retrieving revision 1.2
diff -u -r1.2 resource.h
--- resource.h 13 Aug 2003 01:18:37 -0000 1.2
+++ resource.h 12 Dec 2003 23:09:40 -0000
@@ -68,7 +68,7 @@
#define ID_PREFERED_SIZES 0x8005
/* range for drive bar command ids: 0x9000..0x90FF */
-#ifdef __WINE__
+#ifdef WINELIB
#define ID_DRIVE_UNIX_FS 0x9000
#endif
#define ID_DRIVE_SHELL_NS 0x9001
Index: winefile.c
===================================================================
RCS file: /home/wine/wine/programs/winefile/winefile.c,v
retrieving revision 1.14
diff -u -r1.14 winefile.c
--- winefile.c 12 Dec 2003 04:11:25 -0000 1.14
+++ winefile.c 12 Dec 2003 23:09:41 -0000
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifdef __WINE__
+#ifdef WINELIB
#include "config.h"
#include "wine/port.h"
#endif
@@ -30,7 +30,7 @@
#include "resource.h"
/* for read_directory_unix() */
-#if !defined(_NO_EXTENSIONS) && defined(__WINE__)
+#if !defined(_NO_EXTENSIONS) && defined(WINELIB)
#include <dirent.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
@@ -382,7 +382,7 @@
}
-#if !defined(_NO_EXTENSIONS) && defined(__WINE__)
+#if !defined(_NO_EXTENSIONS) && defined(WINELIB)
BOOL time_to_filetime(const time_t* t, FILETIME* ftime)
{
@@ -535,7 +535,7 @@
return entry;
}
-#endif /* !defined(_NO_EXTENSIONS) && defined(__WINE__) */
+#endif /* !defined(_NO_EXTENSIONS) && defined(WINELIB) */
#ifdef _SHELL_FOLDERS
@@ -1137,7 +1137,7 @@
}
else
#endif
-#if !defined(_NO_EXTENSIONS) && defined(__WINE__)
+#if !defined(_NO_EXTENSIONS) && defined(WINELIB)
if (dir->etype == ET_UNIX)
{
read_directory_unix(dir, path);
@@ -1240,7 +1240,7 @@
}
else
#endif
-#if !defined(_NO_EXTENSIONS) && defined(__WINE__)
+#if !defined(_NO_EXTENSIONS) && defined(WINELIB)
if (*path == '/')
{
root->drive_type = GetDriveType(path);
@@ -1790,7 +1790,7 @@
CheckMenuItem(Globals.hMenuOptions, cmd, toggle_fullscreen(hwnd)?MF_CHECKED:0);
break;
-#ifdef __WINE__
+#ifdef WINELIB
case ID_DRIVE_UNIX_FS: {
TCHAR path[MAX_PATH];
ChildWnd* child;
@@ -1825,7 +1825,7 @@
/*TODO: There are even more menu items! */
#ifndef _NO_EXTENSIONS
-#ifdef __WINE__
+#ifdef WINELIB
case ID_LICENSE:
WineLicense(Globals.hMainWnd);
break;
@@ -3574,7 +3574,7 @@
drivebarBtn.fsStyle = TBSTYLE_BUTTON;
#ifndef _NO_EXTENSIONS
-#ifdef __WINE__
+#ifdef WINELIB
/* insert unix file system button */
SendMessage(Globals.hdrivebar, TB_ADDSTRING, 0, (LPARAM)TEXT("/\0"));
@@ -3650,7 +3650,7 @@
ShowWindow(Globals.hMainWnd, cmdshow);
-#if defined(_SHELL_FOLDERS) && !defined(__WINE__)
+#if defined(_SHELL_FOLDERS) && !defined(WINELIB)
/* Shell Namespace as default: */
child = alloc_child_window(path, get_path_pidl(path,Globals.hMainWnd), Globals.hMainWnd);
#else
