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
Releases
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
Johnny Cai
wine
Commits
9f6d4bc0
Commit
9f6d4bc0
authored
24 years ago
by
Dusan Lacko
Committed by
Alexandre Julliard
24 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Pass the type/name as a C string instead of an
IMAGE_RESOURCE_DIR_STRING_U structure to the callback function.
parent
2a2321bb
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
loader/pe_resource.c
+77
-62
77 additions, 62 deletions
loader/pe_resource.c
with
77 additions
and
62 deletions
loader/pe_resource.c
+
77
−
62
View file @
9f6d4bc0
...
...
@@ -263,22 +263,32 @@ BOOL WINAPI EnumResourceTypesA( HMODULE hmod, ENUMRESTYPEPROCA lpfun, LONG lpara
PIMAGE_RESOURCE_DIRECTORY
resdir
=
get_resdir
(
hmod
);
PIMAGE_RESOURCE_DIRECTORY_ENTRY
et
;
BOOL
ret
;
HANDLE
heap
=
GetProcessHeap
();
if
(
!
resdir
)
return
FALSE
;
et
=
(
PIMAGE_RESOURCE_DIRECTORY_ENTRY
)(
resdir
+
1
);
ret
=
FALSE
;
for
(
i
=
0
;
i
<
resdir
->
NumberOfNamedEntries
+
resdir
->
NumberOfIdEntries
;
i
++
)
{
LPSTR
name
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
name
=
HEAP_strdupWtoA
(
heap
,
0
,(
LPWSTR
)((
LPBYTE
)
resdir
+
et
[
i
].
u1
.
s
.
NameOffset
));
else
name
=
(
LPSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
name
,
lparam
);
if
(
HIWORD
(
name
))
HeapFree
(
heap
,
0
,
name
);
LPSTR
type
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
{
PIMAGE_RESOURCE_DIR_STRING_U
pResString
=
(
PIMAGE_RESOURCE_DIR_STRING_U
)
((
LPBYTE
)
resdir
+
et
[
i
].
u1
.
s
.
NameOffset
);
DWORD
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
pResString
->
NameString
,
pResString
->
Length
,
NULL
,
0
,
NULL
,
NULL
);
if
(
!
(
type
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
+
1
)))
return
FALSE
;
WideCharToMultiByte
(
CP_ACP
,
0
,
pResString
->
NameString
,
pResString
->
Length
,
type
,
len
,
NULL
,
NULL
);
type
[
len
]
=
'\0'
;
ret
=
lpfun
(
hmod
,
type
,
lparam
);
HeapFree
(
GetProcessHeap
(),
0
,
type
);
}
else
{
type
=
(
LPSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
lparam
);
}
if
(
!
ret
)
break
;
}
...
...
@@ -302,12 +312,22 @@ BOOL WINAPI EnumResourceTypesW( HMODULE hmod, ENUMRESTYPEPROCW lpfun, LONG lpara
ret
=
FALSE
;
for
(
i
=
0
;
i
<
resdir
->
NumberOfNamedEntries
+
resdir
->
NumberOfIdEntries
;
i
++
)
{
LPWSTR
type
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
type
=
(
LPWSTR
)((
LPBYTE
)
resdir
+
et
[
i
].
u1
.
s
.
NameOffset
);
else
type
=
(
LPWSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
lparam
);
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
{
PIMAGE_RESOURCE_DIR_STRING_U
pResString
=
(
PIMAGE_RESOURCE_DIR_STRING_U
)
((
LPBYTE
)
resdir
+
et
[
i
].
u1
.
s
.
NameOffset
);
if
(
!
(
type
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
pResString
->
Length
+
1
)
*
sizeof
(
WCHAR
))))
return
FALSE
;
memcpy
(
type
,
pResString
->
NameString
,
pResString
->
Length
*
sizeof
(
WCHAR
));
type
[
pResString
->
Length
]
=
'\0'
;
ret
=
lpfun
(
hmod
,
type
,
lparam
);
HeapFree
(
GetProcessHeap
(),
0
,
type
);
}
else
{
type
=
(
LPWSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
lparam
);
}
if
(
!
ret
)
break
;
}
...
...
@@ -325,31 +345,34 @@ BOOL WINAPI EnumResourceNamesA( HMODULE hmod, LPCSTR type, ENUMRESNAMEPROCA lpfu
PIMAGE_RESOURCE_DIRECTORY
resdir
;
PIMAGE_RESOURCE_DIRECTORY_ENTRY
et
;
BOOL
ret
;
HANDLE
heap
=
GetProcessHeap
();
LPWSTR
typeW
;
if
(
!
basedir
)
return
FALSE
;
if
(
HIWORD
(
type
))
typeW
=
HEAP_strdupAtoW
(
heap
,
0
,
type
);
else
typeW
=
(
LPWSTR
)
type
;
resdir
=
GetResDirEntryW
(
basedir
,
typeW
,(
DWORD
)
basedir
,
FALSE
);
if
(
HIWORD
(
typeW
))
HeapFree
(
heap
,
0
,
typeW
);
if
(
!
resdir
)
return
FALSE
;
if
(
!
(
resdir
=
GetResDirEntryA
(
basedir
,
type
,(
DWORD
)
basedir
,
FALSE
)))
return
FALSE
;
et
=
(
PIMAGE_RESOURCE_DIRECTORY_ENTRY
)(
resdir
+
1
);
ret
=
FALSE
;
for
(
i
=
0
;
i
<
resdir
->
NumberOfNamedEntries
+
resdir
->
NumberOfIdEntries
;
i
++
)
{
LPSTR
name
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
name
=
HEAP_strdupWtoA
(
heap
,
0
,(
LPWSTR
)((
LPBYTE
)
basedir
+
et
[
i
].
u1
.
s
.
NameOffset
));
else
name
=
(
LPSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
name
,
lparam
);
if
(
HIWORD
(
name
))
HeapFree
(
heap
,
0
,
name
);
LPSTR
name
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
{
PIMAGE_RESOURCE_DIR_STRING_U
pResString
=
(
PIMAGE_RESOURCE_DIR_STRING_U
)
((
LPBYTE
)
basedir
+
et
[
i
].
u1
.
s
.
NameOffset
);
DWORD
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
pResString
->
NameString
,
pResString
->
Length
,
NULL
,
0
,
NULL
,
NULL
);
if
(
!
(
name
=
HeapAlloc
(
GetProcessHeap
(),
0
,
len
+
1
)))
return
FALSE
;
WideCharToMultiByte
(
CP_ACP
,
0
,
pResString
->
NameString
,
pResString
->
Length
,
name
,
len
,
NULL
,
NULL
);
name
[
len
]
=
'\0'
;
ret
=
lpfun
(
hmod
,
type
,
name
,
lparam
);
HeapFree
(
GetProcessHeap
(),
0
,
name
);
}
else
{
name
=
(
LPSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
name
,
lparam
);
}
if
(
!
ret
)
break
;
}
...
...
@@ -376,12 +399,23 @@ BOOL WINAPI EnumResourceNamesW( HMODULE hmod, LPCWSTR type, ENUMRESNAMEPROCW lpf
et
=
(
PIMAGE_RESOURCE_DIRECTORY_ENTRY
)(
resdir
+
1
);
ret
=
FALSE
;
for
(
i
=
0
;
i
<
resdir
->
NumberOfNamedEntries
+
resdir
->
NumberOfIdEntries
;
i
++
)
{
LPWSTR
name
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
name
=
(
LPWSTR
)((
LPBYTE
)
basedir
+
et
[
i
].
u1
.
s
.
NameOffset
);
else
name
=
(
LPWSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
name
,
lparam
);
LPWSTR
name
;
if
(
et
[
i
].
u1
.
s
.
NameIsString
)
{
PIMAGE_RESOURCE_DIR_STRING_U
pResString
=
(
PIMAGE_RESOURCE_DIR_STRING_U
)
((
LPBYTE
)
basedir
+
et
[
i
].
u1
.
s
.
NameOffset
);
if
(
!
(
name
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
pResString
->
Length
+
1
)
*
sizeof
(
WCHAR
))))
return
FALSE
;
memcpy
(
name
,
pResString
->
NameString
,
pResString
->
Length
*
sizeof
(
WCHAR
));
name
[
pResString
->
Length
]
=
'\0'
;
ret
=
lpfun
(
hmod
,
type
,
name
,
lparam
);
HeapFree
(
GetProcessHeap
(),
0
,
name
);
}
else
{
name
=
(
LPWSTR
)(
int
)
et
[
i
].
u1
.
Id
;
ret
=
lpfun
(
hmod
,
type
,
name
,
lparam
);
}
if
(
!
ret
)
break
;
}
...
...
@@ -400,34 +434,15 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name,
PIMAGE_RESOURCE_DIRECTORY
resdir
;
PIMAGE_RESOURCE_DIRECTORY_ENTRY
et
;
BOOL
ret
;
HANDLE
heap
=
GetProcessHeap
();
if
(
!
basedir
)
return
FALSE
;
if
(
HIWORD
(
type
))
{
LPWSTR
typeW
=
HEAP_strdupAtoW
(
heap
,
0
,
type
);
resdir
=
GetResDirEntryW
(
basedir
,
typeW
,(
DWORD
)
basedir
,
FALSE
);
HeapFree
(
heap
,
0
,
typeW
);
}
else
resdir
=
GetResDirEntryW
(
basedir
,(
LPWSTR
)
type
,(
DWORD
)
basedir
,
FALSE
);
if
(
!
resdir
)
return
FALSE
;
if
(
HIWORD
(
name
))
{
LPWSTR
nameW
=
HEAP_strdupAtoW
(
heap
,
0
,
name
);
resdir
=
GetResDirEntryW
(
resdir
,
nameW
,(
DWORD
)
basedir
,
FALSE
);
HeapFree
(
heap
,
0
,
nameW
);
}
else
resdir
=
GetResDirEntryW
(
resdir
,(
LPWSTR
)
name
,(
DWORD
)
basedir
,
FALSE
);
if
(
!
resdir
)
return
FALSE
;
if
(
!
(
resdir
=
GetResDirEntryA
(
basedir
,
type
,(
DWORD
)
basedir
,
FALSE
)))
return
FALSE
;
if
(
!
(
resdir
=
GetResDirEntryA
(
resdir
,
name
,(
DWORD
)
basedir
,
FALSE
)))
return
FALSE
;
et
=
(
PIMAGE_RESOURCE_DIRECTORY_ENTRY
)(
resdir
+
1
);
ret
=
FALSE
;
for
(
i
=
0
;
i
<
resdir
->
NumberOfNamedEntries
+
resdir
->
NumberOfIdEntries
;
i
++
)
{
/* languages are just ids... I hope */
/* languages are just ids... I hope */
ret
=
lpfun
(
hmod
,
type
,
name
,
et
[
i
].
u1
.
Id
,
lparam
);
if
(
!
ret
)
break
;
...
...
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