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
44ee1c47
Commit
44ee1c47
authored
5 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
wineboot: Only use cpuid on platforms where it makes sense.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
fc97373f
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
programs/wineboot/wineboot.c
+11
-6
11 additions, 6 deletions
programs/wineboot/wineboot.c
with
11 additions
and
6 deletions
programs/wineboot/wineboot.c
+
11
−
6
View file @
44ee1c47
...
...
@@ -185,6 +185,8 @@ static DWORD set_reg_value( HKEY hkey, const WCHAR *name, const WCHAR *value )
return
RegSetValueExW
(
hkey
,
name
,
0
,
REG_SZ
,
(
const
BYTE
*
)
value
,
(
lstrlenW
(
value
)
+
1
)
*
sizeof
(
WCHAR
)
);
}
#if defined(__i386__) || defined(__x86_64__)
#if defined(_MSC_VER)
static
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
)
{
...
...
@@ -205,7 +207,7 @@ __ASM_GLOBAL_FUNC( do_cpuid,
"popl %ebx
\n\t
"
"popl %esi
\n\t
"
"ret"
)
#el
if defined(__x86_64__)
#el
se
extern
void
__cdecl
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
);
__ASM_GLOBAL_FUNC
(
do_cpuid
,
"pushq %rsi
\n\t
"
...
...
@@ -220,11 +222,6 @@ __ASM_GLOBAL_FUNC( do_cpuid,
"popq %rbx
\n\t
"
"popq %rsi
\n\t
"
"ret"
)
#else
static
void
do_cpuid
(
unsigned
int
ax
,
unsigned
int
*
p
)
{
FIXME
(
"
\n
"
);
}
#endif
static
void
regs_to_str
(
unsigned
int
*
regs
,
unsigned
int
len
,
WCHAR
*
buffer
)
...
...
@@ -291,6 +288,14 @@ static void get_namestring( WCHAR *buf )
for
(
i
=
lstrlenW
(
buf
)
-
1
;
i
>=
0
&&
buf
[
i
]
==
' '
;
i
--
)
buf
[
i
]
=
0
;
}
#else
/* __i386__ || __x86_64__ */
static
void
get_identifier
(
WCHAR
*
buf
,
size_t
size
,
const
WCHAR
*
arch
)
{
}
static
void
get_vendorid
(
WCHAR
*
buf
)
{
}
static
void
get_namestring
(
WCHAR
*
buf
)
{
}
#endif
/* __i386__ || __x86_64__ */
/* create the volatile hardware registry keys */
static
void
create_hardware_registry_keys
(
void
)
{
...
...
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