Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [REGEDIT] de-DE.rc Fix accelerator collision (#5265)
by Joachim Henze 05 May '23

05 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4393e6cb54d7c1ec89e31… commit 4393e6cb54d7c1ec89e31061655803875c23a6ca Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri May 5 13:30:21 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 5 13:30:21 2023 +0200 [REGEDIT] de-DE.rc Fix accelerator collision (#5265) Alt+D in german translation is already reserved for the file menu "&Datei" in ROS and in MS Windows, thus we cannot use the same as accelerator for focusing the address bar. So for german we will use Alt+S instead, which is the same shortcut that german MS+ROS explorer use for focusing their address bar. This is an addendum to commit f908d37bb from PR #4885 which broke the german file-menu accelerator. --- base/applications/regedit/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index f6d23a14570..6394f18e3ae 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN - "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT + "S", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT

1 0

[reactos] 01/01: [NTUSER] Remember old KL for Chinese IMEs (#5266)
by Katayama Hirofumi MZ 05 May '23

05 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d31b06c67901db77b34a… commit 2d31b06c67901db77b34a9207b8b6313d8720279 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri May 5 17:00:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri May 5 17:00:05 2023 +0900 [NTUSER] Remember old KL for Chinese IMEs (#5266) The Chinese user uses Ctrl+Space key combination to switch between the IME keyboard and the non-IME keyboard. To enable Ctrl+Space, the system has to remember the previous keyboard layout. In IntImmActivateLayout function, remember the previous keyboard layout (hklPrev) to switch back for Chinese IMEs. CORE-18950 --- win32ss/user/ntuser/kbdlayout.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index f3971cf5c67..ef66cad9ddc 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -650,14 +650,21 @@ IntImmActivateLayout( co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)pKL->hkl); UserDerefObjectCo(pImeWnd); } - else if (pti->spDefaultImc) + else { - /* IME Activation is needed */ - pti->pClientInfo->CI_flags |= CI_IMMACTIVATE; + /* Remember old keyboard layout to switch back for Chinese IMEs */ + pti->hklPrev = pti->KeyboardLayout->hkl; + + if (pti->spDefaultImc) + { + /* IME Activation is needed */ + pti->pClientInfo->CI_flags |= CI_IMMACTIVATE; + } } UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pKL); pti->pClientInfo->hKL = pKL->hkl; + pti->pClientInfo->CodePage = pKL->CodePage; } static VOID co_IntSetKeyboardLayoutForProcess(PPROCESSINFO ppi, PKL pKL)

1 0

[reactos] 01/01: [NTOS:KDBG] Only load symbols on x86
by Timo Kreuzer 04 May '23

04 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df72bcd06c64672f1943c… commit df72bcd06c64672f1943c487a8b0275e9bcc653f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Apr 14 13:07:11 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu May 4 14:09:14 2023 +0300 [NTOS:KDBG] Only load symbols on x86 Symbol loading leads to a hang on x64 boot in 2nd stage and KDBG symbols don't work on x64 anyway. --- ntoskrnl/kdbg/kdb_symbols.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 8cd897f339d..11ccd572219 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -355,8 +355,10 @@ KdbSymInit( SHORT Found = FALSE; CHAR YesNo; - /* By default, load symbols in DBG builds, but not in REL builds */ -#if DBG + /* By default, load symbols in DBG builds, but not in REL builds + or anything other than x86, because they only work on x86 + and can cause the system to hang on x64. */ +#if DBG && defined(_M_IX86) LoadSymbols = TRUE; #else LoadSymbols = FALSE;

1 0

[reactos] 01/01: [FREELDR][SDK] Build UEFI bootloader for ARM32 (#5196)
by Justin Miller 03 May '23

03 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2a58733e85158a8325e6… commit f2a58733e85158a8325e657e9cdfc32f35d516ba Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Wed May 3 11:56:06 2023 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 3 20:56:06 2023 +0200 [FREELDR][SDK] Build UEFI bootloader for ARM32 (#5196) CORE-17604 - Disable some functions for ARM32; - Remove some link options not used on ARM; - Add get _controlfp() to LIBCNTPR to link properly on ARM; - Unify Freeldr UI Drawing on ARM; - Add qemu UART debugging for ARM32/ARM64. --- boot/freeldr/freeldr/arch/arm/debug.c | 35 ++++++++++++++ boot/freeldr/freeldr/arch/arm/entry.c | 11 ----- boot/freeldr/freeldr/arch/arm/macharm.c | 4 ++ boot/freeldr/freeldr/arch/uefi/stubs.c | 2 + boot/freeldr/freeldr/arch/uefi/uefildr.c | 2 + boot/freeldr/freeldr/include/debug.h | 2 +- boot/freeldr/freeldr/lib/debug.c | 7 ++- boot/freeldr/freeldr/uefi.cmake | 8 +++- boot/freeldr/freeldr/ui/directui.c | 3 +- boot/freeldr/freeldr/ui/gui.c | 2 - boot/freeldr/freeldr/ui/minitui.c | 13 ----- boot/freeldr/freeldr/ui/noui.c | 3 -- boot/freeldr/freeldr/ui/tui.c | 15 ------ boot/freeldr/freeldr/ui/tuimenu.c | 82 +++----------------------------- boot/freeldr/freeldr/ui/ui.c | 37 -------------- boot/freeldr/freeldr/ui/video.c | 2 - sdk/lib/crt/float/float.cmake | 7 +++ 17 files changed, 71 insertions(+), 164 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arm/debug.c b/boot/freeldr/freeldr/arch/arm/debug.c new file mode 100644 index 00000000000..f7d65d2bfc5 --- /dev/null +++ b/boot/freeldr/freeldr/arch/arm/debug.c @@ -0,0 +1,35 @@ +/* + * PROJECT: Freeldr ARM32 + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Arch specific debug + * COPYRIGHT: Copyright 2022 Justin Miller <justinmiller100(a)gmail.com> + */ + +#include <freeldr.h> +#include <debug.h> + +#define QEMUUART 0x09000000 +volatile unsigned int * UART0DR = (unsigned int *) QEMUUART; + +BOOLEAN +Rs232PortInitialize(IN ULONG ComPort, + IN ULONG BaudRate) +{ + return TRUE; +} + +VOID +Rs232PortPutByte(UCHAR ByteToSend) +{ + *UART0DR = ByteToSend; +} + +VOID +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...) +{ +} diff --git a/boot/freeldr/freeldr/arch/arm/entry.c b/boot/freeldr/freeldr/arch/arm/entry.c index 4f5a015e4f8..6dbbb2be4df 100644 --- a/boot/freeldr/freeldr/arch/arm/entry.c +++ b/boot/freeldr/freeldr/arch/arm/entry.c @@ -18,14 +18,3 @@ RealEntryPoint(VOID) { BootMain(""); } - -VOID -FrLdrBugCheckWithMessage( - ULONG BugCode, - PCHAR File, - ULONG Line, - PSTR Format, - ...) -{ - -} diff --git a/boot/freeldr/freeldr/arch/arm/macharm.c b/boot/freeldr/freeldr/arch/arm/macharm.c index cfca3b17169..b62ba474df5 100644 --- a/boot/freeldr/freeldr/arch/arm/macharm.c +++ b/boot/freeldr/freeldr/arch/arm/macharm.c @@ -18,7 +18,9 @@ ULONG gDiskReadBuffer, gFileSysBuffer; BOOLEAN ArmHwDetectRan; PCONFIGURATION_COMPONENT_DATA RootNode; +#ifndef UEFIBOOT BOOLEAN AcpiPresent = FALSE; +#endif ULONG FirstLevelDcacheSize; ULONG FirstLevelDcacheFillSize; @@ -174,6 +176,7 @@ ArmHwIdle(VOID) /* UNIMPLEMENTED */ } +#ifndef UEFIBOOT VOID MachInit(IN PCCH CommandLine) { @@ -229,3 +232,4 @@ MachInit(IN PCCH CommandLine) MachVtbl.HwDetect = ArmHwDetect; MachVtbl.HwIdle = ArmHwIdle; } +#endif diff --git a/boot/freeldr/freeldr/arch/uefi/stubs.c b/boot/freeldr/freeldr/arch/uefi/stubs.c index 28f11b7795b..513f9f8f85d 100644 --- a/boot/freeldr/freeldr/arch/uefi/stubs.c +++ b/boot/freeldr/freeldr/arch/uefi/stubs.c @@ -9,12 +9,14 @@ #include <debug.h> +#ifndef _M_ARM /* TODO: Handle this with custom Disk / partition setup */ UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) { return 0; } +#endif VOID StallExecutionProcessor(ULONG Microseconds) diff --git a/boot/freeldr/freeldr/arch/uefi/uefildr.c b/boot/freeldr/freeldr/arch/uefi/uefildr.c index ded8e405f69..ef0dd85cba3 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefildr.c +++ b/boot/freeldr/freeldr/arch/uefi/uefildr.c @@ -31,7 +31,9 @@ EfiEntry( return 0; } +#ifndef _M_ARM VOID __cdecl Reboot(VOID) { } +#endif diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index feed051d013..3c9d741dac6 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -38,7 +38,7 @@ #define DPRINT_HEAP 15 // messages in a bottle #define DBG_CHANNELS_COUNT 16 -#if DBG && !defined(_M_ARM) +#if DBG VOID DebugInit(IN ULONG_PTR FrLdrSectionId); ULONG DbgPrint(const char *Format, ...); diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index b7a37977696..4edb35e4bae 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -20,7 +20,7 @@ #include <freeldr.h> #include <debug.h> -#if DBG && !defined(_M_ARM) +#if DBG // #define DEBUG_ALL // #define DEBUG_WARN @@ -54,6 +54,11 @@ ULONG PortIrq = 0; // Not used at the moment. BOOLEAN DebugStartOfLine = TRUE; +#ifdef UEFIBOOT +VOID +ARMWriteToUART(UCHAR Data); +#endif + VOID DebugInit(IN ULONG_PTR FrLdrSectionId) { PCHAR CommandLine, PortString, BaudString, IrqString; diff --git a/boot/freeldr/freeldr/uefi.cmake b/boot/freeldr/freeldr/uefi.cmake index 0adb0a25f4b..76483f0529e 100644 --- a/boot/freeldr/freeldr/uefi.cmake +++ b/boot/freeldr/freeldr/uefi.cmake @@ -29,6 +29,9 @@ if(ARCH STREQUAL "i386") elseif(ARCH STREQUAL "amd64") #TBD elseif(ARCH STREQUAL "arm") + list(APPEND UEFILDR_ARC_SOURCE + arch/arm/macharm.c + arch/arm/debug.c) #TBD elseif(ARCH STREQUAL "arm64") #TBD @@ -86,7 +89,10 @@ set_target_properties(uefildr PROPERTIES SUFFIX ".efi") target_compile_definitions(uefildr PRIVATE UEFIBOOT) if(MSVC) - target_link_options(uefildr PRIVATE /DYNAMICBASE:NO /NXCOMPAT:NO /ignore:4078 /ignore:4254 /DRIVER) +if(NOT ARCH STREQUAL "arm") + target_link_options(uefildr PRIVATE /DYNAMICBASE:NO) +endif() + target_link_options(uefildr PRIVATE /NXCOMPAT:NO /ignore:4078 /ignore:4254 /DRIVER) # We don't need hotpatching remove_target_compile_option(uefildr "/hotpatch") else() diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index f34f1dc2158..8bd47b2be0e 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -6,8 +6,7 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifdef _M_ARM - +#if 0 #include <freeldr.h> /* GLOBALS ********************************************************************/ diff --git a/boot/freeldr/freeldr/ui/gui.c b/boot/freeldr/freeldr/ui/gui.c index 3c631902e2f..d3160199ac9 100644 --- a/boot/freeldr/freeldr/ui/gui.c +++ b/boot/freeldr/freeldr/ui/gui.c @@ -17,7 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _M_ARM #include <freeldr.h> VOID GuiDrawBackdrop(VOID) @@ -113,4 +112,3 @@ const UIVTBL GuiVtbl = NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -#endif diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 872b9aac6ed..d44aef6bc67 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -13,8 +13,6 @@ // #define NTLDR_PROGRESSBAR // #define BTMGR_PROGRESSBAR /* Default style */ -#ifndef _M_ARM - BOOLEAN MiniTuiInitialize(VOID) { /* Initialize main TUI */ @@ -71,8 +69,6 @@ VOID MiniTuiDrawStatusText(PCSTR StatusText) /* Minimal UI doesn't have a status bar */ } -#endif // _M_ARM - /*static*/ VOID MiniTuiSetProgressBarText( _In_ PCSTR ProgressText) @@ -143,10 +139,8 @@ MiniTuiTickProgressBar( UiProgressBar.Right, UiProgressBar.Bottom, ' ', ATTR(UiTextColor, UiMenuBgColor)); -#ifndef _M_ARM TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); -#endif } VOID @@ -191,10 +185,8 @@ MiniTuiDrawMenu( { ULONG i; -#ifndef _M_ARM /* Draw the backdrop */ UiDrawBackdrop(); -#endif /* No GUI status bar text, just minimal text. Show the menu header. */ if (MenuInfo->MenuHeader) @@ -239,13 +231,9 @@ MiniTuiDrawMenu( DisplayBootTimeOptions(); } -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } -#ifndef _M_ARM - const UIVTBL MiniTuiVtbl = { MiniTuiInitialize, @@ -274,4 +262,3 @@ const UIVTBL MiniTuiVtbl = MiniTuiDrawMenu, }; -#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 5bc33d70e69..1e7c21d1554 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -6,7 +6,6 @@ * PROGRAMMERS: Hervé Poussineau */ -#ifndef _M_ARM #include <freeldr.h> BOOLEAN NoUiInitialize(VOID) @@ -183,5 +182,3 @@ NoUiDrawMenu( _In_ PUI_MENU_INFO MenuInfo) { } - -#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index be9cb22567d..bb5646aa917 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -19,9 +19,7 @@ #include <freeldr.h> -#ifndef _M_ARM PVOID TextVideoBuffer = NULL; -#endif /* GENERIC TUI UTILS *********************************************************/ @@ -93,9 +91,7 @@ TuiDrawText2( _In_reads_or_z_(MaxNumChars) PCSTR Text, _In_ UCHAR Attr) { -#ifndef _M_ARM PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; -#endif ULONG i, j; /* Don't display anything if we are out of the screen */ @@ -105,13 +101,8 @@ TuiDrawText2( /* Draw the text, not exceeding the width */ for (i = X, j = 0; Text[j] && i < UiScreenWidth && (MaxNumChars > 0 ? j < MaxNumChars : TRUE); i++, j++) { -#ifndef _M_ARM ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)] = (UCHAR)Text[j]; ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)+1] = Attr; -#else - /* Write the character */ - MachVideoPutChar(Text[j], Attr, i, Y); -#endif } } @@ -196,8 +187,6 @@ TuiDrawCenteredText( /* FULL TUI THEME ************************************************************/ -#ifndef _M_ARM - #define TAG_TUI_SCREENBUFFER 'SiuT' #define TAG_TUI_PALETTE 'PiuT' @@ -802,10 +791,8 @@ TuiTickProgressBar( UiProgressBar.Right, UiProgressBar.Bottom, '\xB2', ATTR(UiTextColor, UiMenuBgColor)); -#ifndef _M_ARM TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); -#endif } static VOID @@ -1241,5 +1228,3 @@ const UIVTBL TuiVtbl = TuiDisplayMenu, TuiDrawMenu, }; - -#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 548d209e42b..e65b642f367 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -91,11 +91,7 @@ TuiDisplayMenu( TuiCalcMenuBoxSize(&MenuInformation); /* Draw the menu */ -#ifdef _M_ARM - UiDrawMenu(&MenuInformation); -#else UiVtbl.DrawMenu(&MenuInformation); -#endif /* Get the current second of time */ LastClockSecond = ArcGetTime()->Second; @@ -117,10 +113,9 @@ TuiDisplayMenu( /* Update the time information */ LastClockSecond = CurrentClockSecond; -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Update the date & time */ TuiUpdateDateTime(); -#endif /* If there is a countdown, update it */ if (MenuInformation.MenuTimeRemaining > 0) @@ -131,19 +126,13 @@ TuiDisplayMenu( else if (MenuInformation.MenuTimeRemaining == 0) { /* A timeout occurred, exit this loop and return selection */ -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif break; } -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } -#ifndef _M_ARM MachHwIdle(); -#endif } /* Return the selected item */ @@ -178,7 +167,6 @@ TuiCalcMenuBoxSize( /* Allow room for left & right borders, plus 8 spaces on each side */ Width += 18; -#ifndef _M_ARM /* Check if we're drawing a centered menu */ if (UiCenterMenu) { @@ -188,7 +176,6 @@ TuiCalcMenuBoxSize( Height) / 2) + TUI_TITLE_BOX_CHAR_HEIGHT; } else -#endif { /* Put the menu in the default left-corner position */ MenuInfo->Left = -1; @@ -206,21 +193,9 @@ TuiDrawMenu( { ULONG i; -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw the backdrop */ UiDrawBackdrop(); -#else - - /* No GUI status bar text, just minimal text. Show the menu header. */ - if (MenuInfo->MenuHeader) - { - UiDrawText(0, - MenuInfo->Top - 2, - MenuInfo->MenuHeader, - ATTR(UiMenuFgColor, UiMenuBgColor)); - } - -#endif /* Draw the menu box */ TuiDrawMenuBox(MenuInfo); @@ -231,43 +206,17 @@ TuiDrawMenu( TuiDrawMenuItem(MenuInfo, i); } -#ifndef _M_ARM // FIXME: Theme-specific - + // FIXME: Theme-specific /* Update the status bar */ UiVtbl.DrawStatusText("Use \x18 and \x19 to select, then press ENTER."); -#else - - /* Now tell the user how to choose */ - UiDrawText(0, - MenuInfo->Bottom + 1, - "Use \x18 and \x19 to move the highlight to your choice.", - ATTR(UiMenuFgColor, UiMenuBgColor)); - UiDrawText(0, - MenuInfo->Bottom + 2, - "Press ENTER to choose.", - ATTR(UiMenuFgColor, UiMenuBgColor)); - - /* And show the menu footer */ - if (MenuInfo->MenuFooter) - { - UiDrawText(0, - UiScreenHeight - 4, - MenuInfo->MenuFooter, - ATTR(UiMenuFgColor, UiMenuBgColor)); - } - -#endif - /* Display the boot options if needed */ if (MenuInfo->ShowBootOptions) { DisplayBootTimeOptions(); } -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } static VOID @@ -330,7 +279,6 @@ TuiDrawMenuTimeout( * 1 1 Pad on the left with blanks + box bottom border. **/ -#ifndef _M_ARM if (UiCenterMenu) { /* In boxed menu mode, pad on the left with blanks and box border, @@ -368,7 +316,6 @@ TuiDrawMenuTimeout( } } else -#endif { if (Length > 0) { @@ -385,13 +332,8 @@ TuiDrawMenuTimeout( MenuInfo->Bottom + 4, Length ? (Length + 1) : (UiScreenWidth - 1), MenuInfo->Bottom + 4, -#ifndef _M_ARM UiBackdropFillStyle, ATTR(UiBackdropFgColor, UiBackdropBgColor) -#else - 0, // ' ' - ATTR(UiTextColor, COLOR_BLACK) // UiMenuBgColor -#endif ); } } @@ -400,7 +342,7 @@ VOID TuiDrawMenuBox( _In_ PUI_MENU_INFO MenuInfo) { -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw the menu box if requested */ if (UiMenuBox) { @@ -417,8 +359,6 @@ TuiDrawMenuBox( /* Update the date & time */ TuiUpdateDateTime(); -#endif - TuiDrawMenuTimeout(MenuInfo); } @@ -435,7 +375,7 @@ TuiDrawMenuItem( /* If this is a separator */ if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw its left box corner */ if (UiMenuBox) { @@ -444,7 +384,6 @@ TuiDrawMenuItem( "\xC7", ATTR(UiMenuFgColor, UiMenuBgColor)); } -#endif /* Make it a separator line and use menu colors */ RtlZeroMemory(MenuLineText, sizeof(MenuLineText)); @@ -458,7 +397,7 @@ TuiDrawMenuItem( MenuLineText, ATTR(UiMenuFgColor, UiMenuBgColor)); -#ifndef _M_ARM // FIXME: Theme-specific + // FIXME: Theme-specific /* Draw its right box corner */ if (UiMenuBox) { @@ -467,7 +406,6 @@ TuiDrawMenuItem( "\xB6", ATTR(UiMenuFgColor, UiMenuBgColor)); } -#endif /* We are done */ return; @@ -476,7 +414,6 @@ TuiDrawMenuItem( /* This is not a separator */ ASSERT(MenuInfo->MenuItemList[MenuItemNumber]); -#ifndef _M_ARM /* Check if using centered menu */ if (UiCenterMenu) { @@ -491,7 +428,6 @@ TuiDrawMenuItem( SpaceRight = (SpaceTotal - SpaceLeft) + 1; } else -#endif { /* Simply left-align it */ SpaceLeft = 4; @@ -556,11 +492,7 @@ TuiProcessMenuKeyboardEvent( KeyPressFilter(KeyEvent, MenuInfo->SelectedMenuItem, MenuInfo->Context)) { /* It processed the key character, so redraw and exit */ -#ifdef _M_ARM - UiDrawMenu(MenuInfo); -#else UiVtbl.DrawMenu(MenuInfo); -#endif return 0; } @@ -618,9 +550,7 @@ TuiProcessMenuKeyboardEvent( /* Select new item and update video buffer */ TuiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); -#ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); -#endif } /* Return the pressed key */ diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 78ea2f16dd1..7d1b379d3e0 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -22,8 +22,6 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(UI); -#ifndef _M_ARM - UCHAR UiStatusBarFgColor; // Status bar foreground color UCHAR UiStatusBarBgColor; // Status bar background color UCHAR UiBackdropFgColor; // Backdrop foreground color @@ -56,8 +54,6 @@ const PCSTR UiMonthNames[12] = { "January", "February", "March", "April", "May", ULONG UiScreenWidth; // Screen Width ULONG UiScreenHeight; // Screen Height -#endif // _M_ARM - /* * Loading progress bar, based on the NTOS Inbv one. * Supports progress within sub-ranges, used when loading @@ -65,8 +61,6 @@ ULONG UiScreenHeight; // Screen Height */ UI_PROGRESS_BAR UiProgressBar = {{0}}; -#ifndef _M_ARM - UIVTBL UiVtbl = { NoUiInitialize, @@ -386,8 +380,6 @@ UCHAR UiTextToFillStyle(PCSTR FillStyleText) return UiVtbl.TextToFillStyle(FillStyleText); } -#endif // _M_ARM - VOID UiInitProgressBar( _In_ ULONG Left, @@ -413,13 +405,8 @@ UiInitProgressBar( UiProgressBar.Show = TRUE; /* Initial drawing: set the "Loading..." text and the original position */ -#ifndef _M_ARM UiVtbl.SetProgressBarText(ProgressText); UiVtbl.TickProgressBar(0); -#else - MiniTuiSetProgressBarText(ProgressText); - MiniTuiTickProgressBar(0); -#endif } VOID @@ -477,11 +464,7 @@ UiUpdateProgressBar( TotalProgress = UiProgressBar.State.Floor + (Percentage * UiProgressBar.State.Bias); // TotalProgress /= (100 * 100); -#ifndef _M_ARM UiVtbl.TickProgressBar(TotalProgress); -#else - MiniTuiTickProgressBar(TotalProgress); -#endif } VOID @@ -492,22 +475,14 @@ UiSetProgressBarText( if (!UiProgressBar.Show) return; -#ifndef _M_ARM UiVtbl.SetProgressBarText(ProgressText); -#else - MiniTuiSetProgressBarText(ProgressText); -#endif } VOID UiDrawProgressBarCenter( _In_ PCSTR ProgressText) { -#ifndef _M_ARM UiVtbl.DrawProgressBarCenter(ProgressText); -#else - MiniTuiDrawProgressBarCenter(ProgressText); -#endif } VOID @@ -518,15 +493,9 @@ UiDrawProgressBar( _In_ ULONG Bottom, _In_ PCSTR ProgressText) { -#ifndef _M_ARM UiVtbl.DrawProgressBar(Left, Top, Right, Bottom, ProgressText); -#else - MiniTuiDrawProgressBar(Left, Top, Right, Bottom, ProgressText); -#endif } -#ifndef _M_ARM - static VOID UiEscapeString(PCHAR String) { @@ -662,9 +631,3 @@ BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) return UiVtbl.EditBox(MessageText, EditTextBuffer, Length); } -#else -BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) -{ - return FALSE; -} -#endif diff --git a/boot/freeldr/freeldr/ui/video.c b/boot/freeldr/freeldr/ui/video.c index ab77d694a3c..a07ff083f6c 100644 --- a/boot/freeldr/freeldr/ui/video.c +++ b/boot/freeldr/freeldr/ui/video.c @@ -5,7 +5,6 @@ * COPYRIGHT: Copyright 1998-2003 Brian Palmer <brianp(a)sginet.com> */ -#ifndef _M_ARM #include <freeldr.h> #define RGB_MAX 64 @@ -173,4 +172,3 @@ VOID VideoFadeOut(ULONG ColorCount) } } -#endif diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index 24fe327fbd5..d3ca0e6a9c6 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -40,8 +40,15 @@ elseif(ARCH STREQUAL "arm") float/arm/_fpreset.c float/arm/_statusfp.c ) + list(APPEND LIBCNTPR_FLOAT_SOURCE + float/arm/_controlfp.c + ) list(APPEND CRT_FLOAT_ASM_SOURCE float/arm/__getfp.s float/arm/__setfp.s ) + list(APPEND LIBCNTPR_FLOAT_ASM_SOURCE + float/arm/__getfp.s + float/arm/__setfp.s + ) endif()

1 0

[reactos] 01/01: [KBSWITCH] Rely on GetKeyboardLayoutList for getting list (#5263)
by Katayama Hirofumi MZ 02 May '23

02 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0bef1998e07c8d75db26… commit a0bef1998e07c8d75db26eaa5696bbb9a81c596e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 3 07:45:35 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 3 07:45:35 2023 +0900 [KBSWITCH] Rely on GetKeyboardLayoutList for getting list (#5263) - Use GetKeyboardLayoutList to get the keyboard list instead of using Preload registry key. - Get the special IDs from registry to handle special HKLs in newly-added LoadSpecialIds function. - Add GetKLIDFromHKL, GetHKLFromLayoutNum, UpdateLayoutList, and GetKLIDFromLayoutNum helper functions. CORE-13145, CORE-10667, CORE-18924 --- base/applications/kbswitch/kbswitch.c | 400 ++++++++++++++++++---------------- 1 file changed, 218 insertions(+), 182 deletions(-) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 984e2801bc3..bc9e698774a 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -26,6 +26,13 @@ * won't be generated in Vista+. */ +#define IME_MASK (0xE0000000UL) +#define SPECIAL_MASK (0xF0000000UL) + +#define IS_IME_HKL(hKL) ((((ULONG_PTR)(hKL)) & 0xF0000000) == IME_MASK) +#define IS_SPECIAL_HKL(hKL) ((((ULONG_PTR)(hKL)) & 0xF0000000) == SPECIAL_MASK) +#define SPECIALIDFROMHKL(hKL) ((WORD)(HIWORD(hKL) & 0x0FFF)) + #define WM_NOTIFYICONMSG (WM_USER + 248) PKBSWITCHSETHOOKS KbSwitchSetHooks = NULL; @@ -35,52 +42,158 @@ UINT ShellHookMessage = 0; HINSTANCE hInst; HANDLE hProcessHeap; HMODULE g_hHookDLL = NULL; -ULONG ulCurrentLayoutNum = 1; +INT g_nCurrentLayoutNum = 1; HICON g_hTrayIcon = NULL; HWND g_hwndLastActive = NULL; +INT g_cKLs = 0; +HKL g_ahKLs[64]; -static BOOL -GetLayoutID(LPCTSTR szLayoutNum, LPTSTR szLCID, SIZE_T LCIDLength) +typedef struct { - DWORD dwBufLen, dwRes; - HKEY hKey; - TCHAR szTempLCID[CCH_LAYOUT_ID + 1]; + DWORD dwLayoutId; + HKL hKL; + TCHAR szKLID[CCH_LAYOUT_ID + 1]; +} SPECIAL_ID, *PSPECIAL_ID; + +SPECIAL_ID g_SpecialIds[80]; +INT g_cSpecialIds = 0; - /* Get the Layout ID */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, KEY_QUERY_VALUE, - &hKey) == ERROR_SUCCESS) +static VOID LoadSpecialIds(VOID) +{ + TCHAR szKLID[KL_NAMELENGTH], szLayoutId[16]; + DWORD dwSize, dwIndex; + HKEY hKey, hLayoutKey; + + g_cSpecialIds = 0; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + TEXT("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts"), + 0, KEY_READ, &hKey) != ERROR_SUCCESS) { - dwBufLen = sizeof(szTempLCID); - dwRes = RegQueryValueEx(hKey, szLayoutNum, NULL, NULL, (LPBYTE)szTempLCID, &dwBufLen); - if (dwRes != ERROR_SUCCESS) + return; + } + + for (dwIndex = 0; dwIndex < 1000; ++dwIndex) + { + dwSize = ARRAYSIZE(szKLID); + if (RegEnumKeyEx(hKey, dwIndex, szKLID, &dwSize, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if (RegOpenKeyEx(hKey, szKLID, 0, KEY_READ, &hLayoutKey) != ERROR_SUCCESS) + continue; + + dwSize = sizeof(szLayoutId); + if (RegQueryValueEx(hLayoutKey, TEXT("Layout Id"), NULL, NULL, + (LPBYTE)szLayoutId, &dwSize) == ERROR_SUCCESS) { - RegCloseKey(hKey); - return FALSE; + DWORD dwKLID = _tcstoul(szKLID, NULL, 16); + WORD wLangId = LOWORD(dwKLID), wLayoutId = LOWORD(_tcstoul(szLayoutId, NULL, 16)); + HKL hKL = (HKL)(LONG_PTR)(SPECIAL_MASK | MAKELONG(wLangId, wLayoutId)); + + /* Add a special ID */ + g_SpecialIds[g_cSpecialIds].dwLayoutId = wLayoutId; + g_SpecialIds[g_cSpecialIds].hKL = hKL; + StringCchCopy(g_SpecialIds[g_cSpecialIds].szKLID, + ARRAYSIZE(g_SpecialIds[g_cSpecialIds].szKLID), szKLID); + ++g_cSpecialIds; } - RegCloseKey(hKey); + RegCloseKey(hLayoutKey); + + if (g_cSpecialIds >= ARRAYSIZE(g_SpecialIds)) + { + OutputDebugStringA("g_SpecialIds is full!"); + break; + } + } + + RegCloseKey(hKey); +} + +static VOID +GetKLIDFromHKL(HKL hKL, LPTSTR szKLID, SIZE_T KLIDLength) +{ + szKLID[0] = 0; + + if (IS_IME_HKL(hKL)) + { + StringCchPrintf(szKLID, KLIDLength, _T("%08lx"), (DWORD)(DWORD_PTR)hKL); + return; } - /* Look for a substitute of this layout */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Substitutes"), 0, - KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (IS_SPECIAL_HKL(hKL)) { - dwBufLen = sizeof(szTempLCID); - if (RegQueryValueEx(hKey, szTempLCID, NULL, NULL, (LPBYTE)szLCID, &dwBufLen) != ERROR_SUCCESS) + INT i; + for (i = 0; i < g_cSpecialIds; ++i) { - /* No substitute found, then use the old LCID */ - StringCchCopy(szLCID, LCIDLength, szTempLCID); + if (g_SpecialIds[i].hKL == hKL) + { + StringCchCopy(szKLID, KLIDLength, g_SpecialIds[i].szKLID); + return; + } } + } + else + { + StringCchPrintf(szKLID, KLIDLength, _T("%08lx"), LOWORD(hKL)); + } +} - RegCloseKey(hKey); +static VOID UpdateLayoutList(HKL hKL OPTIONAL) +{ + INT iKL; + + if (!hKL) + { + if (0 <= (g_nCurrentLayoutNum - 1) && (g_nCurrentLayoutNum - 1) < g_cKLs) + { + hKL = g_ahKLs[g_nCurrentLayoutNum - 1]; + } + else + { + HWND hwndTarget = (g_hwndLastActive ? g_hwndLastActive : GetForegroundWindow()); + DWORD dwTID = GetWindowThreadProcessId(hwndTarget, NULL); + hKL = GetKeyboardLayout(dwTID); + } + } + + g_cKLs = GetKeyboardLayoutList(ARRAYSIZE(g_ahKLs), g_ahKLs); + + g_nCurrentLayoutNum = -1; + for (iKL = 0; iKL < g_cKLs; ++iKL) + { + if (g_ahKLs[iKL] == hKL) + { + g_nCurrentLayoutNum = iKL + 1; + break; + } + } + + if (g_nCurrentLayoutNum == -1 && g_cKLs < ARRAYSIZE(g_ahKLs)) + { + g_nCurrentLayoutNum = g_cKLs; + g_ahKLs[g_cKLs++] = hKL; + } +} + +static HKL GetHKLFromLayoutNum(INT nLayoutNum) +{ + if (0 <= (nLayoutNum - 1) && (nLayoutNum - 1) < g_cKLs) + { + return g_ahKLs[nLayoutNum - 1]; } else { - /* Substitutes key couldn't be opened, so use the old LCID */ - StringCchCopy(szLCID, LCIDLength, szTempLCID); + HWND hwndTarget = (g_hwndLastActive ? g_hwndLastActive : GetForegroundWindow()); + DWORD dwTID = GetWindowThreadProcessId(hwndTarget, NULL); + return GetKeyboardLayout(dwTID); } +} - return TRUE; +static VOID +GetKLIDFromLayoutNum(INT nLayoutNum, LPTSTR szKLID, SIZE_T KLIDLength) +{ + GetKLIDFromHKL(GetHKLFromLayoutNum(nLayoutNum), szKLID, KLIDLength); } static BOOL @@ -95,21 +208,19 @@ GetSystemLibraryPath(LPTSTR szPath, SIZE_T cchPath, LPCTSTR FileName) } static BOOL -GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) +GetLayoutName(INT nLayoutNum, LPTSTR szName, SIZE_T NameLength) { HKEY hKey; HRESULT hr; DWORD dwBufLen; - TCHAR szBuf[MAX_PATH]; - TCHAR szLCID[CCH_LAYOUT_ID + 1]; + TCHAR szBuf[MAX_PATH], szKLID[CCH_LAYOUT_ID + 1]; - if (!GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID))) - return FALSE; + GetKLIDFromLayoutNum(nLayoutNum, szKLID, ARRAYSIZE(szKLID)); StringCchPrintf(szBuf, ARRAYSIZE(szBuf), - _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szKLID); - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_READ, &hKey) != ERROR_SUCCESS) return FALSE; /* Use "Layout Display Name" value as an entry name if possible */ @@ -123,17 +234,17 @@ GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) /* Otherwise, use "Layout Text" value as an entry name */ dwBufLen = NameLength * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("Layout Text"), NULL, NULL, - (LPBYTE)szName, &dwBufLen) != ERROR_SUCCESS) + (LPBYTE)szName, &dwBufLen) == ERROR_SUCCESS) { RegCloseKey(hKey); - return FALSE; + return TRUE; } RegCloseKey(hKey); - return TRUE; + return FALSE; } -static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szLCID) +static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szKLID) { HKEY hKey; DWORD dwBufLen; @@ -141,19 +252,17 @@ static BOOL GetImeFile(LPTSTR szImeFile, SIZE_T cchImeFile, LPCTSTR szLCID) szImeFile[0] = UNICODE_NULL; - if (_tcslen(szLCID) != CCH_LAYOUT_ID) + if (_tcslen(szKLID) != CCH_LAYOUT_ID) return FALSE; /* Invalid LCID */ - if (szLCID[0] != TEXT('E') && szLCID[0] != TEXT('e')) + if (szKLID[0] != TEXT('E') && szKLID[0] != TEXT('e')) return FALSE; /* Not an IME HKL */ StringCchPrintf(szBuf, ARRAYSIZE(szBuf), - _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); + _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szKLID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - { return FALSE; - } dwBufLen = cchImeFile * sizeof(TCHAR); if (RegQueryValueEx(hKey, _T("IME File"), NULL, NULL, @@ -223,7 +332,7 @@ static HBITMAP BitmapFromIcon(HICON hIcon) } static HICON -CreateTrayIcon(LPTSTR szLCID, LPCTSTR szImeFile OPTIONAL) +CreateTrayIcon(LPTSTR szKLID, LPCTSTR szImeFile OPTIONAL) { LANGID LangID; TCHAR szBuf[4]; @@ -245,7 +354,7 @@ CreateTrayIcon(LPTSTR szLCID, LPCTSTR szImeFile OPTIONAL) } /* Getting "EN", "FR", etc. from English, French, ... */ - LangID = LANGIDFROMLCID(_tcstoul(szLCID, NULL, 16)); + LangID = LANGIDFROMLCID(_tcstoul(szKLID, NULL, 16)); if (GetLocaleInfo(LangID, LOCALE_SABBREVLANGNAME | LOCALE_NOUSEROVERRIDE, szBuf, @@ -323,15 +432,14 @@ static VOID AddTrayIcon(HWND hwnd) { NOTIFYICONDATA tnid = { sizeof(tnid), hwnd, 1, NIF_ICON | NIF_MESSAGE | NIF_TIP }; - TCHAR szLCID[CCH_LAYOUT_ID + 1], szName[MAX_PATH]; - TCHAR szImeFile[80]; + TCHAR szKLID[CCH_LAYOUT_ID + 1], szName[MAX_PATH], szImeFile[80]; - GetLayoutID(_T("1"), szLCID, ARRAYSIZE(szLCID)); - GetLayoutName(_T("1"), szName, ARRAYSIZE(szName)); - GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + GetKLIDFromLayoutNum(g_nCurrentLayoutNum, szKLID, ARRAYSIZE(szKLID)); + GetLayoutName(g_nCurrentLayoutNum, szName, ARRAYSIZE(szName)); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szKLID); tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = CreateTrayIcon(szLCID, szImeFile); + tnid.hIcon = CreateTrayIcon(szKLID, szImeFile); StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_ADD, &tnid); @@ -355,15 +463,15 @@ DeleteTrayIcon(HWND hwnd) } static VOID -UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) +UpdateTrayIcon(HWND hwnd, LPTSTR szKLID, LPTSTR szName) { NOTIFYICONDATA tnid = { sizeof(tnid), hwnd, 1, NIF_ICON | NIF_MESSAGE | NIF_TIP }; TCHAR szImeFile[80]; - GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szKLID); tnid.uCallbackMessage = WM_NOTIFYICONMSG; - tnid.hIcon = CreateTrayIcon(szLCID, szImeFile); + tnid.hIcon = CreateTrayIcon(szKLID, szImeFile); StringCchCopy(tnid.szTip, ARRAYSIZE(tnid.szTip), szName); Shell_NotifyIcon(NIM_MODIFY, &tnid); @@ -373,12 +481,6 @@ UpdateTrayIcon(HWND hwnd, LPTSTR szLCID, LPTSTR szName) g_hTrayIcon = tnid.hIcon; } -static VOID -GetLayoutIDByHkl(HKL hKl, LPTSTR szLayoutID, SIZE_T LayoutIDLength) -{ - StringCchPrintf(szLayoutID, LayoutIDLength, _T("%08lx"), (DWORD)(DWORD_PTR)(hKl)); -} - static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) { @@ -390,25 +492,24 @@ static VOID ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL, BOOL bNoActivate) { HKL hKl; - TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLCID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH]; + TCHAR szKLID[CCH_LAYOUT_ID + 1], szLangName[MAX_PATH]; LANGID LangID; /* The layout number starts from one. Zero is invalid */ if (uLayoutNum == 0 || uLayoutNum > 0xFF) /* Invalid */ return; - _ultot(uLayoutNum, szLayoutNum, 10); - GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID)); - LangID = (LANGID)_tcstoul(szLCID, NULL, 16); + GetKLIDFromLayoutNum(uLayoutNum, szKLID, ARRAYSIZE(szKLID)); + LangID = (LANGID)_tcstoul(szKLID, NULL, 16); /* Switch to the new keyboard layout */ GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName)); - UpdateTrayIcon(hwnd, szLCID, szLangName); + UpdateTrayIcon(hwnd, szKLID, szLangName); if (hwndTarget && !bNoActivate) SetForegroundWindow(hwndTarget); - hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); + hKl = LoadKeyboardLayout(szKLID, KLF_ACTIVATE); if (hKl) ActivateKeyboardLayout(hKl, KLF_SETFORPROCESS); @@ -423,95 +524,45 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum, HWND hwndTarget OPTIONAL, BOOL bNoAc EnumWindows(EnumWindowsProc, (LPARAM) hKl); } - ulCurrentLayoutNum = uLayoutNum; + g_nCurrentLayoutNum = uLayoutNum; } static HMENU BuildLeftPopupMenu(VOID) { HMENU hMenu = CreatePopupMenu(); - HKEY hKey; - DWORD dwIndex, dwSize; - TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szName[MAX_PATH]; - TCHAR szLCID[CCH_LAYOUT_ID + 1], szImeFile[80]; + TCHAR szName[MAX_PATH], szKLID[CCH_LAYOUT_ID + 1], szImeFile[80]; HICON hIcon; MENUITEMINFO mii = { sizeof(mii) }; + INT iKL; - /* Add the keyboard layouts to the popup menu */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, - KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + for (iKL = 0; iKL < g_cKLs; ++iKL) { - for (dwIndex = 0; ; dwIndex++) - { - dwSize = sizeof(szLayoutNum); - if (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, - NULL, NULL) != ERROR_SUCCESS) - { - break; - } + GetKLIDFromHKL(g_ahKLs[iKL], szKLID, ARRAYSIZE(szKLID)); + GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szKLID); - GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID)); - GetImeFile(szImeFile, ARRAYSIZE(szImeFile), szLCID); + if (!GetLayoutName(iKL + 1, szName, ARRAYSIZE(szName))) + continue; - if (!GetLayoutName(szLayoutNum, szName, ARRAYSIZE(szName))) - continue; - - mii.fMask = MIIM_ID | MIIM_STRING; - mii.wID = _ttoi(szLayoutNum); - mii.dwTypeData = szName; - - hIcon = CreateTrayIcon(szLCID, szImeFile); - if (hIcon) - { - mii.hbmpItem = BitmapFromIcon(hIcon); - if (mii.hbmpItem) - mii.fMask |= MIIM_BITMAP; - } - - InsertMenuItem(hMenu, -1, TRUE, &mii); - DestroyIcon(hIcon); - } - - CheckMenuItem(hMenu, ulCurrentLayoutNum, MF_CHECKED); - - RegCloseKey(hKey); - } - - return hMenu; -} - -static ULONG -GetMaxLayoutNum(VOID) -{ - HKEY hKey; - ULONG dwIndex, dwSize, uLayoutNum, uMaxLayoutNum = 0; - TCHAR szLayoutNum[CCH_ULONG_DEC + 1], szLayoutID[CCH_LAYOUT_ID + 1]; + mii.fMask = MIIM_ID | MIIM_STRING; + mii.wID = iKL + 1; + mii.dwTypeData = szName; - /* Get the maximum layout number in the Preload key */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, - KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) - { - for (dwIndex = 0; ; dwIndex++) + hIcon = CreateTrayIcon(szKLID, szImeFile); + if (hIcon) { - dwSize = sizeof(szLayoutNum); - if (RegEnumValue(hKey, dwIndex, szLayoutNum, &dwSize, NULL, NULL, - NULL, NULL) != ERROR_SUCCESS) - { - break; - } - - if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) - { - uLayoutNum = _ttoi(szLayoutNum); - if (uMaxLayoutNum < uLayoutNum) - uMaxLayoutNum = uLayoutNum; - } + mii.hbmpItem = BitmapFromIcon(hIcon); + if (mii.hbmpItem) + mii.fMask |= MIIM_BITMAP; } - RegCloseKey(hKey); + InsertMenuItem(hMenu, -1, TRUE, &mii); + DestroyIcon(hIcon); } - return uMaxLayoutNum; + CheckMenuItem(hMenu, g_nCurrentLayoutNum, MF_CHECKED); + + return hMenu; } BOOL @@ -549,37 +600,36 @@ DeleteHooks(VOID) } } -ULONG -GetNextLayout(VOID) +static UINT GetLayoutNum(HKL hKL) { - TCHAR szLayoutNum[3 + 1], szLayoutID[CCH_LAYOUT_ID + 1]; - ULONG uLayoutNum, uMaxNum = GetMaxLayoutNum(); + INT iKL; - for (uLayoutNum = ulCurrentLayoutNum + 1; ; ++uLayoutNum) + for (iKL = 0; iKL < g_cKLs; ++iKL) { - if (uLayoutNum > uMaxNum) - uLayoutNum = 1; - if (uLayoutNum == ulCurrentLayoutNum) - break; - - _ultot(uLayoutNum, szLayoutNum, 10); - if (GetLayoutID(szLayoutNum, szLayoutID, ARRAYSIZE(szLayoutID))) - return uLayoutNum; + if (g_ahKLs[iKL] == hKL) + return iKL + 1; } - return ulCurrentLayoutNum; + return 0; +} + +ULONG +GetNextLayout(VOID) +{ + return (g_nCurrentLayoutNum % g_cKLs) + 1; } UINT -UpdateLanguageDisplay(HWND hwnd, HKL hKl) +UpdateLanguageDisplay(HWND hwnd, HKL hKL) { - TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH]; + TCHAR szKLID[MAX_PATH], szLangName[MAX_PATH]; LANGID LangID; - GetLayoutIDByHkl(hKl, szLCID, ARRAYSIZE(szLCID)); - LangID = (LANGID)_tcstoul(szLCID, NULL, 16); + GetKLIDFromHKL(hKL, szKLID, ARRAYSIZE(szKLID)); + LangID = (LANGID)_tcstoul(szKLID, NULL, 16); GetLocaleInfo(LangID, LOCALE_SLANGUAGE, szLangName, ARRAYSIZE(szLangName)); - UpdateTrayIcon(hwnd, szLCID, szLangName); + UpdateTrayIcon(hwnd, szKLID, szLangName); + g_nCurrentLayoutNum = GetLayoutNum(hKL); return 0; } @@ -611,21 +661,6 @@ UpdateLanguageDisplayCurrent(HWND hwnd, HWND hwndFore) return 0; } -static UINT GetCurLayoutNum(HKL hKL) -{ - UINT i, nCount; - HKL ahKL[256]; - - nCount = GetKeyboardLayoutList(ARRAYSIZE(ahKL), ahKL); - for (i = 0; i < nCount; ++i) - { - if (ahKL[i] == hKL) - return i + 1; - } - - return 0; -} - static BOOL RememberLastActive(HWND hwnd, HWND hwndFore) { TCHAR szClass[64]; @@ -641,8 +676,7 @@ static BOOL RememberLastActive(HWND hwnd, HWND hwndFore) return FALSE; /* Special window */ } - /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and - DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + /* FIXME: CONWND needs special handling */ if (_tcsicmp(szClass, TEXT("ConsoleWindowClass")) == 0) { HKL hKL = GetKeyboardLayout(0); @@ -671,15 +705,19 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) return -1; } + LoadSpecialIds(); + + UpdateLayoutList(NULL); AddTrayIcon(hwnd); - ActivateLayout(hwnd, ulCurrentLayoutNum, NULL, TRUE); + ActivateLayout(hwnd, g_nCurrentLayoutNum, NULL, TRUE); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); break; } case WM_LANG_CHANGED: /* Comes from kbsdll.dll and this module */ { + UpdateLayoutList((HKL)lParam); UpdateLanguageDisplay(hwnd, (HKL)lParam); break; } @@ -757,8 +795,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) if (hwndTarget == NULL) hwndTarget = g_hwndLastActive; - /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and - DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + /* FIXME: CONWND needs special handling */ if (hwndTarget && GetClassName(hwndTarget, szClass, ARRAYSIZE(szClass)) && _tcsicmp(szClass, TEXT("ConsoleWindowClass")) == 0) @@ -772,19 +809,17 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { dwThreadID = GetWindowThreadProcessId(hwndTarget, NULL); hKL = GetKeyboardLayout(dwThreadID); - uNum = GetCurLayoutNum(hKL); + uNum = GetLayoutNum(hKL); if (uNum != 0) - ulCurrentLayoutNum = uNum; + g_nCurrentLayoutNum = uNum; } ActivateLayout(hwnd, GetNextLayout(), hwndTarget, TRUE); - /* FIXME: CONWND is multithreaded but KLF_SETFORPROCESS and - DefWindowProc.WM_INPUTLANGCHANGEREQUEST won't work yet */ + /* FIXME: CONWND needs special handling */ if (bCONWND) - { - ActivateLayout(hwnd, ulCurrentLayoutNum, hwndTargetSave, TRUE); - } + ActivateLayout(hwnd, g_nCurrentLayoutNum, hwndTargetSave, TRUE); + break; } @@ -826,6 +861,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { if (Message == s_uTaskbarRestart) { + UpdateLayoutList(NULL); AddTrayIcon(hwnd); break; }

1 0

[reactos] 01/01: [EXPLORER][RUNDLL32] Restore minimized non-task windows (#5228)
by Katayama Hirofumi MZ 02 May '23

02 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6bced7a353132121387c… commit e6bced7a353132121387c77ed16d67bd10e9d8d5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 3 07:39:05 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 3 07:39:05 2023 +0900 [EXPLORER][RUNDLL32] Restore minimized non-task windows (#5228) The minimized non-task windows were not usable due to the bugs. In some situations, the system will restore the minimized non-task windows. - Add IsTaskWnd helper function. - Add SendPulseToTray function to send a pulse to the tray window. - At some shell hook handlings, send a pulse to the tray window. - Add IgnorePulse flag to control the timing of restoring. - Add a timer to reset IgnorePulse flag. - If the pulse has come and IgnorePulse flag is false, then restore the minimized non-task windows. - Modify the rundll32 window procedure. - Use WINDOWPLACEMENT to restore the minimized windows. CORE-13895, CORE-18350 --- base/shell/explorer/precomp.h | 3 + base/shell/explorer/taskswnd.cpp | 40 +++++++------ base/shell/explorer/traywnd.cpp | 123 +++++++++++++++++++++++++++++++-------- base/system/rundll32/rundll32.c | 51 +++++++++++++++- 4 files changed, 175 insertions(+), 42 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index efce3c2a233..881c2d05bce 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -130,6 +130,7 @@ HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void #define TWM_GETTASKSWITCH (WM_USER + 236) #define TWM_OPENSTARTMENU (WM_USER + 260) #define TWM_SETTINGSCHANGED (WM_USER + 300) +#define TWM_PULSE (WM_USER + 400) extern const GUID IID_IShellDesktopTray; @@ -149,6 +150,7 @@ DECLARE_INTERFACE_(ITrayWindow, IUnknown) STDMETHOD_(HWND, DisplayProperties) (THIS) PURE; STDMETHOD_(BOOL, ExecContextMenuCmd) (THIS_ UINT uiCmd) PURE; STDMETHOD_(BOOL, Lock) (THIS_ BOOL bLock) PURE; + STDMETHOD_(BOOL, IsTaskWnd) (THIS_ HWND hWnd) PURE; }; #undef INTERFACE @@ -166,6 +168,7 @@ DECLARE_INTERFACE_(ITrayWindow, IUnknown) #define ITrayWindow_DisplayProperties(p) (p)->lpVtbl->DisplayProperties(p) #define ITrayWindow_ExecContextMenuCmd(p,a) (p)->lpVtbl->ExecContextMenuCmd(p,a) #define ITrayWindow_Lock(p,a) (p)->lpVtbl->Lock(p,a) +#define ITrayWindow_IsTaskWnd(p,a) (p)->lpVtbl->IsTaskWnd(p,a) #endif HRESULT CreateTrayWindow(ITrayWindow ** ppTray); diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index da260dbc3e2..5437f4701f0 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -82,6 +82,7 @@ typedef struct _TASK_ITEM PTASK_GROUP Group; INT Index; INT IconIndex; + WINDOWPLACEMENT wndpl; union { @@ -1112,6 +1113,8 @@ public: TaskItem->hWnd = hWnd; TaskItem->Index = -1; TaskItem->Group = AddToTaskGroup(hWnd); + TaskItem->wndpl.length = sizeof(TaskItem->wndpl); + ::GetWindowPlacement(hWnd, &TaskItem->wndpl); if (!m_IsDestroying) { @@ -1131,7 +1134,6 @@ public: } CheckActivateTaskItem(TaskItem); - return FALSE; } @@ -1384,22 +1386,11 @@ public: BOOL CALLBACK EnumWindowsProc(IN HWND hWnd) { - /* Only show windows that still exist and are visible and none of explorer's - special windows (such as the desktop or the tray window) */ - if (::IsWindow(hWnd) && ::IsWindowVisible(hWnd) && - !m_Tray->IsSpecialHWND(hWnd)) + if (m_Tray->IsTaskWnd(hWnd)) { - DWORD exStyle = ::GetWindowLong(hWnd, GWL_EXSTYLE); - /* Don't list popup windows and also no tool windows */ - if ((::GetWindow(hWnd, GW_OWNER) == NULL || exStyle & WS_EX_APPWINDOW) && - !(exStyle & WS_EX_TOOLWINDOW)) - { - TRACE("Adding task for %p...\n", hWnd); - AddTask(hWnd); - } - + TRACE("Adding task for %p...\n", hWnd); + AddTask(hWnd); } - return TRUE; } @@ -1475,6 +1466,12 @@ public: return TRUE; } + VOID SendPulseToTray(BOOL bDelete, HWND hwndActive) + { + HWND hwndTray = m_Tray->GetHWND(); + ::SendMessage(hwndTray, TWM_PULSE, bDelete, (LPARAM)hwndActive); + } + BOOL HandleAppCommand(IN WPARAM wParam, IN LPARAM lParam) { BOOL Ret = FALSE; @@ -1516,17 +1513,20 @@ public: break; case HSHELL_WINDOWCREATED: + SendPulseToTray(FALSE, (HWND)lParam); AddTask((HWND) lParam); break; case HSHELL_WINDOWDESTROYED: /* The window still exists! Delay destroying it a bit */ - DeleteTask((HWND) lParam); + SendPulseToTray(TRUE, (HWND)lParam); + DeleteTask((HWND)lParam); break; case HSHELL_RUDEAPPACTIVATED: case HSHELL_WINDOWACTIVATED: - ActivateTask((HWND) lParam); + SendPulseToTray(FALSE, (HWND)lParam); + ActivateTask((HWND)lParam); break; case HSHELL_FLASH: @@ -1597,12 +1597,17 @@ public: if (!bIsMinimized && bIsActive) { + TaskItem->wndpl.length = sizeof(TaskItem->wndpl); + ::GetWindowPlacement(TaskItem->hWnd, &TaskItem->wndpl); + ::ShowWindowAsync(TaskItem->hWnd, SW_MINIMIZE); TRACE("Valid button clicked. App window Minimized.\n"); } else { ::SwitchToThisWindow(TaskItem->hWnd, TRUE); + ::SetWindowPlacement(TaskItem->hWnd, &TaskItem->wndpl); + TRACE("Valid button clicked. App window Restored.\n"); } } @@ -1631,6 +1636,7 @@ public: TaskItem = FindTaskItemByIndex((INT) wIndex); if (TaskItem != NULL) { + SendPulseToTray(FALSE, TaskItem->hWnd); HandleTaskItemClick(TaskItem); return TRUE; } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index ca930e56e55..05d130b4c3d 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -169,7 +169,13 @@ IsThereAnyEffectiveWindow(BOOL bMustBeInMonitor) return ei.hwndFound != NULL; } -CSimpleArray<HWND> g_MinimizedAll; +/* Minimized window position info */ +struct MINWNDPOS +{ + HWND hwnd; + WINDOWPLACEMENT wndpl; +}; +CSimpleArray<MINWNDPOS> g_MinimizedAll; /* * ITrayWindow @@ -559,6 +565,7 @@ public: DWORD InSizeMove : 1; DWORD IsDragging : 1; DWORD NewPosSize : 1; + DWORD IgnorePulse : 1; }; }; @@ -587,6 +594,7 @@ public: ZeroMemory(&m_TraySize, sizeof(m_TraySize)); ZeroMemory(&m_AutoHideOffset, sizeof(m_AutoHideOffset)); ZeroMemory(&m_MouseTrackingInfo, sizeof(m_MouseTrackingInfo)); + IgnorePulse = TRUE; } virtual ~CTrayWindow() @@ -2460,6 +2468,22 @@ ChangePos: return bPrevLock; } + /* The task window is visible and non-WS_EX_TOOLWINDOW and + { has WS_EX_APPWINDOW style or has no owner } and is none of explorer's + special windows (such as the desktop or the tray window) */ + BOOL STDMETHODCALLTYPE IsTaskWnd(HWND hWnd) + { + if (::IsWindow(hWnd) && ::IsWindowVisible(hWnd) && !IsSpecialHWND(hWnd)) + { + DWORD exStyle = (DWORD)::GetWindowLongPtr(hWnd, GWL_EXSTYLE); + if (((exStyle & WS_EX_APPWINDOW) || ::GetWindow(hWnd, GW_OWNER) == NULL) && + !(exStyle & WS_EX_TOOLWINDOW)) + { + return TRUE; + } + } + return FALSE; + } /* * IContextMenu @@ -2596,6 +2620,15 @@ ChangePos: return TRUE; } +#define TIMER_ID_IGNOREPULSERESET 888 +#define TIMER_IGNOREPULSERESET_TIMEOUT 200 + + LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + KillTimer(TIMER_ID_IGNOREPULSERESET); + return 0; + } + LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_Theme) @@ -3160,6 +3193,39 @@ HandleTrayContextMenu: return (LRESULT)m_TaskSwitch; } + void RestoreMinimizedNonTaskWnds(BOOL bDestroyed, HWND hwndActive) + { + for (INT i = g_MinimizedAll.GetSize() - 1; i >= 0; --i) + { + HWND hwnd = g_MinimizedAll[i].hwnd; + if (!hwnd || hwndActive == hwnd) + continue; + + if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd) && + (!IsTaskWnd(hwnd) || !::IsWindowEnabled(hwnd))) + { + ::SetWindowPlacement(hwnd, &g_MinimizedAll[i].wndpl); // Restore + } + } + + g_MinimizedAll.RemoveAll(); + + if (!bDestroyed) + ::SetForegroundWindow(hwndActive); + } + + LRESULT OnPulse(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (IgnorePulse) + return 0; + + KillTimer(TIMER_ID_IGNOREPULSERESET); + IgnorePulse = TRUE; + RestoreMinimizedNonTaskWnds((BOOL)wParam, (HWND)lParam); + SetTimer(TIMER_ID_IGNOREPULSERESET, TIMER_IGNOREPULSERESET_TIMEOUT, NULL); + return 0; + } + LRESULT OnHotkey(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { return HandleHotKey(wParam); @@ -3170,8 +3236,7 @@ HandleTrayContextMenu: HWND hwndDesktop; HWND hTrayWnd; HWND hwndProgman; - BOOL bRet; - CSimpleArray<HWND> *pMinimizedAll; + CSimpleArray<MINWNDPOS> *pMinimizedAll; BOOL bShowDesktop; }; @@ -3185,11 +3250,9 @@ HandleTrayContextMenu: static BOOL CALLBACK MinimizeWindowsProc(HWND hwnd, LPARAM lParam) { MINIMIZE_INFO *info = (MINIMIZE_INFO *)lParam; - if (hwnd == info->hwndDesktop || hwnd == info->hTrayWnd || - hwnd == info->hwndProgman) - { - return TRUE; - } + if (hwnd == info->hwndDesktop || hwnd == info->hTrayWnd || hwnd == info->hwndProgman) + return TRUE; // Ignore special windows + if (!info->bShowDesktop) { if (!::IsWindowEnabled(hwnd) || IsDialog(hwnd)) @@ -3198,35 +3261,38 @@ HandleTrayContextMenu: if (hwndOwner && !::IsWindowEnabled(hwndOwner)) return TRUE; } + if (::IsWindowVisible(hwnd) && !::IsIconic(hwnd)) { + MINWNDPOS mwp; + mwp.hwnd = hwnd; + mwp.wndpl.length = sizeof(mwp.wndpl); + ::GetWindowPlacement(hwnd, &mwp.wndpl); // Save the position and status + + info->pMinimizedAll->Add(mwp); + ::ShowWindowAsync(hwnd, SW_MINIMIZE); - info->bRet = TRUE; - info->pMinimizedAll->Add(hwnd); } + return TRUE; } VOID MinimizeAll(BOOL bShowDesktop = FALSE) { + IgnorePulse = TRUE; + KillTimer(TIMER_ID_IGNOREPULSERESET); + MINIMIZE_INFO info; info.hwndDesktop = GetDesktopWindow();; info.hTrayWnd = FindWindowW(L"Shell_TrayWnd", NULL); info.hwndProgman = FindWindowW(L"Progman", NULL); - info.bRet = FALSE; info.pMinimizedAll = &g_MinimizedAll; info.bShowDesktop = bShowDesktop; EnumWindows(MinimizeWindowsProc, (LPARAM)&info); - // invalid handles should be cleared to avoid mismatch of handles - for (INT i = 0; i < g_MinimizedAll.GetSize(); ++i) - { - if (!::IsWindow(g_MinimizedAll[i])) - g_MinimizedAll[i] = NULL; - } - ::SetForegroundWindow(m_DesktopWnd); ::SetFocus(m_DesktopWnd); + SetTimer(TIMER_ID_IGNOREPULSERESET, TIMER_IGNOREPULSERESET_TIMEOUT, NULL); } VOID ShowDesktop() @@ -3236,15 +3302,20 @@ HandleTrayContextMenu: VOID RestoreAll() { + IgnorePulse = TRUE; + KillTimer(TIMER_ID_IGNOREPULSERESET); + for (INT i = g_MinimizedAll.GetSize() - 1; i >= 0; --i) { - HWND hwnd = g_MinimizedAll[i]; + HWND hwnd = g_MinimizedAll[i].hwnd; if (::IsWindowVisible(hwnd) && ::IsIconic(hwnd)) { - ::ShowWindowAsync(hwnd, SW_RESTORE); + ::SetWindowPlacement(hwnd, &g_MinimizedAll[i].wndpl); } } + g_MinimizedAll.RemoveAll(); + SetTimer(TIMER_ID_IGNOREPULSERESET, TIMER_IGNOREPULSERESET_TIMEOUT, NULL); } LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -3288,9 +3359,12 @@ HandleTrayContextMenu: { ProcessAutoHide(); } - - bHandled = FALSE; - return TRUE; + else if (wParam == TIMER_ID_IGNOREPULSERESET) + { + KillTimer(TIMER_ID_IGNOREPULSERESET); + IgnorePulse = FALSE; + } + return 0; } LRESULT OnNcActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -3479,7 +3553,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CREATE, OnCreate) - /*MESSAGE_HANDLER(WM_DESTROY, OnDestroy)*/ + MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_SYSCOMMAND, OnSysCommand) @@ -3512,6 +3586,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) MESSAGE_HANDLER(TWM_GETTASKSWITCH, OnGetTaskSwitch) + MESSAGE_HANDLER(TWM_PULSE, OnPulse) ALT_MSG_MAP(1) END_MSG_MAP() diff --git a/base/system/rundll32/rundll32.c b/base/system/rundll32/rundll32.c index b02517ef56a..44b3e543813 100644 --- a/base/system/rundll32/rundll32.c +++ b/base/system/rundll32/rundll32.c @@ -29,6 +29,7 @@ #include <winnls.h> #include <winuser.h> #include <tchar.h> +#include <undocuser.h> // For WM_POPUPSYSTEMMENU #include "resource.h" @@ -299,9 +300,57 @@ LPSTR DuplicateToMultiByte(LPCTSTR lptString, size_t nBufferSize) return lpString; } +typedef struct +{ + HWND hwndOwner; + HWND hwndTarget; +} FIND_OWNED, *PFIND_OWNED; + +static BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) +{ + PFIND_OWNED pFindOwned = (PFIND_OWNED)lParam; + if (pFindOwned->hwndOwner == GetWindow(hwnd, GW_OWNER)) + { + pFindOwned->hwndTarget = hwnd; + return FALSE; + } + return TRUE; +} + LRESULT CALLBACK EmptyWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return DefWindowProc(hWnd, uMsg, wParam, lParam); + switch (uMsg) + { + case WM_POPUPSYSTEMMENU: + case WM_SYSCOMMAND: + { + /* Find the owned window */ + FIND_OWNED FindOwned = { hWnd, NULL }; + EnumWindows(EnumWindowsProc, (LPARAM)&FindOwned); + /* Forward message */ + if (FindOwned.hwndTarget) + PostMessageW(FindOwned.hwndTarget, uMsg, wParam, lParam); + break; + } + case WM_ACTIVATE: + { + /* Find the owned window */ + FIND_OWNED FindOwned = { hWnd, NULL }; + EnumWindows(EnumWindowsProc, (LPARAM)&FindOwned); + if (FindOwned.hwndTarget) + { + if (LOWORD(wParam) != WA_INACTIVE) /* To be activated */ + { + SetActiveWindow(FindOwned.hwndTarget); + return 0; + } + } + /* Fall through */ + } + default: + return DefWindowProc(hWnd, uMsg, wParam, lParam); + } + return 0; } // Registers a minimal window class for passing to the dll function

1 0

[reactos] 01/01: [REGEDIT] Strip redundant include, minor formatting (#5264)
by Joachim Henze 01 May '23

01 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31fdaca8c014ef916be82… commit 31fdaca8c014ef916be824685e3af09712aef4dc Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Mon May 1 16:50:01 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon May 1 16:50:01 2023 +0200 [REGEDIT] Strip redundant include, minor formatting (#5264) strsafe.h is already included via regedit.h --- base/applications/regedit/childwnd.c | 2 +- base/applications/regedit/lang/el-GR.rc | 2 +- base/applications/regedit/lang/sl-SI.rc | 8 ++++---- base/applications/regedit/settings.c | 1 - base/applications/regedit/treeview.c | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 7910dcefdaa..67a88bc90a5 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -656,7 +656,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa } } } - TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd/*g_pChildWnd->hWnd*/, NULL); + TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } } break; diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index 0c840b3662e..5fdb8ff7a26 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -82,7 +82,7 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Αρχείο" BEGIN - MENUITEM "&Εισαγωγή ...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Εισαγωγή...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Εξαγωγή...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Φόρτωση Hive...", ID_REGISTRY_LOADHIVE, GRAYED diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index 4d8d89eb17f..345b80f37cc 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -82,14 +82,14 @@ IDR_REGEDIT_MENU MENU BEGIN POPUP "&Register" BEGIN - MENUITEM "&Uvozi registrsko datoteko ...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Izvozi registrsko datoteko ...", ID_REGISTRY_EXPORTREGISTRYFILE + MENUITEM "&Uvozi registrsko datoteko...", ID_REGISTRY_IMPORTREGISTRYFILE + MENUITEM "&Izvozi registrsko datoteko...", ID_REGISTRY_EXPORTREGISTRYFILE MENUITEM SEPARATOR MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "P&oveži se z omrežnim registrom ...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "P&rekini povezavo z omrežnim registrom ...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED + MENUITEM "P&oveži se z omrežnim registrom...", ID_REGISTRY_CONNECTNETWORKREGISTRY + MENUITEM "P&rekini povezavo z omrežnim registrom...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "Na&tisni...\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR diff --git a/base/applications/regedit/settings.c b/base/applications/regedit/settings.c index 9266ec1a0c1..c82a3a0520d 100644 --- a/base/applications/regedit/settings.c +++ b/base/applications/regedit/settings.c @@ -20,7 +20,6 @@ */ #include "regedit.h" -#include <strsafe.h> const WCHAR g_szGeneralRegKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Regedit"; DECLSPEC_IMPORT ULONG WINAPIV DbgPrint(PCCH Format,...); diff --git a/base/applications/regedit/treeview.c b/base/applications/regedit/treeview.c index 28222432fea..9c957cfe2ad 100644 --- a/base/applications/regedit/treeview.c +++ b/base/applications/regedit/treeview.c @@ -674,7 +674,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) break; case TVN_BEGINLABELEDIT: { - LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO) lParam; + LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; /* cancel label edit for rootkeys */ if (!TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem) || !TreeView_GetParent(g_pChildWnd->hTreeWnd, TreeView_GetParent(g_pChildWnd->hTreeWnd, ptvdi->item.hItem))) @@ -692,7 +692,7 @@ BOOL TreeWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result) LPCWSTR keyPath; HKEY hRootKey; HKEY hKey = NULL; - LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO) lParam; + LPNMTVDISPINFO ptvdi = (LPNMTVDISPINFO)lParam; LONG nRenResult; LONG lResult = TRUE; WCHAR szBuffer[MAX_PATH];

1 0

[reactos] 01/01: [KBSWITCH] Delete SHLoadRegUIString hack (#5260)
by Katayama Hirofumi MZ 30 Apr '23

30 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ee41e9e6091f3f18c6ef… commit 7ee41e9e6091f3f18c6ef652c522f5207bb8f3fb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 29 07:28:56 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 29 07:28:56 2023 +0900 [KBSWITCH] Delete SHLoadRegUIString hack (#5260) Because shlwapi!SHLoadRegUIString function is already implemented, so we don't need the hack any more. CORE-10667 --- base/applications/kbswitch/CMakeLists.txt | 2 +- base/applications/kbswitch/kbswitch.c | 51 +++++-------------------------- 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/base/applications/kbswitch/CMakeLists.txt b/base/applications/kbswitch/CMakeLists.txt index ede579f6181..9cf01e40398 100644 --- a/base/applications/kbswitch/CMakeLists.txt +++ b/base/applications/kbswitch/CMakeLists.txt @@ -2,7 +2,7 @@ add_rc_deps(kbswitch.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/kbswitch.ico) add_executable(kbswitch kbswitch.c kbswitch.rc) set_module_type(kbswitch win32gui UNICODE) -add_importlibs(kbswitch advapi32 imm32 user32 shell32 gdi32 msvcrt kernel32) +add_importlibs(kbswitch advapi32 imm32 user32 shell32 shlwapi gdi32 msvcrt kernel32) add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all) add_subdirectory(kbsdll) diff --git a/base/applications/kbswitch/kbswitch.c b/base/applications/kbswitch/kbswitch.c index 29f59db2f4c..984e2801bc3 100644 --- a/base/applications/kbswitch/kbswitch.c +++ b/base/applications/kbswitch/kbswitch.c @@ -8,6 +8,8 @@ */ #include "kbswitch.h" +#include <shlobj.h> +#include <shlwapi_undoc.h> #include <imm.h> /* @@ -96,11 +98,10 @@ static BOOL GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) { HKEY hKey; + HRESULT hr; DWORD dwBufLen; - TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH]; + TCHAR szBuf[MAX_PATH]; TCHAR szLCID[CCH_LAYOUT_ID + 1]; - HANDLE hLib; - UINT i, j, k; if (!GetLayoutID(szLayoutNum, szLCID, ARRAYSIZE(szLCID))) return FALSE; @@ -109,50 +110,14 @@ GetLayoutName(LPCTSTR szLayoutNum, LPTSTR szName, SIZE_T NameLength) _T("SYSTEM\\CurrentControlSet\\Control\\Keyboard Layouts\\%s"), szLCID); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBuf, 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) - { return FALSE; - } /* Use "Layout Display Name" value as an entry name if possible */ - dwBufLen = sizeof(szDispName); - if (RegQueryValueEx(hKey, _T("Layout Display Name"), NULL, NULL, - (LPBYTE)szDispName, &dwBufLen) == ERROR_SUCCESS) + hr = SHLoadRegUIString(hKey, _T("Layout Display Name"), szName, NameLength); + if (SUCCEEDED(hr)) { - /* FIXME: Use shlwapi!SHLoadRegUIStringW instead if it was implemented */ - if (szDispName[0] == '@') - { - size_t len = _tcslen(szDispName); - - for (i = 0; i < len; i++) - { - if ((szDispName[i] == ',') && (szDispName[i + 1] == '-')) - { - for (j = i + 2, k = 0; j < _tcslen(szDispName)+1; j++, k++) - { - szIndex[k] = szDispName[j]; - } - szDispName[i - 1] = '\0'; - break; - } - else szDispName[i] = szDispName[i + 1]; - } - - if (ExpandEnvironmentStrings(szDispName, szPath, ARRAYSIZE(szPath))) - { - hLib = LoadLibrary(szPath); - if (hLib) - { - if (LoadString(hLib, _ttoi(szIndex), szPath, ARRAYSIZE(szPath))) - { - StringCchCopy(szName, NameLength, szPath); - RegCloseKey(hKey); - FreeLibrary(hLib); - return TRUE; - } - FreeLibrary(hLib); - } - } - } + RegCloseKey(hKey); + return TRUE; } /* Otherwise, use "Layout Text" value as an entry name */

1 0

[reactos] 01/01: [INPUT] Remove fake SHLoadRegUIStringW hack (#5258)
by Katayama Hirofumi MZ 30 Apr '23

30 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eda556c645205795445f… commit 7eda556c645205795445ff2794f1bdf508cb8e73 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Apr 29 07:27:54 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Apr 29 07:27:54 2023 +0900 [INPUT] Remove fake SHLoadRegUIStringW hack (#5258) Because shlwapi!SHLoadRegUIStringW function is already implemented, so we don't need the hack any more. CORE-11700 --- dll/cpl/input/layout_list.c | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/dll/cpl/input/layout_list.c b/dll/cpl/input/layout_list.c index 9d6622312ee..d3661a98f54 100644 --- a/dll/cpl/input/layout_list.c +++ b/dll/cpl/input/layout_list.c @@ -87,51 +87,8 @@ LayoutList_Destroy(VOID) typedef HRESULT (WINAPI *FN_SHLoadRegUIStringW)(HKEY, LPCWSTR, LPWSTR, DWORD); -/* FIXME: Use shlwapi!SHLoadRegUIStringW instead when it is fully implemented */ HRESULT FakeSHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) { -#if 1 - PWCHAR pBuffer, pIndex; - WCHAR szDllPath[MAX_PATH]; - DWORD dwSize; - HINSTANCE hDllInst; - INT iIndex, iLength; - - dwSize = size * sizeof(WCHAR); - if (RegQueryValueExW(hkey, value, NULL, NULL, (LPBYTE)buf, &dwSize) != ERROR_SUCCESS) - return E_FAIL; - - if (buf[0] != L'@') - return S_OK; - - /* Move to the position after the character "@" */ - pBuffer = buf + 1; - - /* Get a pointer to the beginning ",-" */ - pIndex = wcsstr(pBuffer, L",-"); - if (!pIndex) - return E_FAIL; - - /* Convert the number in the string after the ",-" */ - iIndex = _wtoi(pIndex + 2); - - *pIndex = 0; /* Cut the string */ - - if (ExpandEnvironmentStringsW(pBuffer, szDllPath, ARRAYSIZE(szDllPath)) == 0) - return E_FAIL; - - hDllInst = LoadLibraryW(szDllPath); - if (!hDllInst) - return E_FAIL; - - iLength = LoadStringW(hDllInst, iIndex, buf, size); - FreeLibrary(hDllInst); - - if (iLength <= 0) - return E_FAIL; - - return S_OK; -#else HRESULT hr = E_FAIL; HINSTANCE hSHLWAPI = LoadLibraryW(L"shlwapi"); FN_SHLoadRegUIStringW fn; @@ -140,7 +97,6 @@ HRESULT FakeSHLoadRegUIStringW(HKEY hkey, LPCWSTR value, LPWSTR buf, DWORD size) hr = fn(hkey, value, buf, size); FreeLibrary(hSHLWAPI); return hr; -#endif } static BOOL

1 0

[reactos] 01/01: [EXT2FS] Align with upstream and mark ReactOS diff (#5245)
by Vincent Franchomme 30 Apr '23

30 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aaeb131bd4e156effb5d5… commit aaeb131bd4e156effb5d58246187cd18eedb4519 Author: Vincent Franchomme <franchomme.vincent(a)gmail.com> AuthorDate: Sun Apr 30 18:26:30 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 30 18:26:30 2023 +0200 [EXT2FS] Align with upstream and mark ReactOS diff (#5245) NOTE: There are no new features in this PR, we stay with upstream version 0.69. CORE-18645 - Add ifdefs to distinguish ReactOS code/fixes from the upstream code; - If upstream code was overriden, reintroduce it in #else section; - Re-align .rc version info with upstream (0.69). --- drivers/filesystems/ext2/inc/common.h | 5 + drivers/filesystems/ext2/inc/ext2fs.h | 160 +++++++++++++++++++++-- drivers/filesystems/ext2/inc/linux/module.h | 12 +- drivers/filesystems/ext2/inc/linux/types.h | 4 + drivers/filesystems/ext2/src/block.c | 24 ++++ drivers/filesystems/ext2/src/cmcb.c | 24 ++++ drivers/filesystems/ext2/src/devctl.c | 24 ++++ drivers/filesystems/ext2/src/dispatch.c | 16 +++ drivers/filesystems/ext2/src/ext2.rc | 16 +-- drivers/filesystems/ext2/src/ext3/generic.c | 74 +++++++++++ drivers/filesystems/ext2/src/ext3/indirect.c | 28 ++++ drivers/filesystems/ext2/src/ext4/ext4_extents.c | 23 +++- drivers/filesystems/ext2/src/ext4/ext4_jbd2.c | 4 + drivers/filesystems/ext2/src/fastio.c | 68 ++++++++++ drivers/filesystems/ext2/src/fileinfo.c | 7 +- drivers/filesystems/ext2/src/flush.c | 4 + drivers/filesystems/ext2/src/init.c | 17 ++- drivers/filesystems/ext2/src/linux.c | 8 ++ drivers/filesystems/ext2/src/memory.c | 28 ++++ drivers/filesystems/ext2/src/pnp.c | 8 ++ drivers/filesystems/ext2/src/write.c | 16 +++ 21 files changed, 542 insertions(+), 28 deletions(-) diff --git a/drivers/filesystems/ext2/inc/common.h b/drivers/filesystems/ext2/inc/common.h index 78ec730aab0..3fd4eff4a38 100644 --- a/drivers/filesystems/ext2/inc/common.h +++ b/drivers/filesystems/ext2/inc/common.h @@ -196,8 +196,13 @@ typedef struct _EXT2_VOLUME_PROPERTY2 { } EXT2_VOLUME_PROPERTY2, *PEXT2_VOLUME_PROPERTY2; +#ifdef __REACTOS__ #define EXT2_VPROP3_AUTOMOUNT (1ULL << 0) #define EXT2_VPROP3_USERIDS (1ULL << 1) +#else +#define EXT2_VPROP3_AUTOMOUNT (1ui64 << 0) +#define EXT2_VPROP3_USERIDS (1ui64 << 1) +#endif #ifdef __cplusplus typedef struct _EXT2_VOLUME_PROPERTY3:EXT2_VOLUME_PROPERTY2 { diff --git a/drivers/filesystems/ext2/inc/ext2fs.h b/drivers/filesystems/ext2/inc/ext2fs.h index 3cf098635dc..fd5b62be609 100644 --- a/drivers/filesystems/ext2/inc/ext2fs.h +++ b/drivers/filesystems/ext2/inc/ext2fs.h @@ -223,8 +223,13 @@ _InterlockedXor ( #if EXT2_DEBUG +#ifdef __REACTOS__ #define SetLongFlag(_F,_SF) Ext2SetFlag((PULONG)&(_F), (ULONG)(_SF)) #define ClearLongFlag(_F,_SF) Ext2ClearFlag((PULONG)&(_F), (ULONG)(_SF)) +#else +#define SetLongFlag(_F,_SF) Ext2SetFlag(&(_F), (ULONG)(_SF)) +#define ClearLongFlag(_F,_SF) Ext2ClearFlag(&(_F), (ULONG)(_SF)) +#endif #ifdef __REACTOS__ static @@ -489,7 +494,11 @@ typedef PVOID PBCB; // Data that is not specific to a mounted volume // +#ifdef __REACTOS__ typedef VOID (NTAPI *EXT2_REAPER_RELEASE)(PVOID); +#else +typedef VOID (*EXT2_REAPER_RELEASE)(PVOID); +#endif typedef struct _EXT2_REAPER { PETHREAD Thread; @@ -1276,34 +1285,62 @@ Ext2Close (IN PEXT2_IRP_CONTEXT IrpContext); VOID Ext2QueueCloseRequest (IN PEXT2_IRP_CONTEXT IrpContext); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2DeQueueCloseRequest (IN PVOID Context); // // Cmcb.c // +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2AcquireForLazyWrite ( IN PVOID Context, IN BOOLEAN Wait ); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2ReleaseFromLazyWrite (IN PVOID Context); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2AcquireForReadAhead ( IN PVOID Context, IN BOOLEAN Wait ); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2ReleaseFromReadAhead (IN PVOID Context); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2NoOpAcquire ( IN PVOID Fcb, IN BOOLEAN Wait ); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2NoOpRelease (IN PVOID Fcb); // @@ -1589,13 +1626,21 @@ Ext2IsDirectoryEmpty ( // Dispatch.c // +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2OplockComplete ( IN PVOID Context, IN PIRP Irp ); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2LockIrp ( IN PVOID Context, IN PIRP Irp @@ -1604,13 +1649,21 @@ Ext2LockIrp ( NTSTATUS Ext2QueueRequest (IN PEXT2_IRP_CONTEXT IrpContext); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2DeQueueRequest (IN PVOID Context); NTSTATUS Ext2DispatchRequest (IN PEXT2_IRP_CONTEXT IrpContext); +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2BuildRequest ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -2062,7 +2115,11 @@ Ext2IsFastIoPossible( IN PEXT2_FCB Fcb ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoCheckIfPossible ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -2075,7 +2132,11 @@ Ext2FastIoCheckIfPossible ( ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoRead (IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -2085,7 +2146,11 @@ Ext2FastIoRead (IN PFILE_OBJECT FileObject, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -2096,7 +2161,11 @@ Ext2FastIoWrite ( OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryBasicInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -2104,7 +2173,11 @@ Ext2FastIoQueryBasicInfo ( OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryStandardInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -2112,7 +2185,11 @@ Ext2FastIoQueryStandardInfo ( OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoLock ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -2125,7 +2202,11 @@ Ext2FastIoLock ( IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoUnlockSingle ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -2136,7 +2217,11 @@ Ext2FastIoUnlockSingle ( IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoUnlockAll ( IN PFILE_OBJECT FileObject, IN PEPROCESS Process, @@ -2144,7 +2229,11 @@ Ext2FastIoUnlockAll ( IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoUnlockAllByKey ( IN PFILE_OBJECT FileObject, #ifdef __REACTOS__ @@ -2158,7 +2247,11 @@ Ext2FastIoUnlockAllByKey ( ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryNetworkOpenInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -2166,7 +2259,11 @@ Ext2FastIoQueryNetworkOpenInfo ( OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryNetworkOpenInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -2174,20 +2271,29 @@ Ext2FastIoQueryNetworkOpenInfo ( OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject); +#ifdef __REACTOS__ +VOID NTAPI +#else VOID -NTAPI +#endif Ext2AcquireForCreateSection ( IN PFILE_OBJECT FileObject ); +#ifdef __REACTOS__ +VOID NTAPI +#else VOID -NTAPI +#endif Ext2ReleaseForCreateSection ( IN PFILE_OBJECT FileObject ); +#ifdef __REACTOS__ +NTSTATUS NTAPI +#else NTSTATUS -NTAPI +#endif Ext2AcquireFileForModWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, @@ -2195,31 +2301,43 @@ Ext2AcquireFileForModWrite ( IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ +NTSTATUS NTAPI +#else NTSTATUS -NTAPI +#endif Ext2ReleaseFileForModWrite ( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ +NTSTATUS NTAPI +#else NTSTATUS -NTAPI +#endif Ext2AcquireFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ +NTSTATUS NTAPI +#else NTSTATUS -NTAPI +#endif Ext2ReleaseFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject ); +#ifdef __REACTOS__ +NTSTATUS NTAPI +#else NTSTATUS -NTAPI +#endif Ext2PreAcquireForCreateSection( IN PFS_FILTER_CALLBACK_DATA cd, OUT PVOID *cc @@ -2521,7 +2639,11 @@ Ext2QueryGlobalParameters(IN PUNICODE_STRING RegistryPath); BOOLEAN Ext2QueryRegistrySettings(IN PUNICODE_STRING RegistryPath); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif DriverUnload (IN PDRIVER_OBJECT DriverObject); // @@ -2581,20 +2703,29 @@ Ext2LockControl (IN PEXT2_IRP_CONTEXT IrpContext); // Memory.c // +#ifdef __REACTOS__ +VOID NTAPI +#else VOID -NTAPI +#endif Ext2FcbReaperThread( PVOID Context ); +#ifdef __REACTOS__ +VOID NTAPI +#else VOID -NTAPI +#endif Ext2McbReaperThread( PVOID Context ); +#ifdef __REACTOS__ +VOID NTAPI +#else VOID -NTAPI +#endif Ext2bhReaperThread( PVOID Context ); @@ -2900,15 +3031,22 @@ Ext2FirstUnusedMcb( ULONG Number ); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2ReaperThread( PVOID Context ); NTSTATUS Ext2StartReaper(PEXT2_REAPER, EXT2_REAPER_RELEASE); +#ifdef __REACTOS__ +VOID NTAPI +#else VOID -NTAPI +#endif Ext2StopReaper(PEXT2_REAPER Reaper); // diff --git a/drivers/filesystems/ext2/inc/linux/module.h b/drivers/filesystems/ext2/inc/linux/module.h index f16b8b7bb23..ef80e4072a7 100644 --- a/drivers/filesystems/ext2/inc/linux/module.h +++ b/drivers/filesystems/ext2/inc/linux/module.h @@ -59,7 +59,8 @@ extern "C" { #define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) #define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) -#elif !defined(__REACTOS__) +#else +#ifndef __REACTOS__ USHORT FASTCALL @@ -78,6 +79,7 @@ FASTCALL RtlUlonglongByteSwap( IN ULONGLONG Source ); +#endif //#ifndef __REACTOS__ #endif #define __swab16(x) RtlUshortByteSwap(x) @@ -429,10 +431,18 @@ extern struct task_struct *current; // +#ifdef __REACTOS__ static inline int cond_resched() { +#else +static inline cond_resched() { +#endif return FALSE; } +#ifdef __REACTOS__ static inline int need_resched() { +#else +static inline need_resched() { +#endif return FALSE; } diff --git a/drivers/filesystems/ext2/inc/linux/types.h b/drivers/filesystems/ext2/inc/linux/types.h index 32bd1c6a518..ef6156c0492 100644 --- a/drivers/filesystems/ext2/inc/linux/types.h +++ b/drivers/filesystems/ext2/inc/linux/types.h @@ -27,14 +27,18 @@ typedef signed __int64 __s64; typedef unsigned __int64 __u64; +#ifdef __REACTOS__ typedef __s8 s8; typedef __u8 u8; +#endif +#if defined(_MSC_VER) || defined(__REACTOS__) typedef __s16 s16; typedef __u16 u16; typedef __s32 s32; typedef __u32 u32; typedef __s64 s64; typedef __u64 u64; +#endif #define __le16 u16 #define __le32 u32 diff --git a/drivers/filesystems/ext2/src/block.c b/drivers/filesystems/ext2/src/block.c index bddb55e8eee..0ae933b0b93 100644 --- a/drivers/filesystems/ext2/src/block.c +++ b/drivers/filesystems/ext2/src/block.c @@ -17,20 +17,32 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2ReadWriteBlockSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context ); +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2ReadWriteBlockAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context ); +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2MediaEjectControlCompletion ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -148,7 +160,11 @@ Ext2GetUserBuffer (IN PIRP Irp ) } } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2ReadWriteBlockSyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -181,7 +197,11 @@ Ext2ReadWriteBlockSyncCompletionRoutine ( return STATUS_MORE_PROCESSING_REQUIRED; } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2ReadWriteBlockAsyncCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -641,7 +661,11 @@ Ext2DiskIoControl ( } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2MediaEjectControlCompletion ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, diff --git a/drivers/filesystems/ext2/src/cmcb.c b/drivers/filesystems/ext2/src/cmcb.c index 2c0d1874049..1d82d022f03 100644 --- a/drivers/filesystems/ext2/src/cmcb.c +++ b/drivers/filesystems/ext2/src/cmcb.c @@ -19,7 +19,11 @@ extern PEXT2_GLOBAL Ext2Global; #define CMCB_DEBUG_LEVEL DL_NVR +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2AcquireForLazyWrite ( IN PVOID Context, IN BOOLEAN Wait) @@ -51,7 +55,11 @@ Ext2AcquireForLazyWrite ( return TRUE; } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2ReleaseFromLazyWrite (IN PVOID Context) { // @@ -76,7 +84,11 @@ Ext2ReleaseFromLazyWrite (IN PVOID Context) IoSetTopLevelIrp( NULL ); } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2AcquireForReadAhead (IN PVOID Context, IN BOOLEAN Wait) { @@ -97,7 +109,11 @@ Ext2AcquireForReadAhead (IN PVOID Context, return TRUE; } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2ReleaseFromReadAhead (IN PVOID Context) { PEXT2_FCB Fcb = (PEXT2_FCB) Context; @@ -114,7 +130,11 @@ Ext2ReleaseFromReadAhead (IN PVOID Context) ExReleaseResourceLite(Fcb->Header.Resource); } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2NoOpAcquire ( IN PVOID Fcb, IN BOOLEAN Wait @@ -125,7 +145,11 @@ Ext2NoOpAcquire ( return TRUE; } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2NoOpRelease ( IN PVOID Fcb ) diff --git a/drivers/filesystems/ext2/src/devctl.c b/drivers/filesystems/ext2/src/devctl.c index 1114989db02..d986d07bc09 100644 --- a/drivers/filesystems/ext2/src/devctl.c +++ b/drivers/filesystems/ext2/src/devctl.c @@ -17,7 +17,11 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2DeviceControlCompletion ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -38,7 +42,11 @@ Ext2DeviceControlCompletion ( #endif +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2DeviceControlCompletion ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -426,14 +434,22 @@ Ext2ProcessVolumeProperty( case APP_CMD_SET_PROPERTY2: RtlZeroMemory(Vcb->sHidingPrefix, HIDINGPAT_LEN); +#ifdef __REACTOS__ if (Vcb->bHidingPrefix == Property2->bHidingPrefix) { +#else + if (Vcb->bHidingPrefix = Property2->bHidingPrefix) { +#endif RtlCopyMemory( Vcb->sHidingPrefix, Property2->sHidingPrefix, HIDINGPAT_LEN - 1); } RtlZeroMemory(Vcb->sHidingSuffix, HIDINGPAT_LEN); +#ifdef __REACTOS__ if (Vcb->bHidingSuffix == Property2->bHidingSuffix) { +#else + if (Vcb->bHidingSuffix = Property2->bHidingSuffix) { +#endif RtlCopyMemory( Vcb->sHidingSuffix, Property2->sHidingSuffix, HIDINGPAT_LEN - 1); @@ -511,7 +527,11 @@ Ext2ProcessVolumeProperty( RtlCopyMemory(Property2->UUID, Vcb->SuperBlock->s_uuid, 16); Property2->DrvLetter = Vcb->DrvLetter; +#ifdef __REACTOS__ if (Property2->bHidingPrefix == Vcb->bHidingPrefix) { +#else + if (Property2->bHidingPrefix = Vcb->bHidingPrefix) { +#endif RtlCopyMemory( Property2->sHidingPrefix, Vcb->sHidingPrefix, HIDINGPAT_LEN); @@ -520,7 +540,11 @@ Ext2ProcessVolumeProperty( HIDINGPAT_LEN); } +#ifdef __REACTOS__ if (Property2->bHidingSuffix == Vcb->bHidingSuffix) { +#else + if (Property2->bHidingSuffix = Vcb->bHidingSuffix) { +#endif RtlCopyMemory( Property2->sHidingSuffix, Vcb->sHidingSuffix, HIDINGPAT_LEN); diff --git a/drivers/filesystems/ext2/src/dispatch.c b/drivers/filesystems/ext2/src/dispatch.c index 5b278714b41..8246e32718f 100644 --- a/drivers/filesystems/ext2/src/dispatch.c +++ b/drivers/filesystems/ext2/src/dispatch.c @@ -37,7 +37,11 @@ extern PEXT2_GLOBAL Ext2Global; * N/A */ +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2OplockComplete ( IN PVOID Context, IN PIRP Irp @@ -82,7 +86,11 @@ Ext2OplockComplete ( * N/A */ +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2LockIrp ( IN PVOID Context, IN PIRP Irp @@ -174,7 +182,11 @@ Ext2QueueRequest (IN PEXT2_IRP_CONTEXT IrpContext) } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2DeQueueRequest (IN PVOID Context) { PEXT2_IRP_CONTEXT IrpContext; @@ -288,7 +300,11 @@ Ext2DispatchRequest (IN PEXT2_IRP_CONTEXT IrpContext) } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2BuildRequest (PDEVICE_OBJECT DeviceObject, PIRP Irp) { BOOLEAN AtIrqlPassiveLevel = FALSE; diff --git a/drivers/filesystems/ext2/src/ext2.rc b/drivers/filesystems/ext2/src/ext2.rc index 3e53be1f80e..8cbe4bcc206 100644 --- a/drivers/filesystems/ext2/src/ext2.rc +++ b/drivers/filesystems/ext2/src/ext2.rc @@ -62,8 +62,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,6,2,0 - PRODUCTVERSION 0,6,2,0 + FILEVERSION 0,69,11,1 + PRODUCTVERSION 0,69,11,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x29L @@ -79,16 +79,16 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "Comments", "Ext2 File System Driver\0" - VALUE "CompanyName", "Purayidathil\0" - VALUE "FileDescription", "Ext2 File System Driver\0" - VALUE "FileVersion", "0, 6, 2, 0\0" + VALUE "CompanyName", "www.ext2fsd.com\0" + VALUE "FileDescription", "Ext2 File System Driver for Windows\0" + VALUE "FileVersion", "0.69.11.1\0" VALUE "InternalName", "ext2fs.sys\0" - VALUE "LegalCopyright", "Copyright © 2015 Matt Wu\0" + VALUE "LegalCopyright", "GPLv2\0" VALUE "LegalTrademarks", " - \0" VALUE "OriginalFilename", "ext2fs.sys\0" VALUE "PrivateBuild", " - \0" - VALUE "ProductName", "Ext2 File System Driver for Windows\0" - VALUE "ProductVersion", "0, 6, 2, 0\0" + VALUE "ProductName", "Ext2 File System Driver\0" + VALUE "ProductVersion", "0.69.11.1\0" VALUE "SpecialBuild", " - \0" END END diff --git a/drivers/filesystems/ext2/src/ext3/generic.c b/drivers/filesystems/ext2/src/ext3/generic.c index 0140e930860..34d824d2cec 100644 --- a/drivers/filesystems/ext2/src/ext3/generic.c +++ b/drivers/filesystems/ext2/src/ext3/generic.c @@ -10,7 +10,11 @@ /* INCLUDES *****************************************************************/ #include "ext2fs.h" +#ifdef __REACTOS__ #include "linux/ext4.h" +#else +#include "linux\ext4.h" +#endif /* GLOBALS ***************************************************************/ @@ -858,6 +862,7 @@ Ext2ZeroBuffer( IN PEXT2_IRP_CONTEXT IrpContext, } +#ifdef __REACTOS__ #define SIZE_256K 0x40000 BOOLEAN @@ -917,6 +922,75 @@ Ext2SaveBuffer( IN PEXT2_IRP_CONTEXT IrpContext, return rc; } +#else + +BOOLEAN +Ext2SaveBuffer( IN PEXT2_IRP_CONTEXT IrpContext, + IN PEXT2_VCB Vcb, + IN LONGLONG offset, + IN ULONG size, + IN PVOID buf ) +{ + struct buffer_head *bh = NULL; + BOOLEAN rc = 0; + + __try { + + while (size) { + + sector_t block; + ULONG len = 0, delta = 0; + + block = (sector_t) (offset >> BLOCK_BITS); + delta = (ULONG)offset & (BLOCK_SIZE - 1); + len = BLOCK_SIZE - delta; + if (size < len) + len = size; + + if (delta == 0 && len >= BLOCK_SIZE) { + bh = sb_getblk_zero(&Vcb->sb, block); + } else { + bh = sb_getblk(&Vcb->sb, block); + } + + if (!bh) { + DEBUG(DL_ERR, ("Ext2SaveBuffer: can't load block %I64u\n", block)); + DbgBreak(); + __leave; + } + + if (!buffer_uptodate(bh)) { + int err = bh_submit_read(bh); + if (err < 0) { + DEBUG(DL_ERR, ("Ext2SaveBuffer: bh_submit_read failed: %d\n", err)); + __leave; + } + } + + __try { + RtlCopyMemory(bh->b_data + delta, buf, len); + mark_buffer_dirty(bh); + } __finally { + fini_bh(&bh); + } + + buf = (PUCHAR)buf + len; + offset = offset + len; + size = size - len; + } + + rc = TRUE; + + } __finally { + + if (bh) + fini_bh(&bh); + + } + + return rc; +} +#endif VOID diff --git a/drivers/filesystems/ext2/src/ext3/indirect.c b/drivers/filesystems/ext2/src/ext3/indirect.c index f770c85cea7..f59d71cafa7 100644 --- a/drivers/filesystems/ext2/src/ext3/indirect.c +++ b/drivers/filesystems/ext2/src/ext3/indirect.c @@ -219,7 +219,11 @@ Ext2GetBlock( BLOCK_SIZE, PIN_WAIT, &Bcb, +#ifdef __REACTOS__ (void **)&pData )) { +#else + &pData )) { +#endif DEBUG(DL_ERR, ( "Ext2GetBlock: Failed to PinLock block: %xh ...\n", BlockArray[0] )); @@ -521,7 +525,11 @@ Ext2ExpandBlock( BLOCK_SIZE, PIN_WAIT, &Bcb, +#ifdef __REACTOS__ (void **)&pData )) { +#else + &pData )) { +#endif DEBUG(DL_ERR, ( "Ext2ExpandInode: failed to PinLock offset :%I64xh...\n", Offset.QuadPart)); @@ -726,7 +734,11 @@ Ext2TruncateBlock( BLOCK_SIZE, PIN_WAIT, &Bcb, +#ifdef __REACTOS__ (void **)&pData )) { +#else + &pData )) { +#endif DEBUG(DL_ERR, ( "Ext2TruncateBlock: PinLock failed on block %xh ...\n", BlockArray[SizeArray - i - 1])); @@ -906,7 +918,11 @@ Ext2MapIndirect( Layer, Index, dwArray, +#ifdef __REACTOS__ (PULONG)&Mcb->Inode.i_block[Slot], +#else + &Mcb->Inode.i_block[Slot], +#endif bAlloc, &dwHint, &dwRet, @@ -987,7 +1003,11 @@ Ext2ExpandIndirect( Layer, Start, (Layer == 0) ? (Vcb->max_blocks_per_layer[Layer] - Start) : 1, +#ifdef __REACTOS__ (PULONG)&Mcb->Inode.i_block[Slot], +#else + &Mcb->Inode.i_block[Slot], +#endif &Hint, &Extra ); @@ -1118,11 +1138,19 @@ Ext2TruncateIndirect( Base -= Vcb->max_blocks_per_layer[Layer - 1]; if (Layer - 1 == 0) { +#ifdef __REACTOS__ BlockArray = (PULONG)&Mcb->Inode.i_block[0]; +#else + BlockArray = &Mcb->Inode.i_block[0]; +#endif SizeArray = End; ASSERT(End == EXT2_NDIR_BLOCKS && Base == 0); } else { +#ifdef __REACTOS__ BlockArray = (PULONG)&Mcb->Inode.i_block[EXT2_NDIR_BLOCKS - 1 + Layer - 1]; +#else + BlockArray = &Mcb->Inode.i_block[EXT2_NDIR_BLOCKS - 1 + Layer - 1]; +#endif SizeArray = 1; } diff --git a/drivers/filesystems/ext2/src/ext4/ext4_extents.c b/drivers/filesystems/ext2/src/ext4/ext4_extents.c index 68743f0c182..b58278c7766 100644 --- a/drivers/filesystems/ext2/src/ext4/ext4_extents.c +++ b/drivers/filesystems/ext2/src/ext4/ext4_extents.c @@ -14,9 +14,13 @@ */ #include "ext2fs.h" -#include <linux/ext4.h> +#ifdef __REACTOS__ +#include "linux/ext4.h" +#else +#include "linux\ext4.h" +#endif -#ifdef _MSC_VER +#if defined(_MSC_VER) && defined(__REACTOS__) #pragma warning(push) #pragma warning(disable: 4018) #pragma warning(disable: 4242) @@ -83,10 +87,16 @@ static inline void ext_debug(char *str, ...) { } #if TRUE +#ifdef __REACTOS__ #define EXT4_ERROR_INODE(inode, str, ...) do { \ DbgPrint("inode[%p]: " str "\n", inode, ##__VA_ARGS__); \ } while(0) #else +#define EXT4_ERROR_INODE(inode, str, ...) do { \ + DbgPrint("inode[%p]: "##str "\n", inode, __VA_ARGS__); \ + } while(0) +#endif +#else #define EXT4_ERROR_INODE #endif @@ -395,6 +405,7 @@ static int __ext4_ext_check(const char *function, unsigned int line, #ifndef __REACTOS__ int max = 0; #endif + if (eh->eh_magic != EXT4_EXT_MAGIC) { error_msg = "invalid magic"; goto corrupted; @@ -2175,10 +2186,10 @@ fix_extent_len: /* * returns 1 if current index have to be freed (even partial) */ -#ifndef __REACTOS__ -static int inline -#else +#ifdef __REACTOS__ inline int +#else +static int inline #endif ext4_ext_more_to_rm(struct ext4_ext_path *path) { @@ -2517,7 +2528,7 @@ int ext4_ext_truncate(void *icb, struct inode *inode, unsigned long start) return ret; } -#ifdef _MSC_VER +#if defined(_MSC_VER) && defined(__REACTOS__) #pragma warning(pop) #endif diff --git a/drivers/filesystems/ext2/src/ext4/ext4_jbd2.c b/drivers/filesystems/ext2/src/ext4/ext4_jbd2.c index 86636905180..ddc425ceaf7 100644 --- a/drivers/filesystems/ext2/src/ext4/ext4_jbd2.c +++ b/drivers/filesystems/ext2/src/ext4/ext4_jbd2.c @@ -1,5 +1,9 @@ #include "ext2fs.h" +#ifdef __REACTOS__ #include "linux/ext4.h" +#else +#include "linux\ext4.h" +#endif static handle_t no_journal; diff --git a/drivers/filesystems/ext2/src/fastio.c b/drivers/filesystems/ext2/src/fastio.c index ea62543bfe0..2eefedabe76 100644 --- a/drivers/filesystems/ext2/src/fastio.c +++ b/drivers/filesystems/ext2/src/fastio.c @@ -56,7 +56,11 @@ Ext2IsFastIoPossible( } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoCheckIfPossible ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -160,7 +164,11 @@ Ext2FastIoCheckIfPossible ( } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoRead (IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, @@ -191,7 +199,11 @@ Ext2FastIoRead (IN PFILE_OBJECT FileObject, return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -260,7 +272,11 @@ Ext2FastIoWrite ( return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryBasicInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -372,7 +388,11 @@ Ext2FastIoQueryBasicInfo ( return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryStandardInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -489,7 +509,11 @@ Ext2FastIoQueryStandardInfo ( return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoLock ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -597,7 +621,11 @@ Ext2FastIoLock ( return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoUnlockSingle ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -700,7 +728,11 @@ Ext2FastIoUnlockSingle ( return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoUnlockAll ( IN PFILE_OBJECT FileObject, IN PEPROCESS Process, @@ -791,7 +823,11 @@ Ext2FastIoUnlockAll ( return Status; } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoUnlockAllByKey ( IN PFILE_OBJECT FileObject, #ifdef __REACTOS__ @@ -898,7 +934,11 @@ Ext2FastIoUnlockAllByKey ( } +#ifdef __REACTOS__ BOOLEAN NTAPI +#else +BOOLEAN +#endif Ext2FastIoQueryNetworkOpenInfo ( IN PFILE_OBJECT FileObject, IN BOOLEAN Wait, @@ -995,7 +1035,11 @@ Ext2FastIoQueryNetworkOpenInfo ( } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2AcquireForCreateSection ( IN PFILE_OBJECT FileObject ) @@ -1010,7 +1054,11 @@ Ext2AcquireForCreateSection ( DEBUG(FASTIO_DEBUG_LEVEL, ("Ext2AcquireForCreateSection: Fcb=%p\n", Fcb)); } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2ReleaseForCreateSection ( IN PFILE_OBJECT FileObject ) @@ -1025,7 +1073,11 @@ Ext2ReleaseForCreateSection ( } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2AcquireFileForModWrite ( IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER EndingOffset, @@ -1050,7 +1102,11 @@ Ext2AcquireFileForModWrite ( return (ResourceAcquired ? STATUS_SUCCESS : STATUS_CANT_WAIT); } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2ReleaseFileForModWrite ( IN PFILE_OBJECT FileObject, IN PERESOURCE ResourceToRelease, @@ -1071,7 +1127,11 @@ Ext2ReleaseFileForModWrite ( return STATUS_SUCCESS; } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2AcquireFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject @@ -1088,7 +1148,11 @@ Ext2AcquireFileForCcFlush ( return STATUS_SUCCESS; } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2ReleaseFileForCcFlush ( IN PFILE_OBJECT FileObject, IN PDEVICE_OBJECT DeviceObject @@ -1106,7 +1170,11 @@ Ext2ReleaseFileForCcFlush ( } +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2PreAcquireForCreateSection( IN PFS_FILTER_CALLBACK_DATA cd, OUT PVOID *cc diff --git a/drivers/filesystems/ext2/src/fileinfo.c b/drivers/filesystems/ext2/src/fileinfo.c index 61ee0c8ef8c..5871fd19fb6 100644 --- a/drivers/filesystems/ext2/src/fileinfo.c +++ b/drivers/filesystems/ext2/src/fileinfo.c @@ -10,8 +10,13 @@ /* INCLUDES *****************************************************************/ #include "ext2fs.h" -#include <linux/ext4.h> +#ifdef __REACTOS__ +#include "linux/ext4.h" #include "linux/ext4_xattr.h" +#else +#include "linux\ext4.h" +#include "linux\ext4_xattr.h" +#endif /* GLOBALS ***************************************************************/ diff --git a/drivers/filesystems/ext2/src/flush.c b/drivers/filesystems/ext2/src/flush.c index c3e3dcd1625..2172c0a5756 100644 --- a/drivers/filesystems/ext2/src/flush.c +++ b/drivers/filesystems/ext2/src/flush.c @@ -18,7 +18,11 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2FlushCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, diff --git a/drivers/filesystems/ext2/src/init.c b/drivers/filesystems/ext2/src/init.c index 4e968de423e..6c657d69917 100644 --- a/drivers/filesystems/ext2/src/init.c +++ b/drivers/filesystems/ext2/src/init.c @@ -26,7 +26,11 @@ CHAR gDate[] = __DATE__; /* DEFINITIONS ***********************************************************/ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); @@ -53,8 +57,11 @@ DECLARE_EXIT(journal_exit); * DriverObject = object describing this driver * RETURNS: None */ - +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif DriverUnload (IN PDRIVER_OBJECT DriverObject) { @@ -100,7 +107,11 @@ DriverUnload (IN PDRIVER_OBJECT DriverObject) #endif +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2RegistryQueryCallback( IN PWSTR ValueName, IN ULONG ValueType, @@ -449,7 +460,11 @@ Ext2EresourceAlignmentChecking() * RegistryPath = path to our configuration entries * RETURNS: Success or failure */ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif DriverEntry ( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath diff --git a/drivers/filesystems/ext2/src/linux.c b/drivers/filesystems/ext2/src/linux.c index 85975c3515e..a7e6a795831 100644 --- a/drivers/filesystems/ext2/src/linux.c +++ b/drivers/filesystems/ext2/src/linux.c @@ -664,7 +664,11 @@ again: FALSE, PIN_WAIT, &bh->b_bcb, +#ifdef __REACTOS__ (PVOID *)&bh->b_data)) { +#else + &bh->b_data)) { +#endif Ext2Sleep(100); goto again; } @@ -674,7 +678,11 @@ again: bh->b_size, PIN_WAIT, &bh->b_bcb, +#ifdef __REACTOS__ (PVOID *)&bh->b_data)) { +#else + &bh->b_data)) { +#endif Ext2Sleep(100); goto again; } diff --git a/drivers/filesystems/ext2/src/memory.c b/drivers/filesystems/ext2/src/memory.c index 26d342e1b0a..4cce98a222b 100644 --- a/drivers/filesystems/ext2/src/memory.c +++ b/drivers/filesystems/ext2/src/memory.c @@ -1819,7 +1819,11 @@ Ext2CleanupAllMcbs(PEXT2_VCB Vcb) TRUE ); LockAcquired = TRUE; +#ifdef __REACTOS__ while ((Mcb = Ext2FirstUnusedMcb(Vcb, TRUE, Vcb->NumOfMcb)) != 0) { +#else + while (Mcb = Ext2FirstUnusedMcb(Vcb, TRUE, Vcb->NumOfMcb)) { +#endif while (Mcb) { PEXT2_MCB Next = Mcb->Next; if (IsMcbSymLink(Mcb)) { @@ -2209,7 +2213,11 @@ Ext2PerformRegistryVolumeParams(IN PEXT2_VCB Vcb) memcpy(Vcb->Codepage.AnsiName, Ext2Global->Codepage.AnsiName, CODEPAGE_MAXLEN); Vcb->Codepage.PageTable = Ext2Global->Codepage.PageTable; +#ifdef __REACTOS__ if (Vcb->bHidingPrefix == Ext2Global->bHidingPrefix) { +#else + if (Vcb->bHidingPrefix = Ext2Global->bHidingPrefix) { +#endif RtlCopyMemory( Vcb->sHidingPrefix, Ext2Global->sHidingPrefix, HIDINGPAT_LEN); @@ -2218,7 +2226,11 @@ Ext2PerformRegistryVolumeParams(IN PEXT2_VCB Vcb) HIDINGPAT_LEN); } +#ifdef __REACTOS__ if (Vcb->bHidingSuffix == Ext2Global->bHidingSuffix) { +#else + if (Vcb->bHidingSuffix = Ext2Global->bHidingSuffix) { +#endif RtlCopyMemory( Vcb->sHidingSuffix, Ext2Global->sHidingSuffix, HIDINGPAT_LEN); @@ -3035,7 +3047,11 @@ Ext2FirstUnusedMcb(PEXT2_VCB Vcb, BOOLEAN Wait, ULONG Number) /* Reaper thread to release unused Mcb blocks */ +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2McbReaperThread( PVOID Context ) @@ -3215,7 +3231,11 @@ Ext2QueryUnusedBH(PEXT2_VCB Vcb, PLIST_ENTRY head) /* Reaper thread to release unused buffer heads */ +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2bhReaperThread( PVOID Context ) @@ -3363,7 +3383,11 @@ again: } /* Reaper thread to release Fcb */ +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2FcbReaperThread( PVOID Context ) @@ -3514,7 +3538,11 @@ Ext2StartReaper(PEXT2_REAPER Reaper, EXT2_REAPER_RELEASE Free) } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2StopReaper(PEXT2_REAPER Reaper) { LARGE_INTEGER timeout; diff --git a/drivers/filesystems/ext2/src/pnp.c b/drivers/filesystems/ext2/src/pnp.c index 1afb9f9b1e9..1297e7eeca7 100644 --- a/drivers/filesystems/ext2/src/pnp.c +++ b/drivers/filesystems/ext2/src/pnp.c @@ -19,7 +19,11 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2PnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -38,7 +42,11 @@ Ext2PnpCompletionRoutine ( /* FUNCTIONS *************************************************************/ +#ifdef __REACTOS__ NTSTATUS NTAPI +#else +NTSTATUS +#endif Ext2PnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, diff --git a/drivers/filesystems/ext2/src/write.c b/drivers/filesystems/ext2/src/write.c index 08b74c4fcdf..6c39459cfcb 100644 --- a/drivers/filesystems/ext2/src/write.c +++ b/drivers/filesystems/ext2/src/write.c @@ -33,10 +33,18 @@ typedef struct _EXT2_FLPFLUSH_CONTEXT { } EXT2_FLPFLUSH_CONTEXT, *PEXT2_FLPFLUSH_CONTEXT; +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2FloppyFlush(IN PVOID Parameter); +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2FloppyFlushDpc ( IN PKDPC Dpc, IN PVOID DeferredContext, @@ -59,7 +67,11 @@ Ext2DeferWrite(IN PEXT2_IRP_CONTEXT, PIRP Irp); /* FUNCTIONS *************************************************************/ +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2FloppyFlush(IN PVOID Parameter) { PEXT2_FLPFLUSH_CONTEXT Context; @@ -102,7 +114,11 @@ Ext2FloppyFlush(IN PVOID Parameter) Ext2FreePool(Parameter, EXT2_FLPFLUSH_MAGIC); } +#ifdef __REACTOS__ VOID NTAPI +#else +VOID +#endif Ext2FloppyFlushDpc ( IN PKDPC Dpc, IN PVOID DeferredContext,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs