Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[cwittich] 72560: [SHELL32] sync shellole.c with wine 1.9.16

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 4 07:48:41 2016 New Revision: 72560 URL: http://svn.reactos.org/svn/reactos?rev=72560&view=rev Log: [SHELL32] sync shellole.c with wine 1.9.16 Modified: trunk/reactos/dll/win32/shell32/wine/shellole.c Modified: trunk/reactos/dll/win32/shell32/wine/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellole.c [iso-8859-1] Sun Sep 4 07:48:41 2016 @@ -57,7 +57,7 @@ /* this table contains all CLSIDs of shell32 objects */ static const struct { - REFIID riid; + REFIID clsid; LPFNCREATEINSTANCE lpfnCI; } InterfaceTable[] = { @@ -205,8 +205,8 @@ */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - HRESULT hres = E_OUTOFMEMORY; IClassFactory * pcf = NULL; + HRESULT hres; int i; TRACE("CLSID:%s,IID:%s\n",shdebugstr_guid(rclsid),shdebugstr_guid(iid)); @@ -215,10 +215,11 @@ *ppv = NULL; /* search our internal interface table */ - for(i=0;InterfaceTable[i].riid;i++) { - if(IsEqualIID(InterfaceTable[i].riid, rclsid)) { + for(i=0;InterfaceTable[i].clsid;i++) { + if(IsEqualIID(InterfaceTable[i].clsid, rclsid)) { TRACE("index[%u]\n", i); pcf = IDefClF_fnConstructor(InterfaceTable[i].lpfnCI, NULL, NULL); + break; } } @@ -587,7 +588,7 @@ if(lpDropFileStruct->fWide) { LPWSTR lpszFileW = NULL; - if(lpszFile) { + if(lpszFile && lFile != 0xFFFFFFFF) { lpszFileW = HeapAlloc(GetProcessHeap(), 0, lLength*sizeof(WCHAR)); if(lpszFileW == NULL) { goto end; @@ -642,7 +643,7 @@ if(lpDropFileStruct->fWide == FALSE) { LPSTR lpszFileA = NULL; - if(lpszwFile) { + if(lpszwFile && lFile != 0xFFFFFFFF) { lpszFileA = HeapAlloc(GetProcessHeap(), 0, lLength); if(lpszFileA == NULL) { goto end;

8 years

[cwittich] 72559: shell32: Do nothing if we can't convert PIDL to path in SHAddToRecentDocs (wine commit from Vincent Povirk)

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 4 07:08:50 2016 New Revision: 72559 URL: http://svn.reactos.org/svn/reactos?rev=72559&view=rev Log: shell32: Do nothing if we can't convert PIDL to path in SHAddToRecentDocs (wine commit from Vincent Povirk) Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Sun Sep 4 07:08:50 2016 @@ -800,7 +800,11 @@ switch (uFlags) { case SHARD_PIDL: - SHGetPathFromIDListA(pv, doc_name); + if (!SHGetPathFromIDListA(pv, doc_name)) + { + WARN("can't get path from PIDL\n"); + return; + } break; case SHARD_PATHA:

8 years

[cwittich] 72558: [NTOS] addenum to r72556

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Sep 4 06:20:53 2016 New Revision: 72558 URL: http://svn.reactos.org/svn/reactos?rev=72558&view=rev Log: [NTOS] addenum to r72556 Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sun Sep 4 06:20:53 2016 @@ -384,7 +384,7 @@ _SEH2_END; } - /* If we are dismounting a volume, increaase the dismount count */ + /* If we are dismounting a volume, increase the dismount count */ if (IoControlCode == FSCTL_DISMOUNT_VOLUME) { InterlockedIncrement((PLONG)&SharedUserData->DismountCount);

8 years

[dchapyshev] 72557: [RTL] - Formatting only (no code changes)

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 22:43:29 2016 New Revision: 72557 URL: http://svn.reactos.org/svn/reactos?rev=72557&view=rev Log: [RTL] - Formatting only (no code changes) Modified: trunk/reactos/sdk/lib/rtl/dos8dot3.c Modified: trunk/reactos/sdk/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/rtl/dos8dot3.c?rev… ============================================================================== --- trunk/reactos/sdk/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/rtl/dos8dot3.c [iso-8859-1] Sat Sep 3 22:43:29 2016 @@ -24,259 +24,279 @@ static BOOLEAN RtlpIsShortIllegal(CHAR Char) { - return strchr(RtlpShortIllegals, Char) ? TRUE : FALSE; + return strchr(RtlpShortIllegals, Char) ? TRUE : FALSE; } static USHORT RtlpGetCheckSum(PUNICODE_STRING Name) { - USHORT Hash, Saved; - WCHAR * CurChar; - USHORT Len; - - if (Name->Length == 0) - { - return 0; - } - - if (Name->Length == sizeof(WCHAR)) - { - return Name->Buffer[0]; - } - - CurChar = Name->Buffer; - Hash = (*CurChar << 8) + *(CurChar + 1); - if (Name->Length == 2 * sizeof(WCHAR)) - { - return Hash; - } - - Saved = Hash; - Len = 2; - do - { - CurChar = CurChar + 2; - Hash = (Hash << 7) + *CurChar; - Hash = (Saved >> 1) + (Hash << 8); - if (Len + 1 < Name->Length / sizeof(WCHAR)) - { - Hash += *(CurChar + 1); - } - Saved = Hash; - Len += 2; - } while (Len < Name->Length / sizeof(WCHAR)); - - return Hash; + USHORT Hash, Saved; + WCHAR* CurChar; + USHORT Len; + + if (Name->Length == 0) + { + return 0; + } + + if (Name->Length == sizeof(WCHAR)) + { + return Name->Buffer[0]; + } + + CurChar = Name->Buffer; + Hash = (*CurChar << 8) + *(CurChar + 1); + + if (Name->Length == 2 * sizeof(WCHAR)) + { + return Hash; + } + + Saved = Hash; + Len = 2; + + do + { + CurChar = CurChar + 2; + Hash = (Hash << 7) + *CurChar; + Hash = (Saved >> 1) + (Hash << 8); + + if (Len + 1 < Name->Length / sizeof(WCHAR)) + { + Hash += *(CurChar + 1); + } + + Saved = Hash; + Len += 2; + } while (Len < Name->Length / sizeof(WCHAR)); + + return Hash; } static ULONG RtlpGetIndexLength(ULONG Index) { - ULONG Length = 0; - while (Index) - { - Index /= 10; - Length++; - } - return Length ? Length : 1; + ULONG Length = 0; + + while (Index) + { + Index /= 10; + Length++; + } + + return Length ? Length : 1; } /* * @implemented */ -VOID NTAPI +VOID +NTAPI RtlGenerate8dot3Name(IN PUNICODE_STRING Name, IN BOOLEAN AllowExtendedCharacters, IN OUT PGENERATE_NAME_CONTEXT Context, OUT PUNICODE_STRING Name8dot3) { - ULONG Count; - WCHAR NameBuffer[8]; - WCHAR ExtBuffer[4]; - ULONG StrLength; - ULONG NameLength; - ULONG ExtLength; - ULONG CopyLength; - ULONG DotPos; - ULONG i, j; - ULONG IndexLength; - ULONG CurrentIndex; - USHORT Checksum; - WCHAR c; - - StrLength = Name->Length / sizeof(WCHAR); - DPRINT("StrLength: %lu\n", StrLength); - - /* Find last dot in Name */ - DotPos = StrLength; - for (i = 0; i < StrLength; i++) - { - if (Name->Buffer[i] == L'.') - { - DotPos = i; - } - } - - DPRINT("DotPos: %lu\n", DotPos); - - /* Copy name (6 valid characters max) */ - for (i = 0, NameLength = 0; NameLength < 6 && i < DotPos; i++) - { - c = UNICODE_NULL; - if (AllowExtendedCharacters) - { - c = RtlUpcaseUnicodeChar(Name->Buffer[i]); - Count = 1; - } - else - { - RtlUpcaseUnicodeToOemN((CHAR *)&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); - } - - if (Count != 1 || c == UNICODE_NULL || RtlpIsShortIllegal(c)) - { - NameBuffer[NameLength++] = L'_'; - } - else if (c != L'.' && c != L' ') - { - if (isgraph(c) || (AllowExtendedCharacters && iswgraph(c))) - { - NameBuffer[NameLength++] = c; - } - } - } - - DPRINT("NameBuffer: '%.08S'\n", NameBuffer); - DPRINT("NameLength: %lu\n", NameLength); - - /* Copy extension (4 valid characters max) */ - if (DotPos < StrLength) - { - for (i = DotPos, ExtLength = 0; ExtLength < 4 && i < StrLength; i++) - { - c = UNICODE_NULL; - if (AllowExtendedCharacters) - { - c = RtlUpcaseUnicodeChar(Name->Buffer[i]); - Count = 1; - } - else - { - RtlUpcaseUnicodeToOemN((CHAR *)&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); - } - - if (Count != 1 || c == UNICODE_NULL || RtlpIsShortIllegal(c)) - { - ExtBuffer[ExtLength++] = L'_'; - } - else if (c != L' ') - { - if (isgraph(c) || c == L'.' || (AllowExtendedCharacters && iswgraph(c))) - { - ExtBuffer[ExtLength++] = c; - } - } - } - } - else - { - ExtLength = 0; - } - DPRINT("ExtBuffer: '%.04S'\n", ExtBuffer); - DPRINT("ExtLength: %lu\n", ExtLength); - - /* Determine next index */ - IndexLength = RtlpGetIndexLength(Context->LastIndexValue); - if (Context->CheckSumInserted) - { - CopyLength = min(NameLength, 8 - 4 - 1 - IndexLength); - Checksum = RtlpGetCheckSum(Name); - } - else - { - CopyLength = min(NameLength, 8 - 1 - IndexLength); - Checksum = 0; - } - - DPRINT("CopyLength: %lu\n", CopyLength); - - if ((Context->NameLength == CopyLength) && - (wcsncmp(Context->NameBuffer, NameBuffer, CopyLength) == 0) && - (Context->ExtensionLength == ExtLength) && - (wcsncmp(Context->ExtensionBuffer, ExtBuffer, ExtLength) == 0) && - (Checksum == Context->Checksum) && - (Context->LastIndexValue < 999)) - { - Context->LastIndexValue++; - if (Context->CheckSumInserted == FALSE && + ULONG Count; + WCHAR NameBuffer[8]; + WCHAR ExtBuffer[4]; + ULONG StrLength; + ULONG NameLength; + ULONG ExtLength; + ULONG CopyLength; + ULONG DotPos; + ULONG i, j; + ULONG IndexLength; + ULONG CurrentIndex; + USHORT Checksum; + WCHAR c; + + StrLength = Name->Length / sizeof(WCHAR); + + DPRINT("StrLength: %lu\n", StrLength); + + /* Find last dot in Name */ + DotPos = StrLength; + for (i = 0; i < StrLength; i++) + { + if (Name->Buffer[i] == L'.') + { + DotPos = i; + } + } + + DPRINT("DotPos: %lu\n", DotPos); + + /* Copy name (6 valid characters max) */ + for (i = 0, NameLength = 0; NameLength < 6 && i < DotPos; i++) + { + c = UNICODE_NULL; + if (AllowExtendedCharacters) + { + c = RtlUpcaseUnicodeChar(Name->Buffer[i]); + Count = 1; + } + else + { + RtlUpcaseUnicodeToOemN((CHAR *)&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); + } + + if (Count != 1 || c == UNICODE_NULL || RtlpIsShortIllegal(c)) + { + NameBuffer[NameLength++] = L'_'; + } + else if (c != L'.' && c != L' ') + { + if (isgraph(c) || (AllowExtendedCharacters && iswgraph(c))) + { + NameBuffer[NameLength++] = c; + } + } + } + + DPRINT("NameBuffer: '%.08S'\n", NameBuffer); + DPRINT("NameLength: %lu\n", NameLength); + + /* Copy extension (4 valid characters max) */ + if (DotPos < StrLength) + { + for (i = DotPos, ExtLength = 0; ExtLength < 4 && i < StrLength; i++) + { + c = UNICODE_NULL; + + if (AllowExtendedCharacters) + { + c = RtlUpcaseUnicodeChar(Name->Buffer[i]); + Count = 1; + } + else + { + RtlUpcaseUnicodeToOemN((CHAR *)&c, sizeof(CHAR), &Count, &Name->Buffer[i], sizeof(WCHAR)); + } + + if (Count != 1 || c == UNICODE_NULL || RtlpIsShortIllegal(c)) + { + ExtBuffer[ExtLength++] = L'_'; + } + else if (c != L' ') + { + if (isgraph(c) || c == L'.' || (AllowExtendedCharacters && iswgraph(c))) + { + ExtBuffer[ExtLength++] = c; + } + } + } + } + else + { + ExtLength = 0; + } + + DPRINT("ExtBuffer: '%.04S'\n", ExtBuffer); + DPRINT("ExtLength: %lu\n", ExtLength); + + /* Determine next index */ + IndexLength = RtlpGetIndexLength(Context->LastIndexValue); + if (Context->CheckSumInserted) + { + CopyLength = min(NameLength, 8 - 4 - 1 - IndexLength); + Checksum = RtlpGetCheckSum(Name); + } + else + { + CopyLength = min(NameLength, 8 - 1 - IndexLength); + Checksum = 0; + } + + DPRINT("CopyLength: %lu\n", CopyLength); + + if ((Context->NameLength == CopyLength) && + (wcsncmp(Context->NameBuffer, NameBuffer, CopyLength) == 0) && + (Context->ExtensionLength == ExtLength) && + (wcsncmp(Context->ExtensionBuffer, ExtBuffer, ExtLength) == 0) && + (Checksum == Context->Checksum) && + (Context->LastIndexValue < 999)) + { + Context->LastIndexValue++; + + if (Context->CheckSumInserted == FALSE && Context->LastIndexValue > 9) - { - Context->CheckSumInserted = TRUE; - Context->LastIndexValue = 1; - Context->Checksum = RtlpGetCheckSum(Name); - } - } - else - { - Context->LastIndexValue = 1; - if (NameLength == 0) - { - Context->CheckSumInserted = TRUE; - Context->Checksum = RtlpGetCheckSum(Name); - } - else - { - Context->CheckSumInserted = FALSE; - } - } - - IndexLength = RtlpGetIndexLength(Context->LastIndexValue); - - DPRINT("CurrentIndex: %lu, IndexLength %lu\n", Context->LastIndexValue, IndexLength); - - if (Context->CheckSumInserted) - { - CopyLength = min(NameLength, 8 - 4 - 1 - IndexLength); - } - else - { - CopyLength = min(NameLength, 8 - 1 - IndexLength); - } - - /* Build the short name */ - memcpy(Name8dot3->Buffer, NameBuffer, CopyLength * sizeof(WCHAR)); - j = CopyLength; - if (Context->CheckSumInserted) - { - Checksum = Context->Checksum; - for (i = 0; i < 4; i++) - { - Name8dot3->Buffer[j++] = (Checksum & 0xF) > 9 ? (Checksum & 0xF) + L'A' - 10 : (Checksum & 0xF) + L'0'; - Checksum >>= 4; - } - j = CopyLength + 4; - } - Name8dot3->Buffer[j++] = L'~'; - j += IndexLength - 1; - CurrentIndex = Context->LastIndexValue; - for (i = 0; i < IndexLength; i++) - { - Name8dot3->Buffer[j--] = (CurrentIndex % 10) + L'0'; - CurrentIndex /= 10; - } - j += IndexLength + 1; - - memcpy(Name8dot3->Buffer + j, ExtBuffer, ExtLength * sizeof(WCHAR)); - Name8dot3->Length = (USHORT)(j + ExtLength) * sizeof(WCHAR); - - DPRINT("Name8dot3: '%wZ'\n", Name8dot3); - - /* Update context */ - Context->NameLength = (UCHAR)CopyLength; - Context->ExtensionLength = ExtLength; - memcpy(Context->NameBuffer, NameBuffer, CopyLength * sizeof(WCHAR)); - memcpy(Context->ExtensionBuffer, ExtBuffer, ExtLength * sizeof(WCHAR)); + { + Context->CheckSumInserted = TRUE; + Context->LastIndexValue = 1; + Context->Checksum = RtlpGetCheckSum(Name); + } + } + else + { + Context->LastIndexValue = 1; + + if (NameLength == 0) + { + Context->CheckSumInserted = TRUE; + Context->Checksum = RtlpGetCheckSum(Name); + } + else + { + Context->CheckSumInserted = FALSE; + } + } + + IndexLength = RtlpGetIndexLength(Context->LastIndexValue); + + DPRINT("CurrentIndex: %lu, IndexLength %lu\n", Context->LastIndexValue, IndexLength); + + if (Context->CheckSumInserted) + { + CopyLength = min(NameLength, 8 - 4 - 1 - IndexLength); + } + else + { + CopyLength = min(NameLength, 8 - 1 - IndexLength); + } + + /* Build the short name */ + memcpy(Name8dot3->Buffer, NameBuffer, CopyLength * sizeof(WCHAR)); + + j = CopyLength; + + if (Context->CheckSumInserted) + { + Checksum = Context->Checksum; + + for (i = 0; i < 4; i++) + { + Name8dot3->Buffer[j++] = (Checksum & 0xF) > 9 ? (Checksum & 0xF) + L'A' - 10 : (Checksum & 0xF) + L'0'; + Checksum >>= 4; + } + + j = CopyLength + 4; + } + + Name8dot3->Buffer[j++] = L'~'; + j += IndexLength - 1; + CurrentIndex = Context->LastIndexValue; + + for (i = 0; i < IndexLength; i++) + { + Name8dot3->Buffer[j--] = (CurrentIndex % 10) + L'0'; + CurrentIndex /= 10; + } + + j += IndexLength + 1; + + memcpy(Name8dot3->Buffer + j, ExtBuffer, ExtLength * sizeof(WCHAR)); + Name8dot3->Length = (USHORT)(j + ExtLength) * sizeof(WCHAR); + + DPRINT("Name8dot3: '%wZ'\n", Name8dot3); + + /* Update context */ + Context->NameLength = (UCHAR)CopyLength; + Context->ExtensionLength = ExtLength; + + memcpy(Context->NameBuffer, NameBuffer, CopyLength * sizeof(WCHAR)); + memcpy(Context->ExtensionBuffer, ExtBuffer, ExtLength * sizeof(WCHAR)); } @@ -290,10 +310,9 @@ NTSYSAPI BOOLEAN NTAPI -RtlIsNameLegalDOS8Dot3 ( - _In_ PCUNICODE_STRING Name, - _Inout_opt_ POEM_STRING OemName, - _Out_opt_ PBOOLEAN NameContainsSpaces) +RtlIsNameLegalDOS8Dot3(IN PCUNICODE_STRING Name, + IN OUT POEM_STRING OemName, + OUT PBOOLEAN NameContainsSpaces OPTIONAL) { static const char Illegal[] = "*?<>|\"+=,;[]:/\\\345"; int Dot = -1; @@ -322,6 +341,7 @@ { if (OemName->Length != 1 && (OemName->Length != 2 || OemName->Buffer[1] != '.')) return FALSE; if (NameContainsSpaces) *NameContainsSpaces = FALSE; + return TRUE; } @@ -329,18 +349,20 @@ { switch (OemName->Buffer[i]) { - case ' ': - /* leading/trailing spaces not allowed */ - if (!i || i == OemName->Length-1 || OemName->Buffer[i+1] == '.') return FALSE; - GotSpace = TRUE; - break; - case '.': - if (Dot != -1) return FALSE; - Dot = i; - break; - default: - if (strchr(Illegal, OemName->Buffer[i])) return FALSE; - break; + case ' ': + /* leading/trailing spaces not allowed */ + if (!i || i == OemName->Length-1 || OemName->Buffer[i+1] == '.') return FALSE; + GotSpace = TRUE; + break; + + case '.': + if (Dot != -1) return FALSE; + Dot = i; + break; + + default: + if (strchr(Illegal, OemName->Buffer[i])) return FALSE; + break; } } /* check file part is shorter than 8, extension shorter than 3 @@ -354,7 +376,9 @@ { if (Dot > 8 || (OemName->Length - Dot > 4) || Dot == OemName->Length - 1) return FALSE; } + if (NameContainsSpaces) *NameContainsSpaces = GotSpace; + return TRUE; }

8 years

[hbelusca] 72556: [NTOS]: Fix comments & increase code readability by directly using InterlockedIncrement.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 3 22:07:53 2016 New Revision: 72556 URL: http://svn.reactos.org/svn/reactos?rev=72556&view=rev Log: [NTOS]: Fix comments & increase code readability by directly using InterlockedIncrement. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Sep 3 22:07:53 2016 @@ -384,10 +384,10 @@ _SEH2_END; } - /* If we're to dismount a volume, increaase the dismount count */ + /* If we are dismounting a volume, increaase the dismount count */ if (IoControlCode == FSCTL_DISMOUNT_VOLUME) { - InterlockedExchangeAdd((PLONG)&SharedUserData->DismountCount, 1); + InterlockedIncrement((PLONG)&SharedUserData->DismountCount); } /* Call the FSD */ @@ -418,7 +418,7 @@ /* Backup our complete context in case it exists */ if (FileObject->CompletionContext) { - CompletionInfo = *(FileObject->CompletionContext); + CompletionInfo = *(FileObject->CompletionContext); } /* If we had an event, signal it */ @@ -612,12 +612,15 @@ } /* Use deferred completion for FS I/O */ - Irp->Flags |= (!IsDevIoCtl) ? IRP_DEFER_IO_COMPLETION : 0; - - /* If we're to dismount a volume, increaase the dismount count */ + if (!IsDevIoCtl) + { + Irp->Flags |= IRP_DEFER_IO_COMPLETION; + } + + /* If we are dismounting a volume, increaase the dismount count */ if (IoControlCode == FSCTL_DISMOUNT_VOLUME) { - InterlockedExchangeAdd((PLONG)&SharedUserData->DismountCount, 1); + InterlockedIncrement((PLONG)&SharedUserData->DismountCount); } /* Perform the call */

8 years

[dchapyshev] 72555: [NTOS:KE] - Don't set value for DpcActive in KeInitializeMutant and KeInitializeMutex * Fixes 55 tests in kmtest:KeMutex

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 21:48:21 2016 New Revision: 72555 URL: http://svn.reactos.org/svn/reactos?rev=72555&view=rev Log: [NTOS:KE] - Don't set value for DpcActive in KeInitializeMutant and KeInitializeMutex * Fixes 55 tests in kmtest:KeMutex Modified: trunk/reactos/ntoskrnl/ke/mutex.c Modified: trunk/reactos/ntoskrnl/ke/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/mutex.c?rev=72… ============================================================================== --- trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/mutex.c [iso-8859-1] Sat Sep 3 21:48:21 2016 @@ -51,7 +51,6 @@ /* Now we set up the Dispatcher Header */ Mutant->Header.Type = MutantObject; Mutant->Header.Size = sizeof(KMUTANT) / sizeof(ULONG); - Mutant->Header.DpcActive = FALSE; Mutant->Header.SignalState = InitialOwner ? 0 : 1; InitializeListHead(&(Mutant->Header.WaitListHead)); @@ -71,7 +70,6 @@ /* Set up the Dispatcher Header */ Mutex->Header.Type = MutantObject; Mutex->Header.Size = sizeof(KMUTEX) / sizeof(ULONG); - Mutex->Header.DpcActive = FALSE; Mutex->Header.SignalState = 1; InitializeListHead(&(Mutex->Header.WaitListHead));

8 years

[dchapyshev] 72554: [NTOS:IO] - Implement Lookaside Floats allocations in IoAllocateIrp and IoFreeIrp * Fixes 2 tests in kmtest:IoIrp

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 21:25:45 2016 New Revision: 72554 URL: http://svn.reactos.org/svn/reactos?rev=72554&view=rev Log: [NTOS:IO] - Implement Lookaside Floats allocations in IoAllocateIrp and IoFreeIrp * Fixes 2 tests in kmtest:IoIrp Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sat Sep 3 21:25:45 2016 @@ -562,13 +562,14 @@ /* Set Charge Quota Flag */ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; - /* FIXME: Implement Lookaside Floats */ + /* Get the PRCB */ + Prcb = KeGetCurrentPrcb(); /* Figure out which Lookaside List to use */ - if ((StackSize <= 8) && (ChargeQuota == FALSE)) + if ((StackSize <= 8) && (ChargeQuota == FALSE || Prcb->LookasideIrpFloat > 0)) { /* Set Fixed Size Flag */ - Flags = IRP_ALLOCATED_FIXED_SIZE; + Flags |= IRP_ALLOCATED_FIXED_SIZE; /* See if we should use big list */ if (StackSize != 1) @@ -576,9 +577,6 @@ Size = IoSizeOfIrp(8); ListType = LookasideLargeIrpList; } - - /* Get the PRCB */ - Prcb = KeGetCurrentPrcb(); /* Get the P List First */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[ListType].P; @@ -622,8 +620,12 @@ /* Make sure it was sucessful */ if (!Irp) return NULL; } - else - { + else if (Flags & IRP_QUOTA_CHARGED) + { + /* Decrement lookaside float */ + InterlockedDecrement(&Prcb->LookasideIrpFloat); + Flags |= IRP_LOOKASIDE_ALLOCATION; + /* In this case there is no charge quota */ Flags &= ~IRP_QUOTA_CHARGED; } @@ -1587,7 +1589,7 @@ IoFreeIrp(IN PIRP Irp) { PNPAGED_LOOKASIDE_LIST List; - PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; + PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; PKPRCB Prcb; IOTRACE(IO_IRP_DEBUG, "%s - Freeing IRPs %p\n", @@ -1599,6 +1601,16 @@ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); ASSERT(Irp->CurrentLocation >= Irp->StackCount); + /* Get the PRCB */ + Prcb = KeGetCurrentPrcb(); + + /* If this was a lookaside alloc, increment lookaside float */ + if (Irp->AllocationFlags & IRP_LOOKASIDE_ALLOCATION) + { + Irp->AllocationFlags &= ~IRP_LOOKASIDE_ALLOCATION; + InterlockedIncrement(&Prcb->LookasideIrpFloat); + } + /* If this was a pool alloc, free it with the pool */ if (!(Irp->AllocationFlags & IRP_ALLOCATED_FIXED_SIZE)) { @@ -1609,9 +1621,6 @@ { /* Check if this was a Big IRP */ if (Irp->StackCount != 1) ListType = LookasideLargeIrpList; - - /* Get the PRCB */ - Prcb = KeGetCurrentPrcb(); /* Use the P List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[ListType].P; @@ -1640,8 +1649,8 @@ /* The free was within the Depth */ if (Irp) { - InterlockedPushEntrySList(&List->L.ListHead, - (PSLIST_ENTRY)Irp); + InterlockedPushEntrySList(&List->L.ListHead, + (PSLIST_ENTRY)Irp); } } }

8 years

[ekohl] 72553: [SAMSRV] Implement SamrSetSecurityObject.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Sep 3 19:45:09 2016 New Revision: 72553 URL: http://svn.reactos.org/svn/reactos?rev=72553&view=rev Log: [SAMSRV] Implement SamrSetSecurityObject. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c trunk/reactos/dll/win32/samsrv/samsrv.h Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Sat Sep 3 19:45:09 2016 @@ -205,8 +205,133 @@ IN SECURITY_INFORMATION SecurityInformation, IN PSAMPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSAM_DB_OBJECT DbObject = NULL; + ACCESS_MASK DesiredAccess = 0; + PSECURITY_DESCRIPTOR RelativeSd = NULL; + ULONG RelativeSdSize = 0; + HANDLE TokenHandle = NULL; + PGENERIC_MAPPING Mapping; + NTSTATUS Status; + + TRACE("SamrSetSecurityObject(%p %lx %p)\n", + ObjectHandle, SecurityInformation, SecurityDescriptor); + + if ((SecurityDescriptor == NULL) || + (SecurityDescriptor->SecurityDescriptor == NULL) || + !RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor)) + return ERROR_INVALID_PARAMETER; + + if (SecurityInformation == 0 || + SecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION + | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION)) + return ERROR_INVALID_PARAMETER; + + if (SecurityInformation & SACL_SECURITY_INFORMATION) + DesiredAccess |= ACCESS_SYSTEM_SECURITY; + + if (SecurityInformation & DACL_SECURITY_INFORMATION) + DesiredAccess |= WRITE_DAC; + + if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION)) + DesiredAccess |= WRITE_OWNER; + + if ((SecurityInformation & OWNER_SECURITY_INFORMATION) && + (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Owner == NULL)) + return ERROR_INVALID_PARAMETER; + + if ((SecurityInformation & GROUP_SECURITY_INFORMATION) && + (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Group == NULL)) + return ERROR_INVALID_PARAMETER; + + /* Validate the server handle */ + Status = SampValidateDbObject(ObjectHandle, + SamDbIgnoreObject, + DesiredAccess, + &DbObject); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the mapping for the object type */ + switch (DbObject->ObjectType) + { + case SamDbServerObject: + Mapping = &ServerMapping; + break; + + case SamDbDomainObject: + Mapping = &DomainMapping; + break; + + case SamDbAliasObject: + Mapping = &AliasMapping; + break; + + case SamDbGroupObject: + Mapping = &GroupMapping; + break; + + case SamDbUserObject: + Mapping = &UserMapping; + break; + + default: + return STATUS_INVALID_HANDLE; + } + + /* Get the size of the SD */ + Status = SampGetObjectAttribute(DbObject, + L"SecDesc", + NULL, + NULL, + &RelativeSdSize); + if (!NT_SUCCESS(Status)) + return Status; + + /* Allocate a buffer for the SD */ + RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), 0, RelativeSdSize); + if (RelativeSd == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the SD */ + Status = SampGetObjectAttribute(DbObject, + L"SecDesc", + NULL, + RelativeSd, + &RelativeSdSize); + if (!NT_SUCCESS(Status)) + goto done; + + /* Build the new security descriptor */ + Status = RtlSetSecurityObject(SecurityInformation, + (PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor, + &RelativeSd, + Mapping, + TokenHandle); + if (!NT_SUCCESS(Status)) + { + ERR("RtlSetSecurityObject failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Set the modified SD */ + Status = SampSetObjectAttribute(DbObject, + L"SecDesc", + REG_BINARY, + RelativeSd, + RtlLengthSecurityDescriptor(RelativeSd)); + if (!NT_SUCCESS(Status)) + { + ERR("SampSetObjectAttribute failed (Status 0x%08lx)\n", Status); + } + +done: + if (TokenHandle != NULL) + NtClose(TokenHandle); + + if (RelativeSd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd); + + return Status; } Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sat Sep 3 19:45:09 2016 @@ -22,6 +22,7 @@ #include <winreg.h> #define NTOS_MODE_USER #include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ddk/ntsam.h> #include <sddl.h>

8 years

[dchapyshev] 72552: [NTOS:IO] - Add dismount checking (function should behave the same in the fastio and the slow case) - Fix comment

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 19:10:09 2016 New Revision: 72552 URL: http://svn.reactos.org/svn/reactos?rev=72552&view=rev Log: [NTOS:IO] - Add dismount checking (function should behave the same in the fastio and the slow case) - Fix comment Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sat Sep 3 19:10:09 2016 @@ -348,7 +348,7 @@ DeviceObject = IoGetRelatedDeviceObject(FileObject); } - /* If that's FS I/O, try to do it with FastIO path */ + /* If this is a device I/O, try to do it with FastIO path */ if (IsDevIoCtl) { PFAST_IO_DISPATCH FastIoDispatch = DeviceObject->DriverObject->FastIoDispatch; @@ -613,6 +613,12 @@ /* Use deferred completion for FS I/O */ Irp->Flags |= (!IsDevIoCtl) ? IRP_DEFER_IO_COMPLETION : 0; + + /* If we're to dismount a volume, increaase the dismount count */ + if (IoControlCode == FSCTL_DISMOUNT_VOLUME) + { + InterlockedExchangeAdd((PLONG)&SharedUserData->DismountCount, 1); + } /* Perform the call */ return IopPerformSynchronousRequest(DeviceObject,

8 years

[dchapyshev] 72551: [NTOS:EX] - Reset of count of handles prior to enumeration See issue 11928 for more details.

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Sep 3 18:52:22 2016 New Revision: 72551 URL: http://svn.reactos.org/svn/reactos?rev=72551&view=rev Log: [NTOS:EX] - Reset of count of handles prior to enumeration See issue 11928 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Sep 3 18:52:22 2016 @@ -1202,6 +1202,9 @@ _SEH2_TRY { PLIST_ENTRY NextTableEntry; + + /* Reset of count of handles */ + HandleInformation->NumberOfHandles = 0; /* Enumerate all system handles */ for (NextTableEntry = HandleTableListHead.Flink;

8 years

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 September 2016