June 2012 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : mscoree: Correct possible uninitialized variable ( clang).
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 85d49c5819fb4494d9f81c56c3504bef5732b726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d49c5819fb4494d9f81c56c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 31 18:56:53 2012 +1100 mscoree: Correct possible uninitialized variable (clang). --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index d5c94c1..0262757 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1239,7 +1239,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) WCHAR path[CHARS_IN_GUID + ARRAYSIZE(wszCLSIDSlash) + ARRAYSIZE(wszInprocServer32) - 1]; MonoDomain *domain; MonoAssembly *assembly; - ICLRRuntimeInfo *info; + ICLRRuntimeInfo *info = NULL; RuntimeHost *host; HRESULT hr; HKEY key;

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

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

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

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: 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: 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: 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

Matteo Bruni : d3dcompiler: Dump preprocessed shader sources.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: a8839cd1def1ed9fa08b6a84dd183b093d95deeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8839cd1def1ed9fa08b6a84d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:01 2012 +0200 d3dcompiler: Dump preprocessed shader sources. --- dlls/d3dcompiler_43/compiler.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 043d231..1eb07ce 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -500,6 +500,8 @@ static HRESULT compile_shader(const char *preproc_shader, const char *target, co ID3DBlob *buffer; char *pos; + TRACE("Preprocessed shader source: %s\n", debugstr_a(preproc_shader)); + FIXME("Parse compilation target.\n"); shader = parse_hlsl_shader(preproc_shader, ST_VERTEX, 2, entrypoint, &messages);

1 0

Matteo Bruni : d3dcompiler: Distinguish between scalars, vectors and matrices.
by Alexandre Julliard 07 Jun '12

07 Jun '12

Module: wine Branch: master Commit: 9d9dae0cdb79fb30c13c0a20690730fc2cd17ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9dae0cdb79fb30c13c0a206… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 7 00:19:02 2012 +0200 d3dcompiler: Distinguish between scalars, vectors and matrices. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 17 ++++++++++++++--- dlls/d3dcompiler_43/hlsl.y | 6 +++--- dlls/d3dcompiler_43/utils.c | 19 +++++++++++-------- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3ee0ed5..74d2662 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -614,6 +614,17 @@ void SlDeleteShader(struct bwriter_shader *shader) DECLSPEC_HIDDEN; * DEALINGS IN THE SOFTWARE. */ +enum hlsl_type_class +{ + HLSL_CLASS_SCALAR, + HLSL_CLASS_VECTOR, + HLSL_CLASS_MATRIX, + HLSL_CLASS_LAST_NUMERIC = HLSL_CLASS_MATRIX, + HLSL_CLASS_STRUCT, + HLSL_CLASS_ARRAY, + HLSL_CLASS_OBJECT, +}; + enum hlsl_base_type { HLSL_TYPE_FLOAT, @@ -628,8 +639,6 @@ enum hlsl_base_type HLSL_TYPE_PIXELSHADER, HLSL_TYPE_VERTEXSHADER, HLSL_TYPE_STRING, - HLSL_TYPE_STRUCT, - HLSL_TYPE_ARRAY, HLSL_TYPE_VOID, }; @@ -643,6 +652,7 @@ struct hlsl_type { struct list entry; struct list scope_entry; + enum hlsl_type_class type; enum hlsl_base_type base_type; const char *name; unsigned int modifiers; @@ -737,7 +747,8 @@ void hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; -struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; +struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) DECLSPEC_HIDDEN; struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int array_size) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index d967bce..e5a2a48 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -240,7 +240,7 @@ type: base_type base_type: KW_VOID { - $$ = new_hlsl_type("void", HLSL_TYPE_VOID, 1, 1); + $$ = new_hlsl_type("void", HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1); } | TYPE_IDENTIFIER { @@ -257,9 +257,9 @@ base_type: KW_VOID TRACE("Struct type %s.\n", $2); type = get_type(hlsl_ctx.cur_scope, $2, TRUE); - if (type->base_type != HLSL_TYPE_STRUCT) + if (type->type != HLSL_CLASS_STRUCT) { - hlsl_message("Line %u: Redefining %s as a structure.\n", + hlsl_message("Line %u: redefining %s as a structure.\n", hlsl_ctx.line_no, $2); set_parse_status(&hlsl_ctx.status, PARSE_ERR); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index eaf2566..ef22823 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -804,7 +804,8 @@ void free_declaration(struct hlsl_ir_var *decl) d3dcompiler_free(decl); } -struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) +struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_type_class type_class, + enum hlsl_base_type base_type, unsigned dimx, unsigned dimy) { struct hlsl_type *type; @@ -815,6 +816,7 @@ struct hlsl_type *new_hlsl_type(const char *name, enum hlsl_base_type base_type, return NULL; } type->name = name; + type->type = type_class; type->base_type = base_type; type->dimx = dimx; type->dimy = dimy; @@ -879,8 +881,6 @@ const char *debug_base_type(const struct hlsl_type *type) case HLSL_TYPE_INT: name = "int"; break; case HLSL_TYPE_UINT: name = "uint"; break; case HLSL_TYPE_BOOL: name = "bool"; break; - case HLSL_TYPE_STRUCT: name = "struct"; break; - case HLSL_TYPE_ARRAY: name = "array"; break; default: FIXME("Unhandled case %u\n", type->base_type); } @@ -894,15 +894,18 @@ const char *debug_hlsl_type(const struct hlsl_type *type) if (type->name) return debugstr_a(type->name); - if (type->base_type == HLSL_TYPE_STRUCT) + if (type->type == HLSL_CLASS_STRUCT) name = "<anonymous struct>"; else name = debug_base_type(type); - if (type->dimx == 1 && type->dimy == 1) + + if (type->type == HLSL_CLASS_SCALAR) return wine_dbg_sprintf("%s", name); - if (type->dimy == 1) + if (type->type == HLSL_CLASS_VECTOR) return wine_dbg_sprintf("vector<%s, %u>", name, type->dimx); - return wine_dbg_sprintf("matrix<%s, %u, %u>", name, type->dimx, type->dimy); + if (type->type == HLSL_CLASS_MATRIX) + return wine_dbg_sprintf("matrix<%s, %u, %u>", name, type->dimx, type->dimy); + return "unexpected_type"; } const char *debug_node_type(enum hlsl_ir_node_type type) @@ -924,7 +927,7 @@ void free_hlsl_type(struct hlsl_type *type) struct hlsl_struct_field *field, *next_field; d3dcompiler_free((void *)type->name); - if (type->base_type == HLSL_TYPE_STRUCT) + if (type->type == HLSL_CLASS_STRUCT) { LIST_FOR_EACH_ENTRY_SAFE(field, next_field, type->e.elements, struct hlsl_struct_field, entry) {

1 0