Sync winefile's header between WINE and ReactOS.

programs/winefile/winefile.c

@@ -23,9 +23,6 @@
 #include "wine/port.h"
 #endif
 
-#include <locale.h>
-
-#define NONAMELESSUNION
 #include "winefile.h"
 #include "resource.h"
 

programs/winefile/winefile.h

@@ -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
 
-#ifdef UNICODE
-#define	_UNICODE
-#include <wchar.h>
-#endif
-
+#define NONAMELESSUNION
 #include <windows.h>
 #include <windowsx.h>
 #include <commctrl.h>
 #include <commdlg.h>
-#include <shellapi.h>
-#include <shlobj.h>
+
+#ifdef UNICODE
+#define	_UNICODE
+#include <wchar.h>
+#endif
+#include <tchar.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
@@ -101,11 +109,6 @@ 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;