Ros-diffs March 2025

ros-diffs@reactos.org

15 participants
66 discussions

[reactos] 01/01: [FREELDR] Fix menu display on VMware

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a093ecbe93a49ceb86d7… commit 9a093ecbe93a49ceb86d7599480f6f9f32077823 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Mar 3 13:06:23 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Mar 18 00:36:40 2025 +0200 [FREELDR] Fix menu display on VMware When drawing the menu, the boot options should not be overwritten, but when clearing the screen, everything needs to be drawn, otherwise there will be uninitialized characters at the bottom. See CORE-20014. --- boot/freeldr/freeldr/bootmgr.c | 4 ++-- boot/freeldr/freeldr/include/ui.h | 4 ++-- boot/freeldr/freeldr/include/ui/minitui.h | 2 +- boot/freeldr/freeldr/include/ui/noui.h | 2 +- boot/freeldr/freeldr/include/ui/tui.h | 2 +- boot/freeldr/freeldr/linuxboot.c | 2 +- boot/freeldr/freeldr/ntldr/setupldr.c | 2 +- boot/freeldr/freeldr/ntldr/winldr.c | 2 +- boot/freeldr/freeldr/options.c | 2 +- boot/freeldr/freeldr/ui/directui.c | 4 ++-- boot/freeldr/freeldr/ui/minitui.c | 14 ++++++++++---- boot/freeldr/freeldr/ui/noui.c | 2 +- boot/freeldr/freeldr/ui/tui.c | 6 +++--- boot/freeldr/freeldr/ui/tuimenu.c | 2 +- boot/freeldr/freeldr/ui/ui.c | 6 +++--- 15 files changed, 31 insertions(+), 25 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index b0494083d75..5a5d8335df7 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -427,8 +427,8 @@ VOID RunLoader(VOID) for (;;) { - /* Redraw the backdrop */ - UiDrawBackdrop(); + /* Redraw the backdrop, but don't overwrite boot options */ + UiDrawBackdrop(UiGetScreenHeight() - 2); /* Show the operating system list menu */ if (!UiDisplayMenu("Please select the operating system to start:", diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index cedc2fa922a..1ee72572ae4 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -53,7 +53,7 @@ extern const PCSTR UiMonthNames[12]; BOOLEAN UiInitialize(BOOLEAN ShowUi); // Initialize User-Interface VOID UiUnInitialize(PCSTR BootText); // Un-initialize User-Interface -VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop +VOID UiDrawBackdrop(ULONG DrawHeight); // Fills the entire screen with a backdrop VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID UiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified VOID UiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOLEAN Fill, BOOLEAN Shadow, UCHAR Attr); // Draws a box around the area specified @@ -254,7 +254,7 @@ typedef struct tagUIVTBL BOOLEAN (*Initialize)(VOID); VOID (*UnInitialize)(VOID); - VOID (*DrawBackdrop)(VOID); + VOID (*DrawBackdrop)(ULONG DrawHeight); VOID (*FillArea)(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr); VOID (*DrawShadow)(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); VOID (*DrawBox)(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOLEAN Fill, BOOLEAN Shadow, UCHAR Attr); diff --git a/boot/freeldr/freeldr/include/ui/minitui.h b/boot/freeldr/freeldr/include/ui/minitui.h index 6db89b41cc0..e8743835d42 100644 --- a/boot/freeldr/freeldr/include/ui/minitui.h +++ b/boot/freeldr/freeldr/include/ui/minitui.h @@ -10,7 +10,7 @@ /* Textual User Interface Functions ******************************************/ -VOID MiniTuiDrawBackdrop(VOID); +VOID MiniTuiDrawBackdrop(ULONG DrawHeight); VOID MiniTuiDrawStatusText(PCSTR StatusText); VOID diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index ac6524dec54..99d66ceb341 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -13,7 +13,7 @@ BOOLEAN NoUiInitialize(VOID); VOID NoUiUnInitialize(VOID); -VOID NoUiDrawBackdrop(VOID); +VOID NoUiDrawBackdrop(ULONG DrawHeight); VOID NoUiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr); VOID NoUiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); VOID NoUiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOLEAN Fill, BOOLEAN Shadow, UCHAR Attr); diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index 4a3f3e25ef9..ee0c756d526 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -37,7 +37,7 @@ TuiTruncateStringEllipsis( BOOLEAN TuiInitialize(VOID); // Initialize User-Interface VOID TuiUnInitialize(VOID); // Un-initialize User-Interface -VOID TuiDrawBackdrop(VOID); // Fills the entire screen with a backdrop +VOID TuiDrawBackdrop(ULONG DrawHeight); // Fills the entire screen with a backdrop VOID TuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index e7f81d699d8..3cd90237fc8 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -114,7 +114,7 @@ LoadAndBootLinux( else strcpy(LinuxBootDescription, "Loading Linux..."); - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); UiDrawStatusText(LinuxBootDescription); UiDrawProgressBarCenter(LinuxBootDescription); diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 576222378f7..57931fc841e 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -531,7 +531,7 @@ LoadReactOSSetup( } /* Let the user know we started loading */ - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); UiDrawStatusText("Setup is loading..."); UiDrawProgressBarCenter("Loading ReactOS Setup..."); diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 5dc97f2acb5..198c673d962 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -1030,7 +1030,7 @@ LoadAndBootWindows( } /* Let the user know we started loading */ - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); UiDrawStatusText("Loading..."); UiDrawProgressBarCenter("Loading NT..."); diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index 27eb1dda090..1b07ec64cda 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -108,7 +108,7 @@ VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem) } /* Clear the backdrop */ - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); switch (SelectedMenuItem) { diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index 7788fa1e84d..54b4debb1ca 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -35,7 +35,7 @@ UiInitialize(IN BOOLEAN ShowUi) MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); /* Clear the screen */ - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); return TRUE; } @@ -47,7 +47,7 @@ UiUnInitialize(IN PCSTR BootText) } VOID -UiDrawBackdrop(VOID) +UiDrawBackdrop(ULONG DrawHeight) { /* Clear the screen */ MachVideoClearScreen(ATTR(COLOR_WHITE, COLOR_BLACK)); diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 1ca4e8b5062..8742244940b 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -53,10 +53,10 @@ BOOLEAN MiniTuiInitialize(VOID) return TRUE; } -VOID MiniTuiDrawBackdrop(VOID) +VOID MiniTuiDrawBackdrop(ULONG DrawHeight) { /* Fill in a black background */ - TuiFillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 3, + TuiFillArea(0, 0, UiScreenWidth - 1, DrawHeight - 1, UiBackdropFillStyle, ATTR(UiBackdropFgColor, UiBackdropBgColor)); @@ -64,6 +64,12 @@ VOID MiniTuiDrawBackdrop(VOID) VideoCopyOffScreenBufferToVRAM(); } +VOID MiniTuiFadeInBackdrop(VOID) +{ + /* No fade-in effect in MiniTui */ + MiniTuiDrawBackdrop(UiScreenHeight); +} + VOID MiniTuiDrawStatusText(PCSTR StatusText) { /* Minimal UI doesn't have a status bar */ @@ -186,7 +192,7 @@ MiniTuiDrawMenu( ULONG i; /* Draw the backdrop */ - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); /* No GUI status bar text, just minimal text. Show the menu header. */ if (MenuInfo->MenuHeader) @@ -250,7 +256,7 @@ const UIVTBL MiniTuiVtbl = TuiEditBox, TuiTextToColor, TuiTextToFillStyle, - MiniTuiDrawBackdrop, /* no FadeIn */ + MiniTuiFadeInBackdrop, TuiFadeOut, TuiDisplayMenu, MiniTuiDrawMenu, diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 80fefea0c9a..b465acff575 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -17,7 +17,7 @@ VOID NoUiUnInitialize(VOID) { } -VOID NoUiDrawBackdrop(VOID) +VOID NoUiDrawBackdrop(ULONG DrawHeight) { } diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 80c5e3b0100..732c2a622d6 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -269,13 +269,13 @@ VOID TuiUnInitialize(VOID) MachVideoHideShowTextCursor(TRUE); } -VOID TuiDrawBackdrop(VOID) +VOID TuiDrawBackdrop(ULONG DrawHeight) { /* Fill in the background (excluding title box & status bar) */ TuiFillArea(0, TUI_TITLE_BOX_CHAR_HEIGHT, UiScreenWidth - 1, - UiScreenHeight - 3, + DrawHeight - 2, UiBackdropFillStyle, ATTR(UiBackdropFgColor, UiBackdropBgColor)); @@ -996,7 +996,7 @@ VOID TuiFadeInBackdrop(VOID) } // Draw the backdrop and title box - TuiDrawBackdrop(); + TuiDrawBackdrop(UiGetScreenHeight()); if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed() && TuiFadePalette != NULL) { diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index ff6f95e1128..b3a7e3f5ef9 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -202,7 +202,7 @@ TuiDrawMenu( // FIXME: Theme-specific /* Draw the backdrop */ - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); /* Draw the menu box */ TuiDrawMenuBox(MenuInfo); diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 3496921cb53..946b49f4354 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -223,16 +223,16 @@ BOOLEAN UiInitialize(BOOLEAN ShowUi) VOID UiUnInitialize(PCSTR BootText) { - UiDrawBackdrop(); + UiDrawBackdrop(UiGetScreenHeight()); UiDrawStatusText(BootText); UiInfoBox(BootText); UiVtbl.UnInitialize(); } -VOID UiDrawBackdrop(VOID) +VOID UiDrawBackdrop(ULONG DrawHeight) { - UiVtbl.DrawBackdrop(); + UiVtbl.DrawBackdrop(DrawHeight); } VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */)

3 months, 2 weeks

[reactos] 01/01: [SYSETUP] Set the tcpip service hostname parameter even if the service key does not exist yet

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcedb5314c0d0e83e62ca… commit bcedb5314c0d0e83e62ca1602c19d5c993f69440 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 16 14:14:58 2025 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 16 14:14:58 2025 +0100 [SYSETUP] Set the tcpip service hostname parameter even if the service key does not exist yet --- dll/win32/syssetup/wizard.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 0345ed14f40..ade3c295a3f 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -937,30 +937,35 @@ WriteComputerSettings(WCHAR * ComputerName, HWND hwndDlg) SetAccountsDomainSid(NULL, ComputerName); /* Now we need to set the Hostname */ - lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", - 0, - KEY_SET_VALUE, - &hKey); - if (lError != ERROR_SUCCESS) - { - DPRINT1("RegOpenKeyExW for Tcpip\\Parameters failed (%08lX)\n", lError); - return TRUE; - } + lError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL); + if (lError == ERROR_SUCCESS) + { + lError = RegSetValueEx(hKey, + L"Hostname", + 0, + REG_SZ, + (LPBYTE)ComputerName, + (wcslen(ComputerName) + 1) * sizeof(WCHAR)); + if (lError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx(\"Hostname\") failed (%08lX)\n", lError); + } - lError = RegSetValueEx(hKey, - L"Hostname", - 0, - REG_SZ, - (LPBYTE)ComputerName, - (wcslen(ComputerName) + 1) * sizeof(WCHAR)); - if (lError != ERROR_SUCCESS) + RegCloseKey(hKey); + } + else { - DPRINT1("RegSetValueEx(\"Hostname\") failed (%08lX)\n", lError); + DPRINT1("RegCreateKeyExW for Tcpip\\Parameters failed (%08lX)\n", lError); } - RegCloseKey(hKey); - return TRUE; }

3 months, 2 weeks

[reactos] 01/01: [SHELL32] Initialize COM for PickIconDlg (#7788)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6b134123b02fd27b2c88… commit c6b134123b02fd27b2c8831b5718ccf830f52c79 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Mar 16 10:09:31 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 16 10:09:31 2025 +0100 [SHELL32] Initialize COM for PickIconDlg (#7788) CORE-20030 --- dll/win32/shell32/dialogs/dialogs.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/shell32/dialogs/dialogs.cpp b/dll/win32/shell32/dialogs/dialogs.cpp index 2ef69786079..6e11361eea4 100644 --- a/dll/win32/shell32/dialogs/dialogs.cpp +++ b/dll/win32/shell32/dialogs/dialogs.cpp @@ -354,6 +354,7 @@ BOOL WINAPI PickIconDlg( UINT nMaxFile, INT* lpdwIconIndex) { + CCoInit ComInit; // For SHAutoComplete (CORE-20030) int res; WCHAR szExpandedPath[MAX_PATH];

3 months, 2 weeks

[reactos] 01/01: [LNKTOOL][SHELL32] Add utility to create/dump .lnk files (#7745)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96aa1eee179b7c0225adb… commit 96aa1eee179b7c0225adb3c642a30d8d3e6904a1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Mar 15 16:31:22 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 15 16:31:22 2025 +0100 [LNKTOOL][SHELL32] Add utility to create/dump .lnk files (#7745) Unlike mkshelllink, this uses the native COM interface to create the link. --- dll/win32/shell32/CShellLink.cpp | 19 +- .../rosapps/applications/devutils/CMakeLists.txt | 1 + .../applications/devutils/lnktool/CMakeLists.txt | 7 + .../applications/devutils/lnktool/lnktool.cpp | 874 +++++++++++++++++++++ .../applications/devutils/lnktool/lnktool.rc | 9 + sdk/include/psdk/shlwapi.h | 17 + sdk/include/reactos/shellutils.h | 2 + 7 files changed, 919 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/CShellLink.cpp b/dll/win32/shell32/CShellLink.cpp index edc482f8883..3ea7c3d5e6c 100644 --- a/dll/win32/shell32/CShellLink.cpp +++ b/dll/win32/shell32/CShellLink.cpp @@ -544,7 +544,7 @@ static BOOL Stream_LoadVolume(LOCAL_VOLUME_INFO *vol, CShellLink::volume_info *v INT len = vol->dwSize - vol->dwVolLabelOfs; LPSTR label = (LPSTR)vol; - label += vol->dwVolLabelOfs; + label += vol->dwVolLabelOfs; // FIXME: 0x14 Unicode MultiByteToWideChar(CP_ACP, 0, label, len, volume->label, _countof(volume->label)); return TRUE; @@ -595,7 +595,7 @@ static HRESULT Stream_LoadLocation(IStream *stm, /* if there's a local path, load it */ DWORD n = loc->dwLocalPathOfs; if (n && n < loc->dwTotalSize) - *path = Stream_LoadPath(&p[n], loc->dwTotalSize - n); + *path = Stream_LoadPath(&p[n], loc->dwTotalSize - n); // FIXME: Unicode offset (if present) TRACE("type %d serial %08x name %s path %s\n", volume->type, volume->serial, debugstr_w(volume->label), debugstr_w(*path)); @@ -850,7 +850,7 @@ static HRESULT Stream_WriteString(IStream* stm, LPCWSTR str) * Figure out how Windows deals with unicode paths here. */ static HRESULT Stream_WriteLocationInfo(IStream* stm, LPCWSTR path, - CShellLink::volume_info *volume) + CShellLink::volume_info *volume) // FIXME: Write Unicode strings { LOCAL_VOLUME_INFO *vol; LOCATION_INFO *loc; @@ -913,6 +913,7 @@ HRESULT STDMETHODCALLTYPE CShellLink::Save(IStream *stm, BOOL fClearDirty) m_Header.dwSize = sizeof(m_Header); m_Header.clsid = CLSID_ShellLink; + m_Header.dwReserved3 = m_Header.dwReserved2 = m_Header.wReserved1 = 0; /* Store target attributes */ WIN32_FIND_DATAW wfd = {}; @@ -934,8 +935,9 @@ HRESULT STDMETHODCALLTYPE CShellLink::Save(IStream *stm, BOOL fClearDirty) * already set in accordance by the different mutator member functions. * The other flags will be determined now by the presence or absence of data. */ - m_Header.dwFlags &= (SLDF_RUN_WITH_SHIMLAYER | SLDF_RUNAS_USER | - SLDF_RUN_IN_SEPARATE | SLDF_HAS_DARWINID | + UINT NT6SimpleFlags = LOBYTE(GetVersion()) > 6 ? (0x00040000 | 0x00400000 | 0x00800000 | 0x02000000) : 0; + m_Header.dwFlags &= (SLDF_RUN_WITH_SHIMLAYER | SLDF_RUNAS_USER | SLDF_RUN_IN_SEPARATE | + SLDF_HAS_DARWINID | SLDF_FORCE_NO_LINKINFO | NT6SimpleFlags | #if (NTDDI_VERSION < NTDDI_LONGHORN) SLDF_HAS_LOGO3ID | #endif @@ -2488,14 +2490,11 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetFlags(DWORD *pdwFlags) HRESULT STDMETHODCALLTYPE CShellLink::SetFlags(DWORD dwFlags) { -#if 0 // FIXME! + if (m_Header.dwFlags == dwFlags) + return S_FALSE; m_Header.dwFlags = dwFlags; m_bDirty = TRUE; return S_OK; -#else - FIXME("\n"); - return E_NOTIMPL; -#endif } /************************************************************************** diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt index 446fbc1ea74..2ffa876e181 100644 --- a/modules/rosapps/applications/devutils/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/CMakeLists.txt @@ -3,6 +3,7 @@ add_subdirectory(createspec) add_subdirectory(gdb2) add_subdirectory(gdihv) add_subdirectory(genguid) +add_subdirectory(lnktool) add_subdirectory(nls2txt) add_subdirectory(shimdbg) add_subdirectory(shimtest_ros) diff --git a/modules/rosapps/applications/devutils/lnktool/CMakeLists.txt b/modules/rosapps/applications/devutils/lnktool/CMakeLists.txt new file mode 100644 index 00000000000..009f746e742 --- /dev/null +++ b/modules/rosapps/applications/devutils/lnktool/CMakeLists.txt @@ -0,0 +1,7 @@ + +add_executable(lnktool lnktool.cpp lnktool.rc) + +set_module_type(lnktool win32cui UNICODE) +target_link_libraries(lnktool uuid) +add_importlibs(lnktool ole32 comctl32 shell32 shlwapi advapi32 user32 msvcrt kernel32) +add_cd_file(TARGET lnktool DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/devutils/lnktool/lnktool.cpp b/modules/rosapps/applications/devutils/lnktool/lnktool.cpp new file mode 100644 index 00000000000..32499fcdf07 --- /dev/null +++ b/modules/rosapps/applications/devutils/lnktool/lnktool.cpp @@ -0,0 +1,874 @@ +/* + * PROJECT: lnktool + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: ShellLink (.lnk) utility + * COPYRIGHT: Copyright 2025 Whindmar Saksit <whindsaks(a)proton.me> + */ + +#define INDENT " " +static const char g_Usage[] = "" + "lnktool <Create|Dump|RemoveDatablock> <LnkFile> [Options]\n" + "\n" + "Create Options:\n" + "/Pidl <Path>\n" + "/Path <TargetPath>\n" + "/Icon <Path,Index>\n" + "/Arguments <String>\n" + "/RelativePath <LnkPath>\n" + "/WorkingDir <Path>\n" + "/Comment <String>\n" + "/ShowCmd <Number>\n" + "/SpecialFolderOffset <CSIDL> <Offset|-Count>\n" + "/AddExp <TargetPath>\n" + "/AddExpIcon <Path>\n" + "/RemoveExpIcon\n" // Removes the EXP_SZ_ICON block and flag + "/AddSLDF <Flag>\n" + "/RemoveSLDF <Flag>\n"; + +#include <windows.h> +#include <shlobj.h> +#include <shlwapi.h> +#include <wchar.h> +#include <stdio.h> // For shellutils.h (sprintf) +#include <shellutils.h> +#include <shlwapi_undoc.h> +#include <undocshell.h> // SHELL_LINK_HEADER + +enum { slgp_relativepriority = 0x08 }; +#define PT_DESKTOP_REGITEM 0x1F +#define PT_COMPUTER_REGITEM 0x2E +#define PT_FS 0x30 +#define PT_FS_UNICODE_FLAG 0x04 + +static const struct { UINT Flag; PCSTR Name; } g_SLDF[] = +{ + { SLDF_HAS_ID_LIST, "IDLIST" }, + { SLDF_HAS_LINK_INFO, "LINKINFO" }, + { SLDF_HAS_NAME, "NAME" }, + { SLDF_HAS_RELPATH, "RELPATH" }, + { SLDF_HAS_WORKINGDIR, "WORKINGDIR" }, + { SLDF_HAS_ARGS, "ARGS" }, + { SLDF_HAS_ICONLOCATION, "ICONLOCATION" }, + { SLDF_UNICODE, "UNICODE" }, + { SLDF_FORCE_NO_LINKINFO, "FORCE_NO_LINKINFO" }, + { SLDF_HAS_EXP_SZ, "EXP_SZ" }, + { SLDF_RUN_IN_SEPARATE, "RUN_IN_SEPARATE" }, + { 0x00000800, "LOGO3ID" }, + { SLDF_HAS_DARWINID, "DARWINID" }, + { SLDF_RUNAS_USER, "RUNAS_USER" }, + { SLDF_HAS_EXP_ICON_SZ, "EXP_ICON_SZ" }, + { SLDF_NO_PIDL_ALIAS, "NO_PIDL_ALIAS" }, + { SLDF_FORCE_UNCNAME, "FORCE_UNCNAME" }, + { SLDF_RUN_WITH_SHIMLAYER, "RUN_WITH_SHIMLAYER" }, + { 0x00040000, "FORCE_NO_LINKTRACK" }, + { 0x00080000, "ENABLE_TARGET_METADATA" }, + { 0x00100000, "DISABLE_LINK_PATH_TRACKING" }, + { 0x00200000, "DISABLE_KNOWNFOLDER_RELATIVE_TRACKING" }, + { 0x00400000, "NO_KF_ALIAS" }, + { 0x00800000, "ALLOW_LINK_TO_LINK" }, + { 0x01000000, "UNALIAS_ON_SAVE" }, + { 0x02000000, "PREFER_ENVIRONMENT_PATH" }, + { 0x04000000, "KEEP_LOCAL_IDLIST_FOR_UNC_TARGET" }, + { 0x08000000, "PERSIST_VOLUME_ID_RELATIVE" }, +}; + +static const struct { UINT Flag; PCSTR Name; } g_DBSig[] = +{ + { EXP_SZ_LINK_SIG, "SZ_LINK" }, + { EXP_SZ_ICON_SIG, "SZ_ICON" }, + { EXP_SPECIAL_FOLDER_SIG, "SPECIALFOLDER" }, + { EXP_TRACKER_SIG, "TRACKER" }, + { 0xA0000009, "PROPERTYSTORAGE" }, + { EXP_KNOWN_FOLDER_SIG, "KNOWNFOLDER" }, + { EXP_VISTA_ID_LIST_SIG, "VISTAPIDL" }, +}; + +static LONG StrToNum(PCWSTR in) +{ + PWCHAR end; + LONG v = wcstol(in, &end, 0); + if (v == LONG_MAX) + v = wcstoul(in, &end, 0); + return (end > in) ? v : 0; +} + +template<class T> +static UINT MapToNumber(PCWSTR Name, const T &Map) +{ + CHAR buf[200]; + WideCharToMultiByte(CP_ACP, 0, Name, -1, buf, _countof(buf), NULL, NULL); + buf[_countof(buf) - 1] = ANSI_NULL; + for (UINT i = 0; i < _countof(Map); ++i) + { + if (!StrCmpIA(buf, Map[i].Name)) + return Map[i].Flag; + } + return StrToNum(Name); +} + +template<class T> +static PCSTR MapToName(UINT Value, const T &Map, PCSTR Fallback = NULL) +{ + for (UINT i = 0; i < _countof(Map); ++i) + { + if (Map[i].Flag == Value) + return Map[i].Name; + } + return Fallback; +} + +#define GetSLDF(Name) MapToNumber((Name), g_SLDF) +#define GetDatablockSignature(Name) MapToNumber((Name), g_DBSig) + +static int ErrMsg(int Error) +{ + WCHAR buf[400]; + for (UINT e = Error, cch; ;) + { + lstrcpynW(buf, L"?", _countof(buf)); + cch = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, 0, e, 0, buf, _countof(buf), NULL); + while (cch && buf[cch - 1] <= ' ') + buf[--cch] = UNICODE_NULL; // Remove trailing newlines + if (cch || HIWORD(e) != HIWORD(HRESULT_FROM_WIN32(1))) + break; + e = HRESULT_CODE(e); // "WIN32_FROM_HRESULT" + } + wprintf(Error < 0 ? L"Error 0x%.8X %s\n" : L"Error %d %s\n", Error, buf); + return Error; +} + +static int SuccessOrReportError(int Error) +{ + return Error ? ErrMsg(Error) : Error; +} + +static inline HRESULT Seek(IStream *pStrm, int Move, int Origin = FILE_CURRENT, ULARGE_INTEGER *pNewPos = NULL) +{ + LARGE_INTEGER Pos; + Pos.QuadPart = Move; + return pStrm->Seek(Pos, Origin, pNewPos); +} + +static HRESULT IL_LoadFromStream(IStream *pStrm, PIDLIST_ABSOLUTE *ppidl) +{ + HMODULE hShell32 = LoadLibraryA("SHELL32"); + HRESULT (WINAPI*ILLFS)(IStream*, PIDLIST_ABSOLUTE*); + (FARPROC&)ILLFS = GetProcAddress(hShell32, (char*)26); // NT5 + if (!ILLFS) + (FARPROC&)ILLFS = GetProcAddress(hShell32, (char*)846); // NT6 + return ILLFS(pStrm, ppidl); +} + +static HRESULT SHParseName(PCWSTR Path, PIDLIST_ABSOLUTE *ppidl) +{ + HMODULE hShell32 = LoadLibraryA("SHELL32"); + int (WINAPI*SHPDN)(PCWSTR, void*, PIDLIST_ABSOLUTE*, UINT, UINT*); + (FARPROC&)SHPDN = GetProcAddress(hShell32, "SHParseDisplayName"); + if (SHPDN) + return SHPDN(Path, NULL, ppidl, 0, NULL); + return SHILCreateFromPath(Path, ppidl, NULL); +} + +static HRESULT SHParseNameEx(PCWSTR Path, PIDLIST_ABSOLUTE *ppidl, bool Simple) +{ + if (!Simple) + return SHParseName(Path, ppidl); + *ppidl = SHSimpleIDListFromPath(Path); + return *ppidl ? S_OK : E_FAIL; +} + +static INT_PTR SHGetPidlInfo(LPCITEMIDLIST pidl, SHFILEINFOW &shfi, UINT Flags, UINT Depth = 0) +{ + LPITEMIDLIST pidlDup = NULL, pidlChild; + if (Depth > 0) + { + if ((pidl = pidlDup = pidlChild = ILClone(pidl)) == NULL) + return 0; + while (Depth--) + { + if (LPITEMIDLIST pidlNext = ILGetNext(pidlChild)) + pidlChild = pidlNext; + } + pidlChild->mkid.cb = 0; + } + INT_PTR ret = SHGetFileInfoW((PWSTR)pidl, 0, &shfi, sizeof(shfi), Flags | SHGFI_PIDL); + ILFree(pidlDup); + return ret; +} + +static void PrintOffsetString(PCSTR Name, LPCVOID Base, UINT Min, UINT Ansi, UINT Unicode, PCSTR Indent = "") +{ + if (Unicode && Unicode >= Min) + wprintf(L"%hs%hs=%ls", Indent, Name, (PWSTR)((BYTE*)Base + Unicode)); + else + wprintf(L"%hs%hs=%hs", Indent, Name, Ansi >= Min ? (char*)Base + Ansi : ""); + wprintf(L"\n"); // Separate function call in case the (untrusted) input ends with a DEL character +} + +static void Print(PCSTR Name, REFGUID Guid, PCSTR Indent = "") +{ + WCHAR Buffer[39]; + StringFromGUID2(Guid, Buffer, _countof(Buffer)); + wprintf(L"%hs%hs=%ls\n", Indent, Name, Buffer); +} + +template<class V, class T> +static void DumpFlags(V Value, T *pInfo, UINT Count, PCSTR Prefix = NULL) +{ + if (!Prefix) + Prefix = ""; + for (SIZE_T i = 0; i < Count; ++i) + { + if (Value & pInfo[i].Flag) + wprintf(L"%hs%#.8x:%hs\n", Prefix, pInfo[i].Flag, const_cast<PCSTR>(pInfo[i].Name)); + Value &= ~pInfo[i].Flag; + } + if (Value) + wprintf(L"%hs%#.8x:%hs\n", Prefix, Value, "?"); +} + +static void Dump(LPITEMIDLIST pidl, PCSTR Heading = NULL) +{ + struct GUIDPIDL { WORD cb; BYTE Type, Unknown; GUID guid; }; + struct DRIVE { BYTE cb1, cb2, Type; char Name[4]; BYTE Unk[18]; }; + struct FS95 { WORD cb; BYTE Type, Unknown, Data[4+2+2+2]; char Name[1]; }; + if (Heading) + wprintf(L"%hs ", Heading); + if (!pidl || !pidl->mkid.cb) + wprintf(L"[Desktop (%hs)]", pidl ? "Empty" : "NULL"); + for (UINT i = 0; pidl && pidl->mkid.cb; ++i, pidl = ILGetNext(pidl)) + { + SHFILEINFOW shfi; + PWSTR buf = shfi.szDisplayName; + GUIDPIDL *pidlGUID = (GUIDPIDL*)pidl; + UINT cb = pidl->mkid.cb; + UINT type = cb >= 3 ? (pidlGUID->Type & ~0x80) : 0, folder = type & 0x70; + if (i) + wprintf(L" "); + if (cb < 3) + { + wprintf(L"[? %ub]", cb); + } + else if (i == 0 && cb == sizeof(GUIDPIDL) && type == PT_DESKTOP_REGITEM) guiditem: + { + if (!SHGetPidlInfo(pidl, shfi, SHGFI_DISPLAYNAME, 1)) + StringFromGUID2(*(GUID*)((char*)pidl + cb - 16), buf, 39); + wprintf(L"[%.2X %ub %s]", pidl->mkid.abID[0], cb, buf); + } + else if (i == 1 && cb == sizeof(GUIDPIDL) && type == PT_COMPUTER_REGITEM) + { + goto guiditem; + } + else if (i == 1 && cb == sizeof(DRIVE) && folder == 0x20) + { + DRIVE *p = (DRIVE*)pidl; + wprintf(L"[%.2X %ub \"%.3hs\"]", p->Type, cb, p->Name); + } + else if (cb > FIELD_OFFSET(FS95, Name) && folder == PT_FS) + { + FS95 *p = (FS95*)pidl; + const BOOL wide = type & PT_FS_UNICODE_FLAG; + wprintf(wide ? L"[%.2X %ub \"%.256ls\"]" : L"[%.2X %ub \"%.256hs\"]", p->Type, cb, p->Name); + } + else + { + wprintf(L"[%.2X %ub ?]", pidl->mkid.abID[0], cb); + } + } + wprintf(L"\n"); +} + +static HRESULT Save(IShellLink *pSL, PCWSTR LnkPath) +{ + HRESULT hr; + IPersistFile *pPF; + if (SUCCEEDED(hr = pSL->QueryInterface(IID_PPV_ARG(IPersistFile, &pPF)))) + { + if (SUCCEEDED(hr = pPF->Save(LnkPath, FALSE)) && hr != S_OK) + hr = E_FAIL; + pPF->Release(); + } + return hr; +} + +static HRESULT Load(IUnknown *pUnk, IStream *pStream) +{ + IPersistStream *pPS; + HRESULT hr = pUnk->QueryInterface(IID_PPV_ARG(IPersistStream, &pPS)); + if (SUCCEEDED(hr)) + { + hr = pPS->Load(pStream); + pPS->Release(); + } + return hr; +} + +static HRESULT Open(PCWSTR Path, IStream **ppStream, IShellLink **ppLink, UINT Mode = STGM_READ) +{ + if (Mode & (STGM_WRITE | STGM_READWRITE)) + Mode = (Mode & ~STGM_WRITE) | STGM_READWRITE | STGM_SHARE_DENY_WRITE; + else + Mode |= STGM_READ | STGM_SHARE_DENY_NONE; + IStream *pStream; + HRESULT hr = SHCreateStreamOnFileW(Path, Mode, &pStream); + if (SUCCEEDED(hr) && ppLink) + { + hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLink, ppLink)); + if (SUCCEEDED(hr) && !(Mode & STGM_CREATE)) + { + if (FAILED(hr = Load(*ppLink, pStream))) + { + (*ppLink)->Release(); + *ppLink = NULL; + } + IStream_Reset(pStream); + } + } + + if (SUCCEEDED(hr) && ppStream) + *ppStream = pStream; + else if (pStream) + pStream->Release(); + return hr; +} + +#define FreeBlock SHFree +static inline LPDATABLOCK_HEADER NextBlock(LPDATABLOCK_HEADER pdbh) +{ + return (LPDATABLOCK_HEADER)((char*)pdbh + pdbh->cbSize); +} + +template<class T> +static HRESULT ReadBlock(IStream *pStream, T **ppData = NULL) +{ + DWORD cb = 0; + HRESULT hr = IStream_Read(pStream, &cb, sizeof(cb)); + if (SUCCEEDED(hr)) + { + UINT Remain = cb - min(sizeof(DWORD), cb); + if (!ppData) + return Seek(pStream, Remain); + *ppData = (T*)SHAlloc(Remain + sizeof(DWORD)); + if (!*ppData) + return E_OUTOFMEMORY; + ((DATABLOCK_HEADER*)*ppData)->cbSize = cb; + if (SUCCEEDED(hr = IStream_Read(pStream, &((DATABLOCK_HEADER*)*ppData)->dwSignature, Remain))) + return cb; + } + return hr; +} + +struct DataBlockEnum +{ + DataBlockEnum(LPDATABLOCK_HEADER pHead) : m_It(pHead) {} + + LPDATABLOCK_HEADER Get() + { + if (m_It && m_It->cbSize >= FIELD_OFFSET(DATABLOCK_HEADER, dwSignature)) + return m_It + (m_It->dwSignature == ~0UL); // SHFindDataBlock compatible + return NULL; + } + void Next() + { + if (m_It && m_It->cbSize) + m_It = NextBlock(m_It); + } + LPDATABLOCK_HEADER m_It; +}; + +static HRESULT ReadAndDumpString(PCSTR Name, UINT Id, const SHELL_LINK_HEADER &slh, IStream *pStream) +{ + if (!(Id & slh.dwFlags)) + return S_OK; + WORD cch; + HRESULT hr = IStream_Read(pStream, &cch, sizeof(cch)); + if (FAILED(hr)) + return hr; + UINT cb = (UINT)cch * ((slh.dwFlags & SLDF_UNICODE) ? sizeof(WCHAR) : sizeof(CHAR)); + void *data = SHAlloc(cb); + if (!data) + return E_OUTOFMEMORY; + if (FAILED(hr = IStream_Read(pStream, data, cb))) + return hr; + if (slh.dwFlags & SLDF_UNICODE) + wprintf(L"%hs=%.*ls\n", Name, cch, (PWSTR)data); + else + wprintf(L"%hs=%.*hs\n", Name, cch, (PCSTR)data); + SHFree(data); + return S_OK; +} + +static HRESULT DumpCommand(PCWSTR Path) +{ + IStream *pStream; + HRESULT hr = Open(Path, &pStream, NULL); + if (FAILED(hr)) + return hr; + + LPITEMIDLIST pidl; + SHELL_LINK_HEADER slh; + if (SUCCEEDED(hr = IStream_Read(pStream, &slh, sizeof(slh)))) + { + #define DUMPSLH(name, fmt, field) wprintf(L"%hs=" fmt L"\n", (name), (slh).field) + DUMPSLH("Flags", L"%#.8x", dwFlags); + DumpFlags(slh.dwFlags, g_SLDF, _countof(g_SLDF), INDENT); + DUMPSLH("FileAttributes", L"%#.8x", dwFileAttributes); + DUMPSLH("Size", L"%u", nFileSizeLow); + DUMPSLH("IconIndex", L"%d", nIconIndex); + DUMPSLH("ShowCommand", L"%d", nShowCommand); + DUMPSLH("HotKey", L"%#.4x", wHotKey); + + if (SUCCEEDED(hr) && (slh.dwFlags & SLDF_HAS_ID_LIST)) + { + if (SUCCEEDED(hr = IL_LoadFromStream(pStream, &pidl))) + { + Dump(pidl, "PIDL:"); + ILFree(pidl); + } + } + if (SUCCEEDED(hr) && (slh.dwFlags & SLDF_HAS_LINK_INFO)) + { + int offset; + SHELL_LINK_INFOW *p; + if ((hr = ReadBlock(pStream, &p)) >= (signed)sizeof(SHELL_LINK_INFOA)) + { + wprintf(L"%hs:\n", "LINKINFO"); + wprintf(L"%hs%hs=%#.8x\n", INDENT, "Flags", p->dwFlags); + if (p->dwFlags & SLI_VALID_LOCAL) + { + if (p->cbVolumeIDOffset) + { + SHELL_LINK_INFO_VOLUME_IDW *pVol = (SHELL_LINK_INFO_VOLUME_IDW*)((char*)p + p->cbVolumeIDOffset); + wprintf(L"%hs%hs=%d\n", INDENT, "DriveType", pVol->dwDriveType); + wprintf(L"%hs%hs=%#.8x\n", INDENT, "Serial", pVol->nDriveSerialNumber); + offset = pVol->cbVolumeLabelOffset == 0x14 ? pVol->cbVolumeLabelUnicodeOffset : 0; + if (offset || pVol->cbVolumeLabelOffset != 0x14) // 0x14 from [MS-SHLLINK] documentation + PrintOffsetString("Label", pVol, 0x10, pVol->cbVolumeLabelOffset, offset, INDENT); + } + offset = p->cbHeaderSize >= sizeof(SHELL_LINK_INFOW) ? p->cbCommonPathSuffixUnicodeOffset : 0; + PrintOffsetString("CommonSuffix", p, sizeof(SHELL_LINK_INFOA), p->cbCommonPathSuffixOffset, offset, INDENT); + + offset = p->cbHeaderSize >= sizeof(SHELL_LINK_INFOW) ? p->cbLocalBasePathUnicodeOffset : 0; + PrintOffsetString("LocalBase", p, sizeof(SHELL_LINK_INFOA), p->cbLocalBasePathOffset, offset, INDENT); + } + SHELL_LINK_INFO_CNR_LINKW *pCNR = (SHELL_LINK_INFO_CNR_LINKW*)((char*)p + p->cbCommonNetworkRelativeLinkOffset); + if ((p->dwFlags & SLI_VALID_NETWORK) && p->cbCommonNetworkRelativeLinkOffset) + { + wprintf(L"%hs%hs=%#.8x\n", INDENT, "CNR", pCNR->dwFlags); + wprintf(L"%hs%hs=%#.8x\n", INDENT, "Provider", pCNR->dwNetworkProviderType); // WNNC_NET_* + + offset = pCNR->cbNetNameOffset > 0x14 ? pCNR->cbNetNameUnicodeOffset : 0; + PrintOffsetString("NetName", pCNR, sizeof(SHELL_LINK_INFO_CNR_LINKA), pCNR->cbNetNameOffset, offset, INDENT); + + offset = pCNR->cbNetNameOffset > 0x14 ? pCNR->cbDeviceNameUnicodeOffset : 0; + if (pCNR->dwFlags & SLI_CNR_VALID_DEVICE) + PrintOffsetString("DeviceName", pCNR, sizeof(SHELL_LINK_INFO_CNR_LINKA), pCNR->cbDeviceNameOffset, offset, INDENT); + } + FreeBlock(p); + } + } + if (SUCCEEDED(hr)) + hr = ReadAndDumpString("NAME", SLDF_HAS_NAME, slh, pStream); + if (SUCCEEDED(hr)) + hr = ReadAndDumpString("RELPATH", SLDF_HAS_RELPATH, slh, pStream); + if (SUCCEEDED(hr)) + hr = ReadAndDumpString("WORKINGDIR", SLDF_HAS_WORKINGDIR, slh, pStream); + if (SUCCEEDED(hr)) + hr = ReadAndDumpString("ARGS", SLDF_HAS_ARGS, slh, pStream); + if (SUCCEEDED(hr)) + hr = ReadAndDumpString("ICONLOCATION", SLDF_HAS_ICONLOCATION, slh, pStream); + + LPDATABLOCK_HEADER pDBListHead, pDBH; + if (SUCCEEDED(hr) && SUCCEEDED(hr = SHReadDataBlockList(pStream, &pDBListHead))) + { + for (DataBlockEnum it(pDBListHead); (pDBH = it.Get()) != NULL; it.Next()) + { + PCSTR SigName = MapToName(pDBH->dwSignature, g_DBSig, NULL); + wprintf(L"DataBlock: %.8X %ub", pDBH->dwSignature, pDBH->cbSize); + void *pFirstMember = ((EXP_SZ_LINK*)pDBH)->szTarget; + if (pDBH->dwSignature == EXP_SZ_LINK_SIG && pDBH->cbSize > FIELD_OFFSET(EXP_SZ_LINK, szwTarget)) + { + wprintf(L" %hs\n", "SZ_LINK"); + printdbpaths: + EXP_SZ_LINK *p = (EXP_SZ_LINK*)pDBH; + wprintf(L"%hs%hs=%.260hs\n", INDENT, "Ansi", p->szTarget); + wprintf(L"%hs%hs=%.260ls\n", INDENT, "Wide", p->szwTarget); + } + else if (pDBH->dwSignature == EXP_SZ_ICON_SIG && pDBH->cbSize > FIELD_OFFSET(EXP_SZ_LINK, szwTarget)) + { + wprintf(L" %hs\n", "SZ_ICON/LOGO3"); + goto printdbpaths; + } + else if (pDBH->dwSignature == EXP_DARWIN_ID_SIG && pDBH->cbSize == sizeof(EXP_DARWIN_LINK)) + { + wprintf(L" %hs\n", "DARWIN_LINK"); + goto printdbpaths; + } + else if (pDBH->dwSignature == NT_CONSOLE_PROPS_SIG && pDBH->cbSize >= sizeof(NT_CONSOLE_PROPS)) + { + wprintf(L" %hs\n", "NT_CONSOLE_PROPS"); + NT_CONSOLE_PROPS *p = (NT_CONSOLE_PROPS*)pDBH; + wprintf(L"%hsInsert=%d Quick=%d %ls\n", INDENT, p->bInsertMode, p->bQuickEdit, p->FaceName); + } + else if (pDBH->dwSignature == EXP_SPECIAL_FOLDER_SIG && pDBH->cbSize == sizeof(EXP_SPECIAL_FOLDER)) + { + wprintf(L" %hs\n", SigName); + EXP_SPECIAL_FOLDER *p = (EXP_SPECIAL_FOLDER*)pDBH; + wprintf(L"%hsCSIDL=%#x Offset=%#x\n", INDENT, p->idSpecialFolder, p->cbOffset); + } + else if (pDBH->dwSignature == EXP_TRACKER_SIG) + { + wprintf(L" %hs\n", SigName); + EXP_TRACKER *p = (EXP_TRACKER*)pDBH; + UINT len = FIELD_OFFSET(EXP_TRACKER, nLength) + p->nLength; + if (len >= FIELD_OFFSET(EXP_TRACKER, szMachineID)) + wprintf(L"%hsVersion=%d\n", INDENT, p->nVersion); + if (len >= FIELD_OFFSET(EXP_TRACKER, guidDroidVolume)) + wprintf(L"%hsMachine=%hs\n", INDENT, p->szMachineID); + if (len >= FIELD_OFFSET(EXP_TRACKER, guidDroidObject)) + Print("Volume", p->guidDroidVolume, INDENT); + if (len >= FIELD_OFFSET(EXP_TRACKER, guidDroidBirthVolume)) + Print("Object", p->guidDroidObject, INDENT); + if (len >= FIELD_OFFSET(EXP_TRACKER, guidDroidBirthObject)) + Print("BirthVolume", p->guidDroidBirthVolume, INDENT); + if (len >= sizeof(EXP_TRACKER)) + Print("BirthObject", p->guidDroidBirthObject, INDENT); + } + else if (pDBH->dwSignature == EXP_SHIM_SIG) + { + wprintf(L" %hs\n", SigName ? SigName : "SHIM"); + wprintf(L"%hs%ls\n", INDENT, (PWSTR)pFirstMember); + } + else if (pDBH->dwSignature == EXP_VISTA_ID_LIST_SIG && pDBH->cbSize >= 8 + 2) + { + wprintf(L" %hs\n", SigName); + Dump((LPITEMIDLIST)pFirstMember, INDENT + 1); + } + else + { + wprintf(SigName ? L" %hs\n" : L"\n", SigName); + } + } + SHFreeDataBlockList(pDBListHead); + } + } + pStream->Release(); + + // Now dump using the API + HRESULT hr2; + WCHAR buf[MAX_PATH * 2]; + IShellLink *pSL; + if (FAILED(hr2 = Open(Path, NULL, &pSL))) + return hr2; + wprintf(L"\n"); + + if (SUCCEEDED(hr2 = pSL->GetIDList(&pidl))) + { + Dump(pidl, "GetIDList:"); + ILFree(pidl); + } + else + { + wprintf(L"%hs: %#x\n", "GetIDList", hr2); + } + + static const BYTE GetPathFlags[] = { 0, SLGP_SHORTPATH, SLGP_RAWPATH, slgp_relativepriority }; + for (UINT i = 0; i < _countof(GetPathFlags); ++i) + { + if (SUCCEEDED(hr2 = pSL->GetPath(buf, _countof(buf), NULL, GetPathFlags[i]))) + wprintf(L"GetPath(%#.2x): %ls\n", GetPathFlags[i], buf); + else + wprintf(L"GetPath(%#.2x): %#x\n", GetPathFlags[i], hr2); + } + + if (SUCCEEDED(hr2 = pSL->GetWorkingDirectory(buf, _countof(buf)))) + wprintf(L"%hs: %ls\n", "GetWorkingDirectory", buf); + else + wprintf(L"%hs: %#x\n", "GetWorkingDirectory", hr2); + + if (SUCCEEDED(hr2 = pSL->GetArguments(buf, _countof(buf)))) + wprintf(L"%hs: %ls\n", "GetArguments", buf); + else + wprintf(L"%hs: %#x\n", "GetArguments", hr2); + + if (SUCCEEDED(hr2 = pSL->GetDescription(buf, _countof(buf)))) + wprintf(L"%hs: %ls\n", "GetDescription", buf); + else + wprintf(L"%hs: %#x\n", "GetDescription", hr2); + + int index = 123456789; + if (SUCCEEDED(hr2 = pSL->GetIconLocation(buf, _countof(buf), &index))) + wprintf(L"%hs: %ls,%d\n", "GetIconLocation", buf, index); + else + wprintf(L"%hs: %#x\n", "GetIconLocation", hr2); + + IExtractIconW *pEI; + if (SUCCEEDED(pSL->QueryInterface(IID_PPV_ARG(IExtractIconW, &pEI)))) + { + index = 123456789; + UINT flags = 0; + if (SUCCEEDED(hr2 = pEI->GetIconLocation(0, buf, _countof(buf), &index, &flags))) + wprintf(L"%hs: %#x %ls,%d %#.4x\n", "EI:GetIconLocation", hr2, buf, index, flags); + else + wprintf(L"%hs: %#x %#.4x\n", "EI:GetIconLocation", hr2, flags); + pEI->Release(); + } + + pSL->Release(); + return hr; +} + +#define RemoveSLDF(pSL, Flag) RemoveDatablock((pSL), 0, (Flag)) +#define AddSLDF(pSL, Flag) RemoveDatablock((pSL), 0, 0, (Flag)) + +static HRESULT RemoveDatablock(IShellLinkW *pSL, UINT Signature, UINT KillFlag = 0, UINT AddFlag = 0) +{ + IShellLinkDataList *pSLDL; + HRESULT hr = pSL->QueryInterface(IID_PPV_ARG(IShellLinkDataList, &pSLDL)); + if (SUCCEEDED(hr)) + { + if (Signature) + hr = pSLDL->RemoveDataBlock(Signature); + DWORD OrgFlags; + if ((AddFlag | KillFlag) && SUCCEEDED(pSLDL->GetFlags(&OrgFlags))) + pSLDL->SetFlags((OrgFlags & ~KillFlag) | AddFlag); + pSLDL->Release(); + } + return hr; +} + +template<class T> +static HRESULT AddDataBlock(IShellLinkW *pSL, T &DataBlock) +{ + IShellLinkDataList *pSLDL; + HRESULT hr = pSL->QueryInterface(IID_PPV_ARG(IShellLinkDataList, &pSLDL)); + if (SUCCEEDED(hr)) + { + hr = pSLDL->AddDataBlock(&DataBlock); + pSLDL->Release(); + } + return hr; +} + +static BOOL TryGetUpdatedPidl(IShellLinkW *pSL, PIDLIST_ABSOLUTE &pidl) +{ + PIDLIST_ABSOLUTE pidlNew; + if (pSL->GetIDList(&pidlNew) == S_OK) + { + ILFree(pidl); + pidl = pidlNew; + } + return pidl != NULL; +} + +static HRESULT CreateCommand(PCWSTR LnkPath, UINT argc, WCHAR **argv) +{ + IShellLinkW *pSL; + HRESULT hr = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellLinkW, &pSL)); + if (FAILED(hr)) + return hr; + + UINT TargetCount = 0, DumpResult = 0, ForceAddSLDF = 0, ForceRemoveSLDF = 0; + PIDLIST_ABSOLUTE pidlTarget = NULL; + for (UINT i = 0; i < argc && SUCCEEDED(hr); ++i) + { + hr = E_INVALIDARG; + if (!StrCmpIW(argv[i], L"/Pidl") && i + 1 < argc) + { + bool Simple = !StrCmpIW(argv[i + 1], L"/Force") && i + 2 < argc && ++i; + if (SUCCEEDED(hr = SHParseNameEx(argv[++i], &pidlTarget, Simple))) + TargetCount += SUCCEEDED(hr = pSL->SetIDList(pidlTarget)); + } + else if (!StrCmpIW(argv[i], L"/Path") && i + 1 < argc) + { + TargetCount += SUCCEEDED(hr = pSL->SetPath(argv[++i])); + } + else if (!StrCmpIW(argv[i], L"/Icon") && i + 1 < argc) + { + int index = PathParseIconLocation(argv[++i]); + hr = pSL->SetIconLocation(argv[i], index); + } + else if (!StrCmpIW(argv[i], L"/Arguments") && i + 1 < argc) + { + hr = pSL->SetArguments(argv[++i]); + } + else if (!StrCmpIW(argv[i], L"/RelativePath") && i + 1 < argc) + { + hr = pSL->SetRelativePath(argv[++i], 0); + } + else if (!StrCmpIW(argv[i], L"/WorkingDir") && i + 1 < argc) + { + hr = pSL->SetWorkingDirectory(argv[++i]); + } + else if (!StrCmpIW(argv[i], L"/Comment") && i + 1 < argc) + { + hr = pSL->SetDescription(argv[++i]); + } + else if (!StrCmpIW(argv[i], L"/ShowCmd") && i + 1 < argc) + { + if (int sw = StrToNum(argv[++i])) // Don't allow SW_HIDE + hr = pSL->SetShowCmd(sw); + } + else if (!StrCmpIW(argv[i], L"/AddExp") && ++i < argc) + { + EXP_SZ_LINK db = { sizeof(db), EXP_SZ_LINK_SIG }; + WideCharToMultiByte(CP_ACP, 0, argv[i], -1, db.szTarget, _countof(db.szTarget), NULL, NULL); + lstrcpynW(db.szwTarget, argv[i], _countof(db.szwTarget)); + if (SUCCEEDED(hr = AddDataBlock(pSL, db))) + TargetCount += SUCCEEDED(hr = AddSLDF(pSL, SLDF_HAS_EXP_SZ)); + } + else if (!StrCmpIW(argv[i], L"/AddExpIcon") && ++i < argc) + { + EXP_SZ_LINK db = { sizeof(db), EXP_SZ_ICON_SIG }; + WideCharToMultiByte(CP_ACP, 0, argv[i], -1, db.szTarget, _countof(db.szTarget), NULL, NULL); + lstrcpynW(db.szwTarget, argv[i], _countof(db.szwTarget)); + if (SUCCEEDED(hr = AddDataBlock(pSL, db))) + hr = AddSLDF(pSL, SLDF_HAS_EXP_ICON_SZ); + } + else if (!StrCmpIW(argv[i], L"/RemoveExpIcon")) + { + hr = RemoveDatablock(pSL, EXP_SZ_ICON_SIG, SLDF_HAS_EXP_ICON_SZ); + } + else if (!StrCmpIW(argv[i], L"/SpecialFolderOffset") && i + 2 < argc) + { + EXP_SPECIAL_FOLDER db = { sizeof(db), EXP_SPECIAL_FOLDER_SIG }; + if ((db.idSpecialFolder = StrToNum(argv[++i])) == 0) + { + if (!StrCmpIW(argv[i], L"Windows")) + db.idSpecialFolder = CSIDL_WINDOWS; + if (!StrCmpIW(argv[i], L"System")) + db.idSpecialFolder = CSIDL_SYSTEM; + } + db.cbOffset = StrToNum(argv[++i]); + if ((signed)db.cbOffset < 0 && TryGetUpdatedPidl(pSL, pidlTarget)) + { + UINT i = 0, c = -(signed)db.cbOffset; + db.cbOffset = 0; + for (PIDLIST_ABSOLUTE pidl = pidlTarget; i < c && pidl->mkid.cb; ++i, pidl = ILGetNext(pidl)) + db.cbOffset += pidl->mkid.cb; + } + hr = AddDataBlock(pSL, db); + } + else if (!StrCmpIW(argv[i], L"/RemoveDatablock")) + { + if (UINT sig = GetDatablockSignature(argv[++i])) + hr = RemoveDatablock(pSL, sig); + } + else if (!StrCmpIW(argv[i], L"/AddSLDF") && i + 1 < argc) + { + bool Force = !StrCmpIW(argv[i + 1], L"/Force") && i + 2 < argc && ++i; + UINT Flag = GetSLDF(argv[++i]); + if (Flag > SLDF_UNICODE) + hr = AddSLDF(pSL, Flag); + if (Force) + ForceAddSLDF |= Flag; + } + else if (!StrCmpIW(argv[i], L"/RemoveSLDF") && i + 1 < argc) + { + bool Force = !StrCmpIW(argv[i + 1], L"/Force") && i + 2 < argc && ++i; + UINT Flag = GetSLDF(argv[++i]); + if (Flag) + hr = RemoveSLDF(pSL, Flag); + if (Force) + ForceRemoveSLDF |= Flag; + } + else if (!StrCmpIW(argv[i], L"/Dump")) + { + DumpResult++; + hr = S_OK; + } + else if (!StrCmpIW(argv[i], L"/ForceCreate")) + { + TargetCount++; + hr = S_OK; + } + else + { + wprintf(L"%hsUnable to parse \"%ls\"!\n", "Error: ", argv[i]); + } + } + + if (SUCCEEDED(hr)) + { + if (TargetCount) + { + if (SUCCEEDED(hr = Save(pSL, LnkPath)) && (ForceAddSLDF | ForceRemoveSLDF)) + { + IStream *pStream; + if (SUCCEEDED(Open(LnkPath, &pStream, NULL, STGM_READWRITE))) + { + SHELL_LINK_HEADER slh; + if (SUCCEEDED(IStream_Read(pStream, &slh, sizeof(slh)))) + { + slh.dwFlags = (slh.dwFlags & ~ForceRemoveSLDF) | ForceAddSLDF; + if (SUCCEEDED(Seek(pStream, 0, FILE_BEGIN))) + IStream_Write(pStream, &slh, sizeof(slh)); + } + pStream->Release(); + } + } + } + else + { + hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + } + + if (SUCCEEDED(hr) && DumpResult) + DumpCommand(LnkPath); + } + pSL->Release(); + ILFree(pidlTarget); + return hr; +} + +static HRESULT RemoveDatablockCommand(PCWSTR LnkPath, UINT argc, WCHAR **argv) +{ + IShellLink *pSL; + HRESULT hr = Open(LnkPath, NULL, &pSL, STGM_READWRITE); + if (FAILED(hr)) + return hr; + + hr = E_INVALIDARG; + for (UINT i = 0; i < argc; ++i) + { + UINT Sig = GetDatablockSignature(argv[i]); + if (!Sig) + { + hr = E_INVALIDARG; + break; + } + hr = RemoveDatablock(pSL, Sig); + } + + if (SUCCEEDED(hr)) + hr = Save(pSL, LnkPath); + pSL->Release(); + return hr; +} + +static int ProcessCommandLine(int argc, WCHAR **argv) +{ + if (argc < 3) + { + wprintf(L"%hs", g_Usage); + return argc < 2 ? 0 : ERROR_INVALID_PARAMETER; + } + + if (!StrCmpIW(argv[1], L"Dump")) + return SuccessOrReportError(DumpCommand(argv[2])); + if (!StrCmpIW(argv[1], L"Create")) + return SuccessOrReportError(CreateCommand(argv[2], argc - 3, &argv[3])); + if (!StrCmpIW(argv[1], L"RemoveDatablock")) + return SuccessOrReportError(RemoveDatablockCommand(argv[2], argc - 3, &argv[3])); + + return SuccessOrReportError(ERROR_INVALID_PARAMETER); +} + +EXTERN_C int wmain(int argc, WCHAR **argv) +{ + HRESULT hrInit = OleInitialize(NULL); + int result = ProcessCommandLine(argc, argv); + if (SUCCEEDED(hrInit)) + OleUninitialize(); + return result; +} diff --git a/modules/rosapps/applications/devutils/lnktool/lnktool.rc b/modules/rosapps/applications/devutils/lnktool/lnktool.rc new file mode 100644 index 00000000000..fceb662389f --- /dev/null +++ b/modules/rosapps/applications/devutils/lnktool/lnktool.rc @@ -0,0 +1,9 @@ +#include <windef.h> +#include <winuser.h> + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Shell Link Utility" +#define REACTOS_STR_INTERNAL_NAME "lnktool" +#define REACTOS_STR_ORIGINAL_FILENAME "lnktool.exe" +#include <reactos/version.rc> + +#include <reactos/manifest_exe.rc> diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 547cf01ea8a..aac7061c01e 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -25,6 +25,15 @@ #include <objbase.h> #include <shtypes.h> +#ifndef _SHLWAPI_ +#define LWSTDAPI_(type) EXTERN_C DECLSPEC_IMPORT type WINAPI +#define LWSTDAPIV_(type) EXTERN_C DECLSPEC_IMPORT type STDAPIVCALLTYPE +#else +#define LWSTDAPI_(type) type WINAPI +#define LWSTDAPIV_(type) type STDAPIVCALLTYPE +#endif +#define LWSTDAPI LWSTDAPI_(HRESULT) + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */ @@ -1897,6 +1906,14 @@ SHCreateStreamOnFileEx( HRESULT WINAPI SHCreateStreamWrapper(LPBYTE,DWORD,DWORD,struct IStream**); +#ifndef _SHLWAPI_ +LWSTDAPI IStream_Reset(_In_ struct IStream*); +#if !defined(IStream_Read) && defined(__cplusplus) +LWSTDAPI IStream_Read(_In_ struct IStream*, _Out_ void*, _In_ ULONG); +LWSTDAPI IStream_Write(_In_ struct IStream*, _In_ const void*, _In_ ULONG); +#endif +#endif + #endif /* NO_SHLWAPI_STREAM */ #ifndef NO_SHLWAPI_SHARED diff --git a/sdk/include/reactos/shellutils.h b/sdk/include/reactos/shellutils.h index c45b6ad8770..2165a6706dc 100644 --- a/sdk/include/reactos/shellutils.h +++ b/sdk/include/reactos/shellutils.h @@ -127,6 +127,7 @@ SHELL_ErrorBox(H hwndOwner, UINT Error = GetLastError()) #endif #ifdef __cplusplus +#ifdef DECLARE_CLASSFACTORY // ATL template <typename T> class CComCreatorCentralInstance { @@ -456,6 +457,7 @@ HRESULT inline ShellObjectCreatorInit(T1 initArg1, T2 initArg2, T3 initArg3, T4 return hResult; } +#endif // DECLARE_CLASSFACTORY (ATL) template<class P, class R> static HRESULT SHILClone(P pidl, R *ppOut) {

3 months, 2 weeks

[reactos] 01/01: [EXPLORER][COMCTL32][SHELL32] Enable SPI_SETICONTITLELOGFONT (#7783)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75c0dc0cd850a50341317… commit 75c0dc0cd850a503413175d24fab3b23c1360ec0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 15 09:31:15 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 15 09:31:15 2025 +0900 [EXPLORER][COMCTL32][SHELL32] Enable SPI_SETICONTITLELOGFONT (#7783) Enable desktop icon title font setting. JIRA issue: CORE-13601 - Forward WM_SETTINGCHANGE message up to ListView. - ListView accepts WM_SETTINGCHANGE message. - Enable icon spacing. --- base/shell/explorer/traywnd.cpp | 3 +++ dll/win32/comctl32/listview.c | 29 +++++++++++++++++++++++++++++ dll/win32/shell32/CDefView.cpp | 1 + 3 files changed, 33 insertions(+) diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index f853609077f..d5695c7411c 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2454,6 +2454,9 @@ ChangePos: CheckTrayWndPosition(); } + if (m_DesktopWnd) + ::SendMessageW(m_DesktopWnd, uMsg, wParam, lParam); + if (m_StartMenuPopup && lstrcmpiW((LPCWSTR)lParam, L"TraySettings") == 0) { HideStartMenu(); diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index eb165e835c4..f50e32847fb 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -12001,7 +12001,36 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } return DefWindowProcW(hwnd, uMsg, wParam, lParam); +#ifdef __REACTOS__ + case WM_SETTINGCHANGE: /* Same as WM_WININICHANGE */ + if (wParam == SPI_SETICONMETRICS || + wParam == SPI_SETICONTITLELOGFONT || + wParam == SPI_SETNONCLIENTMETRICS || + (!wParam && !lParam)) + { + BOOL bDefaultOrNullFont = (infoPtr->hDefaultFont == infoPtr->hFont || !infoPtr->hFont); + LOGFONTW logFont; + SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); + + if (infoPtr->autoSpacing) + LISTVIEW_SetIconSpacing(infoPtr, -1, -1); + + if (infoPtr->hDefaultFont) + DeleteObject(infoPtr->hDefaultFont); + infoPtr->hDefaultFont = CreateFontIndirectW(&logFont); + + if (bDefaultOrNullFont) + infoPtr->hFont = infoPtr->hDefaultFont; + + LISTVIEW_SaveTextMetrics(infoPtr); + LISTVIEW_UpdateItemSize(infoPtr); + LISTVIEW_UpdateScroll(infoPtr); + LISTVIEW_InvalidateRect(infoPtr, NULL); + } + return 0; +#else /* case WM_WININICHANGE: */ +#endif default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) diff --git a/dll/win32/shell32/CDefView.cpp b/dll/win32/shell32/CDefView.cpp index 46322dfec26..60301182694 100644 --- a/dll/win32/shell32/CDefView.cpp +++ b/dll/win32/shell32/CDefView.cpp @@ -3008,6 +3008,7 @@ LRESULT CDefView::OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL if (wParam == SPI_SETDESKWALLPAPER || wParam == 0) UpdateListColors(); + m_ListView.SendMessage(uMsg, wParam, lParam); return S_OK; }

3 months, 2 weeks

[reactos] 02/02: [SETUPLIB][REACTOS][USETUP] Don't export setup data. Make IsUnattendedSetup local to the installer.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e53386de965211e954e2… commit 8e53386de965211e954e2a944fbca35d47edad5a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 14 13:52:22 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 14 21:38:39 2025 +0100 [SETUPLIB][REACTOS][USETUP] Don't export setup data. Make IsUnattendedSetup local to the installer. --- base/setup/lib/bootsup.c | 3 +- base/setup/lib/setuplib.c | 7 +++-- base/setup/lib/setuplib.h | 4 +-- base/setup/lib/setuplib.spec | 8 ++---- base/setup/lib/utils/partinfo.c | 64 +++++++++++++++++++++++++++++++++++++---- base/setup/lib/utils/partinfo.h | 30 +++++-------------- base/setup/reactos/drivepage.c | 32 ++++----------------- base/setup/reactos/reactos.c | 4 +-- base/setup/usetup/partlist.c | 32 ++++----------------- base/setup/usetup/usetup.c | 4 +-- 10 files changed, 89 insertions(+), 99 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 1ee5f8c133d..aa0ed8f3194 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -19,7 +19,8 @@ #include "bootcode.h" #include "fsutil.h" -#include "setuplib.h" // HACK for IsUnattendedSetup +#include "setuplib.h" +extern BOOLEAN IsUnattendedSetup; // HACK #include "bootsup.h" diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 862c9020719..a4b80bd2a13 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -27,7 +27,7 @@ BOOLEAN IsUnattendedSetup = FALSE; /* FUNCTIONS ****************************************************************/ -VOID +BOOLEAN NTAPI CheckUnattendedSetup( IN OUT PUSETUP_DATA pSetupData) @@ -47,7 +47,7 @@ CheckUnattendedSetup( if (DoesFileExist(NULL, UnattendInfPath) == FALSE) { DPRINT("Does not exist: %S\n", UnattendInfPath); - return; + return IsUnattendedSetup; } /* Load 'unattend.inf' from installation media */ @@ -59,7 +59,7 @@ CheckUnattendedSetup( if (UnattendInf == INVALID_HANDLE_VALUE) { DPRINT("SpInfOpenInfFile() failed\n"); - return; + return IsUnattendedSetup; } /* Open 'Unattend' section */ @@ -200,6 +200,7 @@ CheckUnattendedSetup( Quit: SpInfCloseInfFile(UnattendInf); + return IsUnattendedSetup; } VOID diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 3b513f7d2b8..d0b49a7757c 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -30,8 +30,6 @@ extern "C" { #endif -extern SPLIBAPI BOOLEAN IsUnattendedSetup; // HACK - /* NOTE: Please keep the header inclusion order! */ #include "errorcode.h" @@ -167,7 +165,7 @@ typedef struct _USETUP_DATA #include "substset.h" -VOID +BOOLEAN NTAPI CheckUnattendedSetup( IN OUT PUSETUP_DATA pSetupData); diff --git a/base/setup/lib/setuplib.spec b/base/setup/lib/setuplib.spec index a2809a06b0a..acfaa4ce680 100644 --- a/base/setup/lib/setuplib.spec +++ b/base/setup/lib/setuplib.spec @@ -1,8 +1,4 @@ -@ extern IsUnattendedSetup -@ extern MbrPartitionTypes -@ extern GptPartitionTypes - ;; fileqsup and infsupp function pointers to be initialized by the user of this library ;;@ extern SpFileExports ;;@ extern SpInfExports @@ -10,7 +6,6 @@ ;; infsupp @ cdecl INF_GetDataField(ptr long ptr) ## -private - ;; filesup @ cdecl ConcatPathsV(ptr long long ptr) @ cdecl CombinePathsV(ptr long long ptr) @@ -44,6 +39,9 @@ @ cdecl IsPartitionActive(ptr) ## -private @ cdecl SelectPartition(ptr long long) +;; partinfo +@ stdcall LookupPartitionTypeString(long ptr) + ;; osdetect @ stdcall CreateNTOSInstallationsList(ptr) @ stdcall FindSubStrI(wstr wstr) diff --git a/base/setup/lib/utils/partinfo.c b/base/setup/lib/utils/partinfo.c index 064b7dc633e..6f813b97c51 100644 --- a/base/setup/lib/utils/partinfo.c +++ b/base/setup/lib/utils/partinfo.c @@ -1,14 +1,14 @@ /* * PROJECT: ReactOS Setup Library - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: MBR and GPT Partition types - * COPYRIGHT: Copyright 2018-2020 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2018-2025 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include "precomp.h" #include "partinfo.h" -/* MBR PARTITION TYPES ******************************************************/ +/* MBR PARTITION TYPES *******************************************************/ /* * This partition type list is based from: @@ -42,8 +42,14 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +typedef struct _MBR_PARTITION_TYPE +{ + UCHAR Type; + PCSTR Description; +} MBR_PARTITION_TYPE, *PMBR_PARTITION_TYPE; + /* Known MBR partition type codes and descriptions */ -const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES] = +const MBR_PARTITION_TYPE MbrPartitionTypes[] = { { 0x00, "(Empty)" }, // PARTITION_ENTRY_UNUSED { 0x01, "FAT12" }, // PARTITION_FAT_12 @@ -201,7 +207,7 @@ const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES] = }; -/* GPT PARTITION TYPES ******************************************************/ +/* GPT PARTITION TYPES *******************************************************/ #define GUID_CONST(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } @@ -267,8 +273,14 @@ DEFINE_GUID(PARTITION_DPP_GUID, 0x57434F53, 0x94CB, 0x43F0, 0xA5, 0 * https://www.magnumdb.com/search?q=PARTITION_* */ +typedef struct _GPT_PARTITION_TYPE +{ + GUID Guid; + PCSTR Description; +} GPT_PARTITION_TYPE, *PGPT_PARTITION_TYPE; + /* Known GPT partition type GUIDs and descriptions */ -const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES] = +const GPT_PARTITION_TYPE GptPartitionTypes[] = { /* * EFI specification @@ -784,4 +796,44 @@ const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES] = "ArcaOS Type 1" }, }; + +/* PARTITION TYPES LOOKUP ****************************************************/ + +PCSTR +NTAPI +LookupPartitionTypeString( + _In_ PARTITION_STYLE PartitionStyle, + _In_ PVOID PartitionType) +{ + UINT i; + + /* Do the table lookup */ + if (PartitionStyle == PARTITION_STYLE_MBR) + { + for (i = 0; i < _countof(MbrPartitionTypes); ++i) + { + if (*(PUCHAR)PartitionType == MbrPartitionTypes[i].Type) + { + return MbrPartitionTypes[i].Description; + } + } + } +#if 0 // TODO: GPT support! + else if (PartitionStyle == PARTITION_STYLE_GPT) + { + for (i = 0; i < _countof(GptPartitionTypes); ++i) + { + if (IsEqualPartitionType((PGUID)PartitionType, + &GptPartitionTypes[i].Guid)) + { + return GptPartitionTypes[i].Description; + } + } + } +#endif + + /* The partition type is unknown */ + return NULL; +} + /* EOF */ diff --git a/base/setup/lib/utils/partinfo.h b/base/setup/lib/utils/partinfo.h index dac7af89158..774a39982b3 100644 --- a/base/setup/lib/utils/partinfo.h +++ b/base/setup/lib/utils/partinfo.h @@ -1,32 +1,16 @@ /* * PROJECT: ReactOS Setup Library - * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: MBR and GPT Partition types - * COPYRIGHT: Copyright 2018-2020 Hermes Belusca-Maito + * COPYRIGHT: Copyright 2018-2025 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #pragma once -/* MBR PARTITION TYPES ******************************************************/ - -typedef struct _MBR_PARTITION_TYPE -{ - UCHAR Type; - PCSTR Description; -} MBR_PARTITION_TYPE, *PMBR_PARTITION_TYPE; - -#define NUM_MBR_PARTITION_TYPES 153 -extern SPLIBAPI const MBR_PARTITION_TYPE MbrPartitionTypes[NUM_MBR_PARTITION_TYPES]; - -/* GPT PARTITION TYPES ******************************************************/ - -typedef struct _GPT_PARTITION_TYPE -{ - GUID Guid; - PCSTR Description; -} GPT_PARTITION_TYPE, *PGPT_PARTITION_TYPE; - -#define NUM_GPT_PARTITION_TYPES 177 -extern SPLIBAPI const GPT_PARTITION_TYPE GptPartitionTypes[NUM_GPT_PARTITION_TYPES]; +PCSTR +NTAPI +LookupPartitionTypeString( + _In_ PARTITION_STYLE PartitionStyle, + _In_ PVOID PartitionType); /* EOF */ diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index dc4fc64cfb5..274aa069ac3 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -896,36 +896,14 @@ GetPartitionTypeString( } else { - UINT i; - /* Do the table lookup */ - if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_MBR) - { - for (i = 0; i < ARRAYSIZE(MbrPartitionTypes); ++i) - { - if (PartEntry->PartitionType == MbrPartitionTypes[i].Type) - { - StringCchCopyA(strBuffer, cchBuffer, - MbrPartitionTypes[i].Description); - return; - } - } - } -#if 0 // TODO: GPT support! - else if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + PCSTR Description = LookupPartitionTypeString(PartEntry->DiskEntry->DiskStyle, + &PartEntry->PartitionType); + if (Description) { - for (i = 0; i < ARRAYSIZE(GptPartitionTypes); ++i) - { - if (IsEqualPartitionType(PartEntry->PartitionType, - GptPartitionTypes[i].Guid)) - { - StringCchCopyA(strBuffer, cchBuffer, - GptPartitionTypes[i].Description); - return; - } - } + StringCchCopyA(strBuffer, cchBuffer, Description); + return; } -#endif /* We are here because the partition type is unknown */ if (cchBuffer > 0) *strBuffer = '\0'; diff --git a/base/setup/reactos/reactos.c b/base/setup/reactos/reactos.c index 35a68250ff6..d84d3da37a6 100644 --- a/base/setup/reactos/reactos.c +++ b/base/setup/reactos/reactos.c @@ -39,6 +39,7 @@ HANDLE ProcessHeap; SETUPDATA SetupData; +static BOOLEAN IsUnattendedSetup; /* The partition where to perform the installation */ PPARTENTRY InstallPartition = NULL; @@ -2880,8 +2881,7 @@ _tWinMain(HINSTANCE hInst, } /* Retrieve any supplemental options from the unattend file */ - CheckUnattendedSetup(&SetupData.USetupData); - SetupData.bUnattend = IsUnattendedSetup; // FIXME :-) + SetupData.bUnattend = IsUnattendedSetup = CheckUnattendedSetup(&SetupData.USetupData); /* Load extra setup data (HW lists etc...) */ if (!LoadSetupData(&SetupData)) diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index a7eb50a8b59..7d41bea9c3c 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -49,36 +49,14 @@ GetPartitionTypeString( } else { - UINT i; - /* Do the table lookup */ - if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_MBR) - { - for (i = 0; i < ARRAYSIZE(MbrPartitionTypes); ++i) - { - if (PartEntry->PartitionType == MbrPartitionTypes[i].Type) - { - RtlStringCchCopyA(strBuffer, cchBuffer, - MbrPartitionTypes[i].Description); - return; - } - } - } -#if 0 // TODO: GPT support! - else if (PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_GPT) + PCSTR Description = LookupPartitionTypeString(PartEntry->DiskEntry->DiskStyle, + &PartEntry->PartitionType); + if (Description) { - for (i = 0; i < ARRAYSIZE(GptPartitionTypes); ++i) - { - if (IsEqualPartitionType(PartEntry->PartitionType, - GptPartitionTypes[i].Guid)) - { - RtlStringCchCopyA(strBuffer, cchBuffer, - GptPartitionTypes[i].Description); - return; - } - } + RtlStringCchCopyA(strBuffer, cchBuffer, Description); + return; } -#endif /* We are here because the partition type is unknown */ if (cchBuffer > 0) *strBuffer = '\0'; diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 13b4238aa46..d3c62e6b490 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -42,6 +42,7 @@ HANDLE ProcessHeap; static USETUP_DATA USetupData; +static BOOLEAN IsUnattendedSetup; /* The partition where to perform the installation */ static PPARTENTRY InstallPartition = NULL; @@ -604,8 +605,7 @@ SetupStartPage(PINPUT_RECORD Ir) if (WaitNoPendingInstallEvents(NULL) != STATUS_WAIT_0) DPRINT1("WaitNoPendingInstallEvents() failed to wait!\n"); - CheckUnattendedSetup(&USetupData); - + IsUnattendedSetup = CheckUnattendedSetup(&USetupData); if (IsUnattendedSetup) { // TODO: Read options from inf

3 months, 2 weeks

[reactos] 01/02: [SDK:MC] Fix basic english typos in some messages.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d80203d65b76ded1ed2a… commit 8d80203d65b76ded1ed2a398dfdea112a9fcf83a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 13 20:40:23 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 14 21:38:38 2025 +0100 [SDK:MC] Fix basic english typos in some messages. --- sdk/include/reactos/mc/errcodes.mc | 12 ++++++------ sdk/include/reactos/mc/ntstatus.mc | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/include/reactos/mc/errcodes.mc b/sdk/include/reactos/mc/errcodes.mc index 550e563d9f0..a74bea47dd9 100644 --- a/sdk/include/reactos/mc/errcodes.mc +++ b/sdk/include/reactos/mc/errcodes.mc @@ -6145,16 +6145,16 @@ Severity=Success Facility=System SymbolicName=ERROR_FAILED_DRIVER_ENTRY Language=English -The driver was not loaded because it failed it's initialization call. +The driver was not loaded because it failed its initialization call. . Language=Russian -The driver was not loaded because it failed it's initialization call. +The driver was not loaded because it failed its initialization call. . Language=Polish Sterownik nie został załadowany, ponieważ nie powiodło się wywołanie jego inicjalizacji. . Language=Romanian -The driver was not loaded because it failed it's initialization call. +The driver was not loaded because it failed its initialization call. . Language=Japanese ドライバの初期化コールに失敗したため、ドライバがロードされませんでした。 @@ -34540,16 +34540,16 @@ Severity=Success Facility=System SymbolicName=ERROR_DS_LDAP_SEND_QUEUE_FULL Language=English -The LDAP servers network send queue has filled up because the client is not processing the results of it's requests fast enough. No more requests will be processed until the client catches up. If the client does not catch up then it will be disconnected. +The LDAP servers network send queue has filled up because the client is not processing the results of its requests fast enough. No more requests will be processed until the client catches up. If the client does not catch up then it will be disconnected. . Language=Russian -The LDAP servers network send queue has filled up because the client is not processing the results of it's requests fast enough. No more requests will be processed until the client catches up. If the client does not catch up then it will be disconnected. +The LDAP servers network send queue has filled up because the client is not processing the results of its requests fast enough. No more requests will be processed until the client catches up. If the client does not catch up then it will be disconnected. . Language=Polish Kolejka odbiorcza sieci serwerów LDAP wypełniła się, ponieważ klient nie przetwarza odpowiednio szybko wyników swoich żądań. Żadne żądania nie będą przetwarzane do czasu wyrównania klienta. Jeżeli klient nie zostanie wyrównany, zostanie rozłączony. . Language=Romanian -The LDAP servers network send queue has filled up because the client is not processing the results of it's requests fast enough. No more requests will be processed until the client catches up. If the client does not catch up then it will be disconnected. +The LDAP servers network send queue has filled up because the client is not processing the results of its requests fast enough. No more requests will be processed until the client catches up. If the client does not catch up then it will be disconnected. . Language=Japanese クライアントが要求の結果を十分に速く処理できないため、LDAPサーバーのネットワーク送信キューがいっぱいになりました。クライアントが追いつくまで、これ以上のリクエストは処理されません。クライアントが追いつかない場合、クライアントは切断されます。 diff --git a/sdk/include/reactos/mc/ntstatus.mc b/sdk/include/reactos/mc/ntstatus.mc index 86c69332ae0..0794625812c 100644 --- a/sdk/include/reactos/mc/ntstatus.mc +++ b/sdk/include/reactos/mc/ntstatus.mc @@ -1045,7 +1045,7 @@ Severity=Warning Facility=System SymbolicName=STATUS_DEVICE_DOOR_OPEN Language=English -The device has indicated that it's door is open. Further operations require it closed and secured. +The device has indicated that its door is open. Further operations require it closed and secured. . MessageId=0x1 @@ -4369,7 +4369,7 @@ Severity=Error Facility=System SymbolicName=STATUS_FAILED_DRIVER_ENTRY Language=English -The driver was not loaded because it failed it's initialization call. +The driver was not loaded because it failed its initialization call. . MessageId=0x366

3 months, 2 weeks

[reactos] 01/01: [DXDIAG] Romanian (ro-RO): Fix unrecognized escape sequence (#7781)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=135a9a95b882fb9ac1432… commit 135a9a95b882fb9ac1432bed8d4745c70898defe Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 13 22:57:08 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 13 22:57:08 2025 +0900 [DXDIAG] Romanian (ro-RO): Fix unrecognized escape sequence (#7781) JIRA issue: N/A Fix IDS_DDPRIMARY_DESCRIPTION escape sequence. --- base/applications/dxdiag/lang/ro-RO.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/dxdiag/lang/ro-RO.rc b/base/applications/dxdiag/lang/ro-RO.rc index 92755011343..bfde7621fa4 100644 --- a/base/applications/dxdiag/lang/ro-RO.rc +++ b/base/applications/dxdiag/lang/ro-RO.rc @@ -239,7 +239,7 @@ BEGIN IDS_REG_FAIL "Eroare" IDS_DDTEST_ERROR "Testul de randare DirectDraw a eșuat.\nVă rugăm să consultați notele pentru mai multe informații." IDS_DDTEST_DESCRIPTION "Acesta va porni testarea interfeței DirectDraw. Doriți să continuați?" - IDS_DDPRIMARY_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena pe suprafața principală.\Ar trebui desenate dreptunghiuri alb-negru. Doriți să continuați?" + IDS_DDPRIMARY_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena pe suprafața principală.\nAr trebui desenate dreptunghiuri alb-negru. Doriți să continuați?" IDS_DDPRIMARY_RESULT "Ați văzut dreptunghiuri alb-negru?" IDS_DDOFFSCREEN_DESCRIPTION "Acest test va folosi DirectDraw pentru a desena un tampon în afara ecranului. Ar trebui desenat un dreptunghi alb în mișcare. Doriți să continuați?" IDS_DDOFFSCREEN_RESULT "Ați văzut dreptunghi alb în mișcare?"

3 months, 2 weeks

[reactos] 01/01: [REGEDIT] Reduce flickering and fix rendering (#7747)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6302ccd70a7af896dc70… commit e6302ccd70a7af896dc706c0941a559cff9300ff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Mar 13 19:33:14 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 13 19:33:14 2025 +0900 [REGEDIT] Reduce flickering and fix rendering (#7747) JIRA issue: CORE-19970 - Fix status bar toggling. - Improve behaviour of splitter. - Add (WS_CLIPCHILDREN | WS_CLIPSIBLINGS) style to ChildWnd. --- base/applications/regedit/childwnd.c | 19 +++++++++++++------ base/applications/regedit/framewnd.c | 3 ++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index 1cd0dc787ed..6ba0758bbbf 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -11,7 +11,7 @@ #include <shlguid.h> ChildWnd* g_pChildWnd; -static int last_split; +static int last_split = -1; HBITMAP SizingPattern; HBRUSH SizingBrush; WCHAR Suggestions[256]; @@ -99,16 +99,20 @@ extern void ResizeWnd(int cx, int cy) const int nButtonWidth = 44; const int nButtonHeight = 22; int cyEdge = GetSystemMetrics(SM_CYEDGE); - const UINT uFlags = SWP_NOZORDER | SWP_NOACTIVATE; - SetRect(&rt, 0, 0, cx, cy); + const UINT uFlags = SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS; + cy = 0; - if (hStatusBar != NULL) + if (IsWindowVisible(hStatusBar)) { GetWindowRect(hStatusBar, &rs); cy = rs.bottom - rs.top; } + GetWindowRect(g_pChildWnd->hAddressBtnWnd, &rb); + GetClientRect(g_pChildWnd->hWnd, &rt); + RedrawWindow(g_pChildWnd->hWnd, &rt, NULL, RDW_INVALIDATE | RDW_NOCHILDREN); + g_pChildWnd->nSplitPos = ClampSplitBarX(g_pChildWnd->hWnd, g_pChildWnd->nSplitPos); cx = g_pChildWnd->nSplitPos + SPLIT_WIDTH / 2; @@ -148,7 +152,7 @@ static void draw_splitbar(HWND hWnd, int x) { RECT rt; HGDIOBJ OldObj; - HDC hdc = GetDC(hWnd); + HDC hdc = GetDCEx(hWnd, NULL, DCX_CACHE); if(!SizingPattern) { @@ -159,7 +163,10 @@ static void draw_splitbar(HWND hWnd, int x) { SizingBrush = CreatePatternBrush(SizingPattern); } - GetClientRect(hWnd, &rt); + + GetWindowRect(g_pChildWnd->hTreeWnd, &rt); + MapWindowPoints(NULL, hWnd, (POINT *)&rt, sizeof(rt) / sizeof(POINT)); + rt.left = x - SPLIT_WIDTH/2; rt.right = x + SPLIT_WIDTH/2+1; OldObj = SelectObject(hdc, SizingBrush); diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index e22f383d970..95f5cf9e9ec 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -1446,7 +1446,8 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa // For now, the Help dialog item is disabled because of lacking of HTML Help support EnableMenuItem(GetMenu(hWnd), ID_HELP_HELPTOPICS, MF_BYCOMMAND | MF_GRAYED); GetClientRect(hWnd, &rc); - CreateWindowExW(0, szChildClass, NULL, WS_CHILD | WS_VISIBLE, + CreateWindowExW(0, szChildClass, NULL, + WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, hWnd, (HMENU)0, hInst, 0); break;

3 months, 2 weeks

[reactos] 01/01: [NTOS:KE] Implement KeI386VirtualIntExtensions code paths for INT and IRET. CORE-19049 (#7742)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=656a5dcc1fd6fac455a46… commit 656a5dcc1fd6fac455a469a39383ceeb4533f1f7 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Wed Mar 12 05:24:36 2025 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 12 05:24:36 2025 -0700 [NTOS:KE] Implement KeI386VirtualIntExtensions code paths for INT and IRET. CORE-19049 (#7742) Co-authored-by: Thomas Faber <thomas.faber(a)reactos.org> Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> Continued from PR #6070 JIRA issue: CORE-19049 --- ntoskrnl/ke/i386/v86vdm.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/ke/i386/v86vdm.c b/ntoskrnl/ke/i386/v86vdm.c index a50f3aba188..b4790d146f6 100644 --- a/ntoskrnl/ke/i386/v86vdm.c +++ b/ntoskrnl/ke/i386/v86vdm.c @@ -191,13 +191,21 @@ KiVdmOpcodeINTnn(IN PKTRAP_FRAME TrapFrame, V86EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_INTERRUPT_MASK); /* Check for VME support */ - ASSERT(KeI386VirtualIntExtensions == FALSE); + if (KeI386VirtualIntExtensions) + { + /* Set IF based on VIF */ + V86EFlags &= ~EFLAGS_INTERRUPT_MASK; + if (TrapEFlags & EFLAGS_VIF) + { + V86EFlags |= EFLAGS_INTERRUPT_MASK; + } + } /* Mask in the relevant V86 EFlags into the trap flags */ V86EFlags |= (TrapEFlags & ~EFLAGS_INTERRUPT_MASK); /* And mask out the VIF, nested task and TF flag from the trap flags */ - TrapFrame->EFlags = TrapEFlags &~ (EFLAGS_VIF | EFLAGS_NESTED_TASK | EFLAGS_TF); + TrapFrame->EFlags = TrapEFlags & ~(EFLAGS_VIF | EFLAGS_NESTED_TASK | EFLAGS_TF); /* Add the IOPL flag to the local trap flags */ V86EFlags |= EFLAGS_IOPL; @@ -299,11 +307,17 @@ KiVdmOpcodeIRET(IN PKTRAP_FRAME TrapFrame, } /* Mask out EFlags */ - EFlags &= ~(EFLAGS_IOPL + EFLAGS_VIF + EFLAGS_NESTED_TASK + EFLAGS_VIP); + EFlags &= ~(EFLAGS_VIP | EFLAGS_VIF | EFLAGS_NESTED_TASK | EFLAGS_IOPL); V86EFlags = EFlags; /* Check for VME support */ - ASSERT(KeI386VirtualIntExtensions == FALSE); + if (KeI386VirtualIntExtensions) + { + if (EFlags & EFLAGS_INTERRUPT_MASK) + { + EFlags |= EFLAGS_VIF; + } + } /* Add V86 and Interrupt flag */ EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK;

3 months, 3 weeks

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2025