July 2007 - Wine-Commits - list.winehq.org

Paul Vriens : advapi32/service: Check for duplicate displayname.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: f8f6340a692afc199f171edd03fd295fe3fb0a7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8f6340a692afc199f171edd0… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Jul 18 20:17:35 2007 +0200 advapi32/service: Check for duplicate displayname. --- dlls/advapi32/service.c | 55 +++++++++++++++++++++++++++++++++++++--- dlls/advapi32/tests/service.c | 10 ------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 3fbd242..76f8290 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -1309,6 +1309,9 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, struct reg_value val[10]; int n = 0; DWORD new_mask = dwDesiredAccess; + DWORD index = 0; + WCHAR buffer[MAX_PATH]; + BOOL displayname_exists = FALSE; TRACE("%p %s %s\n", hSCManager, debugstr_w(lpServiceName), debugstr_w(lpDisplayName)); @@ -1385,15 +1388,57 @@ CreateServiceW( SC_HANDLE hSCManager, LPCWSTR lpServiceName, return NULL; } + /* Loop through the registry to check if the service already exists and to + * check if we can use the given displayname. + * FIXME: Should we use EnumServicesStatusEx? + */ + len = sizeof(buffer); + while (RegEnumKeyExW(hscm->hkey, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + HKEY service_key; + + /* The service already exists, so bail out */ + if(!lstrcmpiW(lpServiceName, buffer)) + { + SetLastError(ERROR_SERVICE_EXISTS); + return NULL; + } + + /* The given displayname matches the found servicename. We don't bail out + * as servicename is checked before a duplicate displayname + */ + if(!lstrcmpiW(lpDisplayName, buffer)) + displayname_exists = TRUE; + + if (RegOpenKeyExW(hscm->hkey, buffer, 0, KEY_READ, &service_key) == ERROR_SUCCESS) + { + WCHAR name[MAX_PATH]; + DWORD size = sizeof(name); + + if (RegQueryValueExW(service_key, szDisplayName, NULL, NULL, (LPBYTE)name, &size) == ERROR_SUCCESS) + { + /* The given displayname matches the found displayname */ + if (!lstrcmpiW(lpDisplayName, name)) + displayname_exists = TRUE; + } + RegCloseKey(service_key); + } + index++; + len = sizeof(buffer); + } + + if (lpDisplayName && displayname_exists) + { + SetLastError(ERROR_DUPLICATE_SERVICE_NAME); + return NULL; + } + r = RegCreateKeyExW(hscm->hkey, lpServiceName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &hKey, &dp); if (r!=ERROR_SUCCESS) - return NULL; - - if (dp != REG_CREATED_NEW_KEY) { - SetLastError(ERROR_SERVICE_EXISTS); - goto error; + /* FIXME: Should we set an error? */ + return NULL; } if( lpDisplayName ) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index ff38d79..0547686 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -315,24 +315,14 @@ static void test_create_delete_svc(void) { svc_handle1 = CreateServiceA(scm_handle, servicename, display, 0, SERVICE_WIN32_OWN_PROCESS, SERVICE_DISABLED, 0, pathname, NULL, NULL, NULL, NULL, NULL); - todo_wine - { ok(!svc_handle1, "Expected failure\n"); ok(GetLastError() == ERROR_DUPLICATE_SERVICE_NAME, "Expected ERROR_DUPLICATE_SERVICE_NAME, got %d\n", GetLastError()); - } } } else skip("Could not retrieve a displayname (Spooler service doesn't exist)\n"); - /* FIXME: Remove this when Wine is fixed */ - if (svc_handle1) - { - DeleteService(svc_handle1); - CloseServiceHandle(svc_handle1); - } - CloseServiceHandle(scm_handle); }

1 0

Rob Shearman : advapi32: Add tests for ConvertStringSecurityDescriptorToSecurityDescriptor.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 4fdf90d406fcfe78b93b686fdc209548233dcb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fdf90d406fcfe78b93b686fd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 18 18:13:25 2007 +0100 advapi32: Add tests for ConvertStringSecurityDescriptorToSecurityDescriptor. --- dlls/advapi32/tests/security.c | 98 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 247827c..f67f0a6 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1758,6 +1758,103 @@ static void test_GetNamedSecurityInfoA(void) ok(group != NULL, "group should not be NULL\n"); } +static void test_ConvertSecurityStringSecurityDescriptor(void) +{ + BOOL ret; + PSECURITY_DESCRIPTOR pSD; + + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;GA;;;WD)", 0xdeadbeef, &pSD, NULL); + ok(!ret && GetLastError() == ERROR_UNKNOWN_REVISION, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_UNKNOWN_REVISION instead of %d\n", + GetLastError()); + + /* test ACE string type */ + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "ERROR:(D;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_PARAMETER instead of %d\n", + GetLastError()); + + /* test ACE string access rights */ + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;GA;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;GRGWGX;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;RCSDWDWO;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;RPWPCCDCLCSWLODTCR;;;WD)", SDDL_REVISION_1, &pSD, NULL); + todo_wine + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;FAFRFWFX;;;WD)", SDDL_REVISION_1, &pSD, NULL); + todo_wine + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, &pSD, NULL); + todo_wine + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + + /* test ACE string access right error case */ + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(A;;ROB;;;WD)", SDDL_REVISION_1, &pSD, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_ACL, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n", + GetLastError()); + + /* test ACE string SID */ + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(D;;GA;;;S-1-0-0)", SDDL_REVISION_1, &pSD, NULL); + ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); + LocalFree(pSD); + + SetLastError(0xdeadbeef); + ret = ConvertStringSecurityDescriptorToSecurityDescriptor( + "D:(D;;GA;;;Non existant account)", SDDL_REVISION_1, &pSD, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_ACL, + "ConvertStringSecurityDescriptorToSecurityDescriptor should have failed with ERROR_INVALID_ACL instead of %d\n", + GetLastError()); +} + START_TEST(security) { init(); @@ -1780,4 +1877,5 @@ START_TEST(security) test_impersonation_level(); test_SetEntriesInAcl(); test_GetNamedSecurityInfoA(); + test_ConvertSecurityStringSecurityDescriptor(); }

1 0

Rob Shearman : advapi32: Set the right pointer so that StringAcl is updated correct in ParseAceStringRights .
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: ccfa9ad8df1c866cfb0267568f6b1254c5049439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfa9ad8df1c866cfb0267568… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 18 18:12:43 2007 +0100 advapi32: Set the right pointer so that StringAcl is updated correct in ParseAceStringRights. The number of allowed hex digits should be 8, not 6. --- dlls/advapi32/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index aa51515..7de2ab8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3125,10 +3125,10 @@ static DWORD ParseAceStringRights(LPCWSTR* StringAcl) while (*p && *p != ';') p++; - if (p - szAcl <= 8) + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) { rights = strtoulW(szAcl, NULL, 16); - *StringAcl = p; + szAcl = p; } else WARN("Invalid rights string format: %s\n", debugstr_wn(szAcl, p - szAcl));

1 0

Rob Shearman : advapi32: Add the size of the security descriptor structure to the size of memory required in ParseStringSecurityDescriptorToSecurityDescriptor .
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 4d5ce383f52992d04f75558989675e0f9c452efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d5ce383f52992d04f7555898… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 18 18:09:16 2007 +0100 advapi32: Add the size of the security descriptor structure to the size of memory required in ParseStringSecurityDescriptorToSecurityDescriptor. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 41a3aef..48d795f 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3266,7 +3266,7 @@ static BOOL ParseStringSecurityDescriptorToSecurityDescriptor( LPBYTE lpNext = NULL; DWORD len; - *cBytes = 0; + *cBytes = sizeof(SECURITY_DESCRIPTOR); if (SecurityDescriptor) lpNext = ((LPBYTE) SecurityDescriptor) + sizeof(SECURITY_DESCRIPTOR);

1 0

Huw Davies : wininet: Stubs for IsUrlCacheEntryExpired[AW].
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 3f2d93b51260fde45ca5e252044ab066d4acaead URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2d93b51260fde45ca5e2520… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 18 16:08:41 2007 +0100 wininet: Stubs for IsUrlCacheEntryExpired[AW]. --- dlls/wininet/urlcache.c | 28 ++++++++++++++++++++++++++++ dlls/wininet/wininet.spec | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 42f3ba9..5f6ac8d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2885,3 +2885,31 @@ void WINAPI DeleteIE3Cache(HWND hWnd, HINSTANCE hInst, LPSTR lpszCmdLine, int nC { FIXME("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_a(lpszCmdLine), nCmdShow); } + +/*********************************************************************** + * IsUrlCacheEntryExpiredA (WININET.@) + * + * PARAMS + * url [I] Url + * b Unknown + * c Unknown ptr + */ +DWORD WINAPI IsUrlCacheEntryExpiredA( LPCSTR url, DWORD b, void *c ) +{ + FIXME("(%s, %08x, %p) stub\n", debugstr_a(url), b, c); + return FALSE; +} + +/*********************************************************************** + * IsUrlCacheEntryExpiredW (WININET.@) + * + * PARAMS + * url [I] Url + * b Unknown + * c Unknown ptr + */ +DWORD WINAPI IsUrlCacheEntryExpiredW( LPCWSTR url, DWORD b, void *c ) +{ + FIXME("(%s, %08x, %p) stub\n", debugstr_w(url), b, c); + return FALSE; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index f670ba9..3722546 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -209,8 +209,8 @@ @ stub InternetWriteFileExA @ stub InternetWriteFileExW @ stdcall IsHostInProxyBypassList(long str long) -@ stub IsUrlCacheEntryExpiredA -@ stub IsUrlCacheEntryExpiredW +@ stdcall IsUrlCacheEntryExpiredA(str long ptr) +@ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stub LoadUrlCacheContent @ stub ParseX509EncodedCertificateForListBoxEntry @ stub PrivacyGetZonePreferenceW # (long long ptr ptr ptr)

1 0

Rob Shearman : advapi32: Fix ComputeStringSidSize to work with SIDs with one sub authority.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: f56fe2c1bc9627ea4f47c2000ea7526b1b503f3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f56fe2c1bc9627ea4f47c2000… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 18 18:06:36 2007 +0100 advapi32: Fix ComputeStringSidSize to work with SIDs with one sub authority. Use GetSidLengthRequired instead of computing the length in a way that won't always be correct. --- dlls/advapi32/security.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b46a6f7..0f067de 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3743,9 +3743,7 @@ BOOL WINAPI EnumDependentServicesW( */ static DWORD ComputeStringSidSize(LPCWSTR StringSid) { - DWORD size = sizeof(SID); - - if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I(-S)+ */ { int ctok = 0; while (*StringSid) @@ -3755,8 +3753,8 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid) StringSid++; } - if (ctok > 3) - size += (ctok - 3) * sizeof(DWORD); + if (ctok >= 3) + return GetSidLengthRequired(ctok - 2); } else /* String constant format - Only available in winxp and above */ { @@ -3764,10 +3762,10 @@ static DWORD ComputeStringSidSize(LPCWSTR StringSid) for (i = 0; i < sizeof(WellKnownSids)/sizeof(WellKnownSids[0]); i++) if (!strncmpW(WellKnownSids[i].wstr, StringSid, 2)) - size += (WellKnownSids[i].Sid.SubAuthorityCount - 1) * sizeof(DWORD); + return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); } - return size; + return GetSidLengthRequired(0); } /****************************************************************************** @@ -3796,7 +3794,7 @@ static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes) if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ { DWORD i = 0, identAuth; - DWORD csubauth = ((*cBytes - sizeof(SID)) / sizeof(DWORD)) + 1; + DWORD csubauth = ((*cBytes - GetSidLengthRequired(0)) / sizeof(DWORD)); StringSid += 2; /* Advance to Revision */ pisid->Revision = atoiW(StringSid);

1 0

Rob Shearman : advapi32: Fix a typo in ParseStringAclToAcl which caused the ACE to be written inside of the ACL memory .
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 60d847b074d27bc7a5bd1d1908d5126d497b80de URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d847b074d27bc7a5bd1d190… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 18 18:07:29 2007 +0100 advapi32: Fix a typo in ParseStringAclToAcl which caused the ACE to be written inside of the ACL memory. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0f067de..41a3aef 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3178,7 +3178,7 @@ static BOOL ParseStringAclToAcl(LPCWSTR StringAcl, LPDWORD lpdwFlags, return FALSE; if (pAcl) /* pAce is only useful if we're setting values */ - pAce = (PACCESS_ALLOWED_ACE) ((LPBYTE)pAcl + sizeof(PACL)); + pAce = (PACCESS_ALLOWED_ACE) (pAcl + 1); /* Parse ACL flags */ *lpdwFlags = ParseAclStringFlags(&StringAcl);

1 0

Huw Davies : wininet: Certain options of InternetQueryOption can take a NULL handle, so don' t do the NULL handle check at the beginning.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: d9bdf793fe32a69ef29aa40096b410a4a3c67d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9bdf793fe32a69ef29aa4009… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 18 14:44:20 2007 +0100 wininet: Certain options of InternetQueryOption can take a NULL handle, so don't do the NULL handle check at the beginning. --- dlls/wininet/internet.c | 10 +++++----- dlls/wininet/tests/internet.c | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 32891be..cb38297 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1943,11 +1943,6 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d TRACE("(%p, 0x%08x, %p, %p)\n", hInternet, dwOption, lpBuffer, lpdwBufferLength); lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); - if (!lpwhh) - { - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } switch (dwOption) { @@ -2214,6 +2209,11 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d break; case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: + if (!lpwhh) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } if (*lpdwBufferLength < sizeof(INTERNET_CERTIFICATE_INFOW)) { *lpdwBufferLength = sizeof(INTERNET_CERTIFICATE_INFOW); diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9c202ea..aa96391 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -214,6 +214,11 @@ static void test_null(void) ok( sz == lstrlenW(buffer), "sz wrong\n"); ok( !lstrcmpW(szExpect, buffer), "cookie data wrong\n"); } + + sz = sizeof(buffer); + r = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECTED_STATE, buffer, &sz); + ok(r == TRUE, "ret %d\n", r); + } START_TEST(internet)

1 0

Rob Shearman : advapi32: Don' t crash in ConvertStringSecurityDescriptorToSecurityDescriptorW if LocalAlloc fails .
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 6c24386e03ce78a47ff51cf14a663b39c775fc6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c24386e03ce78a47ff51cf14… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jul 18 18:11:37 2007 +0100 advapi32: Don't crash in ConvertStringSecurityDescriptorToSecurityDescriptorW if LocalAlloc fails. --- dlls/advapi32/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 48d795f..aa51515 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3451,6 +3451,7 @@ BOOL WINAPI ConvertStringSecurityDescriptorToSecurityDescriptorW( psd = *SecurityDescriptor = (SECURITY_DESCRIPTOR*) LocalAlloc( GMEM_ZEROINIT, cBytes); + if (!psd) goto lend; psd->Revision = SID_REVISION; psd->Control |= SE_SELF_RELATIVE;

1 0

Vitaliy Margolen : user32/test: Destroy no longer needed test dialog windows.
by Alexandre Julliard July 19, 2007

July 19, 2007

Module: wine Branch: master Commit: 9c9174efac6981b1c0d8b7c620f912799f70c54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9174efac6981b1c0d8b7c62… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jul 18 06:06:40 2007 -0600 user32/test: Destroy no longer needed test dialog windows. --- dlls/user32/tests/msg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f9387f..d04028c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9178,6 +9178,9 @@ static void test_dialog_messages(void) check_selection(hedit2, 0, 3); EndDialog(hdlg, 0); + DestroyWindow(hedit1); + DestroyWindow(hedit2); + DestroyWindow(hdlg); flush_sequence(); #undef set_selection @@ -9194,12 +9197,14 @@ static void test_dialog_messages(void) ok(IsWindow(hdlg), "CreateDialogParam failed\n"); ok_sequence(WmCreateDialogParamSeq_1, "CreateDialogParam_1", FALSE); EndDialog(hdlg, 0); + DestroyWindow(hdlg); flush_sequence(); hdlg = CreateDialogParam(0, "CLASS_TEST_DIALOG_2", 0, NULL, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); ok_sequence(WmCreateDialogParamSeq_2, "CreateDialogParam_2", FALSE); EndDialog(hdlg, 0); + DestroyWindow(hdlg); flush_sequence(); UnregisterClass(cls.lpszClassName, cls.hInstance);

1 0