wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]LinearAttenuation.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: b04eceed4512da8a07410f2b54f5b267f8772ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04eceed4512da8a07410f2b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 13:38:09 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]LinearAttenuation. --- dlls/d3drm/light.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 750bb5f..e8303ff 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -36,6 +36,7 @@ typedef struct { D3DCOLOR color; D3DVALUE range; D3DVALUE cattenuation; + D3DVALUE lattenuation; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -256,9 +257,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetLinearAttenuation(IDirect3DRMLight { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, lattenuation); + TRACE("(%p/%p)->(%f)\n", iface, This, lattenuation); - return E_NOTIMPL; + This->lattenuation = lattenuation; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetQuadraticAttenuation(IDirect3DRMLight* iface, @@ -311,9 +314,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetLinearAttenuation(IDirect3DRMLigh { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->lattenuation; } static D3DVALUE WINAPI IDirect3DRMLightImpl_GetQuadraticAttenuation(IDirect3DRMLight* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]ConstantAttenuation.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 2f5608877d524e84b6b00d22054432919b5790a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5608877d524e84b6b00d220… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 7 13:36:20 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]ConstantAttenuation. --- dlls/d3drm/light.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 12c8623..750bb5f 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -35,6 +35,7 @@ typedef struct { D3DRMLIGHTTYPE type; D3DCOLOR color; D3DVALUE range; + D3DVALUE cattenuation; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -243,9 +244,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetConstantAttenuation(IDirect3DRMLig { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, cattenuation); + TRACE("(%p/%p)->(%f)\n", iface, This, cattenuation); - return E_NOTIMPL; + This->cattenuation = cattenuation; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetLinearAttenuation(IDirect3DRMLight* iface, @@ -299,9 +302,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetConstantAttenuation(IDirect3DRMLi { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->cattenuation; } static D3DVALUE WINAPI IDirect3DRMLightImpl_GetLinearAttenuation(IDirect3DRMLight* iface)

1 0

Jacek Caban : wininet: Added more security flags and errors tests.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: f6fc1e3cac6289cbb87da7d059ca19ae97c811db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6fc1e3cac6289cbb87da7d05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:40:56 2012 +0200 wininet: Added more security flags and errors tests. --- dlls/wininet/tests/http.c | 68 ++++++++++++++++++++++++++++++++++++-------- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fbb7ab6..1d82537 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2937,12 +2937,12 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags) ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags); } -#define set_secflags(a,b) _set_secflags(__LINE__,a,b) -static void _set_secflags(unsigned line, HINTERNET req, DWORD flags) +#define set_secflags(a,b,c) _set_secflags(__LINE__,a,b,c) +static void _set_secflags(unsigned line, HINTERNET req, BOOL use_undoc, DWORD flags) { BOOL res; - res = InternetSetOptionW(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + res = InternetSetOptionW(req, use_undoc ? 99 : INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); ok_(__FILE__,line)(res, "InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError()); } @@ -2976,8 +2976,19 @@ static void test_security_flags(void) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); test_secflags_option(req, 0); - set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); - test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION); + + set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); + + set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + + set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); + test_secflags_option(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID); + + flags = SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_SECURE; + res = InternetSetOptionW(req, 99, &flags, sizeof(flags)); + ok(!res && GetLastError() == ERROR_INTERNET_OPTION_NOT_SETTABLE, "InternetSetOption(99) failed: %u\n", GetLastError()); SET_EXPECT(INTERNET_STATUS_RESOLVING_NAME); SET_EXPECT(INTERNET_STATUS_NAME_RESOLVED); @@ -3010,8 +3021,8 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); test_request_flags(req, 0); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA| - SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_STRENGTH_STRONG); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA + |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_CERT_CN_INVALID|SECURITY_FLAG_STRENGTH_STRONG); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -3070,8 +3081,37 @@ static void test_security_flags(void) test_request_flags(req, 8); test_secflags_option(req, 0x800000); - set_secflags(req, SECURITY_FLAG_IGNORE_UNKNOWN_CA); - test_secflags_option(req, 0x800000|SECURITY_FLAG_IGNORE_UNKNOWN_CA); + set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_REVOCATION); + test_secflags_option(req, 0x800000|SECURITY_FLAG_IGNORE_REVOCATION); + + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + + res = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); + + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); + + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + + test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); + + set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); + test_secflags_option(req, 0x1800000|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA + |SECURITY_FLAG_IGNORE_REVOCATION); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -3101,8 +3141,8 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); test_request_flags(req, 0); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA - |SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION + |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); test_cert_struct(req); @@ -3136,7 +3176,8 @@ static void test_security_flags(void) ok(req != NULL, "HttpOpenRequest failed\n"); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG + |SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -3164,7 +3205,8 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); test_request_flags(req, 0); - test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG|0x800000); + test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG + |SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError());

1 0

Jacek Caban : wininet: Added support for ERROR_INTERNET_SEC_CERT_REV_FAILED in InternetErrorDlg.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 448f2452c4df01cf75bacd1c0f986aa326458eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=448f2452c4df01cf75bacd1c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:41:35 2012 +0200 wininet: Added support for ERROR_INTERNET_SEC_CERT_REV_FAILED in InternetErrorDlg. --- dlls/wininet/dialogs.c | 4 ++++ dlls/wininet/tests/internet.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 66a666b..a032ebb 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -539,6 +539,9 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( case ERROR_INTERNET_SEC_CERT_CN_INVALID: flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; break; + case ERROR_INTERNET_SEC_CERT_REV_FAILED: + flags |= SECURITY_FLAG_IGNORE_REVOCATION; + break; case ERROR_INTERNET_SEC_CERT_ERRORS: if(flags & _SECURITY_FLAG_CERT_REV_FAILED) flags |= SECURITY_FLAG_IGNORE_REVOCATION; @@ -655,6 +658,7 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: + case ERROR_INTERNET_SEC_CERT_REV_FAILED: if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { res = ERROR_CANCELLED; break; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 57fc7c4..f2ea04f 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1256,7 +1256,7 @@ static void test_InternetErrorDlg(void) { ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR, ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_INSERT_CDROM , ERROR_CANCELLED, FLAG_TODO|FLAG_NEEDREQ|FLAG_UNIMPL }, { ERROR_INTERNET_SEC_CERT_ERRORS , ERROR_CANCELLED, 0 }, - { ERROR_INTERNET_SEC_CERT_REV_FAILED , ERROR_CANCELLED, FLAG_TODO }, + { ERROR_INTERNET_SEC_CERT_REV_FAILED , ERROR_CANCELLED, 0 }, { ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION , ERROR_HTTP_COOKIE_DECLINED, FLAG_TODO }, { ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT , ERROR_CANCELLED, FLAG_TODO }, { ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT, ERROR_CANCELLED, FLAG_TODO },

1 0

Jacek Caban : wininet: Set SECURITY_FLAG_SECURE when error dialog ignores invalid certificate.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 964e538ba9f466648e4939dd9d1d28ce725db2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=964e538ba9f466648e4939dd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:41:22 2012 +0200 wininet: Set SECURITY_FLAG_SECURE when error dialog ignores invalid certificate. --- dlls/wininet/dialogs.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index bd80ea3..66a666b 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -550,9 +550,11 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; break; } - res = InternetSetOptionW( params->req->hdr.hInternet, INTERNET_OPTION_SECURITY_FLAGS, &flags, size ); - if(!res) - WARN("InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS) failed.\n"); + /* FIXME: Use helper function */ + flags |= SECURITY_FLAG_SECURE; + req->security_flags |= flags; + if(req->netconn) + req->netconn->security_flags |= flags; } EndDialog( hdlg, res ? ERROR_SUCCESS : ERROR_NOT_SUPPORTED );

1 0

Jacek Caban : wininet: Store request object instead of handle in error dialog.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: b5fec3c03380c066d36531d963a8d54596fb241d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5fec3c03380c066d36531d96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:41:08 2012 +0200 wininet: Store request object instead of handle in error dialog. --- dlls/wininet/dialogs.c | 83 +++++++++++++++++++++++++++-------------- dlls/wininet/tests/internet.c | 4 +- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 7bcfb15..bd80ea3 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -50,8 +50,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); struct WININET_ErrorDlgParams { + http_request_t *req; HWND hWnd; - HINTERNET hRequest; DWORD dwError; DWORD dwFlags; LPVOID* lppvData; @@ -317,7 +317,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam ); /* extract the Realm from the proxy response and show it */ - if( WININET_GetAuthRealm( params->hRequest, + if( WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); @@ -325,7 +325,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( } /* extract the name of the proxy server */ - if( WININET_GetProxyServer( params->hRequest, + if( WININET_GetProxyServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { hitem = GetDlgItem( hdlg, IDC_PROXY ); @@ -360,14 +360,14 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && - WININET_GetAuthRealm( params->hRequest, + WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), TRUE ) && - WININET_GetProxyServer( params->hRequest, + WININET_GetProxyServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } - WININET_SetAuthorization( params->hRequest, username, password, TRUE ); + WININET_SetAuthorization( params->req->hdr.hInternet, username, password, TRUE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -401,7 +401,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( SetWindowLongPtrW( hdlg, GWLP_USERDATA, lParam ); /* extract the Realm from the response and show it */ - if( WININET_GetAuthRealm( params->hRequest, + if( WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) ) { hitem = GetDlgItem( hdlg, IDC_REALM ); @@ -409,7 +409,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( } /* extract the name of the server */ - if( WININET_GetServer( params->hRequest, + if( WININET_GetServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { hitem = GetDlgItem( hdlg, IDC_SERVER ); @@ -444,14 +444,14 @@ static INT_PTR WINAPI WININET_PasswordDialog( hitem = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); if( hitem && SendMessageW( hitem, BM_GETSTATE, 0, 0 ) && - WININET_GetAuthRealm( params->hRequest, + WININET_GetAuthRealm( params->req->hdr.hInternet, szRealm, sizeof szRealm/sizeof(WCHAR), FALSE ) && - WININET_GetServer( params->hRequest, + WININET_GetServer( params->req->hdr.hInternet, szServer, sizeof szServer/sizeof(WCHAR)) ) { WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } - WININET_SetAuthorization( params->hRequest, username, password, FALSE ); + WININET_SetAuthorization( params->req->hdr.hInternet, username, password, FALSE ); EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; @@ -524,9 +524,10 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( if( params->dwFlags & FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) { + http_request_t *req = params->req; DWORD flags, size = sizeof(flags); - InternetQueryOptionW( params->hRequest, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size ); + InternetQueryOptionW( req->hdr.hInternet, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size ); switch( params->dwError ) { case ERROR_INTERNET_INVALID_CA: @@ -549,7 +550,7 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; break; } - res = InternetSetOptionW( params->hRequest, INTERNET_OPTION_SECURITY_FLAGS, &flags, size ); + res = InternetSetOptionW( params->req->hdr.hInternet, INTERNET_OPTION_SECURITY_FLAGS, &flags, size ); if(!res) WARN("InternetSetOption(INTERNET_OPTION_SECURITY_FLAGS) failed.\n"); } @@ -592,7 +593,6 @@ static INT WININET_GetConnectionStatus( HINTERNET hRequest ) return dwStatus; } - /*********************************************************************** * InternetErrorDlg */ @@ -600,15 +600,24 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, DWORD dwError, DWORD dwFlags, LPVOID* lppvData) { struct WININET_ErrorDlgParams params; - INT dwStatus; + http_request_t *req = NULL; + DWORD res = ERROR_SUCCESS; TRACE("%p %p %d %08x %p\n", hWnd, hRequest, dwError, dwFlags, lppvData); if( !hWnd && !(dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI) ) return ERROR_INVALID_HANDLE; + if(hRequest) { + req = (http_request_t*)get_handle_object(hRequest); + if(!req) + return ERROR_INVALID_HANDLE; + if(req->hdr.htype != WH_HHTTPREQ) + return ERROR_SUCCESS; /* Yes, that was tested */ + } + + params.req = req; params.hWnd = hWnd; - params.hRequest = hRequest; params.dwError = dwError; params.dwFlags = dwFlags; params.lppvData = lppvData; @@ -616,40 +625,58 @@ DWORD WINAPI InternetErrorDlg(HWND hWnd, HINTERNET hRequest, switch( dwError ) { case ERROR_SUCCESS: - case ERROR_INTERNET_INCORRECT_PASSWORD: + case ERROR_INTERNET_INCORRECT_PASSWORD: { + DWORD dwStatus; + if( !dwError && !(dwFlags & FLAGS_ERROR_UI_FILTER_FOR_ERRORS ) ) - return 0; + break; + if(!req) + return ERROR_INVALID_HANDLE; dwStatus = WININET_GetConnectionStatus( hRequest ); switch (dwStatus) { case HTTP_STATUS_PROXY_AUTH_REQ: - return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), - hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_PROXYDLG ), + hWnd, WININET_ProxyPasswordDialog, (LPARAM) &params ); + break; case HTTP_STATUS_DENIED: - return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), + res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_AUTHDLG ), hWnd, WININET_PasswordDialog, (LPARAM) &params ); + break; default: WARN("unhandled status %u\n", dwStatus); - return 0; } + break; + } case ERROR_INTERNET_SEC_CERT_ERRORS: case ERROR_INTERNET_SEC_CERT_CN_INVALID: case ERROR_INTERNET_SEC_CERT_DATE_INVALID: case ERROR_INTERNET_INVALID_CA: - if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) - return ERROR_CANCELLED; + if( dwFlags & FLAGS_ERROR_UI_FLAGS_NO_UI ) { + res = ERROR_CANCELLED; + break; + } + if(!req) + return ERROR_INVALID_HANDLE; + if( dwFlags & ~FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS ) FIXME("%08x contains unsupported flags.\n", dwFlags); - return DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), - hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); + res = DialogBoxParamW( WININET_hModule, MAKEINTRESOURCEW( IDD_INVCERTDLG ), + hWnd, WININET_InvalidCertificateDialog, (LPARAM) &params ); + break; case ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR: case ERROR_INTERNET_POST_IS_NON_SECURE: FIXME("Need to display dialog for error %d\n", dwError); - return ERROR_SUCCESS; + res = ERROR_SUCCESS; + break; + default: + res = ERROR_NOT_SUPPORTED; } - return ERROR_NOT_SUPPORTED; + if(req) + WININET_Release(&req->hdr); + return res; } diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 3567cc8..57fc7c4 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1303,11 +1303,11 @@ static void test_InternetErrorDlg(void) res = InternetErrorDlg(hwnd, (HANDLE)0xdeadbeef, i, flags, NULL); if(res == ERROR_CALL_NOT_IMPLEMENTED) { - todo_wine ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); + ok(test_flags & FLAG_UNIMPL, "%i is unexpectedly unimplemented.\n", i); continue; } else - todo_wine ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); + ok(res == ERROR_INVALID_HANDLE, "Got %d (%d)\n", res, i); /* With a valid req */ if(i == ERROR_INTERNET_NEED_UI)

1 0

Jacek Caban : wininet: Added support for undocumented InternetSetOption(99) call.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: d8b5f468ab4351845ff527ed04b84e9b687d482d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8b5f468ab4351845ff527ed0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:40:45 2012 +0200 wininet: Added support for undocumented InternetSetOption(99) call. --- dlls/wininet/http.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e263d8a..620fcf7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2190,6 +2190,15 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, http_request_t *req = (http_request_t*)hdr; switch(option) { + case 99: /* Undocumented, seems to be INTERNET_OPTION_SECURITY_FLAGS with argument validation */ + TRACE("Undocumented option 99\n"); + + if (!buffer || size != sizeof(DWORD)) + return ERROR_INVALID_PARAMETER; + if(*(DWORD*)buffer & ~SECURITY_SET_MASK) + return ERROR_INTERNET_OPTION_NOT_SETTABLE; + + /* fall through */ case INTERNET_OPTION_SECURITY_FLAGS: { DWORD flags;

1 0

Jacek Caban : wininet: Improved handling ERROR_INTERNET_INVALID_CA error.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: c3eec8dc57de430c3d6ca46a15f0ead2553505b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3eec8dc57de430c3d6ca46a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 7 15:40:31 2012 +0200 wininet: Improved handling ERROR_INTERNET_INVALID_CA error. --- dlls/wininet/dialogs.c | 2 ++ dlls/wininet/internet.h | 2 ++ dlls/wininet/netconnection.c | 17 +++++++++++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 68c668e..7bcfb15 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -540,6 +540,8 @@ static INT_PTR WINAPI WININET_InvalidCertificateDialog( break; case ERROR_INTERNET_SEC_CERT_ERRORS: if(flags & _SECURITY_FLAG_CERT_REV_FAILED) + flags |= SECURITY_FLAG_IGNORE_REVOCATION; + if(flags & _SECURITY_FLAG_CERT_INVALID_CA) flags |= SECURITY_FLAG_IGNORE_UNKNOWN_CA; if(flags & _SECURITY_FLAG_CERT_INVALID_CN) flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index a46e185..a25be32 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -560,11 +560,13 @@ typedef struct /* Undocumented security flags */ #define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 +#define _SECURITY_FLAG_CERT_INVALID_CA 0x01000000 #define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 #define _SECURITY_FLAG_CERT_INVALID_DATE 0x04000000 #define _SECURITY_ERROR_FLAGS_MASK \ (_SECURITY_FLAG_CERT_REV_FAILED \ + |_SECURITY_FLAG_CERT_INVALID_CA \ |_SECURITY_FLAG_CERT_INVALID_CN \ |_SECURITY_FLAG_CERT_INVALID_DATE) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 00c3513..47b8453 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -272,12 +272,21 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; } + /* This seems strange, but that's what tests show */ if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { WARN("CERT_TRUST_IS_PARTIAL_CHAIN\n"); - if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; - if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) { + if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + else + err = conn->mask_errors ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + } + if(conn->mask_errors) { + if(!(conn->security_flags & _SECURITY_FLAG_CERT_REV_FAILED)) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + else + conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + } errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; }

1 0

Piotr Caban : msvcp90: Added codecvt<char> implementation.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 2baabaefe8e21767d1b691143fb654cd75874c40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2baabaefe8e21767d1b691143… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 7 12:54:00 2012 +0200 msvcp90: Added codecvt<char> implementation. --- dlls/msvcp90/locale.c | 217 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 60 ++++++------ 2 files changed, 247 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2baabaefe8e21767d1b69…

1 0

Piotr Caban : msvcp90: Added codecvt_base class implementation.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 679b0d4843180692582b8427d0c382948435d03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=679b0d4843180692582b8427d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 7 12:53:38 2012 +0200 msvcp90: Added codecvt_base class implementation. --- dlls/msvcp90/locale.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 38 +++++++------- 2 files changed, 139 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=679b0d4843180692582b8…

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
83
Older →

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 June 2012