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
bc909b1b
Commit
bc909b1b
authored
Oct 22, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
348336b8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
shellord.c
dlls/shell32/shellord.c
+6
-6
shlfileop.c
dlls/shell32/shlfileop.c
+1
-1
shlexec.c
dlls/shell32/tests/shlexec.c
+6
-6
No files found.
dlls/shell32/shellord.c
View file @
bc909b1b
...
...
@@ -422,10 +422,10 @@ int WINAPIV ShellMessageBoxW(
WCHAR
szText
[
100
],
szTitle
[
100
];
LPCWSTR
pszText
=
szText
,
pszTitle
=
szTitle
;
LPWSTR
pszTemp
;
__ms_
va_list
args
;
va_list
args
;
int
ret
;
__ms_
va_start
(
args
,
uType
);
va_start
(
args
,
uType
);
/* wvsprintfA(buf,fmt, args); */
TRACE
(
"(%p,%p,%p,%p,%08x)
\n
"
,
...
...
@@ -444,7 +444,7 @@ int WINAPIV ShellMessageBoxW(
FormatMessageW
(
FORMAT_MESSAGE_ALLOCATE_BUFFER
|
FORMAT_MESSAGE_FROM_STRING
,
pszText
,
0
,
0
,
(
LPWSTR
)
&
pszTemp
,
0
,
&
args
);
__ms_
va_end
(
args
);
va_end
(
args
);
ret
=
MessageBoxW
(
hWnd
,
pszTemp
,
pszTitle
,
uType
);
LocalFree
(
pszTemp
);
...
...
@@ -480,10 +480,10 @@ int WINAPIV ShellMessageBoxA(
char
szText
[
100
],
szTitle
[
100
];
LPCSTR
pszText
=
szText
,
pszTitle
=
szTitle
;
LPSTR
pszTemp
;
__ms_
va_list
args
;
va_list
args
;
int
ret
;
__ms_
va_start
(
args
,
uType
);
va_start
(
args
,
uType
);
/* wvsprintfA(buf,fmt, args); */
TRACE
(
"(%p,%p,%p,%p,%08x)
\n
"
,
...
...
@@ -502,7 +502,7 @@ int WINAPIV ShellMessageBoxA(
FormatMessageA
(
FORMAT_MESSAGE_ALLOCATE_BUFFER
|
FORMAT_MESSAGE_FROM_STRING
,
pszText
,
0
,
0
,
(
LPSTR
)
&
pszTemp
,
0
,
&
args
);
__ms_
va_end
(
args
);
va_end
(
args
);
ret
=
MessageBoxA
(
hWnd
,
pszTemp
,
pszTitle
,
uType
);
LocalFree
(
pszTemp
);
...
...
dlls/shell32/shlfileop.c
View file @
bc909b1b
...
...
@@ -287,7 +287,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI
args
[
0
]
=
(
DWORD_PTR
)
szDir
;
FormatMessageW
(
FORMAT_MESSAGE_FROM_STRING
|
FORMAT_MESSAGE_ARGUMENT_ARRAY
,
szText
,
0
,
0
,
szBuffer
,
ARRAY_SIZE
(
szBuffer
),
(
__ms_
va_list
*
)
args
);
szText
,
0
,
0
,
szBuffer
,
ARRAY_SIZE
(
szBuffer
),
(
va_list
*
)
args
);
hIcon
=
LoadIconW
(
ids
.
hIconInstance
,
(
LPWSTR
)
MAKEINTRESOURCE
(
ids
.
icon_resource_id
));
...
...
dlls/shell32/tests/shlexec.c
View file @
bc909b1b
...
...
@@ -114,13 +114,13 @@ static char* decodeA(const char* str)
static
void
WINAPIV
__WINE_PRINTF_ATTR
(
2
,
3
)
childPrintf
(
HANDLE
h
,
const
char
*
fmt
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
char
buffer
[
1024
];
DWORD
w
;
__ms_
va_start
(
valist
,
fmt
);
va_start
(
valist
,
fmt
);
vsprintf
(
buffer
,
fmt
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
WriteFile
(
h
,
buffer
,
strlen
(
buffer
),
&
w
,
NULL
);
}
...
...
@@ -348,14 +348,14 @@ static void dump_child_(const char* file, int line)
static
char
shell_call
[
2048
];
static
void
WINAPIV
__WINE_PRINTF_ATTR
(
2
,
3
)
_okShell
(
int
condition
,
const
char
*
msg
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
char
buffer
[
2048
];
strcpy
(
buffer
,
shell_call
);
strcat
(
buffer
,
" "
);
__ms_
va_start
(
valist
,
msg
);
va_start
(
valist
,
msg
);
vsprintf
(
buffer
+
strlen
(
buffer
),
msg
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
winetest_ok
(
condition
,
"%s"
,
buffer
);
}
#define okShell_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : _okShell
...
...
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