From 8aa79fbe19f52045ec2d3348a2d07a156e1416fc Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@codeweavers.com>
Date: Fri, 29 Sep 2000 01:03:30 +0000
Subject: [PATCH] Moved DLLVERSIONINFO to shlwapi.h.

---
 dlls/comctl32/commctrl.c    |  1 +
 dlls/richedit/richedit.c    |  1 +
 dlls/shlwapi/shlwapi_main.c |  1 +
 include/shlwapi.h           | 13 +++++++++++++
 include/winbase.h           |  8 --------
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index 5e17ca50a79..c8e49e28a88 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -13,6 +13,7 @@
 #include "commctrl.h"
 #include "debugtools.h"
 #include "winerror.h"
+#include "shlwapi.h"
 
 DEFAULT_DEBUG_CHANNEL(commctrl);
 
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index e637784edb4..6e112257923 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -17,6 +17,7 @@
 #include "riched32.h"
 #include "richedit.h"
 #include "charlist.h"
+#include "shlwapi.h"
 
 #include "rtf.h"
 #include "rtf2text.h"
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index b94b9750551..05fa3e74800 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -12,6 +12,7 @@
 #include "initguid.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
+#include "shlwapi.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
 
diff --git a/include/shlwapi.h b/include/shlwapi.h
index c120cbda293..a3531c8006d 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -130,6 +130,19 @@ DWORD WINAPI SHDeleteEmptyKeyA(HKEY hKey, LPCSTR lpszSubKey);
 DWORD WINAPI SHDeleteEmptyKeyW(HKEY hKey, LPCWSTR lpszSubKey);
 #define  SHDeleteEmptyKey WINELIB_NAME_AW(SHDeleteEmptyKey)
 
+typedef struct _DllVersionInfo {
+    DWORD cbSize;
+    DWORD dwMajorVersion;
+    DWORD dwMinorVersion;
+    DWORD dwBuildNumber;
+    DWORD dwPlatformID;
+} DLLVERSIONINFO;
+
+#define DLLVER_PLATFORM_WINDOWS         0x00000001      // Windows 9x
+#define DLLVER_PLATFORM_NT              0x00000002      // Windows NT
+
+typedef HRESULT (CALLBACK* DLLGETVERSIONPROC)(DLLVERSIONINFO *);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* defined(__cplusplus) */
diff --git a/include/winbase.h b/include/winbase.h
index 48fd25521e0..d72e0d58a86 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -882,14 +882,6 @@ typedef struct _WIN32_FILE_ATTRIBUTES_DATA {
     DWORD    nFileSizeLow;
 } WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA;
 
-typedef struct _DllVersionInfo {
-    DWORD cbSize;
-    DWORD dwMajorVersion;
-    DWORD dwMinorVersion;
-    DWORD dwBuildNumber;
-    DWORD dwPlatformID;
-} DLLVERSIONINFO;
-
 /*
  * This one seems to be a Win32 only definition. It also is defined with
  * WINAPI instead of CALLBACK in the windows headers.