Austin English : version: Move GetFileVersionInfoSize(A/W) implemementation to GetFileVersionInfoSizeEx(A/W).
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 26 09:14:34 CDT 2015
Module: wine
Branch: master
Commit: e3ae89e8e204eb7948f7edfb869d171acdb71a68
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ae89e8e204eb7948f7edfb869d171acdb71a68
Author: Austin English <austinenglish at gmail.com>
Date: Thu May 21 18:23:58 2015 -0700
version: Move GetFileVersionInfoSize(A/W) implemementation to GetFileVersionInfoSizeEx(A/W).
---
dlls/version/version.c | 51 ++++++++++++++++++++++++++------------------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/dlls/version/version.c b/dlls/version/version.c
index 68dab66..bcc6d01 100644
--- a/dlls/version/version.c
+++ b/dlls/version/version.c
@@ -607,11 +607,34 @@ typedef struct
*/
DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
{
+ return GetFileVersionInfoSizeExW( 0, filename, handle );
+}
+
+/***********************************************************************
+ * GetFileVersionInfoSizeA [VERSION.@]
+ */
+DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
+{
+ return GetFileVersionInfoSizeExA( 0, filename, handle );
+}
+
+/******************************************************************************
+ * GetFileVersionInfoSizeExW [VERSION.@]
+ */
+DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD handle )
+{
DWORD len, offset, magic = 1;
HFILE lzfd;
HMODULE hModule;
OFSTRUCT ofs;
+ if (flags)
+ {
+ FIXME("stub: %x %s %p\n", flags, wine_dbgstr_w(filename), handle);
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
+ return 0;
+ }
+
TRACE("(%s,%p)\n", debugstr_w(filename), handle );
if (handle) *handle = 0;
@@ -676,10 +699,10 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
}
}
-/***********************************************************************
- * GetFileVersionInfoSizeA [VERSION.@]
+/******************************************************************************
+ * GetFileVersionInfoSizeExA [VERSION.@]
*/
-DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
+DWORD WINAPI GetFileVersionInfoSizeExA( DWORD flags, LPCSTR filename, LPDWORD handle )
{
UNICODE_STRING filenameW;
DWORD retval;
@@ -691,7 +714,7 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
else
filenameW.Buffer = NULL;
- retval = GetFileVersionInfoSizeW(filenameW.Buffer, handle);
+ retval = GetFileVersionInfoSizeExW(0, filenameW.Buffer, handle);
RtlFreeUnicodeString(&filenameW);
@@ -1615,26 +1638,6 @@ DWORD WINAPI VerInstallFileW(
}
/******************************************************************************
- * GetFileVersionInfoSizeExA [VERSION.@]
- */
-DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle)
-{
- FIXME("stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/******************************************************************************
- * GetFileVersionInfoSizeExW [VERSION.@]
- */
-DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle)
-{
- FIXME("stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle);
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return 0;
-}
-
-/******************************************************************************
* GetFileVersionInfoExA [VERSION.@]
*/
BOOL WINAPI GetFileVersionInfoExA(DWORD flags, LPCSTR filename, DWORD handle, DWORD len, LPVOID data)
More information about the wine-cvs
mailing list