Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/05: [ADVAPI32] When starting or sending a control to a service, set the tag in the TEB
by Pierre Schweitzer 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29b46995aa7f3c176e17d… commit 29b46995aa7f3c176e17dc6b25c852ed3a858060 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 30 20:45:11 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 30 21:44:39 2018 +0100 [ADVAPI32] When starting or sending a control to a service, set the tag in the TEB This now allows tracking the threads of the services thanks to their tag. This fixes the failing test in advapi32:ServiceEnv --- dll/win32/advapi32/service/sctrl.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dll/win32/advapi32/service/sctrl.c b/dll/win32/advapi32/service/sctrl.c index f4a7aa85c4..ec5a4cc4bf 100644 --- a/dll/win32/advapi32/service/sctrl.c +++ b/dll/win32/advapi32/service/sctrl.c @@ -22,6 +22,7 @@ typedef struct _SERVICE_THREAD_PARAMSA LPSERVICE_MAIN_FUNCTIONA lpServiceMain; DWORD dwArgCount; LPSTR *lpArgVector; + DWORD dwServiceTag; } SERVICE_THREAD_PARAMSA, *PSERVICE_THREAD_PARAMSA; @@ -30,6 +31,7 @@ typedef struct _SERVICE_THREAD_PARAMSW LPSERVICE_MAIN_FUNCTIONW lpServiceMain; DWORD dwArgCount; LPWSTR *lpArgVector; + DWORD dwServiceTag; } SERVICE_THREAD_PARAMSW, *PSERVICE_THREAD_PARAMSW; @@ -47,6 +49,7 @@ typedef struct _ACTIVE_SERVICE LPVOID HandlerContext; BOOL bUnicode; BOOL bOwnProcess; + DWORD dwServiceTag; } ACTIVE_SERVICE, *PACTIVE_SERVICE; @@ -164,14 +167,22 @@ ScLookupServiceByServiceName(LPCWSTR lpServiceName) static DWORD WINAPI ScServiceMainStubA(LPVOID Context) { + PTEB Teb; PSERVICE_THREAD_PARAMSA ThreadParams = Context; TRACE("ScServiceMainStubA(%p)\n", Context); + /* Set service tag */ + Teb = NtCurrentTeb(); + Teb->SubProcessTag = (PVOID)ThreadParams->dwServiceTag; + /* Call the main service routine and free the arguments vector */ (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, ThreadParams->lpArgVector); + /* Reset service tag */ + Teb->SubProcessTag = 0; + if (ThreadParams->lpArgVector != NULL) { HeapFree(GetProcessHeap(), 0, ThreadParams->lpArgVector); @@ -185,14 +196,22 @@ ScServiceMainStubA(LPVOID Context) static DWORD WINAPI ScServiceMainStubW(LPVOID Context) { + PTEB Teb; PSERVICE_THREAD_PARAMSW ThreadParams = Context; TRACE("ScServiceMainStubW(%p)\n", Context); + /* Set service tag */ + Teb = NtCurrentTeb(); + Teb->SubProcessTag = (PVOID)ThreadParams->dwServiceTag; + /* Call the main service routine and free the arguments vector */ (ThreadParams->lpServiceMain)(ThreadParams->dwArgCount, ThreadParams->lpArgVector); + /* Reset service tag */ + Teb->SubProcessTag = 0; + if (ThreadParams->lpArgVector != NULL) { HeapFree(GetProcessHeap(), 0, ThreadParams->lpArgVector); @@ -440,6 +459,8 @@ ScStartService(PACTIVE_SERVICE lpService, /* Set the service status handle */ lpService->hServiceStatus = ControlPacket->hServiceStatus; + /* Set the service tag */ + lpService->dwServiceTag = ControlPacket->dwServiceTag; /* Build the arguments vector */ if (lpService->bUnicode != FALSE) @@ -456,6 +477,7 @@ ScStartService(PACTIVE_SERVICE lpService, return dwError; } ThreadParamsW->lpServiceMain = lpService->ServiceMain.W; + ThreadParamsW->dwServiceTag = ControlPacket->dwServiceTag; ThreadHandle = CreateThread(NULL, 0, ScServiceMainStubW, @@ -489,6 +511,7 @@ ScStartService(PACTIVE_SERVICE lpService, return dwError; } ThreadParamsA->lpServiceMain = lpService->ServiceMain.A; + ThreadParamsA->dwServiceTag = ControlPacket->dwServiceTag; ThreadHandle = CreateThread(NULL, 0, ScServiceMainStubA, @@ -528,6 +551,9 @@ ScControlService(PACTIVE_SERVICE lpService, TRACE("Size: %lu\n", ControlPacket->dwSize); TRACE("Service: %S\n", (PWSTR)((ULONG_PTR)ControlPacket + ControlPacket->dwServiceNameOffset)); + /* Set service tag */ + NtCurrentTeb()->SubProcessTag = (PVOID)lpService->dwServiceTag; + if (lpService->HandlerFunction) { _SEH2_TRY @@ -560,6 +586,9 @@ ScControlService(PACTIVE_SERVICE lpService, dwError = ERROR_SERVICE_CANNOT_ACCEPT_CTRL; } + /* Reset service tag */ + NtCurrentTeb()->SubProcessTag = 0; + TRACE("ScControlService() done (Error %lu)\n", dwError); return dwError;

1 0

[reactos] 02/05: [ADVAPI32] Stop pretending our advapi32 is NT6+
by Pierre Schweitzer 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=446e13745c72d9874091b… commit 446e13745c72d9874091b9a808f371cc737dc2bd Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 30 20:36:20 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 30 21:44:39 2018 +0100 [ADVAPI32] Stop pretending our advapi32 is NT6+ This is wrong and messes up with internal structures (such as TEB). For the two needed functions which are "NT6+", they were exported with NT6, but already existed in W2K3 SP2. This might fix random bugs CORE-15526 --- dll/win32/advapi32/CMakeLists.txt | 3 --- dll/win32/advapi32/wine/security.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index ff7961c492..744dc098a1 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -2,9 +2,6 @@ spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB) add_definitions(-D_ADVAPI32_) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/ksecdd diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index 54dd595d49..449cbd354b 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -17,6 +17,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); +#ifdef __REACTOS__ +VOID WINAPI QuerySecurityAccessMask(SECURITY_INFORMATION,LPDWORD); +VOID WINAPI SetSecurityAccessMask(SECURITY_INFORMATION,LPDWORD); +#endif typedef struct _ACEFLAG {

1 0

[reactos] 01/05: [SERVICES] On service start control message, send the service tag
by Pierre Schweitzer 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ee627ba635bd45f93da1… commit 2ee627ba635bd45f93da1f5967191c35c5e1646c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Dec 30 18:44:32 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Dec 30 21:44:25 2018 +0100 [SERVICES] On service start control message, send the service tag --- base/system/services/database.c | 1 + sdk/include/reactos/services/services.h | 1 + 2 files changed, 2 insertions(+) diff --git a/base/system/services/database.c b/base/system/services/database.c index 26172a7a94..60e6d4bea1 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -1431,6 +1431,7 @@ ScmSendStartCommand(PSERVICE Service, ? SERVICE_CONTROL_START_OWN : SERVICE_CONTROL_START_SHARE; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; + ControlPacket->dwServiceTag = Service->dwTag; /* Copy the start command line */ ControlPacket->dwServiceNameOffset = sizeof(SCM_CONTROL_PACKET); diff --git a/sdk/include/reactos/services/services.h b/sdk/include/reactos/services/services.h index b6f9d17fcc..fa8ebd2f64 100644 --- a/sdk/include/reactos/services/services.h +++ b/sdk/include/reactos/services/services.h @@ -30,6 +30,7 @@ typedef struct _SCM_CONTROL_PACKET DWORD dwSize; DWORD dwControl; DWORD dwArgumentsCount; + DWORD dwServiceTag; SERVICE_STATUS_HANDLE hServiceStatus; DWORD dwServiceNameOffset; DWORD dwArgumentsOffset;

1 0

[reactos] 01/01: [UMPNPMGR] PNP_GetDeviceList: Implement the enumeration of all device instances.
by Eric Kohl 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6183774efa3cbaef6a454… commit 6183774efa3cbaef6a4547c6f9db6fbf1967cd8e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 30 17:14:43 2018 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 30 17:15:40 2018 +0100 [UMPNPMGR] PNP_GetDeviceList: Implement the enumeration of all device instances. --- base/services/umpnpmgr/umpnpmgr.c | 55 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 2583d135ef..2420a47a85 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -671,6 +671,54 @@ GetEnumeratorInstanceList( } +static +CONFIGRET +GetAllInstanceList( + _Inout_ PWSTR pszBuffer, + _Inout_ PDWORD pulLength) +{ + WCHAR szEnumeratorBuffer[MAX_DEVICE_ID_LEN]; + PWSTR pPtr; + DWORD dwIndex, dwEnumeratorLength, dwUsedLength, dwRemainingLength, dwPathLength; + DWORD dwError; + CONFIGRET ret = CR_SUCCESS; + + dwUsedLength = 0; + dwRemainingLength = *pulLength; + pPtr = pszBuffer; + + for (dwIndex = 0; ; dwIndex++) + { + dwEnumeratorLength = MAX_DEVICE_ID_LEN; + dwError = RegEnumKeyExW(hEnumKey, + dwIndex, + szEnumeratorBuffer, + &dwEnumeratorLength, + NULL, NULL, NULL, NULL); + if (dwError != ERROR_SUCCESS) + break; + + dwPathLength = dwRemainingLength; + ret = GetEnumeratorInstanceList(szEnumeratorBuffer, + pPtr, + &dwPathLength); + if (ret != CR_SUCCESS) + break; + + dwUsedLength += dwPathLength - 1; + dwRemainingLength += dwPathLength - 1; + pPtr += dwPathLength - 1; + } + + if (ret == CR_SUCCESS) + *pulLength = dwUsedLength + 1; + else + *pulLength = 0; + + return ret; +} + + /* Function 10 */ DWORD WINAPI @@ -766,7 +814,8 @@ PNP_GetDeviceList( } else /* CM_GETIDLIST_FILTER_NONE */ { - ret = CR_CALL_NOT_IMPLEMENTED; + ret = GetAllInstanceList(Buffer, + pulLength); } return ret; @@ -889,7 +938,6 @@ GetEnumeratorInstanceListSize( static CONFIGRET GetAllInstanceListSize( - _In_ LPCWSTR pszEnumerator, _Out_ PULONG pulLength) { WCHAR szEnumeratorBuffer[MAX_DEVICE_ID_LEN]; @@ -1016,8 +1064,7 @@ PNP_GetDeviceListSize( } else /* CM_GETIDLIST_FILTER_NONE */ { - ret = GetAllInstanceListSize(pszFilter, - pulLength); + ret = GetAllInstanceListSize(pulLength); } /* Add one character for the terminating double UNICODE_NULL */

1 0

[reactos] 06/06: [FREELDR] Explicitly call RamDiskInitialize() in RamDiskLoadVirtualFile().
by Hermès Bélusca-Maïto 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d5a7b1ce3916acb5b61f… commit 6d5a7b1ce3916acb5b61fe6bb6bf200fcfdde866 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 30 15:21:19 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 30 15:26:44 2018 +0100 [FREELDR] Explicitly call RamDiskInitialize() in RamDiskLoadVirtualFile(). --- boot/freeldr/freeldr/disk/ramdisk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index 8f2edc6a13..f922452d1b 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -112,7 +112,7 @@ VOID NTAPI RamDiskInitialize(VOID) { - /* Setup the RAMDISK device */ + /* Register the RAMDISK device */ FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); } @@ -229,8 +229,8 @@ RamDiskLoadVirtualFile(IN PCHAR FileName) FsCloseFile(RamFile); - // Register a new device for the ramdisk - FsRegisterDevice("ramdisk(0)", &RamDiskVtbl); + /* Setup the RAMDISK device */ + RamDiskInitialize(); return TRUE; }

1 0

[reactos] 05/06: [USETUP] Fix the strings given to the printf-like functions (addendum to a3168373).
by Hermès Bélusca-Maïto 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d6cbea42da3560956d2c… commit 7d6cbea42da3560956d2cdcf86f8a6731c0b756f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 30 15:15:31 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 30 15:26:44 2018 +0100 [USETUP] Fix the strings given to the printf-like functions (addendum to a3168373). --- base/setup/usetup/partlist.c | 12 ++++----- base/setup/usetup/usetup.c | 60 ++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index f0b5c9aafa..7ad044c1c6 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -313,9 +313,9 @@ PrintDiskData( DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -327,9 +327,9 @@ PrintDiskData( DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } if (ListUi->Line >= 0 && ListUi->Line <= Height) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 6fd68b7542..3199cba9b7 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1983,9 +1983,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -1997,9 +1997,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2146,9 +2146,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -2160,9 +2160,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2308,9 +2308,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -2322,9 +2322,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2551,9 +2551,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -2565,9 +2565,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } while (TRUE) @@ -2789,9 +2789,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); @@ -2852,9 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } if (FileSystemList == NULL)

1 0

[reactos] 04/06: [CDFS] Addendum to 5429771b, 6c733856 and 3c64b4cb (r75579): When the CDFS driver is used as a fixed disk FS, the type of device it should return must not be FILE_DEVICE_CD_ROM, but must be the actual underlying one!
by Hermès Bélusca-Maïto 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f488102c863c46763f36c… commit f488102c863c46763f36c837265a207dc59dadd5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 30 14:59:08 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 30 15:26:43 2018 +0100 [CDFS] Addendum to 5429771b, 6c733856 and 3c64b4cb (r75579): When the CDFS driver is used as a fixed disk FS, the type of device it should return must not be FILE_DEVICE_CD_ROM, but must be the actual underlying one! This fixes recognizing *removable* USB keys as disks and not CD-ROMs. CORE-13184 --- drivers/filesystems/cdfs/volinfo.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/cdfs/volinfo.c b/drivers/filesystems/cdfs/volinfo.c index 7448dd5850..f61c975886 100644 --- a/drivers/filesystems/cdfs/volinfo.c +++ b/drivers/filesystems/cdfs/volinfo.c @@ -418,7 +418,11 @@ Return Value: // Buffer->Characteristics = Vcb->TargetDeviceObject->Characteristics; +#ifndef __REACTOS__ Buffer->DeviceType = FILE_DEVICE_CD_ROM; +#else + Buffer->DeviceType = Vcb->TargetDeviceObject->DeviceType; +#endif // // Adjust the length variable

1 0

[reactos] 03/06: [NTOS] Fix a NULL-pointer access bug.
by Hermès Bélusca-Maïto 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf6b5e1ceb7fdfd4850cf… commit bf6b5e1ceb7fdfd4850cf330115d74810c376b13 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 30 14:45:29 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 30 15:26:43 2018 +0100 [NTOS] Fix a NULL-pointer access bug. --- ntoskrnl/fstub/disksup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index e7ab0a7990..dfdbf0c494 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1392,7 +1392,6 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, BOOLEAN IsValid, IsEmpty = TRUE; PVOID MbrBuffer; PIO_STACK_LOCATION IoStackLocation; - PBOOT_SECTOR_INFO BootSectorInfo = (PBOOT_SECTOR_INFO)Buffer; UCHAR PartitionType; LARGE_INTEGER HiddenSectors64; VolumeOffset.QuadPart = Offset.QuadPart = 0; @@ -1723,6 +1722,8 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if ((DiskGeometry.MediaType == RemovableMedia) && (j == 0) && (MbrFound) && (IsEmpty)) { + PBOOT_SECTOR_INFO BootSectorInfo = (PBOOT_SECTOR_INFO)Buffer; + /* Read the jump bytes to detect super-floppy */ if ((BootSectorInfo->JumpByte[0] == 0xeb) || (BootSectorInfo->JumpByte[0] == 0xe9))

1 0

[reactos] 02/06: [NTOS] Don't use TAG_IO_NAME when calling ExFreePoolWithTag() for freeing FileObject->FileName.Buffer .
by Hermès Bélusca-Maïto 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fefb982d644f97975f92f… commit fefb982d644f97975f92f35c3dd4b67ccfe378ee Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 30 14:02:54 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 30 15:26:42 2018 +0100 [NTOS] Don't use TAG_IO_NAME when calling ExFreePoolWithTag() for freeing FileObject->FileName.Buffer . This may look strange, since this buffer is originally allocated using the TAG_IO_NAME tag. However, it happens that file-system drivers are allowed to re-allocate this buffer: this is what the MS' open-sourced CDFS driver does, see e.g. CdCommonCreate() and CdNormalizeFileNames() in cdfs/create.c . This fixes a pool tag mismatch 'mNoI' != 'nFdC' BSOD when resources are freed when closing a file that has been opened with a relative name on a CDFS-mounted volume. --- ntoskrnl/io/iomgr/file.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index a6132692ae..5004938c09 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -253,7 +253,12 @@ IopDoNameTransmogrify(IN PIRP Irp, { if (FileObject->FileName.Buffer) { - ExFreePoolWithTag(FileObject->FileName.Buffer, TAG_IO_NAME); + /* + * Don't use TAG_IO_NAME since the FileObject's FileName + * may have been re-allocated using a different tag + * by a filesystem. + */ + ExFreePoolWithTag(FileObject->FileName.Buffer, 0); } FileObject->FileName.Buffer = NewBuffer; @@ -1060,11 +1065,16 @@ IopParseDevice(IN PVOID ParseObject, /* The driver failed to create the file */ if (!NT_SUCCESS(Status)) { - /* Check if we have a name */ + /* Check if we have a name and if so, free it */ if (FileObject->FileName.Length) { - /* Free it */ - ExFreePoolWithTag(FileObject->FileName.Buffer, TAG_IO_NAME); + /* + * Don't use TAG_IO_NAME since the FileObject's FileName + * may have been re-allocated using a different tag + * by a filesystem. + */ + ExFreePoolWithTag(FileObject->FileName.Buffer, 0); + FileObject->FileName.Buffer = NULL; FileObject->FileName.Length = 0; } @@ -1112,6 +1122,11 @@ IopParseDevice(IN PVOID ParseObject, /* Release the old one */ if (CompleteName->Buffer != NULL) { + /* + * Don't use TAG_IO_NAME since the FileObject's FileName + * may have been re-allocated using a different tag + * by a filesystem. + */ ExFreePoolWithTag(CompleteName->Buffer, 0); } @@ -1129,11 +1144,16 @@ IopParseDevice(IN PVOID ParseObject, } } - /* Check if we have a name */ + /* Check if we have a name and if so, free it */ if (FileObject->FileName.Length) { - /* Free it */ + /* + * Don't use TAG_IO_NAME since the FileObject's FileName + * may have been re-allocated using a different tag + * by a filesystem. + */ ExFreePoolWithTag(FileObject->FileName.Buffer, 0); + FileObject->FileName.Buffer = NULL; FileObject->FileName.Length = 0; } @@ -1427,8 +1447,13 @@ IopDeleteFile(IN PVOID ObjectBody) /* Clear the file name */ if (FileObject->FileName.Buffer) { - ExFreePoolWithTag(FileObject->FileName.Buffer, TAG_IO_NAME); - FileObject->FileName.Buffer = NULL; + /* + * Don't use TAG_IO_NAME since the FileObject's FileName + * may have been re-allocated using a different tag + * by a filesystem. + */ + ExFreePoolWithTag(FileObject->FileName.Buffer, 0); + FileObject->FileName.Buffer = NULL; } /* Check if the FO had a completion port */

1 0

[reactos] 01/06: [NTOS] Code formatting only.
by Hermès Bélusca-Maïto 30 Dec '18

30 Dec '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3a97e222875ffedec021… commit d3a97e222875ffedec021828dd1454cfadbeb653 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Dec 30 13:40:09 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Dec 30 15:26:35 2018 +0100 [NTOS] Code formatting only. --- ntoskrnl/fstub/disksup.c | 11 ++++------- ntoskrnl/io/iomgr/file.c | 15 ++++++--------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/ntoskrnl/fstub/disksup.c b/ntoskrnl/fstub/disksup.c index ef5630d0ee..e7ab0a7990 100644 --- a/ntoskrnl/fstub/disksup.c +++ b/ntoskrnl/fstub/disksup.c @@ -1503,8 +1503,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, if (!Offset.QuadPart) { /* Then read the signature off the disk */ - (*PartitionBuffer)->Signature = ((PULONG)Buffer) - [PARTITION_TABLE_OFFSET / 2 - 1]; + (*PartitionBuffer)->Signature = ((PULONG)Buffer)[PARTITION_TABLE_OFFSET / 2 - 1]; } /* Get the partition descriptor array */ @@ -1540,7 +1539,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, /* Make sure that the partition is valid, unless it's the first */ if (!(HalpIsValidPartitionEntry(PartitionDescriptor, MaxOffset, - MaxSector)) && !(j)) + MaxSector)) && (j == 0)) { /* It's invalid, so fail */ IsValid = FALSE; @@ -1722,9 +1721,7 @@ xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, /* Check if this is a removable device that's probably a super-floppy */ if ((DiskGeometry.MediaType == RemovableMedia) && - !(j) && - (MbrFound) && - (IsEmpty)) + (j == 0) && (MbrFound) && (IsEmpty)) { /* Read the jump bytes to detect super-floppy */ if ((BootSectorInfo->JumpByte[0] == 0xeb) || @@ -2133,7 +2130,7 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, if (((PULONG)Buffer)[PARTITION_TABLE_OFFSET / 2 - 1] != PartitionBuffer->Signature) { - /* Then write the signature and now w need a rewrite */ + /* Then write the signature and now we need a rewrite */ ((PULONG)Buffer)[PARTITION_TABLE_OFFSET / 2 - 1] = PartitionBuffer->Signature; DoRewrite = TRUE; diff --git a/ntoskrnl/io/iomgr/file.c b/ntoskrnl/io/iomgr/file.c index 6b6b2e4abe..a6132692ae 100644 --- a/ntoskrnl/io/iomgr/file.c +++ b/ntoskrnl/io/iomgr/file.c @@ -210,7 +210,7 @@ IopDoNameTransmogrify(IN PIRP Irp, } else { - /* Compute how much mem we'll need */ + /* Compute how much memory we'll need */ RequiredLength = DataBuffer->Reserved + Length + sizeof(UNICODE_NULL); /* Check if FileObject can already hold what we need */ @@ -224,7 +224,7 @@ IopDoNameTransmogrify(IN PIRP Irp, NewBuffer = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_IO_NAME); if (NewBuffer == NULL) { - Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; } } } @@ -233,7 +233,7 @@ IopDoNameTransmogrify(IN PIRP Irp, /* Everything went right */ if (NT_SUCCESS(Irp->IoStatus.Status)) { - /* Copy reserved */ + /* Copy the reserved data */ if (DataBuffer->Reserved) { RtlMoveMemory((PWSTR)((ULONG_PTR)NewBuffer + Length), @@ -241,7 +241,7 @@ IopDoNameTransmogrify(IN PIRP Irp, DataBuffer->Reserved); } - /* Then, buffer */ + /* Then the buffer */ if (Length) { RtlCopyMemory(NewBuffer, Buffer, Length); @@ -958,12 +958,9 @@ IopParseDevice(IN PVOID ParseObject, if (RemainingName->Length) { /* Setup the unicode string */ - FileObject->FileName.MaximumLength = RemainingName->Length + - sizeof(WCHAR); + FileObject->FileName.MaximumLength = RemainingName->Length + sizeof(WCHAR); FileObject->FileName.Buffer = ExAllocatePoolWithTag(PagedPool, - FileObject-> - FileName. - MaximumLength, + FileObject->FileName.MaximumLength, TAG_IO_NAME); if (!FileObject->FileName.Buffer) {

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