wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Erich Hoover : ws2_32/tests: AcceptEx IOCP initialization cleanup.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 1e0b65f3a2ecd9ae67c8809cea7a7e7e8b642778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b65f3a2ecd9ae67c8809ce… Author: Erich Hoover <ehoover(a)mines.edu> Date: Mon Apr 30 21:13:18 2012 -0600 ws2_32/tests: AcceptEx IOCP initialization cleanup. --- dlls/ws2_32/tests/sock.c | 193 +++++++++++++++------------------------------- 1 files changed, 61 insertions(+), 132 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f3b33be..ac5cef5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5274,6 +5274,58 @@ static void test_WSAAsyncGetServByName(void) DestroyWindow(hwnd); } +/* + * Provide consistent initialization for the AcceptEx IOCP tests. + */ +static SOCKET setup_iocp_src(struct sockaddr_in *bindAddress) +{ + SOCKET src, ret = INVALID_SOCKET; + int iret, socklen; + + src = socket(AF_INET, SOCK_STREAM, 0); + if (src == INVALID_SOCKET) + { + skip("could not create listener socket, error %d\n", WSAGetLastError()); + goto end; + } + + memset(bindAddress, 0, sizeof(*bindAddress)); + bindAddress->sin_family = AF_INET; + bindAddress->sin_addr.s_addr = inet_addr("127.0.0.1"); + iret = bind(src, (struct sockaddr*)bindAddress, sizeof(*bindAddress)); + if (iret != 0) + { + skip("failed to bind, error %d\n", WSAGetLastError()); + goto end; + } + + socklen = sizeof(*bindAddress); + iret = getsockname(src, (struct sockaddr*)bindAddress, &socklen); + if (iret != 0) { + skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + goto end; + } + + if (set_blocking(src, FALSE)) + { + skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + goto end; + } + + iret = listen(src, 5); + if (iret != 0) + { + skip("listening failed, errno = %d\n", WSAGetLastError()); + goto end; + } + + ret = src; +end: + if (src != ret && ret == INVALID_SOCKET) + closesocket(src); + return ret; +} + static void test_completion_port(void) { HANDLE previous_port, io_port; @@ -5289,7 +5341,6 @@ static void test_completion_port(void) struct sockaddr_in bindAddress; GUID acceptExGuid = WSAID_ACCEPTEX; LPFN_ACCEPTEX pAcceptEx = NULL; - int socklen; previous_port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); ok( previous_port != NULL, "Failed to create completion port %u\n", GetLastError()); @@ -5401,14 +5452,6 @@ static void test_completion_port(void) if (dest != INVALID_SOCKET) closesocket(dest); - - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } - dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET) { @@ -5416,7 +5459,7 @@ static void test_completion_port(void) goto end; } - iret = WSAIoctl(src, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), + iret = WSAIoctl(dest, SIO_GET_EXTENSION_FUNCTION_POINTER, &acceptExGuid, sizeof(acceptExGuid), &pAcceptEx, sizeof(pAcceptEx), &num_bytes, NULL, NULL); if (iret) { @@ -5424,28 +5467,10 @@ static void test_completion_port(void) goto end; } - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + /* Test IOCP response on socket close (IOCP created after AcceptEx) */ - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } - - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } SetLastError(0xdeadbeef); @@ -5485,42 +5510,10 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } + /* */ - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } - - socklen = sizeof(bindAddress); - iret = getsockname(src, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } - - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } - - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } connector = socket(AF_INET, SOCK_STREAM, 0); if (connector == INVALID_SOCKET) { @@ -5575,42 +5568,10 @@ static void test_completion_port(void) if (src != INVALID_SOCKET) closesocket(dest); - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } - - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } + /* */ - socklen = sizeof(bindAddress); - iret = getsockname(src, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } - - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } - - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); - goto end; - } dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET) @@ -5675,42 +5636,10 @@ static void test_completion_port(void) if (connector != INVALID_SOCKET) closesocket(connector); - src = socket(AF_INET, SOCK_STREAM, 0); - if (src == INVALID_SOCKET) - { - skip("could not create listener socket, error %d\n", WSAGetLastError()); - goto end; - } - - memset(&bindAddress, 0, sizeof(bindAddress)); - bindAddress.sin_family = AF_INET; - bindAddress.sin_addr.s_addr = inet_addr("127.0.0.1"); - iret = bind(src, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - if (iret != 0) - { - skip("failed to bind, error %d\n", WSAGetLastError()); - goto end; - } - - socklen = sizeof(bindAddress); - iret = getsockname(src, (struct sockaddr*)&bindAddress, &socklen); - if (iret != 0) { - skip("failed to lookup bind address, error %d\n", WSAGetLastError()); - goto end; - } - - if (set_blocking(src, FALSE)) - { - skip("couldn't make socket non-blocking, error %d\n", WSAGetLastError()); - goto end; - } + /* */ - iret = listen(src, 5); - if (iret != 0) - { - skip("listening failed, errno = %d\n", WSAGetLastError()); + if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) goto end; - } dest = socket(AF_INET, SOCK_STREAM, 0); if (dest == INVALID_SOCKET)

1 0

Jacek Caban : oleaut32: SysStringByteLen code clean up.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: ab509cde5e188c9af19bedd04f653f065d6fa5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab509cde5e188c9af19bedd04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:06:44 2012 +0200 oleaut32: SysStringByteLen code clean up. --- dlls/oleaut32/oleaut.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0d4a07c..bb3bac6 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -171,18 +171,7 @@ UINT WINAPI SysStringLen(BSTR str) */ UINT WINAPI SysStringByteLen(BSTR str) { - DWORD* bufferPointer; - - if (!str) return 0; - /* - * The length of the string (in bytes) is contained in a DWORD placed - * just before the BSTR pointer - */ - bufferPointer = (DWORD*)str; - - bufferPointer--; - - return (int)(*bufferPointer); + return str ? *((DWORD*)str-1) : 0; } /******************************************************************************

1 0

Jacek Caban : oleaut32: SysStringLen code clean up.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 7fded8889577385d6595a18b3dd00c73dba23bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fded8889577385d6595a18b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:06:32 2012 +0200 oleaut32: SysStringLen code clean up. --- dlls/oleaut32/oleaut.c | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 8cbc819..0d4a07c 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -152,18 +152,7 @@ static DWORD *alloc_bstr(size_t size) */ UINT WINAPI SysStringLen(BSTR str) { - DWORD* bufferPointer; - - if (!str) return 0; - /* - * The length of the string (in bytes) is contained in a DWORD placed - * just before the BSTR pointer - */ - bufferPointer = (DWORD*)str; - - bufferPointer--; - - return (int)(*bufferPointer/sizeof(WCHAR)); + return str ? *((DWORD*)str-1)/sizeof(WCHAR) : 0; } /******************************************************************************

1 0

Jacek Caban : jscript: Added VT_I2 tests.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 13db9a1662fa0b52d83337e724814a27cc5d97bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13db9a1662fa0b52d83337e72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:05:21 2012 +0200 jscript: Added VT_I2 tests. --- dlls/jscript/jsutils.c | 4 +++ dlls/jscript/tests/run.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4773fc9..5e7e347 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -262,6 +262,8 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret WARN("failed\n"); return throw_type_error(ctx, ei, JS_E_TO_PRIMITIVE, NULL); } + case VT_I2: + assert(0); default: FIXME("Unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; @@ -444,6 +446,8 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) case VT_BOOL: *ret = V_BOOL(v) ? 1 : 0; break; + case VT_I2: + assert(0); default: FIXME("unimplemented for vt %d\n", V_VT(v)); return E_NOTIMPL; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c4dfd1d..332b125 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); DEFINE_EXPECT(global_propargput_d); DEFINE_EXPECT(global_propargput_i); +DEFINE_EXPECT(global_testargtypes_i); DEFINE_EXPECT(puredisp_prop_d); DEFINE_EXPECT(puredisp_noprop_d); DEFINE_EXPECT(testobj_delete); @@ -99,6 +100,9 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_GLOBAL_PROPARGPUT 0x1012 +#define DISPID_GLOBAL_SHORTPROP 0x1013 +#define DISPID_GLOBAL_GETSHORT 0x1014 +#define DISPID_GLOBAL_TESTARGTYPES 0x1015 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -519,6 +523,21 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "shortProp")) { + *pid = DISPID_GLOBAL_SHORTPROP; + return S_OK; + } + + if(!strcmp_wa(bstrName, "getShort")) { + *pid = DISPID_GLOBAL_GETSHORT; + return S_OK; + } + + if(!strcmp_wa(bstrName, "testArgTypes")) { + *pid = DISPID_GLOBAL_TESTARGTYPES; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -903,6 +922,39 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, IDispatchEx_Release(dispex); return S_OK; } + case DISPID_GLOBAL_SHORTPROP: + case DISPID_GLOBAL_GETSHORT: + V_VT(pvarRes) = VT_I2; + V_I2(pvarRes) = 10; + return S_OK; + + case DISPID_GLOBAL_TESTARGTYPES: { + VARIANT args[1]; + DISPPARAMS dp = {args, NULL, 1, 0}; + HRESULT hres; + + CHECK_EXPECT(global_testargtypes_i); + ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); + ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + + ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); + ok(V_I4(pdp->rgvarg+1) == 10, "V_I4(psp->rgvargs+1) = %d\n", V_I4(pdp->rgvarg)); + + ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+1)); + ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+1)); + + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + + V_VT(args) = VT_I2; + V_I2(args) = 2; + hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + + return S_OK; + } } ok(0, "unexpected call %x\n", id); @@ -1659,6 +1711,10 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i); + SET_EXPECT(global_testargtypes_i); + parse_script_a("testArgTypes(getShort(), shortProp, function(s) {ok(getVT(s) === 'VT_I4', 'not VT_I4');});"); + CHECK_CALLED(global_testargtypes_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Added support for VT_I2 in invoke_prop_func.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: c9c8c6165eafc91e0c1c11fe5563db613ecc35b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c8c6165eafc91e0c1c11fe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:05:07 2012 +0200 jscript: Added support for VT_I2 in invoke_prop_func. --- dlls/jscript/dispex.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/jscript.h | 2 +- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 4f6ed7e..96c17c8 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -333,6 +333,49 @@ static HRESULT set_this(DISPPARAMS *dp, DISPPARAMS *olddp, IDispatch *jsthis) return S_OK; } +static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *ret) +{ + BOOL need_conversion = FALSE; + const VARIANT *s; + VARIANT *d; + unsigned i; + + *ret = *dp; + + for(i = 0; i < ret->cArgs; i++) { + if(V_VT(get_arg(dp, i)) == VT_I2) { + need_conversion = TRUE; + break; + } + } + + if(!need_conversion) + return S_OK; + + if(ret->cArgs > 6) { + ret->rgvarg = heap_alloc(ret->cArgs * sizeof(VARIANT)); + if(!ret->rgvarg) + return E_OUTOFMEMORY; + }else { + ret->rgvarg = buf; + } + + for(i = 0; i < ret->cArgs; i++) { + s = get_arg(dp, i); + d = get_arg(ret, i); + switch(V_VT(s)) { + case VT_I2: + V_VT(d) = VT_I4; + V_I4(d) = V_I2(s); + break; + default: + *d = *s; + } + } + + return S_OK; +} + static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t *prop, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { @@ -340,6 +383,8 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { + DISPPARAMS params; + VARIANT buf[6]; vdisp_t vthis; if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { @@ -347,9 +392,15 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t return E_INVALIDARG; } + hres = convert_params(dp, buf, &params); + if(FAILED(hres)) + return hres; + set_jsdisp(&vthis, jsthis); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, dp, retv, ei); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, &params, retv, ei); vdisp_release(&vthis); + if(params.rgvarg != buf && params.rgvarg != dp->rgvarg) + heap_free(params.rgvarg); return hres; } case PROP_PROTREF: diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 65a80e9..ad39b45 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -375,7 +375,7 @@ HRESULT regexp_match(script_ctx_t*,jsdisp_t*,const WCHAR*,DWORD,BOOL,match_resul HRESULT parse_regexp_flags(const WCHAR*,DWORD,DWORD*) DECLSPEC_HIDDEN; HRESULT regexp_string_match(script_ctx_t*,jsdisp_t*,BSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -static inline VARIANT *get_arg(DISPPARAMS *dp, DWORD i) +static inline VARIANT *get_arg(const DISPPARAMS *dp, DWORD i) { return dp->rgvarg + dp->cArgs-i-1; }

1 0

Jacek Caban : jscript: Added support for VT_I2 in disp_call.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: da125450dadeb859508f05a1227ec93fea338740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da125450dadeb859508f05a12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:04:51 2012 +0200 jscript: Added support for VT_I2 in disp_call. --- dlls/jscript/dispex.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 3b52145..4f6ed7e 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1056,7 +1056,10 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS if(retv) V_VT(retv) = VT_EMPTY; hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { UINT err = 0; if(flags == DISPATCH_CONSTRUCT) { @@ -1065,13 +1068,15 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS } TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei->ei, &err); } - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei->ei, &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); + if(FAILED(hres)) + return hres; - return hres; + if(retv) + ensure_retval_type(retv); + return S_OK; } HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei)

1 0

Jacek Caban : jscript: Added support for VT_I2 in disp_propget.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: b6a1912392ac0a1544ae3ba7d264c320b18a2d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a1912392ac0a1544ae3ba7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 1 15:04:37 2012 +0200 jscript: Added support for VT_I2 in disp_propget. --- dlls/jscript/dispex.c | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index f214ea0..3b52145 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -958,6 +958,15 @@ jsdisp_t *iface_to_jsdisp(IUnknown *iface) return ret; } +static void ensure_retval_type(VARIANT *v) +{ + switch(V_VT(v)) { + case VT_I2: + V_VT(v) = VT_I4; + V_I4(v) = V_I2(v); + } +} + HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID *id) { dispex_prop_t *prop; @@ -1203,18 +1212,21 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val } hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, + &ctx->jscaller->IServiceProvider_iface); + IDispatchEx_Release(dispex); + }else { ULONG err = 0; TRACE("using IDispatch\n"); - return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); + hres = IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, &err); } + if(FAILED(hres)) + return hres; - hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, INVOKE_PROPERTYGET, &dp, val, &ei->ei, - &ctx->jscaller->IServiceProvider_iface); - IDispatchEx_Release(dispex); - - return hres; + ensure_retval_type(val); + return S_OK; } HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx)

1 0

Hans Leidekker : msi: Fix a couple of DispGetParam calls.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 9700e9c7a62b1e9734bcb739a03e321e086bd55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9700e9c7a62b1e9734bcb739a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 1 12:39:17 2012 +0200 msi: Fix a couple of DispGetParam calls. --- dlls/msi/automation.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 375191e..918572a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -884,7 +884,7 @@ static HRESULT RecordImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiRecordSetStringW(This->msiHandle, V_I4(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) { @@ -905,7 +905,7 @@ static HRESULT RecordImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiRecordSetInteger(This->msiHandle, V_I4(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) { @@ -1340,7 +1340,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); if (FAILED(hr)) { VariantClear(&varg0); return hr; @@ -1374,7 +1374,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BOOL, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_BOOL, &varg1, puArgErr); if (FAILED(hr)) return hr; if ((ret = MsiSetMode(This->msiHandle, V_I4(&varg0), V_BOOL(&varg1))) != ERROR_SUCCESS) { @@ -1515,7 +1515,7 @@ static HRESULT SessionImpl_Invoke( } else if (wFlags & DISPATCH_PROPERTYPUT) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); if (FAILED(hr)) return hr; - hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); if (FAILED(hr)) { VariantClear(&varg0); return hr;

1 0

Hans Leidekker : msi: Add the Session object as a global member to custom action scripts.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: c3e3c81bfb661e02f497667d91bfa9867683e491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e3c81bfb661e02f497667d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 1 12:38:52 2012 +0200 msi: Add the Session object as a global member to custom action scripts. --- dlls/msi/script.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index e157c6d..236b60b 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -136,7 +136,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function if (FAILED(hr)) goto done; /* Add the session object */ - hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_ISVISIBLE); + hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_GLOBALMEMBERS); if (FAILED(hr)) goto done; /* Pass the script to the engine */

1 0

Hans Leidekker : msi: Remove a workaround for missing Windows Script interfaces.
by Alexandre Julliard 01 May '12

01 May '12

Module: wine Branch: master Commit: 52738e4f93314d1ae17c992a0d08bdfc6beea844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52738e4f93314d1ae17c992a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 1 12:38:27 2012 +0200 msi: Remove a workaround for missing Windows Script interfaces. --- dlls/msi/script.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 27bbee1..e157c6d 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -88,10 +88,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function DISPID dispid; CLSID clsid; VARIANT var; - - /* Return success by default (if Windows Script not installed) - not native behavior. This - * should be here until we implement wine scripting. */ - DWORD ret = ERROR_SUCCESS; + DWORD ret = ERROR_INSTALL_FAILURE; CoInitialize(NULL); @@ -126,9 +123,6 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function goto done; } - /* If we got this far, Windows Script is installed, so don't return success by default anymore */ - ret = ERROR_INSTALL_FAILURE; - /* Get the IActiveScriptParse engine interface */ hr = IActiveScript_QueryInterface(pActiveScript, &IID_IActiveScriptParse, (void **)&pActiveScriptParse); if (FAILED(hr)) goto done;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012