Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[ion] 22653: - Fix all the failures in the RTLSTR Wine test by merging our old rtl string routines with Wine's. We now pass all 2300 something tests.
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 08:09:03 2006 New Revision: 22653 URL: http://svn.reactos.org/svn/reactos?rev=22653&view=rev Log: - Fix all the failures in the RTLSTR Wine test by merging our old rtl string routines with Wine's. We now pass all 2300 something tests. Modified: trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=22653&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c (original) +++ trunk/reactos/lib/rtl/nls.c Tue Jun 27 08:09:03 2006 @@ -564,19 +564,19 @@ { USHORT Offset; - if (Source < L'a') + if (Source < 'a') return Source; - if (Source <= L'z') - return (Source - (L'a' - L'A')); - - Offset = ((USHORT)Source >> 8); + if (Source <= 'z') + return (Source - ('a' - 'A')); + + Offset = ((USHORT)Source >> 8) & 0xFF; Offset = NlsUnicodeUpcaseTable[Offset]; - Offset += (((USHORT)Source & 0x00F0) >> 4); + Offset += ((USHORT)Source >> 4) & 0xF; Offset = NlsUnicodeUpcaseTable[Offset]; - Offset += ((USHORT)Source & 0x000F); + Offset += ((USHORT)Source & 0xF); Offset = NlsUnicodeUpcaseTable[Offset]; return Source + (SHORT)Offset; @@ -727,24 +727,42 @@ WCHAR Unicode; CHAR Destination; - if (NlsMbCodePageTag == FALSE) - { - /* single-byte code page */ - - /* ansi->unicode */ - Unicode = NlsAnsiToUnicodeTable[(UCHAR)Source]; - - /* upcase conversion */ - Unicode = RtlUpcaseUnicodeChar (Unicode); - - /* unicode -> ansi */ - Destination = NlsUnicodeToAnsiTable[(USHORT)Unicode]; - } - else - { - /* multi-byte code page */ - /* FIXME */ - Destination = Source; + /* Check for simple ANSI case */ + if (Source <= 'z') + { + /* Check for simple downcase a-z case */ + if (Source >= 'a') + { + /* Just XOR with the difference */ + return Source ^ ('a' - 'A'); + } + else + { + /* Otherwise return the same char, it's already upcase */ + return Source; + } + } + else + { + if (NlsMbCodePageTag == FALSE) + { + /* single-byte code page */ + + /* ansi->unicode */ + Unicode = NlsAnsiToUnicodeTable[(UCHAR)Source]; + + /* upcase conversion */ + Unicode = RtlUpcaseUnicodeChar (Unicode); + + /* unicode -> ansi */ + Destination = NlsUnicodeToAnsiTable[(USHORT)Unicode]; + } + else + { + /* multi-byte code page */ + /* FIXME */ + Destination = Source; + } } return Destination; Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=2265… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c (original) +++ trunk/reactos/lib/rtl/unicode.c Tue Jun 27 08:09:03 2006 @@ -510,54 +510,48 @@ * Str is nullterminated when length allowes it. * When str fits exactly in length characters the nullterm is ommitted. */ -NTSTATUS -NTAPI -RtlIntegerToChar( - IN ULONG Value, - IN ULONG Base, - IN ULONG Length, - IN OUT PCHAR String) -{ - ULONG Radix; - CHAR temp[33]; - ULONG v = Value; - ULONG i; - PCHAR tp; - PCHAR sp; - - Radix = Base; - if (Radix == 0) - Radix = 10; - - if ((Radix != 2) && (Radix != 8) && - (Radix != 10) && (Radix != 16)) - { - return STATUS_INVALID_PARAMETER; - } - - tp = temp; - while (v || tp == temp) - { - i = v % Radix; - v = v / Radix; - if (i < 10) - *tp = i + '0'; - else - *tp = i + 'a' - 10; - tp++; - } - - if ((ULONG)((ULONG_PTR)tp - (ULONG_PTR)temp) >= Length) - { - return STATUS_BUFFER_TOO_SMALL; - } - - sp = String; - while (tp > temp) - *sp++ = *--tp; - *sp = 0; - - return STATUS_SUCCESS; +NTSTATUS NTAPI RtlIntegerToChar( + ULONG value, /* [I] Value to be converted */ + ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ + ULONG length, /* [I] Length of the str buffer in bytes */ + PCHAR str) /* [O] Destination for the converted value */ +{ + CHAR buffer[33]; + PCHAR pos; + CHAR digit; + ULONG len; + + if (base == 0) { + base = 10; + } else if (base != 2 && base != 8 && base != 10 && base != 16) { + return STATUS_INVALID_PARAMETER; + } /* if */ + + pos = &buffer[32]; + *pos = '\0'; + + do { + pos--; + digit = value % base; + value = value / base; + if (digit < 10) { + *pos = '0' + digit; + } else { + *pos = 'A' + digit - 10; + } /* if */ + } while (value != 0L); + + len = &buffer[32] - pos; + if (len > length) { + return STATUS_BUFFER_OVERFLOW; + } else if (str == NULL) { + return STATUS_ACCESS_VIOLATION; + } else if (len == length) { + memcpy(str, pos, len); + } else { + memcpy(str, pos, len + 1); + } /* if */ + return STATUS_SUCCESS; } /* @@ -765,87 +759,57 @@ } return FALSE; } - -/************************************************************************** - * RtlUnicodeStringToInteger (NTDLL.@) - * @implemented - * Converts an unicode string into its integer equivalent. - * - * RETURNS - * Success: STATUS_SUCCESS. value contains the converted number - * Failure: STATUS_INVALID_PARAMETER, if base is not 0, 2, 8, 10 or 16. - * STATUS_ACCESS_VIOLATION, if value is NULL. - * - * NOTES - * For base 0 it uses 10 as base and the string should be in the format - * "{whitespace} [+|-] [0[x|o|b]] {digits}". - * For other bases the string should be in the format - * "{whitespace} [+|-] {digits}". - * No check is made for value overflow, only the lower 32 bits are assigned. - * If str is NULL it crashes, as the native function does. - * - * Note that regardless of success or failure status, we should leave the - * partial value in Value. An error is never returned based on the chars - * in the string. - * - * DIFFERENCES - * This function does not read garbage on string length 0 as the native - * version does. - */ -NTSTATUS -NTAPI -RtlUnicodeStringToInteger( - PCUNICODE_STRING str, /* [I] Unicode string to be converted */ +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlUnicodeStringToInteger(const UNICODE_STRING *str, /* [I] Unicode string to be converted */ ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ - PULONG value) /* [O] Destination for the converted value */ + ULONG *value) /* [O] Destination for the converted value */ { LPWSTR lpwstr = str->Buffer; USHORT CharsRemaining = str->Length / sizeof(WCHAR); WCHAR wchCurrent; int digit; - ULONG newbase = 0; ULONG RunningTotal = 0; char bMinus = 0; - while (CharsRemaining >= 1 && *lpwstr <= L' ') { + while (CharsRemaining >= 1 && *lpwstr <= ' ') { lpwstr++; CharsRemaining--; } /* while */ if (CharsRemaining >= 1) { - if (*lpwstr == L'+') { + if (*lpwstr == '+') { lpwstr++; CharsRemaining--; - } else if (*lpwstr == L'-') { + } else if (*lpwstr == '-') { bMinus = 1; lpwstr++; CharsRemaining--; } /* if */ } /* if */ - if (CharsRemaining >= 2 && lpwstr[0] == L'0') { - if (lpwstr[1] == L'b' || lpwstr[1] == L'B') { - lpwstr += 2; - CharsRemaining -= 2; - newbase = 2; - } else if (lpwstr[1] == L'o' || lpwstr[1] == L'O') { - lpwstr += 2; - CharsRemaining -= 2; - newbase = 8; - } else if (lpwstr[1] == L'x' || lpwstr[1] == L'X') { - lpwstr += 2; - CharsRemaining -= 2; - newbase = 16; + if (base == 0) { + base = 10; + if (CharsRemaining >= 2 && lpwstr[0] == '0') { + if (lpwstr[1] == 'b') { + lpwstr += 2; + CharsRemaining -= 2; + base = 2; + } else if (lpwstr[1] == 'o') { + lpwstr += 2; + CharsRemaining -= 2; + base = 8; + } else if (lpwstr[1] == 'x') { + lpwstr += 2; + CharsRemaining -= 2; + base = 16; + } /* if */ } /* if */ - } - if (base == 0 && newbase == 0) { - base = 10; - } else if (base == 0 && newbase != 0) { - base = newbase; - } else if ((newbase != 0 && base != newbase) || - (base != 2 && base != 8 && base != 10 && base != 16)) { + } else if (base != 2 && base != 8 && base != 10 && base != 16) { return STATUS_INVALID_PARAMETER; - } /* if */ if (value == NULL) { @@ -854,16 +818,16 @@ while (CharsRemaining >= 1) { wchCurrent = *lpwstr; - if (wchCurrent >= L'0' && wchCurrent <= L'9') { - digit = wchCurrent - L'0'; - } else if (wchCurrent >= L'A' && wchCurrent <= L'Z') { - digit = wchCurrent - L'A' + 10; - } else if (wchCurrent >= L'a' && wchCurrent <= L'z') { - digit = wchCurrent - L'a' + 10; + if (wchCurrent >= '0' && wchCurrent <= '9') { + digit = wchCurrent - '0'; + } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { + digit = wchCurrent - 'A' + 10; + } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { + digit = wchCurrent - 'a' + 10; } else { digit = -1; } /* if */ - if (digit < 0 || digit >= (int)base) { + if (digit < 0 || digit >= base) { *value = bMinus ? -RunningTotal : RunningTotal; return STATUS_SUCCESS; } /* if */ @@ -1267,7 +1231,7 @@ /* Convert string: {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} * to memory: DWORD... WORD WORD BYTES............ */ - while (i < 37) + while (i <= 37) { switch (i) { @@ -1774,36 +1738,28 @@ RtlStringFromGUID (IN REFGUID Guid, OUT PUNICODE_STRING GuidString) { - static CONST PWCHAR Hex = L"0123456789ABCDEF"; - WCHAR Buffer[40]; - PWCHAR BufferPtr; - ULONG i; - - if (Guid == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - swprintf (Buffer, - L"{%08lX-%04X-%04X-%02X%02X-", + /* Setup the string */ + GuidString->Length = 38 * sizeof(WCHAR); + GuidString->MaximumLength = GuidString->Length + sizeof(UNICODE_NULL); + GuidString->Buffer = RtlpAllocateStringMemory(GuidString->MaximumLength, + TAG_USTR); + if (!GuidString->Buffer) return STATUS_NO_MEMORY; + + /* Now format the GUID */ + swprintf(GuidString->Buffer, + L"{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", Guid->Data1, Guid->Data2, Guid->Data3, Guid->Data4[0], - Guid->Data4[1]); - BufferPtr = Buffer + 25; - - /* 6 hex bytes */ - for (i = 2; i < 8; i++) - { - *BufferPtr++ = Hex[Guid->Data4[i] >> 4]; - *BufferPtr++ = Hex[Guid->Data4[i] & 0xf]; - } - - *BufferPtr++ = L'}'; - *BufferPtr++ = L'\0'; - - return RtlCreateUnicodeString (GuidString, Buffer); + Guid->Data4[1], + Guid->Data4[2], + Guid->Data4[3], + Guid->Data4[4], + Guid->Data4[5], + Guid->Data4[6], + Guid->Data4[7]); + return STATUS_SUCCESS; } /* @@ -2119,7 +2075,7 @@ PCHAR Src, Dest; Length = min(SourceString->Length, - DestinationString->MaximumLength - 1); + DestinationString->MaximumLength); Src = SourceString->Buffer; Dest = DestinationString->Buffer; @@ -2146,8 +2102,12 @@ { PAGED_CODE_RTL(); - if (SourceString == NULL || DestinationString == NULL) - return STATUS_INVALID_PARAMETER; + if (SourceString == NULL || DestinationString == NULL || + SourceString->Length > SourceString->MaximumLength || + (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4 || Flags < 0) { + return STATUS_INVALID_PARAMETER; + } if ((SourceString->Length == 0) &&

1 0

[ion] 22652: - Catch illegal call to Ob functions when ObjectAttributes == NULL and return distinguished status code for this situation (STATUS_INVALID_PARAMETER), instead of failing due to access violation. - Create the BNO Global and Local symbolic links in kernel32. - We pass all the Ob+Native tests in ntdll_winetest om now (we fail some named pipe ones, but I have no idea why WINE calls them "Object Manager" related...)
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 07:06:26 2006 New Revision: 22652 URL: http://svn.reactos.org/svn/reactos?rev=22652&view=rev Log: - Catch illegal call to Ob functions when ObjectAttributes == NULL and return distinguished status code for this situation (STATUS_INVALID_PARAMETER), instead of failing due to access violation. - Create the BNO Global and Local symbolic links in kernel32. - We pass all the Ob+Native tests in ntdll_winetest om now (we fail some named pipe ones, but I have no idea why WINE calls them "Object Manager" related...) Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/dll/win32/kernel32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/dllmain.c Tue Jun 27 07:06:26 2006 @@ -66,7 +66,10 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); + UNICODE_STRING SymName = RTL_CONSTANT_STRING(L"Local"); + UNICODE_STRING SymName2 = RTL_CONSTANT_STRING(L"Global"); NTSTATUS Status; + HANDLE SymHandle; InitializeObjectAttributes(&ObjectAttributes, &Name, @@ -87,6 +90,36 @@ if (!NT_SUCCESS(Status)) { DPRINT1("NtCreateDirectoryObject() failed\n"); + } + + /* Create the "local" Symbolic Link. FIXME: CSR should do this */ + InitializeObjectAttributes(&ObjectAttributes, + &SymName, + OBJ_CASE_INSENSITIVE, + *DirHandle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateSymbolicLinkObject() failed\n"); + } + + /* Create the "global" Symbolic Link. FIXME: CSR should do this */ + InitializeObjectAttributes(&ObjectAttributes, + &SymName2, + OBJ_CASE_INSENSITIVE, + *DirHandle, + NULL); + Status = NtCreateSymbolicLinkObject(&SymHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &Name); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateSymbolicLinkObject() failed\n"); } } Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jun 27 07:06:26 2006 @@ -1455,6 +1455,14 @@ OB_OPEN_REASON OpenReason; PAGED_CODE(); + /* Check if we didn't get any Object Attributes */ + if (!ObjectAttributes) + { + /* Fail with special status code */ + *Handle = NULL; + return STATUS_INVALID_PARAMETER; + } + /* Capture all the info */ Status = ObpCaptureObjectAttributes(ObjectAttributes, AccessMode,

1 0

[ion] 22651: - Fix another critical bug in ObInsertObject: don't overwrite the lookup status with the handle creation status. If the lookup returned something like OBJECT_NAME_EXISTS (which is a success + warning), we don't want to overwrite it with ObpCreateHandle's STATUS_SUCCESS. This should fix a large number of regressions (and also fixes many WINE ntdll "om" tests). - We also now correctly dereference the object in ObInsertObject, which should reduce one source of leaks (But there is still
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 05:52:16 2006 New Revision: 22651 URL: http://svn.reactos.org/svn/reactos?rev=22651&view=rev Log: - Fix another critical bug in ObInsertObject: don't overwrite the lookup status with the handle creation status. If the lookup returned something like OBJECT_NAME_EXISTS (which is a success + warning), we don't want to overwrite it with ObpCreateHandle's STATUS_SUCCESS. This should fix a large number of regressions (and also fixes many WINE ntdll "om" tests). - We also now correctly dereference the object in ObInsertObject, which should reduce one source of leaks (But there is still one). OTOH, this makes the Cm code crash at shutdown (I'll fix this ASAP, this fix is worth having atm.) Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jun 27 05:52:16 2006 @@ -1705,7 +1705,7 @@ POBJECT_TYPE ObjectType; PVOID FoundObject = NULL; POBJECT_HEADER FoundHeader = NULL; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS, RealStatus; PSECURITY_DESCRIPTOR DirectorySd = NULL; BOOLEAN SdAllocated; OBP_LOOKUP_CONTEXT Context; @@ -1749,9 +1749,14 @@ Header->ObjectCreateInfo = NULL; /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); // FIXME: Needs sync changes + if (Handle) ObDereferenceObject(Object); // FIXME: Needs sync changes /* Return */ + OBTRACE(OB_HANDLE_DEBUG, + "%s - returning Object with PC S: %lx %lx\n", + __FUNCTION__, + OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + Status); return Status; } @@ -1893,12 +1898,15 @@ } } + /* Save the actual status until here */ + RealStatus = Status; + /* HACKHACK: Because of ROS's incorrect startup, this can be called - * without a valid Process until I finalize the startup patch, - * so don't create a handle if this is the case. We also don't create - * a handle if Handle is NULL when the Registry Code calls it, because - * the registry code totally bastardizes the Ob and needs to be fixed - */ + * without a valid Process until I finalize the startup patch, + * so don't create a handle if this is the case. We also don't create + * a handle if Handle is NULL when the Registry Code calls it, because + * the registry code totally bastardizes the Ob and needs to be fixed + */ if (Handle) { /* Create the handle */ @@ -1925,7 +1933,15 @@ } /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); + if (Handle) ObDereferenceObject(Object); + + /* Check our final status */ + if (!NT_SUCCESS(Status)) + { + /* Return the status of the failure */ + *Handle = NULL; + RealStatus = Status; + } /* Check if we created our own access state */ if (PassedAccessState == &AccessState) @@ -1934,8 +1950,13 @@ SeDeleteAccessState(PassedAccessState); } - /* Return failure code */ - return Status; + /* Return status code */ + OBTRACE(OB_HANDLE_DEBUG, + "%s - returning Object with PC S/RS: %lx %lx %lx\n", + __FUNCTION__, + OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + RealStatus, Status); + return RealStatus; } /*++

1 0

[ion] 22650: - ObpCreateUnnamedHandle/ObpCreateHandle => Reference the object before calling ExCreateHandle. - Fix two critical bugs in ObInsertObject: We were creating a handle for the wrong object (in ObInsertObject) and we were not passing the ReferencedObject parameter to ObpCreateHandle, so that object was never being returned properly to the caller. - ObfDereferenceObject shouldn't check for the OB_FLAG_PERMANENT flag, or else it would never be possible to kill permanent objects while in k
by ion＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: ion Date: Tue Jun 27 05:16:17 2006 New Revision: 22650 URL: http://svn.reactos.org/svn/reactos?rev=22650&view=rev Log: - ObpCreateUnnamedHandle/ObpCreateHandle => Reference the object before calling ExCreateHandle. - Fix two critical bugs in ObInsertObject: We were creating a handle for the wrong object (in ObInsertObject) and we were not passing the ReferencedObject parameter to ObpCreateHandle, so that object was never being returned properly to the caller. - ObfDereferenceObject shouldn't check for the OB_FLAG_PERMANENT flag, or else it would never be possible to kill permanent objects while in kernel mode (permanent objects only apply to user-mode handles). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Tue Jun 27 05:16:17 2006 @@ -520,6 +520,7 @@ BOOLEAN AttachedToProcess = FALSE; PVOID HandleTable; NTSTATUS Status; + ULONG i; PAGED_CODE(); /* Get the object header and type */ @@ -579,6 +580,18 @@ /* Save the access mask */ NewEntry.GrantedAccess = DesiredAccess; + + /* Handle extra references */ + if (AdditionalReferences) + { + /* Make a copy in case we fail later below */ + i = AdditionalReferences; + while (i--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + } /* * Create the actual handle. We'll need to do this *after* calling @@ -597,13 +610,6 @@ /* Make sure we got a handle */ if (Handle) { - /* Handle extra references */ - while (AdditionalReferences--) - { - /* Increment the count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - } - /* Check if this was a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { @@ -615,12 +621,19 @@ *ReturnedHandle = Handle; if (ReturnedObject) *ReturnedObject = Object; OBTRACE(OB_HANDLE_DEBUG, - "%s %s - Returning Handle: %lx HC LC %lx %lx\n", + "%s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, Handle, ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; + } + + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Decrement the count */ + InterlockedDecrement(&ObjectHeader->PointerCount); } /* Decrement the handle count and detach */ @@ -692,6 +705,7 @@ POBJECT_TYPE ObjectType; PVOID HandleTable; NTSTATUS Status; + ULONG i; PAGED_CODE(); /* Get the object header and type */ @@ -764,6 +778,18 @@ NewEntry.GrantedAccess = AccessState->RemainingDesiredAccess | AccessState->PreviouslyGrantedAccess; + /* Handle extra references */ + if (AdditionalReferences) + { + /* Make a copy in case we fail later below */ + i = AdditionalReferences; + while (i--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + } + /* * Create the actual handle. We'll need to do this *after* calling * ObpIncrementHandleCount to make sure that Object Security is valid @@ -781,13 +807,6 @@ /* Make sure we got a handle */ if (Handle) { - /* Handle extra references */ - while (AdditionalReferences--) - { - /* Increment the count */ - InterlockedIncrement(&ObjectHeader->PointerCount); - } - /* Check if this was a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { @@ -805,6 +824,13 @@ ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; + } + + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Increment the count */ + InterlockedDecrement(&ObjectHeader->PointerCount); } /* Decrement the handle count and detach */ @@ -1052,7 +1078,7 @@ /* Make sure that the handle is inheritable */ Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - if(Ret) + if (Ret) { /* Get the object header */ ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); @@ -1519,9 +1545,10 @@ ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); OBTRACE(OB_HANDLE_DEBUG, - "%s returning Object with PC S: %lx %lx\n", + "%s - returning Object %p with PC S: %lx %lx\n", __FUNCTION__, - OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + Object, + Object ? OBJECT_TO_OBJECT_HEADER(Object)->PointerCount : -1, Status); return Status; } @@ -1722,7 +1749,7 @@ Header->ObjectCreateInfo = NULL; /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); FIXME: Will require massive changes + //ObDereferenceObject(Object); // FIXME: Needs sync changes /* Return */ return Status; @@ -1853,6 +1880,7 @@ if (!NT_SUCCESS(Status)) { /* We failed, dereference the object and delete the access state */ + KEBUGCHECK(0); ObDereferenceObject(Object); if (PassedAccessState == &AccessState) { @@ -1875,13 +1903,13 @@ { /* Create the handle */ Status = ObpCreateHandle(OpenReason, - &Header->Body, + FoundObject, NULL, PassedAccessState, AdditionalReferences + 1, ObjectCreateInfo->Attributes, ExGetPreviousMode(), - NULL, + ReferencedObject, Handle); } @@ -1897,7 +1925,7 @@ } /* Remove the extra keep-alive reference */ - //ObDereferenceObject(Object); FIXME: Will require massive changes + //ObDereferenceObject(Object); /* Check if we created our own access state */ if (PassedAccessState == &AccessState) Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Tue Jun 27 05:16:17 2006 @@ -38,7 +38,7 @@ }; PDEVICE_MAP ObSystemDeviceMap = NULL; -ULONG ObpTraceLevel = OB_NAMESPACE_DEBUG; +ULONG ObpTraceLevel = OB_HANDLE_DEBUG | OB_REFERENCE_DEBUG; /* PRIVATE FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Tue Jun 27 05:16:17 2006 @@ -89,8 +89,7 @@ Header = OBJECT_TO_OBJECT_HEADER(Object); /* Check whether the object can now be deleted. */ - if (!(InterlockedDecrement(&Header->PointerCount)) && - !(Header->Flags & OB_FLAG_PERMANENT)) + if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ ASSERT(!Header->HandleCount);

1 0

[ion] 22649: - Lesson One: Don't revert commits because your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copyright". - Lesson Two: What do you know! En and De.rc actually *are* our files, not James Brown's (his is sol.rc, which hasn't been altered with a ROS Header). - Lesson Three: It is official (voted) ROS Policy that all ROS files have a header. Reverting this header violated it.
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: ion Date: Tue Jun 27 03:50:03 2006 New Revision: 22649 URL: http://svn.reactos.org/svn/reactos?rev=22649&view=rev Log: - Lesson One: Don't revert commits because your eyes are inventing the word "copyright". I tried really hard, I really did, but I could not find even the word "copy", much less "copyright". - Lesson Two: What do you know! En and De.rc actually *are* our files, not James Brown's (his is sol.rc, which hasn't been altered with a ROS Header). - Lesson Three: It is official (voted) ROS Policy that all ROS files have a header. Reverting this header violated it. Modified: trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/de.rc (original) +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 03:50:03 2006 @@ -1,3 +1,10 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/de.rc + * PURPOSE: German Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/en.rc (original) +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 03:50:03 2006 @@ -1,3 +1,10 @@ +/* + * PROJECT: Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * FILE: base/applications/games/solitaire/en.rc + * PURPOSE: English Language File for Solitaire + * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) + */ #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS

1 0

[gedmurphy] 22648: You can't really claim copyright for translating a resource file. Secondly, it's not even our code to put headers in. It's James Browns from catch22.net
by gedmurphy＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: gedmurphy Date: Tue Jun 27 03:02:54 2006 New Revision: 22648 URL: http://svn.reactos.org/svn/reactos?rev=22648&view=rev Log: You can't really claim copyright for translating a resource file. Secondly, it's not even our code to put headers in. It's James Browns from catch22.net Modified: trunk/reactos/base/applications/games/solitaire/de.rc trunk/reactos/base/applications/games/solitaire/en.rc Modified: trunk/reactos/base/applications/games/solitaire/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/de.rc (original) +++ trunk/reactos/base/applications/games/solitaire/de.rc Tue Jun 27 03:02:54 2006 @@ -1,11 +1,3 @@ -/* - * PROJECT: Solitaire - * LICENSE: Freeware, permission to use under Public Domain - * FILE: base/applications/games/solitaire/de.rc - * PURPOSE: German Language File for Solitaire - * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - */ - #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS Modified: trunk/reactos/base/applications/games/solitaire/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/en.rc (original) +++ trunk/reactos/base/applications/games/solitaire/en.rc Tue Jun 27 03:02:54 2006 @@ -1,11 +1,3 @@ -/* - * PROJECT: Solitaire - * LICENSE: Freeware, permission to use under Public Domain - * FILE: base/applications/games/solitaire/en.rc - * PURPOSE: English Language File for Solitaire - * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel(a)freenet.de) - */ - #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS

1 0

[ion] 22647: - Same fixes for LocalAlloc/LocalReAlloc - We now pass all 278+49 WINE Regression Tests related to Heap/Memory.
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: ion Date: Tue Jun 27 02:50:02 2006 New Revision: 22647 URL: http://svn.reactos.org/svn/reactos?rev=22647&view=rev Log: - Same fixes for LocalAlloc/LocalReAlloc - We now pass all 278+49 WINE Regression Tests related to Heap/Memory. Modified: trunk/reactos/dll/win32/kernel32/mem/local.c 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 (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c Tue Jun 27 02:50:02 2006 @@ -113,7 +113,7 @@ if (!Ptr) { /* We don't have a valid pointer, but so reuse this handle */ - HandleEntry->Flags = BASE_HEAP_ENTRY_FLAG_REUSE; + HandleEntry->Flags |= BASE_HEAP_ENTRY_FLAG_REUSE; } /* Check if the handle is discardable */ @@ -319,7 +319,7 @@ if (Ptr) { /* Make sure the handle isn't locked */ - if ((uFlags & LMEM_MOVEABLE) & !(HandleEntry->LockCount)) + if ((uFlags & LMEM_MOVEABLE) && !(HandleEntry->LockCount)) { /* Free the current heap */ RtlFreeHeap(hProcessHeap, Flags, Ptr);

1 0

[ion] 22646: - Fix a typo in a comparison (& vs &&) which was breaking GlobalReAlloc in some cases. - Fix a missing | (OR) in GlobalAlloc which created an invalid handle if the first allocation was of size 0.
by ion＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: ion Date: Tue Jun 27 02:48:12 2006 New Revision: 22646 URL: http://svn.reactos.org/svn/reactos?rev=22646&view=rev Log: - Fix a typo in a comparison (& vs &&) which was breaking GlobalReAlloc in some cases. - Fix a missing | (OR) in GlobalAlloc which created an invalid handle if the first allocation was of size 0. Modified: trunk/reactos/dll/win32/kernel32/include/baseheap.h trunk/reactos/dll/win32/kernel32/mem/global.c Modified: trunk/reactos/dll/win32/kernel32/include/baseheap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/baseheap.h (original) +++ trunk/reactos/dll/win32/kernel32/include/baseheap.h Tue Jun 27 02:48:12 2006 @@ -65,6 +65,7 @@ #define BASE_TRACE_FAILURE() \ BH_PRINT("[BASE_HEAP] %s : Failing %d\n", \ __FUNCTION__, __LINE__) + // // The handle structure for global heap handles. // Notice that it nicely overlays with RTL_HANDLE_ENTRY. Modified: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/global.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/global.c Tue Jun 27 02:48:12 2006 @@ -117,7 +117,7 @@ if (!Ptr) { /* We don't have a valid pointer, but so reuse this handle */ - HandleEntry->Flags = BASE_HEAP_ENTRY_FLAG_REUSE; + HandleEntry->Flags |= BASE_HEAP_ENTRY_FLAG_REUSE; } /* Check if the handle is discardable */ @@ -486,7 +486,7 @@ if (Ptr) { /* Make sure the handle isn't locked */ - if ((uFlags & GMEM_MOVEABLE) & !(HandleEntry->LockCount)) + if ((uFlags & GMEM_MOVEABLE) && !(HandleEntry->LockCount)) { /* Free the current heap */ RtlFreeHeap(hProcessHeap, Flags, Ptr);

1 0

[janderwald] 22645: add missing includes
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: janderwald Date: Tue Jun 27 00:18:52 2006 New Revision: 22645 URL: http://svn.reactos.org/svn/reactos?rev=22645&view=rev Log: add missing includes Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp Tue Jun 27 00:18:52 2006 @@ -5,6 +5,7 @@ // Copyright J Brown 2001 // #include <windows.h> +#include <stdlib.h> #include "cardlib.h" #include "cardregion.h" #include "cardcolor.h" Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Tue Jun 27 00:18:52 2006 @@ -1,6 +1,8 @@ #include <windows.h> #include <commctrl.h> #include <tchar.h> +#include <stdlib.h> + #include "resource.h" #include "cardlib/cardlib.h"

1 0

[janderwald] 22644: add missing include
by janderwald＠svn.reactos.org 26 Jun '06

26 Jun '06

Author: janderwald Date: Tue Jun 27 00:15:58 2006 New Revision: 22644 URL: http://svn.reactos.org/svn/reactos?rev=22644&view=rev Log: add missing include Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp Modified: trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp Tue Jun 27 00:15:58 2006 @@ -6,6 +6,7 @@ // #include <windows.h> #include <tchar.h> +#include <stdlib.h> #include "globals.h" #include "cardlib.h"

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
60
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

Ros-diffs June 2006