Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 63723: [SCSIPORT] ScsiPortLogError: Print the information that is to be logged.
by ekohl＠svn.reactos.org 20 Jul '14

20 Jul '14

Author: ekohl Date: Sun Jul 20 07:19:42 2014 New Revision: 63723 URL: http://svn.reactos.org/svn/reactos?rev=63723&view=rev Log: [SCSIPORT] ScsiPortLogError: Print the information that is to be logged. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sun Jul 20 07:19:42 2014 @@ -1840,6 +1840,8 @@ //PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; DPRINT1("ScsiPortLogError() called\n"); + DPRINT1("PathId: 0x%02x TargetId: 0x%02x Lun: 0x%02x ErrorCode: 0x%08lx UniqueId: 0x%08lx\n", + PathId, TargetId, Lun, ErrorCode, UniqueId); //DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, SCSI_PORT_DEVICE_EXTENSION, MiniPortDeviceExtension);

1 0

[tfaber] 63722: [NTOS:FSTUB] - Make sure to NULL the return pointer in the failure case of xHalIoReadPartitionTable. CORE-8359
by tfaber＠svn.reactos.org 19 Jul '14

19 Jul '14

Author: tfaber Date: Sat Jul 19 17:50:56 2014 New Revision: 63722 URL: http://svn.reactos.org/svn/reactos?rev=63722&view=rev Log: [NTOS:FSTUB] - Make sure to NULL the return pointer in the failure case of xHalIoReadPartitionTable. CORE-8359 Modified: trunk/reactos/ntoskrnl/fstub/disksup.c Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sat Jul 19 17:50:56 2014 @@ -1787,7 +1787,11 @@ /* Free the buffer and check for success */ if (Buffer) ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); - if (!NT_SUCCESS(Status)) ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); + *PartitionBuffer = NULL; + } /* Return status */ return Status;

1 0

[tfaber] 63721: [DISK] - Fix memory leak in CreatePartitionDeviceObjects
by tfaber＠svn.reactos.org 19 Jul '14

19 Jul '14

Author: tfaber Date: Sat Jul 19 17:48:46 2014 New Revision: 63721 URL: http://svn.reactos.org/svn/reactos?rev=63721&view=rev Log: [DISK] - Fix memory leak in CreatePartitionDeviceObjects Modified: trunk/reactos/drivers/storage/class/disk/disk.c Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Sat Jul 19 17:48:46 2014 @@ -1183,7 +1183,7 @@ // Allocate and zero a partition list. // - partitionList = ExAllocatePool(NonPagedPool, sizeof(*partitionList )); + partitionList = ExAllocatePool(NonPagedPool, sizeof(*partitionList)); if (partitionList != NULL) { @@ -1446,6 +1446,10 @@ ExFreePool(partitionList); + if (dmSkew) { + ExFreePool(dmSkew); + } + } else { CreatePartitionDeviceObjectsExit: @@ -1455,6 +1459,10 @@ } if (initData) { ExFreePool(initData); + } + + if (dmSkew) { + ExFreePool(dmSkew); } return status; @@ -1909,7 +1917,7 @@ case EXECUTE_OFFLINE_DIAGS: controlCode = IOCTL_SCSI_MINIPORT_EXECUTE_OFFLINE_DIAGS; break; - + default: status = STATUS_INVALID_PARAMETER; break; @@ -2090,13 +2098,13 @@ RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, deviceExtension->DiskGeometry, (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? - sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY) : sizeof(DISK_GEOMETRY_EX)); status = STATUS_SUCCESS; Irp->IoStatus.Information = (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? - sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY) : sizeof(DISK_GEOMETRY_EX); }

1 0

[tfaber] 63720: [SERVICES] - Silence some debug prints
by tfaber＠svn.reactos.org 18 Jul '14

18 Jul '14

Author: tfaber Date: Fri Jul 18 17:47:43 2014 New Revision: 63720 URL: http://svn.reactos.org/svn/reactos?rev=63720&view=rev Log: [SERVICES] - Silence some debug prints Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Jul 18 17:47:43 2014 @@ -936,16 +936,16 @@ &Overlapped); if (bResult == FALSE) { - DPRINT1("WriteFile() returned FALSE\n"); + DPRINT("WriteFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -990,16 +990,16 @@ &Overlapped); if (bResult == FALSE) { - DPRINT1("ReadFile() returned FALSE\n"); + DPRINT("ReadFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -1187,16 +1187,16 @@ &Overlapped); if (bResult == FALSE) { - DPRINT1("WriteFile() returned FALSE\n"); + DPRINT("WriteFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -1241,16 +1241,16 @@ &Overlapped); if (bResult == FALSE) { - DPRINT1("ReadFile() returned FALSE\n"); + DPRINT("ReadFile() returned FALSE\n"); dwError = GetLastError(); if (dwError == ERROR_IO_PENDING) { - DPRINT1("dwError: ERROR_IO_PENDING\n"); + DPRINT("dwError: ERROR_IO_PENDING\n"); dwError = WaitForSingleObject(Service->lpImage->hControlPipe, PipeTimeout); - DPRINT1("WaitForSingleObject() returned %lu\n", dwError); + DPRINT("WaitForSingleObject() returned %lu\n", dwError); if (dwError == WAIT_TIMEOUT) { @@ -1457,7 +1457,7 @@ } } - DPRINT1("ScmWaitForServiceConnect() done\n"); + DPRINT("ScmWaitForServiceConnect() done\n"); return ERROR_SUCCESS; #else

1 0

[tfaber] 63719: [SERVICES] - Use asynchronous I/O to correctly catch timeouts -- we have a reliable NPFS now. This makes the timeout test in advapi32_winetest:service succeed, however I'm leaving i...
by tfaber＠svn.reactos.org 18 Jul '14

18 Jul '14

Author: tfaber Date: Fri Jul 18 16:44:16 2014 New Revision: 63719 URL: http://svn.reactos.org/svn/reactos?rev=63719&view=rev Log: [SERVICES] - Use asynchronous I/O to correctly catch timeouts -- we have a reliable NPFS now. This makes the timeout test in advapi32_winetest:service succeed, however I'm leaving it disabled because it takes two minutes to run (due to... timeouts). ROSTESTS-56 Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Fri Jul 18 16:44:16 2014 @@ -29,7 +29,7 @@ * Uncomment the line below to use asynchronous IO operations * on the service control pipes. */ -// #define USE_ASYNCHRONOUS_IO +#define USE_ASYNCHRONOUS_IO /* GLOBALS *******************************************************************/

1 0

[tfaber] 63718: [MSHTML_WINETEST] - Enable htmllocation test again ROSTESTS-81
by tfaber＠svn.reactos.org 18 Jul '14

18 Jul '14

Author: tfaber Date: Fri Jul 18 10:59:32 2014 New Revision: 63718 URL: http://svn.reactos.org/svn/reactos?rev=63718&view=rev Log: [MSHTML_WINETEST] - Enable htmllocation test again ROSTESTS-81 Modified: trunk/rostests/winetests/mshtml/htmllocation.c Modified: trunk/rostests/winetests/mshtml/htmllocation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmlloca… ============================================================================== --- trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmllocation.c [iso-8859-1] Fri Jul 18 10:59:32 2014 @@ -21,8 +21,6 @@ #include <wine/test.h> -#if ROSTESTS_81_IS_FIXED - #include "mshtml.h" #include "wininet.h" @@ -370,11 +368,9 @@ IMoniker_Release(url_mon); IBindCtx_Release(bc); } -#endif /* ROSTESTS_81_IS_FIXED */ START_TEST(htmllocation) { -#if ROSTESTS_81_IS_FIXED int i; CoInitialize(NULL); @@ -383,5 +379,4 @@ perform_test(location_tests+i); CoUninitialize(); -#endif /* ROSTESTS_81_IS_FIXED */ -} +}

1 0

[ekohl] 63717: [BOOTDATA] Create additional install directories. Patch by Lee Schroeder. Thank you for updating the directory list! CORE-8365 #resolve
by ekohl＠svn.reactos.org 18 Jul '14

18 Jul '14

Author: ekohl Date: Fri Jul 18 04:09:24 2014 New Revision: 63717 URL: http://svn.reactos.org/svn/reactos?rev=63717&view=rev Log: [BOOTDATA] Create additional install directories. Patch by Lee Schroeder. Thank you for updating the directory list! CORE-8365 #resolve Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Fri Jul 18 04:09:24 2014 @@ -44,16 +44,28 @@ 28 = system32\spool\drivers\w32x86\3 29 = system32\spool\prtprocs 30 = system32\spool\prtprocs\w32x86 -31 = system32\wbem\Repository -32 = system32\wbem\Repository\FS -33 = system32\wbem\mof\good -34 = system32\wbem\mof\bad -35 = system32\wbem\AdStatus -36 = system32\wbem\xml -37 = system32\wbem\Logs -38 = system32\wbem\AutoRecover -39 = twain_32 -40 = repair +31 = system32\spool\PRINTERS +32 = system32\wbem\Repository +33 = system32\wbem\Repository\FS +34 = system32\wbem\mof\good +35 = system32\wbem\mof\bad +36 = system32\wbem\AdStatus +37 = system32\wbem\xml +38 = system32\wbem\Logs +39 = system32\wbem\AutoRecover +40 = system32\wbem\snmp +41 = system32\wbem\Performance +42 = twain_32 +43 = repair +44 = Web +45 = Web\Wallpaper +46 = Prefetch +47 = security +48 = security\Database +49 = security\logs +50 = security\templates +51 = system32\CatRoot +52 = system32\CatRoot2 .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Jul 18 04:09:24 2014 @@ -215,26 +215,50 @@ set(${var} 29) elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86) set(${var} 30) + elseif(${dir} STREQUAL reactos/system32/spool/PRINTERS) + set(${var} 31) elseif(${dir} STREQUAL reactos/system32/wbem/Repository) - set(${var} 31) + set(${var} 32) elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS) - set(${var} 32) + set(${var} 33) elseif(${dir} STREQUAL reactos/system32/wbem/mof/good) - set(${var} 33) + set(${var} 34) elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad) - set(${var} 34) + set(${var} 35) elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus) - set(${var} 35) + set(${var} 36) elseif(${dir} STREQUAL reactos/system32/wbem/xml) - set(${var} 36) + set(${var} 37) elseif(${dir} STREQUAL reactos/system32/wbem/Logs) - set(${var} 37) + set(${var} 38) elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover) - set(${var} 38) + set(${var} 39) + elseif(${dir} STREQUAL reactos/system32/wbem/snmp) + set(${var} 40) + elseif(${dir} STREQUAL reactos/system32/wbem/Performance) + set(${var} 41) elseif(${dir} STREQUAL reactos/twain_32) - set(${var} 39) + set(${var} 42) elseif(${dir} STREQUAL reactos/repair) - set(${var} 40) + set(${var} 43) + elseif(${dir} STREQUAL reactos/Web) + set(${var} 44) + elseif(${dir} STREQUAL reactos/Web/Wallpaper) + set(${var} 45) + elseif(${dir} STREQUAL reactos/Prefetch) + set(${var} 46) + elseif(${dir} STREQUAL reactos/security) + set(${var} 47) + elseif(${dir} STREQUAL reactos/security/Database) + set(${var} 48) + elseif(${dir} STREQUAL reactos/security/logs) + set(${var} 49) + elseif(${dir} STREQUAL reactos/security/templates) + set(${var} 50) + elseif(${dir} STREQUAL reactos/system32/CatRoot) + set(${var} 51) + elseif(${dir} STREQUAL reactos/system32/CatRoot2) + set(${var} 52) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

[ekohl] 63716: [USETUP] Create additional install directories. Patch by Lee Schroeder. Thanks a lot! CORE-7987 #resolve #comment Fixed in r63716.
by ekohl＠svn.reactos.org 16 Jul '14

16 Jul '14

Author: ekohl Date: Wed Jul 16 19:43:23 2014 New Revision: 63716 URL: http://svn.reactos.org/svn/reactos?rev=63716&view=rev Log: [USETUP] Create additional install directories. Patch by Lee Schroeder. Thanks a lot! CORE-7987 #resolve #comment Fixed in r63716. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Wed Jul 16 19:43:23 2014 @@ -32,6 +32,28 @@ 16 = Resources\Themes 17 = system32\wbem 18 = Resources\Themes\Lautus +19 = Help +20 = Config +21 = Cursors +22 = system32\ShellExt +23 = Temp +24 = system32\spool +25 = system32\spool\drivers +26 = system32\spool\drivers\color +27 = system32\spool\drivers\w32x86 +28 = system32\spool\drivers\w32x86\3 +29 = system32\spool\prtprocs +30 = system32\spool\prtprocs\w32x86 +31 = system32\wbem\Repository +32 = system32\wbem\Repository\FS +33 = system32\wbem\mof\good +34 = system32\wbem\mof\bad +35 = system32\wbem\AdStatus +36 = system32\wbem\xml +37 = system32\wbem\Logs +38 = system32\wbem\AutoRecover +39 = twain_32 +40 = repair .InfEnd Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Wed Jul 16 19:43:23 2014 @@ -191,6 +191,50 @@ set(${var} 17) elseif(${dir} STREQUAL reactos/Resources/Themes/Lautus) set(${var} 18) + elseif(${dir} STREQUAL reactos/Help) + set(${var} 19) + elseif(${dir} STREQUAL reactos/Config) + set(${var} 20) + elseif(${dir} STREQUAL reactos/Cursors) + set(${var} 21) + elseif(${dir} STREQUAL reactos/system32/ShellExt) + set(${var} 22) + elseif(${dir} STREQUAL reactos/Temp) + set(${var} 23) + elseif(${dir} STREQUAL reactos/system32/spool) + set(${var} 24) + elseif(${dir} STREQUAL reactos/system32/spool/drivers) + set(${var} 25) + elseif(${dir} STREQUAL reactos/system32/spool/drivers/color) + set(${var} 26) + elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86) + set(${var} 27) + elseif(${dir} STREQUAL reactos/system32/spool/drivers/w32x86/3) + set(${var} 28) + elseif(${dir} STREQUAL reactos/system32/spool/prtprocs) + set(${var} 29) + elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86) + set(${var} 30) + elseif(${dir} STREQUAL reactos/system32/wbem/Repository) + set(${var} 31) + elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS) + set(${var} 32) + elseif(${dir} STREQUAL reactos/system32/wbem/mof/good) + set(${var} 33) + elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad) + set(${var} 34) + elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus) + set(${var} 35) + elseif(${dir} STREQUAL reactos/system32/wbem/xml) + set(${var} 36) + elseif(${dir} STREQUAL reactos/system32/wbem/Logs) + set(${var} 37) + elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover) + set(${var} 38) + elseif(${dir} STREQUAL reactos/twain_32) + set(${var} 39) + elseif(${dir} STREQUAL reactos/repair) + set(${var} 40) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

[ekohl] 63715: [USETUP] Reimplement SetupCreateDirectory in such a way, that a full directory path will be created, if needed. This enables us to install ReactOS in a sub-directory like for example...
by ekohl＠svn.reactos.org 15 Jul '14

15 Jul '14

Author: ekohl Date: Tue Jul 15 21:34:12 2014 New Revision: 63715 URL: http://svn.reactos.org/svn/reactos?rev=63715&view=rev Log: [USETUP] Reimplement SetupCreateDirectory in such a way, that a full directory path will be created, if needed. This enables us to install ReactOS in a sub-directory like for example '\OS\Test\Alpha\ReactOS'. Modified: trunk/reactos/base/setup/usetup/filesup.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Tue Jul 15 21:34:12 2014 @@ -37,8 +37,9 @@ static WCHAR CurrentCabinetName[MAX_PATH]; static CAB_SEARCH Search; +static NTSTATUS -SetupCreateDirectory( +SetupCreateSingleDirectory( PWCHAR DirectoryName) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -87,6 +88,111 @@ } RtlFreeUnicodeString(&PathName); + + return Status; +} + + +static +BOOLEAN +DoesPathExist( + PWSTR PathName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; + + RtlInitUnicodeString(&Name, + PathName); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + 0, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + return FALSE; + } + + NtClose(FileHandle); + + return TRUE; +} + + +NTSTATUS +SetupCreateDirectory( + PWCHAR PathName) +{ + PWCHAR PathBuffer = NULL; + PWCHAR Ptr, EndPtr; + ULONG BackslashCount; + ULONG Size; + NTSTATUS Status = STATUS_SUCCESS; + + Size = (wcslen(PathName) + 1) * sizeof(WCHAR); + PathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, Size); + if (PathBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + wcscpy(PathBuffer, PathName); + EndPtr = PathBuffer + wcslen(PathName); + + Ptr = PathBuffer; + + /* Skip the '\Device\HarddiskX\PartitionY\ part */ + BackslashCount = 0; + while (Ptr < EndPtr && BackslashCount < 4) + { + if (*Ptr == L'\\') + BackslashCount++; + + Ptr++; + } + + while (Ptr < EndPtr) + { + if (*Ptr == L'\\') + { + *Ptr = 0; + + DPRINT("PathBuffer: %S\n", PathBuffer); + if (!DoesPathExist(PathBuffer)) + { + DPRINT("Create: %S\n", PathBuffer); + Status = SetupCreateSingleDirectory(PathBuffer); + if (!NT_SUCCESS(Status)) + goto done; + } + + *Ptr = L'\\'; + } + + Ptr++; + } + + if (!DoesPathExist(PathBuffer)) + { + DPRINT("Create: %S\n", PathBuffer); + Status = SetupCreateSingleDirectory(PathBuffer); + if (!NT_SUCCESS(Status)) + goto done; + } + +done: + DPRINT("Done.\n"); + if (PathBuffer != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, PathBuffer); return Status; }

1 0

[ekohl] 63714: [BOOTDATA] Revert accidentially committed changes from r63713.
by ekohl＠svn.reactos.org 13 Jul '14

13 Jul '14

Author: ekohl Date: Sun Jul 13 18:33:40 2014 New Revision: 63714 URL: http://svn.reactos.org/svn/reactos?rev=63714&view=rev Log: [BOOTDATA] Revert accidentially committed changes from r63713. Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sun Jul 13 18:33:40 2014 @@ -1321,11 +1321,6 @@ ; PNP Root device HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,"" - -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\Software",,0x00000012 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\0000\System",,0x00000012 ; Afd driver HKLM,"SYSTEM\CurrentControlSet\Services\Afd","ErrorControl",0x00010001,0x00000001 @@ -2003,7 +1998,7 @@ HKLM,"SYSTEM\Setup","SystemSetupInProgress",0x00010001,0x00000001 ; Debug channels -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+sam,+netapi32,+msports,+devmgr" +;HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","DEBUGCHANNEL",0x00020000,"+ole,+rpc" ; Winsrv configuration HKLM,"SYSTEM\CurrentControlSet\Control\PriorityControl",,0x00000012

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