May 2013 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_BYTES-> DBTYPE_BYTES | DBTYPE_BYREF.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 72845af0a62ae3f5b63883a8976b60f6390ca300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72845af0a62ae3f5b63883a89… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 14:24:08 2013 +1000 oledb32: Implement DataConvert DBTYPE_BYTES->DBTYPE_BYTES | DBTYPE_BYREF. --- dlls/oledb32/convert.c | 19 +++++++++++++++++++ dlls/oledb32/tests/convert.c | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 61a2be6..7e09016 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -957,6 +957,25 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_BYTES | DBTYPE_BYREF: + { + BYTE **d = dst; + + switch(src_type) + { + case DBTYPE_BYTES: + *d = CoTaskMemAlloc(src_len); + if(*d) memcpy(*d, src, src_len); + else hr = E_OUTOFMEMORY; + + *dst_len = src_len; + *dst_status = DBSTATUS_S_OK; + return S_OK; + default: FIXME("Unimplemented conversion %04x -> DBTYPE_BYTES | DBTYPE_BYREF\n", src_type); return E_NOTIMPL; + } + break; + } + break; default: FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b3eda95..bb81835 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2463,6 +2463,23 @@ static void test_converttobytes(void) ok(!memcmp(byte_src, dst, 2 ), "bytes differ\n"); } +static void test_converttobytesbyref(void) +{ + DBLENGTH dst_len; + HRESULT hr; + BYTE byte_src[] = {0, 1, 2, 4, 5}; + BYTE *dst; + DBSTATUS dst_status; + + dst_len = 0; + hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_BYTES | DBTYPE_BYREF, sizeof(byte_src), &dst_len, byte_src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(byte_src), "got %ld\n", dst_len); + ok(!memcmp(byte_src, dst, dst_len ), "bytes differ\n"); + CoTaskMemFree(dst); +} + static void test_converttodbdate(void) { DBLENGTH dst_len; @@ -2693,6 +2710,7 @@ START_TEST(convert) test_converttoui8(); test_converttovar(); test_converttobytes(); + test_converttobytesbyref(); test_converttodbdate(); test_getconversionsize(); test_converttotimestamp();

1 0

Alistair Leslie-Hughes : oledb32: DataConvert only variant length types can have a null dst.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 7a762fee023cc2585348308945d16b0b114b7e01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a762fee023cc258534830894… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 23 14:57:39 2013 +1000 oledb32: DataConvert only variant length types can have a null dst. --- dlls/oledb32/convert.c | 7 +++++++ dlls/oledb32/tests/convert.c | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 7e09016..9d41860 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -191,6 +191,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, return S_OK; } + if(dst == NULL && get_length(dst_type) != 0) + { + *dst_len = get_length(src_type); + *dst_status = DBSTATUS_S_OK; + return S_OK; + } + if(src_type == DBTYPE_STR) { BSTR b; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index bb81835..ee2a39b 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -892,6 +892,13 @@ todo_wine ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 0, "got %ld\n", dst_len); + /* dst = NULL */ + *(int *)src = 0x4321cafe; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I4, 0, &dst_len, src, NULL, 0, 0, NULL, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_len == sizeof(i4), "got %ld\n", dst_len); + } static void test_converttoi8(void)

1 0

Alexandre Julliard : wininet/tests: Use test.winehq. org for all certificate tests.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 147ffa0ccd84f16fa694f8b92be596283f353b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=147ffa0ccd84f16fa694f8b92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 19:23:17 2013 +0200 wininet/tests: Use test.winehq.org for all certificate tests. --- dlls/wininet/tests/http.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bc3505f..60fbe57 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3461,19 +3461,16 @@ static void test_cert_struct(HINTERNET req) BOOL res; static const char ex_subject[] = - "US\r\n" - "Minnesota\r\n" - "Saint Paul\r\n" - "WineHQ\r\n" - "test.winehq.org\r\n" - "webmaster(a)winehq.org"; + "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" + "GT98380011\r\n" + "See www.rapidssl.com/resources/cps (c)13\r\n" + "Domain Control Validated - RapidSSL(R)\r\n" + "*.winehq.org"; static const char ex_issuer[] = "US\r\n" - "Minnesota\r\n" - "WineHQ\r\n" - "test.winehq.org\r\n" - "webmaster(a)winehq.org"; + "\"GeoTrust, Inc.\"\r\n" + "RapidSSL CA"; memset(&info, 0x5, sizeof(info)); @@ -3841,9 +3838,9 @@ static void test_security_flags(void) static void test_secure_connection(void) { static const WCHAR gizmo5[] = {'G','i','z','m','o','5',0}; - static const WCHAR testbot[] = {'t','e','s','t','b','o','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR testsite[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR get[] = {'G','E','T',0}; - static const WCHAR slash[] = {'/',0}; + static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; DWORD size, flags; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; @@ -3853,12 +3850,12 @@ static void test_secure_connection(void) ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnect(ses, "testbot.winehq.org", + con = InternetConnect(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/", NULL, NULL, NULL, + req = HttpOpenRequest(con, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); ok(req != NULL, "HttpOpenRequest failed\n"); @@ -3937,12 +3934,12 @@ static void test_secure_connection(void) ses = InternetOpenW(gizmo5, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnectW(ses, testbot, + con = InternetConnectW(ses, testsite, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestW(con, get, slash, NULL, NULL, NULL, + req = HttpOpenRequestW(con, get, testpage, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); ok(req != NULL, "HttpOpenRequest failed\n");

1 0

Jacek Caban : ole32: Use a separated object to expose local servers instead of marshaling them in CoRegisterClassObject .
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 889112a29a951be278bfa84ffc05d8d8518cef61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889112a29a951be278bfa84ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 13:20:41 2013 +0200 ole32: Use a separated object to expose local servers instead of marshaling them in CoRegisterClassObject. --- dlls/ole32/compobj.c | 187 +++++++++++++++++++++++++++++++------ dlls/ole32/compobj_private.h | 12 +++ dlls/ole32/errorinfo.c | 10 -- dlls/ole32/rpc.c | 13 ++- dlls/ole32/tests/defaulthandler.c | 2 - 5 files changed, 181 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889112a29a951be278bfa…

1 0

Jacek Caban : ole32: Added IExternalConnection support.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: a30cc75fe08b0d1a35af009fbbdf61fa87b79061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a30cc75fe08b0d1a35af009fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 13:21:12 2013 +0200 ole32: Added IExternalConnection support. --- dlls/ole32/compobj_private.h | 2 ++ dlls/ole32/stubmanager.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f2c9d31..c4379cb 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -98,6 +98,8 @@ struct stub_manager ULONG next_ipid; /* currently unused (LOCK) */ OXID_INFO oxid_info; /* string binding, ipid of rem unknown and other information (RO) */ + IExternalConnection *extern_conn; + /* We need to keep a count of the outstanding marshals, so we can enforce the * marshalling rules (ie, you can only unmarshal normal marshals once). Note * that these counts do NOT include unmarshalled interfaces, once a stream is diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index e7018b9..822b299 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -173,6 +173,7 @@ struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHL struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) { struct stub_manager *sm; + HRESULT hres; assert( apt ); @@ -218,6 +219,16 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) */ sm->extrefs = 0; + /* + * NOTE: According to tests, creating a stub causes two AddConnection calls followed by + * one ReleaseConnection call (with fLastReleaseCloses=FALSE). + */ + hres = IUnknown_QueryInterface(object, &IID_IExternalConnection, (void**)&sm->extern_conn); + if(SUCCEEDED(hres)) + IExternalConnection_AddConnection(sm->extern_conn, EXTCONN_STRONG, 0); + else + sm->extern_conn = NULL; + EnterCriticalSection(&apt->cs); sm->oid = apt->oidc++; list_add_head(&apt->stubmgrs, &sm->entry); @@ -242,6 +253,11 @@ static void stub_manager_delete(struct stub_manager *m) stub_manager_delete_ifstub(m, ifstub); } + if(m->extern_conn) { + IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE); + IExternalConnection_Release(m->extern_conn); + } + CoTaskMemFree(m->oxid_info.psa); IUnknown_Release(m->object);

1 0

Jacek Caban : oleaut32: Added IExternalConnection tests.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: a047b2cb6f1a0ce0082ef6fe5bce9e2dcb124ede URL: http://source.winehq.org/git/wine.git/?a=commit;h=a047b2cb6f1a0ce0082ef6fe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 23 13:21:29 2013 +0200 oleaut32: Added IExternalConnection tests. --- dlls/oleaut32/tests/tmarshal.c | 203 ++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 11 ++ 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2c1b8e8..3572bbb 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -151,6 +151,60 @@ static void end_host_object(DWORD tid, HANDLE thread) CloseHandle(thread); } +static int external_connections; + +static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface, REFIID riid, void **ppv) +{ + ok(0, "unxpected call\n"); + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ExternalConnection_AddRef(IExternalConnection *iface) +{ + return 2; +} + +static ULONG WINAPI ExternalConnection_Release(IExternalConnection *iface) +{ + return 1; +} + +static DWORD WINAPI ExternalConnection_AddConnection(IExternalConnection *iface, DWORD extconn, DWORD reserved) +{ + trace("add connection\n"); + + ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + ok(!reserved, "reserved = %x\n", reserved); + return ++external_connections; +} + +static DWORD WINAPI ExternalConnection_ReleaseConnection(IExternalConnection *iface, DWORD extconn, + DWORD reserved, BOOL fLastReleaseCloses) +{ + trace("release connection\n"); + + ok(extconn == EXTCONN_STRONG, "extconn = %d\n", extconn); + ok(!reserved, "reserved = %x\n", reserved); + + /* This may need to be adjusted if we'll add more complex tests. */ + if(--external_connections) + ok(!fLastReleaseCloses, "fLastReleaseCloses = %x\n", fLastReleaseCloses); + else + ok(fLastReleaseCloses, "fLastReleaseCloses = %x\n", fLastReleaseCloses); + return external_connections; +} + +static const IExternalConnectionVtbl ExternalConnectionVtbl = { + ExternalConnection_QueryInterface, + ExternalConnection_AddRef, + ExternalConnection_Release, + ExternalConnection_AddConnection, + ExternalConnection_ReleaseConnection +}; + +static IExternalConnection ExternalConnection = { &ExternalConnectionVtbl }; + static ItestDual TestDual, TestDualDisp; static HRESULT WINAPI TestSecondIface_QueryInterface(ITestSecondIface *iface, REFIID riid, void **ppv) @@ -182,6 +236,67 @@ static const ITestSecondIfaceVtbl TestSecondIfaceVtbl = { static ITestSecondIface TestSecondIface = { &TestSecondIfaceVtbl }; +static HRESULT WINAPI TestSecondDisp_QueryInterface(ITestSecondDisp *iface, REFIID riid, void **ppv) +{ + return ItestDual_QueryInterface(&TestDual, riid, ppv); +} + +static ULONG WINAPI TestSecondDisp_AddRef(ITestSecondDisp *iface) +{ + return 2; +} + +static ULONG WINAPI TestSecondDisp_Release(ITestSecondDisp *iface) +{ + return 1; +} + +static HRESULT WINAPI TestSecondDisp_GetTypeInfoCount(ITestSecondDisp *iface, UINT *pctinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_GetTypeInfo(ITestSecondDisp *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_GetIDsOfNames(ITestSecondDisp *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_Invoke(ITestSecondDisp *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, + UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI TestSecondDisp_test(ITestSecondDisp *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static ITestSecondDispVtbl TestSecondDispVtbl = { + TestSecondDisp_QueryInterface, + TestSecondDisp_AddRef, + TestSecondDisp_Release, + TestSecondDisp_GetTypeInfoCount, + TestSecondDisp_GetTypeInfo, + TestSecondDisp_GetIDsOfNames, + TestSecondDisp_Invoke, + TestSecondDisp_test +}; + +static ITestSecondDisp TestSecondDisp = { &TestSecondDispVtbl }; + static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, void **ppvObject) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch)) { @@ -193,6 +308,13 @@ static HRESULT WINAPI TestDual_QueryInterface(ItestDual *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_ITestSecondIface)) { *ppvObject = &TestSecondIface; return S_OK; + }else if(IsEqualGUID(riid, &IID_ITestSecondDisp)) { + *ppvObject = &TestSecondDisp; + return S_OK; + }else if (IsEqualGUID(riid, &IID_IExternalConnection)) { + trace("QI external connection\n"); + *ppvObject = &ExternalConnection; + return S_OK; } *ppvObject = NULL; @@ -1704,6 +1826,86 @@ static void test_libattr(void) ITypeLib_Release(pTypeLib); } +static void test_external_connection(void) +{ + IStream *stream, *stream2; + ITestSecondDisp *second; + ItestDual *iface; + HANDLE thread; + DWORD tid; + HRESULT hres; + + static const LARGE_INTEGER zero; + + trace("Testing IExternalConnection...\n"); + + external_connections = 0; + + /* Marshaling an interface increases external connection count. */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + tid = start_host_object(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHLFLAGS_NORMAL, &thread); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); + ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Release(stream); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + /* Creating a stub for new iface does not cause new external connection. */ + hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second); + ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + ITestSecondDisp_Release(second); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + ItestDual_Release(iface); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + + end_host_object(tid, thread); + + /* A test with direct CoMarshalInterface call. */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + + hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + + /* Two separated marshal data are still one external connection. */ + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream2); + ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + hres = CoMarshalInterface(stream2, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 1, "external_connections = %d\n", external_connections); + + IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL); + hres = CoReleaseMarshalData(stream2); + ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + ok(external_connections == 0, "external_connections = %d\n", external_connections); + +} + START_TEST(tmarshal) { HRESULT hr; @@ -1724,6 +1926,7 @@ START_TEST(tmarshal) test_DispCallFunc(); test_StaticWidget(); test_libattr(); + test_external_connection(); hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 8dca84c..0f0186b 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -75,6 +75,17 @@ library TestTypelib [ odl, + oleautomation, + dual, + uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c7967) + ] + interface ITestSecondDisp : IDispatch + { + HRESULT test(); + } + + [ + odl, uuid(a1f8cae3-c947-4c5f-b57d-c87b9b5f3586), oleautomation, dual

1 0

Christian Costa : d3dx9_36: Add support for D3DFMT_P8 and conversion to other ARGB formats + tests.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: edb01d2662748125b7ef7d9a1dc21419e33cad20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb01d2662748125b7ef7d9a1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:32:18 2013 +0200 d3dx9_36: Add support for D3DFMT_P8 and conversion to other ARGB formats + tests. --- dlls/d3dx9_36/d3dx9_36_private.h | 7 ++-- dlls/d3dx9_36/surface.c | 68 +++++++++++++++++++++++++++++++------ dlls/d3dx9_36/tests/surface.c | 36 +++++++++++++++++--- dlls/d3dx9_36/util.c | 14 +++++++- dlls/d3dx9_36/volume.c | 10 ++++-- 5 files changed, 110 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edb01d2662748125b7ef7…

1 0

Roderick Colenbrander : winex11: Store opengl swap interval with gl_drawable.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: 1f47580e9ccc9c22435d3933528d89cceb17858b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f47580e9ccc9c22435d39335… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat May 11 17:55:18 2013 -0700 winex11: Store opengl swap interval with gl_drawable. --- dlls/opengl32/tests/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 42 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 066b026..3aa2c40 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1581,7 +1581,7 @@ static void test_swap_control(HDC oldhdc) * is not global or shared among contexts. */ interval = pwglGetSwapIntervalEXT(); - todo_wine ok(interval == 1, "Expected swap interval 1, got %d\n", interval); + ok(interval == 1, "Expected swap interval 1, got %d\n", interval); ret = wglDeleteContext(ctx1); ok(ret, "Failed to delete GL context, last error %#x.\n", GetLastError()); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c617245..05b8f60 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -251,6 +251,7 @@ struct gl_drawable const struct wgl_pixel_format *format; /* pixel format for the drawable */ XVisualInfo *visual; /* information about the GL visual */ RECT rect; /* drawable rect, relative to whole window drawable */ + int swap_interval; }; /* X context to associate a struct gl_drawable to an hwnd */ @@ -271,7 +272,6 @@ static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; static int use_render_texture_emulation = 1; static BOOL has_swap_control; -static int swap_interval = 1; static CRITICAL_SECTION context_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1223,6 +1223,10 @@ static void free_gl_drawable( struct gl_drawable *gl ) static BOOL create_gl_drawable( HWND hwnd, HWND parent, struct gl_drawable *gl ) { gl->drawable = 0; + /* Default GLX and WGL swap interval is 1, but in case of glXSwapIntervalSGI + * there is no way to query it, so we have to store it here. + */ + gl->swap_interval = 1; if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ { @@ -2866,9 +2870,24 @@ static const GLubyte *X11DRV_wglGetExtensionsStringEXT(void) */ static int X11DRV_wglGetSwapIntervalEXT(void) { - /* GLX_SGI_swap_control doesn't have any provisions for getting the swap - * interval, so the swap interval has to be tracked. */ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + struct gl_drawable *gl; + int swap_interval; + TRACE("()\n"); + + if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) + { + /* This can't happen because a current WGL context is required to get + * here. Likely the application is buggy. + */ + WARN("No GL drawable found, returning swap interval 0\n"); + return 0; + } + + swap_interval = gl->swap_interval; + release_gl_drawable(gl); + return swap_interval; } @@ -2879,6 +2898,8 @@ static int X11DRV_wglGetSwapIntervalEXT(void) */ static BOOL X11DRV_wglSwapIntervalEXT(int interval) { + struct wgl_context *ctx = NtCurrentTeb()->glContext; + struct gl_drawable *gl; BOOL ret = TRUE; TRACE("(%d)\n", interval); @@ -2888,13 +2909,20 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) SetLastError(ERROR_INVALID_DATA); return FALSE; } - else if (!has_swap_control && interval == 0) + + if (!(gl = get_gl_drawable( WindowFromDC( ctx->hdc ), ctx->hdc ))) + { + SetLastError(ERROR_DC_NOT_FOUND); + return FALSE; + } + + if (!has_swap_control && interval == 0) { /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a * value to be an error. Just silently ignore the request for now. */ WARN("Request to disable vertical sync is not handled\n"); - swap_interval = 0; + gl->swap_interval = 0; } else { @@ -2904,11 +2932,13 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) WARN("GLX_SGI_swap_control extension is not available\n"); if (ret) - swap_interval = interval; + gl->swap_interval = interval; else SetLastError(ERROR_DC_NOT_FOUND); } + release_gl_drawable(gl); + return ret; }

1 0

Alexandre Julliard : ntdll: Make the entire relay entry point routine CPU-specific.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: f4e58868d499489d6c6e560fed85231eaa36263c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e58868d499489d6c6e560fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 11:45:39 2013 +0200 ntdll: Make the entire relay entry point routine CPU-specific. --- dlls/ntdll/relay.c | 291 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 166 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e58868d499489d6c6e5…

1 0

Alexandre Julliard : ntdll: Reimplement the i386 relay entry point in assembler.
by Alexandre Julliard 23 May '13

23 May '13

Module: wine Branch: master Commit: fb75238f7e3bc5611912ed7103d39f5a3c65d11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb75238f7e3bc5611912ed710… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 13:16:23 2013 +0200 ntdll: Reimplement the i386 relay entry point in assembler. --- dlls/ntdll/relay.c | 67 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index f677082..6736d0f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -416,15 +416,64 @@ __ASM_GLOBAL_FUNC( call_entry_point, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" ) -static LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ) -{ - BYTE nb_args = LOBYTE(HIWORD(idx)); - BYTE flags = HIBYTE(HIWORD(idx)); - void *func = relay_trace_entry( descr, idx, stack ); - LONGLONG ret = call_entry_point( func, nb_args, stack + 1, flags ); - relay_trace_exit( descr, idx, stack, ret ); - return ret; -} +extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx, const INT_PTR *stack ); +__ASM_GLOBAL_FUNC( relay_call, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "pushl %ecx\n\t" + __ASM_CFI(".cfi_rel_offset %ecx,-12\n\t") + /* trace the parameters */ + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("relay_trace_entry") "\n\t" + /* copy the arguments*/ + "movzbl 14(%ebp),%ecx\n\t" /* number of args */ + "jecxz 1f\n\t" + "leal 0(,%ecx,4),%edx\n\t" + "subl %edx,%esp\n\t" + "andl $~15,%esp\n\t" + "movl 16(%ebp),%esi\n\t" + "addl $4,%esi\n\t" + "movl %esp,%edi\n\t" + "cld\n\t" + "rep; movsl\n\t" + "testb $2,15(%ebp)\n\t" /* (flags & 2) -> thiscall */ + "jz 1f\n\t" + "popl %ecx\n" + /* call the entry point */ + "1:\tcall *%eax\n\t" + "movl %eax,%esi\n\t" + "movl %edx,%edi\n\t" + /* trace the return value */ + "leal -20(%ebp),%esp\n\t" + "pushl %edx\n\t" + "pushl %eax\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("relay_trace_exit") "\n\t" + /* restore return value and return */ + "leal -12(%ebp),%esp\n\t" + "movl %esi,%eax\n\t" + "movl %edi,%edx\n\t" + "popl %ecx\n\t" + __ASM_CFI(".cfi_same_value %ecx\n\t") + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $12" ) void WINAPI __regs_relay_call_regs( struct relay_descr *descr, unsigned int idx, unsigned int orig_eax, unsigned int ret_addr,

1 0