[PATCH] rpcrt4: Use str/wstr parameters for A/W functions.

[Serge Gautherie]

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
---
 dlls/rpcrt4/rpcrt4.spec | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
index 135beab..c1db5ba 100644
--- a/dlls/rpcrt4/rpcrt4.spec
+++ b/dlls/rpcrt4/rpcrt4.spec
@@ -9,8 +9,8 @@
 @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr)
 @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr)
 @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr)
-@ stdcall DceErrorInqTextA (long ptr)
-@ stdcall DceErrorInqTextW (long ptr)
+@ stdcall DceErrorInqTextA(long str)
+@ stdcall DceErrorInqTextW(long wstr)
 @ stdcall -private DllRegisterServer()
 @ stub GlobalMutexClearExternal
 @ stub GlobalMutexRequestExternal
@@ -196,7 +196,7 @@
 @ stdcall NdrFullPointerQueryPointer(ptr ptr long ptr)
 @ stdcall NdrFullPointerQueryRefId(ptr long long ptr)
 @ stdcall NdrFullPointerXlatFree(ptr)
-@ stdcall NdrFullPointerXlatInit(long long) 
+@ stdcall NdrFullPointerXlatInit(long long)
 @ stdcall NdrGetBuffer(ptr long ptr)
 @ stub NdrGetDcomProtocolVersion
 @ stub NdrGetPartialBuffer
@@ -341,7 +341,7 @@
 @ stub RpcAsyncRegisterInfo
 @ stdcall RpcBindingCopy(ptr ptr)
 @ stdcall RpcBindingFree(ptr)
-@ stdcall RpcBindingFromStringBindingA(str  ptr)
+@ stdcall RpcBindingFromStringBindingA(str ptr)
 @ stdcall RpcBindingFromStringBindingW(wstr ptr)
 @ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr)
 @ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long)
@@ -434,7 +434,7 @@
 @ stdcall RpcServerInqDefaultPrincNameW(long ptr)
 @ stub RpcServerInqIf
 @ stdcall RpcServerListen(long long long)
-@ stdcall RpcServerRegisterAuthInfoA(str  long ptr ptr)
+@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr)
 @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr)
 @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr)
 @ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr)
@@ -448,8 +448,8 @@
 @ stub RpcServerUseAllProtseqsIf
 @ stub RpcServerUseAllProtseqsIfEx
 @ stdcall RpcServerUseProtseqA(str long ptr)
-@ stdcall RpcServerUseProtseqEpA(str  long str  ptr)
-@ stdcall RpcServerUseProtseqEpExA(str  long str  ptr ptr)
+@ stdcall RpcServerUseProtseqEpA(str long str ptr)
+@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr)
 @ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr)
 @ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr)
 @ stub RpcServerUseProtseqExA
@@ -483,9 +483,9 @@
 @ stub RpcSsSetClientAllocFree
 @ stub RpcSsSetThreadHandle
 @ stub RpcSsSwapClientAllocFree
-@ stdcall RpcStringBindingComposeA(str  str  str  str  str  ptr)
+@ stdcall RpcStringBindingComposeA(str str str str str ptr)
 @ stdcall RpcStringBindingComposeW(wstr wstr wstr wstr wstr ptr)
-@ stdcall RpcStringBindingParseA(str  ptr ptr ptr ptr ptr)
+@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr)
 @ stdcall RpcStringBindingParseW(wstr ptr ptr ptr ptr ptr)
 @ stdcall RpcStringFreeA(ptr)
 @ stdcall RpcStringFreeW(ptr)
-- 
2.10.0.windows.1

[Zebediah Figura]

On 4/27/20 10:46 PM, Serge Gautherie wrote:
> Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr>
> ---
>   dlls/rpcrt4/rpcrt4.spec | 18 +++++++++---------
>   1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec
> index 135beab..c1db5ba 100644
> --- a/dlls/rpcrt4/rpcrt4.spec
> +++ b/dlls/rpcrt4/rpcrt4.spec
> @@ -9,8 +9,8 @@
>   @ stdcall CStdStubBuffer_Invoke(ptr ptr ptr)
>   @ stdcall CStdStubBuffer_IsIIDSupported(ptr ptr)
>   @ stdcall CStdStubBuffer_QueryInterface(ptr ptr ptr)
> -@ stdcall DceErrorInqTextA (long ptr)
> -@ stdcall DceErrorInqTextW (long ptr)
> +@ stdcall DceErrorInqTextA(long str)
> +@ stdcall DceErrorInqTextW(long wstr)
>   @ stdcall -private DllRegisterServer()
>   @ stub GlobalMutexClearExternal
>   @ stub GlobalMutexRequestExternal

+relay only traces input parameters, so str/wstr doesn't make sense for 
output-only buffers.
> @@ -196,7 +196,7 @@
>   @ stdcall NdrFullPointerQueryPointer(ptr ptr long ptr)
>   @ stdcall NdrFullPointerQueryRefId(ptr long long ptr)
>   @ stdcall NdrFullPointerXlatFree(ptr)
> -@ stdcall NdrFullPointerXlatInit(long long)
> +@ stdcall NdrFullPointerXlatInit(long long)
>   @ stdcall NdrGetBuffer(ptr long ptr)
>   @ stub NdrGetDcomProtocolVersion
>   @ stub NdrGetPartialBuffer
> @@ -341,7 +341,7 @@
>   @ stub RpcAsyncRegisterInfo
>   @ stdcall RpcBindingCopy(ptr ptr)
>   @ stdcall RpcBindingFree(ptr)
> -@ stdcall RpcBindingFromStringBindingA(str  ptr)
> +@ stdcall RpcBindingFromStringBindingA(str ptr)
>   @ stdcall RpcBindingFromStringBindingW(wstr ptr)
>   @ stdcall RpcBindingInqAuthClientA(ptr ptr ptr ptr ptr ptr)
>   @ stdcall RpcBindingInqAuthClientExA(ptr ptr ptr ptr ptr ptr long)
> @@ -434,7 +434,7 @@
>   @ stdcall RpcServerInqDefaultPrincNameW(long ptr)
>   @ stub RpcServerInqIf
>   @ stdcall RpcServerListen(long long long)
> -@ stdcall RpcServerRegisterAuthInfoA(str  long ptr ptr)
> +@ stdcall RpcServerRegisterAuthInfoA(str long ptr ptr)
>   @ stdcall RpcServerRegisterAuthInfoW(wstr long ptr ptr)
>   @ stdcall RpcServerRegisterIf2(ptr ptr ptr long long long ptr)
>   @ stdcall RpcServerRegisterIf3(ptr ptr ptr long long long ptr ptr)
> @@ -448,8 +448,8 @@
>   @ stub RpcServerUseAllProtseqsIf
>   @ stub RpcServerUseAllProtseqsIfEx
>   @ stdcall RpcServerUseProtseqA(str long ptr)
> -@ stdcall RpcServerUseProtseqEpA(str  long str  ptr)
> -@ stdcall RpcServerUseProtseqEpExA(str  long str  ptr ptr)
> +@ stdcall RpcServerUseProtseqEpA(str long str ptr)
> +@ stdcall RpcServerUseProtseqEpExA(str long str ptr ptr)
>   @ stdcall RpcServerUseProtseqEpExW(wstr long wstr ptr ptr)
>   @ stdcall RpcServerUseProtseqEpW(wstr long wstr ptr)
>   @ stub RpcServerUseProtseqExA
> @@ -483,9 +483,9 @@
>   @ stub RpcSsSetClientAllocFree
>   @ stub RpcSsSetThreadHandle
>   @ stub RpcSsSwapClientAllocFree
> -@ stdcall RpcStringBindingComposeA(str  str  str  str  str  ptr)
> +@ stdcall RpcStringBindingComposeA(str str str str str ptr)
>   @ stdcall RpcStringBindingComposeW(wstr wstr wstr wstr wstr ptr)
> -@ stdcall RpcStringBindingParseA(str  ptr ptr ptr ptr ptr)
> +@ stdcall RpcStringBindingParseA(str ptr ptr ptr ptr ptr)
>   @ stdcall RpcStringBindingParseW(wstr ptr ptr ptr ptr ptr)
>   @ stdcall RpcStringFreeA(ptr)
>   @ stdcall RpcStringFreeW(ptr)

All of the rest of these changes seem to be spacing tweaks. I suspect 
that's not desired in general, though there's few enough here that 
perhaps it'll be accepted anyway.

[Dmitry Timoshkov]

Some of these are output parameters, and using str/wstr would lead to
printing garbage.

-- 
Dmitry.