November 2012 - Wine-Commits

Erich Hoover : advapi32: Implement SetSecurityInfo on top of NtSetSecurityObject.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: d5e40b0eff65aa2d309b9e4be7d9867fd1cf7eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e40b0eff65aa2d309b9e4be… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Nov 15 10:16:23 2012 -0700 advapi32: Implement SetSecurityInfo on top of NtSetSecurityObject. --- dlls/advapi32/security.c | 22 +++++++- dlls/advapi32/tests/security.c | 103 ++++++++++++++++++++++++++++++++++----- 2 files changed, 108 insertions(+), 17 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 699c8e0..6afcc42 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5611,9 +5611,25 @@ BOOL WINAPI FileEncryptionStatusA(LPCSTR lpFileName, LPDWORD lpStatus) */ DWORD WINAPI SetSecurityInfo(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSID psidOwner, - PSID psidGroup, PACL pDacl, PACL pSacl) { - FIXME("stub\n"); - return ERROR_SUCCESS; + PSID psidGroup, PACL pDacl, PACL pSacl) +{ + SECURITY_DESCRIPTOR sd; + NTSTATUS status; + + if (!InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION)) + return ERROR_INVALID_SECURITY_DESCR; + + if (SecurityInfo & OWNER_SECURITY_INFORMATION) + SetSecurityDescriptorOwner(&sd, psidOwner, FALSE); + if (SecurityInfo & GROUP_SECURITY_INFORMATION) + SetSecurityDescriptorGroup(&sd, psidGroup, FALSE); + if (SecurityInfo & DACL_SECURITY_INFORMATION) + SetSecurityDescriptorDacl(&sd, TRUE, pDacl, FALSE); + if (SecurityInfo & SACL_SECURITY_INFORMATION) + SetSecurityDescriptorSacl(&sd, TRUE, pSacl, FALSE); + + status = NtSetSecurityObject(handle, SecurityInfo, &sd); + return RtlNtStatusToDosError(status); } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 844b238..da5af04 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -120,10 +120,14 @@ static BOOL (WINAPI *pSetSecurityDescriptorControl)(PSECURITY_DESCRIPTOR, SECURI SECURITY_DESCRIPTOR_CONTROL); static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); +static DWORD (WINAPI *pSetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, + PSID, PSID, PACL, PACL); static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); +static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); static HMODULE hmod; static int myARGC; @@ -174,9 +178,12 @@ static void init(void) pSetEntriesInAclA = (void *)GetProcAddress(hmod, "SetEntriesInAclA"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); + pSetSecurityInfo = (void *)GetProcAddress(hmod, "SetSecurityInfo"); pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); pConvertSidToStringSidA = (void *)GetProcAddress(hmod, "ConvertSidToStringSidA"); pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA"); + pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); + pGetAce = (void *)GetProcAddress(hmod, "GetAce"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3528,20 +3535,42 @@ static void test_acls(void) static void test_GetSecurityInfo(void) { - HANDLE obj; - PSECURITY_DESCRIPTOR sd; + char b[sizeof(TOKEN_USER) + sizeof(SID) + sizeof(DWORD)*SID_MAX_SUB_AUTHORITIES]; + char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100]; + DWORD sid_size = sizeof(admin_ptr), l = sizeof(b); + PSID admin_sid = (PSID) admin_ptr, user_sid; + char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; + ACL_SIZE_INFORMATION acl_size; + PSECURITY_DESCRIPTOR pSD; + ACCESS_ALLOWED_ACE *ace; + HANDLE token, obj; PSID owner, group; - PACL dacl; + BOOL bret = TRUE; + PACL pDacl; DWORD ret; - if (!pGetSecurityInfo) + if (!pGetSecurityInfo || !pSetSecurityInfo) { - win_skip("GetSecurityInfo is not available\n"); + win_skip("[Get|Set]SecurityInfo is not available\n"); return; } + if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) + { + if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; + else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; + } + if (!bret) + { + win_skip("Failed to get current user token\n"); + return; + } + GetTokenInformation(token, TokenUser, b, l, &l); + CloseHandle( token ); + user_sid = ((TOKEN_USER *)b)->User.Sid; + /* Create something. Files have lots of associated security info. */ - obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, + obj = CreateFile(myARGV[0], GENERIC_READ|WRITE_DAC, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (obj == INVALID_HANDLE_VALUE) { @@ -3551,7 +3580,7 @@ static void test_GetSecurityInfo(void) ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, &sd); + &owner, &group, &pDacl, NULL, &pSD); if (ret == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetSecurityInfo is not implemented\n"); @@ -3559,15 +3588,15 @@ static void test_GetSecurityInfo(void) return; } ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); - ok(sd != NULL, "GetSecurityInfo\n"); + ok(pSD != NULL, "GetSecurityInfo\n"); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); - LocalFree(sd); + LocalFree(pSD); if (!pCreateWellKnownSid) { @@ -3580,15 +3609,61 @@ static void test_GetSecurityInfo(void) the other stuff, leaving us no way to free it. */ ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - &owner, &group, &dacl, NULL, NULL); + &owner, &group, &pDacl, NULL, NULL); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(owner != NULL, "GetSecurityInfo\n"); ok(group != NULL, "GetSecurityInfo\n"); - if (dacl != NULL) - ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + if (pDacl != NULL) + ok(IsValidAcl(pDacl), "GetSecurityInfo\n"); else win_skip("No ACL information returned\n"); + /* Create security descriptor information and test that it comes back the same */ + pSD = &sd; + pDacl = (PACL)&dacl; + InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); + pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); + bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); + ok(bret, "Failed to initialize ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); + ok(bret, "Failed to add Current User to ACL.\n"); + bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); + ok(bret, "Failed to add Administrator Group to ACL.\n"); + bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); + ok(bret, "Failed to add ACL to security desciptor.\n"); + ret = pSetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, pDacl, NULL); + ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret); + ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, + NULL, NULL, &pDacl, NULL, NULL); + ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); + ok(pDacl && IsValidAcl(pDacl), "GetSecurityInfo returned invalid DACL.\n"); + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } + LocalFree(pSD); + CloseHandle(obj); }

1 0

Alexandre Julliard : user32: Maintain a cache of registry keys for the various parameters.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 9c729720a9d824d1c695e4043b3a562e7c5418bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c729720a9d824d1c695e4043… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 16 12:39:43 2012 +0100 user32: Maintain a cache of registry keys for the various parameters. --- dlls/user32/sysparams.c | 86 +++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 47 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index e1b8b72..6d10642 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -558,65 +558,44 @@ static void SYSPARAMS_NotifyChange( UINT uiAction, UINT fWinIni ) } } - -/*********************************************************************** - * Saves system parameter to user profile. - */ - -/* Save data as-is */ -static BOOL SYSPARAMS_SaveRaw( LPCWSTR lpRegKey, LPCWSTR lpValName, - const void *lpValue, DWORD valueSize, - DWORD type, UINT fWinIni ) +/* retrieve the cached base keys for a given entry */ +static BOOL get_base_keys( enum parameter_key index, HKEY *base_key, HKEY *volatile_key ) { - HKEY hKey; - HKEY hBaseKey; - DWORD dwOptions; - BOOL ret = FALSE; + static HKEY base_keys[NB_PARAM_KEYS]; + static HKEY volatile_keys[NB_PARAM_KEYS]; + HKEY key; - if (fWinIni & SPIF_UPDATEINIFILE) - { - hBaseKey = HKEY_CURRENT_USER; - dwOptions = 0; - } - else + if (!base_keys[index] && base_key) { - hBaseKey = get_volatile_regkey(); - dwOptions = REG_OPTION_VOLATILE; + if (RegCreateKeyW( HKEY_CURRENT_USER, parameter_key_names[index], &key )) return FALSE; + if (InterlockedCompareExchangePointer( (void **)&base_keys[index], key, 0 )) + RegCloseKey( key ); } - - if (RegCreateKeyExW( hBaseKey, lpRegKey, - 0, 0, dwOptions, KEY_ALL_ACCESS, - 0, &hKey, 0 ) == ERROR_SUCCESS) + if (!volatile_keys[index] && volatile_key) { - if (RegSetValueExW( hKey, lpValName, 0, type, - lpValue, valueSize) == ERROR_SUCCESS) - { - ret = TRUE; - if (hBaseKey == HKEY_CURRENT_USER) - RegDeleteKeyW( get_volatile_regkey(), lpRegKey ); - } - RegCloseKey( hKey ); + if (RegCreateKeyExW( get_volatile_regkey(), parameter_key_names[index], + 0, 0, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &key, 0 )) return FALSE; + if (InterlockedCompareExchangePointer( (void **)&volatile_keys[index], key, 0 )) + RegCloseKey( key ); } - return ret; + if (base_key) *base_key = base_keys[index]; + if (volatile_key) *volatile_key = volatile_keys[index]; + return TRUE; } /* load a value to a registry entry */ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) { DWORD type, count = 0; - HKEY key; + HKEY base_key, volatile_key; - if (!RegOpenKeyW( get_volatile_regkey(), parameter_key_names[entry->regval[0]], &key )) - { - count = size; - if (RegQueryValueExW( key, entry->regval + 1, NULL, &type, data, &count )) count = 0; - RegCloseKey( key ); - } - if (!count && !RegOpenKeyW( HKEY_CURRENT_USER, parameter_key_names[entry->regval[0]], &key )) + if (!get_base_keys( entry->regval[0], &base_key, &volatile_key )) return FALSE; + + count = size; + if (RegQueryValueExW( volatile_key, entry->regval + 1, NULL, &type, data, &count )) { count = size; - if (RegQueryValueExW( key, entry->regval + 1, NULL, &type, data, &count )) count = 0; - RegCloseKey( key ); + if (RegQueryValueExW( base_key, entry->regval + 1, NULL, &type, data, &count )) count = 0; } /* make sure strings are null-terminated */ if (size && count == size && type == REG_SZ) ((WCHAR *)data)[count - 1] = 0; @@ -628,9 +607,22 @@ static DWORD load_entry( struct sysparam_entry *entry, void *data, DWORD size ) static BOOL save_entry( const struct sysparam_entry *entry, const void *data, DWORD size, DWORD type, UINT flags ) { - if (!SYSPARAMS_SaveRaw( parameter_key_names[entry->regval[0]], entry->regval + 1, data, size, type, flags )) - return FALSE; - if (entry->mirror) SYSPARAMS_SaveRaw( parameter_key_names[entry->mirror[0]], entry->mirror + 1, data, size, type, flags ); + HKEY base_key, volatile_key; + + if (flags & SPIF_UPDATEINIFILE) + { + if (!get_base_keys( entry->regval[0], &base_key, &volatile_key )) return FALSE; + if (RegSetValueExW( base_key, entry->regval + 1, 0, type, data, size )) return FALSE; + RegDeleteValueW( volatile_key, entry->regval + 1 ); + + if (entry->mirror && get_base_keys( entry->mirror[0], &base_key, NULL )) + RegSetValueExW( base_key, entry->mirror + 1, 0, type, data, size ); + } + else + { + if (!get_base_keys( entry->regval[0], NULL, &volatile_key )) return FALSE; + if (RegSetValueExW( volatile_key, entry->regval + 1, 0, type, data, size )) return FALSE; + } return TRUE; }

1 0

Jacek Caban : wininet: Store both proxy and destination host in http_request_t.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: c8da35729c89d634cecc6438f2b8ebda9c229e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8da35729c89d634cecc6438f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 14:38:56 2012 +0100 wininet: Store both proxy and destination host in http_request_t. --- dlls/wininet/http.c | 24 +++++++++++++----------- dlls/wininet/internet.h | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8937a39..1c24153 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1729,8 +1729,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req if(!new_server) return FALSE; - server_release(request->server); - request->server = new_server; + request->proxy = new_server; TRACE("proxy server=%s port=%d\n", debugstr_w(new_server->name), new_server->port); return TRUE; @@ -1738,7 +1737,7 @@ static BOOL HTTP_DealWithProxy(appinfo_t *hIC, http_session_t *session, http_req static DWORD HTTP_ResolveName(http_request_t *request) { - server_t *server = request->server; + server_t *server = request->proxy ? request->proxy : request->server; socklen_t addr_len; void *addr; @@ -1829,6 +1828,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) if(request->server) server_release(request->server); + if(request->proxy) + server_release(request->proxy); heap_free(request->path); heap_free(request->verb); @@ -3933,8 +3934,6 @@ static LPWSTR HTTP_GetRedirectURL(http_request_t *request, LPCWSTR lpszUrl) static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) { http_session_t *session = request->session; - appinfo_t *hIC = session->appInfo; - BOOL using_proxy = hIC->proxy && hIC->proxy[0]; WCHAR path[INTERNET_MAX_PATH_LENGTH]; int index; @@ -4020,7 +4019,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) reset_data_stream(request); - if(!using_proxy && (strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort)) { + if(strcmpiW(request->server->name, hostName) || request->server->port != urlComponents.nPort) { server_t *new_server; new_server = get_server(hostName, urlComponents.nPort, TRUE); @@ -4084,6 +4083,7 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static DWORD HTTP_SecureProxyConnect(http_request_t *request) { + server_t *server = request->server; LPWSTR lpszPath; LPWSTR requestString; INT len; @@ -4093,12 +4093,11 @@ static DWORD HTTP_SecureProxyConnect(http_request_t *request) DWORD res; static const WCHAR szConnect[] = {'C','O','N','N','E','C','T',0}; static const WCHAR szFormat[] = {'%','s',':','%','u',0}; - http_session_t *session = request->session; TRACE("\n"); - lpszPath = heap_alloc((lstrlenW( session->hostName ) + 13)*sizeof(WCHAR)); - sprintfW( lpszPath, szFormat, session->hostName, session->hostPort ); + lpszPath = heap_alloc((lstrlenW(server->name) + 13)*sizeof(WCHAR)); + sprintfW(lpszPath, szFormat, server->name, server->port); requestString = HTTP_BuildHeaderRequestString( request, szConnect, lpszPath, g_szHttp1_1 ); heap_free( lpszPath ); @@ -4712,12 +4711,15 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) return ERROR_SUCCESS; } + TRACE("connecting to %s, proxy %s\n", debugstr_w(request->server->name), + request->proxy ? debugstr_w(request->proxy->name) : "(null)"); + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, request->server->addr_str, strlen(request->server->addr_str)+1); - res = create_netconn(is_https, request->server, request->security_flags, + res = create_netconn(is_https, request->proxy ? request->proxy : request->server, request->security_flags, (request->hdr.ErrorMask & INTERNET_ERROR_MASK_COMBINED_SEC_CERT) != 0, request->connect_timeout, &netconn); if(res != ERROR_SUCCESS) { @@ -4738,7 +4740,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) * behaviour to be more correct and to not cause any incompatibilities * because using a secure connection through a proxy server is a rare * case that would be hard for anyone to depend on */ - if(request->session->appInfo->proxy) + if(request->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) res = NETCON_secure_connect(request->netconn); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 181ef4c..3873855 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -314,6 +314,7 @@ typedef struct object_header_t hdr; http_session_t *session; server_t *server; + server_t *proxy; LPWSTR path; LPWSTR verb; LPWSTR rawHeaders;

1 0

Nikolay Sivov : msxml3: Store handler pointers so casts to particular type are avoided.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: a644bad2afa3f2689a254f953857cae58c1b3597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a644bad2afa3f2689a254f953… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 15 22:34:58 2012 -0500 msxml3: Store handler pointers so casts to particular type are avoided. --- dlls/msxml3/saxreader.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 9ebdc0f..21c5b4f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -173,7 +173,7 @@ enum saxhandler_type SAXHandler_Last }; -struct saxhandler_iface +struct saxanyhandler_iface { IUnknown *handler; IUnknown *vbhandler; @@ -197,6 +197,16 @@ struct saxlexicalhandler_iface IVBSAXLexicalHandler *vbhandler; }; +struct saxhandler_iface +{ + union { + struct saxcontenthandler_iface content; + struct saxerrorhandler_iface error; + struct saxlexicalhandler_iface lexical; + struct saxanyhandler_iface anyhandler; + } u; +}; + typedef struct { DispatchEx dispex; @@ -215,7 +225,7 @@ typedef struct static HRESULT saxreader_put_handler(saxreader *reader, enum saxhandler_type type, void *ptr, BOOL vb) { - struct saxhandler_iface *iface = &reader->saxhandlers[type]; + struct saxanyhandler_iface *iface = &reader->saxhandlers[type].u.anyhandler; IUnknown *unk = (IUnknown*)ptr; if (unk) @@ -234,7 +244,7 @@ static HRESULT saxreader_put_handler(saxreader *reader, enum saxhandler_type typ static HRESULT saxreader_get_handler(const saxreader *reader, enum saxhandler_type type, BOOL vb, void **ret) { - const struct saxhandler_iface *iface = &reader->saxhandlers[type]; + const struct saxanyhandler_iface *iface = &reader->saxhandlers[type].u.anyhandler; if (!ret) return E_POINTER; @@ -253,17 +263,17 @@ static HRESULT saxreader_get_handler(const saxreader *reader, enum saxhandler_ty static struct saxcontenthandler_iface *saxreader_get_contenthandler(saxreader *reader) { - return (struct saxcontenthandler_iface*)&reader->saxhandlers[SAXContentHandler]; + return &reader->saxhandlers[SAXContentHandler].u.content; } static struct saxerrorhandler_iface *saxreader_get_errorhandler(saxreader *reader) { - return (struct saxerrorhandler_iface*)&reader->saxhandlers[SAXErrorHandler]; + return &reader->saxhandlers[SAXErrorHandler].u.error; } static struct saxlexicalhandler_iface *saxreader_get_lexicalhandler(saxreader *reader) { - return (struct saxlexicalhandler_iface*)&reader->saxhandlers[SAXLexicalHandler]; + return &reader->saxhandlers[SAXLexicalHandler].u.lexical; } typedef struct @@ -327,8 +337,8 @@ static inline saxlocator *impl_from_ISAXAttributes( ISAXAttributes *iface ) static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandler_type type) { - return (locator->vbInterface && locator->saxreader->saxhandlers[type].vbhandler) || - (!locator->vbInterface && locator->saxreader->saxhandlers[type].handler); + struct saxanyhandler_iface *iface = &locator->saxreader->saxhandlers[type].u.anyhandler; + return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler); } /* property names */ @@ -2734,7 +2744,7 @@ static ULONG WINAPI saxxmlreader_Release( for (i = 0; i < SAXHandler_Last; i++) { - struct saxhandler_iface *iface = &This->saxhandlers[i]; + struct saxanyhandler_iface *iface = &This->saxhandlers[i].u.anyhandler; if (iface->handler) IUnknown_Release(iface->handler);

1 0

Erich Hoover : wininet: Fix InternetCrackUrl parsing URLs containing a semicolon.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 499c53175bd9e886dcbf02d0a70bad0d1ac0b900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=499c53175bd9e886dcbf02d0a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Nov 15 10:23:52 2012 -0700 wininet: Fix InternetCrackUrl parsing URLs containing a semicolon. --- dlls/wininet/internet.c | 4 +--- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 0e83389..1877af9 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1717,9 +1717,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWOR lpUC->nPort = INTERNET_INVALID_PORT_NUMBER; /* Parse <params> */ - lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl)); - if(!lpszParam) - lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl)); + lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl)); if(!lpszParam) lpszParam = memchrW(lpszap, '#', dwUrlLength - (lpszap - lpszUrl)); diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 8559aae..96c3809 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -124,6 +124,9 @@ static const crack_url_test_t crack_url_tests[] = { {"http://www.winehq.org?test=123", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 0, 21, 9, "http", "www.winehq.org", "", "", "", "?test=123"}, + {"http://www.winehq.org/myscript.php;test=123", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 22, -1, 0, + "http", "www.winehq.org", "", "", "/myscript.php;test=123", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""},

1 0

Jacek Caban : cmd: Added HeapFree wrapper.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 08c17ada571c359d018079eae560b731495bbfdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c17ada571c359d018079eae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 10:37:39 2012 +0100 cmd: Added HeapFree wrapper. --- programs/cmd/batch.c | 6 +++--- programs/cmd/builtins.c | 38 +++++++++++++++++++------------------- programs/cmd/directory.c | 20 ++++++++++---------- programs/cmd/wcmd.h | 5 +++++ programs/cmd/wcmdmain.c | 36 ++++++++++++++++++------------------ 5 files changed, 55 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=08c17ada571c359d01807…

1 0

Austin English : secur32: Get rid of deprecated types.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 62e77128c57d33d0d42a956e87b8ee251a31848d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e77128c57d33d0d42a956e8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 15 19:53:36 2012 -0800 secur32: Get rid of deprecated types. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 16ce0de..bb481b7 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -129,7 +129,7 @@ BOOL schan_imp_create_session(schan_imp_session *session, BOOL is_server, } err = pgnutls_credentials_set(*s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials)cred); + (gnutls_certificate_credentials_t)cred); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -409,7 +409,7 @@ BOOL schan_imp_allocate_certificate_credentials(schan_imp_certificate_credential void schan_imp_free_certificate_credentials(schan_imp_certificate_credentials c) { - pgnutls_certificate_free_credentials((gnutls_certificate_credentials)c); + pgnutls_certificate_free_credentials((gnutls_certificate_credentials_t)c); } static void schan_gnutls_log(int level, const char *msg)

1 0

Henri Verbeet : d3d8/tests: Also test that render states get reset in test_reset().
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: f94f753e51ffc2362fa013cb46326cdf7a87514f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f753e51ffc2362fa013cb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:53 2012 +0100 d3d8/tests: Also test that render states get reset in test_reset(). --- dlls/d3d8/tests/device.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b98a84a..e41aeb3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1022,6 +1022,7 @@ static void test_reset(void) D3DVIEWPORT8 vp; D3DCAPS8 caps; DWORD shader; + DWORD value; HRESULT hr; UINT i; @@ -1141,6 +1142,12 @@ static void test_reset(void) hr = IDirect3DDevice8_SetViewport(device1, &vp); ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + hr = IDirect3DDevice8_SetRenderState(device1, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + memset(&d3dpp, 0, sizeof(d3dpp)); d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.Windowed = FALSE; @@ -1152,6 +1159,10 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device1, D3DRS_LIGHTING, &value); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(!!value, "Got unexpected value %#x for D3DRS_LIGHTING.\n", value); + memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr);

1 0

Piotr Caban : msvcp80: Forward functions that are using String_iterators to msvcp90.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 965543acff6ec3c939385561589e95bd802eada5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965543acff6ec3c9393855615… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:09 2012 +0100 msvcp80: Forward functions that are using String_iterators to msvcp90. --- dlls/msvcp80/msvcp80.spec | 132 ++++++++++++++++++++++---------------------- 1 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=965543acff6ec3c939385…

1 0

Piotr Caban : msvcp90: Added wctrans and towctrans implementation.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: a71acb30764077e376d7c489994f2245308fe9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71acb30764077e376d7c4899… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 10:53:37 2012 +0100 msvcp90: Added wctrans and towctrans implementation. --- dlls/msvcp90/locale.c | 22 ++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 4 ++-- include/msvcrt/wctype.h | 5 +++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 31beeee..c3f48d9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -26,6 +26,7 @@ #include "limits.h" #include "math.h" #include "stdio.h" +#include "wctype.h" #include "wine/list.h" @@ -8541,6 +8542,27 @@ locale* __cdecl locale_global(locale *ret, const locale *loc) return ret; } +/* wctrans */ +wctrans_t __cdecl wctrans(const char *property) +{ + static const char str_tolower[] = "tolower"; + static const char str_toupper[] = "toupper"; + + if(!strcmp(property, str_tolower)) + return 2; + if(!strcmp(property, str_toupper)) + return 1; + return 0; +} + +/* towctrans */ +wint_t __cdecl towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return towupper(c); + return towlower(c); +} + DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@"); DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@"); DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)_W@std@@"); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 742f162..e512acb 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5807,8 +5807,8 @@ @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk -@ stub towctrans -@ stub wctrans +@ cdecl towctrans(long long) +@ cdecl wctrans(str) @ cdecl wctype(str) #Functions not exported in native dll: diff --git a/include/msvcrt/wctype.h b/include/msvcrt/wctype.h index d6bed60..81c2e22 100644 --- a/include/msvcrt/wctype.h +++ b/include/msvcrt/wctype.h @@ -68,6 +68,11 @@ wchar_t __cdecl towlower(wchar_t); wchar_t __cdecl towupper(wchar_t); #endif /* _WCTYPE_DEFINED */ +typedef wchar_t wctrans_t; +wint_t __cdecl towctrans(wint_t,wctrans_t); +wctrans_t __cdecl wctrans(const char *); +wctype_t __cdecl wctype(const char *); + #ifdef __cplusplus } #endif

1 0