Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [RUNDLL32] Try to resolve the manifest file manually
by Mark Jansen 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e16f2878906dd332ab6c… commit 8e16f2878906dd332ab6caa5c597deec14a40363 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 15 11:40:22 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 19 19:39:29 2022 +0200 [RUNDLL32] Try to resolve the manifest file manually This fixes f.e. Ctrl+A not working in the Create Shortcut wizard CORE-16669 --- base/system/rundll32/rundll32.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/base/system/rundll32/rundll32.c b/base/system/rundll32/rundll32.c index 23bba1e2539..8c14009e8b9 100644 --- a/base/system/rundll32/rundll32.c +++ b/base/system/rundll32/rundll32.c @@ -337,6 +337,7 @@ int WINAPI _tWinMain( LPTSTR *argv; LPTSTR lptCmdLine,lptDllName,lptFuncName,lptMsgBuffer; + WCHAR ResolvedFile[MAX_PATH + 1] = {0}, *lpManifestName; LPSTR lpFuncName,lpaCmdLine; LPWSTR lpwCmdLine; HMODULE hDll; @@ -386,7 +387,18 @@ int WINAPI _tWinMain( else lptCmdLine = _T(""); - ActCtx.lpSource = lptDllName; + lpManifestName = lptDllName; + if (GetFileAttributesW(lptDllName) == INVALID_FILE_ATTRIBUTES) + { + LPWSTR FilePart = NULL; + if (SearchPathW(NULL, lptDllName, NULL, _countof(ResolvedFile) - 1, ResolvedFile, &FilePart)) + { + lpManifestName = ResolvedFile; + } + } + + // FIXME: If there is a .manifest file next to the input file, we should use that instead! + ActCtx.lpSource = lpManifestName; ActCtx.lpResourceName = (LPCWSTR)123; hActCtx = CreateActCtx(&ActCtx); bActivated = (hActCtx != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx, &cookie) : FALSE);

1 0

[reactos] 01/01: [SHELL32] Fix 'Paste' command in context menu not working
by Mark Jansen 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0452d3415aa65ae1c2f29… commit 0452d3415aa65ae1c2f291ec5b22c12d01fecd19 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Oct 15 12:32:43 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 19 19:38:33 2022 +0200 [SHELL32] Fix 'Paste' command in context menu not working Bug found by Rosen Iliev --- dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 15acfae51a3..ecb456661ae 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -1222,7 +1222,7 @@ CDefaultContextMenu::InvokeCommand( if (LocalInvokeInfo.cbSize >= sizeof(CMINVOKECOMMANDINFOEX) && (LocalInvokeInfo.fMask & CMIC_MASK_PTINVOKE)) { - if (FAILED_UNEXPECTEDLY(DataObject_SetOffset(m_pDataObj, &LocalInvokeInfo.ptInvoke))) + if (m_pDataObj && FAILED_UNEXPECTEDLY(DataObject_SetOffset(m_pDataObj, &LocalInvokeInfo.ptInvoke))) { ERR("Unable to add OFFSET to DataObject!\n"); }

1 0

[reactos] 01/01: [SHELL32] Fix menu item handling
by Mark Jansen 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bd86b8487058b7a8d75c… commit 5bd86b8487058b7a8d75c9dfcbbca861e20cff49 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Oct 16 00:51:19 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 19 19:37:41 2022 +0200 [SHELL32] Fix menu item handling This restores the 'properties' functionality on the desktop Bug found by Hervé Poussineau --- dll/win32/shell32/CDefaultContextMenu.cpp | 2 +- dll/win32/shell32/folders/CDesktopFolder.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index 10cffcfe4f2..15acfae51a3 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -646,7 +646,7 @@ CDefaultContextMenu::QueryContextMenu( QCMINFO qcminfo = {hMenu, IndexMenu, idCmdNext, idCmdLast, NULL}; if (SUCCEEDED(_DoCallback(DFM_MERGECONTEXTMENU, uFlags, &qcminfo))) { - UINT added = idCmdNext - (idCmdFirst + cIds); + UINT added = qcminfo.idCmdFirst - idCmdNext; cIds += added; IndexMenu += added; m_iIdCBFirst = m_iIdSHELast; diff --git a/dll/win32/shell32/folders/CDesktopFolder.cpp b/dll/win32/shell32/folders/CDesktopFolder.cpp index 3e7c3b950e6..8aa1e089fff 100644 --- a/dll/win32/shell32/folders/CDesktopFolder.cpp +++ b/dll/win32/shell32/folders/CDesktopFolder.cpp @@ -860,7 +860,7 @@ HRESULT WINAPI CDesktopFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IData QCMINFO *pqcminfo = (QCMINFO *)lParam; HMENU hpopup = CreatePopupMenu(); _InsertMenuItemW(hpopup, 0, TRUE, 0, MFT_STRING, MAKEINTRESOURCEW(IDS_PROPERTIES), MFS_ENABLED); - Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu++, pqcminfo->idCmdFirst, pqcminfo->idCmdLast, MM_ADDSEPARATOR); + Shell_MergeMenus(pqcminfo->hmenu, hpopup, pqcminfo->indexMenu, pqcminfo->idCmdFirst++, pqcminfo->idCmdLast, MM_ADDSEPARATOR); DestroyMenu(hpopup); } @@ -887,4 +887,4 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) TRACE("-- %p->(%p)\n",psf, *psf); return hres; -} \ No newline at end of file +}

1 0

[reactos] 01/01: [SYSSETUP] Add support for shortcut arguments
by Mark Jansen 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b33915adc92b76c80a97… commit 7b33915adc92b76c80a97a81899f11a135ed1df4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Sep 26 17:26:03 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed Oct 19 19:36:26 2022 +0200 [SYSSETUP] Add support for shortcut arguments --- dll/win32/syssetup/install.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dll/win32/syssetup/install.c b/dll/win32/syssetup/install.c index 4a89017d5bc..fe2ccf89394 100644 --- a/dll/win32/syssetup/install.c +++ b/dll/win32/syssetup/install.c @@ -121,7 +121,8 @@ CreateShortcut( LPCWSTR pszCommand, LPCWSTR pszDescription, INT iIconNr, - LPCWSTR pszWorkingDir) + LPCWSTR pszWorkingDir, + LPCWSTR pszArgs) { DWORD dwLen; LPWSTR Ptr; @@ -170,7 +171,7 @@ CreateShortcut( /* Create the shortcut */ return SUCCEEDED(CreateShellLink(szPath, pszCommand, - L"", + pszArgs, pszWorkingDir, /* Special value to indicate no icon */ (iIconNr != -1 ? pszCommand : NULL), @@ -188,6 +189,7 @@ static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR psz WCHAR szName[MAX_PATH]; WCHAR szDescription[MAX_PATH]; WCHAR szDirectory[MAX_PATH]; + WCHAR szArgs[MAX_PATH]; if (!SetupFindFirstLine(hinf, pszSection, NULL, &Context)) return FALSE; @@ -213,9 +215,12 @@ static BOOL CreateShortcutsFromSection(HINF hinf, LPWSTR pszSection, LPCWSTR psz if (dwFieldCount < 5 || !SetupGetStringFieldW(&Context, 5, szDirectory, ARRAYSIZE(szDirectory), NULL)) szDirectory[0] = L'\0'; + if (dwFieldCount < 6 || !SetupGetStringFieldW(&Context, 6, szArgs, ARRAYSIZE(szArgs), NULL)) + szArgs[0] = L'\0'; + wcscat(szName, L".lnk"); - CreateShortcut(pszFolder, szName, szCommand, szDescription, iIconNr, szDirectory); + CreateShortcut(pszFolder, szName, szCommand, szDescription, iIconNr, szDirectory, szArgs); } while (SetupFindNextLine(&Context, &Context));

1 0

[reactos] 01/01: [FREELDR] Partially implement docking station detection (#4751)
by Dmitry Borisov 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d06e79373bdc39ee69b7… commit 9d06e79373bdc39ee69b70bba2b3293341874b27 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Wed Oct 19 20:48:27 2022 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 19 16:48:27 2022 +0200 [FREELDR] Partially implement docking station detection (#4751) --- boot/freeldr/freeldr/arch/amd64/pnpbios.S | 55 +++++++++++++++------- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 59 ++++++++++++++++++++++++ boot/freeldr/freeldr/arch/i386/pnpbios.S | 57 ++++++++++++++++------- boot/freeldr/freeldr/arch/realmode/amd64.S | 2 + boot/freeldr/freeldr/arch/realmode/i386.S | 2 + boot/freeldr/freeldr/arch/realmode/pnp.inc | 25 ++++++++++ boot/freeldr/freeldr/include/arch/pc/hardware.h | 1 + boot/freeldr/freeldr/include/arch/pc/pcbios.h | 6 +++ boot/freeldr/freeldr/include/arch/pc/x86common.h | 1 + 9 files changed, 175 insertions(+), 33 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/pnpbios.S b/boot/freeldr/freeldr/arch/amd64/pnpbios.S index 8dd44e933ca..4651f3bb0b0 100644 --- a/boot/freeldr/freeldr/arch/amd64/pnpbios.S +++ b/boot/freeldr/freeldr/arch/amd64/pnpbios.S @@ -1,21 +1,9 @@ /* - * FreeLoader - * Copyright (C) 2003 Eric Kohl - * Copyright (C) 2011 Timo Kreuzer - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PnP BIOS helper functions + * COPYRIGHT: Copyright 2003 Eric Kohl <eric.kohl(a)reactos.org> + * Copyright 2011 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ #include <asm.inc> @@ -170,5 +158,38 @@ PnpBiosGetDeviceNode: ret + +/* + * U32 PnpBiosGetDockStationInformation(U8 *DockingStationInfo<rcx>); + * + * RETURNS: + */ +PUBLIC PnpBiosGetDockStationInformation +PnpBiosGetDockStationInformation: + + /* Convert pointer to info structure to segment/offset */ + mov rax, rcx + shr eax, 4 + mov word ptr [BSS_PnpBiosBufferSegment], ax + mov rax, rcx + and eax, HEX(0f) + mov word ptr [BSS_PnpBiosBufferOffset], ax + + /* Save registers */ + push rcx + push rbx + + /* Call the real mode function */ + mov bx, FNID_PnpBiosGetDockStationInformation + call CallRealMode + + /* Restore registers */ + pop rbx + pop rcx + + mov eax, dword ptr [BSS_PnpResult] + + ret + END /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 8ac4139442a..43baec3b491 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -177,6 +177,63 @@ PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) return PartialResourceList; } +static +VOID +DetectDockingStation( + _Inout_ PCONFIGURATION_COMPONENT_DATA BusKey) +{ + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + PCONFIGURATION_COMPONENT_DATA PeripheralKey; + PDOCKING_STATE_INFORMATION DockingState; + ULONG Size, Result; + + Result = PnpBiosGetDockStationInformation(DiskReadBuffer); + + /* Build full device descriptor */ + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + + sizeof(DOCKING_STATE_INFORMATION); + PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); + if (PartialResourceList == NULL) + { + ERR("Failed to allocate resource descriptor\n"); + return; + } + + /* Initialize resource descriptor */ + RtlZeroMemory(PartialResourceList, Size); + PartialResourceList->Version = 0; + PartialResourceList->Revision = 0; + PartialResourceList->Count = 1; + + /* Set device specific data */ + PartialDescriptor = &PartialResourceList->PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeDeviceSpecific; + PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; + PartialDescriptor->Flags = 0; + PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(DOCKING_STATE_INFORMATION); + + DockingState = (PDOCKING_STATE_INFORMATION)&PartialResourceList->PartialDescriptors[1]; + DockingState->ReturnCode = Result; + if (Result == 0) + { + /* FIXME: Add more device specific data */ + ERR("FIXME: System docked\n"); + } + + /* Create controller key */ + FldrCreateComponentKey(BusKey, + PeripheralClass, + DockingInformation, + 0, + 0, + 0xFFFFFFFF, + "Docking State Information", + PartialResourceList, + Size, + &PeripheralKey); +} + static VOID DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) @@ -308,6 +365,8 @@ DetectPnpBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) Size, &BusKey); + DetectDockingStation(BusKey); + (*BusNumber)++; } diff --git a/boot/freeldr/freeldr/arch/i386/pnpbios.S b/boot/freeldr/freeldr/arch/i386/pnpbios.S index e77b43fb201..018af55ca86 100644 --- a/boot/freeldr/freeldr/arch/i386/pnpbios.S +++ b/boot/freeldr/freeldr/arch/i386/pnpbios.S @@ -1,20 +1,8 @@ /* - * FreeLoader - * Copyright (C) 2003 Eric Kohl - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PnP BIOS helper functions + * COPYRIGHT: Copyright 2003 Eric Kohl <eric.kohl(a)reactos.org> */ #include <asm.inc> @@ -179,6 +167,43 @@ _PnpBiosGetDeviceNode: ret + +/* + * U32 PnpBiosGetDockStationInformation(U8 *DockingStationInfo); + * + * RETURNS: + */ +PUBLIC _PnpBiosGetDockStationInformation +_PnpBiosGetDockStationInformation: + + push ebp + mov ebp, esp + + pusha + push es + + /* Convert pointer to info structure to segment/offset */ + mov eax, [ebp + 8] + shr eax, 4 + and eax, HEX(0f000) + mov word ptr ds:[BSS_PnpBiosBufferSegment], ax + mov eax, [ebp + 8] + and eax, HEX(0ffff) + mov word ptr ds:[BSS_PnpBiosBufferOffset], ax + + mov bx, FNID_PnpBiosGetDockStationInformation + call i386CallRealMode + + pop es + popa + + mov esp, ebp + pop ebp + + mov eax, [BSS_PnpResult] + + ret + END /* EOF */ diff --git a/boot/freeldr/freeldr/arch/realmode/amd64.S b/boot/freeldr/freeldr/arch/realmode/amd64.S index d948df6eead..28ade6be943 100644 --- a/boot/freeldr/freeldr/arch/realmode/amd64.S +++ b/boot/freeldr/freeldr/arch/realmode/amd64.S @@ -360,6 +360,7 @@ LongModeEntryPoint: int HEX(16) jmp Reboot +/* FNID_* functions */ CallbackTable: .word Int386 .word Reboot @@ -367,6 +368,7 @@ CallbackTable: .word PxeCallApi .word PnpBiosGetDeviceNodeCount .word PnpBiosGetDeviceNode + .word PnpBiosGetDockStationInformation /* 16-bit stack pointer */ stack16: diff --git a/boot/freeldr/freeldr/arch/realmode/i386.S b/boot/freeldr/freeldr/arch/realmode/i386.S index 5f4d35f70db..d2bcd7b9288 100644 --- a/boot/freeldr/freeldr/arch/realmode/i386.S +++ b/boot/freeldr/freeldr/arch/realmode/i386.S @@ -140,6 +140,7 @@ pm_entrypoint: .long 0 // receives address of PE entry point nop +/* FNID_* functions */ CallbackTable: .word Int386 .word Reboot @@ -147,6 +148,7 @@ CallbackTable: .word PxeCallApi .word PnpBiosGetDeviceNodeCount .word PnpBiosGetDeviceNode + .word PnpBiosGetDockStationInformation /* 16-bit stack pointer */ diff --git a/boot/freeldr/freeldr/arch/realmode/pnp.inc b/boot/freeldr/freeldr/arch/realmode/pnp.inc index dde53fcbf00..610bd1fba79 100644 --- a/boot/freeldr/freeldr/arch/realmode/pnp.inc +++ b/boot/freeldr/freeldr/arch/realmode/pnp.inc @@ -54,3 +54,28 @@ PnpBiosGetDeviceNode: mov dword ptr ds:[BSS_PnpResult], ecx ret + + +PnpBiosGetDockStationInformation: + + /* push bios segment */ + mov ax, word ptr ds:[BSS_PnpBiosDataSegment] + push ax + + /* push pointer to info structure (segment/offset) */ + mov ax, word ptr ds:[BSS_PnpBiosBufferSegment] + push ax + mov ax, word ptr ds:[BSS_PnpBiosBufferOffset] + push ax + + /* push function number */ + push 5 + + /* call entry point */ + call dword ptr ds:[BSS_PnpBiosEntryPoint] + add sp, 8 + + movzx ecx, ax + mov dword ptr ds:[BSS_PnpResult], ecx + + ret diff --git a/boot/freeldr/freeldr/include/arch/pc/hardware.h b/boot/freeldr/freeldr/include/arch/pc/hardware.h index fb547212ea8..de408b74cd9 100644 --- a/boot/freeldr/freeldr/include/arch/pc/hardware.h +++ b/boot/freeldr/freeldr/include/arch/pc/hardware.h @@ -87,6 +87,7 @@ ULONG __cdecl PnpBiosGetDeviceNodeCount(ULONG *NodeSize, ULONG *NodeCount); ULONG __cdecl PnpBiosGetDeviceNode(UCHAR *NodeId, UCHAR *NodeBuffer); +ULONG __cdecl PnpBiosGetDockStationInformation(UCHAR *DockingStationInfo); /* i386pxe.S */ USHORT __cdecl PxeCallApi(USHORT Segment, USHORT Offset, USHORT Service, VOID* Parameter); diff --git a/boot/freeldr/freeldr/include/arch/pc/pcbios.h b/boot/freeldr/freeldr/include/arch/pc/pcbios.h index 3b03a32dbc7..f3539d21426 100644 --- a/boot/freeldr/freeldr/include/arch/pc/pcbios.h +++ b/boot/freeldr/freeldr/include/arch/pc/pcbios.h @@ -79,6 +79,12 @@ typedef struct _ACPI_BIOS_DATA BIOS_MEMORY_MAP MemoryMap[1]; /* Count of BIOS memory map entries */ } ACPI_BIOS_DATA, *PACPI_BIOS_DATA; +typedef struct _DOCKING_STATE_INFORMATION +{ + USHORT Unused[5]; + USHORT ReturnCode; +} DOCKING_STATE_INFORMATION, *PDOCKING_STATE_INFORMATION; + #include <pshpack1.h> typedef struct { diff --git a/boot/freeldr/freeldr/include/arch/pc/x86common.h b/boot/freeldr/freeldr/include/arch/pc/x86common.h index e4c304bb38c..27c377039d5 100644 --- a/boot/freeldr/freeldr/include/arch/pc/x86common.h +++ b/boot/freeldr/freeldr/include/arch/pc/x86common.h @@ -58,6 +58,7 @@ #define FNID_PxeCallApi 3 #define FNID_PnpBiosGetDeviceNodeCount 4 #define FNID_PnpBiosGetDeviceNode 5 +#define FNID_PnpBiosGetDockStationInformation 6 /* Flag Masks */ #define CR0_PE_SET HEX(00000001) /* OR this value with CR0 to enable pmode */

1 0

[reactos] 01/01: [USER32] CliGetPreloadKeyboardLayouts: Use _ultow
by Katayama Hirofumi MZ 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=774c3b3c9226cebd00302… commit 774c3b3c9226cebd00302926db2ac8fa6665ecd2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 19 17:50:47 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Oct 19 17:52:31 2022 +0900 [USER32] CliGetPreloadKeyboardLayouts: Use _ultow CORE-11700 --- win32ss/user/user32/windows/input.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 7c2a3992278..d3b7e114ba9 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -369,7 +369,7 @@ BOOL FASTCALL CliGetImeHotKeysFromRegistry(VOID) VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags) { - WCHAR szValueName[12], szValue[16]; + WCHAR szValueName[33], szValue[16]; UNICODE_STRING ustrValue; DWORD dwKL, cbValue, dwType; UINT iNumber; @@ -382,7 +382,7 @@ VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags) for (iNumber = 1; iNumber < 1000; ++iNumber) { - StringCchPrintfW(szValueName, _countof(szValueName), L"%u", iNumber); + _ultow(iNumber, szValueName, 10); cbValue = sizeof(szValue); error = RegQueryValueExW(hKey, szValueName, NULL, &dwType, (LPBYTE)szValue, &cbValue);

1 0

[reactos] 01/01: [USER32] Fix build; Appendum to 21feb52
by Katayama Hirofumi MZ 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7523bf84a58f8ff808185… commit 7523bf84a58f8ff808185ba2110cf7f07055c3a7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 19 17:40:34 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Oct 19 17:40:40 2022 +0900 [USER32] Fix build; Appendum to 21feb52 CORE-11700 --- win32ss/user/user32/windows/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index af6500dfee5..7c2a3992278 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -382,7 +382,7 @@ VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags) for (iNumber = 1; iNumber < 1000; ++iNumber) { - RtlIntegerToUnicode(iNumber, 10, sizeof(szValueName), szValueName); + StringCchPrintfW(szValueName, _countof(szValueName), L"%u", iNumber); cbValue = sizeof(szValue); error = RegQueryValueExW(hKey, szValueName, NULL, &dwType, (LPBYTE)szValue, &cbValue);

1 0

[reactos] 01/01: [USER32] Improve CliGetPreloadKeyboardLayouts
by Katayama Hirofumi MZ 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21feb529fe59943fe061e… commit 21feb529fe59943fe061ef294cf03662fa966d8e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 19 17:34:43 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Oct 19 17:36:04 2022 +0900 [USER32] Improve CliGetPreloadKeyboardLayouts CORE-11700 --- win32ss/user/user32/windows/input.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index aac99382113..af6500dfee5 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -369,7 +369,7 @@ BOOL FASTCALL CliGetImeHotKeysFromRegistry(VOID) VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags) { - WCHAR szValueName[8], szValue[16]; + WCHAR szValueName[12], szValue[16]; UNICODE_STRING ustrValue; DWORD dwKL, cbValue, dwType; UINT iNumber; @@ -382,14 +382,17 @@ VOID APIENTRY CliGetPreloadKeyboardLayouts(PBYTE pbFlags) for (iNumber = 1; iNumber < 1000; ++iNumber) { - StringCchPrintfW(szValueName, _countof(szValueName), L"%u", iNumber); + RtlIntegerToUnicode(iNumber, 10, sizeof(szValueName), szValueName); cbValue = sizeof(szValue); error = RegQueryValueExW(hKey, szValueName, NULL, &dwType, (LPBYTE)szValue, &cbValue); - if (error != ERROR_SUCCESS || dwType != REG_SZ) + if (error != ERROR_SUCCESS) break; - szValue[_countof(szValue) - 1] = 0; + if (dwType != REG_SZ) + continue; + + szValue[_countof(szValue) - 1] = 0; /* Avoid stack overrun */ RtlInitUnicodeString(&ustrValue, szValue); RtlUnicodeStringToInteger(&ustrValue, 16, &dwKL);

1 0

[reactos] 01/01: [USER32] Improve CliGetImeHotKeysFromRegistry
by Katayama Hirofumi MZ 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=10acb335fa670e2b3865d… commit 10acb335fa670e2b3865d0c2a9b97d8f8c6df7cc Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 19 17:01:20 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Oct 19 17:03:54 2022 +0900 [USER32] Improve CliGetImeHotKeysFromRegistry CORE-11700 --- win32ss/user/user32/windows/input.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 220dd4c3cfe..aac99382113 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -345,19 +345,19 @@ BOOL FASTCALL CliGetImeHotKeysFromRegistry(VOID) error = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Input Method\\Hot Keys", 0, - KEY_ALL_ACCESS, + KEY_READ, &hKey); if (error != ERROR_SUCCESS) return ret; - for (dwIndex = 0; ; ++dwIndex) + for (dwIndex = 0; dwIndex < 1000; ++dwIndex) { cchKeyName = _countof(szKeyName); error = RegEnumKeyExW(hKey, dwIndex, szKeyName, &cchKeyName, NULL, NULL, NULL, NULL); - if (error == ERROR_NO_MORE_ITEMS || error != ERROR_SUCCESS) + if (error != ERROR_SUCCESS) break; - szKeyName[_countof(szKeyName) - 1] = 0; + szKeyName[_countof(szKeyName) - 1] = 0; /* Avoid stack overrun */ if (CliSetSingleHotKey(szKeyName, hKey)) ret = TRUE;

1 0

[reactos] 01/01: [NTUSER][USER32][INCLUDE] s/SETIMEHOTKEY_DELETEALL/SETIMEHOTKEY_INITIALIZE/
by Katayama Hirofumi MZ 19 Oct '22

19 Oct '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dff4579bd6f4f107ef1c1… commit dff4579bd6f4f107ef1c121b841112bdbfa01f2b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 19 12:15:11 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Oct 19 12:15:11 2022 +0900 [NTUSER][USER32][INCLUDE] s/SETIMEHOTKEY_DELETEALL/SETIMEHOTKEY_INITIALIZE/ CORE-11700 --- sdk/include/reactos/undocuser.h | 2 +- win32ss/user/ntuser/ime.c | 2 +- win32ss/user/user32/misc/logon.c | 4 ++-- win32ss/user/user32/windows/input.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index f396c58a7ba..d742e3a541c 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -399,7 +399,7 @@ typedef enum tagSETIMEHOTKEY_ACTION { SETIMEHOTKEY_DELETE = 1, SETIMEHOTKEY_ADD, - SETIMEHOTKEY_DELETEALL + SETIMEHOTKEY_INITIALIZE } SETIMEHOTKEY_ACTION; #ifdef __cplusplus diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 35d8b66bda5..7f252e36af9 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -403,7 +403,7 @@ IntSetImeHotKey(DWORD dwHotKeyId, UINT uModifiers, UINT uVirtualKey, HKL hKL, DW IntAddImeHotKey(&gpImeHotKeyList, pNode); return TRUE; - case SETIMEHOTKEY_DELETEALL: + case SETIMEHOTKEY_INITIALIZE: IntFreeImeHotKeys(); return TRUE; diff --git a/win32ss/user/user32/misc/logon.c b/win32ss/user/user32/misc/logon.c index a763e24e370..69580735fb9 100644 --- a/win32ss/user/user32/misc/logon.c +++ b/win32ss/user/user32/misc/logon.c @@ -104,8 +104,8 @@ UpdatePerUserSystemParameters(DWORD dwReserved, // Update Imm support and load Imm32.dll. UpdatePerUserImmEnabling(); - /* Delete all the IME hotkeys */ - CliImmInitializeHotKeys(SETIMEHOTKEY_DELETEALL, NULL); + /* Initialize the IME hotkeys */ + CliImmInitializeHotKeys(SETIMEHOTKEY_INITIALIZE, NULL); /* Load Preload keyboard layouts */ IntLoadPreloadKeyboardLayouts(); diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index a15e9b57810..220dd4c3cfe 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -428,11 +428,11 @@ VOID APIENTRY CliImmInitializeHotKeys(DWORD dwAction, HKL hKL) BYTE bFlags = 0; BOOL bCheck; - NtUserSetImeHotKey(0, 0, 0, NULL, SETIMEHOTKEY_DELETEALL); + NtUserSetImeHotKey(0, 0, 0, NULL, SETIMEHOTKEY_INITIALIZE); bCheck = CliGetImeHotKeysFromRegistry(); - if (dwAction == SETIMEHOTKEY_DELETEALL) + if (dwAction == SETIMEHOTKEY_INITIALIZE) { LangID = LANGIDFROMLCID(GetUserDefaultLCID()); IntSetFeKeyboardFlags(LangID, &bFlags);

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