Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 01/01: [SHELL32] Fix visual glitch appeared after fixing CORE-18137 (#4488)

by Raymond Czerny

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d74ceb655957ede39a4b6… commit d74ceb655957ede39a4b63084c065e1eaaa905a8 Author: Raymond Czerny <chip(a)raymisoft.de> AuthorDate: Mon May 9 20:36:23 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 9 21:36:23 2022 +0300 [SHELL32] Fix visual glitch appeared after fixing CORE-18137 (#4488) - Check if the parent window of RunDLL is the desktop, only in this case add the system control applet to the taskbar. - Try loading small 16x16 icon for the taskbar button. CORE-18175 --- dll/win32/shell32/wine/control.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 6044b736fdb..6103af4136c 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -819,10 +819,35 @@ Control_EnumWinProc( static void Control_ShowAppletInTaskbar(CPlApplet* applet, UINT index) { + HICON hSmallIcon; ITaskbarList* pTaskbar = NULL; + /* Try to add a taskbar button only if the applet's parent window is the desktop */ + if (GetParent(applet->hWnd) != NULL) + { + return; + } + SetWindowTextW(applet->hWnd, applet->info[index].name); - SendMessageW(applet->hWnd, WM_SETICON, ICON_SMALL, (LPARAM)applet->info[index].icon); + + /* Try loading the small icon for the taskbar button */ + hSmallIcon = (HICON)LoadImageW(applet->hModule, + MAKEINTRESOURCEW(applet->info[index].idIcon), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + if (hSmallIcon) + { + SendMessageW(applet->hWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmallIcon); + } + else + { + if (applet->info[index].icon) + { + SendMessageW(applet->hWnd, WM_SETICON, ICON_SMALL, (LPARAM)applet->info[index].icon); + } + } /* Add button to the taskbar */ ShowWindow(applet->hWnd, SW_SHOWMINNOACTIVE);

2 years, 7 months

[reactos] 01/01: [IMM32] Silence two debug prints

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=081ffbeb4f02f000aa6ae… commit 081ffbeb4f02f000aa6aedd9177bf81b62684716 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 21:49:14 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 21:49:14 2022 +0200 [IMM32] Silence two debug prints These two debug prints are spammy as fuck and it makes shit harder to debug ReactOS, apart that these prints barely serve any purpose. --- dll/win32/imm32/ctf.c | 2 +- dll/win32/imm32/imm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index b894c4498e3..153d4c5e5fa 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -41,7 +41,7 @@ HRESULT APIENTRY CtfImmTIMDestroyInputContext(HIMC hIMC) // Win: CtfImmTIMCreateInputContext HRESULT APIENTRY CtfImmTIMCreateInputContext(HIMC hIMC) { - FIXME("(%p)\n", hIMC); + TRACE("(%p)\n", hIMC); return E_NOTIMPL; } diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index e2e1e639689..c4cb95a1da1 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -491,7 +491,7 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) { - FIXME("We have to do something\n"); + TRACE("We have to do something\n"); } /***********************************************************************

2 years, 7 months

[reactos] 02/02: [WINLOGON] Let Winlogon assign security to desktop when a user logs in now

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07227562c0731d847fe73… commit 07227562c0731d847fe73569fdcab180e567e7e1 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 00:51:54 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 20:16:18 2022 +0200 [WINLOGON] Let Winlogon assign security to desktop when a user logs in now --- base/system/winlogon/security.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/base/system/winlogon/security.c b/base/system/winlogon/security.c index 4045496abb2..d2a845ffbd6 100644 --- a/base/system/winlogon/security.c +++ b/base/system/winlogon/security.c @@ -1446,21 +1446,12 @@ AllowAccessOnSession( goto Quit; } -/* - * FIXME: Desktop security management is broken. The application desktop gets created - * with CreateDesktopW() API call with an initial and defined security descriptor for it yet - * when we are giving access to the logged in user, SetUserObjectSecurity() API call fails to set - * new security because the desktop in question has no prior security descriptor (when it's - * been assigned even before!!!). This chunk of code must be enabled when this gets fixed. - */ -#if 0 /* Allow application desktop access to this user within this session */ if (!AllowDesktopAccessToUser(Session->ApplicationDesktop, LogonSid)) { ERR("AllowAccessOnSession(): Failed to allow application desktop access to the logon user!\n"); goto Quit; } -#endif /* Get the length of this logon SID */ SidLength = GetLengthSid(LogonSid);

2 years, 7 months

[reactos] 01/02: [WIN32K:NTUSER] Assign a security descriptor when parsing the desktop object

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa815e1cfa66f65e1964b… commit aa815e1cfa66f65e1964bbb4cce917c04d56f631 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 00:39:44 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 20:16:15 2022 +0200 [WIN32K:NTUSER] Assign a security descriptor when parsing the desktop object The problem ReactOS currently faces is this -- whenever the desktop is being parsed we aren't assigning a security descriptor to it. As a matter of fact when Winlogon tries to assign new security information to the application desktop when a user logs in, Winlogon fails because no prior descriptor has been created for it even though we already do this when initializing security buffers in Winlogon. With that said, we must assign a descriptor when parsing the desktop as well. This fixes a hack in Winlogon where security assigning of application desktop during a log in is disabled (which we can now enable such code path back). --- win32ss/user/ntuser/desktop.c | 8 +++++ win32ss/user/ntuser/security.c | 66 ++++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/security.h | 7 +++++ 3 files changed, 81 insertions(+) diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index fb8d6ed96cd..fcb3a8aa009 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -128,6 +128,14 @@ IntDesktopObjectParse(IN PVOID ParseObject, (PVOID*)&Desktop); if (!NT_SUCCESS(Status)) return Status; + /* Assign security to the desktop we have created */ + Status = IntAssignDesktopSecurityOnParse(WinStaObject, Desktop, AccessState); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(Desktop); + return Status; + } + /* Initialize the desktop */ Status = UserInitializeDesktop(Desktop, RemainingName, WinStaObject); if (!NT_SUCCESS(Status)) diff --git a/win32ss/user/ntuser/security.c b/win32ss/user/ntuser/security.c index 0286a76f5e3..276d01bfe16 100644 --- a/win32ss/user/ntuser/security.c +++ b/win32ss/user/ntuser/security.c @@ -235,6 +235,72 @@ IntQueryUserSecurityIdentification( return STATUS_SUCCESS; } +/** + * @brief + * Assigns a security descriptor to the desktop + * object during a desktop object parse procedure. + * + * @param[in] WinSta + * A pointer to a window station object, of which + * such object contains its own security descriptor + * that will be captured. + * + * @param[in] Desktop + * A pointer to a desktop object that is created + * during a parse procedure. + * + * @param[in] AccessState + * A pointer to an access state structure that + * describes the progress state of an access in + * action. + * + * @return + * Returns STATUS_SUCCESS if the function has successfully + * assigned new security descriptor to the desktop object. + * A NTSTATUS failure code is returned otherwise. + */ +NTSTATUS +NTAPI +IntAssignDesktopSecurityOnParse( + _In_ PWINSTATION_OBJECT WinSta, + _In_ PDESKTOP Desktop, + _In_ PACCESS_STATE AccessState) +{ + NTSTATUS Status; + PSECURITY_DESCRIPTOR CapturedDescriptor; + BOOLEAN MemoryAllocated; + + /* + * Capture the security descriptor from + * the window station. The window station + * in question has a descriptor that is + * inheritable and contains desktop access + * rights as well. + */ + Status = ObGetObjectSecurity(WinSta, + &CapturedDescriptor, + &MemoryAllocated); + if (!NT_SUCCESS(Status)) + { + ERR("IntAssignDesktopSecurityOnParse(): Failed to capture the security descriptor from window station (Status 0x%08lx)\n", Status); + return Status; + } + + /* Assign new security to the desktop */ + Status = ObAssignSecurity(AccessState, + CapturedDescriptor, + Desktop, + ExDesktopObjectType); + if (!NT_SUCCESS(Status)) + { + ERR("IntAssignDesktopSecurityOnParse(): Failed to assign security information to the desktop object (Status 0x%08lx)\n", Status); + } + + /* Release the descriptor that we have captured */ + ObReleaseObjectSecurity(CapturedDescriptor, MemoryAllocated); + return Status; +} + /** * @brief * Creates a security descriptor for the service. diff --git a/win32ss/user/ntuser/security.h b/win32ss/user/ntuser/security.h index f719beccc8a..1bbf185ac30 100644 --- a/win32ss/user/ntuser/security.h +++ b/win32ss/user/ntuser/security.h @@ -84,6 +84,13 @@ NTSTATUS IntQueryUserSecurityIdentification( _Out_ PTOKEN_USER *User); +NTSTATUS +NTAPI +IntAssignDesktopSecurityOnParse( + _In_ PWINSTATION_OBJECT WinSta, + _In_ PDESKTOP Desktop, + _In_ PACCESS_STATE AccessState); + NTSTATUS NTAPI IntCreateServiceSecurity(

2 years, 7 months

[reactos] 01/01: [SACDRV] Add 2 OBJ_KERNEL_HANDLE

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed125de9f35b742e397ff… commit ed125de9f35b742e397ff591eecc829289446ce0 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat May 7 00:49:29 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 19:42:49 2022 +0200 [SACDRV] Add 2 OBJ_KERNEL_HANDLE Match Zw*() uses. Plus: - GetRegistryValueBuffer(): Add missing ZwClose(Handle), Fix a copypasta. - SetRegistryValue(): 1 s/NtClose/ZwClose/. CORE-10207 --- drivers/sac/driver/util.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/sac/driver/util.c b/drivers/sac/driver/util.c index 3eef9025377..0e0722f4794 100644 --- a/drivers/sac/driver/util.c +++ b/drivers/sac/driver/util.c @@ -406,7 +406,7 @@ GetRegistryValueBuffer(IN PCWSTR KeyName, RtlInitUnicodeString(&DestinationString, KeyName); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenKey(&Handle, @@ -427,7 +427,8 @@ GetRegistryValueBuffer(IN PCWSTR KeyName, NULL, 0, &ResultLength); - if (!ResultLength) return Status; + if (!ResultLength) + goto Quit; /* Allocate the buffer for the partial info structure and our integer data */ ResultLength += sizeof(ULONG); @@ -435,7 +436,7 @@ GetRegistryValueBuffer(IN PCWSTR KeyName, if (!*Buffer) { SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC GetRegistryValueBuffer: failed allocation\n"); - return Status; + goto Quit; } /* Now read the data */ @@ -452,8 +453,10 @@ GetRegistryValueBuffer(IN PCWSTR KeyName, SacFreePool(*Buffer); } - /* Return the result */ - SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC SetRegistryValue: Exiting.\n"); +Quit: + /* Close the handle and exit */ + ZwClose(Handle); + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC GetRegistryValueBuffer: Exiting.\n"); return Status; } @@ -478,7 +481,7 @@ SetRegistryValue(IN PCWSTR KeyName, RtlInitUnicodeString(&DestinationString, KeyName); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwOpenKey(&Handle, @@ -501,7 +504,7 @@ SetRegistryValue(IN PCWSTR KeyName, } /* Close the handle and exit */ - NtClose(Handle); + ZwClose(Handle); SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC SetRegistryValue: Exiting.\n"); return Status; }

2 years, 7 months

[reactos] 01/01: [NTOS:OB] Specify the query security descriptor tag when freeing the allocation

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f8fbe14f5e48a0ff3910… commit 9f8fbe14f5e48a0ff391078866bbfddcfe16d222 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun May 8 19:16:34 2022 +0200 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun May 8 19:16:34 2022 +0200 [NTOS:OB] Specify the query security descriptor tag when freeing the allocation We are allocating blocks of pool memory for a security descriptor with its own specific tag, TAG_SEC_QUERY, so just use it when freeing when releasing the descriptor as well (aka freeing the said pool). --- ntoskrnl/ob/obsecure.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/ob/obsecure.c b/ntoskrnl/ob/obsecure.c index 135b7b2f5e1..649ba4ea283 100644 --- a/ntoskrnl/ob/obsecure.c +++ b/ntoskrnl/ob/obsecure.c @@ -718,7 +718,7 @@ ObReleaseObjectSecurity(IN PSECURITY_DESCRIPTOR SecurityDescriptor, if (MemoryAllocated) { /* Free it */ - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, TAG_SEC_QUERY); } else {

2 years, 7 months

[reactos] 02/02: [HAL][HALARM] The HAL should only use KPCR.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94c25baf85ebb409a8a7a… commit 94c25baf85ebb409a8a7a26a90df73366ce4dfe8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 04:55:17 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 8 17:21:44 2022 +0200 [HAL][HALARM] The HAL should only use KPCR. And why the ARM HAL uses KPCR::InterruptRoutine, a field only defined in *powerpc*/ketypes.h, is beyond me, but OK... See Timo vs. Alex discussion, explaining that KIPCR is a ReactOS-only thing: https://reactos.org/archives/public/ros-dev/2008-August/010549.html --- hal/halarm/generic/pic.c | 6 +++--- hal/halarm/generic/timer.c | 2 +- hal/halarm/generic/usage.c | 2 +- hal/halx86/generic/bios.c | 8 ++++---- hal/halx86/mp/mpsirql.c | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hal/halarm/generic/pic.c b/hal/halarm/generic/pic.c index a8c68cd6f67..8b99e462aa5 100644 --- a/hal/halarm/generic/pic.c +++ b/hal/halarm/generic/pic.c @@ -92,7 +92,7 @@ UCHAR HalpMaskTable[HIGH_LEVEL + 1] = VOID HalpInitializeInterrupts(VOID) { - PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPCR Pcr = KeGetPcr(); /* Fill out the IRQL mappings */ RtlCopyMemory(Pcr->IrqlTable, HalpIrqlTable, sizeof(Pcr->IrqlTable)); @@ -187,7 +187,7 @@ FASTCALL KfRaiseIrql(IN KIRQL NewIrql) { ARM_STATUS_REGISTER Flags; - PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPCR Pcr = KeGetPcr(); KIRQL CurrentIrql; ULONG InterruptMask; @@ -232,7 +232,7 @@ FASTCALL KfLowerIrql(IN KIRQL NewIrql) { ARM_STATUS_REGISTER Flags; - PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPCR Pcr = KeGetPcr(); ULONG InterruptMask; /* Disableinterrupts */ diff --git a/hal/halarm/generic/timer.c b/hal/halarm/generic/timer.c index 0a84b7446ad..b83a64dc205 100644 --- a/hal/halarm/generic/timer.c +++ b/hal/halarm/generic/timer.c @@ -53,7 +53,7 @@ HalpStallInterrupt(VOID) VOID HalpInitializeClock(VOID) { - PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PKPCR Pcr = KeGetPcr(); ULONG ClockInterval; SP804_CONTROL_REGISTER ControlRegister; diff --git a/hal/halarm/generic/usage.c b/hal/halarm/generic/usage.c index 3f44107181e..a302c118558 100644 --- a/hal/halarm/generic/usage.c +++ b/hal/halarm/generic/usage.c @@ -54,7 +54,7 @@ HalpEnableInterruptHandler(IN UCHAR Flags, IN KINTERRUPT_MODE Mode) { /* Register the routine */ - ((PKIPCR)KeGetPcr())->InterruptRoutine[Irql] = Handler; + KeGetPcr()->InterruptRoutine[Irql] = Handler; } /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/hal/halx86/generic/bios.c b/hal/halx86/generic/bios.c index aac2502a872..be5e082d1fc 100644 --- a/hal/halx86/generic/bios.c +++ b/hal/halx86/generic/bios.c @@ -302,7 +302,7 @@ HalpBorrowTss(VOID) // Get the current TSS and its GDT entry // Tss = Ke386GetTr(); - TssGdt = &((PKIPCR)KeGetPcr())->GDT[Tss / sizeof(KGDTENTRY)]; + TssGdt = &KeGetPcr()->GDT[Tss / sizeof(KGDTENTRY)]; // // Get the KTSS limit and check if it has IOPM space @@ -324,7 +324,7 @@ HalpBorrowTss(VOID) // // Get the "real" TSS // - TssGdt = &((PKIPCR)KeGetPcr())->GDT[KGDT_TSS / sizeof(KGDTENTRY)]; + TssGdt = &KeGetPcr()->GDT[KGDT_TSS / sizeof(KGDTENTRY)]; TssBase = (PKTSS)(ULONG_PTR)(TssGdt->BaseLow | TssGdt->HighWord.Bytes.BaseMid << 16 | TssGdt->HighWord.Bytes.BaseHi << 24); @@ -358,7 +358,7 @@ HalpReturnTss(VOID) // // Get the original TSS // - TssGdt = &((PKIPCR)KeGetPcr())->GDT[HalpSavedTss / sizeof(KGDTENTRY)]; + TssGdt = &KeGetPcr()->GDT[HalpSavedTss / sizeof(KGDTENTRY)]; TssBase = (PKTSS)(ULONG_PTR)(TssGdt->BaseLow | TssGdt->HighWord.Bytes.BaseMid << 16 | TssGdt->HighWord.Bytes.BaseHi << 24); @@ -670,7 +670,7 @@ HalpBiosDisplayReset(VOID) // the cmpxchg8b lock errata. Unprotect them here so we can set our custom // invalid op-code handler. // - IdtPte = HalAddressToPte(((PKIPCR)KeGetPcr())->IDT); + IdtPte = HalAddressToPte(KeGetPcr()->IDT); RestoreWriteProtection = IdtPte->Write != 0; IdtPte->Write = 1; diff --git a/hal/halx86/mp/mpsirql.c b/hal/halx86/mp/mpsirql.c index 604b07b82c2..95ef20799f9 100644 --- a/hal/halx86/mp/mpsirql.c +++ b/hal/halx86/mp/mpsirql.c @@ -84,10 +84,10 @@ HalpLowerIrql(KIRQL NewIrql, BOOLEAN FromHalEndSystemInterrupt) { KeSetCurrentIrql (DISPATCH_LEVEL); APICWrite(APIC_TPR, IRQL2TPR (DISPATCH_LEVEL) & APIC_TPR_PRI); - DpcRequested = __readfsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST])); + DpcRequested = __readfsbyte(FIELD_OFFSET(KPCR, HalReserved[HAL_DPC_REQUEST])); if (FromHalEndSystemInterrupt || DpcRequested) { - __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); + __writefsbyte(FIELD_OFFSET(KPCR, HalReserved[HAL_DPC_REQUEST]), 0); _enable(); KiDispatchInterrupt(); if (!(Flags & EFLAGS_INTERRUPT_MASK)) @@ -338,11 +338,11 @@ HalRequestSoftwareInterrupt(IN KIRQL Request) switch (Request) { case APC_LEVEL: - __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_APC_REQUEST]), 1); + __writefsbyte(FIELD_OFFSET(KPCR, HalReserved[HAL_APC_REQUEST]), 1); break; case DISPATCH_LEVEL: - __writefsbyte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 1); + __writefsbyte(FIELD_OFFSET(KPCR, HalReserved[HAL_DPC_REQUEST]), 1); break; default:

2 years, 7 months

[reactos] 01/02: [FREELDR][MINIHAL] Move KefAcquireSpinLockAtDpcLevel stub back to HAL, #ifdef'ed in _MINIHAL_ where it's only needed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c026b5950e9091da13a01… commit c026b5950e9091da13a0143b32b5625dcaca69fd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 04:44:46 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 8 17:21:43 2022 +0200 [FREELDR][MINIHAL] Move KefAcquireSpinLockAtDpcLevel stub back to HAL, #ifdef'ed in _MINIHAL_ where it's only needed. --- boot/freeldr/freeldr/arch/i386/ntoskrnl.c | 15 --------------- hal/halx86/generic/spinlock.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c index 40a3d16466e..d14d822c8e3 100644 --- a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c +++ b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c @@ -23,21 +23,6 @@ KeInitializeEvent( RtlZeroMemory(Event, sizeof(*Event)); } -VOID -FASTCALL -KefAcquireSpinLockAtDpcLevel( - IN PKSPIN_LOCK SpinLock) -{ -#if DBG - /* To be on par with HAL/NTOSKRNL */ -#ifdef _M_AMD64 - *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; -#else - *SpinLock = (KSPIN_LOCK)(((PKIPCR)KeGetPcr())->PrcbData.CurrentThread) | 1; -#endif -#endif -} - VOID NTAPI KeSetTimeIncrement( diff --git a/hal/halx86/generic/spinlock.c b/hal/halx86/generic/spinlock.c index 4ffce2e665e..32b8c36e56f 100644 --- a/hal/halx86/generic/spinlock.c +++ b/hal/halx86/generic/spinlock.c @@ -28,6 +28,19 @@ KSPIN_LOCK HalpSystemHardwareLock; #ifdef _M_IX86 +#ifdef _MINIHAL_ +VOID +FASTCALL +KefAcquireSpinLockAtDpcLevel( + IN PKSPIN_LOCK SpinLock) +{ +#if DBG + /* To be on par with HAL/NTOSKRNL */ + *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; +#endif +} +#endif /* defined(_MINIHAL_) */ + /* * @implemented */ @@ -205,6 +218,7 @@ KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, return KeTryToAcquireSpinLockAtDpcLevel(Lock); } #endif /* !defined(_MINIHAL_) */ + #endif /* defined(_M_IX86) */ VOID

2 years, 7 months

[reactos] 01/01: [NTUSER][USER32] Implement IME status (#4472)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=242e0b43036ce5acea66b… commit 242e0b43036ce5acea66bc5d8be8bd37296c4130 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun May 8 20:16:17 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun May 8 20:16:17 2022 +0900 [NTUSER][USER32] Implement IME status (#4472) - Add IntCheckImeShowStatus, IntSendMessageToUI, IntSendOpenStatusNotify, IntNotifyImeShowStatus, and xxxBroadcastImeShowStatusChange helper functions. - Renaming: s/X_ROUTINE_IMESHOWSTATUSCHANGE/TWOPARAM_ROUTINE_IMESHOWSTATUSCHANGE/ - Implement NtUserCallNoParam.NOPARAM_ROUTINE_GETIMESHOWSTATUS. - Implement NtUserCallHwndParamLock.TWOPARAM_ROUTINE_IMESHOWSTATUSCHANGE. - Fix hung in User32GetTopLevelWindow and rename it as IntGetTopLevelWindow. CORE-11700 --- win32ss/include/ntuser.h | 2 +- win32ss/user/ntuser/ime.c | 265 +++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/simplecall.c | 11 +- win32ss/user/ntuser/window.h | 4 + win32ss/user/user32/misc/imm.c | 26 ++-- 5 files changed, 290 insertions(+), 18 deletions(-) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 68999e7f932..7dde3b3810f 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1727,7 +1727,7 @@ enum SimpleCallRoutines HWNDLOCK_ROUTINE_SETSYSMENU, HWNDLOCK_ROUTINE_UPDATECKIENTRECT, HWNDLOCK_ROUTINE_UPDATEWINDOW, - X_ROUTINE_IMESHOWSTATUSCHANGE, + TWOPARAM_ROUTINE_IMESHOWSTATUSCHANGE, TWOPARAM_ROUTINE_ENABLEWINDOW, TWOPARAM_ROUTINE_REDRAWTITLE, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS, diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 966e4d0e5d0..370854ad2e8 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -41,6 +41,7 @@ DBG_DEFAULT_CHANNEL(UserMisc); HIMC ghIMC = NULL; BOOL gfImeOpen = (BOOL)-1; DWORD gdwImeConversion = (DWORD)-1; +BOOL gfIMEShowStatus = (BOOL)-1; typedef struct tagIMEHOTKEY { @@ -2105,4 +2106,268 @@ BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget) return TRUE; } +// Update IMEUI.fShowStatus flags and Send the WM_IME_NOTIFY messages. +// Win: xxxCheckImeShowStatus +BOOL FASTCALL IntCheckImeShowStatus(PWND pwndIme, PTHREADINFO pti) +{ + BOOL ret = FALSE, bDifferent; + PWINDOWLIST pwl; + HWND *phwnd; + PWND pwndNode, pwndIMC; + PTHREADINFO ptiCurrent = GetW32ThreadInfo(); + PIMEUI pimeui; + IMEUI SafeImeUI; + + if (pwndIme->state2 & WNDS2_INDESTROY) + return FALSE; + + // Build a window list + pwl = IntBuildHwndList(pwndIme->spwndParent->spwndChild, IACE_LIST, NULL); + if (!pwl) + return FALSE; + + ret = TRUE; + for (phwnd = pwl->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd) + { + pwndNode = ValidateHwndNoErr(*phwnd); + + if (!pwndNode || pwndIme == pwndNode) + continue; + + if (pwndNode->pcls->atomClassName != gpsi->atomSysClass[ICLS_IME] || + (pwndNode->state2 & WNDS2_INDESTROY)) + { + continue; + } + + pimeui = ((PIMEWND)pwndNode)->pimeui; + if (!pimeui || pimeui == (PIMEUI)-1) + continue; + + if (pti && pti != pwndNode->head.pti) + continue; + + // Attach to the process if necessary + bDifferent = FALSE; + if (pwndNode->head.pti->ppi != ptiCurrent->ppi) + { + KeAttachProcess(&(pwndNode->head.pti->ppi->peProcess->Pcb)); + bDifferent = TRUE; + } + + // Get pwndIMC and update IMEUI.fShowStatus flag + _SEH2_TRY + { + ProbeForWrite(pimeui, sizeof(IMEUI), 1); + SafeImeUI = *pimeui; + if (SafeImeUI.fShowStatus) + { + pwndIMC = ValidateHwndNoErr(pimeui->hwndIMC); + if (pwndIMC) + pimeui->fShowStatus = FALSE; + } + else + { + pwndIMC = NULL; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + pwndIMC = NULL; + } + _SEH2_END; + + // Detach from the process if necessary + if (bDifferent) + KeDetachProcess(); + + // Send the WM_IME_NOTIFY message + if (pwndIMC && pwndIMC->head.pti && !(pwndIMC->head.pti->TIF_flags & TIF_INCLEANUP)) + { + HWND hImeWnd; + USER_REFERENCE_ENTRY Ref; + + UserRefObjectCo(pwndIMC, &Ref); + + hImeWnd = UserHMGetHandle(pwndIMC); + co_IntSendMessage(hImeWnd, WM_IME_NOTIFY, IMN_CLOSESTATUSWINDOW, 0); + + UserDerefObjectCo(pwndIMC); + } + } + + // Free the window list + IntFreeHwndList(pwl); + return ret; +} + +// Send a UI message. +// Win: xxxSendMessageToUI +LRESULT FASTCALL +IntSendMessageToUI(PTHREADINFO ptiIME, PIMEUI pimeui, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + PWND pwndUI; + LRESULT ret = 0; + IMEUI SafeImeUI; + BOOL bDifferent = FALSE; + USER_REFERENCE_ENTRY Ref; + + // Attach to the process if necessary + if (ptiIME != GetW32ThreadInfo()) + { + bDifferent = TRUE; + KeAttachProcess(&(ptiIME->ppi->peProcess->Pcb)); + } + + // Get the pwndUI + _SEH2_TRY + { + ProbeForRead(pimeui, sizeof(IMEUI), 1); + SafeImeUI = *pimeui; + pwndUI = ValidateHwndNoErr(SafeImeUI.hwndUI); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + pwndUI = NULL; + } + _SEH2_END; + + if (!pwndUI) + goto Quit; + + // Increment the recursion count of the IME procedure. + // See also ImeWndProc_common of user32. + _SEH2_TRY + { + ProbeForWrite(&pimeui->nCntInIMEProc, sizeof(LONG), 1); + InterlockedIncrement(&pimeui->nCntInIMEProc); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + goto Quit; + } + _SEH2_END; + + // Detach from the process if necessary + if (bDifferent) + KeDetachProcess(); + + UserRefObjectCo(pwndUI, &Ref); + ret = co_IntSendMessage(UserHMGetHandle(pwndUI), uMsg, wParam, lParam); + UserDerefObjectCo(pwndUI); + + // Attach to the process if necessary + if (bDifferent) + KeAttachProcess(&(ptiIME->ppi->peProcess->Pcb)); + + // Decrement the recursion count of the IME procedure + _SEH2_TRY + { + ProbeForWrite(&pimeui->nCntInIMEProc, sizeof(LONG), 1); + InterlockedDecrement(&pimeui->nCntInIMEProc); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + goto Quit; + } + _SEH2_END; + +Quit: + // Detach from the process if necessary + if (bDifferent) + KeDetachProcess(); + + return ret; +} + +// Send the open status notification. +// Win: xxxSendOpenStatusNotify +VOID FASTCALL +IntSendOpenStatusNotify(PTHREADINFO ptiIME, PIMEUI pimeui, PWND pWnd, BOOL bOpen) +{ + WPARAM wParam = (bOpen ? IMN_OPENSTATUSWINDOW : IMN_CLOSESTATUSWINDOW); + PTHREADINFO ptiWnd = pWnd->head.pti; + USER_REFERENCE_ENTRY Ref; + + if (ptiWnd->dwExpWinVer >= WINVER_WINNT4 && pWnd->hImc) + { + UserRefObjectCo(pWnd, &Ref); + co_IntSendMessage(UserHMGetHandle(pWnd), WM_IME_NOTIFY, wParam, 0); + UserDerefObjectCo(pWnd); + } + else + { + IntSendMessageToUI(ptiIME, pimeui, WM_IME_NOTIFY, wParam, 0); + } +} + +// Update the IME status and send a notification. +// Win: xxxNotifyImeShowStatus +VOID FASTCALL IntNotifyImeShowStatus(PWND pImeWnd) +{ + PIMEUI pimeui; + PWND pWnd; + PTHREADINFO pti, ptiIME; + BOOL bShow, bSendNotify = FALSE; + IMEUI SafeImeUI; + + if (!IS_IMM_MODE() || (pImeWnd->state2 & WNDS2_INDESTROY)) + return; + + pti = PsGetCurrentThreadWin32Thread(); + ptiIME = pImeWnd->head.pti; + + // Attach to the process if necessary + if (pti != ptiIME) + KeAttachProcess(&(ptiIME->ppi->peProcess->Pcb)); + + // Get an IMEUI and check whether hwndIMC is valid and update fShowStatus + _SEH2_TRY + { + ProbeForWrite(pImeWnd, sizeof(IMEWND), 1); + pimeui = ((PIMEWND)pImeWnd)->pimeui; + SafeImeUI = *pimeui; + + bShow = (gfIMEShowStatus == TRUE) && SafeImeUI.fCtrlShowStatus; + + pWnd = ValidateHwndNoErr(SafeImeUI.hwndIMC); + if (!pWnd) + pWnd = ptiIME->MessageQueue->spwndFocus; + + if (pWnd) + { + bSendNotify = TRUE; + pimeui->fShowStatus = bShow; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if (pti != ptiIME) + KeDetachProcess(); + return; + } + _SEH2_END; + + // Detach from the process if necessary + if (pti != ptiIME) + KeDetachProcess(); + + if (bSendNotify) + IntSendOpenStatusNotify(ptiIME, &SafeImeUI, pWnd, bShow); + + if (!(pImeWnd->state2 & WNDS2_INDESTROY)) + IntCheckImeShowStatus(pImeWnd, NULL); +} + +// Win: xxxBroadcastImeShowStatusChange +BOOL FASTCALL IntBroadcastImeShowStatusChange(PWND pImeWnd, BOOL bShow) +{ + if (gfIMEShowStatus == bShow || !IS_IMM_MODE()) + return TRUE; + + gfIMEShowStatus = bShow; + IntNotifyImeShowStatus(pImeWnd); + return TRUE; +} + /* EOF */ diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index ed7583b0bac..b228746a9e4 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -114,6 +114,10 @@ NtUserCallNoParam(DWORD Routine) break; } + case NOPARAM_ROUTINE_GETIMESHOWSTATUS: + Result = !!gfIMEShowStatus; + break; + /* this is a ReactOS only case and is needed for gui-on-demand */ case NOPARAM_ROUTINE_ISCONSOLEMODE: Result = (ScreenDeviceContext == NULL); @@ -895,11 +899,10 @@ NtUserCallHwndParamLock( switch (Routine) { - case X_ROUTINE_IMESHOWSTATUSCHANGE: - { - // TODO: + case TWOPARAM_ROUTINE_IMESHOWSTATUSCHANGE: + Ret = IntBroadcastImeShowStatusChange(Window, !!Param); break; - } + case TWOPARAM_ROUTINE_VALIDATERGN: { PREGION Rgn = REGION_LockRgn((HRGN)Param); diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index a093e4e4ee8..b68c1657c5d 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -112,9 +112,13 @@ VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); (((pWnd)->pcls->style & CS_IME) || \ ((pWnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) +extern BOOL gfIMEShowStatus; + BOOL FASTCALL IntWantImeWindow(PWND pwndTarget); PWND FASTCALL co_IntCreateDefaultImeWindow(PWND pwndTarget, HINSTANCE hInst); BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget); BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget); +BOOL FASTCALL IntBroadcastImeShowStatusChange(PWND pImeWnd, BOOL bShow); +VOID FASTCALL IntNotifyImeShowStatus(PWND pImeWnd); /* EOF */ diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index f14db5ddf15..9099235c8ee 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -23,16 +23,18 @@ BOOL gbImmInitializing = FALSE; // Win: bImmInitializing INT gfConIme = -1; // Win: gfConIme -// Win: GetTopLevelWindow -PWND FASTCALL User32GetTopLevelWindow(PWND pwnd) +HWND FASTCALL IntGetTopLevelWindow(HWND hWnd) { - if (!pwnd) - return NULL; + DWORD style; - while (pwnd->style & WS_CHILD) - pwnd = pwnd->spwndParent; + for (; hWnd; hWnd = GetParent(hWnd)) + { + style = (DWORD)GetWindowLongPtrW(hWnd, GWL_STYLE); + if (!(style & WS_CHILD)) + break; + } - return pwnd; + return hWnd; } /* define stub functions */ @@ -573,7 +575,7 @@ static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) if (User32GetImeShowStatus() == !lParam) { hImeWnd = UserHMGetHandle(pimeui->spwnd); - NtUserCallHwndParamLock(hImeWnd, lParam, X_ROUTINE_IMESHOWSTATUSCHANGE); + NtUserCallHwndParamLock(hImeWnd, lParam, TWOPARAM_ROUTINE_IMESHOWSTATUSCHANGE); } break; @@ -707,7 +709,7 @@ LRESULT ImeWnd_OnImeSetContext(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) HIMC hIMC; LPINPUTCONTEXTDX pIC; HWND hwndFocus, hwndOldImc, hwndNewImc, hImeWnd, hwndActive, hwndOwner; - PWND pwndFocus, pwndOldImc, pwndNewImc, pImeWnd, pwndOwner; + PWND pwndFocus, pImeWnd, pwndOwner; COMPOSITIONFORM CompForm; pimeui->fActivate = !!wParam; @@ -813,10 +815,8 @@ LRESULT ImeWnd_OnImeSetContext(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) hwndNewImc = pimeui->hwndIMC; if (pimeui->fShowStatus) { - pwndNewImc = ValidateHwnd(hwndNewImc); - pwndOldImc = ValidateHwnd(hwndOldImc); - if (pwndNewImc && pwndOldImc && pwndNewImc != pwndOldImc && - User32GetTopLevelWindow(pwndNewImc) != User32GetTopLevelWindow(pwndOldImc)) + if (hwndOldImc && hwndNewImc && hwndOldImc != hwndNewImc && + IntGetTopLevelWindow(hwndOldImc) != IntGetTopLevelWindow(hwndNewImc)) { User32NotifyOpenStatus(pimeui, hwndOldImc, FALSE); User32NotifyOpenStatus(pimeui, hwndNewImc, TRUE);

2 years, 7 months

[reactos] 03/03: [NDK][XDK] Improve some HAL-related definitions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a84912594754b52343d5c… commit a84912594754b52343d5cac0426adbaba764d2bf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 8 05:32:17 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun May 8 04:15:52 2022 +0200 [NDK][XDK] Improve some HAL-related definitions. - Add more accurate definitions for the values of HAL_DISPATCH_VERSION and HAL_PRIVATE_DISPATCH_VERSION. See https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/ntos/hal/hal_… and https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/ntos/hal/hal_… - Make the conditionals for HalDispatchTable definition MS-WDK-compatible, and do the same for HalPrivateDispatchTable. - Remove MinGW-only non-MS-WDK-compatible PHAL_DISPATCH_TABLE and PHAL_PRIVATE_DISPATCH_TABLE definitions. - Remove hackish #define _NTSYSTEM_ in the wdm.h header. --- sdk/include/ndk/haltypes.h | 17 ++++++++++++++--- sdk/include/xdk/haltypes.h | 25 ++++++++++++++++++------- sdk/include/xdk/ntddk.template.h | 2 ++ sdk/include/xdk/wdm.template.h | 9 ++------- 4 files changed, 36 insertions(+), 17 deletions(-) diff --git a/sdk/include/ndk/haltypes.h b/sdk/include/ndk/haltypes.h index 125158b4210..e5f2edc48eb 100644 --- a/sdk/include/ndk/haltypes.h +++ b/sdk/include/ndk/haltypes.h @@ -153,9 +153,20 @@ BOOLEAN ); // -// Hal Private dispatch Table +// HAL Private dispatch Table // +// See Version table at: +// https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/ntos/hal/hal_… +// +#if (NTDDI_VERSION < NTDDI_WINXP) +#define HAL_PRIVATE_DISPATCH_VERSION 1 +#elif (NTDDI_VERSION < NTDDI_LONGHORN) #define HAL_PRIVATE_DISPATCH_VERSION 2 +#elif (NTDDI_VERSION >= NTDDI_LONGHORN) +#define HAL_PRIVATE_DISPATCH_VERSION 5 +#else +/* Not yet defined */ +#endif typedef struct _HAL_PRIVATE_DISPATCH { ULONG Version; @@ -257,7 +268,7 @@ typedef struct _BUS_HANDLER // // Kernel Exports // -#if (defined(_NTDRIVER_) || defined(_NTHAL_)) && !defined(_BLDR_) +#if !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_)) extern NTSYSAPI PHAL_PRIVATE_DISPATCH HalPrivateDispatchTable; #define HALPRIVATEDISPATCH ((PHAL_PRIVATE_DISPATCH)&HalPrivateDispatchTable) #else @@ -268,7 +279,7 @@ extern NTSYSAPI HAL_PRIVATE_DISPATCH HalPrivateDispatchTable; // // HAL Exports // -extern PUCHAR NTHALAPI KdComPortInUse; +extern NTHALAPI PUCHAR KdComPortInUse; // // HAL Constants diff --git a/sdk/include/xdk/haltypes.h b/sdk/include/xdk/haltypes.h index 4ba2b36c7b6..5497d8408e1 100644 --- a/sdk/include/xdk/haltypes.h +++ b/sdk/include/xdk/haltypes.h @@ -269,16 +269,27 @@ typedef struct { #endif } HAL_DISPATCH, *PHAL_DISPATCH; -#ifdef _NTSYSTEM_ -extern HAL_DISPATCH HalDispatchTable; -#define HALDISPATCH (&HalDispatchTable) -#else +#if !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_)) __CREATE_NTOS_DATA_IMPORT_ALIAS(HalDispatchTable) -extern PHAL_DISPATCH HalDispatchTable; -#define HALDISPATCH HalDispatchTable +extern PHAL_DISPATCH HalDispatchTable; +#define HALDISPATCH HalDispatchTable +#else +extern HAL_DISPATCH HalDispatchTable; +#define HALDISPATCH (&HalDispatchTable) +#endif + +// See Version table at: +// https://www.geoffchappell.com/studies/windows/km/ntoskrnl/inc/ntos/hal/hal_… +#if (NTDDI_VERSION < NTDDI_WIN2K) +#define HAL_DISPATCH_VERSION 1 +#elif (NTDDI_VERSION < NTDDI_WINXP) +#define HAL_DISPATCH_VERSION 2 +#elif (NTDDI_VERSION < NTDDI_WIN7) +#define HAL_DISPATCH_VERSION 3 +#else +#define HAL_DISPATCH_VERSION 4 #endif -#define HAL_DISPATCH_VERSION 3 /* FIXME: when to use 4? */ #define HalDispatchTableVersion HALDISPATCH->Version #define HalQuerySystemInformation HALDISPATCH->HalQuerySystemInformation #define HalSetSystemInformation HALDISPATCH->HalSetSystemInformation diff --git a/sdk/include/xdk/ntddk.template.h b/sdk/include/xdk/ntddk.template.h index 35eb73c4aaf..dc2ff5ff5d0 100644 --- a/sdk/include/xdk/ntddk.template.h +++ b/sdk/include/xdk/ntddk.template.h @@ -65,12 +65,14 @@ extern "C" { typedef GUID UUID; +/* Forward declarations */ struct _LOADER_PARAMETER_BLOCK; struct _CREATE_DISK; struct _DRIVE_LAYOUT_INFORMATION_EX; struct _SET_PARTITION_INFORMATION_EX; struct _DISK_GEOMETRY_EX; +/* Structures not exposed to drivers */ typedef struct _BUS_HANDLER *PBUS_HANDLER; typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT; #if defined(_NTHAL_INCLUDED_) diff --git a/sdk/include/xdk/wdm.template.h b/sdk/include/xdk/wdm.template.h index 1623e00a081..956bd6ce2ac 100644 --- a/sdk/include/xdk/wdm.template.h +++ b/sdk/include/xdk/wdm.template.h @@ -91,12 +91,9 @@ $define(USHORT=USHORT) #define NTKERNELAPI DECLSPEC_IMPORT #else #define NTKERNELAPI -#ifndef _NTSYSTEM_ -#define _NTSYSTEM_ -#endif #endif -/* for statically-linked ntoskrnl_vista library */ +/* For statically-linked ntoskrnl_vista library */ #if defined(NTKRNLVISTA) #define NTKRNLVISTAAPI #else @@ -117,7 +114,7 @@ $define(USHORT=USHORT) #define POINTER_ALIGNMENT #endif -/* Helper macro to enable gcc's extension. */ +/* Helper macro to enable gcc's extension */ #ifndef __GNU_EXTENSION #ifdef __GNUC__ #define __GNU_EXTENSION __extension__ @@ -196,8 +193,6 @@ struct _IO_RESOURCE_DESCRIPTOR; /* Structures not exposed to drivers */ typedef struct _OBJECT_TYPE *POBJECT_TYPE; -typedef struct _HAL_DISPATCH_TABLE *PHAL_DISPATCH_TABLE; -typedef struct _HAL_PRIVATE_DISPATCH_TABLE *PHAL_PRIVATE_DISPATCH_TABLE; typedef struct _CALLBACK_OBJECT *PCALLBACK_OBJECT; typedef struct _EPROCESS *PEPROCESS; typedef struct _ETHREAD *PETHREAD;

2 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2022