wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

Jacek Caban : mshtml: Use debugstr_mshtml_guid in htmlhead.c.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: ac2b2e5e58ee341a0ba93cc1b5f7535b5f016605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2b2e5e58ee341a0ba93cc1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:45:36 2014 +0200 mshtml: Use debugstr_mshtml_guid in htmlhead.c. --- dlls/mshtml/htmlhead.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index a6a2a73..11bba8d 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -134,12 +134,12 @@ static HRESULT HTMLTitleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLTitleElement *This = HTMLTitleElement_from_HTMLDOMNode(iface); - if(IsEqualGUID(&IID_IHTMLTitleElement, riid)) { - TRACE("(%p)->(IID_IHTMLTitleElement %p)\n", This, ppv); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IHTMLTitleElement, riid)) *ppv = &This->IHTMLTitleElement_iface; - }else { + else return HTMLElement_QI(&This->element.node, riid, ppv); - } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -294,12 +294,12 @@ static HRESULT HTMLHeadElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLHeadElement *This = impl_from_HTMLDOMNode(iface); - if(IsEqualGUID(&IID_IHTMLHeadElement, riid)) { - TRACE("(%p)->(IID_IHTMLHeadElement %p)\n", This, ppv); + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IHTMLHeadElement, riid)) *ppv = &This->IHTMLHeadElement_iface; - }else { + else return HTMLElement_QI(&This->element.node, riid, ppv); - } IUnknown_AddRef((IUnknown*)*ppv); return S_OK;

1 0

Jacek Caban : mshtml: Use TID_LIST in debugstr_mshtml_guid.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 8b0e62c42b50719c4883bc23cff2558cf3831986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0e62c42b50719c4883bc23c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:45:31 2014 +0200 mshtml: Use TID_LIST in debugstr_mshtml_guid. --- dlls/mshtml/main.c | 50 +++++--------------------------------------------- 1 file changed, 5 insertions(+), 45 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 8e11ce9..ce9222f 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -504,7 +504,6 @@ HRESULT WINAPI DllUnregisterServer(void) const char *debugstr_mshtml_guid(const GUID *iid) { #define X(x) if(IsEqualGUID(iid, &x)) return #x - X(DIID_DispHTMLDocument); X(DIID_HTMLDocumentEvents); X(DIID_HTMLDocumentEvents2); X(DIID_HTMLTableEvents); @@ -517,54 +516,10 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IEnumConnections); X(IID_IEnumVARIANT); X(IID_IHlinkTarget); - X(IID_IHTMLAttributeCollection); - X(IID_IHTMLAttributeCollection2); - X(IID_IHTMLAttributeCollection3); - X(IID_IHTMLCurrentStyle); - X(IID_IHTMLCurrentStyle2); - X(IID_IHTMLCurrentStyle3); - X(IID_IHTMLCurrentStyle4); - X(IID_IHTMLDocument); - X(IID_IHTMLDocument2); - X(IID_IHTMLDocument3); - X(IID_IHTMLDocument4); - X(IID_IHTMLDocument5); X(IID_IHTMLDocument6); X(IID_IHTMLDocument7); - X(IID_IHTMLDOMAttribute); - X(IID_IHTMLDOMChildrenCollection); - X(IID_IHTMLDOMImplementation); - X(IID_IHTMLDOMNode); - X(IID_IHTMLDOMNode2); - X(IID_IHTMLElement); - X(IID_IHTMLElement2); - X(IID_IHTMLElement3); - X(IID_IHTMLElement4); - X(IID_IHTMLElementCollection); - X(IID_IHTMLEventObj); - X(IID_IHTMLFiltersCollection); X(IID_IHTMLFramesCollection2); - X(IID_IHTMLImageElementFactory); - X(IID_IHTMLLocation); - X(IID_IHTMLOptionElementFactory); X(IID_IHTMLPrivateWindow); - X(IID_IHTMLRect); - X(IID_IHTMLScreen); - X(IID_IHTMLStorage); - X(IID_IHTMLStyle); - X(IID_IHTMLStyle2); - X(IID_IHTMLStyle3); - X(IID_IHTMLStyle4); - X(IID_IHTMLStyle5); - X(IID_IHTMLStyle6); - X(IID_IHTMLStyleSheet); - X(IID_IHTMLStyleSheetRulesCollection); - X(IID_IHTMLStyleSheetsCollection); - X(IID_IHTMLWindow2); - X(IID_IHTMLWindow3); - X(IID_IHTMLWindow4); - X(IID_IHTMLWindow5); - X(IID_IHTMLWindow6); X(IID_IHtmlLoadOptions); X(IID_IInternetHostSecurityManager); X(IID_IMonikerProp); @@ -601,6 +556,11 @@ const char *debugstr_mshtml_guid(const GUID *iid) X(IID_IViewObjectEx); X(IID_nsCycleCollectionISupports); X(IID_nsXPCOMCycleCollectionParticipant); +#define XIID(x) X(IID_##x); +#define XDIID(x) X(DIID_##x); + TID_LIST +#undef XIID +#undef XDIID #undef X return debugstr_guid(iid);

1 0

Piotr Caban : msvcp90: Fix complex::operator*= implementation.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: f370017e6f2179e5a3bdae0b9ef7f25afa9deaab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f370017e6f2179e5a3bdae0b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 2 11:38:45 2014 +0200 msvcp90: Fix complex::operator*= implementation. --- dlls/msvcp90/math.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 6c20b2c..ec0b4f8 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1162,10 +1162,11 @@ complex_float* __thiscall complex_float_mult_assign_float(complex_float *this, c DEFINE_THISCALL_WRAPPER(complex_float_mult_assign, 8) complex_float* __thiscall complex_float_mult_assign(complex_float *this, const complex_float *r) { - complex_float tmp = *this; + complex_float tmp; - this->real = tmp.real*r->real - tmp.imag*r->imag; - this->imag = tmp.real*r->imag + tmp.imag*r->real; + tmp.real = this->real*r->real - this->imag*r->imag; + tmp.imag = this->real*r->imag + this->imag*r->real; + *this = tmp; return this; } @@ -1819,10 +1820,11 @@ complex_double* __thiscall complex_double_mult_assign_double(complex_double *thi DEFINE_THISCALL_WRAPPER(complex_double_mult_assign, 8) complex_double* __thiscall complex_double_mult_assign(complex_double *this, const complex_double *r) { - complex_double tmp = *this; + complex_double tmp; - this->real = tmp.real*r->real - tmp.imag*r->imag; - this->imag = tmp.real*r->imag + tmp.imag*r->real; + tmp.real = this->real*r->real - this->imag*r->imag; + tmp.imag = this->real*r->imag + this->imag*r->real; + *this = tmp; return this; }

1 0

Jacek Caban : mshtml: Fixed session_storage leak.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 6b18f619f49b02b8de0afe94aab56754029dbabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b18f619f49b02b8de0afe94a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 2 11:34:53 2014 +0200 mshtml: Fixed session_storage leak. --- dlls/mshtml/htmlwindow.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bc648f3..6c6c328 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -264,6 +264,9 @@ static void release_inner_window(HTMLInnerWindow *This) IOmHistory_Release(&This->history->IOmHistory_iface); } + if(This->session_storage) + IHTMLStorage_Release(This->session_storage); + if(This->mon) IMoniker_Release(This->mon);

1 0

Austin English : advapi32: Add stub for CloseEncryptedFileRaw.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: d5ef271ecec7dfe974a95feff1847489e93b9f9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ef271ecec7dfe974a95feff… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:18:59 2014 -0500 advapi32: Add stub for CloseEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d1ab64d..f1cae1f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -84,7 +84,7 @@ @ stdcall ClearEventLogA (long str) @ stdcall ClearEventLogW (long wstr) # @ stub CloseCodeAuthzLevel -# @ stub CloseEncryptedFileRaw +@ stdcall CloseEncryptedFileRaw(ptr) @ stdcall CloseEventLog (long) @ stdcall CloseServiceHandle(long) # @ stub CloseThreadWaitChainSession diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f74dee4..b2be5e3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -319,6 +319,23 @@ static void CRYPT_CreateMachineGuid(void) } } + +/****************************************************************************** + * CloseEncryptedFileRaw (ADVAPI32.@) + * + * Close encrypted files + * + * PARAMS + * context [I] pointer to the context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +void WINAPI CloseEncryptedFileRaw(PVOID context) +{ + FIXME("(%p): stub\n", context); +} + /****************************************************************************** * CryptAcquireContextW (ADVAPI32.@) *

1 0

Austin English : advapi32: Add stub for WriteEncryptedFileRaw.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: a98496a09a97a554a18c7f29fc63f0052537fd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a98496a09a97a554a18c7f29f… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:15:10 2014 -0500 advapi32: Add stub for WriteEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e61e983..d1ab64d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -825,4 +825,4 @@ # @ stub WmiSetSingleItemA # @ stub WmiSetSingleItemW # @ stub Wow64Win32ApiEntry -# @ stub WriteEncryptedFileRaw +@ stdcall WriteEncryptedFileRaw(ptr ptr ptr) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index f369ae3..f74dee4 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2434,3 +2434,22 @@ NTSTATUS WINAPI SystemFunction041(PVOID memory, ULONG length, ULONG flags) FIXME("(%p, %x, %x): stub [RtlDecryptMemory]\n", memory, length, flags); return STATUS_SUCCESS; } + +/****************************************************************************** + * WriteEncryptedFileRaw (ADVAPI32.@) + * + * Import encrypted files + * + * PARAMS + * import [I] pointer to the import callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI WriteEncryptedFileRaw(PFE_IMPORT_FUNC import, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", import, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Austin English : advapi32: Add stub for ReadEncryptedFileRaw.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 8ca36632e98c1e96c2df5189973ccc93d97bc280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca36632e98c1e96c2df51899… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:12:59 2014 -0500 advapi32: Add stub for ReadEncryptedFileRaw. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/crypt.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 57d2c65..e61e983 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -566,7 +566,7 @@ @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUsersOnEncryptedFile @ stdcall QueryWindows31FilesMigration(long) -# @ stub ReadEncryptedFileRaw +@ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA (long long long ptr long ptr ptr) @ stdcall ReadEventLogW (long long long ptr long ptr ptr) @ stdcall RegCloseKey(long) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index b41965d..f369ae3 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2290,6 +2290,25 @@ DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR filename, ULONG flags, PVOID *context } /****************************************************************************** + * ReadEncryptedFileRaw (ADVAPI32.@) + * + * Export encrypted files + * + * PARAMS + * export [I] pointer to the export callback function + * callback [I] pointer to the application defined context + * context [I] pointer to the system context + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI ReadEncryptedFileRaw(PFE_EXPORT_FUNC export, PVOID callback, PVOID context) +{ + FIXME("(%p, %p, %p): stub\n", export, callback, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * SystemFunction030 (ADVAPI32.@) * * Tests if two blocks of 16 bytes are equal

1 0

Austin English : advapi32: Add stub for OpenEncryptedFileRawA/W.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: 27f00d4f68b4fc19015c626b5ecb3771ef7fa7b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f00d4f68b4fc19015c626b5… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Aug 29 18:03:08 2014 -0500 advapi32: Add stub for OpenEncryptedFileRawA/W. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/crypt.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index b4bf440..57d2c65 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -507,8 +507,8 @@ @ stdcall ObjectPrivilegeAuditAlarmW(wstr ptr long long ptr long) @ stdcall OpenBackupEventLogA (str str) @ stdcall OpenBackupEventLogW (wstr wstr) -# @ stub OpenEncryptedFileRawA -# @ stub OpenEncryptedFileRawW +@ stdcall OpenEncryptedFileRawA(str long ptr) +@ stdcall OpenEncryptedFileRawW(wstr long ptr) @ stdcall OpenEventLogA (str str) @ stdcall OpenEventLogW (wstr wstr) @ stdcall OpenProcessToken(long long ptr) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 2c5e411..b41965d 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -2260,6 +2260,36 @@ BOOL WINAPI CryptVerifySignatureA (HCRYPTHASH hHash, const BYTE *pbSignature, DW } /****************************************************************************** + * OpenEncryptedFileRawA (ADVAPI32.@) + * + * See OpenEncryptedFileRawW + */ +DWORD WINAPI OpenEncryptedFileRawA(LPCSTR filename, ULONG flags, PVOID *context) +{ + FIXME("(%s, %x, %p): stub\n", debugstr_a(filename), flags, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * OpenEncryptedFileRawW (ADVAPI32.@) + * + * Opens an EFS encrypted file for backup/restore + * + * PARAMS + * filename [I] Filename to operate on + * flags [I] Operation to perform + * context [I] Handle to the context (out) + * RETURNS + * Success: ERROR_SUCCESS + * Failure: NTSTATUS error code + */ +DWORD WINAPI OpenEncryptedFileRawW(LPCWSTR filename, ULONG flags, PVOID *context) +{ + FIXME("(%s, %x, %p): stub\n", debugstr_w(filename), flags, context); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * SystemFunction030 (ADVAPI32.@) * * Tests if two blocks of 16 bytes are equal

1 0

Hans Leidekker : winhttp/tests: Avoid test failures caused by connection errors.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: e52bbd581d4414d3e08169d6660ef29a0377c92d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e52bbd581d4414d3e08169d66… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 1 14:48:49 2014 +0200 winhttp/tests: Avoid test failures caused by connection errors. --- dlls/winhttp/tests/winhttp.c | 47 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 0d8f8be..51fcc86 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -265,8 +265,14 @@ static void test_empty_headers_param(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, empty, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); + done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -315,6 +321,11 @@ static void test_SendRequest (void) context++; ret = WinHttpSendRequest(request, content_type, header_len, post_data, optional_len, total_len, context); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); context = 0; @@ -346,9 +357,9 @@ static void test_SendRequest (void) ok(bytes_rw == sizeof(test_post) - 1, "Read %u bytes\n", bytes_rw); ok(!memcmp(buffer, test_post, sizeof(test_post) - 1), "Data read did not match.\n"); + done: ret = WinHttpCloseHandle(request); ok(ret == TRUE, "WinHttpCloseHandle failed on closing request, got %d.\n", ret); - done: ret = WinHttpCloseHandle(connection); ok(ret == TRUE, "WinHttpCloseHandle failed on closing connection, got %d.\n", ret); ret = WinHttpCloseHandle(session); @@ -845,18 +856,17 @@ static void test_secure_connection(void) WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - ok(ret, "failed to send request %u\n", GetLastError()); - if (!ret) + if (!ret && (GetLastError() == ERROR_WINHTTP_SECURE_FAILURE || GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; } + ok(ret, "failed to send request %u\n", GetLastError()); size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); - if (ret) - CertFreeCertificateContext(cert); + if (ret) CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size ); @@ -920,6 +930,11 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); @@ -936,6 +951,11 @@ static void test_request_parameter_defaults(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request %u\n", GetLastError()); ret = WinHttpReceiveResponse(req, NULL); @@ -959,6 +979,7 @@ static void test_request_parameter_defaults(void) ok(ret, "failed unexpectedly %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); +done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -1719,12 +1740,11 @@ static void test_resolve_timeout(void) SetLastError(0xdeadbeef); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); - if(ret == 1) + if (ret) { skip("nxdomain returned success. Broken ISP redirects?\n"); - return; + goto done; } - ok(!ret, "sent request\n"); ok(GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED, "expected ERROR_WINHTTP_NAME_NOT_RESOLVED got %u\n", GetLastError()); @@ -1749,8 +1769,14 @@ static void test_resolve_timeout(void) ok(req != NULL, "failed to open a request %u\n", GetLastError()); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok(ret, "failed to send request\n"); + done: WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -3071,6 +3097,11 @@ static void test_chunked_read(void) if (!req) goto done; ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + if (!ret && GetLastError() == ERROR_WINHTTP_CANNOT_CONNECT) + { + skip("connection failed, skipping\n"); + goto done; + } ok( ret, "WinHttpSendRequest failed with error %u\n", GetLastError() ); ret = WinHttpReceiveResponse( req, NULL );

1 0

Jacek Caban : atl: Added typelib.
by Alexandre Julliard 02 Sep '14

02 Sep '14

Module: wine Branch: master Commit: f900bb5cbcf0ab726b1326f0c8ac2abafb7a8ddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f900bb5cbcf0ab726b1326f0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 1 13:45:06 2014 +0200 atl: Added typelib. --- configure | 8 ++++---- configure.ac | 8 ++++---- dlls/atl/Makefile.in | 4 +++- dlls/atl/atl_lib.idl | 36 ++++++++++++++++++++++++++++++++++++ dlls/atl100/Makefile.in | 2 ++ dlls/atl110/Makefile.in | 2 ++ dlls/atl80/Makefile.in | 2 ++ dlls/atl90/Makefile.in | 2 ++ 8 files changed, 55 insertions(+), 9 deletions(-) diff --git a/configure b/configure index fe2cf48..35bdf9d 100755 --- a/configure +++ b/configure @@ -16792,12 +16792,12 @@ wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl clean,implib wine_fn_config_test dlls/atl/tests atl_test -wine_fn_config_dll atl100 enable_atl100 implib +wine_fn_config_dll atl100 enable_atl100 clean,implib wine_fn_config_test dlls/atl100/tests atl100_test -wine_fn_config_dll atl110 enable_atl110 -wine_fn_config_dll atl80 enable_atl80 implib +wine_fn_config_dll atl110 enable_atl110 clean +wine_fn_config_dll atl80 enable_atl80 clean,implib wine_fn_config_test dlls/atl80/tests atl80_test -wine_fn_config_dll atl90 enable_atl90 +wine_fn_config_dll atl90 enable_atl90 clean wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib wine_fn_config_dll avifil32 enable_avifil32 clean,implib,po diff --git a/configure.ac b/configure.ac index ba0c927..2f291e3 100644 --- a/configure.ac +++ b/configure.ac @@ -2702,12 +2702,12 @@ WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl/tests) -WINE_CONFIG_DLL(atl100,,[implib]) +WINE_CONFIG_DLL(atl100,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl100/tests) -WINE_CONFIG_DLL(atl110) -WINE_CONFIG_DLL(atl80,,[implib]) +WINE_CONFIG_DLL(atl110,,[clean]) +WINE_CONFIG_DLL(atl80,,[clean,implib]) WINE_CONFIG_TEST(dlls/atl80/tests) -WINE_CONFIG_DLL(atl90) +WINE_CONFIG_DLL(atl90,,[clean]) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) WINE_CONFIG_DLL(avifil32,,[clean,implib,po]) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 4f87b27..34ae9b8 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -9,4 +9,6 @@ C_SRCS = \ atl_ax.c \ registrar.c -IDL_SRCS = atl_classes.idl +IDL_SRCS = \ + atl_classes.idl \ + atl_lib.idl diff --git a/dlls/atl/atl_lib.idl b/dlls/atl/atl_lib.idl new file mode 100644 index 0000000..918416c --- /dev/null +++ b/dlls/atl/atl_lib.idl @@ -0,0 +1,36 @@ +/* + * Copyright 2014 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep regtypelib +#pragma makedep register + +import "atliface.idl"; + +[ + uuid(44ec0535-400f-11d0-9dcd-00a0c90391d3), + version(1.0), + helpstring("ATL 2.0 Type Library") +] +library ATLLib +{ + importlib("stdole2.tlb"); + + interface IDocHostUIHandlerDispatch; + interface IAxWinAmbientDispatch; + interface IAxWinAmbientDispatchEx; +} diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 35b37ac..916bd8e 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -8,3 +8,5 @@ C_SRCS = \ atl.c \ atl_ax.c \ registrar.c + +IDL_SRCS = atl_lib.idl diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index ed357f6..ced0f18 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -7,3 +7,5 @@ C_SRCS = \ atl.c \ atl_ax.c \ registrar.c + +IDL_SRCS = atl_lib.idl diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 2ada925..4b7bbd7 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -10,4 +10,6 @@ C_SRCS = \ atl_ax.c \ registrar.c +IDL_SRCS = atl_lib.idl + RC_SRCS = atl80.rc diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index a5082bc..5fed63b 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -8,4 +8,6 @@ C_SRCS = \ atl_ax.c \ registrar.c +IDL_SRCS = atl_lib.idl + RC_SRCS = atl90.rc

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 September 2014