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
Jason Beetham
wine
Commits
7f95bb7f
Commit
7f95bb7f
authored
26 years ago
by
Marcus Meissner
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Use MESSAGE_RESOURCE_* defines from SDK headers, updated LoadMessage*
code.
parent
37130802
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/peexe.h
+18
-0
18 additions, 0 deletions
include/peexe.h
loader/resource.c
+18
-27
18 additions, 27 deletions
loader/resource.c
with
36 additions
and
27 deletions
include/peexe.h
+
18
−
0
View file @
7f95bb7f
...
...
@@ -578,4 +578,22 @@ typedef struct _IMAGE_SEPARATE_DEBUG_HEADER {
#define IMAGE_SEPARATE_DEBUG_SIGNATURE 0x4944
typedef
struct
tagMESSAGE_RESOURCE_ENTRY
{
WORD
Length
;
WORD
Flags
;
BYTE
Text
[
1
];
}
MESSAGE_RESOURCE_ENTRY
,
*
PMESSAGE_RESOURCE_ENTRY
;
#define MESSAGE_RESOURCE_UNICODE 0x0001
typedef
struct
tagMESSAGE_RESOURCE_BLOCK
{
DWORD
LowId
;
DWORD
HighId
;
DWORD
OffsetToEntries
;
}
MESSAGE_RESOURCE_BLOCK
,
*
PMESSAGE_RESOURCE_BLOCK
;
typedef
struct
tagMESSAGE_RESOURCE_DATA
{
DWORD
NumberOfBlocks
;
MESSAGE_RESOURCE_BLOCK
Blocks
[
1
];
}
MESSAGE_RESOURCE_DATA
,
*
PMESSAGE_RESOURCE_DATA
;
#endif
/* __WINE_PEEXE_H */
This diff is collapsed.
Click to expand it.
loader/resource.c
+
18
−
27
View file @
7f95bb7f
...
...
@@ -931,7 +931,7 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
*
* (lastentry-firstentry) * stringentry:
* 0: WORD len (0 marks end)
* 2: WORD
unknown (
flags
?)
* 2: WORD flags
* 4: CHAR[len-4]
* (stringentry i of a subentry refers to the ID 'firstentry+i')
*
...
...
@@ -946,18 +946,10 @@ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang,
{
HGLOBAL
hmem
;
HRSRC
hrsrc
;
BYTE
*
p
;
int
nrofentries
,
i
,
slen
;
struct
_subentry
{
DWORD
firstentry
;
DWORD
lastentry
;
DWORD
offset
;
}
*
se
;
struct
_stringentry
{
WORD
len
;
WORD
unknown
;
CHAR
str
[
1
];
}
*
stre
;
PMESSAGE_RESOURCE_DATA
mrd
;
PMESSAGE_RESOURCE_BLOCK
mrb
;
PMESSAGE_RESOURCE_ENTRY
mre
;
int
i
,
slen
;
TRACE
(
resource
,
"instance = %08lx, id = %08lx, buffer = %p, length = %ld
\n
"
,
(
DWORD
)
instance
,
(
DWORD
)
id
,
buffer
,
(
DWORD
)
buflen
);
...
...
@@ -967,32 +959,31 @@ INT WINAPI LoadMessageA( HMODULE instance, UINT id, WORD lang,
hmem
=
LoadResource
(
instance
,
hrsrc
);
if
(
!
hmem
)
return
0
;
p
=
LockResource
(
hmem
);
nrofentries
=
*
(
DWORD
*
)
p
;
stre
=
NULL
;
se
=
(
struct
_subentry
*
)(
p
+
4
);
for
(
i
=
nrofentries
;
i
--
;)
{
if
((
id
>=
se
->
firstentry
)
&&
(
id
<=
se
->
lastentry
))
{
stre
=
(
struct
_stringentry
*
)(
p
+
se
->
offset
);
id
-=
se
->
firstentry
;
mrd
=
(
PMESSAGE_RESOURCE_DATA
)
LockResource
(
hmem
);
mre
=
NULL
;
mrb
=
&
(
mrd
->
Blocks
[
0
]);
for
(
i
=
mrd
->
NumberOfBlocks
;
i
--
;)
{
if
((
id
>=
mrb
->
LowId
)
&&
(
id
<=
mrb
->
HighId
))
{
mre
=
(
PMESSAGE_RESOURCE_ENTRY
)(((
char
*
)
mrd
)
+
mrb
->
OffsetToEntries
);
id
-=
mrb
->
LowId
;
break
;
}
se
++
;
mrb
++
;
}
if
(
!
st
re
)
if
(
!
m
re
)
return
0
;
for
(
i
=
id
;
i
--
;)
{
if
(
!
(
slen
=
st
re
->
l
en
)
)
if
(
!
m
re
->
L
en
gth
)
return
0
;
st
re
=
(
struct
_stringentry
*
)(((
char
*
)
st
re
)
+
slen
);
m
re
=
(
PMESSAGE_RESOURCE_ENTRY
)(((
char
*
)
m
re
)
+
(
mre
->
Length
)
);
}
slen
=
st
re
->
l
en
;
slen
=
m
re
->
L
en
gth
;
TRACE
(
resource
,
" - strlen=%d
\n
"
,
slen
);
i
=
MIN
(
buflen
-
1
,
slen
);
if
(
buffer
==
NULL
)
return
slen
;
/* different to LoadString */
if
(
i
>
0
)
{
lstrcpynA
(
buffer
,
stre
->
str
,
i
);
lstrcpynA
(
buffer
,
(
char
*
)
mre
->
Text
,
i
);
buffer
[
i
]
=
0
;
}
else
{
if
(
buflen
>
1
)
{
...
...
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