Ros-diffs July 2019

ros-diffs@reactos.org

22 participants
146 discussions

[reactos] 02/05: [NTOS:MM] Add a MmChangeKernelResourceSectionProtection() helper. (#1649)
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3625238ecb5eec1b65d6e… commit 3625238ecb5eec1b65d6efd756013d3738bacb95 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 14 00:04:19 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:49 2019 +0200 [NTOS:MM] Add a MmChangeKernelResourceSectionProtection() helper. (#1649) This allows setting the memory protection of the kernel's resource section as will. MmMakeKernelResourceSectionWritable() is re-implemented around this helper. --- ntoskrnl/include/internal/mm.h | 4 ++++ ntoskrnl/mm/ARM3/sysldr.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index da3a720d4dc..32fd7b1146d 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1370,6 +1370,10 @@ MiInitializeLoadedModuleList( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +BOOLEAN +NTAPI +MmChangeKernelResourceSectionProtection(IN ULONG_PTR ProtectionMask); + VOID NTAPI MmMakeKernelResourceSectionWritable(VOID); diff --git a/ntoskrnl/mm/ARM3/sysldr.c b/ntoskrnl/mm/ARM3/sysldr.c index 036c38505d6..ab6e1165cc1 100644 --- a/ntoskrnl/mm/ARM3/sysldr.c +++ b/ntoskrnl/mm/ARM3/sysldr.c @@ -2281,20 +2281,20 @@ MiInitializeLoadedModuleList(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return TRUE; } -VOID +BOOLEAN NTAPI -MmMakeKernelResourceSectionWritable(VOID) +MmChangeKernelResourceSectionProtection(IN ULONG_PTR ProtectionMask) { PMMPTE PointerPte; MMPTE TempPte; /* Don't do anything if the resource section is already writable */ if (MiKernelResourceStartPte == NULL || MiKernelResourceEndPte == NULL) - return; + return FALSE; /* If the resource section is physical, we cannot change its protection */ if (MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(MiKernelResourceStartPte))) - return; + return FALSE; /* Loop the PTEs */ for (PointerPte = MiKernelResourceStartPte; PointerPte < MiKernelResourceEndPte; ++PointerPte) @@ -2303,19 +2303,36 @@ MmMakeKernelResourceSectionWritable(VOID) TempPte = *PointerPte; /* Update the protection */ - MI_MAKE_HARDWARE_PTE_KERNEL(&TempPte, PointerPte, MM_READWRITE, TempPte.u.Hard.PageFrameNumber); + MI_MAKE_HARDWARE_PTE_KERNEL(&TempPte, PointerPte, ProtectionMask, TempPte.u.Hard.PageFrameNumber); MI_UPDATE_VALID_PTE(PointerPte, TempPte); } - /* - * Invalidate the cached resource section PTEs - * so as to not change its protection again later. - */ - MiKernelResourceStartPte = NULL; - MiKernelResourceEndPte = NULL; - /* Only flush the current processor's TLB */ KeFlushCurrentTb(); + return TRUE; +} + +VOID +NTAPI +MmMakeKernelResourceSectionWritable(VOID) +{ + /* Don't do anything if the resource section is already writable */ + if (MiKernelResourceStartPte == NULL || MiKernelResourceEndPte == NULL) + return; + + /* If the resource section is physical, we cannot change its protection */ + if (MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(MiKernelResourceStartPte))) + return; + + if (MmChangeKernelResourceSectionProtection(MM_READWRITE)) + { + /* + * Invalidate the cached resource section PTEs + * so as to not change its protection again later. + */ + MiKernelResourceStartPte = NULL; + MiKernelResourceEndPte = NULL; + } } LOGICAL

1 0

[reactos] 01/05: [NTOS:INBV] Classify the bitmap resources. (#1649)
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3e22b99a4577c6c2651c… commit a3e22b99a4577c6c2651cddf01a96899d519f3a1 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 7 00:33:06 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:23:48 2019 +0200 [NTOS:INBV] Classify the bitmap resources. (#1649) See "How to change Windows XP boot logo" at http://www.reversing.be/article.php?story=20061209171938444 as well as the "Boot Editor for WinXP" program for more details. --- ntoskrnl/inbv/inbv.c | 2 +- ntoskrnl/include/resource.h | 38 ++++++++++++++++++++++++++++---------- ntoskrnl/ntoskrnl.rc | 6 ++++-- ntoskrnl/po/poshtdwn.c | 2 +- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ntoskrnl/inbv/inbv.c b/ntoskrnl/inbv/inbv.c index c1ece52461e..295ffac0142 100644 --- a/ntoskrnl/inbv/inbv.c +++ b/ntoskrnl/inbv/inbv.c @@ -1048,7 +1048,7 @@ DisplayBootBitmap(IN BOOLEAN TextMode) #ifdef INBV_ROTBAR_IMPLEMENTED /* Server product, use appropriate status bar color */ - Bar = InbvGetResourceAddress(IDB_BAR_SERVER); + Bar = InbvGetResourceAddress(IDB_BAR_DEFAULT); #endif } #else diff --git a/ntoskrnl/include/resource.h b/ntoskrnl/include/resource.h index 2f7c22b1cc4..bb400bb3151 100644 --- a/ntoskrnl/include/resource.h +++ b/ntoskrnl/include/resource.h @@ -1,26 +1,44 @@ #pragma once +/* + * List of all the bitmap overlay resources present in the NT kernel + * of Windows XP, Windows Server 2003 and their variations. + * See "How to change Windows XP boot logo" at + * http://www.reversing.be/article.php?story=20061209171938444 + * as well as the "Boot Editor for WinXP" program for more details. + */ + #define IDB_BOOT_SCREEN 1 #define IDB_HIBERNATE_BAR 2 #define IDB_SHUTDOWN_MSG 3 -#define IDB_DEFAULT_LOGO 5 +#define IDB_BAR_DEFAULT 4 +#define IDB_LOGO_DEFAULT 5 + #define IDB_WKSTA_HEADER 6 #define IDB_WKSTA_FOOTER 7 -#define IDB_BAR_SERVER 4 #define IDB_BAR_WKSTA 8 #define IDB_BAR_HOME 9 -#define IDB_ROTATING_LINE 19 - -#define IDB_PROF_TEXT 10 -#define IDB_HOME_TEXT 11 -#define IDB_EMBEDDED_TEXT 12 -#define IDB_MCE_TEXT 18 #define IDB_SERVER_LOGO 13 #define IDB_SERVER_HEADER 14 #define IDB_SERVER_FOOTER 15 -#define IDB_STORAGE_SERVER 16 -#define IDB_CLUSTER_SERVER 17 + +/* Workstation editions Overlays */ +#define IDB_TEXT_PROF 10 // Professional +#define IDB_TEXT_HOME 11 // Home Edition +#define IDB_TEXT_EMBEDDED 12 // Embedded +#define IDB_TEXT_SVRFAMILY 13 // Server Family +#define IDB_TEXT_DOTNET 16 // .NET 2003 +#define IDB_TEXT_TABLETPC 17 // Tablet PC Edition +#define IDB_TEXT_MEDIACTR 18 // Media Center Edition + +/* Server editions Overlays */ +#define IDB_STORAGE_SERVER 16 // Storage Server +#define IDB_CLUSTER_SERVER 17 // Compute Cluster Edition +#define IDB_STORAGE_SERVER2 18 + +/* ReactOS additions */ +#define IDB_ROTATING_LINE 19 #define IDB_MAX_RESOURCE IDB_ROTATING_LINE diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index dbe2caccc02..0a01fe32228 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -31,12 +31,14 @@ IDB_BOOT_SCREEN BITMAP "inbv/logo/1.bmp" IDB_HIBERNATE_BAR BITMAP "inbv/logo/2.bmp" IDB_SHUTDOWN_MSG BITMAP "inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP "inbv/logo/4.bmp" -IDB_DEFAULT_LOGO BITMAP "inbv/logo/5.bmp" +IDB_BAR_DEFAULT BITMAP "inbv/logo/4.bmp" +IDB_LOGO_DEFAULT BITMAP "inbv/logo/5.bmp" IDB_WKSTA_HEADER BITMAP "inbv/logo/6.bmp" IDB_WKSTA_FOOTER BITMAP "inbv/logo/7.bmp" IDB_BAR_WKSTA BITMAP "inbv/logo/8.bmp" IDB_SERVER_LOGO BITMAP "inbv/logo/5.bmp" IDB_SERVER_HEADER BITMAP "inbv/logo/14.bmp" IDB_SERVER_FOOTER BITMAP "inbv/logo/15.bmp" + +/* ReactOS additions */ IDB_ROTATING_LINE BITMAP "inbv/logo/line.bmp" diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index dd9bcc2dbb4..17adbc2a415 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -165,7 +165,7 @@ PopShutdownHandler(VOID) /* Display shutdown logo and message */ Logo1 = InbvGetResourceAddress(IDB_SHUTDOWN_MSG); - Logo2 = InbvGetResourceAddress(IDB_DEFAULT_LOGO); + Logo2 = InbvGetResourceAddress(IDB_LOGO_DEFAULT); if ((Logo1) && (Logo2)) { InbvBitBlt(Logo1, 220, 352);

1 0

[reactos] 01/01: [UMPNPMGR] Fix build.
by Hermès Bélusca-Maïto 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e095695a645eced297699… commit e095695a645eced297699daf02edca47c4a732e5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 14 22:17:50 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 22:17:50 2019 +0200 [UMPNPMGR] Fix build. --- base/services/umpnpmgr/rpcserver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 58a28e3cb4e..32ff58d5865 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -2723,17 +2723,13 @@ PNP_GetDeviceStatus( DWORD *pulProblem, DWORD ulFlags) { - PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; - CONFIGRET ret = CR_SUCCESS; - NTSTATUS Status; - UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulFlags); DPRINT("PNP_GetDeviceStatus(%p %S %p %p)\n", hBinding, pDeviceID, pulStatus, pulProblem, ulFlags); - return GetDeviceStatus(pDeviceId, pulStatus, pulProblem); + return GetDeviceStatus(pDeviceID, pulStatus, pulProblem); }

1 0

[reactos] 01/01: [UMPNPMGR] PNP_GetDeviceStatus: Move the code that retrieves the status of a device into a separate function so that we can use in other functions.
by Eric Kohl 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47e90b5ea44076fa7a771… commit 47e90b5ea44076fa7a77144939dfcb453f6b7d3f Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 14 21:50:06 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 14 21:50:06 2019 +0200 [UMPNPMGR] PNP_GetDeviceStatus: Move the code that retrieves the status of a device into a separate function so that we can use in other functions. --- base/services/umpnpmgr/rpcserver.c | 59 ++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/base/services/umpnpmgr/rpcserver.c b/base/services/umpnpmgr/rpcserver.c index 63148af8623..58a28e3cb4e 100644 --- a/base/services/umpnpmgr/rpcserver.c +++ b/base/services/umpnpmgr/rpcserver.c @@ -191,6 +191,41 @@ SplitDeviceInstanceID(IN LPWSTR pszDeviceInstanceID, } +static +CONFIGRET +GetDeviceStatus( + _In_ LPWSTR pDeviceID, + _Out_ DWORD *pulStatus, + _Out_ DWORD *pulProblem) +{ + PLUGPLAY_CONTROL_STATUS_DATA PlugPlayData; + CONFIGRET ret = CR_SUCCESS; + NTSTATUS Status; + + DPRINT("GetDeviceStatus(%S %p %p)\n", + pDeviceID, pulStatus, pulProblem); + + RtlInitUnicodeString(&PlugPlayData.DeviceInstance, + pDeviceID); + PlugPlayData.Operation = 0; /* Get status */ + + Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, + (PVOID)&PlugPlayData, + sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); + if (NT_SUCCESS(Status)) + { + *pulStatus = PlugPlayData.DeviceStatus; + *pulProblem = PlugPlayData.DeviceProblem; + } + else + { + ret = NtStatusToCrError(Status); + } + + return ret; +} + + /* PUBLIC FUNCTIONS **********************************************************/ /* Function 0 */ @@ -2695,28 +2730,10 @@ PNP_GetDeviceStatus( UNREFERENCED_PARAMETER(hBinding); UNREFERENCED_PARAMETER(ulFlags); - DPRINT("PNP_GetDeviceStatus() called\n"); - - RtlInitUnicodeString(&PlugPlayData.DeviceInstance, - pDeviceID); - PlugPlayData.Operation = 0; /* Get status */ - - Status = NtPlugPlayControl(PlugPlayControlDeviceStatus, - (PVOID)&PlugPlayData, - sizeof(PLUGPLAY_CONTROL_STATUS_DATA)); - if (NT_SUCCESS(Status)) - { - *pulStatus = PlugPlayData.DeviceStatus; - *pulProblem = PlugPlayData.DeviceProblem; - } - else - { - ret = NtStatusToCrError(Status); - } - - DPRINT("PNP_GetDeviceStatus() done (returns %lx)\n", ret); + DPRINT("PNP_GetDeviceStatus(%p %S %p %p)\n", + hBinding, pDeviceID, pulStatus, pulProblem, ulFlags); - return ret; + return GetDeviceStatus(pDeviceId, pulStatus, pulProblem); }

1 0

[reactos] 01/01: [ACPICA] Fix MSVC x64 build
by Timo Kreuzer 14 Jul '19

14 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad607262885c7f23fe1fb… commit ad607262885c7f23fe1fba0de4f48ab0119cb94b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 26 15:06:32 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 14 11:35:50 2019 +0200 [ACPICA] Fix MSVC x64 build See CORE-16082 --- drivers/bus/acpi/acpica/include/platform/acmsvc.h | 4 +-- drivers/bus/acpi/acpica/include/platform/acwin64.h | 41 ++++++++++++++++++++++ drivers/bus/acpi/acpica/namespace/nsnames.c | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h b/drivers/bus/acpi/acpica/include/platform/acmsvc.h index 57d9693c65e..936cbf4ebff 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h @@ -149,7 +149,7 @@ #endif #ifdef __REACTOS__ - +#ifdef _M_IX86 /* Flush CPU cache - used when going to sleep. Wbinvd or similar. */ #ifdef ACPI_APPLICATION @@ -208,7 +208,7 @@ __asm exit_rel: \ __asm mov Pnd, al \ } - +#endif /* _M_IX86 */ #endif /* __REACTOS__ */ /* warn C4100: unreferenced formal parameter */ diff --git a/drivers/bus/acpi/acpica/include/platform/acwin64.h b/drivers/bus/acpi/acpica/include/platform/acwin64.h index 5dda0a5de8e..9ad34088c9d 100644 --- a/drivers/bus/acpi/acpica/include/platform/acwin64.h +++ b/drivers/bus/acpi/acpica/include/platform/acwin64.h @@ -83,6 +83,7 @@ /*! [Begin] no source code translation */ +#ifndef __REACTOS__ #define ACPI_FLUSH_CPU_CACHE() /* @@ -99,6 +100,46 @@ #endif +#else /* __REACTOS__ */ + +#ifdef ACPI_APPLICATION +#define ACPI_FLUSH_CPU_CACHE() +#else +#define ACPI_FLUSH_CPU_CACHE() __wbinvd() +#endif + +#define ACPI_ACQUIRE_GLOBAL_LOCK(FacsPtr, Acq) \ +{ \ + BOOLEAN acquired = 0xFF; \ +\ + if ((FacsPtr) != 0) \ + { \ + UINT32 compare, prev, newval; \ + UINT32* lock = &((FacsPtr)->GlobalLock); \ + do \ + { \ + compare = *lock; \ + newval = (compare & ~1) | ((compare >> 1) & 1) | 2; \ + prev = InterlockedCompareExchange(lock, newval, compare); \ + } while (prev != compare); \ + acquired = ((newval & 0xFF) < 3) ? 0xFF : 0x00; \ + } \ + (Acq) = acquired; \ +} + +#define ACPI_RELEASE_GLOBAL_LOCK(FacsPtr, Pnd) \ +{ \ + BOOLEAN pending = 0; \ +\ + if ((FacsPtr) != 0) \ + { \ + pending = InterlockedAnd(&(FacsPtr)->GlobalLock, ~3) & 1; \ + } \ + (Pnd) = pending; \ +} + +#endif /* __REACTOS__ */ + /*! [End] no source code translation !*/ #endif /* __ACWIN_H__ */ diff --git a/drivers/bus/acpi/acpica/namespace/nsnames.c b/drivers/bus/acpi/acpica/namespace/nsnames.c index 6ab5cc64430..3c40c6ac3de 100644 --- a/drivers/bus/acpi/acpica/namespace/nsnames.c +++ b/drivers/bus/acpi/acpica/namespace/nsnames.c @@ -434,7 +434,7 @@ AcpiNsBuildPrefixedPathname ( char *FullPath = NULL; char *ExternalPath = NULL; char *PrefixPath = NULL; - UINT32 PrefixPathLength = 0; + SIZE_T PrefixPathLength = 0; /* If there is a prefix, get the pathname to it */

1 0

[reactos] 01/01: [DOCS] Add myself to CODEOWNERS file
by Victor Perevertkin 13 Jul '19

13 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6997a7a36fa472afb7ff6… commit 6997a7a36fa472afb7ff6e6d871fe666c7cb9572 Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Sun Jul 14 01:58:53 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Sun Jul 14 01:58:53 2019 +0300 [DOCS] Add myself to CODEOWNERS file --- CODEOWNERS | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 074145bc657..a6a954d82dc 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,6 +1,6 @@ ## List of maintainers for the ReactOS project -## This file purpose is to give newcomers to the projet the responsible +## This file purpose is to give newcomers to the project the responsible ## developers when submitting a pull request on GitHub, or opening a bug ## report on Jira. @@ -149,8 +149,9 @@ CMakeLists.txt @learn-more @ThFabba # Freeloader # M: # R: tkreuzer. ThePhysicist, Timo Kreuzer +# R: Extravert-ir, extravert34, Victor Perevertkin # S: Maintained -/boot/freeldr/freeldr/ @tkreuzer +/boot/freeldr/freeldr/ @tkreuzer @Extravert-ir # HAL / APIC # M: tkreuzer. ThePhysicist, Timo Kreuzer @@ -184,6 +185,13 @@ CMakeLists.txt @learn-more @ThFabba # S: Maintained /drivers/network/ @ThFabba +# Intel PRO/1000 NIC family driver +# M: +# R: ThFabba, Thomas Faber +# R: Extravert-ir, extravert34, Victor Perevertkin +# S: Maintained +/drivers/network/dd/e1000/ @ThFabba @Extravert-ir + # Network File Systems kernel libraries # M: HeisSpiter, Pierre Schweitzer # S: Maintained @@ -251,10 +259,11 @@ CMakeLists.txt @learn-more @ThFabba # USB Drivers # M: ThFabba, Thomas Faber +# R: Extravert-ir, extravert34, Victor Perevertkin # S: Maintained -/drivers/usb/ @ThFabba -/sdk/lib/drivers/libusb/ @ThFabba -/sdk/include/reactos/drivers/usbport/ @ThFabba +/drivers/usb/ @ThFabba @Extravert-ir +/sdk/lib/drivers/libusb/ @ThFabba @Extravert-ir +/sdk/include/reactos/drivers/usbport/ @ThFabba @Extravert-ir # Virtual CD-ROM # M: HeisSpiter, Pierre Schweitzer

1 0

[reactos] 01/01: [NTOS:MM] Fix MmGetFileNameForAddress() callers. (#1723)
by Serge Gautherie 13 Jul '19

13 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ccf8bff3ecfb92c1be6c4… commit ccf8bff3ecfb92c1be6c4997107a2249a8f43341 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sun Jul 14 00:32:23 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 14 00:32:23 2019 +0200 [NTOS:MM] Fix MmGetFileNameForAddress() callers. (#1723) MmGetFileNameForAddress() calls RtlCreateUnicodeString(). This also fixes a leak in MiQueryMemorySectionName(). --- ntoskrnl/dbgk/dbgkobj.c | 2 +- ntoskrnl/mm/ARM3/section.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/dbgk/dbgkobj.c b/ntoskrnl/dbgk/dbgkobj.c index 3f03e9b9031..c8126feb7d0 100644 --- a/ntoskrnl/dbgk/dbgkobj.c +++ b/ntoskrnl/dbgk/dbgkobj.c @@ -558,7 +558,7 @@ DbgkpPostFakeModuleMessages(IN PEPROCESS Process, if (!NT_SUCCESS(Status)) LoadDll->FileHandle = NULL; /* Free the name now */ - ExFreePool(ModuleName.Buffer); + RtlFreeUnicodeString(&ModuleName); } /* Send the fake module load message */ diff --git a/ntoskrnl/mm/ARM3/section.c b/ntoskrnl/mm/ARM3/section.c index fdda46d3afa..e50aa518e5d 100644 --- a/ntoskrnl/mm/ARM3/section.c +++ b/ntoskrnl/mm/ARM3/section.c @@ -1897,7 +1897,6 @@ MiQueryMemorySectionName(IN HANDLE ProcessHandle, { PEPROCESS Process; NTSTATUS Status; - WCHAR ModuleFileNameBuffer[MAX_PATH] = {0}; UNICODE_STRING ModuleFileName; PMEMORY_SECTION_NAME SectionName = NULL; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); @@ -1915,7 +1914,6 @@ MiQueryMemorySectionName(IN HANDLE ProcessHandle, return Status; } - RtlInitEmptyUnicodeString(&ModuleFileName, ModuleFileNameBuffer, sizeof(ModuleFileNameBuffer)); Status = MmGetFileNameForAddress(BaseAddress, &ModuleFileName); if (NT_SUCCESS(Status)) @@ -1947,6 +1945,8 @@ MiQueryMemorySectionName(IN HANDLE ProcessHandle, if (ReturnLength) *ReturnLength = ModuleFileName.Length; } + + RtlFreeUnicodeString(&ModuleFileName); } ObDereferenceObject(Process); return Status;

1 0

[reactos] 01/01: [DOCS] Replace MAINTAINERS file with CODEOWNERS
by Timo Kreuzer 13 Jul '19

13 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=46c052e0f206ddc7c8c78… commit 46c052e0f206ddc7c8c78bafcadb2b885b6c694f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jun 30 16:12:58 2019 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Jul 13 19:27:40 2019 +0200 [DOCS] Replace MAINTAINERS file with CODEOWNERS --- CODEOWNERS | 302 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ MAINTAINERS | 271 ----------------------------------------------------- 2 files changed, 302 insertions(+), 271 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000000..074145bc657 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,302 @@ +## List of maintainers for the ReactOS project + +## This file purpose is to give newcomers to the projet the responsible +## developers when submitting a pull request on GitHub, or opening a bug +## report on Jira. + +## This file will notably establish who is responsible for a specific +## area of ReactOS. Being a maintainer means the following: +## - that person has good knownledge in the area +## - that person is able to enforce consistency in the area +## - that person may be available for giving help in the area +## - that person has push access on the repository +## Being a maintainer does not mean the following: +## - that person is dedicated to the area +## - that person is working full-time on the area/on ReactOS +## - that person is paid +## - that person is always available + +## We have no supported (paid) areas in ReactOS. + +## When submitting a pull request on GitHub and looking for reviewers, +## look at that file and ask for a review from some of the people (M, R +## - the most recently active in the area) listed in the matching area, +## also, assign the pull request to the M person. Don't ask for a review +## from all the listed reviewers. +## Also, when submitted a pull request on GitHub, rules defined in +## CONTRIBUTING.md apply. And if the maintainer is not available and +## reviewers approved the pull request, developers feeling confident +## can merge the pull request. Note that reviewers do not necessarily +## have push access to the repository. +## When submitting a bug report on Jira, if you want to be sure to have +## a developer with skills in that area, write @nick from M people. + +## There should be one and only one primary maintainer per area. + +## In case of 3rd party code (also refered as upstream), the maintainer +## is responsible of updating periodically the source code and of +## managing local patches. He is not here to upstream code on your behalf. +## As responsible, he may refuse a local patch if you did not try to +## upstream your changes. + +## If you want to get listed in that file, either put yourself in the +## file and push it, or open a pull request. You can also ask a person +## who has push access to add yourself. + +## This file uses GitHub's format for specifying code owners. +## - Lines starting with # are comment lines. +## - All other lines specify a path / file (wildcards allowed) followed +## by the GitHub user name(s) of the code owners. +## See https://help.github.com/en/articles/about-code-owners + +## Additionally it tries to use a similar format to the Linux kernel +## MAINTAINERS file within comments. +## Descriptions of comment section entries used here: +## M: Primary maintainer. Assign them pull requests +## Use the GitHub, Jira, Real Name format for entry, squash if +## some are overlapping +## R: Reviewers. Ask them for review on pull requests +## S: Status, one of the following: +## Maintained: Someone is handling that area +## Upstream: This is 3rd party code, synced in our tree +## Abandoned: No one is handling that code anymore +## F: Files. Directories, files (wildcards allowed) covered in +## this area +## C: Comments + + +# 3rd Party File Format Libraries +# M: ThFabba, Thomas Faber +# S: Upstream +# C: See media/doc/3rd Party Files.txt +/dll/3rdparty/libjpeg/ @ThFabba +/dll/3rdparty/libpng/ @ThFabba +/dll/3rdparty/libtiff/ @ThFabba +/dll/3rdparty/libxslt/ @ThFabba +/sdk/include/reactos/libs/libjpeg/ @ThFabba +/sdk/include/reactos/libs/libmpg123/ @ThFabba +/sdk/include/reactos/libs/libpng/ @ThFabba +/sdk/include/reactos/libs/libtiff/ @ThFabba +/sdk/include/reactos/libs/libxml/ @ThFabba +/sdk/include/reactos/libs/libxslt/ @ThFabba +/sdk/lib/3rdparty/libmpg123/ @ThFabba +/sdk/lib/3rdparty/libsamplerate/ @ThFabba +/sdk/lib/3rdparty/libxml2/ @ThFabba + +# ACPI +# M: +# R: ThFabba, Thomas Faber +# S: Maintained +/drivers/bus/acpi/ @ThFabba +/hal/halx86/acpi/ @ThFabba + +# ACPICA Library +# M: ThFabba, Thomas Faber +# S: Upstream +/drivers/bus/acpi/acpica/ @ThFabba + +# Apisets +# M: learn-more, learn_more, Mark Jansen +# S: Maintained +/dll/apisets/ @learn-more + +# Application Compatibility subystem +# M: learn-more, learn_more, Mark Jansen +# S: Maintained +/dll/appcompat/ @learn-more +/dll/shellext/acppage/ @learn-more +/ntoskrnl/ps/apphelp.c @learn-more + +# Cache Manager +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +/modules/rostests/kmtests/ntos_cc/ @HeisSpiter +/ntoskrnl/cc/ @HeisSpiter + +# Cache Manager Rewrite +# S: Abandoned +/ntoskrnl/cache/ + +# CMake Build Scripts +# M: +# R: learn-more, learn_more, Mark Jansen +# R: ThFabba, Thomas Faber +# S: Maintained +/sdk/cmake/ @learn-more @ThFabba +CMakeLists.txt @learn-more @ThFabba +*.cmake @learn-more @ThFabba + +# File Patch API +# M: learn-more, learn_more, Mark Jansen +# S: Maintained +/dll/win32/mspatcha/ @learn-more + +# File Systems +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +# C: Also see "Upstream File Systems" +/drivers/filesystems/ @HeisSpiter +/sdk/lib/fslib/ @HeisSpiter + +# File Systems Run Time Library +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +/modules/rostests/kmtests/ntos_fsrtl/ @HeisSpiter +/modules/rostests/kmtests/novp_fsrtl/ @HeisSpiter +/ntoskrnl/fsrtl/ @HeisSpiter +/sdk/lib/drivers/ntoskrnl_vista/fsrtl.c @HeisSpiter + +# Freeloader +# M: +# R: tkreuzer. ThePhysicist, Timo Kreuzer +# S: Maintained +/boot/freeldr/freeldr/ @tkreuzer + +# HAL / APIC +# M: tkreuzer. ThePhysicist, Timo Kreuzer +# S: Maintained +/hal/halx86/apic/ @tkreuzer + +# HID Drivers +# M: +# R: ThFabba, Thomas Faber +# S: Maintained +/drivers/hid/ @ThFabba + +# Kernel +# M: +# R: HeisSpiter, Pierre Schweitzer +# R: ThFabba, Thomas Faber +# R: tkreuzer. ThePhysicist, Timo Kreuzer +# S: Maintained +/ntoskrnl/ @HeisSpiter @ThFabba @tkreuzer + +# mbed TLS +# M: ThFabba, Thomas Faber +# S: Upstream +# C: See media/doc/3rd Party Files.txt +/dll/3rdparty/mbedtls/ @ThFabba +/sdk/include/reactos/libs/mbedtls/ @ThFabba + +# Network Drivers +# M: +# R: ThFabba, Thomas Faber +# S: Maintained +/drivers/network/ @ThFabba + +# Network File Systems kernel libraries +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +/sdk/lib/drivers/rdbsslib/ @HeisSpiter +/sdk/lib/drivers/rxce/ @HeisSpiter + +# NTDLL +# M: +# R: HeisSpiter, Pierre Schweitzer +# R: learn-more, learn_more, Mark Jansen +# R: ThFabba, Thomas Faber +# R: tkreuzer. ThePhysicist, Timo Kreuzer +# S: Maintained +/dll/ntdll/ @HeisSpiter @learn-more @ThFabba @tkreuzer + +# ReactOS API Tests +# M: +# R: learn-more, learn_more, Mark Jansen +# R: ThFabba, Thomas Faber +# S: Maintained +/modules/rostests/apitests/ @learn-more @ThFabba + +# ReactOS Kernel-Mode Tests +# M: ThFabba, Thomas Faber +# S: Maintained +/modules/rostests/kmtests/ @ThFabba + +# ROS internals tools +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +/modules/rosapps/applications/rosinternals/ @HeisSpiter + +# Run-Time Library (RTL) +# M: +# R: HeisSpiter, Pierre Schweitzer +# R: learn-more, learn_more, Mark Jansen +# R: ThFabba, Thomas Faber +# R: tkreuzer. ThePhysicist, Timo Kreuzer +# S: Maintained +/sdk/lib/rtl/ @HeisSpiter @learn-more @ThFabba @tkreuzer + +# Shell Extensions +# M: +# R: learn-more, learn_more, Mark Jansen +# S: Maintained +/dll/shellext @learn-more + +# Upstream File Systems +# M: HeisSpiter, Pierre Schweitzer +# S: Upstream +/base/services/nfsd/ @HeisSpiter +/dll/np/nfs/ @HeisSpiter +/dll/shellext/shellbtrfs/ @HeisSpiter +/drivers/filesystems/btrfs/ @HeisSpiter +/drivers/filesystems/cdfs/ @HeisSpiter +/drivers/filesystems/ext2/ @HeisSpiter +/drivers/filesystems/fastfat_new/ @HeisSpiter +/drivers/filesystems/ffs/ @HeisSpiter +/drivers/filesystems/nfs/ @HeisSpiter +/drivers/filesystems/reiserfs/ @HeisSpiter +/media/doc/README.FSD @HeisSpiter +/sdk/lib/fslib/btrfslib/ @HeisSpiter +/sdk/lib/fslib/ext2lib/ @HeisSpiter +/sdk/lib/fslib/vfatlib/check/ @HeisSpiter + +# USB Drivers +# M: ThFabba, Thomas Faber +# S: Maintained +/drivers/usb/ @ThFabba +/sdk/lib/drivers/libusb/ @ThFabba +/sdk/include/reactos/drivers/usbport/ @ThFabba + +# Virtual CD-ROM +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +/modules/rosapps/applications/cmdutils/vcdcli/ @HeisSpiter +/modules/rosapps/applications/vcdcontroltool/ @HeisSpiter +/modules/rosapps/drivers/vcdrom/ @HeisSpiter + +# Virtual Floppy Disk +# M: HeisSpiter, Pierre Schweitzer +# S: Upstream +/modules/rosapps/applications/cmdutils/vfdcmd/ @HeisSpiter +/modules/rosapps/drivers/vfd/ @HeisSpiter + +# Win32 file functions +# M: HeisSpiter, Pierre Schweitzer +# S: Maintained +/dll/win32/kernel32/client/file/ @HeisSpiter + +# Windows Network File Systems functions +# M: HeisSpiter, Pierre Schweitzer +# S: Upstream +/dll/win32/mpr/wnet.c @HeisSpiter + +# Wine Tests +# M: +# R: ThFabba, Thomas Faber +# S: Upstream +/modules/rostests/winetests/ @ThFabba + +# zlib +# M: ThFabba, Thomas Faber +# S: Upstream +# C: See media/doc/3rd Party Files.txt +/sdk/include/reactos/libs/zlib/ @ThFabba +/sdk/lib/3rdparty/zlib/ @ThFabba + +# x64 related code (keep this at the bottom) +# M: tkreuzer. ThePhysicist, Timo Kreuzer +# S: Maintained +amd64/ @tkreuzer +/boot/freeldr/freeldr/arch/realmode/amd64.S @tkreuzer + +# Translations +de-DE.rc @reactos/lang-german diff --git a/MAINTAINERS b/MAINTAINERS deleted file mode 100644 index ef0d035d456..00000000000 --- a/MAINTAINERS +++ /dev/null @@ -1,271 +0,0 @@ - List of maintainers for the ReactOS project - -This file purpose is to give newcomers to the projet the responsible -developers when submitting a pull request on GitHub, or opening a bug -report on Jira. - -This file will notably establish who is responsible for a specific -area of ReactOS. Being a maintainer means the following: - - that person has good knownledge in the area - - that person is able to enforce consistency in the area - - that person may be available for giving help in the area - - that person has push access on the repository -Being a maintainer does not mean the following: - - that person is dedicated to the area - - that person is working full-time on the area/on ReactOS - - that person is paid - - that person is always available - -We have no supported (paid) areas in ReactOS. - -When submitting a pull request on GitHub and looking for reviewers, -look at that file and ask for a review from some of the people (M, R -- the most recently active in the area) listed in the matching area, -also, assign the pull request to the M person. Don't ask for a review -from all the listed reviewers. -Also, when submitted a pull request on GitHub, rules defined in -CONTRIBUTING.md apply. And if the maintainer is not available and -reviewers approved the pull request, developers feeling confident -can merge the pull request. Note that reviewers do not necessarily -have push access to the repository. -When submitting a bug report on Jira, if you want to be sure to have -a developer with skills in that area, write @nick from M people. - -There should be one and only one primary maintainer per area. - -In case of 3rd party code (also refered as upstream), the maintainer -is responsible of updating periodically the source code and of -managing local patches. He is not here to upstream code on your behalf. -As responsible, he may refuse a local patch if you did not try to -upstream your changes. - -If you want to get listed in that file, either put yourself in the -file and push it, or open a pull request. You can also ask a person -who has push access to add yourself. - -This file uses a similar format to the Linux kernel MAINTAINERS file. -Descriptions of section entries used here: - M: Primary maintainer. Assign them pull requests - Use the GitHub, Jira, Real Name format for entry, squash if - some are overlapping - R: Reviewers. Ask them for review on pull requests - S: Status, one of the following: - Maintained: Someone is handling that area - Upstream: This is 3rd party code, synced in our tree - Abandoned: No one is handling that code anymore - F: Files. Directories, files (wildcards allowed) covered in - this area - C: Comments - -3rd Party File Format Libraries - M: ThFabba, Thomas Faber - S: Upstream - F: dll/3rdparty/libjpeg/ - F: dll/3rdparty/libpng/ - F: dll/3rdparty/libtiff/ - F: dll/3rdparty/libxslt/ - F: sdk/include/reactos/libs/libjpeg/ - F: sdk/include/reactos/libs/libmpg123/ - F: sdk/include/reactos/libs/libpng/ - F: sdk/include/reactos/libs/libtiff/ - F: sdk/include/reactos/libs/libxml/ - F: sdk/include/reactos/libs/libxslt/ - F: sdk/lib/3rdparty/libmpg123/ - F: sdk/lib/3rdparty/libsamplerate/ - F: sdk/lib/3rdparty/libxml2/ - C: See media/doc/3rd Party Files.txt - -ACPI - M: - R: ThFabba, Thomas Faber - S: Maintained - F: drivers/bus/acpi/ - F: hal/halx86/acpi/ - -ACPICA Library - M: ThFabba, Thomas Faber - S: Upstream - F: drivers/bus/acpi/acpica/ - -Apisets - M: learn-more, learn_more, Mark Jansen - S: Maintained - F: dll/apisets - -Application Compatibility subystem - M: learn-more, learn_more, Mark Jansen - S: Maintained - F: dll/appcompat - F: dll/shellext/acppage - F: ntoskrnl/ps/apphelp.c - -Cache Manager - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: modules/rostests/kmtests/ntos_cc/ - F: ntoskrnl/cc/ - -Cache Manager Rewrite - S: Abandoned - F: ntoskrnl/cache/ - -CMake Build Scripts - M: - R: learn-more, learn_more, Mark Jansen - R: ThFabba, Thomas Faber - S: Maintained - F: sdk/cmake/ - F: */CMakeLists.txt - F: */*.cmake - -File Patch API - M: learn-more, learn_more, Mark Jansen - S: Maintained - F: dll/win32/mspatcha - -File Systems - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: drivers/filesystems/ - F: sdk/lib/fslib/ - C: Also see "Upstream File Systems" - -File Systems Run Time Library - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: modules/rostests/kmtests/ntos_fsrtl/ - F: modules/rostests/kmtests/novp_fsrtl/ - F: ntoskrnl/fsrtl/ - F: sdk/lib/drivers/ntoskrnl_vista/fsrtl.c - -HID Drivers - M: - R: ThFabba, Thomas Faber - S: Maintained - F: drivers/hid/ - -Kernel - M: - R: HeisSpiter, Pierre Schweitzer - R: ThFabba, Thomas Faber - S: Maintained - F: ntoskrnl/ - -mbed TLS - M: ThFabba, Thomas Faber - S: Upstream - F: dll/3rdparty/mbedtls/ - F: sdk/include/reactos/libs/mbedtls/ - C: See media/doc/3rd Party Files.txt - -Network Drivers - M: - R: ThFabba, Thomas Faber - S: Maintained - F: drivers/network/ - -Network File Systems kernel libraries - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: sdk/lib/drivers/rdbsslib/ - F: sdk/lib/drivers/rxce/ - -NTDLL - M: - R: HeisSpiter, Pierre Schweitzer - R: learn-more, learn_more, Mark Jansen - R: ThFabba, Thomas Faber - S: Maintained - F: dll/ntdll/ - -ReactOS API Tests - M: - R: learn-more, learn_more, Mark Jansen - R: ThFabba, Thomas Faber - S: Maintained - F: modules/rostests/apitests/ - -ReactOS Kernel-Mode Tests - M: ThFabba, Thomas Faber - S: Maintained - F: modules/rostests/kmtests/ - -ROS internals tools - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: modules/rosapps/applications/rosinternals/ - -Run-Time Library (RTL) - M: - R: HeisSpiter, Pierre Schweitzer - R: learn-more, learn_more, Mark Jansen - R: ThFabba, Thomas Faber - S: Maintained - F: sdk/lib/rtl/ - -Shell Extensions - M: - R: learn-more, learn_more, Mark Jansen - S: Maintained - F: dll/shellext - -Upstream File Systems - M: HeisSpiter, Pierre Schweitzer - S: Upstream - F: base/services/nfsd/ - F: dll/np/nfs/ - F: dll/shellext/shellbtrfs/ - F: drivers/filesystems/btrfs/ - F: drivers/filesystems/cdfs/ - F: drivers/filesystems/ext2/ - F: drivers/filesystems/fastfat_new/ - F: drivers/filesystems/ffs/ - F: drivers/filesystems/nfs/ - F: drivers/filesystems/reiserfs/ - F: media/doc/README.FSD - F: sdk/lib/fslib/btrfslib/ - F: sdk/lib/fslib/ext2lib/ - F: sdk/lib/fslib/vfatlib/check/ - -USB Drivers - M: ThFabba, Thomas Faber - S: Maintained - F: drivers/usb/ - F: sdk/lib/drivers/libusb/ - F: sdk/include/reactos/drivers/usbport/ - -Virtual CD-ROM - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: modules/rosapps/applications/cmdutils/vcdcli/ - F: modules/rosapps/applications/vcdcontroltool/ - F: modules/rosapps/drivers/vcdrom/ - -Virtual Floppy Disk - M: HeisSpiter, Pierre Schweitzer - S: Upstream - F: modules/rosapps/applications/cmdutils/vfdcmd/ - F: modules/rosapps/drivers/vfd/ - -Win32 file functions - M: HeisSpiter, Pierre Schweitzer - S: Maintained - F: dll/win32/kernel32/client/file/ - -Windows Network File Systems functions - M: HeisSpiter, Pierre Schweitzer - S: Upstream - F: dll/win32/mpr/wnet.c - -Wine Tests - M: - R: ThFabba, Thomas Faber - S: Upstream - F: modules/rostests/winetests/ - -zlib - M: ThFabba, Thomas Faber - S: Upstream - F: sdk/include/reactos/libs/zlib/ - F: sdk/lib/3rdparty/zlib/ - C: See media/doc/3rd Party Files.txt

1 0

[reactos] 01/01: [SETUPAPI] Implement CM_Delete_DevNode_Key_Ex()
by Eric Kohl 13 Jul '19

13 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=433c9d327e57113e62c0b… commit 433c9d327e57113e62c0b04befe2f08007bae4e4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jul 13 14:26:57 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jul 13 14:26:57 2019 +0200 [SETUPAPI] Implement CM_Delete_DevNode_Key_Ex() CM_REGISTRY_USER is not supported yet. --- dll/win32/setupapi/cfgmgr.c | 103 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 1362f9969f5..d1a46745b8b 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1590,10 +1590,111 @@ CM_Delete_DevNode_Key_Ex( _In_ ULONG ulFlags, _In_opt_ HANDLE hMachine) { + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + PWSTR pszDevInst, pszKeyPath = NULL, pszInstancePath = NULL; + CONFIGRET ret; + FIXME("CM_Delete_DevNode_Key_Ex(%p %lu %lx %p)\n", dnDevInst, ulHardwareProfile, ulFlags, hMachine); - return CR_CALL_NOT_IMPLEMENTED; + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags & ~CM_REGISTRY_BITS) + return CR_INVALID_FLAG; + + if ((ulFlags & CM_REGISTRY_USER) && (ulFlags & CM_REGISTRY_CONFIG)) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + pszDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (pszDevInst == NULL) + return CR_INVALID_DEVNODE; + + TRACE("pszDevInst: %S\n", pszDevInst); + + pszKeyPath = MyMalloc(512 * sizeof(WCHAR)); + if (pszKeyPath == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto done; + } + + pszInstancePath = MyMalloc(512 * sizeof(WCHAR)); + if (pszInstancePath == NULL) + { + ret = CR_OUT_OF_MEMORY; + goto done; + } + + ret = GetDeviceInstanceKeyPath(BindingHandle, + pszDevInst, + pszKeyPath, + pszInstancePath, + ulHardwareProfile, + ulFlags); + if (ret != CR_SUCCESS) + goto done; + + TRACE("pszKeyPath: %S\n", pszKeyPath); + TRACE("pszInstancePath: %S\n", pszInstancePath); + + if (ulFlags & CM_REGISTRY_USER) + { + FIXME("The CM_REGISTRY_USER flag is not supported yet!\n"); + } + else + { +#if 0 + if (!pSetupIsUserAdmin()) + { + ret = CR_ACCESS_DENIED; + goto done; + } +#endif + + if (!(ulFlags & CM_REGISTRY_CONFIG)) + ulHardwareProfile = 0; + + RpcTryExcept + { + ret = PNP_DeleteRegistryKey(BindingHandle, + pszDevInst, + pszKeyPath, + pszInstancePath, + ulHardwareProfile); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + } + +done: + if (pszInstancePath != NULL) + MyFree(pszInstancePath); + + if (pszKeyPath != NULL) + MyFree(pszKeyPath); + + return ret; }

1 0

[reactos] 01/01: [MEDIA][FONTS] Add Turkish MS Sans Serif (sserifet.fon) CORE-16166
by Katayama Hirofumi MZ 12 Jul '19

12 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e683b1509c75a3b96c20… commit 7e683b1509c75a3b96c20ac568cbc393307ad844 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Jul 12 09:50:38 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Jul 12 09:50:38 2019 +0900 [MEDIA][FONTS] Add Turkish MS Sans Serif (sserifet.fon) CORE-16166 --- media/fonts/CMakeLists.txt | 1 + media/fonts/sserifet.fon | Bin 0 -> 64288 bytes 2 files changed, 1 insertion(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 36cf568d42..5c2b1c3846 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -129,6 +129,7 @@ list(APPEND FONT_FILES #sserife.fon #sserifeg.fon #sserifer.fon + #sserifet.fon UniVGA16.ttf) foreach(item ${FONT_FILES}) diff --git a/media/fonts/sserifet.fon b/media/fonts/sserifet.fon new file mode 100644 index 0000000000..51d9919c5b Binary files /dev/null and b/media/fonts/sserifet.fon differ

1 0

← Newer
1
...
8
9
10
11
12
13
14
15
Older →

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