Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d6096057
Commit
d6096057
authored
Oct 09, 2023
by
Eric Pouech
Committed by
Alexandre Julliard
Oct 18, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dbghelp: Rename internal field (system -> host).
Signed-off-by:
Eric Pouech
<
epouech@codeweavers.com
>
parent
0c7a09cb
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
dbghelp.c
dlls/dbghelp/dbghelp.c
+2
-2
dbghelp_private.h
dlls/dbghelp/dbghelp_private.h
+1
-1
elf_module.c
dlls/dbghelp/elf_module.c
+3
-3
module.c
dlls/dbghelp/module.c
+3
-3
No files found.
dlls/dbghelp/dbghelp.c
View file @
d6096057
...
...
@@ -378,7 +378,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64)
peb_addr
+=
0x1000
;
if
(
!
ReadProcessMemory
(
pcs
->
handle
,
peb_addr
,
&
peb32
,
sizeof
(
peb32
),
NULL
))
return
FALSE
;
base
=
*
(
const
DWORD
*
)((
const
char
*
)
&
peb32
+
0x460
/* CloudFileFlags */
);
pcs
->
is_
system
_64bit
=
FALSE
;
pcs
->
is_
host
_64bit
=
FALSE
;
if
(
read_process_memory
(
pcs
,
peb32
.
ProcessParameters
+
0x48
,
&
env32
,
sizeof
(
env32
)))
env
=
env32
;
}
if
(
pcs
->
is_64bit
||
base
==
0
)
...
...
@@ -388,7 +388,7 @@ static BOOL check_live_target(struct process* pcs, BOOL wow64, BOOL child_wow64)
if
(
!
pcs
->
is_64bit
)
peb_addr
-=
0x1000
;
/* PEB32 => PEB64 */
if
(
!
ReadProcessMemory
(
pcs
->
handle
,
peb_addr
,
&
peb
,
sizeof
(
peb
),
NULL
))
return
FALSE
;
base
=
*
(
const
DWORD64
*
)
&
peb
.
CloudFileFlags
;
pcs
->
is_
system
_64bit
=
TRUE
;
pcs
->
is_
host
_64bit
=
TRUE
;
if
(
pcs
->
is_64bit
)
ReadProcessMemory
(
pcs
->
handle
,
(
char
*
)(
ULONG_PTR
)
peb
.
ProcessParameters
+
FIELD_OFFSET
(
RTL_USER_PROCESS_PARAMETERS
,
Environment
),
...
...
dlls/dbghelp/dbghelp_private.h
View file @
d6096057
...
...
@@ -517,7 +517,7 @@ struct process
void
*
buffer
;
BOOL
is_64bit
;
BOOL
is_
system
_64bit
;
BOOL
is_
host
_64bit
;
};
static
inline
BOOL
read_process_memory
(
const
struct
process
*
process
,
UINT64
addr
,
void
*
buf
,
size_t
size
)
...
...
dlls/dbghelp/elf_module.c
View file @
d6096057
...
...
@@ -1345,7 +1345,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR*
{
char
buffer
[
sizeof
(
SYMBOL_INFO
)
+
MAX_SYM_NAME
];
SYMBOL_INFO
*
si
=
(
SYMBOL_INFO
*
)
buffer
;
const
unsigned
ptr_size
=
pcs
->
is_
system
_64bit
?
8
:
4
;
const
unsigned
ptr_size
=
pcs
->
is_
host
_64bit
?
8
:
4
;
UINT64
envp
;
UINT64
addr
;
UINT64
str
;
...
...
@@ -1385,7 +1385,7 @@ static BOOL elf_search_auxv(const struct process* pcs, unsigned type, ULONG_PTR*
if
(
str
)
break
;
}
if
(
pcs
->
is_
system
_64bit
)
if
(
pcs
->
is_
host
_64bit
)
{
struct
{
...
...
@@ -1479,7 +1479,7 @@ static BOOL elf_enum_modules_internal(const struct process* pcs,
char
bufstr
[
256
];
ULONG_PTR
lm_addr
;
if
(
pcs
->
is_
system
_64bit
)
if
(
pcs
->
is_
host
_64bit
)
{
struct
{
...
...
dlls/dbghelp/module.c
View file @
d6096057
...
...
@@ -134,7 +134,7 @@ WCHAR *get_wine_loader_name(struct process *pcs)
unsigned
len
;
name
=
process_getenv
(
pcs
,
L"WINELOADER"
);
if
(
!
name
)
name
=
pcs
->
is_
system
_64bit
?
L"wine64"
:
L"wine"
;
if
(
!
name
)
name
=
pcs
->
is_
host
_64bit
?
L"wine64"
:
L"wine"
;
len
=
lstrlenW
(
name
);
/* WINELOADER isn't properly updated in Wow64 process calling inside Windows env block
...
...
@@ -145,14 +145,14 @@ WCHAR *get_wine_loader_name(struct process *pcs)
if
(
altname
)
{
memcpy
(
altname
,
name
,
len
*
sizeof
(
WCHAR
));
if
(
pcs
->
is_
system
_64bit
&&
len
>=
2
&&
memcmp
(
name
+
len
-
2
,
L"64"
,
2
*
sizeof
(
WCHAR
))
!=
0
)
if
(
pcs
->
is_
host
_64bit
&&
len
>=
2
&&
memcmp
(
name
+
len
-
2
,
L"64"
,
2
*
sizeof
(
WCHAR
))
!=
0
)
{
lstrcpyW
(
altname
+
len
,
L"64"
);
/* in multi-arch wow configuration, wine64 doesn't exist */
if
(
GetFileAttributesW
(
altname
)
==
INVALID_FILE_ATTRIBUTES
)
altname
[
len
]
=
L'\0'
;
}
else
if
(
!
pcs
->
is_
system
_64bit
&&
len
>=
2
&&
!
memcmp
(
name
+
len
-
2
,
L"64"
,
2
*
sizeof
(
WCHAR
)))
else
if
(
!
pcs
->
is_
host
_64bit
&&
len
>=
2
&&
!
memcmp
(
name
+
len
-
2
,
L"64"
,
2
*
sizeof
(
WCHAR
)))
altname
[
len
-
2
]
=
'\0'
;
else
altname
[
len
]
=
'\0'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment