[PATCH 2/2] vbscript: Fixed CStr

Piotr Caban piotr.caban at gmail.com
Fri Jun 13 06:31:44 CDT 2014


On 06/13/14 06:26, Shuai Meng wrote:
> ---
>   dlls/vbscript/global.c      | 16 +++++++++++++---
>   dlls/vbscript/tests/api.vbs | 21 +++++++++++++++++++++
>   2 files changed, 34 insertions(+), 3 deletions(-)
>
You have probably sent wrong patch, one that you've sent me earlier is 
better 
(https://github.com/Shuai-Meng/wine/commit/54bb6a783a623a3bf30c8fe33187c8a359db99e3).

Taking in account you'll need to resend it, could you please also change:
+    if(!res)
+        return DISP_E_BADVARTYPE;
+    else {
+        *res = v;
+        return S_OK;
+    }

to

if(!res)
     return DISP_E_BADVARTYPE;

*res = v;
return S_OK;

It's a style change that makes your code similar to other code in global.c

Thanks,
Piotr



More information about the wine-devel mailing list