Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Dec 9 12:20:18 2008 New Revision: 37975 URL: http://svn.reactos.org/svn/reactos?rev=37975&view=rev Log: - More trace :/ Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c [iso-8859-1] Tue Dec 9 12:20:18 2008 @@ -307,6 +307,8 @@ SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) { NTSTATUS Status; + + DbgPrint("SetSecurityDescriptorControl: Received %p\n", pSecurityDescriptor); Status = RtlSetControlSecurityDescriptor(pSecurityDescriptor, ControlBitsOfInterest,

16 years

[sginsberg] 37974: - Temporarily add tracing to ConvertStringSecurityDescriptorToSecurityDescriptorW and LocalAlloc to figure out why the tests crashes on build server -- will be reverted ASAP

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Dec 9 12:04:58 2008 New Revision: 37974 URL: http://svn.reactos.org/svn/reactos?rev=37974&view=rev Log: - Temporarily add tracing to ConvertStringSecurityDescriptorToSecurityDescriptorW and LocalAlloc to figure out why the tests crashes on build server -- will be reverted ASAP Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 12:04:58 2008 @@ -1288,6 +1288,7 @@ if (SecurityDescriptorSize) *SecurityDescriptorSize = relativeSdSize; *SecurityDescriptor = relativeSd; + if ((ULONG_PTR)relativeSd == 0xC) DbgPrint("ConvertStringSecurityDescriptorToSecurityDescriptorW: relativeSd is 0xC\n"); cleanup: if (GetSecurityDescriptorOwner(sd, &pSid, &dummy)) Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Tue Dec 9 12:04:58 2008 @@ -52,6 +52,7 @@ /* Allocate heap for it */ Ptr = RtlAllocateHeap(hProcessHeap, Flags, dwBytes); BASE_TRACE_ALLOC2(Ptr); + if ((ULONG_PTR)Ptr == 0xC) DbgPrint("LocalAlloc: Ptr is 0xC\n"); return Ptr; } @@ -131,10 +132,12 @@ } /* Set the pointer */ + if ((ULONG_PTR)hMemory == 0xC) DbgPrint("LocalAlloc: hMemory is 0xC\n"); Ptr = hMemory; } /* Return the pointer */ + if ((ULONG_PTR)Ptr == 0xC) DbgPrint("LocalAlloc: Ptr is 0xC\n"); return Ptr; }

16 years

[sginsberg] 37973: - Add back debug print -- build server still crashes

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Dec 9 11:44:27 2008 New Revision: 37973 URL: http://svn.reactos.org/svn/reactos?rev=37973&view=rev Log: - Add back debug print -- build server still crashes Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Dec 9 11:44:27 2008 @@ -2410,6 +2410,7 @@ "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"); buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); + DbgPrint("Received %p\n", sec); pSetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); GetSecurityDescriptorControl(sec, &ctrl, &dwRevision); todo_wine expect_eq(ctrl, 0x9014, int, "%x");

16 years

[sginsberg] 37972: - Revert the debug print

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Dec 9 10:39:33 2008 New Revision: 37972 URL: http://svn.reactos.org/svn/reactos?rev=37972&view=rev Log: - Revert the debug print Modified: trunk/rostests/winetests/advapi32/security.c Modified: trunk/rostests/winetests/advapi32/security.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/securi… ============================================================================== --- trunk/rostests/winetests/advapi32/security.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/security.c [iso-8859-1] Tue Dec 9 10:39:33 2008 @@ -2409,7 +2409,6 @@ "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"); - DbgPrint("Received %p\n", sec); buf = HeapAlloc(GetProcessHeap(), 0, dwDescSize); pSetSecurityDescriptorControl(sec, SE_DACL_PROTECTED, SE_DACL_PROTECTED); GetSecurityDescriptorControl(sec, &ctrl, &dwRevision);

16 years

[cwittich] 37971: implement hex value support for ParseAccessMaskString sync ComputeStringSidSize with wine

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Dec 9 10:39:03 2008 New Revision: 37971 URL: http://svn.reactos.org/svn/reactos?rev=37971&view=rev Log: implement hex value support for ParseAccessMaskString sync ComputeStringSidSize with wine Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Tue Dec 9 10:39:03 2008 @@ -452,10 +452,35 @@ OUT DWORD* pAccessMask, OUT SIZE_T* pLength) { - /* FIXME: Allow hexadecimal string for access rights! */ - - return ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); -} + LPCWSTR szAcl = Buffer; + BOOL RetVal = FALSE; + LPCWSTR ptr; + + if ((*szAcl == '0') && (*(szAcl + 1) == 'x')) + { + LPCWSTR p = szAcl; + + while (*p && *p != ';') + p++; + + if (p - szAcl <= 10 /* 8 hex digits + "0x" */ ) + { + *pAccessMask = strtoulW(szAcl, NULL, 16); + ptr = wcschr(Buffer, SDDL_SEPERATORC); + if (ptr) + { + *pLength = ptr - Buffer; + RetVal = TRUE; + } + } + } + else + { + RetVal = ParseFlagsString(Buffer, AccessMaskTable, SDDL_SEPERATORC, pAccessMask, pLength); + } + + return RetVal; + } static BOOL ParseGuidString( @@ -1664,12 +1689,9 @@ /****************************************************************************** * ComputeStringSidSize */ -static DWORD -ComputeStringSidSize(LPCWSTR StringSid) -{ - DWORD size = sizeof(SID); - - if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I-S-S */ +static DWORD ComputeStringSidSize(LPCWSTR StringSid) +{ + if (StringSid[0] == 'S' && StringSid[1] == '-') /* S-R-I(-S)+ */ { int ctok = 0; while (*StringSid) @@ -1679,8 +1701,8 @@ 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 */ { @@ -1688,10 +1710,10 @@ 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 size; + return GetSidLengthRequired(WellKnownSids[i].Sid.SubAuthorityCount); + } + + return GetSidLengthRequired(0); } static const RECORD SidTable[] =

16 years

[dgorbachev] 37970: Fix IntIsValidSBCSMapping(). Bug #3903.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Tue Dec 9 10:13:51 2008 New Revision: 37970 URL: http://svn.reactos.org/svn/reactos?rev=37970&view=rev Log: Fix IntIsValidSBCSMapping(). Bug #3903. Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c [iso-8859-1] Tue Dec 9 10:13:51 2008 @@ -740,7 +740,7 @@ { /* If the WC_NO_BEST_FIT_CHARS flag has been specified, the characters need to match exactly. */ if (Flags & WC_NO_BEST_FIT_CHARS) - return (CodePageTable->MultiByteTable[ch] != wch); + return (CodePageTable->MultiByteTable[ch] == wch); /* By default, all characters except TransDefaultChar apply as a valid mapping for ch (so also "nearest" characters) */

16 years

[tkreuzer] 37969: fix Ke386SetCr2

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 9 09:50:10 2008 New Revision: 37969 URL: http://svn.reactos.org/svn/reactos?rev=37969&view=rev Log: fix Ke386SetCr2 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Tue Dec 9 09:50:10 2008 @@ -106,7 +106,7 @@ // // CR Macros // -#define Ke386SetCr2(X) __asm__ __volatile__("movl %0,%%cr2" : :"r" (X)); +#define Ke386SetCr2(X) __asm__ __volatile__("movq %0,%%cr2" : :"r" ((void*)X)); // // DR Macros

16 years

[tkreuzer] 37968: Make PsNtosImageBase an ULONG_PTR

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 9 09:46:57 2008 New Revision: 37968 URL: http://svn.reactos.org/svn/reactos?rev=37968&view=rev Log: Make PsNtosImageBase an ULONG_PTR Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Tue Dec 9 09:46:57 2008 @@ -423,7 +423,7 @@ extern LARGE_INTEGER ShortPsLockDelay; extern UNICODE_STRING PsNtDllPathName; extern LIST_ENTRY PsLoadedModuleList; -extern ULONG PsNtosImageBase; +extern ULONG_PTR PsNtosImageBase; // // Inlined Functions Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Tue Dec 9 09:46:57 2008 @@ -28,7 +28,7 @@ LIST_ENTRY PsLoadedModuleList; KSPIN_LOCK PsLoadedModuleSpinLock; -ULONG PsNtosImageBase; +ULONG_PTR PsNtosImageBase; KMUTANT MmSystemLoadLock; extern ULONG NtGlobalFlag;

16 years

[tkreuzer] 37967: fix ULONG/ULONG_PTR isuue

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 9 09:45:54 2008 New Revision: 37967 URL: http://svn.reactos.org/svn/reactos?rev=37967&view=rev Log: fix ULONG/ULONG_PTR isuue Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Tue Dec 9 09:45:54 2008 @@ -1065,7 +1065,7 @@ /* Check if we need to save the context for KD */ #ifdef _WINKD_ - if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG)&Context; + if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG_PTR)&Context; #endif /* Check if a debugger is connected */

16 years

[tkreuzer] 37966: Make IMAGE_ORDINAL_FLAG64 an ULONGLONG

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 9 09:37:05 2008 New Revision: 37966 URL: http://svn.reactos.org/svn/reactos?rev=37966&view=rev Log: Make IMAGE_ORDINAL_FLAG64 an ULONGLONG Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/ntimage.h [iso-8859-1] Tue Dec 9 09:37:05 2008 @@ -470,7 +470,7 @@ } u1; } IMAGE_THUNK_DATA32, *PIMAGE_THUNK_DATA32; -#define IMAGE_ORDINAL_FLAG64 0x8000000000000000 +#define IMAGE_ORDINAL_FLAG64 0x8000000000000000ULL #define IMAGE_ORDINAL_FLAG32 0x80000000 #define IMAGE_ORDINAL64(Ordinal) (Ordinal & 0xffff) #define IMAGE_ORDINAL32(Ordinal) (Ordinal & 0xffff)

16 years

← Newer
1
...
50
51
52
53
54
55
56
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008