--- mstools/h/winver.h	2018/08/09 18:20:35	1.1.1.2
+++ mstools/h/winver.h	2018/08/09 18:21:14	1.1.1.3
@@ -1,6 +1,6 @@
 /*****************************************************************************\
 *                                                                             *
-* ver.h -       Version management functions, types, and definitions          *
+* winver.h -    Version management functions, types, and definitions          *
 *                                                                             *
 *               Include file for VER.DLL.  This library is                    *
 *               designed to allow version stamping of Windows executable files*
@@ -137,7 +137,7 @@ typedef struct tagVS_FIXEDFILEINFO
 
 DWORD
 APIENTRY
-VerFindFile(
+VerFindFileA(
 	DWORD uFlags,
 	LPSTR szFileName,
 	LPSTR szWinDir,
@@ -147,10 +147,27 @@ VerFindFile(
 	LPSTR szDestDir,
 	LPDWORD lpuDestDirLen
 	);
+DWORD
+APIENTRY
+VerFindFileW(
+	DWORD uFlags,
+	LPWSTR szFileName,
+	LPWSTR szWinDir,
+	LPWSTR szAppDir,
+	LPWSTR szCurDir,
+	LPDWORD lpuCurDirLen,
+	LPWSTR szDestDir,
+	LPDWORD lpuDestDirLen
+	);
+#ifdef UNICODE
+#define VerFindFile VerFindFileW
+#else
+#define VerFindFile VerFindFileA
+#endif // !UNICODE
 
 DWORD
 APIENTRY
-VerInstallFile(
+VerInstallFileA(
 	DWORD uFlags,
 	LPSTR szSrcFileName,
 	LPSTR szDestFileName,
@@ -160,41 +177,109 @@ VerInstallFile(
 	LPSTR szTmpFile,
 	LPDWORD lpuTmpFileLen
 	);
+DWORD
+APIENTRY
+VerInstallFileW(
+	DWORD uFlags,
+	LPWSTR szSrcFileName,
+	LPWSTR szDestFileName,
+	LPWSTR szSrcDir,
+	LPWSTR szDestDir,
+	LPWSTR szCurDir,
+	LPWSTR szTmpFile,
+	LPDWORD lpuTmpFileLen
+	);
+#ifdef UNICODE
+#define VerInstallFile VerInstallFileW
+#else
+#define VerInstallFile VerInstallFileA
+#endif // !UNICODE
 
 /* Returns size of version info in bytes */
 DWORD
 APIENTRY
-GetFileVersionInfoSize(
-	LPSTR lpstrFilename,	/* Filename of version stamped file */
+GetFileVersionInfoSizeA(
+	LPSTR lptstrFilename,	/* Filename of version stamped file */
+	LPDWORD lpdwHandle
+	);			/* Information for use by GetFileVersionInfo */
+/* Returns size of version info in bytes */
+DWORD
+APIENTRY
+GetFileVersionInfoSizeW(
+	LPWSTR lptstrFilename,	/* Filename of version stamped file */
 	LPDWORD lpdwHandle
 	);			/* Information for use by GetFileVersionInfo */
+#ifdef UNICODE
+#define GetFileVersionInfoSize GetFileVersionInfoSizeW
+#else
+#define GetFileVersionInfoSize GetFileVersionInfoSizeA
+#endif // !UNICODE
 
 /* Read version info into buffer */
 BOOL
 APIENTRY
-GetFileVersionInfo(
-	LPSTR lpstrFilename,	/* Filename of version stamped file */
+GetFileVersionInfoA(
+	LPSTR lptstrFilename,	/* Filename of version stamped file */
+	DWORD dwHandle,		/* Information from GetFileVersionSize */
+	DWORD dwLen,		/* Length of buffer for info */
+	LPVOID lpData
+	);			/* Buffer to place the data structure */
+/* Read version info into buffer */
+BOOL
+APIENTRY
+GetFileVersionInfoW(
+	LPWSTR lptstrFilename,	/* Filename of version stamped file */
 	DWORD dwHandle,		/* Information from GetFileVersionSize */
 	DWORD dwLen,		/* Length of buffer for info */
 	LPVOID lpData
 	);			/* Buffer to place the data structure */
+#ifdef UNICODE
+#define GetFileVersionInfo GetFileVersionInfoW
+#else
+#define GetFileVersionInfo GetFileVersionInfoA
+#endif // !UNICODE
 
 DWORD
 APIENTRY
-VerLanguageName(
+VerLanguageNameA(
 	DWORD wLang,
 	LPSTR szLang,
 	DWORD nSize
 	);
+DWORD
+APIENTRY
+VerLanguageNameW(
+	DWORD wLang,
+	LPWSTR szLang,
+	DWORD nSize
+	);
+#ifdef UNICODE
+#define VerLanguageName VerLanguageNameW
+#else
+#define VerLanguageName VerLanguageNameA
+#endif // !UNICODE
 
 BOOL
 APIENTRY
-VerQueryValue(
+VerQueryValueA(
 	const LPVOID pBlock,
 	LPSTR lpSubBlock,
 	LPVOID * lplpBuffer,
 	LPDWORD lpuLen
 	);
+BOOL
+APIENTRY
+VerQueryValueW(
+	const LPVOID pBlock,
+	LPWSTR lpSubBlock,
+	LPVOID * lplpBuffer,
+	LPDWORD lpuLen
+	);
+#ifdef UNICODE
+#define VerQueryValue VerQueryValueW
+#else
+#define VerQueryValue VerQueryValueA
+#endif // !UNICODE
 
 #endif  /* !RC_INVOKED */
 #endif  /* !VER_H */