Moved DLLVERSIONINFO to shlwapi.h.

dlls/comctl32/commctrl.c

@@ -13,6 +13,7 @@
 #include "commctrl.h"
 #include "debugtools.h"
 #include "winerror.h"
+#include "shlwapi.h"
 
 DEFAULT_DEBUG_CHANNEL(commctrl);
 

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"

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);
 

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) */

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.