Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
1ce19853
Commit
1ce19853
authored
20 years ago
by
Stefan Leichter
Committed by
Alexandre Julliard
20 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Moved implementation of GetFileVersionInfoSize from ascii to unicode,
fixed failing, crashing test cases.
parent
f35d1cae
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/version/info.c
+72
-36
72 additions, 36 deletions
dlls/version/info.c
with
72 additions
and
36 deletions
dlls/version/info.c
+
72
−
36
View file @
1ce19853
...
...
@@ -31,6 +31,7 @@
#include
"winbase.h"
#include
"winreg.h"
#include
"winver.h"
#include
"winternl.h"
#include
"wine/winuser16.h"
#include
"wine/unicode.h"
#include
"winerror.h"
...
...
@@ -287,7 +288,7 @@ void ConvertVersionInfo32To16( VS_VERSION_INFO_STRUCT32 *info32,
* in the case if file exists, but VERSION_INFO not found.
* FIXME: handle is not used.
*/
static
DWORD
VERSION_GetFileVersionInfo_PE
(
LPCSTR
filename
,
LPDWORD
handle
,
static
DWORD
VERSION_GetFileVersionInfo_PE
(
LPC
W
STR
filename
,
LPDWORD
handle
,
DWORD
datasize
,
LPVOID
data
)
{
VS_FIXEDFILEINFO
*
vffi
;
...
...
@@ -297,16 +298,16 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCSTR filename, LPDWORD handle,
HRSRC
hRsrc
;
HGLOBAL
hMem
;
TRACE
(
"(%s,%p)
\n
"
,
debugstr_
a
(
filename
),
handle
);
TRACE
(
"(%s,%p)
\n
"
,
debugstr_
w
(
filename
),
handle
);
hModule
=
GetModuleHandle
A
(
filename
);
hModule
=
GetModuleHandle
W
(
filename
);
if
(
!
hModule
)
hModule
=
LoadLibraryEx
A
(
filename
,
0
,
LOAD_LIBRARY_AS_DATAFILE
);
hModule
=
LoadLibraryEx
W
(
filename
,
0
,
LOAD_LIBRARY_AS_DATAFILE
);
else
hModule
=
LoadLibraryEx
A
(
filename
,
0
,
0
);
hModule
=
LoadLibraryEx
W
(
filename
,
0
,
0
);
if
(
!
hModule
)
{
WARN
(
"Could not load %s
\n
"
,
debugstr_
a
(
filename
));
WARN
(
"Could not load %s
\n
"
,
debugstr_
w
(
filename
));
return
0
;
}
hRsrc
=
FindResourceW
(
hModule
,
...
...
@@ -314,7 +315,7 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCSTR filename, LPDWORD handle,
MAKEINTRESOURCEW
(
VS_FILE_INFO
));
if
(
!
hRsrc
)
{
WARN
(
"Could not find VS_VERSION_INFO in %s
\n
"
,
debugstr_
a
(
filename
));
WARN
(
"Could not find VS_VERSION_INFO in %s
\n
"
,
debugstr_
w
(
filename
));
FreeLibrary
(
hModule
);
return
0xFFFFFFFF
;
}
...
...
@@ -322,7 +323,7 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCSTR filename, LPDWORD handle,
hMem
=
LoadResource
(
hModule
,
hRsrc
);
if
(
!
hMem
)
{
WARN
(
"Could not load VS_VERSION_INFO from %s
\n
"
,
debugstr_
a
(
filename
));
WARN
(
"Could not load VS_VERSION_INFO from %s
\n
"
,
debugstr_
w
(
filename
));
FreeLibrary
(
hModule
);
return
0xFFFFFFFF
;
}
...
...
@@ -434,44 +435,72 @@ END:
}
/***********************************************************************
* GetFileVersionInfoSize
A
[VERSION.@]
* GetFileVersionInfoSize
W
[VERSION.@]
*/
DWORD
WINAPI
GetFileVersionInfoSize
A
(
LPCSTR
filename
,
LPDWORD
handle
)
DWORD
WINAPI
GetFileVersionInfoSize
W
(
LPC
W
STR
filename
,
LPDWORD
handle
)
{
DWORD
ret
,
offset
,
len
=
(
filename
&&
strlenW
(
filename
))
?
strlenW
(
filename
)
+
1
:
MAX_PATH
;
DWORD
nSize
=
len
;
LPSTR
filenameA
=
NULL
;
LPWSTR
filenameW
;
VS_FIXEDFILEINFO
*
vffi
;
DWORD
len
,
ret
,
offset
;
BYTE
buf
[
144
];
TRACE
(
"(%s,%p)
\n
"
,
debugstr_a
(
filename
),
handle
);
TRACE
(
"(%s,%p)
\n
"
,
debugstr_w
(
filename
),
handle
);
filenameW
=
HeapAlloc
(
GetProcessHeap
(),
0
,
sizeof
(
WCHAR
)
*
len
);
if
(
filename
&&
strlenW
(
filename
))
strcpyW
(
filenameW
,
filename
);
else
{
nSize
=
GetModuleFileNameW
(
NULL
,
filenameW
,
nSize
);
if
((
nSize
+
1
)
>=
len
)
FIXME
(
"buffer may be too small
\n
"
);
}
len
=
VERSION_GetFileVersionInfo_PE
(
filename
,
handle
,
0
,
NULL
);
len
=
VERSION_GetFileVersionInfo_PE
(
filename
W
,
handle
,
0
,
NULL
);
/* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
if
(
len
==
0xFFFFFFFF
)
{
if
(
handle
)
*
handle
=
0L
;
SetLastError
(
ERROR_RESOURCE_DATA_NOT_FOUND
);
return
0
;
len
=
0
;
goto
End
;
}
if
(
len
)
{
if
(
handle
)
*
handle
=
0L
;
goto
End
;
}
if
(
len
)
return
len
;
len
=
VERSION_GetFileVersionInfo_16
(
filename
,
handle
,
0
,
NULL
);
/* FIXME: handle not set correctly after this point
*/
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
filename
,
-
1
,
NULL
,
0
,
NULL
,
NULL
);
filenameA
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
);
WideCharToMultiByte
(
CP_ACP
,
0
,
filename
,
-
1
,
filenameA
,
len
,
NULL
,
NULL
);
len
=
VERSION_GetFileVersionInfo_16
(
filenameA
,
handle
,
0
,
NULL
);
/* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
if
(
len
==
0xFFFFFFFF
)
{
SetLastError
(
ERROR_RESOURCE_DATA_NOT_FOUND
);
return
0
;
len
=
0
;
goto
End
;
}
if
(
len
)
return
len
;
if
(
len
)
goto
End
;
len
=
GetFileResourceSize16
(
filename
,
/* FIXME: last error not handled after this point
*/
len
=
GetFileResourceSize16
(
filenameA
,
MAKEINTRESOURCEA
(
VS_FILE_INFO
),
MAKEINTRESOURCEA
(
VS_VERSION_INFO
),
&
offset
);
if
(
!
len
)
return
0
;
if
(
!
len
)
goto
End
;
ret
=
GetFileResource16
(
filename
,
ret
=
GetFileResource16
(
filename
A
,
MAKEINTRESOURCEA
(
VS_FILE_INFO
),
MAKEINTRESOURCEA
(
VS_VERSION_INFO
),
offset
,
sizeof
(
buf
),
buf
);
if
(
!
ret
)
return
0
;
if
(
!
ret
)
goto
End
;
if
(
handle
)
*
handle
=
offset
;
...
...
@@ -484,7 +513,8 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
{
WARN
(
"vffi->dwSignature is 0x%08lx, but not 0x%08lx!
\n
"
,
vffi
->
dwSignature
,
VS_FFI_SIGNATURE
);
return
0
;
len
=
0
;
goto
End
;
}
if
(
((
VS_VERSION_INFO_STRUCT16
*
)
buf
)
->
wLength
<
len
)
...
...
@@ -492,21 +522,24 @@ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle )
if
(
TRACE_ON
(
ver
)
)
print_vffi_debug
(
vffi
);
End:
HeapFree
(
GetProcessHeap
(),
0
,
filenameW
);
if
(
filenameA
)
HeapFree
(
GetProcessHeap
(),
0
,
filenameA
);
return
len
;
}
/***********************************************************************
* GetFileVersionInfoSize
W
[VERSION.@]
* GetFileVersionInfoSize
A
[VERSION.@]
*/
DWORD
WINAPI
GetFileVersionInfoSize
W
(
LPC
W
STR
filename
,
LPDWORD
handle
)
{
DWORD
ret
,
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
filename
,
-
1
,
NULL
,
0
,
NULL
,
NULL
)
;
LPSTR
fn
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
);
WideCharToMultiByte
(
CP_ACP
,
0
,
filename
,
-
1
,
fn
,
len
,
NULL
,
NULL
)
;
ret
=
GetFileVersionInfoSize
A
(
fn
,
handle
);
HeapFree
(
GetProcessHeap
(),
0
,
fn
);
return
ret
;
DWORD
WINAPI
GetFileVersionInfoSize
A
(
LPCSTR
filename
,
LPDWORD
handle
)
{
UNICODE_STRING
filenameW
;
DWORD
ret
val
;
if
(
filename
)
RtlCreateUnicodeStringFromAsciiz
(
&
filenameW
,
filename
);
else
filenameW
.
Buffer
=
NULL
;
ret
val
=
GetFileVersionInfoSize
W
(
filenameW
.
Buffer
,
handle
);
RtlFreeUnicodeString
(
&
filenameW
);
return
ret
val
;
}
/***********************************************************************
...
...
@@ -514,14 +547,17 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle )
*/
BOOL
WINAPI
GetFileVersionInfoA
(
LPCSTR
filename
,
DWORD
handle
,
DWORD
datasize
,
LPVOID
data
)
{
{
UNICODE_STRING
filenameW
;
DWORD
len
;
TRACE
(
"(%s,%ld,size=%ld,data=%p)
\n
"
,
debugstr_a
(
filename
),
handle
,
datasize
,
data
);
len
=
VERSION_GetFileVersionInfo_PE
(
filename
,
&
handle
,
datasize
,
data
);
if
(
filename
)
RtlCreateUnicodeStringFromAsciiz
(
&
filenameW
,
filename
);
else
filenameW
.
Buffer
=
NULL
;
len
=
VERSION_GetFileVersionInfo_PE
(
filenameW
.
Buffer
,
&
handle
,
datasize
,
data
);
/* 0xFFFFFFFF means: file exists, but VERSION_INFO not found */
RtlFreeUnicodeString
(
&
filenameW
);
if
(
len
==
0xFFFFFFFF
)
return
FALSE
;
if
(
len
)
goto
DO_CONVERT
;
...
...
@@ -563,7 +599,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle,
TRACE
(
"(%s,%ld,size=%ld,data=%p)
\n
"
,
debugstr_w
(
filename
),
handle
,
datasize
,
data
);
if
(
VERSION_GetFileVersionInfo_PE
(
f
n
,
&
handle
,
datasize
,
data
))
if
(
VERSION_GetFileVersionInfo_PE
(
f
ilename
,
&
handle
,
datasize
,
data
))
goto
END
;
if
(
VERSION_GetFileVersionInfo_16
(
fn
,
&
handle
,
datasize
,
data
))
goto
END
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment