wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Alexander Nicolaysen Sørnes : comment: Set default subject when replying
by Chris Morgan 23 Oct '07

23 Oct '07

Module: appdb Branch: master Commit: d5b029fc613cf880c815450e9bfdde326617a3a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d5b029fc613cf880c815450e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 13:25:44 2007 +0200 comment: Set default subject when replying --- include/comment.php | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/comment.php b/include/comment.php index e6646d7..8a5d1ba 100644 --- a/include/comment.php +++ b/include/comment.php @@ -232,19 +232,13 @@ class Comment { // body echo htmlify_urls($this->sBody), " \n"; - // only add RE: once - if(eregi("RE:", $this->sSubject)) - $sSubject = $this->sSubject; - else - $sSubject = "RE: ".$this->sSubject; - $oVersion = new version($this->iVersionId); $oM = new objectManager("comment", "Post new ocmment"); $oM->setReturnTo($oVersion->objectMakeUrl()); // reply post buttons echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId\">post new</a>] \n"; - echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId&sSubject=". - urlencode("$sSubject")."&iThread=$this->iCommentId\">reply to this</a>] \n"; + echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId". + "&iThread=$this->iCommentId\">reply to this</a>] \n"; echo "</td></tr>\n"; @@ -605,6 +599,17 @@ class Comment { echo html_frame_start($oRow->subject,500); echo htmlify_urls($oRow->body), " \n"; echo html_frame_end(); + + /* Set default reply subject */ + if(!$this->sSubject) + { + // Only add RE: once + if(eregi("RE:", $oRow->subject)) + $this->sSubject = $oRow->subject; + else + $this->sSubject = "RE: ".$oRow->subject; + } + } }

1 0

Alexander Dorofeyev : gdi32: Fix runaway loop because of unsigned comparison in BIDI_Reorder.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: cdca3018213e4b68561a107038604d6eb4a709a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdca3018213e4b68561a10703… Author: Alexander Dorofeyev <alexd14(a)hushmail.com> Date: Tue Oct 23 00:49:39 2007 -0700 gdi32: Fix runaway loop because of unsigned comparison in BIDI_Reorder. --- dlls/gdi32/bidi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 1853a84..1b7b856 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -1087,7 +1087,7 @@ BOOL BIDI_Reorder( i = done = 0; while (done < uCount) { - unsigned j, lastgood; + unsigned j; classify(lpOutString + done, chartype, uCount - done); /* limit text to first block */ i = resolveParagraphs(chartype, uCount - done); @@ -1140,7 +1140,7 @@ BOOL BIDI_Reorder( if (lpOrder) { - unsigned k; + int k, lastgood; for (j = lastgood = 0; j < i; ++j) if (levels[j] != levels[lastgood]) {

1 0

Alex Villacís Lasso : riched32: Skeleton of richedit 1.0 test plus WM_SETTEXT test.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 74cd5903e2b3c3ca51989b61781e1aba729d490a URL: http://source.winehq.org/git/wine.git/?a=commit;h=74cd5903e2b3c3ca51989b617… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Oct 22 10:47:59 2007 -0500 riched32: Skeleton of richedit 1.0 test plus WM_SETTEXT test. --- .gitignore | 4 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/riched32/tests/Makefile.in | 13 ++++ dlls/riched32/tests/editor.c | 142 +++++++++++++++++++++++++++++++++++++++ programs/winetest/Makefile.in | 3 + programs/winetest/winetest.rc | 1 + 9 files changed, 170 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74cd5903e2b3c3ca51989…

1 0

Rob Shearman : include: Remove duplicate ACL_REVISION1 and ACL_REVISION2 defines in winnt.h.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 2c742a38c49cbc70e9560afe36faba99ba35f7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c742a38c49cbc70e9560afe3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 23 15:19:07 2007 +0100 include: Remove duplicate ACL_REVISION1 and ACL_REVISION2 defines in winnt.h. Move the remaining ACL_REVISION define nearer to the other ACL revision defines. --- include/winnt.h | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index aecc2af..cd81087 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3400,6 +3400,8 @@ typedef struct _SID { #define MIN_ACL_REVISION ACL_REVISION2 #define MAX_ACL_REVISION ACL_REVISION4 +#define ACL_REVISION 2 + typedef struct _ACL { BYTE AclRevision; BYTE Sbz1; @@ -3893,11 +3895,6 @@ typedef struct _TOKEN_STATISTICS { * ACLs of NT */ -#define ACL_REVISION 2 - -#define ACL_REVISION1 1 -#define ACL_REVISION2 2 - /* ACEs, directly starting after an ACL */ typedef struct _ACE_HEADER { BYTE AceType;

1 0

Rob Shearman : ntdll: Add a stub for RtlSetControlSecurityDescriptor.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 6b081232b97c80d08cfec467ef0ca05e41b2a614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b081232b97c80d08cfec467e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 23 15:19:00 2007 +0100 ntdll: Add a stub for RtlSetControlSecurityDescriptor. Implement SetSecurityDescriptorControl on top of RtlSetControlSecurityDescriptor. --- dlls/advapi32/security.c | 21 +++++++++++---------- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/sec.c | 13 +++++++++++++ include/winternl.h | 1 + 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 4cab225..82de97b 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1363,6 +1363,17 @@ BOOL WINAPI GetSecurityDescriptorControl ( PSECURITY_DESCRIPTOR pSecurityDescri return set_ntstatus( RtlGetControlSecurityDescriptor(pSecurityDescriptor,pControl,lpdwRevision)); } +/****************************************************************************** + * SetSecurityDescriptorControl [ADVAPI32.@] + */ +BOOL WINAPI SetSecurityDescriptorControl( PSECURITY_DESCRIPTOR pSecurityDescriptor, + SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, + SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet ) +{ + return set_ntstatus( RtlSetControlSecurityDescriptor( + pSecurityDescriptor, ControlBitsOfInterest, ControlBitsToSet ) ); +} + /* ############################## ###### ACL FUNCTIONS ###### ############################## @@ -3077,16 +3088,6 @@ BOOL WINAPI SetPrivateObjectSecurity( SECURITY_INFORMATION SecurityInformation, return TRUE; } -BOOL WINAPI SetSecurityDescriptorControl( PSECURITY_DESCRIPTOR pSecurityDescriptor, - SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, - SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet ) -{ - FIXME("%p 0x%08x 0x%08x - stub\n", pSecurityDescriptor, ControlBitsOfInterest, - ControlBitsToSet); - - return TRUE; -} - BOOL WINAPI AreAllAccessesGranted( DWORD GrantedAccess, DWORD DesiredAccess ) { return RtlAreAllAccessesGranted( GrantedAccess, DesiredAccess ); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 30c6ab3..fc1a6c8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -813,7 +813,7 @@ @ stdcall RtlSetAllBits(ptr) # @ stub RtlSetAttributesSecurityDescriptor @ stdcall RtlSetBits(ptr long long) -# @ stub RtlSetControlSecurityDescriptor +@ stdcall RtlSetControlSecurityDescriptor(ptr long long) @ stdcall RtlSetCriticalSectionSpinCount(ptr long) @ stdcall RtlSetCurrentDirectory_U(ptr) @ stdcall RtlSetCurrentEnvironment(wstr ptr) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index a1c839d..0a9fa5c 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1030,6 +1030,19 @@ NTSTATUS WINAPI RtlGetControlSecurityDescriptor( return STATUS_SUCCESS; } +/****************************************************************************** + * RtlSetControlSecurityDescriptor (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetControlSecurityDescriptor( + PSECURITY_DESCRIPTOR SecurityDescriptor, + SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, + SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) +{ + FIXME("(%p 0x%08x 0x%08x): stub\n", SecurityDescriptor, ControlBitsOfInterest, + ControlBitsToSet); + return STATUS_SUCCESS; +} + /************************************************************************** * RtlAbsoluteToSelfRelativeSD [NTDLL.@] diff --git a/include/winternl.h b/include/winternl.h index df3a489..7ed801a 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2221,6 +2221,7 @@ NTSTATUS WINAPI RtlSelfRelativeToAbsoluteSD(PSECURITY_DESCRIPTOR,PSECURITY_DESC void WINAPI RtlSetAllBits(PRTL_BITMAP); void WINAPI RtlSetBits(PRTL_BITMAP,ULONG,ULONG); ULONG WINAPI RtlSetCriticalSectionSpinCount(RTL_CRITICAL_SECTION*,ULONG); +NTSTATUS WINAPI RtlSetControlSecurityDescriptor(PSECURITY_DESCRIPTOR,SECURITY_DESCRIPTOR_CONTROL,SECURITY_DESCRIPTOR_CONTROL); NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING*); void WINAPI RtlSetCurrentEnvironment(PWSTR, PWSTR*); NTSTATUS WINAPI RtlSetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: c4b1195c0c742cb925d2154fa81f0c81866af6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4b1195c0c742cb925d2154fa… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:30:30 2007 +0200 Assorted spelling fixes. --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/theming.c | 2 +- dlls/comdlg32/printdlg.c | 6 +++--- dlls/comdlg32/printdlg16.c | 2 +- dlls/crypt32/crypt32_private.h | 2 +- dlls/dplayx/dplay.c | 4 ++-- dlls/dsound/mixer.c | 2 +- dlls/gdi32/region.c | 4 ++-- dlls/msi/appsearch.c | 2 +- dlls/ole32/filemoniker.c | 4 ++-- dlls/ole32/ole2.c | 2 +- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/typelib.c | 2 +- dlls/opengl32/make_opengl | 4 ++-- dlls/riched20/rtf.h | 2 +- dlls/usp10/tests/usp10.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/winedos/dosaspi.c | 2 +- dlls/winejack.drv/audio.c | 4 ++-- dlls/winex11.drv/dib.c | 8 ++++---- dlls/winex11.drv/dib_convert.c | 12 ++++++------ dlls/winex11.drv/dib_dst_swap.c | 12 ++++++------ dlls/winex11.drv/dib_src_swap.c | 12 ++++++------ dlls/winex11.drv/mouse.c | 2 +- dlls/wininet/urlcache.c | 2 +- programs/explorer/systray.c | 2 +- programs/taskmgr/applpage.c | 2 +- programs/taskmgr/graphctl.c | 4 ++-- programs/winedbg/stack.c | 4 ++-- tools/winedump/README | 3 ++- 30 files changed, 59 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4b1195c0c742cb925d21…

1 0

Francois Gouget : Better match the PSDK types and update win32. api to fix the winapi_check warnings.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: b1335db353918324899e0206f4aabe85c74d4b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1335db353918324899e0206f… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:31:27 2007 +0200 Better match the PSDK types and update win32.api to fix the winapi_check warnings. --- dlls/advapi32/security.c | 2 +- dlls/cryptnet/cryptnet_main.c | 2 +- include/winbase.h | 2 +- tools/winapi/win32.api | 22 ++++++++++++++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 79f5a3a..4cab225 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -580,7 +580,7 @@ AdjustTokenGroups( HANDLE TokenHandle, BOOL ResetToDefault, PTOKEN_GROUPS NewSta BOOL WINAPI AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges, PTOKEN_PRIVILEGES NewState, DWORD BufferLength, - PTOKEN_PRIVILEGES PreviousState, LPDWORD ReturnLength ) + PTOKEN_PRIVILEGES PreviousState, PDWORD ReturnLength ) { NTSTATUS status; diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index dd66a10..603185d 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1305,7 +1305,7 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, * CertDllVerifyRevocation (CRYPTNET.@) */ BOOL WINAPI CertDllVerifyRevocation(DWORD dwEncodingType, DWORD dwRevType, - DWORD cContext, void *rgpvContext[], DWORD dwFlags, + DWORD cContext, PVOID rgpvContext[], DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { FIXME("(%08x, %d, %d, %p, %08x, %p, %p): stub\n", dwEncodingType, dwRevType, diff --git a/include/winbase.h b/include/winbase.h index 2734ecb..7ca6e84 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1253,7 +1253,7 @@ BOOL WINAPI AccessCheckAndAuditAlarmA(LPCSTR,LPVOID,LPSTR,LPSTR,PSECURITY BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LPWSTR,PSECURITY_DESCRIPTOR,DWORD,PGENERIC_MAPPING,BOOL,LPDWORD,LPBOOL,LPBOOL); #define AccessCheckAndAuditAlarm WINELIB_NAME_AW(AccessCheckAndAuditAlarm) BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); -BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,LPDWORD); +BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); BOOL WINAPI AllocateLocallyUniqueId(PLUID); BOOL WINAPI AreAllAccessesGranted(DWORD,DWORD); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 6864f2e..c3c33a6 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -147,6 +147,7 @@ PSID * PSID_IDENTIFIER_AUTHORITY PSID_NAME_USE PTOKEN_GROUPS +PTOKEN_PRIVILEGES PTRACE_GUID_REGISTRATION PTRACEHANDLE PTRUSTED_DOMAIN_AUTH_INFORMATION @@ -797,6 +798,27 @@ void LPCWSTR LPWSTR +%%cryptnet.dll + +%long + +BOOL +DWORD + +%ptr + +DWORD * +LPVOID +PCERT_REVOCATION_PARA +PCERT_REVOCATION_STATUS +PCRYPT_URL_ARRAY +PCRYPT_URL_INFO +PVOID[] + +%str + +LPCSTR + %%ctl3d32.dll %long

1 0

Francois Gouget : winex11: Remove some unneeded casts.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 602ab961c4b9596ed84ad2e0933b3c581b06fd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=602ab961c4b9596ed84ad2e09… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 23 15:32:38 2007 +0200 winex11: Remove some unneeded casts. --- dlls/winex11.drv/dib.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index e24bd96..65f90ee 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -614,7 +614,7 @@ static void X11DRV_DIB_GetImageBits_1( int lines, BYTE *dstbits, dstval=0; for (x=0; x<width; x++) { PALETTEENTRY srcval; - srcval=srccolors[(int)*srcpixel++]; + srcval=srccolors[*srcpixel++]; dstval|=(X11DRV_DIB_GetNearestIndex (colors, 2, srcval.peRed, @@ -998,7 +998,7 @@ static void X11DRV_DIB_GetImageBits_4( int lines, BYTE *dstbits, dstval=0; for (x=0; x<width; x++) { PALETTEENTRY srcval; - srcval = srccolors[(int)*srcpixel++]; + srcval = srccolors[*srcpixel++]; dstval|=(X11DRV_DIB_GetNearestIndex (colors, 16, srcval.peRed, @@ -1577,7 +1577,7 @@ static void X11DRV_DIB_GetImageBits_8( int lines, BYTE *dstbits, dstbyte=dstbits; for (x = 0; x < width; x++) { PALETTEENTRY srcval; - srcval=srccolors[(int)*srcpixel++]; + srcval=srccolors[*srcpixel++]; *dstbyte++=X11DRV_DIB_GetNearestIndex(colors, 256, srcval.peRed, srcval.peGreen, @@ -2418,7 +2418,7 @@ static void X11DRV_DIB_GetImageBits_16( int lines, BYTE *dstbits, for (x = 0; x < width; x++) { PALETTEENTRY srcval; DWORD dstval; - srcval=srccolors[(int)*srcpixel++]; + srcval=srccolors[*srcpixel++]; dstval=((srcval.peRed << rShift) & rDst) | ((srcval.peGreen << gShift) & gDst) | ((srcval.peBlue << bShift) & bDst); @@ -2815,7 +2815,7 @@ static void X11DRV_DIB_GetImageBits_24( int lines, BYTE *dstbits, dstbyte=dstbits; for (x = 0; x < width; x++ ) { PALETTEENTRY srcval; - srcval=srccolors[(int)*srcpixel++]; + srcval=srccolors[*srcpixel++]; dstbyte[0]=srcval.peBlue; dstbyte[1]=srcval.peGreen; dstbyte[2]=srcval.peRed; @@ -3400,7 +3400,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits, dstpixel=(DWORD*)dstbits; for (x = 0; x < width; x++) { PALETTEENTRY srcval; - srcval=srccolors[(int)*srcpixel++]; + srcval=srccolors[*srcpixel++]; *dstpixel++=(srcval.peRed << rShift) | (srcval.peGreen << gShift) | (srcval.peBlue << bShift);

1 0

Rob Shearman : ntdll: Fix RtlValidAcl to accept newer ACL revisions.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 06b2da95604a830bf3cd035906348b515b31254b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b2da95604a830bf3cd03590… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 23 13:39:02 2007 +0100 ntdll: Fix RtlValidAcl to accept newer ACL revisions. --- dlls/advapi32/tests/security.c | 2 -- dlls/ntdll/sec.c | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 62463a7..3332d7b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2300,14 +2300,12 @@ static void test_acls(void) ok(ret, "InitializeAcl(ACL_REVISION3) failed with error %d\n", GetLastError()); ret = IsValidAcl(pAcl); - todo_wine ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION4); ok(ret, "InitializeAcl(ACL_REVISION4) failed with error %d\n", GetLastError()); ret = IsValidAcl(pAcl); - todo_wine ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); SetLastError(0xdeadbeef); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index f195678..a1c839d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1278,7 +1278,8 @@ BOOLEAN WINAPI RtlValidAcl(PACL pAcl) PACE_HEADER ace; int i; - if (pAcl->AclRevision != ACL_REVISION) + if (pAcl->AclRevision < MIN_ACL_REVISION || + pAcl->AclRevision > MAX_ACL_REVISION) ret = FALSE; else {

1 0

Rob Shearman : advapi32: Add some tests for ACL functions.
by Alexandre Julliard 23 Oct '07

23 Oct '07

Module: wine Branch: master Commit: 866ec270444ccb1f1cc53ca052a02388fdea4844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=866ec270444ccb1f1cc53ca05… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Oct 23 13:38:47 2007 +0100 advapi32: Add some tests for ACL functions. --- dlls/advapi32/tests/security.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7f5728e..62463a7 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2272,6 +2272,49 @@ static void test_PrivateObjectSecurity(void) #undef CHECK_RESULT_AND_FREE #undef CHECK_ONE_OF_AND_FREE +static void test_acls(void) +{ + char buffer[256]; + PACL pAcl = (PACL)buffer; + BOOL ret; + + SetLastError(0xdeadbeef); + ret = InitializeAcl(pAcl, sizeof(ACL) - 1, ACL_REVISION); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InitializeAcl with too small a buffer should have failed with ERROR_INSUFFICIENT_BUFFER instead of %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InitializeAcl(pAcl, 0xffffffff, ACL_REVISION); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "InitializeAcl with too large a buffer should have failed with ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION1); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "InitializeAcl(ACL_REVISION1) should have failed with ERROR_INVALID_PARAMETER instead of %d\n", GetLastError()); + + ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION2); + ok(ret, "InitializeAcl(ACL_REVISION2) failed with error %d\n", GetLastError()); + + ret = IsValidAcl(pAcl); + ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); + + ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION3); + ok(ret, "InitializeAcl(ACL_REVISION3) failed with error %d\n", GetLastError()); + + ret = IsValidAcl(pAcl); + todo_wine + ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); + + ret = InitializeAcl(pAcl, sizeof(buffer), ACL_REVISION4); + ok(ret, "InitializeAcl(ACL_REVISION4) failed with error %d\n", GetLastError()); + + ret = IsValidAcl(pAcl); + todo_wine + ok(ret, "IsValidAcl failed with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = InitializeAcl(pAcl, sizeof(buffer), -1); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "InitializeAcl(-1) failed with error %d\n", GetLastError()); +} + START_TEST(security) { init(); @@ -2299,4 +2342,5 @@ START_TEST(security) test_ConvertStringSecurityDescriptor(); test_ConvertSecurityDescriptorToString(); test_PrivateObjectSecurity(); + test_acls(); }

1 0

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 October 2007