[PATCH v2 2/7] include: Move FILE_DISPOSITION_INFO after DeleteFile(A|W).

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/kernel32/tests/file.c |  2 --
 include/winbase.h          | 12 ++++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index c57edebb316..fcfe42f359b 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -35,8 +35,6 @@
 #include "winnls.h"
 #include "fileapi.h"

-#undef DeleteFile  /* needed for FILE_DISPOSITION_INFO */
-
 static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD);
 static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID);
 static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT);
diff --git a/include/winbase.h b/include/winbase.h
index c775ab71694..2003210ec19 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -852,10 +852,6 @@ typedef struct _FILE_ALLOCATION_INFO {
     LARGE_INTEGER AllocationSize;
 } FILE_ALLOCATION_INFO, *PFILE_ALLOCATION_INFO;

-typedef struct _FILE_DISPOSITION_INFO {
-    BOOLEAN DeleteFile;
-} FILE_DISPOSITION_INFO, *PFILE_DISPOSITION_INFO;
-
 typedef struct _FILE_END_OF_FILE_INFO {
     LARGE_INTEGER EndOfFile;
 } FILE_END_OF_FILE_INFO, *PFILE_END_OF_FILE_INFO;
@@ -2867,6 +2863,14 @@ WINBASEAPI INT         WINAPI lstrcmpW(LPCWSTR,LPCWSTR);
 WINBASEAPI INT         WINAPI lstrcmpiA(LPCSTR,LPCSTR);
 WINBASEAPI INT         WINAPI lstrcmpiW(LPCWSTR,LPCWSTR);

+#ifdef WINE_NO_UNICODE_MACROS
+#undef DeleteFile
+#endif
+
+typedef struct _FILE_DISPOSITION_INFO {
+    BOOLEAN DeleteFile;
+} FILE_DISPOSITION_INFO, *PFILE_DISPOSITION_INFO;
+
 #if !defined(__WINESRC__) || defined(WINE_NO_INLINE_STRING)

WINBASEAPI LPSTR       WINAPI lstrcatA(LPSTR,LPCSTR);