Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 71212: [SHELL32] - Accept parsing paths like "C:". Also simplify CDrivesFolder::ParseDisplayName a bit. Note: trying to run "c:" from the run dialog doesn't have the right result due...
by gadamopoulos＠svn.reactos.org 30 Apr '16

30 Apr '16

Author: gadamopoulos Date: Sat Apr 30 12:52:17 2016 New Revision: 71212 URL: http://svn.reactos.org/svn/reactos?rev=71212&view=rev Log: [SHELL32] - Accept parsing paths like "C:". Also simplify CDrivesFolder::ParseDisplayName a bit. Note: trying to run "c:" from the run dialog doesn't have the right result due to a bug in ShellExecute. Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Sat Apr 30 12:52:17 2016 @@ -206,7 +206,6 @@ { HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; LPITEMIDLIST pidlTemp = NULL; TRACE("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", this, @@ -219,17 +218,18 @@ /* handle CLSID paths */ if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') - { return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); - } - /* do we have an absolute path name ? */ - else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && - lpszDisplayName[2] == (WCHAR) '\\') - { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - /* make drive letter uppercase to enable PIDL comparison */ - szElement[0] = toupper(szElement[0]); - pidlTemp = _ILCreateDrive (szElement); + + if (PathGetDriveNumberW(lpszDisplayName) < 0) + return E_INVALIDARG; + + pidlTemp = _ILCreateDrive(lpszDisplayName); + if (!pidlTemp) + return E_OUTOFMEMORY; + + if (lpszDisplayName[2] == L'\\') + { + szNext = &lpszDisplayName[3]; } if (szNext && *szNext)

1 0

[akhaldi] 71211: [0.4.1] Update the version number.
by akhaldi＠svn.reactos.org 30 Apr '16

30 Apr '16

Author: akhaldi Date: Sat Apr 30 12:29:15 2016 New Revision: 71211 URL: http://svn.reactos.org/svn/reactos?rev=71211&view=rev Log: [0.4.1] Update the version number. Modified: branches/ros-branch-0_4_1/reactos/sdk/include/reactos/version.cmake Modified: branches/ros-branch-0_4_1/reactos/sdk/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_1/reactos/sdk/in… ============================================================================== --- branches/ros-branch-0_4_1/reactos/sdk/include/reactos/version.cmake [iso-8859-1] (original) +++ branches/ros-branch-0_4_1/reactos/sdk/include/reactos/version.cmake [iso-8859-1] Sat Apr 30 12:29:15 2016 @@ -17,15 +17,15 @@ string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") -set(KERNEL_VERSION_MINOR "5") -set(KERNEL_VERSION_PATCH_LEVEL "0") +set(KERNEL_VERSION_MINOR "4") +set(KERNEL_VERSION_PATCH_LEVEL "1") set(COPYRIGHT_YEAR "2016") # KERNEL_VERSION_BUILD_TYPE is "SVN" or "" (for the release) -set(KERNEL_VERSION_BUILD_TYPE "SVN") +set(KERNEL_VERSION_BUILD_TYPE "") # KERNEL_VERSION_RELEASE_TYPE is "RC1", "RC2" or "" (for the final one) -set(KERNEL_VERSION_RELEASE_TYPE "") +set(KERNEL_VERSION_RELEASE_TYPE "RC1") set(KERNEL_VERSION "${KERNEL_VERSION_MAJOR}.${KERNEL_VERSION_MINOR}") if(KERNEL_VERSION_PATCH_LEVEL)

1 0

[akhaldi] 71210: [0.4.1] Branch for the release.
by akhaldi＠svn.reactos.org 30 Apr '16

30 Apr '16

Author: akhaldi Date: Sat Apr 30 09:30:52 2016 New Revision: 71210 URL: http://svn.reactos.org/svn/reactos?rev=71210&view=rev Log: [0.4.1] Branch for the release. Added: branches/ros-branch-0_4_1/ - copied from r71209, trunk/

1 0

[pschweitzer] 71209: [FASTFAT] Update the FCB cached dir entry in case of a rename. CORE-11150 #resolve #comment Fixed in r71209
by pschweitzer＠svn.reactos.org 30 Apr '16

30 Apr '16

Author: pschweitzer Date: Sat Apr 30 08:20:00 2016 New Revision: 71209 URL: http://svn.reactos.org/svn/reactos?rev=71209&view=rev Log: [FASTFAT] Update the FCB cached dir entry in case of a rename. CORE-11150 #resolve #comment Fixed in r71209 Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Sat Apr 30 08:20:00 2016 @@ -84,13 +84,14 @@ PVOID Context = NULL; LARGE_INTEGER Offset; PFATX_DIR_ENTRY pDirEntry; - UNICODE_STRING ShortName; NTSTATUS Status; DPRINT("vfatRenameEntry(%p, %p, %wZ, %d)\n", DeviceExt, pFcb, FileName, CaseChangeOnly); if (pFcb->Flags & FCB_IS_FATX_ENTRY) { + VFAT_DIRENTRY_CONTEXT DirContext; + /* Open associated dir entry */ StartIndex = pFcb->startIndex; Offset.u.HighPart = 0; @@ -115,10 +116,12 @@ CcUnpinData(Context); /* Update FCB */ - ShortName.Length = 0; - ShortName.MaximumLength = 0; - ShortName.Buffer = NULL; - Status = vfatUpdateFCB(DeviceExt, pFcb, FileName, &ShortName, pFcb->parentFcb); + DirContext.ShortNameU.Length = 0; + DirContext.ShortNameU.MaximumLength = 0; + DirContext.ShortNameU.Buffer = NULL; + DirContext.LongNameU = *FileName; + DirContext.DirEntry.FatX = *pDirEntry; + Status = vfatUpdateFCB(DeviceExt, pFcb, &DirContext, pFcb->parentFcb); if (NT_SUCCESS(Status)) { CcPurgeCacheSection(&pFcb->parentFcb->SectionObjectPointers, NULL, 0, FALSE); @@ -588,7 +591,7 @@ if (MoveContext != NULL) { /* We're modifying an existing FCB - likely rename/move */ - Status = vfatUpdateFCB(DeviceExt, *Fcb, &DirContext.LongNameU, &DirContext.ShortNameU, ParentFcb); + Status = vfatUpdateFCB(DeviceExt, *Fcb, &DirContext, ParentFcb); (*Fcb)->dirIndex = DirContext.DirIndex; (*Fcb)->startIndex = DirContext.StartIndex; } @@ -744,7 +747,7 @@ { /* We're modifying an existing FCB - likely rename/move */ /* FIXME: check status */ - vfatUpdateFCB(DeviceExt, *Fcb, &DirContext.LongNameU, &DirContext.ShortNameU, ParentFcb); + vfatUpdateFCB(DeviceExt, *Fcb, &DirContext, ParentFcb); (*Fcb)->dirIndex = DirContext.DirIndex; (*Fcb)->startIndex = DirContext.StartIndex; } Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sat Apr 30 08:20:00 2016 @@ -362,17 +362,16 @@ vfatUpdateFCB( PDEVICE_EXTENSION pVCB, PVFATFCB Fcb, - PUNICODE_STRING LongName, - PUNICODE_STRING ShortName, + PVFAT_DIRENTRY_CONTEXT DirContext, PVFATFCB ParentFcb) { NTSTATUS Status; PVFATFCB OldParent; - DPRINT("vfatUpdateFCB(%p, %p, %wZ, %wZ, %p)\n", pVCB, Fcb, LongName, ShortName, ParentFcb); + DPRINT("vfatUpdateFCB(%p, %p, %p, %p)\n", pVCB, Fcb, DirContext, ParentFcb); /* Get full path name */ - Status = vfatMakeFullName(ParentFcb, LongName, ShortName, &Fcb->PathNameU); + Status = vfatMakeFullName(ParentFcb, &DirContext->LongNameU, &DirContext->ShortNameU, &Fcb->PathNameU); if (!NT_SUCCESS(Status)) { return Status; @@ -393,18 +392,23 @@ vfatSplitPathName(&Fcb->PathNameU, &Fcb->DirNameU, &Fcb->LongNameU); /* Copy short name */ - RtlCopyUnicodeString(&Fcb->ShortNameU, ShortName); + RtlCopyUnicodeString(&Fcb->ShortNameU, &DirContext->ShortNameU); /* Recompute hashes */ Fcb->Hash.Hash = vfatNameHash(0, &Fcb->PathNameU); if (pVCB->Flags & VCB_IS_FATX) { Fcb->ShortHash.Hash = Fcb->Hash.Hash; + + RtlCopyMemory(Fcb->entry.FatX.Filename, DirContext->DirEntry.FatX.Filename, 42); + Fcb->entry.FatX.FilenameLength = DirContext->DirEntry.FatX.FilenameLength; } else { Fcb->ShortHash.Hash = vfatNameHash(0, &Fcb->DirNameU); Fcb->ShortHash.Hash = vfatNameHash(Fcb->ShortHash.Hash, &Fcb->ShortNameU); + + RtlCopyMemory(Fcb->entry.Fat.ShortName, DirContext->DirEntry.Fat.ShortName, 11); } /* Set parent */ Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Apr 30 08:20:00 2016 @@ -808,8 +808,7 @@ vfatUpdateFCB( PDEVICE_EXTENSION pVCB, PVFATFCB Fcb, - PUNICODE_STRING LongName, - PUNICODE_STRING ShortName, + PVFAT_DIRENTRY_CONTEXT DirContext, PVFATFCB ParentFcb); VOID

1 0

[akhaldi] 71208: [SHELL32] German layout improvements in the folder options dialog. By Joachim Henze. CORE-11143
by akhaldi＠svn.reactos.org 26 Apr '16

26 Apr '16

Author: akhaldi Date: Tue Apr 26 21:17:25 2016 New Revision: 71208 URL: http://svn.reactos.org/svn/reactos?rev=71208&view=rev Log: [SHELL32] German layout improvements in the folder options dialog. By Joachim Henze. CORE-11143 Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Tue Apr 26 21:17:25 2016 @@ -406,8 +406,8 @@ BEGIN GROUPBOX "Aufgaben", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "&Allgemeine Aufgaben in Ordnern anzeigen", 14001, 40, 25, 150, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "ReactOS Klassisc&he Ansicht verwenden", 14002, 40, 37, 150, 10 + AUTORADIOBUTTON "&Allgemeine Aufgaben in Ordnern anzeigen", 14001, 40, 20, 150, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "ReactOS Klassisc&he Ansicht verwenden", 14002, 40, 32, 150, 10 GROUPBOX "Ordner durchsuchen", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL AUTORADIOBUTTON "Jeden Ordner im &selben Fenster Ã¶ffnen", 14004, 40, 70, 150, 10, WS_TABSTOP | WS_GROUP @@ -415,10 +415,10 @@ GROUPBOX "Markieren von Elementen", -1, 7, 110, 249, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL AUTORADIOBUTTON "&Ãffnen durch &einfachen Klick (Markieren durch zeigen)", 14007, 40, 120, 210, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", 14008, 50, 132, 210, 10 - AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", 14009, 50, 144, 210, 10 + AUTORADIOBUTTON "Symbolbeschriftungen wie im Br&owser unterstreichen", 14008, 50, 132, 200, 10 + AUTORADIOBUTTON "Symbolbeschriftungen nur beim Zeigen &unterstreichen", 14009, 50, 144, 200, 10 AUTORADIOBUTTON "&Ãffnen durch &Doppelklick (Markieren durch einfachen Klick)", 14010, 40, 156, 210, 10 - PUSHBUTTON "&Wiederherstellen", 14011, 180, 180, 60, 14, WS_TABSTOP + PUSHBUTTON "&Wiederherstellen", 14011, 191, 175, 65, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 @@ -432,8 +432,8 @@ PUSHBUTTON "Auf a&lle Ordner anwenden", 14001, 60, 50, 90, 14, WS_TABSTOP PUSHBUTTON "&Alle Ordner zurÃ¼cksetzen", 14002, 160, 50, 90, 14, WS_TABSTOP LTEXT "Erweiterte Einstellungen:", -1, 7, 80, 100, 10 - CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 - PUSHBUTTON "&Wiederherstellen", 14004, 180, 210, 80, 14, WS_TABSTOP + CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 140 + PUSHBUTTON "&Wiederherstellen", 14004, 191, 235, 65, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256 @@ -442,16 +442,16 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "&Registrierte Dateitypen:", -1, 7, 10, 80, 10 - CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 - PUSHBUTTON "&Neu", 14001, 120, 110, 50, 14, WS_TABSTOP - PUSHBUTTON "&LÃ¶schen", 14002, 180, 110, 50, 14, WS_TABSTOP - GROUPBOX "Details zum Dateityp '%s'", 14003, 7, 130, 249, 70 - LTEXT "Ãffnen mit:", -1, 12, 140, 40, 10 + CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 115 + PUSHBUTTON "&Neu", 14001, 140, 140, 55, 14, WS_TABSTOP + PUSHBUTTON "&LÃ¶schen", 14002, 200, 140, 55, 14, WS_TABSTOP + GROUPBOX "Details zum Dateityp '%s'", 14003, 7, 170, 249, 70 + LTEXT "Ãffnen mit:", -1, 12, 180, 40, 10 //ICON - LTEXT "Name", 14005, 100, 140, 40, 10 - PUSHBUTTON "Ãn&dern...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "", 14007, 12, 155, 160, 30 - PUSHBUTTON "&Erweitert", 14008, 180, 175, 50, 14, WS_TABSTOP + LTEXT "Name", 14005, 100, 180, 40, 10 + PUSHBUTTON "Ãn&dern...", 14006, 200, 180, 50, 14, WS_TABSTOP + LTEXT "", 14007, 12, 195, 160, 30 + PUSHBUTTON "&Erweitert", 14008, 200, 215, 50, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143

1 0

[tfaber] 71207: [ACPI] - Fix a broken status check in Bus_StartFdo. Spotted by willok.
by tfaber＠svn.reactos.org 26 Apr '16

26 Apr '16

Author: tfaber Date: Tue Apr 26 18:29:42 2016 New Revision: 71207 URL: http://svn.reactos.org/svn/reactos?rev=71207&view=rev Log: [ACPI] - Fix a broken status check in Bus_StartFdo. Spotted by willok. Modified: trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Tue Apr 26 18:29:42 2016 @@ -268,7 +268,7 @@ PFDO_DEVICE_DATA FdoData, PIRP Irp ) { - NTSTATUS status = STATUS_SUCCESS; + NTSTATUS status; POWER_STATE powerState; ACPI_STATUS AcpiStatus; @@ -285,11 +285,10 @@ DPRINT1("Unable to AcpiInitializeSubsystem\n"); return STATUS_UNSUCCESSFUL; } - - - AcpiStatus = AcpiInitializeTables(NULL, 16, 0); - if (ACPI_FAILURE(status)){ - DPRINT1("Unable to AcpiInitializeSubsystem\n"); + + AcpiStatus = AcpiInitializeTables(NULL, 16, 0); + if (ACPI_FAILURE(AcpiStatus)){ + DPRINT1("Unable to AcpiInitializeTables\n"); return STATUS_UNSUCCESSFUL; }

1 0

[akhaldi] 71206: [CLASSPNP] Use NT_ASSERTMSGW instead of ASSERTMSGW.
by akhaldi＠svn.reactos.org 25 Apr '16

25 Apr '16

Author: akhaldi Date: Mon Apr 25 22:47:45 2016 New Revision: 71206 URL: http://svn.reactos.org/svn/reactos?rev=71206&view=rev Log: [CLASSPNP] Use NT_ASSERTMSGW instead of ASSERTMSGW. Modified: trunk/reactos/drivers/storage/classpnp/class.c Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Mon Apr 25 22:47:45 2016 @@ -803,13 +803,13 @@ if(irpStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) { status = devInfo->ClassStopDevice(DeviceObject, irpStack->MinorFunction); - ASSERTMSGW(L"ClassDispatchPnp !! CANCEL_STOP_DEVICE should " - L"never be failed\n", NT_SUCCESS(status)); + NT_ASSERTMSGW(L"ClassDispatchPnp !! CANCEL_STOP_DEVICE should " + L"never be failed\n", NT_SUCCESS(status)); } else { status = devInfo->ClassRemoveDevice(DeviceObject, irpStack->MinorFunction); - ASSERTMSGW(L"ClassDispatchPnp !! CANCEL_REMOVE_DEVICE should " - L"never be failed\n", NT_SUCCESS(status)); + NT_ASSERTMSGW(L"ClassDispatchPnp !! CANCEL_REMOVE_DEVICE should " + L"never be failed\n", NT_SUCCESS(status)); } Irp->IoStatus.Status = status; @@ -876,8 +876,8 @@ status = devInfo->ClassStopDevice(DeviceObject, IRP_MN_STOP_DEVICE); - ASSERTMSGW(L"ClassDispatchPnp !! STOP_DEVICE should " - L"never be failed\n", NT_SUCCESS(status)); + NT_ASSERTMSGW(L"ClassDispatchPnp !! STOP_DEVICE should " + L"never be failed\n", NT_SUCCESS(status)); if(isFdo) { status = ClassForwardIrpSynchronous(commonExtension, Irp);

1 0

[akhaldi] 71205: [CLASSPNP] Addendum to r71183.
by akhaldi＠svn.reactos.org 25 Apr '16

25 Apr '16

Author: akhaldi Date: Mon Apr 25 22:39:15 2016 New Revision: 71205 URL: http://svn.reactos.org/svn/reactos?rev=71205&view=rev Log: [CLASSPNP] Addendum to r71183. Modified: trunk/reactos/drivers/storage/classpnp/class.c Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Mon Apr 25 22:39:15 2016 @@ -803,13 +803,13 @@ if(irpStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) { status = devInfo->ClassStopDevice(DeviceObject, irpStack->MinorFunction); - ASSERTMSG("ClassDispatchPnp !! CANCEL_STOP_DEVICE should " - L"never be failed\n", NT_SUCCESS(status)); + ASSERTMSGW(L"ClassDispatchPnp !! CANCEL_STOP_DEVICE should " + L"never be failed\n", NT_SUCCESS(status)); } else { status = devInfo->ClassRemoveDevice(DeviceObject, irpStack->MinorFunction); - ASSERTMSG("ClassDispatchPnp !! CANCEL_REMOVE_DEVICE should " - L"never be failed\n", NT_SUCCESS(status)); + ASSERTMSGW(L"ClassDispatchPnp !! CANCEL_REMOVE_DEVICE should " + L"never be failed\n", NT_SUCCESS(status)); } Irp->IoStatus.Status = status; @@ -876,8 +876,8 @@ status = devInfo->ClassStopDevice(DeviceObject, IRP_MN_STOP_DEVICE); - ASSERTMSG("ClassDispatchPnp !! STOP_DEVICE should " - L"never be failed\n", NT_SUCCESS(status)); + ASSERTMSGW(L"ClassDispatchPnp !! STOP_DEVICE should " + L"never be failed\n", NT_SUCCESS(status)); if(isFdo) { status = ClassForwardIrpSynchronous(commonExtension, Irp);

1 0

[spetreolle] 71204: [CONFIGURE] Addendum to r69601: host-tools are "no longer required" but actually still exist. Add the CMakeCache cleanup for them.
by spetreolle＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: spetreolle Date: Sun Apr 24 22:40:53 2016 New Revision: 71204 URL: http://svn.reactos.org/svn/reactos?rev=71204&view=rev Log: [CONFIGURE] Addendum to r69601: host-tools are "no longer required" but actually still exist. Add the CMakeCache cleanup for them. Modified: trunk/reactos/configure.cmd trunk/reactos/configure.sh Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=71204&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Apr 24 22:40:53 2016 @@ -214,6 +214,7 @@ if EXIST CMakeCache.txt ( del CMakeCache.txt /q + del host-tools\CMakeCache.txt /q ) if "%NEW_STYLE_BUILD%"=="0" ( Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=71204&r1=… ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Sun Apr 24 22:40:53 2016 @@ -52,7 +52,7 @@ mkdir -p reactos -EXTRA_ARGS="" +#EXTRA_ARGS="" if [ $USE_NEW_STYLE -eq 0 ]; then mkdir -p host-tools echo Preparing host tools... @@ -62,14 +62,14 @@ REACTOS_BUILD_TOOLS_DIR="$PWD" cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR" - EXTRA_ARGS="-DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" + EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" cd .. fi echo Preparing reactos... cd reactos -rm -f CMakeCache.txt +rm -f CMakeCache.txt host-tools/CMakeCache.txt cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"

1 0

[pschweitzer] 71203: Create the AHCI branch for Aman's work
by pschweitzer＠svn.reactos.org 24 Apr '16

24 Apr '16

Author: pschweitzer Date: Sun Apr 24 20:17:09 2016 New Revision: 71203 URL: http://svn.reactos.org/svn/reactos?rev=71203&view=rev Log: Create the AHCI branch for Aman's work Added: branches/GSoC_2016/AHCI/ (props changed) - copied from r71202, trunk/reactos/ Propchange: branches/GSoC_2016/AHCI/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sun Apr 24 20:17:09 2016 @@ -0,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/GSoC_2016/AHCI/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Apr 24 20:17:09 2016 @@ -0,0 +1,22 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/condrv_restructure:63104-65657 +/branches/header-work:45691-47721 +/branches/kd++:58883-58973 +/branches/kernel-fun/reactos:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm:59241-63176 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013:59059 +/branches/ros-csrss:57561-58762 +/branches/shell-experiments:61927-65494 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup:54809-54998 Propchange: branches/GSoC_2016/AHCI/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs