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
56af82b1
Commit
56af82b1
authored
3 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
shlwapi: Use the standard va_list instead of __ms_va_list.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
bc909b1b
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
dlls/shlwapi/ordinal.c
+11
-11
11 additions, 11 deletions
dlls/shlwapi/ordinal.c
dlls/shlwapi/wsprintf.c
+8
-8
8 additions, 8 deletions
dlls/shlwapi/wsprintf.c
with
19 additions
and
19 deletions
dlls/shlwapi/ordinal.c
+
11
−
11
View file @
56af82b1
...
...
@@ -2363,7 +2363,7 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM
*
* _SHPackDispParamsV
*/
HRESULT
WINAPI
SHPackDispParamsV
(
DISPPARAMS
*
params
,
VARIANTARG
*
args
,
UINT
cnt
,
__ms_
va_list
valist
)
HRESULT
WINAPI
SHPackDispParamsV
(
DISPPARAMS
*
params
,
VARIANTARG
*
args
,
UINT
cnt
,
va_list
valist
)
{
VARIANTARG
*
iter
;
...
...
@@ -2417,12 +2417,12 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt,
*/
HRESULT
WINAPIV
SHPackDispParams
(
DISPPARAMS
*
params
,
VARIANTARG
*
args
,
UINT
cnt
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
HRESULT
hres
;
__ms_
va_start
(
valist
,
cnt
);
va_start
(
valist
,
cnt
);
hres
=
SHPackDispParamsV
(
params
,
args
,
cnt
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
hres
;
}
...
...
@@ -2579,7 +2579,7 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
IConnectionPoint
*
iCP
;
IConnectionPointContainer
*
iCPC
;
DISPPARAMS
dispParams
=
{
buffer
,
NULL
,
cParams
,
0
};
__ms_
va_list
valist
;
va_list
valist
;
if
(
!
container
)
return
E_NOINTERFACE
;
...
...
@@ -2593,9 +2593,9 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam(
if
(
FAILED
(
result
))
return
result
;
__ms_
va_start
(
valist
,
cParams
);
va_start
(
valist
,
cParams
);
SHPackDispParamsV
(
&
dispParams
,
buffer
,
cParams
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
result
=
SHLWAPI_InvokeByIID
(
iCP
,
riid
,
dispId
,
&
dispParams
);
IConnectionPoint_Release
(
iCP
);
...
...
@@ -4031,10 +4031,10 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
WCHAR
*
szText
=
NULL
,
szTitle
[
100
];
LPCWSTR
pszText
,
pszTitle
=
szTitle
;
LPWSTR
pszTemp
;
__ms_
va_list
args
;
va_list
args
;
int
ret
;
__ms_
va_start
(
args
,
uType
);
va_start
(
args
,
uType
);
TRACE
(
"(%p,%p,%p,%p,%08x)
\n
"
,
hInstance
,
hWnd
,
lpText
,
lpCaption
,
uType
);
...
...
@@ -4056,7 +4056,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
pszText
=
szText
;
if
(
!
pszText
)
{
WARN
(
"Failed to load id %d
\n
"
,
LOWORD
(
lpText
));
__ms_
va_end
(
args
);
va_end
(
args
);
return
0
;
}
}
...
...
@@ -4066,7 +4066,7 @@ INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText,
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
);
...
...
This diff is collapsed.
Click to expand it.
dlls/shlwapi/wsprintf.c
+
8
−
8
View file @
56af82b1
...
...
@@ -349,7 +349,7 @@ static UINT WPRINTF_GetLen( WPRINTF_FORMAT *format, WPRINTF_DATA *arg,
* Success: The number of characters written.
* Failure: -1.
*/
INT
WINAPI
wvnsprintfA
(
LPSTR
buffer
,
INT
maxlen
,
LPCSTR
spec
,
__ms_
va_list
args
)
INT
WINAPI
wvnsprintfA
(
LPSTR
buffer
,
INT
maxlen
,
LPCSTR
spec
,
va_list
args
)
{
WPRINTF_FORMAT
format
;
LPSTR
p
=
buffer
;
...
...
@@ -471,7 +471,7 @@ INT WINAPI wvnsprintfA( LPSTR buffer, INT maxlen, LPCSTR spec, __ms_va_list args
*
* See wvnsprintfA.
*/
INT
WINAPI
wvnsprintfW
(
LPWSTR
buffer
,
INT
maxlen
,
LPCWSTR
spec
,
__ms_
va_list
args
)
INT
WINAPI
wvnsprintfW
(
LPWSTR
buffer
,
INT
maxlen
,
LPCWSTR
spec
,
va_list
args
)
{
WPRINTF_FORMAT
format
;
LPWSTR
p
=
buffer
;
...
...
@@ -602,12 +602,12 @@ INT WINAPI wvnsprintfW( LPWSTR buffer, INT maxlen, LPCWSTR spec, __ms_va_list ar
*/
int
WINAPIV
wnsprintfA
(
LPSTR
lpOut
,
int
cchLimitIn
,
LPCSTR
lpFmt
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
INT
res
;
__ms_
va_start
(
valist
,
lpFmt
);
va_start
(
valist
,
lpFmt
);
res
=
wvnsprintfA
(
lpOut
,
cchLimitIn
,
lpFmt
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
...
...
@@ -619,11 +619,11 @@ int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
*/
int
WINAPIV
wnsprintfW
(
LPWSTR
lpOut
,
int
cchLimitIn
,
LPCWSTR
lpFmt
,
...)
{
__ms_
va_list
valist
;
va_list
valist
;
INT
res
;
__ms_
va_start
(
valist
,
lpFmt
);
va_start
(
valist
,
lpFmt
);
res
=
wvnsprintfW
(
lpOut
,
cchLimitIn
,
lpFmt
,
valist
);
__ms_
va_end
(
valist
);
va_end
(
valist
);
return
res
;
}
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