October 2010 - Wine-commits

Austin English : wineserver: Return the version information in the same format as wine --version.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: c99609a5a025f94af4e3a5e59e404df612e4fab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99609a5a025f94af4e3a5e59… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 1 03:16:46 2010 -0500 wineserver: Return the version information in the same format as wine --version. --- server/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/main.c b/server/main.c index a59350b..2d841e8 100644 --- a/server/main.c +++ b/server/main.c @@ -36,6 +36,7 @@ #include "file.h" #include "thread.h" #include "request.h" +#include "wine/library.h" /* command-line options */ int debug_level = 0; @@ -107,7 +108,7 @@ static void parse_args( int argc, char *argv[] ) master_socket_timeout = TIMEOUT_INFINITE; break; case 'v': - fprintf( stderr, "%s\n", PACKAGE_STRING ); + fprintf( stderr, "%s\n", wine_get_build_id()); exit(0); case 'w': wait_for_lock();

1 0

Alexandre Julliard : wineboot: Always create the various RunOnce keys.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 0647a85dda8048f7de7a9219e7f7a3c62c38c552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0647a85dda8048f7de7a9219e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 14:22:40 2010 +0200 wineboot: Always create the various RunOnce keys. --- programs/wineboot/wineboot.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 90dd779..92331ee 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -643,7 +643,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; HKEY hkWin, hkRun; - DWORD res; + DWORD res, dispos; DWORD i, nMaxCmdLine=0, nMaxValue=0; WCHAR *szCmdLine=NULL; WCHAR *szValue=NULL; @@ -653,15 +653,17 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, else WINE_TRACE("processing %s entries under HKCU\n",wine_dbgstr_w(szKeyName) ); - if (RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin ) != ERROR_SUCCESS) + if (RegCreateKeyExW( hkRoot, WINKEY_NAME, 0, NULL, 0, KEY_READ, NULL, &hkWin, NULL ) != ERROR_SUCCESS) return TRUE; - if (RegOpenKeyExW( hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun ) != ERROR_SUCCESS) + if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, + NULL, &hkRun, &dispos ) != ERROR_SUCCESS)) { RegCloseKey( hkWin ); return TRUE; } RegCloseKey( hkWin ); + if (dispos == REG_CREATED_NEW_KEY) goto end; if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS )

1 0

Alexandre Julliard : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 15c1670a5cdfa6660ff284f3a875e44c75d74881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c1670a5cdfa6660ff284f3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 15:16:47 2010 +0200 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlview.c | 49 ++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 0992252..bfb6870 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -471,7 +471,7 @@ static const struct message folderview_getselectionmarked_seq[] = { }; static const struct message folderview_getfocused_seq[] = { - { LVM_GETNEXTITEM, sent|wparam|lparam, -1, LVNI_FOCUSED }, + { LVM_GETNEXTITEM, sent|wparam|lparam|optional, -1, LVNI_FOCUSED }, { 0 } }; @@ -535,7 +535,7 @@ static void test_IFolderView(void) HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; - INT ret; + INT ret, count; POINT pt; LONG ref1, ref2; RECT r; @@ -618,6 +618,19 @@ if (0) ok(pt.x == LOWORD(ret) && pt.y == HIWORD(ret), "got (%d, %d)\n", LOWORD(ret), HIWORD(ret)); } + /* IFolderView::ItemCount */ +if (0) +{ + /* crashes on XP */ + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); +} + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, count ? folderview_itemcount_seq : empty_seq, + "IFolderView::ItemCount", FALSE); + /* IFolderView::GetSelectionMarkedItem */ if (0) { @@ -627,16 +640,22 @@ if (0) flush_sequences(sequences, NUM_MSG_SEQUENCES); hr = IFolderView_GetSelectionMarkedItem(fv, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); + if (count) + ok(hr == S_OK, "got (0x%08x)\n", hr); + else + ok(hr == S_FALSE, "got (0x%08x)\n", hr); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getselectionmarked_seq, - "IFolderView::GetSelectionMarkedItem", FALSE); + "IFolderView::GetSelectionMarkedItem", FALSE); /* IFolderView::GetFocusedItem */ flush_sequences(sequences, NUM_MSG_SEQUENCES); hr = IFolderView_GetFocusedItem(fv, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); + if (count) + ok(hr == S_OK, "got (0x%08x)\n", hr); + else + ok(hr == S_FALSE, "got (0x%08x)\n", hr); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getfocused_seq, - "IFolderView::GetFocusedItem", FALSE); + "IFolderView::GetFocusedItem", FALSE); /* IFolderView::GetFolder, just return pointer */ if (0) @@ -655,22 +674,10 @@ if (0) ok(hr == S_OK, "got (0x%08x)\n", hr); ref2 = IShellFolder_AddRef(desktop); IShellFolder_Release(desktop); - ok(ref1 == ref2, "expected same refcount, got %d\n", ref2); + ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ + "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); - /* IFolderView::ItemCount */ -if (0) -{ - /* crashes on XP */ - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); -} - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_itemcount_seq, - "IFolderView::ItemCount", FALSE); - IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view); @@ -821,7 +828,7 @@ static const struct message folderview_setcurrentviewmode3_prevista[] = { static const struct message folderview_setcurrentviewmode4_prevista[] = { { LVM_GETHEADER, sent}, - { LVM_GETITEMCOUNT, sent}, + { LVM_GETITEMCOUNT, sent|optional }, { LVM_SETSELECTEDCOLUMN, sent}, { WM_NOTIFY, sent }, { WM_NOTIFY, sent },

1 0

Juan Lang : wininet: Let CertVerifyCertificateChainPolicy handle certain security flags.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 9f6cd2663e53f3617656a5462fdae7a78e3975c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6cd2663e53f3617656a5462… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 14:19:23 2010 -0700 wininet: Let CertVerifyCertificateChainPolicy handle certain security flags. --- dlls/wininet/netconnection.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e06a253..004b213 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -282,6 +282,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; + sslExtraPolicyPara.fdwChecks = security_flags; policyPara.cbSize = sizeof(policyPara); policyPara.dwFlags = 0; policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; @@ -293,11 +294,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - { - if (!(security_flags & - SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; - } + err = ERROR_INTERNET_SEC_CERT_CN_INVALID; else err = ERROR_INTERNET_SEC_INVALID_CERT; }

1 0

Juan Lang : wininet: Add some secure connection tests.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 86732e04d808d439629bbe8b04f3fa2c3ae1abff URL: http://source.winehq.org/git/wine.git/?a=commit;h=86732e04d808d439629bbe8b0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 09:53:47 2010 -0700 wininet: Add some secure connection tests. --- dlls/wininet/tests/http.c | 183 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 183 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 93b3877..0637057 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2568,6 +2568,188 @@ static void test_http_connection(void) CloseHandle(hThread); } +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 get[] = {'G','E','T',0}; + static const WCHAR slash[] = {'/',0}; + HINTERNET ses, con, req; + DWORD size, flags; + INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; + INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; + BOOL ret; + + ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "testbot.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, + INTERNET_FLAG_SECURE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %d\n", GetLastError()); + + size = sizeof(flags); + ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); + ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); + todo_wine + ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); + + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + NULL, &size); + ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + certificate_structA = HeapAlloc(GetProcessHeap(), 0, size); + ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + certificate_structA, &size); + ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + ok(certificate_structA->lpszSubjectInfo && + strlen(certificate_structA->lpszSubjectInfo) > 1, + "expected a non-empty subject name\n"); + ok(certificate_structA->lpszIssuerInfo && + strlen(certificate_structA->lpszIssuerInfo) > 1, + "expected a non-empty issuer name\n"); + ok(!certificate_structA->lpszSignatureAlgName, + "unexpected signature algorithm name\n"); + ok(!certificate_structA->lpszEncryptionAlgName, + "unexpected encryption algorithm name\n"); + ok(!certificate_structA->lpszProtocolName, + "unexpected protocol name\n"); + todo_wine + ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + } + HeapFree(GetProcessHeap(), 0, certificate_structA); + + /* Querying the same option through InternetQueryOptionW still results in + * ASCII strings being returned. + */ + size = 0; + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + NULL, &size); + ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + certificate_structW = HeapAlloc(GetProcessHeap(), 0, size); + ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + certificate_structW, &size); + certificate_structA = (INTERNET_CERTIFICATE_INFOA *)certificate_structW; + ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + ok(certificate_structA->lpszSubjectInfo && + strlen(certificate_structA->lpszSubjectInfo) > 1, + "expected a non-empty subject name\n"); + ok(certificate_structA->lpszIssuerInfo && + strlen(certificate_structA->lpszIssuerInfo) > 1, + "expected a non-empty issuer name\n"); + ok(!certificate_structA->lpszSignatureAlgName, + "unexpected signature algorithm name\n"); + ok(!certificate_structA->lpszEncryptionAlgName, + "unexpected encryption algorithm name\n"); + ok(!certificate_structA->lpszProtocolName, + "unexpected protocol name\n"); + todo_wine + ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + } + HeapFree(GetProcessHeap(), 0, certificate_structW); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + + /* Repeating the tests with the W functions has the same result: */ + ses = InternetOpenW(gizmo5, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectW(ses, testbot, + 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, + INTERNET_FLAG_SECURE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %d\n", GetLastError()); + + size = sizeof(flags); + ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); + ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); + todo_wine + ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); + + ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + NULL, &size); + ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + certificate_structA = HeapAlloc(GetProcessHeap(), 0, size); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + certificate_structA, &size); + ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + todo_wine + ok(certificate_structA->lpszSubjectInfo && + strlen(certificate_structA->lpszSubjectInfo) > 1, + "expected a non-empty subject name\n"); + todo_wine + ok(certificate_structA->lpszIssuerInfo && + strlen(certificate_structA->lpszIssuerInfo) > 1, + "expected a non-empty issuer name\n"); + ok(!certificate_structA->lpszSignatureAlgName, + "unexpected signature algorithm name\n"); + ok(!certificate_structA->lpszEncryptionAlgName, + "unexpected encryption algorithm name\n"); + ok(!certificate_structA->lpszProtocolName, + "unexpected protocol name\n"); + todo_wine + ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + } + HeapFree(GetProcessHeap(), 0, certificate_structA); + + /* Again, querying the same option through InternetQueryOptionW still + * results in ASCII strings being returned. + */ + size = 0; + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + NULL, &size); + ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); + certificate_structW = HeapAlloc(GetProcessHeap(), 0, size); + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + certificate_structW, &size); + certificate_structA = (INTERNET_CERTIFICATE_INFOA *)certificate_structW; + ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + todo_wine + ok(certificate_structA->lpszSubjectInfo && + strlen(certificate_structA->lpszSubjectInfo) > 1, + "expected a non-empty subject name\n"); + todo_wine + ok(certificate_structA->lpszIssuerInfo && + strlen(certificate_structA->lpszIssuerInfo) > 1, + "expected a non-empty issuer name\n"); + ok(!certificate_structA->lpszSignatureAlgName, + "unexpected signature algorithm name\n"); + ok(!certificate_structA->lpszEncryptionAlgName, + "unexpected encryption algorithm name\n"); + ok(!certificate_structA->lpszProtocolName, + "unexpected protocol name\n"); + todo_wine + ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); + } + HeapFree(GetProcessHeap(), 0, certificate_structW); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_user_agent_header(void) { HINTERNET ses, con, req; @@ -3000,6 +3182,7 @@ START_TEST(http) InternetOpenUrlA_test(); HttpHeaders_test(); test_http_connection(); + test_secure_connection(); test_user_agent_header(); test_bogus_accept_types_array(); InternetReadFile_chunked_test();

1 0

Juan Lang : wininet: Returned certificate strings are always ASCII.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 56ebc04ab6fcda86b60697e6a8bc2119d804536c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ebc04ab6fcda86b60697e6a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 13:09:04 2010 -0700 wininet: Returned certificate strings are always ASCII. --- dlls/wininet/http.c | 61 ++++++++++++-------------------------------- dlls/wininet/tests/http.c | 4 --- 2 files changed, 17 insertions(+), 48 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 2266fcd..992a827 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1820,60 +1820,33 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: { PCCERT_CONTEXT context; - if(*size < sizeof(INTERNET_CERTIFICATE_INFOW)) { - *size = sizeof(INTERNET_CERTIFICATE_INFOW); + if(*size < sizeof(INTERNET_CERTIFICATE_INFOA)) { + *size = sizeof(INTERNET_CERTIFICATE_INFOA); return ERROR_INSUFFICIENT_BUFFER; } context = (PCCERT_CONTEXT)NETCON_GetCert(&(req->netConnection)); if(context) { - INTERNET_CERTIFICATE_INFOW *info = (INTERNET_CERTIFICATE_INFOW*)buffer; + INTERNET_CERTIFICATE_INFOA *info = (INTERNET_CERTIFICATE_INFOA*)buffer; DWORD len; memset(info, 0, sizeof(INTERNET_CERTIFICATE_INFOW)); info->ftExpiry = context->pCertInfo->NotAfter; info->ftStart = context->pCertInfo->NotBefore; - if(unicode) { - len = CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); - info->lpszSubjectInfo = LocalAlloc(0, len*sizeof(WCHAR)); - if(info->lpszSubjectInfo) - CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, - info->lpszSubjectInfo, len); - len = CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); - info->lpszIssuerInfo = LocalAlloc(0, len*sizeof(WCHAR)); - if (info->lpszIssuerInfo) - CertNameToStrW(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - info->lpszIssuerInfo, len); - }else { - INTERNET_CERTIFICATE_INFOA *infoA = (INTERNET_CERTIFICATE_INFOA*)info; - - len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); - infoA->lpszSubjectInfo = LocalAlloc(0, len); - if(infoA->lpszSubjectInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, - infoA->lpszSubjectInfo, len); - len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); - infoA->lpszIssuerInfo = LocalAlloc(0, len); - if(infoA->lpszIssuerInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, - infoA->lpszIssuerInfo, len); - } - - /* - * Contrary to MSDN, these do not appear to be set. - * lpszProtocolName - * lpszSignatureAlgName - * lpszEncryptionAlgName - * dwKeySize - */ + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, NULL, 0); + info->lpszSubjectInfo = LocalAlloc(0, len); + if(info->lpszSubjectInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR, + info->lpszSubjectInfo, len); + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, NULL, 0); + info->lpszIssuerInfo = LocalAlloc(0, len); + if(info->lpszIssuerInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, + info->lpszIssuerInfo, len); CertFreeCertificateContext(context); return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0637057..d06cdf2 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2693,11 +2693,9 @@ static void test_secure_connection(void) ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); if (ret) { - todo_wine ok(certificate_structA->lpszSubjectInfo && strlen(certificate_structA->lpszSubjectInfo) > 1, "expected a non-empty subject name\n"); - todo_wine ok(certificate_structA->lpszIssuerInfo && strlen(certificate_structA->lpszIssuerInfo) > 1, "expected a non-empty issuer name\n"); @@ -2726,11 +2724,9 @@ static void test_secure_connection(void) ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); if (ret) { - todo_wine ok(certificate_structA->lpszSubjectInfo && strlen(certificate_structA->lpszSubjectInfo) > 1, "expected a non-empty subject name\n"); - todo_wine ok(certificate_structA->lpszIssuerInfo && strlen(certificate_structA->lpszIssuerInfo) > 1, "expected a non-empty issuer name\n");

1 0

Juan Lang : wininet: Support querying the cipher strength of an SSL connection.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 887aeb6a097b73165658e00313eeec8728022d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=887aeb6a097b73165658e0031… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 13:18:07 2010 -0700 wininet: Support querying the cipher strength of an SSL connection. --- dlls/wininet/http.c | 1 + dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 22 ++++++++++++++++++++++ dlls/wininet/tests/http.c | 4 ---- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 992a827..a15977a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1847,6 +1847,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe CertNameToStrA(context->dwCertEncodingType, &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, info->lpszIssuerInfo, len); + info->dwKeySize = NETCON_GetCipherStrength(&req->netConnection); CertFreeCertificateContext(context); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 109179f..86b16bd 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -460,6 +460,7 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int int *recvd /* out */); BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); +int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection); DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); int sock_get_error(int); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 004b213..a1c3090 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -150,6 +150,8 @@ MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); MAKE_FUNCPTR(SSL_CTX_set_verify); +MAKE_FUNCPTR(SSL_get_current_cipher); +MAKE_FUNCPTR(SSL_CIPHER_get_bits); MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ @@ -427,6 +429,8 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); DYNSSL(SSL_CTX_set_verify); + DYNSSL(SSL_get_current_cipher); + DYNSSL(SSL_CIPHER_get_bits); DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL @@ -868,6 +872,24 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) #endif } +int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) +{ +#ifdef SONAME_LIBSSL + SSL_CIPHER *cipher; + int bits = 0; + + if (!connection->useSSL) + return 0; + cipher = pSSL_get_current_cipher(connection->ssl_s); + if (!cipher) + return 0; + pSSL_CIPHER_get_bits(cipher, &bits); + return bits; +#else + return 0; +#endif +} + DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) { int result; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d06cdf2..1236d30 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2622,7 +2622,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structA); @@ -2653,7 +2652,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structW); @@ -2705,7 +2703,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structA); @@ -2736,7 +2733,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structW);

1 0

Vincent Povirk : gdiplus: Don' t create a DIB section for non-alpha or reference bitmaps.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: c8a48f237e43174673fa3686ebe99e42f6a0d8a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a48f237e43174673fa3686e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Sep 30 16:07:53 2010 -0500 gdiplus: Don't create a DIB section for non-alpha or reference bitmaps. --- dlls/gdiplus/image.c | 14 +------------- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9b83d95..e17edde 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1630,7 +1630,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, INT row_size, dib_stride; HDC hdc; BYTE *bits=NULL, *own_bits=NULL; - int i; REAL xres, yres; GpStatus stat; @@ -1655,7 +1654,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if(stride == 0) stride = dib_stride; - if (format & PixelFormatGDI) + if (format & PixelFormatGDI && !(format & (PixelFormatAlpha|PixelFormatIndexed)) && !scan0) { pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); if (!pbmi) @@ -1691,12 +1690,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, { /* Not a GDI format; don't try to make an HBITMAP. */ if (scan0) - { - /* FIXME: We should do this with GDI formats too when scan0 is - * provided, but for now we need the HDC for most drawing - * operations. */ bits = scan0; - } else { INT size = abs(stride) * height; @@ -1709,12 +1703,6 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, } } - /* copy bits to the dib if necessary */ - /* FIXME: should reference the bits instead of copying them */ - if (scan0 && bits != scan0) - for (i=0; i<height; i++) - memcpy(bits+i*dib_stride, scan0+i*stride, row_size); - *bitmap = GdipAlloc(sizeof(GpBitmap)); if(!*bitmap) { diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9fae06c..940dbef 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2194,7 +2194,7 @@ static void test_fromMemoryBitmap(void) GdipDeleteGraphics(graphics); - todo_wine expect(0x79, bits[0]); + expect(0x79, bits[0]); todo_wine expect(0x68, bits[3]); GdipDisposeImage((GpImage*)bitmap);

1 0

Henri Verbeet : wined3d: Pass gl_info and state parameters directly to drawStridedInstanced().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: cf9d9e3204bc7732423ec524ea7d322500683aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9d9e3204bc7732423ec524e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:46 2010 +0200 wined3d: Pass gl_info and state parameters directly to drawStridedInstanced(). --- dlls/wined3d/drawprim.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2441e4c..9370161 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -468,16 +468,13 @@ static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struc } /* GL locking is done by the caller */ -static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wined3d_stream_info *si, - UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, UINT idxSize, - UINT startIdx) +static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, + const void *idxData, UINT idxSize, UINT startIdx) { UINT numInstances = 0, i; int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; if (!idxSize) { @@ -491,20 +488,18 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine return; } - TRACE("(%p) : glElements(%x, %d, ...)\n", This, glPrimitiveType, numberOfVertices); - /* First, figure out how many instances we have to draw */ for (i = 0; i < MAX_STREAMS; ++i) { /* Look at the streams and take the first one which matches */ - if (stateblock->state.streams[i].buffer - && ((stateblock->state.streams[i].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) - || (stateblock->state.streams[i].flags & WINED3DSTREAMSOURCE_INDEXEDDATA))) + if (state->streams[i].buffer + && ((state->streams[i].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) + || (state->streams[i].flags & WINED3DSTREAMSOURCE_INDEXEDDATA))) { /* Use the specified number of instances from the first matched * stream. A streamFreq of 0 (with INSTANCEDATA or INDEXEDDATA) * is handled as 1. See d3d9/tests/visual.c-> stream_test(). */ - numInstances = stateblock->state.streams[i].frequency ? stateblock->state.streams[i].frequency : 1; + numInstances = state->streams[i].frequency ? state->streams[i].frequency : 1; break; } } @@ -513,7 +508,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine { if (!(si->use_map & (1 << i))) continue; - if (stateblock->state.streams[si->elements[i].stream_idx].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) + if (state->streams[si->elements[i].stream_idx].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { instancedData[numInstancedAttribs] = i; numInstancedAttribs++; @@ -526,11 +521,11 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine for(j = 0; j < numInstancedAttribs; j++) { const BYTE *ptr = si->elements[instancedData[j]].data + si->elements[instancedData[j]].stride * i - + stateblock->state.streams[si->elements[instancedData[j]].stream_idx].offset; + + state->streams[si->elements[instancedData[j]].stream_idx].offset; if (si->elements[instancedData[j]].buffer_object) { - struct wined3d_buffer *vb = stateblock->state.streams[si->elements[instancedData[j]].stream_idx].buffer; - ptr += (ULONG_PTR)buffer_get_sysmem(vb, &This->adapter->gl_info); + struct wined3d_buffer *vb = state->streams[si->elements[instancedData[j]].stream_idx].buffer; + ptr += (ULONG_PTR)buffer_get_sysmem(vb, gl_info); } send_attribute(gl_info, si->elements[instancedData[j]].format->id, instancedData[j], ptr); @@ -712,11 +707,15 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT drawStridedSlow(iface, context, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); } - } else if(This->instancedDraw) { + } + else if (This->instancedDraw) + { /* Instancing emulation with mixing immediate mode and arrays */ - drawStridedInstanced(iface, &This->strided_streams, index_count, - glPrimType, idxData, idxSize, StartIdx); - } else { + drawStridedInstanced(context->gl_info, state, stream_info, + index_count, glPrimType, idxData, idxSize, StartIdx); + } + else + { drawStridedFast(glPrimType, index_count, idxSize, idxData, StartIdx); } }

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to remove_vbos().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 4dcd56f43b7da9389c5242fbcf05012a165ae5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcd56f43b7da9389c5242fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:47 2010 +0200 wined3d: Pass a wined3d_state structure to remove_vbos(). --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9370161..6b6102b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -537,8 +537,8 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st } } -static inline void remove_vbos(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info, - struct wined3d_stream_info *s) +static void remove_vbos(const struct wined3d_gl_info *gl_info, + const struct wined3d_state *state, struct wined3d_stream_info *s) { unsigned int i; @@ -551,7 +551,7 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, const struct wined3d_gl e = &s->elements[i]; if (e->buffer_object) { - struct wined3d_buffer *vb = This->stateBlock->state.streams[e->stream_idx].buffer; + struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->buffer_object = 0; e->data = (BYTE *)((ULONG_PTR)e->data + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); } @@ -683,7 +683,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT if(emulation) { stream_info = &stridedlcl; memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl)); - remove_vbos(This, context->gl_info, &stridedlcl); + remove_vbos(context->gl_info, state, &stridedlcl); } }

1 0