Ros-diffs September 2019

ros-diffs@reactos.org

21 participants
115 discussions

[reactos] 04/04: [MOUNTMGR_APITEST] Add a test suite for the mount manager
by Pierre Schweitzer 05 Sep '19

05 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16ec2e2aa53b403a9e59f… commit 16ec2e2aa53b403a9e59ffd7c9db09ce356335e3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Sep 5 08:35:23 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Sep 5 08:36:20 2019 +0200 [MOUNTMGR_APITEST] Add a test suite for the mount manager It only tests IOCTL_MOUNTMGR_QUERY_POINTS for now --- modules/rostests/apitests/CMakeLists.txt | 1 + modules/rostests/apitests/mountmgr/CMakeLists.txt | 11 +++++ modules/rostests/apitests/mountmgr/QueryPoints.c | 55 +++++++++++++++++++++++ modules/rostests/apitests/mountmgr/precomp.h | 12 +++++ modules/rostests/apitests/mountmgr/testlist.c | 11 +++++ 5 files changed, 90 insertions(+) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index 5bff8ce7604..1d623104fc7 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -19,6 +19,7 @@ if(NOT ARCH STREQUAL "amd64") add_subdirectory(kernel32) endif() add_subdirectory(localspl) +add_subdirectory(mountmgr) add_subdirectory(msgina) add_subdirectory(mspatcha) add_subdirectory(msvcrt) diff --git a/modules/rostests/apitests/mountmgr/CMakeLists.txt b/modules/rostests/apitests/mountmgr/CMakeLists.txt new file mode 100644 index 00000000000..73317c628b6 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/CMakeLists.txt @@ -0,0 +1,11 @@ + +list(APPEND SOURCE + QueryPoints.c + precomp.h) + +add_executable(mountmgr_apitest ${SOURCE} testlist.c) +target_link_libraries(mountmgr_apitest wine ${PSEH_LIB}) +set_module_type(mountmgr_apitest win32cui) +add_importlibs(mountmgr_apitest msvcrt kernel32 ntdll) +add_pch(mountmgr_apitest precomp.h SOURCE) +add_rostests_file(TARGET mountmgr_apitest) diff --git a/modules/rostests/apitests/mountmgr/QueryPoints.c b/modules/rostests/apitests/mountmgr/QueryPoints.c new file mode 100644 index 00000000000..b7e6bee3250 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/QueryPoints.c @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for QueryPoints IOCTL + * PROGRAMMER: Pierre Schweitzer + */ + +#include "precomp.h" + +START_TEST(QueryPoints) +{ + BOOL Ret; + DWORD BytesReturned; + HANDLE MountMgrHandle; + MOUNTMGR_MOUNT_POINT SinglePoint; + MOUNTMGR_MOUNT_POINTS MountPoints; + PMOUNTMGR_MOUNT_POINTS AllocatedPoints; + + MountMgrHandle = CreateFileW(MOUNTMGR_DOS_DEVICE_NAME, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, + INVALID_HANDLE_VALUE); + if (MountMgrHandle == INVALID_HANDLE_VALUE) + { + win_skip("MountMgr unavailable: %lx\n", GetLastError()); + return; + } + + ZeroMemory(&SinglePoint, sizeof(MOUNTMGR_MOUNT_POINT)); + + Ret = DeviceIoControl(MountMgrHandle, IOCTL_MOUNTMGR_QUERY_POINTS, + &SinglePoint, sizeof(MOUNTMGR_MOUNT_POINT), + &MountPoints, sizeof(MOUNTMGR_MOUNT_POINTS), + &BytesReturned, NULL); + ok(Ret == FALSE, "IOCTL unexpectedly succeed\n"); + ok(GetLastError() == ERROR_MORE_DATA, "Unexcepted failure: %lx\n", GetLastError()); + + AllocatedPoints = RtlAllocateHeap(RtlGetProcessHeap(), 0, MountPoints.Size); + if (AllocatedPoints == NULL) + { + win_skip("Insufficiant memory\n"); + goto Done; + } + + Ret = DeviceIoControl(MountMgrHandle, IOCTL_MOUNTMGR_QUERY_POINTS, + &SinglePoint, sizeof(MOUNTMGR_MOUNT_POINT), + AllocatedPoints, MountPoints.Size, + &BytesReturned, NULL); + ok(Ret == TRUE, "IOCTL unexpectedly failed %lx\n", GetLastError()); + + RtlFreeHeap(RtlGetProcessHeap(), 0, AllocatedPoints); + +Done: + CloseHandle(MountMgrHandle); +} diff --git a/modules/rostests/apitests/mountmgr/precomp.h b/modules/rostests/apitests/mountmgr/precomp.h new file mode 100644 index 00000000000..33509fb8083 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/precomp.h @@ -0,0 +1,12 @@ +#ifndef _MOUNTMGR_APITEST_PRECOMP_H_ +#define _MOUNTMGR_APITEST_PRECOMP_H_ + +#define WIN32_NO_STATUS + +#include <apitest.h> +#include <strsafe.h> +#include <ntstatus.h> +#include <mountmgr.h> +#include <ndk/rtlfuncs.h> + +#endif /* _MOUNTMGR_APITEST_PRECOMP_H_ */ diff --git a/modules/rostests/apitests/mountmgr/testlist.c b/modules/rostests/apitests/mountmgr/testlist.c new file mode 100644 index 00000000000..ab7c0921a26 --- /dev/null +++ b/modules/rostests/apitests/mountmgr/testlist.c @@ -0,0 +1,11 @@ +#define STANDALONE +#include <apitest.h> + +extern void func_QueryPoints(void); + +const struct test winetest_testlist[] = +{ + { "QueryPoints", func_QueryPoints }, + { 0, 0 } +}; +

1 0

[reactos] 03/04: [MOUNTMGR] Fix QueryPointsFromMemory and make it working
by Pierre Schweitzer 05 Sep '19

05 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d592e00dfa07277b2f27c… commit d592e00dfa07277b2f27c4f50543c8caacdd1bce Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Sep 5 08:28:56 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Sep 5 08:36:19 2019 +0200 [MOUNTMGR] Fix QueryPointsFromMemory and make it working Select the current stack location for output buffer And set output size so that buffer gets properly copied to caller --- drivers/filters/mountmgr/point.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index d9a468f32c2..d63ec3a4592 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -332,12 +332,13 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, } /* Now, ensure output buffer can hold everything */ - Stack = IoGetNextIrpStackLocation(Irp); + Stack = IoGetCurrentIrpStackLocation(Irp); MountPoints = (PMOUNTMGR_MOUNT_POINTS)Irp->AssociatedIrp.SystemBuffer; /* Ensure we set output to let user reallocate! */ MountPoints->Size = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSize; MountPoints->NumberOfMountPoints = TotalSymLinks; + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalSize; if (MountPoints->Size > Stack->Parameters.DeviceIoControl.OutputBufferLength) {

1 0

[reactos] 02/04: [MOUNTMGR] Properly validate input buffer size
by Pierre Schweitzer 05 Sep '19

05 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70d29ec4238e830a84a4b… commit 70d29ec4238e830a84a4b6d41a0ee3eafe9fcbd5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu Sep 5 08:22:59 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Sep 5 08:36:19 2019 +0200 [MOUNTMGR] Properly validate input buffer size This avoids IOCTL_MOUNTMGR_QUERY_POINTS always failing --- drivers/filters/mountmgr/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index 17d720e346c..7172a3b5da8 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -1745,7 +1745,7 @@ MountMgrQueryPoints(IN PDEVICE_EXTENSION DeviceExtension, /* We can't go beyond */ if (((ULONG)MountPoint->SymbolicLinkNameLength + MountPoint->UniqueIdLength + - MountPoint->DeviceNameLength) < Stack->Parameters.DeviceIoControl.InputBufferLength) + MountPoint->DeviceNameLength) > Stack->Parameters.DeviceIoControl.InputBufferLength) { return STATUS_INVALID_PARAMETER; }

1 0

[reactos] 01/04: [MOUNTMGR] Fix global symbolic link creations
by Pierre Schweitzer 05 Sep '19

05 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77657c22c950dc1d5404d… commit 77657c22c950dc1d5404df1cac7ce06e0cf8fa24 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Sep 4 23:47:26 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Sep 5 08:36:19 2019 +0200 [MOUNTMGR] Fix global symbolic link creations They were wrongly pointing to the original target once rewritten instead of pointing to the proper target: the device. This notably fixes opening the MountMgr device from user mode (to perform IOCTL calls, for instance), and might also fix various bugs dealing with global namespaces. This might have some various effects in ReactOS~. --- drivers/filters/mountmgr/symlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/symlink.c b/drivers/filters/mountmgr/symlink.c index 061e6717e77..254eb2fb452 100644 --- a/drivers/filters/mountmgr/symlink.c +++ b/drivers/filters/mountmgr/symlink.c @@ -124,7 +124,7 @@ GlobalCreateSymbolicLink(IN PUNICODE_STRING DosName, } /* Then, create the symlink */ - Status = IoCreateSymbolicLink(&GlobalName, DosName); + Status = IoCreateSymbolicLink(&GlobalName, DeviceName); FreePool(GlobalName.Buffer);

1 0

[reactos] 01/01: [Win32SS|Eng] Update stubs.
by jimtabor 04 Sep '19

04 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f353f7747184507a5fe1… commit 6f353f7747184507a5fe1d8922436269b68a26fa Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Wed Sep 4 13:09:34 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Wed Sep 4 13:09:34 2019 -0500 [Win32SS|Eng] Update stubs. These functions are no longer support for UMPD. --- win32ss/gdi/eng/stubs.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/win32ss/gdi/eng/stubs.c b/win32ss/gdi/eng/stubs.c index 29d5595d7fc..8a91c86ff5f 100644 --- a/win32ss/gdi/eng/stubs.c +++ b/win32ss/gdi/eng/stubs.c @@ -70,7 +70,7 @@ EngComputeGlyphSet( } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -83,7 +83,7 @@ EngEnumForms( OUT LPDWORD pcReturned) { // www.osr.com/ddk/graphics/gdifncs_5e07.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -151,7 +151,7 @@ EngGetFilePath( } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -164,12 +164,12 @@ EngGetForm( OUT LPDWORD pcbNeeded) { // www.osr.com/ddk/graphics/gdifncs_5vvr.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -181,12 +181,12 @@ EngGetPrinter( OUT LPDWORD pcbNeeded) { // www.osr.com/ddk/graphics/gdifncs_50h3.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } /* - * @unimplemented + * @implemented */ DWORD APIENTRY @@ -199,7 +199,7 @@ EngGetPrinterData( OUT LPDWORD pcbNeeded) { // www.osr.com/ddk/graphics/gdifncs_8t5z.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return 0; } @@ -216,7 +216,7 @@ EngGetPrinterDataFileName(IN HDEV hdev) } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -229,7 +229,7 @@ EngGetType1FontList( OUT LARGE_INTEGER *pLastModified) { // www.osr.com/ddk/graphics/gdifncs_6e5j.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -301,7 +301,7 @@ EngSetPrinterData( IN DWORD cjPrinterData) { // www.osr.com/ddk/graphics/gdifncs_8drb.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return 0; } @@ -364,7 +364,7 @@ EngWritePrinter( OUT LPDWORD pcWritten) { // www.osr.com/ddk/graphics/gdifncs_9v6v.htm - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -515,7 +515,7 @@ EngDeleteFile( } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -527,7 +527,7 @@ EngGetPrinterDriver( IN DWORD Buf, OUT DWORD *Needed) { - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -1063,13 +1063,13 @@ NtGdiGetEudcTimeStampEx( } /* - * @unimplemented + * @implemented */ BOOL APIENTRY NtGdiInitSpool(VOID) { - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -1088,7 +1088,7 @@ NtGdiQueryFonts( } /* - * @unimplemented + * @implemented */ INT APIENTRY @@ -1099,7 +1099,7 @@ NtGdiGetSpoolMessage( DWORD u4) { /* FIXME: The prototypes */ - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return 0; } @@ -1473,7 +1473,7 @@ NtGdiSetMagicColors( } /* - * @unimplemented + * @implemented */ BOOL APIENTRY @@ -1481,7 +1481,7 @@ NtGdiUnloadPrinterDriver( IN LPWSTR pDriverName, IN ULONG cbDriverName) { - UNIMPLEMENTED; + EngSetLastError(ERROR_NOT_SUPPORTED); return FALSE; }

1 0

[reactos] 01/01: [TXTSETUP] Revert an accidental change
by Victor Perevertkin 04 Sep '19

04 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc44b334d761b15ba8b0d… commit bc44b334d761b15ba8b0d01f76cf15cf838d949e Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Wed Sep 4 17:54:00 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Sep 4 17:54:00 2019 +0300 [TXTSETUP] Revert an accidental change --- boot/bootdata/txtsetup.sif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 59977b553f9..8b662ef7177 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -208,7 +208,7 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS -OsLoadOptions = "/NOGUIBOOT" +OsLoadOptions = "/NOGUIBOOT /NODEBUG" DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" ;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" ;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"

1 0

[reactos] 01/01: [USBHUB_NEW] Enable generic USB hubs (USB class 09) They actually work, tested on a couple of real devices
by Victor Perevertkin 04 Sep '19

04 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6392c5a78c06ad8460dea… commit 6392c5a78c06ad8460deae47e90406fba0412bb5 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Wed Sep 4 05:26:02 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Wed Sep 4 05:26:02 2019 +0300 [USBHUB_NEW] Enable generic USB hubs (USB class 09) They actually work, tested on a couple of real devices --- boot/bootdata/hivesys.inf | 4 ++-- boot/bootdata/setupreg.inf | 2 +- boot/bootdata/txtsetup.sif | 4 ++-- media/inf/usb.inf | 3 +-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 983c6317840..a30fb55aae1 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -38,8 +38,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubCl HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Service",0x00000000,"usbhub" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" diff --git a/boot/bootdata/setupreg.inf b/boot/bootdata/setupreg.inf index 197918f13b1..ed841fdd044 100644 --- a/boot/bootdata/setupreg.inf +++ b/boot/bootdata/setupreg.inf @@ -17,7 +17,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index feeae2404fa..59977b553f9 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -161,7 +161,7 @@ PCI\CC_0105 = uniata PCI\CC_0106 = uniata ;PCI\CC_0106 = storahci *PNP0600 = uniata -;USB\CLASS_09 = usbhub +USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub USB\ROOT_HUB20 = usbhub PCI\CC_0C0300 = usbuhci @@ -208,7 +208,7 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS -OsLoadOptions = "/NOGUIBOOT /NODEBUG" +OsLoadOptions = "/NOGUIBOOT" DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" ;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" ;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" diff --git a/media/inf/usb.inf b/media/inf/usb.inf index 9efaaec7eb3..01f03500a91 100644 --- a/media/inf/usb.inf +++ b/media/inf/usb.inf @@ -28,8 +28,7 @@ CopyFiles = usbhub_CopyFiles.NT usbhub.sys [usbhub_Inst.NT.Services] -;AddService = usbhub, 0x00000002, usbhub_Service_Inst -AddService = , 0x00000002 +AddService = usbhub, 0x00000002, usbhub_Service_Inst [usbhub_Service_Inst] ServiceType = 1

1 0

[reactos] 01/01: [Win32SS] Fix safe pointer and define type.
by jimtabor 03 Sep '19

03 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ca67d97e2864c72237e6… commit 3ca67d97e2864c72237e6ffb618802f17a070686 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 3 15:02:46 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 3 15:02:46 2019 -0500 [Win32SS] Fix safe pointer and define type. --- win32ss/gdi/ntgdi/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/palette.c b/win32ss/gdi/ntgdi/palette.c index 18234566ee9..265b691164c 100644 --- a/win32ss/gdi/ntgdi/palette.c +++ b/win32ss/gdi/ntgdi/palette.c @@ -12,7 +12,7 @@ #define NDEBUG #include <debug.h> -#define PAL_SETOWNER 0x8000 +#define PAL_SETPOWNER 0x8000 #define MAX_PALCOLORS 65536 static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* The program need save the pallete and restore it */ @@ -1304,7 +1304,7 @@ NtGdiEngCreatePalette( } _SEH2_END; - hPal = EngCreatePalette( iMode/*|PAL_SETOWNER*/, cColors, pulColors, flRed, flGreen, flBlue ); + hPal = EngCreatePalette( iMode/*|PAL_SETPOWNER*/, cColors, pulcSafe, flRed, flGreen, flBlue ); if ( cColors > WINDDI_MAXSETPALETTECOLORS ) ExFreePoolWithTag( pulcSafe, GDITAG_UMPD );

1 0

[reactos] 01/01: [Win32SS] Implement EngCreate/DeletePalette.
by jimtabor 03 Sep '19

03 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c698eff041ef60bab147f… commit c698eff041ef60bab147f9feae57fab816327984 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Tue Sep 3 14:36:20 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Tue Sep 3 14:36:20 2019 -0500 [Win32SS] Implement EngCreate/DeletePalette. Safe to be called from user side without UMPD support. --- win32ss/gdi/eng/umpdstubs.c | 25 -------------------- win32ss/gdi/ntgdi/palette.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 25 deletions(-) diff --git a/win32ss/gdi/eng/umpdstubs.c b/win32ss/gdi/eng/umpdstubs.c index acb280ff273..de2a2c6e0e5 100644 --- a/win32ss/gdi/eng/umpdstubs.c +++ b/win32ss/gdi/eng/umpdstubs.c @@ -211,21 +211,6 @@ NtGdiEngCreateDeviceSurface( return NULL; } -__kernel_entry -HPALETTE -APIENTRY -NtGdiEngCreatePalette( - _In_ ULONG iMode, - _In_ ULONG cColors, - _In_ ULONG *pulColors, - _In_ FLONG flRed, - _In_ FLONG flGreen, - _In_ FLONG flBlue) -{ - UNIMPLEMENTED; - return NULL; -} - __kernel_entry NTSTATUS APIENTRY @@ -236,16 +221,6 @@ NtGdiEngDeleteClip( return STATUS_NOT_IMPLEMENTED; } -__kernel_entry -BOOL -APIENTRY -NtGdiEngDeletePalette( - _In_ HPALETTE hPal) -{ - UNIMPLEMENTED; - return FALSE; -} - __kernel_entry NTSTATUS APIENTRY diff --git a/win32ss/gdi/ntgdi/palette.c b/win32ss/gdi/ntgdi/palette.c index ef4509153e6..18234566ee9 100644 --- a/win32ss/gdi/ntgdi/palette.c +++ b/win32ss/gdi/ntgdi/palette.c @@ -12,6 +12,9 @@ #define NDEBUG #include <debug.h> +#define PAL_SETOWNER 0x8000 +#define MAX_PALCOLORS 65536 + static UINT SystemPaletteUse = SYSPAL_NOSTATIC; /* The program need save the pallete and restore it */ PALETTE gpalRGB, gpalBGR, gpalRGB555, gpalRGB565, *gppalMono, *gppalDefault; @@ -1263,5 +1266,58 @@ NtGdiUnrealizeObject(HGDIOBJ hgdiobj) return Ret; } +__kernel_entry +HPALETTE +APIENTRY +NtGdiEngCreatePalette( + _In_ ULONG iMode, + _In_ ULONG cColors, + _In_ ULONG *pulColors, + _In_ FLONG flRed, + _In_ FLONG flGreen, + _In_ FLONG flBlue) +{ + HPALETTE hPal = NULL; + ULONG *pulcSafe, ulColors[WINDDI_MAXSETPALETTECOLORS]; + + if ( cColors > MAX_PALCOLORS ) return NULL; + + if ( cColors <= WINDDI_MAXSETPALETTECOLORS ) + { + pulcSafe = ulColors; + } + else + { + pulcSafe = ExAllocatePoolWithTag(PagedPool, cColors * sizeof(ULONG), GDITAG_UMPD ); + } + + _SEH2_TRY + { + ProbeForRead( pulColors, cColors * sizeof(ULONG), 1); + RtlCopyMemory( pulcSafe, pulColors, cColors * sizeof(ULONG) ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + if ( cColors > WINDDI_MAXSETPALETTECOLORS ) ExFreePoolWithTag( pulcSafe, GDITAG_UMPD ); + _SEH2_YIELD(return hPal); + } + _SEH2_END; + + hPal = EngCreatePalette( iMode/*|PAL_SETOWNER*/, cColors, pulColors, flRed, flGreen, flBlue ); + + if ( cColors > WINDDI_MAXSETPALETTECOLORS ) ExFreePoolWithTag( pulcSafe, GDITAG_UMPD ); + + return hPal; +} + +__kernel_entry +BOOL +APIENTRY +NtGdiEngDeletePalette( + _In_ HPALETTE hPal) +{ + return EngDeletePalette(hPal); +} /* EOF */

1 0

[reactos] 01/01: [BTRFS] Fix fileinfo.c build
by Pierre Schweitzer 02 Sep '19

02 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcd463ba986038d374114… commit dcd463ba986038d374114ad246c6d276e0c0798b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Mon Sep 2 22:17:17 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Mon Sep 2 22:17:17 2019 +0200 [BTRFS] Fix fileinfo.c build --- drivers/filesystems/btrfs/fileinfo.c | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/filesystems/btrfs/fileinfo.c b/drivers/filesystems/btrfs/fileinfo.c index 6defcb1e512..445f4948e59 100644 --- a/drivers/filesystems/btrfs/fileinfo.c +++ b/drivers/filesystems/btrfs/fileinfo.c @@ -17,6 +17,7 @@ #include "btrfs_drv.h" +#if (NTDDI_VERSION >= NTDDI_WIN10) // not currently in mingw - introduced with Windows 10 #ifndef _MSC_VER #define FileIdInformation (enum _FILE_INFORMATION_CLASS)59 @@ -145,6 +146,45 @@ typedef struct _FILE_LINKS_FULL_ID_INFORMATION { #define FILE_RENAME_INFORMATION_EX FILE_RENAME_INFORMATION #define FILE_LINK_INFORMATION_EX FILE_LINK_INFORMATION +#endif +#endif + +#ifdef __REACTOS__ +typedef struct _FILE_RENAME_INFORMATION_EX { + union { + BOOLEAN ReplaceIfExists; + ULONG Flags; + }; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_RENAME_INFORMATION_EX, *PFILE_RENAME_INFORMATION_EX; + +typedef struct _FILE_DISPOSITION_INFORMATION_EX { + ULONG Flags; +} FILE_DISPOSITION_INFORMATION_EX, *PFILE_DISPOSITION_INFORMATION_EX; + +typedef struct _FILE_LINK_INFORMATION_EX { + union { + BOOLEAN ReplaceIfExists; + ULONG Flags; + }; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_LINK_INFORMATION_EX, *PFILE_LINK_INFORMATION_EX; + +#define FILE_RENAME_REPLACE_IF_EXISTS 0x001 +#define FILE_RENAME_POSIX_SEMANTICS 0x002 +#define FILE_RENAME_IGNORE_READONLY_ATTRIBUTE 0x040 + +#define FILE_DISPOSITION_DELETE 0x1 +#define FILE_DISPOSITION_POSIX_SEMANTICS 0x2 +#define FILE_DISPOSITION_FORCE_IMAGE_SECTION_CHECK 0x4 + +#define FILE_LINK_REPLACE_IF_EXISTS 0x001 +#define FILE_LINK_POSIX_SEMANTICS 0x002 +#define FILE_LINK_IGNORE_READONLY_ATTRIBUTE 0x040 #endif static NTSTATUS set_basic_information(device_extension* Vcb, PIRP Irp, PFILE_OBJECT FileObject) { @@ -2826,7 +2866,11 @@ NTSTATUS __stdcall drv_set_information(IN PDEVICE_OBJECT DeviceObject, IN PIRP I } if (fcb != Vcb->dummy_fcb && is_subvol_readonly(fcb->subvol, Irp) && IrpSp->Parameters.SetFile.FileInformationClass != FilePositionInformation && +#ifndef __REACTOS__ (fcb->inode != SUBVOL_ROOT_INODE || (IrpSp->Parameters.SetFile.FileInformationClass != FileBasicInformation && IrpSp->Parameters.SetFile.FileInformationClass != FileRenameInformation && IrpSp->Parameters.SetFile.FileInformationClass != FileRenameInformationEx))) { +#else + (fcb->inode != SUBVOL_ROOT_INODE || (IrpSp->Parameters.SetFile.FileInformationClass != FileBasicInformation && IrpSp->Parameters.SetFile.FileInformationClass != FileRenameInformation))) { +#endif Status = STATUS_ACCESS_DENIED; goto end; }

1 0

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