October 2010 - Wine-Commits

Juan Lang : wininet: Add some secure connection tests.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

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 Oct. 1, 2010

Oct. 1, 2010

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

Louis Lenders : tapi32: Quiet a few noisy fixme's.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 141067fcc46d6241782dcc2f1c46826880b451f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=141067fcc46d6241782dcc2f1… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 1 08:02:35 2010 +0200 tapi32: Quiet a few noisy fixme's. --- dlls/tapi32/line.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 6ccdf13..38d4510 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -471,7 +471,10 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -482,7 +485,10 @@ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVer DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -1079,8 +1085,11 @@ DWORD WINAPI lineNegotiateAPIVersion( LPLINEEXTENSIONID lpExtensionID ) { - FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, - dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, + dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); *lpdwAPIVersion = dwAPIHighVersion; return 0; }

1 0

Henri Verbeet : wined3d: Also pass the destination state directly to wined3d_state_record_lights().
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 5fd1b5c023b10a6766a2ff9c840f043870db12b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd1b5c023b10a6766a2ff9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:49 2010 +0200 wined3d: Also pass the destination state directly to wined3d_state_record_lights(). --- dlls/wined3d/stateblock.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5b58de9..de8ee8e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -537,26 +537,23 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { return refCount; } -/********************************************************** - * IWineD3DStateBlockImpl parts follows - **********************************************************/ -static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_state *state) +static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { UINT i; - /* Lights... For a recorded state block, we just had a chain of actions to perform, - * so we need to walk that chain and update any actions which differ - */ + /* Lights... For a recorded state block, we just had a chain of actions + * to perform, so we need to walk that chain and update any actions which + * differ. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) { struct list *e, *f; - LIST_FOR_EACH(e, &This->state.light_map[i]) + LIST_FOR_EACH(e, &dst_state->light_map[i]) { BOOL updated = FALSE; struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; /* Look up the light in the destination */ - LIST_FOR_EACH(f, &state->light_map[i]) + LIST_FOR_EACH(f, &src_state->light_map[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); if (realLight->OriginalIndex == src->OriginalIndex) @@ -566,12 +563,12 @@ static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_sta if (realLight->glIndex == -1 && src->glIndex != -1) { /* Light disabled */ - This->state.lights[src->glIndex] = NULL; + dst_state->lights[src->glIndex] = NULL; } else if (realLight->glIndex != -1 && src->glIndex == -1) { /* Light enabled */ - This->state.lights[realLight->glIndex] = src; + dst_state->lights[realLight->glIndex] = src; } src->glIndex = realLight->glIndex; updated = TRUE; @@ -583,13 +580,13 @@ static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_sta { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ - WARN("Light %u in stateblock %p does not exist in device state %p.\n", - src->OriginalIndex, This, state); + WARN("Light %u in dst_state %p does not exist in src_state %p.\n", + src->OriginalIndex, dst_state, src_state); src->OriginalParms = WINED3D_default_light; if (src->glIndex != -1) { - This->state.lights[src->glIndex] = NULL; + dst_state->lights[src->glIndex] = NULL; src->glIndex = -1; } } @@ -879,7 +876,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->state.pixel_shader = src_state->pixel_shader; } - record_lights(This, src_state); + wined3d_state_record_lights(&This->state, src_state); TRACE("Captue done.\n");

1 0

Alexandre Julliard : wineboot: Always create the various RunOnce keys.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

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

Austin English : wineserver: Return the version information in the same format as wine --version.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

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

Juan Lang : wininet: Let CertVerifyCertificateChainPolicy handle certain security flags.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

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

Henri Verbeet : wined3d: Pass a wined3d_state structure to nvts_activate_dimensions().
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 545dc012cf6012fd91e47f871f48286cff919eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=545dc012cf6012fd91e47f871… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:48 2010 +0200 wined3d: Pass a wined3d_state structure to nvts_activate_dimensions(). --- dlls/wined3d/nvidia_texture_shader.c | 47 +++++++++++++++++---------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 5fd8fea..00a51f8 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -30,12 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* GL locking for state handlers is done by the caller. */ -static void nvts_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD stage, struct wined3d_context *context) { BOOL bumpmap = FALSE; - if (stage > 0 && (stateblock->state.texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE - || stateblock->state.texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP)) + if (stage > 0 && (state->texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE + || state->texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP)) { bumpmap = TRUE; context->texShaderBumpMap |= (1 << stage); @@ -43,9 +43,9 @@ static void nvts_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateb context->texShaderBumpMap &= ~(1 << stage); } - if (stateblock->state.textures[stage]) + if (state->textures[stage]) { - switch (stateblock->state.textures[stage]->baseTexture.target) + switch (state->textures[stage]->baseTexture.target) { case GL_TEXTURE_2D: glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, bumpmap ? GL_OFFSET_TEXTURE_2D_NV : GL_TEXTURE_2D); @@ -482,16 +482,16 @@ static void nvrc_colorop(DWORD state_id, IWineD3DStateBlockImpl *stateblock, str checkGLcall("glActiveTextureARB"); } - if (stateblock->state.lowest_disabled_stage > 0) + if (state->lowest_disabled_stage > 0) { glEnable(GL_REGISTER_COMBINERS_NV); - GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, stateblock->state.lowest_disabled_stage)); + GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, state->lowest_disabled_stage)); } else { glDisable(GL_REGISTER_COMBINERS_NV); } - if (stage >= stateblock->state.lowest_disabled_stage) + if (stage >= state->lowest_disabled_stage) { TRACE("Stage disabled\n"); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -529,57 +529,58 @@ static void nvrc_colorop(DWORD state_id, IWineD3DStateBlockImpl *stateblock, str { if (gl_info->supported[NV_TEXTURE_SHADER2]) { - nvts_activate_dimensions(stage, stateblock, context); + nvts_activate_dimensions(state, stage, context); } else { - texture_activate_dimensions(stateblock->state.textures[stage], gl_info); + texture_activate_dimensions(state->textures[stage], gl_info); } } } /* Set the texture combiners */ - set_tex_op_nvrc(gl_info, &stateblock->state, FALSE, stage, - stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], - stateblock->state.texture_states[stage][WINED3DTSS_COLORARG1], - stateblock->state.texture_states[stage][WINED3DTSS_COLORARG2], - stateblock->state.texture_states[stage][WINED3DTSS_COLORARG0], + set_tex_op_nvrc(gl_info, state, FALSE, stage, + state->texture_states[stage][WINED3DTSS_COLOROP], + state->texture_states[stage][WINED3DTSS_COLORARG1], + state->texture_states[stage][WINED3DTSS_COLORARG2], + state->texture_states[stage][WINED3DTSS_COLORARG0], mapped_stage, - stateblock->state.texture_states[stage][WINED3DTSS_RESULTARG]); + state->texture_states[stage][WINED3DTSS_RESULTARG]); /* In register combiners bump mapping is done in the stage AFTER the one that has the bump map operation set, * thus the texture shader may have to be updated */ if (gl_info->supported[NV_TEXTURE_SHADER2]) { - BOOL usesBump = (stateblock->state.texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE - || stateblock->state.texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP); + BOOL usesBump = (state->texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE + || state->texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP); BOOL usedBump = !!(context->texShaderBumpMap & 1 << (stage + 1)); if (usesBump != usedBump) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage + 1)); checkGLcall("glActiveTextureARB"); - nvts_activate_dimensions(stage + 1, stateblock, context); + nvts_activate_dimensions(state, stage + 1, context); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); } } } -static void nvts_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void nvts_texdim(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - DWORD sampler = state - STATE_SAMPLER(0); + DWORD sampler = state_id - STATE_SAMPLER(0); DWORD mapped_stage = stateblock->device->texUnitMap[sampler]; + const struct wined3d_state *state = &stateblock->state; /* No need to enable / disable anything here for unused samplers. The tex_colorop * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop * will take care of this business */ if (mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= context->gl_info->limits.textures) return; - if (sampler >= stateblock->state.lowest_disabled_stage) return; + if (sampler >= state->lowest_disabled_stage) return; if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; - nvts_activate_dimensions(sampler, stateblock, context); + nvts_activate_dimensions(state, sampler, context); } static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to remove_vbos().
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

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

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

Oct. 1, 2010

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