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