Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Make advapi32 Winetest do a basic check instead of assuming that the routine won't fail

Browse source 
svn path=/trunk/; revision=38232
This commit is contained in:
Stefan Ginsberg 2008-12-21 16:29:23 +00:00
parent 41556963b7
commit 66bbcfb1cc
2 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
rostests/winetests/advapi32/roshack.diff
View file

@ -3,21 +3,46 @@ Index: security.c
--- security.c (revision 37998)
+++ security.c (working copy)
@@ -2665,13 +2665,17 @@
return;
}
+ /* ReactOS Hack: ros' Security Descriptor string parsing sucks */
+ skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n");
+ return;
+
ok(pConvertStringSecurityDescriptorToSecurityDescriptorA(
"O:SY"
"G:S-1-5-21-93476-23408-4576"
"D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)"
"(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"
"S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)",
- SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n");
+ SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and 'sec' isn't set
test_SetSecurityDescriptorControl(sec);
return;
}
+ /* ReactOS Hack: ros' Security Descriptor string parsing sucks */
+ skip("ROS-HACK: Skipping 'test_PrivateObjectSecurity' -- ros' SID string parsing sucks\n");
+ return;
+
ok(pConvertStringSecurityDescriptorToSecurityDescriptorA(
"O:SY"
"G:S-1-5-21-93476-23408-4576"
"D:(A;NP;GAGXGWGR;;;SU)(A;IOID;CCDC;;;SU)"
"(D;OICI;0xffffffff;;;S-1-5-21-93476-23408-4576)"
"S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)",
- SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n");
+ SDDL_REVISION_1, &sec, &dwDescSize), "Creating descriptor failed\n"); // FIXME: ConvertStringSecurityDescriptorToSecurityDescriptor fails and 'sec' isn't set
test_SetSecurityDescriptorControl(sec);
===================================================================
--- security.c (revision 38229)
+++ security.c (working copy)
@@ -2840,6 +2840,7 @@
/* If we don't ask for the security descriptor, Windows will still give us
the other stuff, leaving us no way to free it. */
+ dacl = NULL;
ret = pGetSecurityInfo(obj, SE_FILE_OBJECT,
OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
&owner, &group, &dacl, NULL, NULL);
@@ -2847,8 +2848,12 @@
ok(owner != NULL, "GetSecurityInfo\n");
ok(group != NULL, "GetSecurityInfo\n");
ok(dacl != NULL, "GetSecurityInfo\n");
- ok(IsValidAcl(dacl), "GetSecurityInfo\n");
+ if (dacl != NULL)
+ {
+ ok(IsValidAcl(dacl), "GetSecurityInfo\n");
+ }
+
CloseHandle(obj);
}

7
rostests/winetests/advapi32/security.c
View file

@ -2840,6 +2840,7 @@ static void test_GetSecurityInfo(void)
/* If we don't ask for the security descriptor, Windows will still give us
the other stuff, leaving us no way to free it. */
dacl = NULL;
ret = pGetSecurityInfo(obj, SE_FILE_OBJECT,
OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION,
&owner, &group, &dacl, NULL, NULL);
@ -2847,7 +2848,11 @@ static void test_GetSecurityInfo(void)
ok(owner != NULL, "GetSecurityInfo\n");
ok(group != NULL, "GetSecurityInfo\n");
ok(dacl != NULL, "GetSecurityInfo\n");
ok(IsValidAcl(dacl), "GetSecurityInfo\n");
if (dacl != NULL)
{
ok(IsValidAcl(dacl), "GetSecurityInfo\n");
}
CloseHandle(obj);
}