wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Piotr Caban : msvcp60: Fixed handling of empty strings.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 95c4284822853c1a0c7227aa38174e61337a07fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95c4284822853c1a0c7227aa3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:08 2012 +0100 msvcp60: Fixed handling of empty strings. --- dlls/msvcp60/string.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index d2e1c81..2b890fa 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -236,7 +236,8 @@ void __thiscall basic_string_char__Split(basic_string_char *this) len = this->size; basic_string_char__Tidy(this, TRUE); if(basic_string_char__Grow(this, len, FALSE)) { - char_traits_char__Copy_s(this->ptr, this->res, ptr, len); + if(ptr) + char_traits_char__Copy_s(this->ptr, this->res, ptr, len); basic_string_char__Eos(this, len); } } @@ -345,8 +346,8 @@ basic_string_char* __thiscall basic_string_char_assign_substr( basic_string_char_erase(this, pos+len, basic_string_char_npos); basic_string_char_erase(this, 0, pos); } else if(basic_string_char__Grow(this, len, FALSE)) { - char_traits_char__Copy_s(this->ptr, this->res, - assign->ptr+pos, len); + if(assign->ptr) + char_traits_char__Copy_s(this->ptr, this->res, assign->ptr+pos, len); basic_string_char__Eos(this, len); } @@ -1149,8 +1150,9 @@ basic_string_char* __thiscall basic_string_char_append_substr(basic_string_char _Xlen(); if(basic_string_char__Grow(this, this->size+count, FALSE)) { - char_traits_char__Copy_s(this->ptr+this->size, - this->res-this->size, append->ptr+offset, count); + if(append->ptr) + char_traits_char__Copy_s(this->ptr+this->size, this->res-this->size, + append->ptr+offset, count); basic_string_char__Eos(this, this->size+count); } @@ -1763,7 +1765,8 @@ MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, _Xran(); if(count > this->size-off) count = this->size-off; - char_traits_char__Copy_s(dest, count, this->ptr+off, count); + if(this->ptr) + char_traits_char__Copy_s(dest, count, this->ptr+off, count); return count; } @@ -1949,7 +1952,8 @@ void __thiscall basic_string_wchar__Split(basic_string_wchar *this) len = this->size; basic_string_wchar__Tidy(this, TRUE); if(basic_string_wchar__Grow(this, len, FALSE)) { - char_traits_wchar__Copy_s(this->ptr, this->res, ptr, len); + if(ptr) + char_traits_wchar__Copy_s(this->ptr, this->res, ptr, len); basic_string_wchar__Eos(this, len); } } @@ -2058,8 +2062,9 @@ basic_string_wchar* __thiscall basic_string_wchar_assign_substr( basic_string_wchar_erase(this, pos+len, basic_string_wchar_npos); basic_string_wchar_erase(this, 0, pos); } else if(basic_string_wchar__Grow(this, len, FALSE)) { - char_traits_wchar__Copy_s(this->ptr, this->res, - assign->ptr+pos, len); + if(assign->ptr) + char_traits_wchar__Copy_s(this->ptr, this->res, + assign->ptr+pos, len); basic_string_wchar__Eos(this, len); } @@ -2861,8 +2866,9 @@ basic_string_wchar* __thiscall basic_string_wchar_append_substr(basic_string_wch _Xlen(); if(basic_string_wchar__Grow(this, this->size+count, FALSE)) { - char_traits_wchar__Copy_s(this->ptr+this->size, - this->res-this->size, append->ptr+offset, count); + if(append->ptr) + char_traits_wchar__Copy_s(this->ptr+this->size, this->res-this->size, + append->ptr+offset, count); basic_string_wchar__Eos(this, this->size+count); } @@ -3475,7 +3481,8 @@ MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, _Xran(); if(count > this->size-off) count = this->size-off; - char_traits_wchar__Copy_s(dest, count, this->ptr+off, count); + if(this->ptr) + char_traits_wchar__Copy_s(dest, count, this->ptr+off, count); return count; }

1 0

Piotr Caban : msvcp60: Export basic_ostream constructors.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 4f4f93802a1472e12c499d50a2d30c3e78877723 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4f93802a1472e12c499d50a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:43:58 2012 +0100 msvcp60: Export basic_ostream constructors. --- dlls/msvcp60/ios.c | 110 +++++++++++++++++++++------------------------ dlls/msvcp60/msvcp60.spec | 16 +++--- 2 files changed, 60 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f4f93802a1472e12c499…

1 0

Piotr Caban : msvcp60: Added basic_stringbuf::_Mode implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: eae21a1fbf9f157ae172d227de49645330dafb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae21a1fbf9f157ae172d227d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:43:48 2012 +0100 msvcp60: Added basic_stringbuf::_Mode implementation. --- dlls/msvcp60/ios.c | 12 +++++++++--- dlls/msvcp60/msvcp60.spec | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 02e903d..e597a7e 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -275,9 +275,9 @@ typedef enum { typedef struct { basic_streambuf_char base; - streamsize minsize; char *endsave; char *seekhigh; + streamsize minsize; int strmode; void* (__cdecl *palloc)(MSVCP_size_t); void (__cdecl *pfree)(void*); @@ -3279,7 +3279,10 @@ int __thiscall basic_filebuf_wchar_sync(basic_filebuf_wchar *this) /* ?_Getstate@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z */ /* ?_Getstate@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z */ -static int basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode) +/* ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z */ +/* ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_stringbuf_char__Getstate, 8) +int __thiscall basic_stringbuf_char__Getstate(basic_stringbuf_char *this, IOSB_openmode mode) { int state = 0; @@ -3645,7 +3648,10 @@ basic_string_char* __thiscall basic_stringbuf_char_str_get(const basic_stringbuf /* ?_Getstate@?$basic_stringbuf@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@AEAAHH@Z */ /* ?_Getstate@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z */ /* ?_Getstate@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z */ -static int basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode) +/* ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z */ +/* ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z */ +DEFINE_THISCALL_WRAPPER(basic_stringbuf_wchar__Getstate, 8) +int __thiscall basic_stringbuf_wchar__Getstate(basic_stringbuf_wchar *this, IOSB_openmode mode) { int state = 0; diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 8dcf374..abcc88e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2303,10 +2303,10 @@ @ stub -arch=win64 ?_Makpat@?$_Mpunct@D@std@@AEAAXAEAUpattern@money_base@2@DDD@Z @ stub -arch=win32 ?_Makpat@?$_Mpunct@G@std@@AAEXAAUpattern@money_base@2@DDD@Z @ stub -arch=win64 ?_Makpat@?$_Mpunct@G@std@@AEAAXAEAUpattern@money_base@2@DDD@Z -@ stub -arch=win32 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z -@ stub -arch=win64 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z -@ stub -arch=win32 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z -@ stub -arch=win64 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z +@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z(ptr long) basic_stringbuf_char__Getstate +@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAHH@Z(ptr long) basic_stringbuf_char__Getstate +@ thiscall -arch=win32 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEHH@Z(ptr long) basic_stringbuf_wchar__Getstate +@ cdecl -arch=win64 ?_Mode@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAAHH@Z(ptr long) basic_stringbuf_wchar__Getstate @ stub ?_Nanv@?$_Ctr@M@std@@SAMM@Z @ stub ?_Nanv@?$_Ctr@N@std@@SANN@Z @ stub ?_Nanv@?$_Ctr@O@std@@SAOO@Z

1 0

Frédéric Delanoy : msi: Fix leaks in ITERATE_InstallService (coverity).
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 098b3c72941c810a8b4f2712e70654312bba5857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098b3c72941c810a8b4f2712e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 16 11:50:28 2012 +0100 msi: Fix leaks in ITERATE_InstallService (coverity). --- dlls/msi/action.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2bf0ed5..246b90c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5752,6 +5752,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; + UINT ret = ERROR_SUCCESS; comp = MSI_RecordGetString( rec, 12 ); component = msi_get_loaded_component( package, comp ); @@ -5809,7 +5810,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { int len = strlenW(file->TargetPath) + strlenW(args) + 2; if (!(image_path = msi_alloc(len * sizeof(WCHAR)))) - return ERROR_OUTOFMEMORY; + { + ret = ERROR_OUTOFMEMORY; + goto done; + } strcpyW(image_path, file->TargetPath); strcatW(image_path, szSpace); @@ -5843,7 +5847,7 @@ done: msi_free(depends); msi_free(args); - return ERROR_SUCCESS; + return ret; } static UINT ACTION_InstallServices( MSIPACKAGE *package )

1 0

Frédéric Delanoy : msi: Fix leaks in stop_service_dependents (coverity).
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: cac26d47a0400788de4782691780f2db1aa04eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac26d47a0400788de4782691… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 16 11:50:27 2012 +0100 msi: Fix leaks in stop_service_dependents (coverity). --- dlls/msi/action.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 833bc67..2bf0ed5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6043,6 +6043,7 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) ENUM_SERVICE_STATUSW *dependencies; SERVICE_STATUS ss; SC_HANDLE depserv; + BOOL stopped, ret = FALSE; if (EnumDependentServicesW(service, SERVICE_ACTIVE, NULL, 0, &needed, &count)) @@ -6057,24 +6058,26 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) if (!EnumDependentServicesW(service, SERVICE_ACTIVE, dependencies, needed, &needed, &count)) - goto error; + goto done; for (i = 0; i < count; i++) { depserv = OpenServiceW(scm, dependencies[i].lpServiceName, SERVICE_STOP | SERVICE_QUERY_STATUS); if (!depserv) - goto error; + goto done; - if (!ControlService(depserv, SERVICE_CONTROL_STOP, &ss)) - goto error; + stopped = ControlService(depserv, SERVICE_CONTROL_STOP, &ss); + CloseServiceHandle(depserv); + if (!stopped) + goto done; } - return TRUE; + ret = TRUE; -error: +done: msi_free(dependencies); - return FALSE; + return ret; } static UINT stop_service( LPCWSTR name )

1 0

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

16 Nov '12

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

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

16 Nov '12

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

Nikolay Sivov : msxml3: Stub support for external entity resolver.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 7a00f31ecf0b5bf86cf38cb262540419d571de44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a00f31ecf0b5bf86cf38cb26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 16 16:46:36 2012 -0500 msxml3: Stub support for external entity resolver. --- dlls/msxml3/saxreader.c | 49 +++++++++++++++++++--------------------- dlls/msxml3/tests/saxreader.c | 9 +++++++ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 21c5b4f..073a00c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -168,6 +168,7 @@ enum saxhandler_type SAXContentHandler = 0, SAXDeclHandler, SAXDTDHandler, + SAXEntityResolver, SAXErrorHandler, SAXLexicalHandler, SAXHandler_Last @@ -197,10 +198,17 @@ struct saxlexicalhandler_iface IVBSAXLexicalHandler *vbhandler; }; +struct saxentityresolver_iface +{ + ISAXEntityResolver *handler; + IVBSAXEntityResolver *vbhandler; +}; + struct saxhandler_iface { union { struct saxcontenthandler_iface content; + struct saxentityresolver_iface entityresolver; struct saxerrorhandler_iface error; struct saxlexicalhandler_iface lexical; struct saxanyhandler_iface anyhandler; @@ -1843,6 +1851,12 @@ static void libxmlCDataBlock(void *ctx, const xmlChar *value, int len) This->column += 4+end-cur; } +static xmlParserInputPtr libxmlresolveentity(void *ctx, const xmlChar *publicid, const xmlChar *systemid) +{ + FIXME("entity resolving not implemented, %s, %s\n", publicid, systemid); + return xmlSAX2ResolveEntity(ctx, publicid, systemid); +} + /*** IVBSAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI ivbsaxlocator_QueryInterface(IVBSAXLocator* iface, REFIID riid, void **ppvObject) @@ -2377,24 +2391,6 @@ static HRESULT internal_parseStream(saxreader *This, ISequentialStream *stream, return hr; } -static HRESULT internal_getEntityResolver( - saxreader *This, - void *pEntityResolver, - BOOL vbInterface) -{ - FIXME("(%p)->(%p) stub\n", This, pEntityResolver); - return E_NOTIMPL; -} - -static HRESULT internal_putEntityResolver( - saxreader *This, - void *pEntityResolver, - BOOL vbInterface) -{ - FIXME("(%p)->(%p) stub\n", This, pEntityResolver); - return E_NOTIMPL; -} - static HRESULT internal_parse( saxreader* This, VARIANT varInput, @@ -2877,18 +2873,18 @@ static HRESULT WINAPI saxxmlreader_putProperty( static HRESULT WINAPI saxxmlreader_get_entityResolver( IVBSAXXMLReader* iface, - IVBSAXEntityResolver **pEntityResolver) + IVBSAXEntityResolver **resolver) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - return internal_getEntityResolver(This, pEntityResolver, TRUE); + return saxreader_get_handler(This, SAXEntityResolver, TRUE, (void**)resolver); } static HRESULT WINAPI saxxmlreader_put_entityResolver( IVBSAXXMLReader* iface, - IVBSAXEntityResolver *pEntityResolver) + IVBSAXEntityResolver *resolver) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - return internal_putEntityResolver(This, pEntityResolver, TRUE); + return saxreader_put_handler(This, SAXEntityResolver, resolver, TRUE); } static HRESULT WINAPI saxxmlreader_get_contentHandler( @@ -3084,18 +3080,18 @@ static HRESULT WINAPI isaxxmlreader_putProperty( static HRESULT WINAPI isaxxmlreader_getEntityResolver( ISAXXMLReader* iface, - ISAXEntityResolver **ppEntityResolver) + ISAXEntityResolver **resolver) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return internal_getEntityResolver(This, ppEntityResolver, FALSE); + return saxreader_get_handler(This, SAXEntityResolver, FALSE, (void**)resolver); } static HRESULT WINAPI isaxxmlreader_putEntityResolver( ISAXXMLReader* iface, - ISAXEntityResolver *pEntityResolver) + ISAXEntityResolver *resolver) { saxreader *This = impl_from_ISAXXMLReader( iface ); - return internal_putEntityResolver(This, pEntityResolver, FALSE); + return saxreader_put_handler(This, SAXEntityResolver, resolver, FALSE); } static HRESULT WINAPI isaxxmlreader_getContentHandler( @@ -3264,6 +3260,7 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->sax.error = libxmlFatalError; reader->sax.fatalError = libxmlFatalError; reader->sax.cdataBlock = libxmlCDataBlock; + reader->sax.resolveEntity = libxmlresolveentity; *ppObj = &reader->IVBSAXXMLReader_iface; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index bcf7529..02bc00c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1903,6 +1903,7 @@ static void test_saxreader(void) while (table->clsid) { struct call_entry *test_seq; + ISAXEntityResolver *resolver; BSTR str; if (!is_clsid_supported(table->clsid, reader_support_data)) @@ -2220,6 +2221,14 @@ static void test_saxreader(void) EXPECT_HR(hr, S_OK); ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + resolver = (void*)0xdeadbeef; + hr = ISAXXMLReader_getEntityResolver(reader, &resolver); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(resolver == NULL, "got %p\n", resolver); + + hr = ISAXXMLReader_putEntityResolver(reader, NULL); + ok(hr == S_OK || broken(hr == E_FAIL), "got 0x%08x\n", hr); + ISAXXMLReader_Release(reader); table++; }

1 0

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

16 Nov '12

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

Jacek Caban : wininet: Fixed HTTP CONNECT secure connection.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: bd42c0416a5db8c607d7dd7bf1576d68af4ca895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd42c0416a5db8c607d7dd7bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 16 14:39:16 2012 +0100 wininet: Fixed HTTP CONNECT secure connection. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1c24153..3eb0b8d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4743,7 +4743,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if(request->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn); + res = NETCON_secure_connect(request->netconn, request->server); } if(res != ERROR_SUCCESS) { diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 3873855..1baaf2a 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -538,7 +538,7 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP DWORD create_netconn(BOOL,server_t*,DWORD,BOOL,DWORD,netconn_t**) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t *connection) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 2abb676..a792a92 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -707,7 +707,6 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m if(!netconn) return ERROR_OUTOFMEMORY; - netconn->useSSL = useSSL; netconn->socketFD = -1; netconn->security_flags = security_flags | server->security_flags; netconn->mask_errors = mask_errors; @@ -903,7 +902,7 @@ fail: * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(netconn_t *connection) +DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -914,6 +913,13 @@ DWORD NETCON_secure_connect(netconn_t *connection) return ERROR_INTERNET_CANNOT_CONNECT; } + connection->useSSL = TRUE; + if(server != connection->server) { + server_release(connection->server); + server_addref(server); + connection->server = server; + } + /* connect with given TLS options */ res = netcon_secure_connect_setup(connection, get_tls_option()); if (res == ERROR_SUCCESS)

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012