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
Lorenzo Ferrillo
wine
Commits
8667b8d1
Commit
8667b8d1
authored
3 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
regedit: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
942f9f71
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
programs/regedit/edit.c
+7
-7
7 additions, 7 deletions
programs/regedit/edit.c
programs/regedit/regedit.c
+7
-7
7 additions, 7 deletions
programs/regedit/regedit.c
with
14 additions
and
14 deletions
programs/regedit/edit.c
+
7
−
7
View file @
8667b8d1
...
...
@@ -44,7 +44,7 @@ struct edit_params
DWORD
size
;
};
static
int
vmessagebox
(
HWND
hwnd
,
int
buttons
,
int
titleId
,
int
resId
,
__ms_
va_list
va_args
)
static
int
vmessagebox
(
HWND
hwnd
,
int
buttons
,
int
titleId
,
int
resId
,
va_list
va_args
)
{
WCHAR
title
[
256
];
WCHAR
fmt
[
1024
];
...
...
@@ -64,23 +64,23 @@ static int vmessagebox(HWND hwnd, int buttons, int titleId, int resId, __ms_va_l
int
WINAPIV
messagebox
(
HWND
hwnd
,
int
buttons
,
int
titleId
,
int
resId
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
INT
result
;
__ms_
va_start
(
ap
,
resId
);
va_start
(
ap
,
resId
);
result
=
vmessagebox
(
hwnd
,
buttons
,
titleId
,
resId
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
return
result
;
}
static
void
WINAPIV
error_code_messagebox
(
HWND
hwnd
,
unsigned
int
msg_id
,
...)
{
__ms_
va_list
ap
;
va_list
ap
;
__ms_
va_start
(
ap
,
msg_id
);
va_start
(
ap
,
msg_id
);
vmessagebox
(
hwnd
,
MB_OK
|
MB_ICONERROR
,
IDS_ERROR
,
msg_id
,
ap
);
__ms_
va_end
(
ap
);
va_end
(
ap
);
}
static
BOOL
change_dword_base
(
HWND
hwndDlg
,
BOOL
toHex
)
...
...
This diff is collapsed.
Click to expand it.
programs/regedit/regedit.c
+
7
−
7
View file @
8667b8d1
...
...
@@ -50,7 +50,7 @@ static void output_writeconsole(const WCHAR *str, DWORD wlen)
}
}
static
void
output_formatstring
(
const
WCHAR
*
fmt
,
__ms_
va_list
va_args
)
static
void
output_formatstring
(
const
WCHAR
*
fmt
,
va_list
va_args
)
{
WCHAR
*
str
;
DWORD
len
;
...
...
@@ -69,31 +69,31 @@ static void output_formatstring(const WCHAR *fmt, __ms_va_list va_args)
void
WINAPIV
output_message
(
unsigned
int
id
,
...)
{
WCHAR
fmt
[
1536
];
__ms_
va_list
va_args
;
va_list
va_args
;
if
(
!
LoadStringW
(
GetModuleHandleW
(
NULL
),
id
,
fmt
,
ARRAY_SIZE
(
fmt
)))
{
WINE_FIXME
(
"LoadString failed with %d
\n
"
,
GetLastError
());
return
;
}
__ms_
va_start
(
va_args
,
id
);
va_start
(
va_args
,
id
);
output_formatstring
(
fmt
,
va_args
);
__ms_
va_end
(
va_args
);
va_end
(
va_args
);
}
void
WINAPIV
error_exit
(
unsigned
int
id
,
...)
{
WCHAR
fmt
[
1536
];
__ms_
va_list
va_args
;
va_list
va_args
;
if
(
!
LoadStringW
(
GetModuleHandleW
(
NULL
),
id
,
fmt
,
ARRAY_SIZE
(
fmt
)))
{
WINE_FIXME
(
"LoadString failed with %u
\n
"
,
GetLastError
());
return
;
}
__ms_
va_start
(
va_args
,
id
);
va_start
(
va_args
,
id
);
output_formatstring
(
fmt
,
va_args
);
__ms_
va_end
(
va_args
);
va_end
(
va_args
);
exit
(
0
);
/* regedit.exe always terminates with error code zero */
}
...
...
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