Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[mkupfer] 34638: avoid flicker when registering components

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Mon Jul 21 10:52:52 2008 New Revision: 34638 URL: http://svn.reactos.org/svn/reactos?rev=34638&view=rev Log: avoid flicker when registering components Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Mon Jul 21 10:52:52 2008 @@ -1813,6 +1813,7 @@ { PSETUPDATA SetupData; PREGISTRATIONNOTIFY RegistrationNotify; + static UINT oldActivityID = -1; WCHAR Title[64]; /* Retrieve pointer to the global setup data */ @@ -1864,13 +1865,18 @@ { WCHAR Activity[64]; RegistrationNotify = (PREGISTRATIONNOTIFY) lParam; - if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, + // update if necessary only + if (oldActivityID != RegistrationNotify->ActivityID) + { + if (0 != LoadStringW(hDllInstance, RegistrationNotify->ActivityID, Activity, sizeof(Activity) / sizeof(Activity[0]))) { SendDlgItemMessageW(hwndDlg, IDC_ACTIVITY, WM_SETTEXT, 0, (LPARAM) Activity); } + oldActivityID = RegistrationNotify->ActivityID; + } SendDlgItemMessageW(hwndDlg, IDC_ITEM, WM_SETTEXT, 0, (LPARAM)(NULL == RegistrationNotify->CurrentItem ? L"" : RegistrationNotify->CurrentItem));

16 years, 2 months

[fireball] 34637: - Pass thread's CreateTime in QSI SystemProcessInformation. - Better implementation of QSI SystemInterruptInformation. - Minor cleanup.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 21 07:45:12 2008 New Revision: 34637 URL: http://svn.reactos.org/svn/reactos?rev=34637&view=rev Log: - Pass thread's CreateTime in QSI SystemProcessInformation. - Better implementation of QSI SystemInterruptInformation. - Minor cleanup. 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] Mon Jul 21 07:45:12 2008 @@ -565,7 +565,7 @@ Spi->AvailablePages = MmStats.NrFreePages; /* - Add up all the used "Commitied" memory + pagefile. + Add up all the used "Committed" memory + pagefile. Not sure this is right. 8^\ */ Spi->CommittedPages = MiMemoryConsumers[MC_PPOOL].PagesUsed + @@ -800,7 +800,7 @@ ThreadInfo->KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; ThreadInfo->UserTime.QuadPart = current->Tcb.UserTime * 100000LL; -// SpiCur->TH[i].CreateTime = current->CreateTime; + ThreadInfo->CreateTime.QuadPart = current->CreateTime.QuadPart; ThreadInfo->WaitTime = current->Tcb.WaitTime; ThreadInfo->StartAddress = (PVOID) current->StartAddress; ThreadInfo->ClientId = current->Cid; @@ -902,12 +902,12 @@ Prcb = KeGetPcr()->Prcb; for (i = 0; i < KeNumberProcessors; i++) { - Spi->IdleTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; // IdleTime - Spi->KernelTime.QuadPart = Prcb->KernelTime * 100000LL; // KernelTime + Spi->IdleTime.QuadPart = (Prcb->IdleThread->KernelTime + Prcb->IdleThread->UserTime) * 100000LL; + Spi->KernelTime.QuadPart = Prcb->KernelTime * 100000LL; Spi->UserTime.QuadPart = Prcb->UserTime * 100000LL; Spi->DpcTime.QuadPart = Prcb->DpcTime * 100000LL; Spi->InterruptTime.QuadPart = Prcb->InterruptTime * 100000LL; - Spi->InterruptCount = Prcb->InterruptCount; // Interrupt Count + Spi->InterruptCount = Prcb->InterruptCount; Spi++; Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); } @@ -1180,6 +1180,7 @@ QSI_DEF(SystemInterruptInformation) { PKPRCB Prcb; + PKIPCR Pcr; LONG i; ULONG ti; PSYSTEM_INTERRUPT_INFORMATION sii = (PSYSTEM_INTERRUPT_INFORMATION)Buffer; @@ -1194,12 +1195,13 @@ Prcb = KeGetPcr()->Prcb; for (i = 0; i < KeNumberProcessors; i++) { - //sii->ContextSwitches = Prcb->KeContextSwitches; - sii->DpcCount = 0; /* FIXME */ - sii->DpcRate = 0; /* FIXME */ + Pcr = CONTAINING_RECORD(Prcb, KIPCR, Prcb); + sii->ContextSwitches = Pcr->ContextSwitches; + sii->DpcCount = Prcb->DpcData[0].DpcCount; + sii->DpcRate = Prcb->DpcRequestRate; sii->TimeIncrement = ti; - sii->DpcBypassCount = 0; /* FIXME */ - sii->ApcBypassCount = 0; /* FIXME */ + sii->DpcBypassCount = 0; + sii->ApcBypassCount = 0; sii++; Prcb = (PKPRCB)((ULONG_PTR)Prcb + PAGE_SIZE); }

16 years, 2 months

[tkreuzer] 34636: use %p in sprintf instead of %x / cast to int

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jul 21 07:15:36 2008 New Revision: 34636 URL: http://svn.reactos.org/svn/reactos?rev=34636&view=rev Log: use %p in sprintf instead of %x / cast to int Modified: trunk/reactos/lib/rtl/austin/avl.c Modified: trunk/reactos/lib/rtl/austin/avl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/avl.c?rev=3… ============================================================================== --- trunk/reactos/lib/rtl/austin/avl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/austin/avl.c [iso-8859-1] Mon Jul 21 07:15:36 2008 @@ -45,7 +45,7 @@ sprintf(buf+i, "Nil\n"); DbgPrint("%s", buf); } else { - sprintf(buf+i, "Node %x (parent %x: balance %d)\n", (int)node, (int)node->parent, node->Balance); + sprintf(buf+i, "Node %p (parent %p: balance %d)\n", node, node->parent, node->Balance); DbgPrint("%s", buf); if( node->LeftChild != nil ) { sprintf(buf+i, "--> Left\n");

16 years, 2 months

[fireball] 34635: - Include a "System Idle Process" as the first item in QSI SystemProcessInformation.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 21 07:14:23 2008 New Revision: 34635 URL: http://svn.reactos.org/svn/reactos?rev=34635&view=rev Log: - Include a "System Idle Process" as the first item in QSI SystemProcessInformation. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c (contents, props changed) 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] Mon Jul 21 07:14:23 2008 @@ -717,7 +717,7 @@ } RtlZeroMemory(Spi, Size); - syspr = PsGetNextProcess(NULL); + syspr = PsIdleProcess; pr = syspr; pCur = (unsigned char *)Spi; @@ -812,6 +812,9 @@ ThreadInfo++; current_entry = current_entry->Flink; } + + /* Handle idle process entry */ + if (pr == PsIdleProcess) pr = NULL; pr = PsGetNextProcess(pr); nThreads = 0; Propchange: trunk/reactos/ntoskrnl/ex/sysinfo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

16 years, 2 months

[gedmurphy] 34634: - fix the length of the dependencies string - spotted by bugboy <martinmnet at hotmail dot com>

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Jul 21 06:43:55 2008 New Revision: 34634 URL: http://svn.reactos.org/svn/reactos?rev=34634&view=rev Log: - fix the length of the dependencies string - spotted by bugboy <martinmnet at hotmail dot com> Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Mon Jul 21 06:43:55 2008 @@ -608,6 +608,8 @@ lpStr = lpStr + dwLength; } dwDependenciesLength++; + + dwDependenciesLength *= sizeof(WCHAR); } /* FIXME: Encrypt the password */

16 years, 2 months

[mkupfer] 34633: add language group for japanese keyboard layout

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Mon Jul 21 05:55:33 2008 New Revision: 34633 URL: http://svn.reactos.org/svn/reactos?rev=34633&view=rev Log: add language group for japanese keyboard layout Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Mon Jul 21 05:55:33 2008 @@ -592,7 +592,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"7" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"8" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Jul 21 05:55:33 2008 @@ -588,7 +588,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1" -HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,"7" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,"8" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1"

16 years, 2 months

[mkupfer] 34632: - enable japanese keyboard layout in 1st stage setup (but 2nd stage doesn't but yet) - select Swiss keyboard layout for Liechtenstein as default

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Mon Jul 21 05:44:18 2008 New Revision: 34632 URL: http://svn.reactos.org/svn/reactos?rev=34632&view=rev Log: - enable japanese keyboard layout in 1st stage setup (but 2nd stage doesn't but yet) - select Swiss keyboard layout for Liechtenstein as default Modified: trunk/reactos/base/setup/usetup/lang/de-LI.h trunk/reactos/base/setup/usetup/lang/ja-JP.h Modified: trunk/reactos/base/setup/usetup/lang/de-LI.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-LI.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-LI.h [iso-8859-1] Mon Jul 21 05:44:18 2008 @@ -3,6 +3,7 @@ MUI_LAYOUTS deLILayouts[] = { + { L"1407", L"00000807" }, { L"1407", L"00000407" }, { L"0409", L"00000409" }, { NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Mon Jul 21 05:44:18 2008 @@ -3,7 +3,8 @@ MUI_LAYOUTS jaJPLayouts[] = { - { L"0411", L"e0010411" }, +// { L"0411", L"e0010411" }, + { L"0411", L"00000411" }, { NULL, NULL } };

16 years, 2 months

[pschweitzer] 34631: - Implemented FsRtlIsHpfsDbcsLegal and updated its comments - Added its prototype to ntifs.h - Fixed its kernel export - Fixed a bug in FsRtlIsFatDbcsLegal, that leads the function to accept names with multiples dots - Fixed a bug in FsRtlIsFatDbcsLegal, that leads the function to accept names finished with a space - Fixed two other minors bugs in FsRtlIsFatDbcsLegal - Fixed build...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Jul 21 05:22:06 2008 New Revision: 34631 URL: http://svn.reactos.org/svn/reactos?rev=34631&view=rev Log: - Implemented FsRtlIsHpfsDbcsLegal and updated its comments - Added its prototype to ntifs.h - Fixed its kernel export - Fixed a bug in FsRtlIsFatDbcsLegal, that leads the function to accept names with multiples dots - Fixed a bug in FsRtlIsFatDbcsLegal, that leads the function to accept names finished with a space - Fixed two other minors bugs in FsRtlIsFatDbcsLegal - Fixed build... Modified: branches/pierre-fsd/include/ddk/ntifs.h branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def Modified: branches/pierre-fsd/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/ntifs.h?… ============================================================================== --- branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/ntifs.h [iso-8859-1] Mon Jul 21 05:22:06 2008 @@ -2966,6 +2966,16 @@ NTKERNELAPI BOOLEAN NTAPI +FsRtlIsHpfsDbcsLegal ( + IN ANSI_STRING DbcsName, + IN BOOLEAN WildCardsPermissible, + IN BOOLEAN PathNamePermissible, + IN BOOLEAN LeadingBackslashPermissible) +); + +NTKERNELAPI +BOOLEAN +NTAPI FsRtlIsNameInExpression ( IN PUNICODE_STRING Expression, IN PUNICODE_STRING Name, Modified: branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/dbcsn… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Mon Jul 21 05:22:06 2008 @@ -61,7 +61,7 @@ for (i = 0; i < Name.Length / sizeof(CHAR); i++) { /* First make sure the character it's not the Lead DBCS */ - if (FsRtlIsLeadDbcsCharacter(Name->Buffer[i])) + if (FsRtlIsLeadDbcsCharacter(Name.Buffer[i])) { i++; } @@ -196,7 +196,8 @@ IN BOOLEAN LeadingBackslashPermissible) { ANSI_STRING FirstPart, RemainingPart, Name; - ULONG i, LastDot = 0; + BOOLEAN LastDot; + ULONG i; /* Just quit if the string is empty */ if (!DbcsName.Length) @@ -217,6 +218,9 @@ FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); while (FirstPart.Length > 0) { + /* Reset dots count */ + LastDot = FALSE; + /* Accept special filename if wildcards are allowed */ if (WildCardsPermissible && (FirstPart.Length == 1 || FirstPart.Length == 2) && FirstPart.Buffer[0] == '.') { @@ -234,7 +238,7 @@ } /* Filename must be 8.3 filename */ - if (FirstPart.Length < 3 || FirstPart.Length > 12) + if (FirstPart.Length / sizeof(CHAR) < 3 || FirstPart.Length / sizeof(CHAR) > 12) return FALSE; if (!WildCardsPermissible && FsRtlDoesDbcsContainWildCards(&FirstPart)) @@ -245,23 +249,27 @@ * 0x00-0x1F, 0x22, 0x2B, 0x2C, 0x2F, 0x3A, 0x3B, 0x3D, 0x5B, 0x5D, 0x7C */ for (i = 0; i < FirstPart.Length / sizeof(CHAR); i++) { - if ((FirstPart.Buffer[i] < 0x1F) || (FirstPart.Buffer[i] == 0x22) || - (FirstPart.Buffer[i] == 0x2B) || (FirstPart.Buffer[i] == 0x2C) || - (FirstPart.Buffer[i] == 0x2F) || (FirstPart.Buffer[i] == 0x3A) || - (FirstPart.Buffer[i] == 0x3B) || (FirstPart.Buffer[i] == 0x3D) || - (FirstPart.Buffer[i] == 0x5B) || (FirstPart.Buffer[i] == 0x5D) || - (FirstPart.Buffer[i] == 0x7C)) + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) + { + i++; + } + else if ((FirstPart.Buffer[i] < 0x1F) || (FirstPart.Buffer[i] == 0x22) || + (FirstPart.Buffer[i] == 0x2B) || (FirstPart.Buffer[i] == 0x2C) || + (FirstPart.Buffer[i] == 0x2F) || (FirstPart.Buffer[i] == 0x3A) || + (FirstPart.Buffer[i] == 0x3B) || (FirstPart.Buffer[i] == 0x3D) || + (FirstPart.Buffer[i] == 0x5B) || (FirstPart.Buffer[i] == 0x5D) || + (FirstPart.Buffer[i] == 0x7C)) { return FALSE; } - /* First make sure the character it's not the Lead DBCS */ - if (FsRtlIsLeadDbcsCharacter(Name->Buffer[i])) - { - i++; - } else if (FirstPart.Buffer[i] == '.') { - LastDot = i; + /* Filename can only contain one dot */ + if (LastDot) + return FALSE; + + LastDot = TRUE; /* We mustn't have spaces before dot or at the end of the filename * and no dot at the beginning of the filename */ @@ -271,11 +279,15 @@ if (i > 0) if (FirstPart.Buffer[i - 1] == ' ') return FALSE; - } - } - - /* Filename must be 8.3 filename and not 3.8 filename */ - if (LastDot && ((FirstPart.Length / sizeof(CHAR) - 1) - LastDot > 3)) + + /* Filename must be 8.3 filename and not 3.8 filename */ + if ((FirstPart.Length / sizeof(CHAR) - 1) - i > 3) + return FALSE; + } + } + + /* Filename mustn't finish with a space */ + if (FirstPart.Buffer[FirstPart.Length / sizeof(CHAR) - 1] == ' ') return FALSE; EndLoop: @@ -296,21 +308,24 @@ /*++ * @name FsRtlIsHpfsDbcsLegal - * @unimplemented - * - * FILLME + * @implemented + * + * Returns TRUE if the given DbcsName is a valid HPFS filename * * @param DbcsName - * FILLME + * The filename to check. It can also contains pathname. * * @param WildCardsPermissible - * FILLME + * If this is set to FALSE and if filename contains wildcard, the function + * will fail * * @param PathNamePermissible - * FILLME + * If this is set to FALSE and if the filename comes with a pathname, the + * function will fail * * @param LeadingBackslashPermissible - * FILLME + * If this is set to FALSE and if the filename starts with a backslash, the + * function will fail * * @return TRUE if the DbcsName is legal, FALSE otherwise * @@ -318,12 +333,94 @@ * *--*/ BOOLEAN -STDCALL +NTAPI FsRtlIsHpfsDbcsLegal(IN ANSI_STRING DbcsName, IN BOOLEAN WildCardsPermissible, IN BOOLEAN PathNamePermissible, IN BOOLEAN LeadingBackslashPermissible) { - KEBUGCHECK(0); - return FALSE; + ANSI_STRING FirstPart, RemainingPart, Name; + ULONG i; + + /* Just quit if the string is empty */ + if (!DbcsName.Length) + return FALSE; + + /* DbcsName wasn't supposed to be started with \ */ + if (!LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + return FALSE; + /* DbcsName was allowed to be started with \, but now, remove it */ + else if (LeadingBackslashPermissible && DbcsName.Buffer[0] == '\\') + { + DbcsName.Buffer = DbcsName.Buffer + 1; + DbcsName.Length = DbcsName.Length - 1; + DbcsName.MaximumLength = DbcsName.MaximumLength - 1; + } + + /* Extract first part of the DbcsName to work on */ + FsRtlDissectDbcs(DbcsName, &FirstPart, &RemainingPart); + while (FirstPart.Length > 0) + { + /* Accept special filename if wildcards are allowed */ + if (WildCardsPermissible && (FirstPart.Length == 1 || FirstPart.Length == 2) && FirstPart.Buffer[0] == '.') + { + if (FirstPart.Length == 2) + { + if (FirstPart.Buffer[1] == '.') + { + goto EndLoop; + } + } + else + { + goto EndLoop; + } + } + + /* Filename must be 255 bytes maximum */ + if (FirstPart.Length > 255) + return FALSE; + + if (!WildCardsPermissible && FsRtlDoesDbcsContainWildCards(&FirstPart)) + return FALSE; + + /* Now, we will parse the filename to find everything bad in + * It mustn't contain: + * 0x00-0x1F, 0x22, 0x2A, 0x2F, 0x3A, 0x3C, 0x3E, 0x3F, 0x7C */ + for (i = 0; i < FirstPart.Length / sizeof(CHAR); i++) + { + /* First make sure the character it's not the Lead DBCS */ + if (FsRtlIsLeadDbcsCharacter(FirstPart.Buffer[i])) + { + i++; + } + else if ((FirstPart.Buffer[i] < 0x1F) || (FirstPart.Buffer[i] == 0x22) || + (FirstPart.Buffer[i] == 0x2A) || (FirstPart.Buffer[i] == 0x2F) || + (FirstPart.Buffer[i] == 0x3A) || (FirstPart.Buffer[i] == 0x3C) || + (FirstPart.Buffer[i] == 0x3E) || (FirstPart.Buffer[i] == 0x3F) || + (FirstPart.Buffer[i] == 0x7C)) + { + return FALSE; + } + } + + /* Filename mustn't finish with a space or a dot */ + if ((FirstPart.Buffer[FirstPart.Length / sizeof(CHAR) - 1] == ' ') || + (FirstPart.Buffer[FirstPart.Length / sizeof(CHAR) - 1] == '.')) + return FALSE; + + EndLoop: + /* Preparing next loop */ + Name.Buffer = RemainingPart.Buffer; + Name.Length = RemainingPart.Length; + Name.MaximumLength = RemainingPart.MaximumLength; + + /* Call once again our dissect function */ + FsRtlDissectDbcs(Name, &FirstPart, &RemainingPart); + + /* We found a pathname, it wasn't allowed */ + if (FirstPart.Length > 0 && !PathNamePermissible) + return FALSE; + } + return TRUE; } Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_ar… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Mon Jul 21 05:22:06 2008 @@ -217,7 +217,7 @@ FsRtlInsertPerStreamContext FsRtlIsDbcsInExpression FsRtlIsFatDbcsLegal@20 -FsRtlIsHpfsDbcsLegal +FsRtlIsHpfsDbcsLegal@20 FsRtlIsNameInExpression FsRtlIsNtstatusExpected FsRtlIsPagingFile Modified: branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/ntoskrnl_i3… ============================================================================== --- branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Mon Jul 21 05:22:06 2008 @@ -234,7 +234,7 @@ FsRtlInsertPerStreamContext FsRtlIsDbcsInExpression FsRtlIsFatDbcsLegal@20 -FsRtlIsHpfsDbcsLegal +FsRtlIsHpfsDbcsLegal@20 FsRtlIsNameInExpression@16 FsRtlIsNtstatusExpected@4 FsRtlIsPagingFile

16 years, 2 months

[fireball] 34630: Yuriy Sidorov <jura@cp-lab.com> - Invalid parameter error is returned if requested memory area is located above USER_SHARED_DATA address (0x7FFE0000) (WinXP compatible). - Access violation error is returned if existing memory area found on requested address and this area have uninitialized region list. See issue #3467 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 21 04:40:12 2008 New Revision: 34630 URL: http://svn.reactos.org/svn/reactos?rev=34630&view=rev Log: Yuriy Sidorov <jura(a)cp-lab.com> - Invalid parameter error is returned if requested memory area is located above USER_SHARED_DATA address (0x7FFE0000) (WinXP compatible). - Access violation error is returned if existing memory area found on requested address and this area have uninitialized region list. See issue #3467 for more details. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Jul 21 04:40:12 2008 @@ -656,7 +656,7 @@ * Yes, MmCreateMemoryArea does similar checks, but they don't return * the right status codes that a caller of this routine would expect. */ - if (BaseAddress >= MM_HIGHEST_USER_ADDRESS) + if ((ULONG_PTR)BaseAddress >= USER_SHARED_DATA) { DPRINT1("Virtual allocation base above User Space\n"); return STATUS_INVALID_PARAMETER_2; @@ -666,7 +666,7 @@ DPRINT1("Region size is invalid (zero)\n"); return STATUS_INVALID_PARAMETER_4; } - if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)BaseAddress) < RegionSize) + if ((USER_SHARED_DATA - (ULONG_PTR)BaseAddress) < RegionSize) { DPRINT1("Region size would overflow into kernel-memory\n"); return STATUS_INVALID_PARAMETER_4; @@ -726,12 +726,21 @@ } else if (MemoryAreaLength >= RegionSize) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); + /* Region list initialized? */ + if (MemoryArea->Data.SectionData.RegionListHead.Flink) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + } + else + { + Status = STATUS_ACCESS_VIOLATION; + } + MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); DPRINT("NtAllocateVirtualMemory() = %x\n",Status);

16 years, 2 months

[fireball] 34629: - Small DPRINT typo fix.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 21 04:36:02 2008 New Revision: 34629 URL: http://svn.reactos.org/svn/reactos?rev=34629&view=rev Log: - Small DPRINT typo fix. Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Mon Jul 21 04:36:02 2008 @@ -32,7 +32,7 @@ CM_PARSE_CONTEXT ParseContext = {0}; HANDLE Handle; PAGED_CODE(); - DPRINT("NtCreateKey(OB 0x%wZ)\n", ObjectAttributes->ObjectName); + DPRINT("NtCreateKey(OB name %wZ)\n", ObjectAttributes->ObjectName); /* Check for user-mode caller */ if (PreviousMode == UserMode)

16 years, 2 months

← Newer
1
...
33
34
35
36
37
38
39
...
77
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 July 2008