winefile header sync
Martin Fuchs
martin-fuchs at gmx.net
Sat Jun 4 15:35:45 CDT 2005
Changelog:
sync winefile's header between WINE and ReactOS
Index: winefile.c
===================================================================
RCS file: /home/wine/wine/programs/winefile/winefile.c,v
retrieving revision 1.47
diff -u -p -d -r1.47 winefile.c
--- winefile.c 3 Jun 2005 11:25:17 -0000 1.47
+++ winefile.c 4 Jun 2005 20:34:59 -0000
@@ -23,9 +23,6 @@
#include "wine/port.h"
#endif
-#include <locale.h>
-
-#define NONAMELESSUNION
#include "winefile.h"
#include "resource.h"
Index: winefile.h
===================================================================
RCS file: /home/wine/wine/programs/winefile/winefile.h,v
retrieving revision 1.11
diff -u -p -d -r1.11 winefile.h
--- winefile.h 23 May 2005 10:26:47 -0000 1.11
+++ winefile.h 4 Jun 2005 20:34:59 -0000
@@ -1,5 +1,5 @@
/*
- * Copyright 2000, 2003, 2004 Martin Fuchs
+ * Copyright 2000, 2003, 2004, 2005 Martin Fuchs
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,26 +28,34 @@
#define NOIMAGE
#define NOTAPE
+#define NONAMELESSUNION
+#include <windows.h>
+#include <windowsx.h>
+#include <commctrl.h>
+#include <commdlg.h>
+
#ifdef UNICODE
#define _UNICODE
#include <wchar.h>
#endif
+#include <tchar.h>
-#include <windows.h>
-#include <windowsx.h>
-#include <commctrl.h>
-#include <commdlg.h>
-#include <shellapi.h>
-#include <shlobj.h>
#include <stdlib.h>
#include <stdio.h>
-#include <tchar.h>
#include <ctype.h>
+#include <locale.h>
-#ifdef _MSC_VER
+#ifndef __WINE__
#include <malloc.h> /* for alloca() */
#endif
+#include <shellapi.h> /* for ShellExecute() */
+#include <shlobj.h> /* for SHFormatDrive() */
+
+#ifndef _NO_EXTENSIONS
+#define _SHELL_FOLDERS
+#endif /* _NO_EXTENSIONS */
+
#ifndef FILE_ATTRIBUTE_NOT_CONTENT_INDEXED
#define FILE_ATTRIBUTE_ENCRYPTED 0x00000040
#define FILE_ATTRIBUTE_SPARSE_FILE 0x00000200
@@ -72,9 +80,9 @@ enum IMAGE {
};
#define IMAGE_WIDTH 16
-#define IMAGE_HEIGHT 13
+#define IMAGE_HEIGHT 13
#define SPLIT_WIDTH 5
-#define TREE_LINE_DX 3
+#define TREE_LINE_DX 3
#define IDW_STATUSBAR 0x100
#define IDW_TOOLBAR 0x101
@@ -101,17 +109,12 @@ enum IMAGE {
#define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt))
-#ifndef _NO_EXTENSIONS
-#define _SHELL_FOLDERS
-#endif
-
-
typedef struct
{
HANDLE hInstance;
HACCEL haccel;
- ATOM hframeClass;
- HWND hwndParent;
+ ATOM hframeClass;
+ HWND hwndParent;
HWND hMainWnd;
HMENU hMenuFrame;
More information about the wine-patches
mailing list