[PATCH 0/2] MR638: wshom: Use signed type for properties ProcessID and ExitCode in IWshExec.
Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. See discussion under Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/638
From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. See discussion under Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 41913dcadd5..5ac04e60e88 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -264,7 +264,7 @@ static HRESULT WINAPI WshExec_get_StdErr(IWshExec *iface, ITextStream **stream) return S_OK; } -static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, DWORD *pid) +static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, int *pid) { WshExecImpl *This = impl_from_IWshExec(iface); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index a0175bb1604..ee9578f5ae3 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -436,7 +436,7 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] DWORD *pid); + HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] HRESULT ExitCode([out, retval] DWORD *code); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index c69362d6fac..c2984afc227 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -436,7 +436,7 @@ library IWshRuntimeLibrary HRESULT StdErr([out, retval] ITextStream** stream); [id(0x0006), propget] - HRESULT ProcessID([out, retval] DWORD *pid); + HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] HRESULT ExitCode([out, retval] DWORD *code); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/638
From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Automation interfaces should use signed types, because VBScript does not support unsigned types like VT_UI4. See discussion under Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53542 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wshom.ocx/shell.c | 2 +- dlls/wshom.ocx/tests/wshom.idl | 2 +- dlls/wshom.ocx/wshom.idl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 5ac04e60e88..034f6583d54 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -277,7 +277,7 @@ static HRESULT WINAPI WshExec_get_ProcessID(IWshExec *iface, int *pid) return S_OK; } -static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, DWORD *code) +static HRESULT WINAPI WshExec_get_ExitCode(IWshExec *iface, int *code) { WshExecImpl *This = impl_from_IWshExec(iface); diff --git a/dlls/wshom.ocx/tests/wshom.idl b/dlls/wshom.ocx/tests/wshom.idl index ee9578f5ae3..cdd674460f6 100644 --- a/dlls/wshom.ocx/tests/wshom.idl +++ b/dlls/wshom.ocx/tests/wshom.idl @@ -439,7 +439,7 @@ library IWshRuntimeLibrary HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] DWORD *code); + HRESULT ExitCode([out, retval] int *code); [id(0x0008)] HRESULT Terminate(); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index c2984afc227..54de529a7a3 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -439,7 +439,7 @@ library IWshRuntimeLibrary HRESULT ProcessID([out, retval] int *pid); [id(0x0007), propget] - HRESULT ExitCode([out, retval] DWORD *code); + HRESULT ExitCode([out, retval] int *code); [id(0x0008)] HRESULT Terminate(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/638
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/638
participants (3)
-
Nikolay Sivov (@nsivov) -
Robert Wilhelm -
Robert Wilhelm (@sloper42)