Ros-diffs February 2024

ros-diffs@reactos.org

17 participants
128 discussions

[reactos] 02/02: [UXTHEME] Add Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8adb84641cb7c78ef483… commit d8adb84641cb7c78ef4835f91cae7dec1ca1d46f Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Feb 14 18:36:33 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Feb 16 21:10:32 2024 +0300 [UXTHEME] Add Russian (ru-RU) translation Addendum to d11582f0e. CORE-5991 --- dll/win32/uxtheme/lang/ru-RU.rc | 19 +++++++++++++++++++ dll/win32/uxtheme/uxtheme.rc | 3 +++ 2 files changed, 22 insertions(+) diff --git a/dll/win32/uxtheme/lang/ru-RU.rc b/dll/win32/uxtheme/lang/ru-RU.rc new file mode 100644 index 00000000000..12dab693a78 --- /dev/null +++ b/dll/win32/uxtheme/lang/ru-RU.rc @@ -0,0 +1,19 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Russian resource file + * TRANSLATOR: Copyright 2024 Stanislav Motylkov <binarymaster(a)mail.ru> + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Окно сообщения" + IDS_ACTIVEWIN "Активное окно" + IDS_INACTIVEWIN "Неактивное окно" + IDS_OK "ОК" + IDS_WINTEXT "Текст в окне" +END diff --git a/dll/win32/uxtheme/uxtheme.rc b/dll/win32/uxtheme/uxtheme.rc index 8ea019dfcc2..69feed2ac73 100644 --- a/dll/win32/uxtheme/uxtheme.rc +++ b/dll/win32/uxtheme/uxtheme.rc @@ -22,3 +22,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif

10 months, 1 week

[reactos] 01/02: [UXTHEME] Localize string resources

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d11582f0e2c1acf16bde9… commit d11582f0e2c1acf16bde997d59000cfa480459b7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Feb 14 18:34:28 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri Feb 16 21:10:21 2024 +0300 [UXTHEME] Localize string resources - Adapt SetWindowResourceText() function from `msconfig_new/utils.c` LoadResourceStringEx() function. - Drop `version.rc` in favor of `uxtheme.rc` since we have forked uxtheme. Addendum to 118869f69. CORE-5991 --- dll/win32/uxtheme/CMakeLists.txt | 6 +++++- dll/win32/uxtheme/lang/en-US.rc | 20 ++++++++++++++++++++ dll/win32/uxtheme/nonclient.c | 41 +++++++++++++++++++++++++++++++++------- dll/win32/uxtheme/resource.h | 16 ++++++++++++++++ dll/win32/uxtheme/uxtheme.rc | 24 +++++++++++++++++++++++ dll/win32/uxtheme/uxthemep.h | 2 ++ dll/win32/uxtheme/version.rc | 21 -------------------- 7 files changed, 101 insertions(+), 29 deletions(-) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index 3124014046b..92a6f0cb292 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND SOURCE ncscrollbar.c nonclient.c property.c + resource.h stylemap.c system.c themehooks.c @@ -26,9 +27,12 @@ if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) pngsup.cpp) endif() +file(GLOB uxtheme_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/lang/*.rc) +add_rc_deps(uxtheme.rc ${uxtheme_rc_deps}) + add_library(uxtheme MODULE ${SOURCE} - version.rc + uxtheme.rc ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) set_module_type(uxtheme win32dll) diff --git a/dll/win32/uxtheme/lang/en-US.rc b/dll/win32/uxtheme/lang/en-US.rc new file mode 100644 index 00000000000..0426d212d3a --- /dev/null +++ b/dll/win32/uxtheme/lang/en-US.rc @@ -0,0 +1,20 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: English (United States) resource file + * TRANSLATORS: Copyright 2014 Giannis Adamopoulos <gadamopoulos(a)reactos.org> + * Copyright 2023 Ethan Rodensky <splitwirez(a)gmail.com> + */ + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_MESSAGEBOX "Message Box" + IDS_ACTIVEWIN "Active Window" + IDS_INACTIVEWIN "Inactive Window" + IDS_OK "OK" + IDS_WINTEXT "Window Text" +END diff --git a/dll/win32/uxtheme/nonclient.c b/dll/win32/uxtheme/nonclient.c index d21d02c6c51..441e27c4cf9 100644 --- a/dll/win32/uxtheme/nonclient.c +++ b/dll/win32/uxtheme/nonclient.c @@ -1193,6 +1193,28 @@ DrawWindowForNCPreview( } } +VOID +SetWindowResourceText( + _In_ HWND hwnd, + _In_ UINT uID) +{ + LPWSTR lpszDestBuf = NULL, lpszResourceString = NULL; + size_t iStrSize = 0; + + /* When passing a zero-length buffer size, LoadString() returns + * a read-only pointer buffer to the program's resource string. */ + iStrSize = LoadStringW(hDllInst, uID, (LPWSTR)&lpszResourceString, 0); + + if (lpszResourceString && ((lpszDestBuf = HeapAlloc(GetProcessHeap(), 0, (iStrSize + 1) * sizeof(WCHAR))) != NULL)) + { + wcsncpy(lpszDestBuf, lpszResourceString, iStrSize); + lpszDestBuf[iStrSize] = UNICODE_NULL; // NULL-terminate the string + + SetWindowTextW(hwnd, lpszDestBuf); + HeapFree(GetProcessHeap(), 0, lpszDestBuf); + } +} + HRESULT WINAPI DrawNCPreview(HDC hDC, DWORD DNCP_Flag, LPRECT prcPreview, @@ -1207,6 +1229,8 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, HRESULT hres; HTHEMEFILE hThemeFile; DRAW_CONTEXT context; + LPWSTR szText; + int len; /* Create a dummy window that will be used to trick the paint funtions */ memset(&DummyPreviewWindowClass, 0, sizeof(DummyPreviewWindowClass)); @@ -1218,7 +1242,7 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, if (!RegisterClassExW(&DummyPreviewWindowClass)) return E_FAIL; - hwndDummy = CreateWindowExW(0, L"DummyPreviewWindowClass", L"Active window", WS_OVERLAPPEDWINDOW | WS_VSCROLL, 30, 30, 300, 150, 0, 0, hDllInst, NULL); + hwndDummy = CreateWindowExW(0, L"DummyPreviewWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VSCROLL, 30, 30, 300, 150, 0, 0, hDllInst, NULL); if (!hwndDummy) return E_FAIL; @@ -1247,12 +1271,12 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, /* Draw inactive preview window */ context.Active = FALSE; - SetWindowTextW(hwndDummy, L"Inactive Window"); + SetWindowResourceText(hwndDummy, IDS_INACTIVEWIN); DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left, rcAdjPreview.top, rcAdjPreview.right - 17, rcAdjPreview.bottom - 20, TRUE, NULL); /* Draw active preview window */ context.Active = TRUE; - SetWindowTextW(hwndDummy, L"Active Window"); + SetWindowResourceText(hwndDummy, IDS_ACTIVEWIN); DWORD textDrawFlags = DT_NOPREFIX | DT_SINGLELINE | DT_WORDBREAK; RECT rcWindowClient; @@ -1266,10 +1290,12 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, SelectFont(hDC, textFont); SetTextColor(hDC, GetThemeSysColor(context.theme, TMT_WINDOWTEXT)); - DrawThemeText(context.theme, hDC, WP_DIALOG, 0, L"Window Text", -1, DT_LEFT | DT_TOP | textDrawFlags, 0, &rcWindowClient); + len = LoadStringW(hDllInst, IDS_WINTEXT, (LPWSTR)&szText, 0); + if (len > 0) + DrawThemeText(context.theme, hDC, WP_DIALOG, 0, szText, len, DT_LEFT | DT_TOP | textDrawFlags, 0, &rcWindowClient); /* Draw preview dialog window */ - SetWindowTextW(hwndDummy, L"Message Box"); + SetWindowResourceText(hwndDummy, IDS_MESSAGEBOX); DWORD dwStyleNew = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_DLGFRAME; SetWindowLongPtr(hwndDummy, GWL_STYLE, dwStyleNew); DWORD dwExStyleNew = WS_EX_DLGMODALFRAME; @@ -1306,12 +1332,13 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, rcBtn.bottom -= btnContentMargins.cyBottomHeight; } - LPCWSTR btnText = L"OK"; LOGFONTW lfBtn; if ((GetThemeFont(hBtnTheme, hDC, btnPart, btnState, TMT_FONT, &lfBtn) != S_OK) && textFont) SelectFont(hDC, textFont); - DrawThemeText(hBtnTheme, hDC, btnPart, btnState, btnText, -1, DT_CENTER | DT_VCENTER | textDrawFlags, 0, &rcBtn); + len = LoadStringW(hDllInst, IDS_OK, (LPWSTR)&szText, 0); + if (len > 0) + DrawThemeText(hBtnTheme, hDC, btnPart, btnState, szText, len, DT_CENTER | DT_VCENTER | textDrawFlags, 0, &rcBtn); CloseThemeData(hBtnTheme); } diff --git a/dll/win32/uxtheme/resource.h b/dll/win32/uxtheme/resource.h new file mode 100644 index 00000000000..4c1fcde3131 --- /dev/null +++ b/dll/win32/uxtheme/resource.h @@ -0,0 +1,16 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Main resource header file + * COPYRIGHT: Copyright 2014 Giannis Adamopoulos <gadamopoulos(a)reactos.org> + * Copyright 2023 Ethan Rodensky <splitwirez(a)gmail.com> + */ + +#pragma once + +/* Resources */ +#define IDS_MESSAGEBOX 2000 +#define IDS_ACTIVEWIN 2001 +#define IDS_INACTIVEWIN 2002 +#define IDS_OK 2003 +#define IDS_WINTEXT 2004 diff --git a/dll/win32/uxtheme/uxtheme.rc b/dll/win32/uxtheme/uxtheme.rc new file mode 100644 index 00000000000..8ea019dfcc2 --- /dev/null +++ b/dll/win32/uxtheme/uxtheme.rc @@ -0,0 +1,24 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Main resource file + * COPYRIGHT: Copyright 2014 Giannis Adamopoulos <gadamopoulos(a)reactos.org> + * Copyright 2023 Ethan Rodensky <splitwirez(a)gmail.com> + */ + +#include <windef.h> + +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS uxtheme.dll" +#define REACTOS_STR_INTERNAL_NAME "uxtheme" +#define REACTOS_STR_ORIGINAL_FILENAME "uxtheme.dll" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/dll/win32/uxtheme/uxthemep.h b/dll/win32/uxtheme/uxthemep.h index 6c8e62b8135..5a047d7fcdd 100644 --- a/dll/win32/uxtheme/uxthemep.h +++ b/dll/win32/uxtheme/uxthemep.h @@ -3,6 +3,8 @@ #include <stdarg.h> +#include "resource.h" + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H diff --git a/dll/win32/uxtheme/version.rc b/dll/win32/uxtheme/version.rc deleted file mode 100644 index fdeec0a0ab6..00000000000 --- a/dll/win32/uxtheme/version.rc +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2003 Kevin Koltzau - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#define WINE_FILENAME_STR "uxtheme.dll" - -#include <wine/wine_common_ver.rc>

10 months, 1 week

[reactos] 01/01: [DC21X4] Recognize all ports emulated by VPC 2007 (#6501)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6cd9de3f1d2eeea9aa31… commit e6cd9de3f1d2eeea9aa312ebe6eb14aa3193b52e Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Fri Feb 16 21:56:07 2024 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 16 16:56:07 2024 +0100 [DC21X4] Recognize all ports emulated by VPC 2007 (#6501) --- drivers/network/dd/dc21x4/net21x4.inf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/network/dd/dc21x4/net21x4.inf b/drivers/network/dd/dc21x4/net21x4.inf index fc30ddc3142..636f9e4b9a7 100644 --- a/drivers/network/dd/dc21x4/net21x4.inf +++ b/drivers/network/dd/dc21x4/net21x4.inf @@ -27,6 +27,9 @@ ExcludeFromSelect = * %DC21143.DeviceDesc% = DC21143.ndi,PCI\VEN_1011&DEV_0019 %DC21145.DeviceDesc% = DC21145.ndi,PCI\VEN_8086&DEV_0039 %DC21140_VPC.DeviceDesc% = DC21140.ndi,PCI\VEN_1011&DEV_0009&SUBSYS_21140A00&REV_20 +%DC21140_VPC.DeviceDesc% = DC21140.ndi,PCI\VEN_1011&DEV_0009&SUBSYS_21140A01&REV_20 +%DC21140_VPC.DeviceDesc% = DC21140.ndi,PCI\VEN_1011&DEV_0009&SUBSYS_21140A02&REV_20 +%DC21140_VPC.DeviceDesc% = DC21140.ndi,PCI\VEN_1011&DEV_0009&SUBSYS_21140A03&REV_20 [DC21040.ndi.NT] Characteristics = 0x84 ; NCF_PHYSICAL | NCF_HAS_UI

10 months, 1 week

[reactos] 01/01: [USBSTOR] Fix PdoHandleQueryInstanceId and increase serial number descriptor size to MAXIMUM_USB_STRING_LENGTH (#6413)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20efea8fa47f1e6527bcd… commit 20efea8fa47f1e6527bcdeb874aecc581d9e1845 Author: Adam Słaboń <asaillen(a)protonmail.com> AuthorDate: Fri Feb 16 16:48:33 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 16 18:48:33 2024 +0300 [USBSTOR] Fix PdoHandleQueryInstanceId and increase serial number descriptor size to MAXIMUM_USB_STRING_LENGTH (#6413) Serial number on some USB devices might exceed the number of 100 characters (e.g. 120 characters on "SanDisk Ultra 3.2Gen1" pendrive) and cause buffer overflow, resulting in usbstor.sys crash. - Use pool allocation for instance ID generation. Fixes stack overflow on USB storage devices with large serial number. - Print the LUN number as a hexadecimal, not as a character. - Verify the serial number descriptor before using it. - Increase the max descriptor size for serial number to MAXIMUM_USB_STRING_LENGTH. This fixes serial number string truncation. Based on suggestions by disean and ThFabba. CORE-17625 --- drivers/usb/usbstor/descriptor.c | 2 +- drivers/usb/usbstor/pdo.c | 53 ++++++++++++++++++++++++++++------------ drivers/usb/usbstor/usbstor.h | 1 + 3 files changed, 40 insertions(+), 16 deletions(-) diff --git a/drivers/usb/usbstor/descriptor.c b/drivers/usb/usbstor/descriptor.c index 885cc7f6b72..788da8de4a2 100644 --- a/drivers/usb/usbstor/descriptor.c +++ b/drivers/usb/usbstor/descriptor.c @@ -118,7 +118,7 @@ USBSTOR_GetDescriptors( if (DeviceExtension->DeviceDescriptor->iSerialNumber) { // get serial number - Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_STRING_DESCRIPTOR_TYPE, 100 * sizeof(WCHAR), DeviceExtension->DeviceDescriptor->iSerialNumber, 0x0409, (PVOID*)&DeviceExtension->SerialNumber); + Status = USBSTOR_GetDescriptor(DeviceExtension->LowerDeviceObject, USB_STRING_DESCRIPTOR_TYPE, MAXIMUM_USB_STRING_LENGTH, DeviceExtension->DeviceDescriptor->iSerialNumber, 0x0409, (PVOID*)&DeviceExtension->SerialNumber); if (!NT_SUCCESS(Status)) { FreeItem(DeviceExtension->DeviceDescriptor); diff --git a/drivers/usb/usbstor/pdo.c b/drivers/usb/usbstor/pdo.c index 28039993340..cec5c793795 100644 --- a/drivers/usb/usbstor/pdo.c +++ b/drivers/usb/usbstor/pdo.c @@ -437,37 +437,60 @@ USBSTOR_PdoHandleQueryInstanceId( { PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; - WCHAR Buffer[100]; - ULONG Length; + PUSB_STRING_DESCRIPTOR Descriptor; + ULONG CharCount; LPWSTR InstanceId; + NTSTATUS Status; - PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + PDODeviceExtension = DeviceObject->DeviceExtension; + FDODeviceExtension = PDODeviceExtension->LowerDeviceObject->DeviceExtension; - // format instance id - if (FDODeviceExtension->SerialNumber) + Descriptor = FDODeviceExtension->SerialNumber; + if (Descriptor && (Descriptor->bLength >= sizeof(USB_COMMON_DESCRIPTOR) + sizeof(WCHAR))) { - // using serial number from device - swprintf(Buffer, L"%s&%c", FDODeviceExtension->SerialNumber->bString, PDODeviceExtension->LUN); + /* Format the serial number descriptor only if supported by the device */ + CharCount = (Descriptor->bLength - sizeof(USB_COMMON_DESCRIPTOR)) / sizeof(WCHAR) + + (sizeof("&") - 1) + + (sizeof("F") - 1) + // LUN: 1 char (MAX_LUN) + sizeof(ANSI_NULL); } else { - // use instance count and LUN - swprintf(Buffer, L"%04lu&%c", FDODeviceExtension->InstanceCount, PDODeviceExtension->LUN); + /* Use the instance count and LUN as a fallback */ + CharCount = (sizeof("99999999") - 1) + // Instance Count: 8 chars + (sizeof("&") - 1) + + (sizeof("F") - 1) + // LUN: 1 char (MAX_LUN) + sizeof(ANSI_NULL); } - Length = wcslen(Buffer) + 1; - - InstanceId = ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), USB_STOR_TAG); + InstanceId = ExAllocatePoolUninitialized(PagedPool, CharCount * sizeof(WCHAR), USB_STOR_TAG); if (!InstanceId) { Irp->IoStatus.Information = 0; return STATUS_INSUFFICIENT_RESOURCES; } - wcscpy(InstanceId, Buffer); + if (Descriptor && (Descriptor->bLength >= sizeof(USB_COMMON_DESCRIPTOR) + sizeof(WCHAR))) + { + Status = RtlStringCchPrintfW(InstanceId, + CharCount, + L"%s&%x", + Descriptor->bString, + PDODeviceExtension->LUN); + } + else + { + Status = RtlStringCchPrintfW(InstanceId, + CharCount, + L"%04lu&%x", + FDODeviceExtension->InstanceCount, + PDODeviceExtension->LUN); + } + + /* This should not happen */ + ASSERT(NT_SUCCESS(Status)); - DPRINT("USBSTOR_PdoHandleQueryInstanceId %S\n", InstanceId); + DPRINT("USBSTOR_PdoHandleQueryInstanceId '%S'\n", InstanceId); Irp->IoStatus.Information = (ULONG_PTR)InstanceId; return STATUS_SUCCESS; diff --git a/drivers/usb/usbstor/usbstor.h b/drivers/usb/usbstor/usbstor.h index 8a65e2bd521..11bb2d2c41c 100644 --- a/drivers/usb/usbstor/usbstor.h +++ b/drivers/usb/usbstor/usbstor.h @@ -2,6 +2,7 @@ #define _USBSTOR_H_ #include <wdm.h> +#include <ntstrsafe.h> #include <usbdi.h> #include <usbbusif.h> #include <usbdlib.h>

10 months, 1 week

[reactos] 01/01: [NTUSER] Relax condition for IntImmProcessKey (#6500)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=398201dca4def5f605068… commit 398201dca4def5f6050686ce4f67e36fb85902be Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 16 21:31:13 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 16 21:31:13 2024 +0900 [NTUSER] Relax condition for IntImmProcessKey (#6500) * [NTUSER] Loose condition for IntImmProcessKey * key up * improve * improve 2 * improve 3 --- win32ss/user/ntuser/ime.c | 8 ++++---- win32ss/user/ntuser/msgqueue.c | 26 +++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 5c21f2f9da9..f4648d7b6e9 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -565,15 +565,14 @@ DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) return dwRealCount; } -// Win: xxxImmProcessKey UINT FASTCALL IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - UINT uVirtualKey, ret = 0; + UINT uVirtualKey, ret; DWORD dwHotKeyId; PKL pKL; - PIMC pIMC = NULL; + PIMC pIMC; PIMEHOTKEY pImeHotKey; HKL hKL; HWND hWnd; @@ -592,6 +591,7 @@ IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT uMsg, return 0; } + pIMC = NULL; hWnd = UserHMGetHandle(pWnd); pKL = pWnd->head.pti->KeyboardLayout; if (!pKL) @@ -638,7 +638,7 @@ IntImmProcessKey(PUSER_MESSAGE_QUEUE MessageQueue, PWND pWnd, UINT uMsg, if (!pIMC) return 0; - if ((lParam & 0x80000000) && + if ((lParam & (KF_UP << 16)) && (pKL->piiex->ImeInfo.fdwProperty & IME_PROP_IGNORE_UPKEYS)) { return 0; diff --git a/win32ss/user/ntuser/msgqueue.c b/win32ss/user/ntuser/msgqueue.c index bcec00196bc..c8ae61ad4eb 100644 --- a/win32ss/user/ntuser/msgqueue.c +++ b/win32ss/user/ntuser/msgqueue.c @@ -1769,17 +1769,16 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) USER_REFERENCE_ENTRY Ref; PWND pWnd; UINT ImmRet; - BOOL Ret = TRUE; + BOOL Ret = TRUE, bKeyUpDown = FALSE; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + const UINT uMsg = Msg->message; - if (Msg->message == VK_PACKET) - { - pti->wchInjected = HIWORD(Msg->wParam); - } + if (uMsg == VK_PACKET) + pti->wchInjected = HIWORD(Msg->wParam); - if (Msg->message == WM_KEYDOWN || Msg->message == WM_SYSKEYDOWN || - Msg->message == WM_KEYUP || Msg->message == WM_SYSKEYUP) + if (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN || uMsg == WM_KEYUP || uMsg == WM_SYSKEYUP) { + bKeyUpDown = TRUE; switch (Msg->wParam) { case VK_LSHIFT: case VK_RSHIFT: @@ -1797,7 +1796,7 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) pWnd = ValidateHwndNoErr(Msg->hwnd); if (pWnd) UserRefObjectCo(pWnd, &Ref); - Event.message = Msg->message; + Event.message = uMsg; Event.hwnd = Msg->hwnd; Event.time = Msg->time; Event.paramL = (Msg->wParam & 0xFF) | (HIWORD(Msg->lParam) << 8); @@ -1807,7 +1806,7 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) if (*RemoveMessages) { - if ((Msg->message == WM_KEYDOWN) && + if ((uMsg == WM_KEYDOWN) && (Msg->hwnd != IntGetDesktopWindow())) { /* Handle F1 key by sending out WM_HELP message */ @@ -1822,7 +1821,7 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) co_IntSendMessage(Msg->hwnd, WM_APPCOMMAND, (WPARAM)Msg->hwnd, MAKELPARAM(0, (FAPPCOMMAND_KEY | (Msg->wParam - VK_BROWSER_BACK + 1)))); } } - else if (Msg->message == WM_KEYUP) + else if (uMsg == WM_KEYUP) { /* Handle VK_APPS key by posting a WM_CONTEXTMENU message */ if (Msg->wParam == VK_APPS && pti->MessageQueue->MenuOwner == NULL) @@ -1831,7 +1830,7 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) } //// Key Down! - if ( *RemoveMessages && Msg->message == WM_SYSKEYDOWN ) + if (*RemoveMessages && uMsg == WM_SYSKEYDOWN) { if ( HIWORD(Msg->lParam) & KF_ALTDOWN ) { @@ -1869,9 +1868,10 @@ BOOL co_IntProcessKeyboardMessage(MSG* Msg, BOOL* RemoveMessages) Ret = FALSE; } - if ( pWnd && Ret && *RemoveMessages && Msg->message == WM_KEYDOWN && !(pti->TIF_flags & TIF_DISABLEIME)) + if (pWnd && Ret && *RemoveMessages && bKeyUpDown && !(pti->TIF_flags & TIF_DISABLEIME)) { - if ( (ImmRet = IntImmProcessKey(pti->MessageQueue, pWnd, Msg->message, Msg->wParam, Msg->lParam)) ) + ImmRet = IntImmProcessKey(pti->MessageQueue, pWnd, uMsg, Msg->wParam, Msg->lParam); + if (ImmRet) { if ( ImmRet & (IPHK_HOTKEY|IPHK_SKIPTHISKEY) ) {

10 months, 1 week

[reactos] 01/01: [MSVIDC32] Keep using CRAM_MAGIC for info structure validation (#6498)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0b67a29901cfe1ef1160… commit e0b67a29901cfe1ef11608fd72a24c48aa9525f1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 15 22:08:47 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 15 17:08:47 2024 +0400 [MSVIDC32] Keep using CRAM_MAGIC for info structure validation (#6498) CRAM_MAGIC is being used to validate the info context structure contents when the driver routines are being called, so partially revert 8be912147. Just report "MSVC" as the main FourCC handler in CRAM_GetInfo() instead. CORE-19453 CORE-15382 --- dll/win32/msvidc32/msvideo1.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msvidc32/msvideo1.c b/dll/win32/msvidc32/msvideo1.c index 578630a39b0..b80033f3f11 100644 --- a/dll/win32/msvidc32/msvideo1.c +++ b/dll/win32/msvidc32/msvideo1.c @@ -538,7 +538,11 @@ static LRESULT CRAM_GetInfo( const Msvideo1Context *info, ICINFO *icinfo, DWORD icinfo->dwSize = sizeof(ICINFO); icinfo->fccType = ICTYPE_VIDEO; +#ifdef __REACTOS__ + icinfo->fccHandler = MSVC_MAGIC; +#else icinfo->fccHandler = info ? info->dwMagic : CRAM_MAGIC; +#endif icinfo->dwFlags = 0; icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; @@ -583,11 +587,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg, if( info ) { memset( info, 0, sizeof *info ); -#ifdef __REACTOS__ - info->dwMagic = MSVC_MAGIC; -#else info->dwMagic = CRAM_MAGIC; -#endif } r = (LRESULT) info; break;

10 months, 1 week

[reactos] 01/01: [UXTHEME] nonclient.c: Formatting only

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa29a61271ecf7e50d9e0… commit fa29a61271ecf7e50d9e0a99687f791b294c3297 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Feb 15 14:22:02 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Feb 15 14:22:02 2024 +0300 [UXTHEME] nonclient.c: Formatting only --- dll/win32/uxtheme/nonclient.c | 171 +++++++++++++++++++++--------------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/dll/win32/uxtheme/nonclient.c b/dll/win32/uxtheme/nonclient.c index 7ff8f46acfa..d21d02c6c51 100644 --- a/dll/win32/uxtheme/nonclient.c +++ b/dll/win32/uxtheme/nonclient.c @@ -5,14 +5,14 @@ * PURPOSE: uxtheme non client area management * PROGRAMMER: Giannis Adamopoulos */ - + #include "uxthemep.h" #define NC_PREVIEW_MSGBOX_HALF_WIDTH 75 #define NC_PREVIEW_MSGBOX_OFFSET_X -29 #define NC_PREVIEW_MSGBOX_OFFSET_Y 71 -static BOOL +static BOOL IsWindowActive(HWND hWnd, DWORD ExStyle) { BOOL ret; @@ -35,13 +35,14 @@ BOOL IsScrollBarVisible(HWND hWnd, INT hBar) { SCROLLBARINFO sbi = {sizeof(SCROLLBARINFO)}; - if(!GetScrollBarInfo(hWnd, hBar, &sbi)) + + if (!GetScrollBarInfo(hWnd, hBar, &sbi)) return FALSE; return !(sbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN); } -static BOOL +static BOOL UserHasWindowEdge(DWORD Style, DWORD ExStyle) { if (Style & WS_MINIMIZE) @@ -115,12 +116,12 @@ HRESULT WINAPI ThemeDrawCaptionText(PDRAW_CONTEXT pcontext, RECT* pRect, int iPa InternalGetWindowText(pcontext->hWnd, pszText, len); hr = GetThemeSysFont(pcontext->theme, TMT_CAPTIONFONT, &logfont); - if(SUCCEEDED(hr)) + if (SUCCEEDED(hr)) hFont = CreateFontIndirectW(&logfont); - if(hFont) + if (hFont) oldFont = SelectObject(pcontext->hDC, hFont); - + textColor = GetThemeSysColor(pcontext->theme, pcontext->Active ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT); GetThemeEnumValue(pcontext->theme, iPartId, iStateId, TMT_CONTENTALIGNMENT, &align); @@ -130,14 +131,14 @@ HRESULT WINAPI ThemeDrawCaptionText(PDRAW_CONTEXT pcontext, RECT* pRect, int iPa drawStyles |= DT_RIGHT; oldTextColor = SetTextColor(pcontext->hDC, textColor); - DrawThemeText(pcontext->theme, - pcontext->hDC, - iPartId, - iStateId, - pszText, - len - 1, - drawStyles, - 0, + DrawThemeText(pcontext->theme, + pcontext->hDC, + iPartId, + iStateId, + pszText, + len - 1, + drawStyles, + 0, pRect); SetTextColor(pcontext->hDC, oldTextColor); @@ -168,7 +169,7 @@ ThemeInitDrawContext(PDRAW_CONTEXT pcontext, pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; pcontext->CaptionHeight += GetSystemMetrics(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); - if(hRgn <= (HRGN)1) + if (hRgn <= (HRGN)1) { hRgn = CreateRectRgnIndirect(&pcontext->wi.rcWindow); } @@ -182,20 +183,20 @@ ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext) { ReleaseDC(pcontext->hWnd ,pcontext->hDC); - if(pcontext->hRgn != NULL) + if (pcontext->hRgn != NULL) { DeleteObject(pcontext->hRgn); } } -static void +static void ThemeStartBufferedPaint(PDRAW_CONTEXT pcontext, int cx, int cy) { HBITMAP hbmp; pcontext->hDCScreen = pcontext->hDC; pcontext->hDC = CreateCompatibleDC(pcontext->hDCScreen); - hbmp = CreateCompatibleBitmap(pcontext->hDCScreen, cx, cy); + hbmp = CreateCompatibleBitmap(pcontext->hDCScreen, cx, cy); pcontext->hbmpOld = (HBITMAP)SelectObject(pcontext->hDC, hbmp); } @@ -221,7 +222,7 @@ static void ThemeCalculateCaptionButtonsPosEx(WINDOWINFO* wi, HWND hWnd, HTHEME /* First of all check if we have something to do here */ style = GetWindowLongW(hWnd, GWL_STYLE); - if((style & (WS_CAPTION | WS_SYSMENU)) != (WS_CAPTION | WS_SYSMENU)) + if ((style & (WS_CAPTION | WS_SYSMENU)) != (WS_CAPTION | WS_SYSMENU)) return; /* Get theme data for this window */ @@ -242,7 +243,7 @@ static void ThemeCalculateCaptionButtonsPosEx(WINDOWINFO* wi, HWND hWnd, HTHEME rcCurrent.bottom = wi->rcWindow.bottom - wi->rcWindow.top; /* Add a padding around the objects of the caption */ - InflateRect(&rcCurrent, -(int)wi->cyWindowBorders-BUTTON_GAP_SIZE, + InflateRect(&rcCurrent, -(int)wi->cyWindowBorders-BUTTON_GAP_SIZE, -(int)wi->cyWindowBorders-BUTTON_GAP_SIZE); iPartId = wi->dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; @@ -270,17 +271,18 @@ void ThemeCalculateCaptionButtonsPos(HWND hWnd, HTHEME htheme) { INT btnHeight; WINDOWINFO wi = {sizeof(wi)}; - if(!GetWindowInfo(hWnd, &wi)) + + if (!GetWindowInfo(hWnd, &wi)) return; btnHeight = GetSystemMetrics(wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - + ThemeCalculateCaptionButtonsPosEx(&wi, hWnd, htheme, btnHeight); } -static void -ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, +static void +ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, RECT* prcCurrent, - CAPTIONBUTTON buttonId, + CAPTIONBUTTON buttonId, INT iStateId) { INT iPartId; @@ -323,12 +325,12 @@ ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, else iStateId = (pcontext->Active ? BUTTON_DISABLED : BUTTON_INACTIVE_DISABLED); } - + iPartId = pcontext->wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON : WP_MINBUTTON; break; default: - //FIXME: Implement Help Button + //FIXME: Implement Help Button return; } @@ -350,13 +352,13 @@ ThemeGetButtonState(DWORD htCurrect, DWORD htHot, DWORD htDown, BOOL Active) } /* Used only from mouse event handlers */ -static void +static void ThemeDrawCaptionButtons(PDRAW_CONTEXT pcontext, DWORD htHot, DWORD htDown) { /* Draw the buttons */ - ThemeDrawCaptionButton(pcontext, NULL, CLOSEBUTTON, + ThemeDrawCaptionButton(pcontext, NULL, CLOSEBUTTON, ThemeGetButtonState(HTCLOSE, htHot, htDown, pcontext->Active)); - ThemeDrawCaptionButton(pcontext, NULL, MAXBUTTON, + ThemeDrawCaptionButton(pcontext, NULL, MAXBUTTON, ThemeGetButtonState(HTMAXBUTTON, htHot, htDown, pcontext->Active)); ThemeDrawCaptionButton(pcontext, NULL, MINBUTTON, ThemeGetButtonState(HTMINBUTTON, htHot, htDown, pcontext->Active)); @@ -365,7 +367,7 @@ ThemeDrawCaptionButtons(PDRAW_CONTEXT pcontext, DWORD htHot, DWORD htDown) } /* Used from WM_NCPAINT and WM_NCACTIVATE handlers */ -static void +static void ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { RECT rcPart; @@ -398,7 +400,7 @@ ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) DrawThemeBackground(pcontext->theme, pcontext->hDC,iPart,iState,&rcPart,NULL); /* Add a padding around the objects of the caption */ - InflateRect(&rcPart, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE, + InflateRect(&rcPart, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE, -(int)pcontext->wi.cyWindowBorders-BUTTON_GAP_SIZE); /* Draw the caption buttons */ @@ -411,7 +413,7 @@ ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) ThemeDrawCaptionButton(pcontext, &rcPart, MINBUTTON, iState); ThemeDrawCaptionButton(pcontext, &rcPart, HELPBUTTON, iState); } - + rcPart.top += 3 ; /* Draw the icon */ @@ -429,7 +431,7 @@ ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) ThemeDrawCaptionText(pcontext, &rcPart, iPart, iState); } -static void +static void ThemeDrawBorders(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { RECT rcPart; @@ -454,14 +456,14 @@ ThemeDrawBorders(PDRAW_CONTEXT pcontext, RECT* prcCurrent) DrawThemeBackground(pcontext->theme, pcontext->hDC,WP_FRAMERIGHT, iState, &rcPart, NULL); } -static void +static void DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) { /* Draw outer edge */ if (UserHasWindowEdge(context->wi.dwStyle, context->wi.dwExStyle)) { DrawEdge(context->hDC, prcCurrent, EDGE_RAISED, BF_RECT | BF_ADJUST); - } + } else if (context->wi.dwExStyle & WS_EX_STATICEDGE) { DrawEdge(context->hDC, prcCurrent, BDR_SUNKENINNER, BF_RECT | BF_ADJUST | BF_FLAT); @@ -481,13 +483,13 @@ DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) context->Active ? COLOR_ACTIVEBORDER : COLOR_INACTIVEBORDER)); /* Draw frame */ - PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, prcCurrent->right - prcCurrent->left, Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height); @@ -506,13 +508,13 @@ DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) COLOR_WINDOWFRAME)); /* Draw frame */ - PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, prcCurrent->right - prcCurrent->left, Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height); @@ -522,11 +524,11 @@ DrawClassicFrame(PDRAW_CONTEXT context, RECT* prcCurrent) static void ThemeDrawMenuBar(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { /* Let the window manager paint the menu */ - prcCurrent->top += PaintMenuBar(pcontext->hWnd, - pcontext->hDC, - pcontext->wi.cxWindowBorders, + prcCurrent->top += PaintMenuBar(pcontext->hWnd, + pcontext->hDC, pcontext->wi.cxWindowBorders, - prcCurrent->top, + pcontext->wi.cxWindowBorders, + prcCurrent->top, pcontext->Active); } @@ -563,13 +565,13 @@ static void ThemeDrawScrollBarsGrip(PDRAW_CONTEXT pcontext, RECT* prcCurrent) } } -static void +static void ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBuffering) { - if(!(pcontext->wi.dwStyle & WS_VISIBLE)) + if (!(pcontext->wi.dwStyle & WS_VISIBLE)) return; - if((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) + if ((pcontext->wi.dwStyle & WS_CAPTION)==WS_CAPTION) { if (bDoDoubleBuffering) ThemeStartBufferedPaint(pcontext, prcCurrent->right, pcontext->CaptionHeight); @@ -583,24 +585,24 @@ ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBufferi DrawClassicFrame(pcontext, prcCurrent); } - if(pcontext->wi.dwStyle & WS_MINIMIZE) + if (pcontext->wi.dwStyle & WS_MINIMIZE) return; - if(HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) + if (HAS_MENU(pcontext->hWnd, pcontext->wi.dwStyle)) ThemeDrawMenuBar(pcontext, prcCurrent); if (pcontext->wi.dwExStyle & WS_EX_CLIENTEDGE) DrawEdge(pcontext->hDC, prcCurrent, EDGE_SUNKEN, BF_RECT | BF_ADJUST); - if((pcontext->wi.dwStyle & WS_HSCROLL) && IsScrollBarVisible(pcontext->hWnd, OBJID_HSCROLL)) + if ((pcontext->wi.dwStyle & WS_HSCROLL) && IsScrollBarVisible(pcontext->hWnd, OBJID_HSCROLL)) ThemeDrawScrollBar(pcontext, SB_HORZ , NULL); - if((pcontext->wi.dwStyle & WS_VSCROLL) && IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) + if ((pcontext->wi.dwStyle & WS_VSCROLL) && IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) ThemeDrawScrollBar(pcontext, SB_VERT, NULL); - if((pcontext->wi.dwStyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL) && - IsScrollBarVisible(pcontext->hWnd, OBJID_HSCROLL) && - IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) + if ((pcontext->wi.dwStyle & (WS_HSCROLL|WS_VSCROLL)) == (WS_HSCROLL|WS_VSCROLL) && + IsScrollBarVisible(pcontext->hWnd, OBJID_HSCROLL) && + IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) { ThemeDrawScrollBarsGrip(pcontext, prcCurrent); } @@ -610,7 +612,7 @@ ThemePaintWindow(PDRAW_CONTEXT pcontext, RECT* prcCurrent, BOOL bDoDoubleBufferi * Message handlers */ -static LRESULT +static LRESULT ThemeHandleNCPaint(HWND hWnd, HRGN hRgn) { DRAW_CONTEXT context; @@ -627,7 +629,7 @@ ThemeHandleNCPaint(HWND hWnd, HRGN hRgn) return 0; } -static LRESULT +static LRESULT ThemeHandleNcMouseMove(HWND hWnd, DWORD ht, POINT* pt) { DRAW_CONTEXT context; @@ -637,7 +639,7 @@ ThemeHandleNcMouseMove(HWND hWnd, DWORD ht, POINT* pt) /* First of all check if we have something to do here */ style = GetWindowLongW(hWnd, GWL_STYLE); - if((style & (WS_CAPTION|WS_HSCROLL|WS_VSCROLL))==0) + if ((style & (WS_CAPTION|WS_HSCROLL|WS_VSCROLL))==0) return 0; /* Get theme data for this window */ @@ -682,7 +684,7 @@ ThemeHandleNcMouseMove(HWND hWnd, DWORD ht, POINT* pt) return 0; } -static LRESULT +static LRESULT ThemeHandleNcMouseLeave(HWND hWnd) { DRAW_CONTEXT context; @@ -691,7 +693,7 @@ ThemeHandleNcMouseLeave(HWND hWnd) /* First of all check if we have something to do here */ style = GetWindowLongW(hWnd, GWL_STYLE); - if((style & (WS_CAPTION|WS_HSCROLL|WS_VSCROLL))==0) + if ((style & (WS_CAPTION|WS_HSCROLL|WS_VSCROLL))==0) return 0; /* Get theme data for this window */ @@ -794,7 +796,6 @@ ThemeHandleButton(HWND hWnd, WPARAM wParam) SendMessageW(hWnd, WM_SYSCOMMAND, SCMsg, 0); } - static LRESULT DefWndNCHitTest(HWND hWnd, POINT Point) { @@ -825,9 +826,9 @@ DefWndNCHitTest(HWND hWnd, POINT Point) ThickFrame = (wi.dwStyle & WS_THICKFRAME); if (Point.y < WindowRect.top) { - if(wi.dwStyle & WS_MINIMIZE) + if (wi.dwStyle & WS_MINIMIZE) return HTCAPTION; - if(!ThickFrame) + if (!ThickFrame) return HTBORDER; if (Point.x < (WindowRect.left + XSize)) return HTTOPLEFT; @@ -837,9 +838,9 @@ DefWndNCHitTest(HWND hWnd, POINT Point) } if (Point.y >= WindowRect.bottom) { - if(wi.dwStyle & WS_MINIMIZE) + if (wi.dwStyle & WS_MINIMIZE) return HTCAPTION; - if(!ThickFrame) + if (!ThickFrame) return HTBORDER; if (Point.x < (WindowRect.left + XSize)) return HTBOTTOMLEFT; @@ -849,9 +850,9 @@ DefWndNCHitTest(HWND hWnd, POINT Point) } if (Point.x < WindowRect.left) { - if(wi.dwStyle & WS_MINIMIZE) + if (wi.dwStyle & WS_MINIMIZE) return HTCAPTION; - if(!ThickFrame) + if (!ThickFrame) return HTBORDER; if (Point.y < (WindowRect.top + YSize)) return HTTOPLEFT; @@ -861,9 +862,9 @@ DefWndNCHitTest(HWND hWnd, POINT Point) } if (Point.x >= WindowRect.right) { - if(wi.dwStyle & WS_MINIMIZE) + if (wi.dwStyle & WS_MINIMIZE) return HTCAPTION; - if(!ThickFrame) + if (!ThickFrame) return HTBORDER; if (Point.y < (WindowRect.top + YSize)) return HTTOPRIGHT; @@ -897,7 +898,7 @@ DefWndNCHitTest(HWND hWnd, POINT Point) if (!(wi.dwExStyle & WS_EX_TOOLWINDOW)) { - // if(!(wi.dwExStyle & WS_EX_DLGMODALFRAME)) + // if (!(wi.dwExStyle & WS_EX_DLGMODALFRAME)) // FIXME: The real test should check whether there is // an icon for the system window, and if so, do the // rect.left increase. @@ -924,7 +925,7 @@ DefWndNCHitTest(HWND hWnd, POINT Point) } } - if(!(wi.dwStyle & WS_MINIMIZE)) + if (!(wi.dwStyle & WS_MINIMIZE)) { HMENU menu; @@ -973,7 +974,7 @@ DefWndNCHitTest(HWND hWnd, POINT Point) TempRect.top = TempRect2.top; TempRect.bottom = TempRect2.bottom; - if(Parent) + if (Parent) GetClientRect(Parent, &ParentRect); if (PtInRect(&TempRect, Point) && HASSIZEGRIP(wi.dwStyle, wi.dwExStyle, GetWindowLongW(Parent, GWL_STYLE), wi.rcWindow, ParentRect)) @@ -996,7 +997,7 @@ DefWndNCHitTest(HWND hWnd, POINT Point) TempRect.left = TempRect.right - GetSystemMetrics(SM_CXVSCROLL); if (PtInRect(&TempRect, Point)) return HTVSCROLL; - } + } else if (wi.dwStyle & WS_HSCROLL) { RECT TempRect = WindowRect; @@ -1010,7 +1011,7 @@ DefWndNCHitTest(HWND hWnd, POINT Point) return HTNOWHERE; } -LRESULT CALLBACK +LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc) { switch(Msg) @@ -1063,8 +1064,8 @@ ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndPr } case WM_SYSCOMMAND: { - if((wParam & 0xfff0) == SC_VSCROLL || - (wParam & 0xfff0) == SC_HSCROLL) + if ((wParam & 0xfff0) == SC_VSCROLL || + (wParam & 0xfff0) == SC_HSCROLL) { POINT Pt; Pt.x = (short)LOWORD(lParam); @@ -1132,7 +1133,6 @@ DrawWindowForNCPreview( OffsetRect(&rcWindowNew, offsetX, offsetY); ThemeCalculateCaptionButtonsPosEx(&pcontext->wi, pcontext->hWnd, pcontext->theme, pcontext->CaptionHeight - pcontext->wi.cyWindowBorders); - INT leftBorderInset = pcontext->wi.cxWindowBorders; INT titleBarInset = pcontext->CaptionHeight; // + pcontext->wi.cyWindowBorders; INT rightBorderInset = pcontext->wi.cxWindowBorders; @@ -1171,7 +1171,7 @@ DrawWindowForNCPreview( pcontext->wi.rcClient = rcClientNew; OffsetRect(&rcClientNew, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); - + if (drawClientAreaColor) { HBRUSH hbrWindow = GetThemeSysColorBrush(pcontext->theme, COLOR_WINDOW); @@ -1193,10 +1193,10 @@ DrawWindowForNCPreview( } } -HRESULT WINAPI DrawNCPreview(HDC hDC, +HRESULT WINAPI DrawNCPreview(HDC hDC, DWORD DNCP_Flag, - LPRECT prcPreview, - LPCWSTR pszThemeFileName, + LPRECT prcPreview, + LPCWSTR pszThemeFileName, LPCWSTR pszColorName, LPCWSTR pszSizeName, PNONCLIENTMETRICSW pncMetrics, @@ -1265,7 +1265,6 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, if (textFont) SelectFont(hDC, textFont); - SetTextColor(hDC, GetThemeSysColor(context.theme, TMT_WINDOWTEXT)); DrawThemeText(context.theme, hDC, WP_DIALOG, 0, L"Window Text", -1, DT_LEFT | DT_TOP | textDrawFlags, 0, &rcWindowClient);

10 months, 1 week

[reactos] 01/01: [UXTHEME] Implement the rest of DrawNCPreview

by Ethan Rodensky

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=118869f69cf8fec59a380… commit 118869f69cf8fec59a38097a96a0338c02524a28 Author: Ethan Rodensky <Splitwirez(a)gmail.com> AuthorDate: Sat Oct 21 21:13:18 2023 -0400 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue Feb 13 21:20:49 2024 +0100 [UXTHEME] Implement the rest of DrawNCPreview --- dll/cpl/desk/theme.c | 3 +- dll/win32/uxtheme/ncscrollbar.c | 41 ++++--- dll/win32/uxtheme/nonclient.c | 254 ++++++++++++++++++++++++++++++++++------ dll/win32/uxtheme/uxthemep.h | 4 +- 4 files changed, 246 insertions(+), 56 deletions(-) diff --git a/dll/cpl/desk/theme.c b/dll/cpl/desk/theme.c index e4d9690fe94..8c9f9faa8e4 100644 --- a/dll/cpl/desk/theme.c +++ b/dll/cpl/desk/theme.c @@ -997,7 +997,8 @@ DrawThemePreview(IN HDC hdcMem, IN PCOLOR_SCHEME scheme, IN PTHEME_SELECTION pSe FillRect(hdcMem, prcWindow, hbrBack); DeleteObject(hbrBack); - InflateRect(prcWindow, -10, -10); + InflateRect(prcWindow, -8, -8); + prcWindow->bottom -= 12; hres = DrawNCPreview(hdcMem, DNCP_DRAW_ALL, diff --git a/dll/win32/uxtheme/ncscrollbar.c b/dll/win32/uxtheme/ncscrollbar.c index a44edb00246..0adb4826cfa 100644 --- a/dll/win32/uxtheme/ncscrollbar.c +++ b/dll/win32/uxtheme/ncscrollbar.c @@ -35,7 +35,7 @@ static BOOL SCROLL_IsVertical(HWND hwnd, INT nBar) } } -static LONG SCROLL_getObjectId(INT nBar) +LONG SCROLL_getObjectId(INT nBar) { switch(nBar) { @@ -273,17 +273,13 @@ static void SCROLL_DrawMovingThumb(PWND_DATA pwndData, PDRAW_CONTEXT pcontext, S void -ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT nBar, POINT* pt) +ThemeDrawScrollBarEx(PDRAW_CONTEXT pcontext, INT nBar, PSCROLLBARINFO psbi, POINT* pt) { SCROLLINFO si; - SCROLLBARINFO sbi; BOOL vertical; enum SCROLL_HITTEST htHot = SCROLL_NOWHERE; PWND_DATA pwndData; - if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) || - ((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL))) return; - if (!(pwndData = ThemeGetWndData(pcontext->hWnd))) return; @@ -291,35 +287,48 @@ ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT nBar, POINT* pt) return; /* Retrieve scrollbar info */ - sbi.cbSize = sizeof(sbi); si.cbSize = sizeof(si); si.fMask = SIF_ALL ; GetScrollInfo(pcontext->hWnd, nBar, &si); - GetScrollBarInfo(pcontext->hWnd, SCROLL_getObjectId(nBar), &sbi); vertical = SCROLL_IsVertical(pcontext->hWnd, nBar); - if(sbi.rgstate[SCROLL_TOP_ARROW] & STATE_SYSTEM_UNAVAILABLE && - sbi.rgstate[SCROLL_BOTTOM_ARROW] & STATE_SYSTEM_UNAVAILABLE ) + if(psbi->rgstate[SCROLL_TOP_ARROW] & STATE_SYSTEM_UNAVAILABLE && + psbi->rgstate[SCROLL_BOTTOM_ARROW] & STATE_SYSTEM_UNAVAILABLE ) { - sbi.xyThumbTop = 0; + psbi->xyThumbTop = 0; } /* The scrollbar rect is in screen coordinates */ - OffsetRect(&sbi.rcScrollBar, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); + OffsetRect(&psbi->rcScrollBar, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); if(pt) { ScreenToWindow(pcontext->hWnd, pt); - htHot = SCROLL_HitTest(pcontext->hWnd, &sbi, vertical, *pt, FALSE); + htHot = SCROLL_HitTest(pcontext->hWnd, psbi, vertical, *pt, FALSE); } /* do not draw if the scrollbar rectangle is empty */ - if(IsRectEmpty(&sbi.rcScrollBar)) return; + if(IsRectEmpty(&psbi->rcScrollBar)) return; /* Draw the scrollbar */ - SCROLL_DrawArrows( pcontext, &sbi, vertical, 0, htHot ); - SCROLL_DrawInterior( pcontext, &sbi, sbi.xyThumbTop, vertical, 0, htHot ); + SCROLL_DrawArrows( pcontext, psbi, vertical, 0, htHot ); + SCROLL_DrawInterior( pcontext, psbi, psbi->xyThumbTop, vertical, 0, htHot ); } +void +ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT nBar, POINT* pt) +{ + SCROLLBARINFO sbi; + + if (((nBar == SB_VERT) && !(pcontext->wi.dwStyle & WS_VSCROLL)) || + ((nBar == SB_HORZ) && !(pcontext->wi.dwStyle & WS_HSCROLL))) + { + return; + } + + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(pcontext->hWnd, SCROLL_getObjectId(nBar), &sbi); + ThemeDrawScrollBarEx(pcontext, nBar, &sbi, pt); +} /*********************************************************************** diff --git a/dll/win32/uxtheme/nonclient.c b/dll/win32/uxtheme/nonclient.c index e48b5ac693a..7ff8f46acfa 100644 --- a/dll/win32/uxtheme/nonclient.c +++ b/dll/win32/uxtheme/nonclient.c @@ -8,6 +8,10 @@ #include "uxthemep.h" +#define NC_PREVIEW_MSGBOX_HALF_WIDTH 75 +#define NC_PREVIEW_MSGBOX_OFFSET_X -29 +#define NC_PREVIEW_MSGBOX_OFFSET_Y 71 + static BOOL IsWindowActive(HWND hWnd, DWORD ExStyle) { @@ -110,17 +114,14 @@ HRESULT WINAPI ThemeDrawCaptionText(PDRAW_CONTEXT pcontext, RECT* pRect, int iPa InternalGetWindowText(pcontext->hWnd, pszText, len); - hr = GetThemeSysFont(0,TMT_CAPTIONFONT,&logfont); + hr = GetThemeSysFont(pcontext->theme, TMT_CAPTIONFONT, &logfont); if(SUCCEEDED(hr)) hFont = CreateFontIndirectW(&logfont); if(hFont) oldFont = SelectObject(pcontext->hDC, hFont); - if (!pcontext->Active) - textColor = GetSysColor(COLOR_INACTIVECAPTIONTEXT); - else - textColor = GetSysColor(COLOR_CAPTIONTEXT); + textColor = GetThemeSysColor(pcontext->theme, pcontext->Active ? COLOR_CAPTIONTEXT : COLOR_INACTIVECAPTIONTEXT); GetThemeEnumValue(pcontext->theme, iPartId, iStateId, TMT_CONTENTALIGNMENT, &align); if (align == CA_CENTER) @@ -210,12 +211,11 @@ ThemeEndBufferedPaint(PDRAW_CONTEXT pcontext, int x, int y, int cx, int cy) pcontext->hDC = pcontext->hDCScreen; } -void ThemeCalculateCaptionButtonsPos(HWND hWnd, HTHEME htheme) +static void ThemeCalculateCaptionButtonsPosEx(WINDOWINFO* wi, HWND hWnd, HTHEME htheme, INT buttonHeight) { PWND_DATA pwndData; DWORD style; - INT ButtonWidth, ButtonHeight, iPartId, i; - WINDOWINFO wi = {sizeof(wi)}; + INT captionBtnWidth, captionBtnHeight, iPartId, i; RECT rcCurrent; SIZE ButtonSize; @@ -236,40 +236,47 @@ void ThemeCalculateCaptionButtonsPos(HWND hWnd, HTHEME htheme) return; } - if(!GetWindowInfo(hWnd, &wi)) - return; - /* Calculate the area of the caption */ rcCurrent.top = rcCurrent.left = 0; - rcCurrent.right = wi.rcWindow.right - wi.rcWindow.left; - rcCurrent.bottom = wi.rcWindow.bottom - wi.rcWindow.top; + rcCurrent.right = wi->rcWindow.right - wi->rcWindow.left; + rcCurrent.bottom = wi->rcWindow.bottom - wi->rcWindow.top; /* Add a padding around the objects of the caption */ - InflateRect(&rcCurrent, -(int)wi.cyWindowBorders-BUTTON_GAP_SIZE, - -(int)wi.cyWindowBorders-BUTTON_GAP_SIZE); + InflateRect(&rcCurrent, -(int)wi->cyWindowBorders-BUTTON_GAP_SIZE, + -(int)wi->cyWindowBorders-BUTTON_GAP_SIZE); - iPartId = wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; + iPartId = wi->dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; GetThemePartSize(htheme, NULL, iPartId, 0, NULL, TS_MIN, &ButtonSize); - ButtonHeight = GetSystemMetrics( wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); + captionBtnWidth = MulDiv(ButtonSize.cx, buttonHeight, ButtonSize.cy); - ButtonHeight -= 4; - ButtonWidth -= 4; + captionBtnHeight = buttonHeight - 4; + captionBtnWidth -= 4; for (i = CLOSEBUTTON; i <= HELPBUTTON; i++) { SetRect(&pwndData->rcCaptionButtons[i], - rcCurrent.right - ButtonWidth, + rcCurrent.right - captionBtnWidth, rcCurrent.top, rcCurrent.right, - rcCurrent.top + ButtonHeight); + rcCurrent.top + captionBtnHeight); - rcCurrent.right -= ButtonWidth + BUTTON_GAP_SIZE; + rcCurrent.right -= captionBtnWidth + BUTTON_GAP_SIZE; } } +void ThemeCalculateCaptionButtonsPos(HWND hWnd, HTHEME htheme) +{ + INT btnHeight; + WINDOWINFO wi = {sizeof(wi)}; + if(!GetWindowInfo(hWnd, &wi)) + return; + btnHeight = GetSystemMetrics(wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + + ThemeCalculateCaptionButtonsPosEx(&wi, hWnd, htheme, btnHeight); +} + static void ThemeDrawCaptionButton(PDRAW_CONTEXT pcontext, RECT* prcCurrent, @@ -1075,6 +1082,117 @@ ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndPr } } +static +void +DrawWindowForNCPreview( + _In_ HDC hDC, + _In_ PDRAW_CONTEXT pcontext, + _In_ INT left, + _In_ INT top, + _In_ INT right, + _In_ INT bottom, + _In_ BOOL drawClientAreaColor, + _Out_opt_ LPRECT prcClient) +{ + if (!hDC) + return; + + if (!pcontext) + return; + + DWORD dwStyle = pcontext->wi.dwStyle; + DWORD dwExStyle = pcontext->wi.dwExStyle; + pcontext->CaptionHeight = pcontext->wi.cyWindowBorders + GetThemeSysSize(pcontext->theme, dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + /* FIXME: still need to use ncmetrics from parameters for window border width */ + + RECT rcWindowPrev = { pcontext->wi.rcWindow.left, pcontext->wi.rcWindow.top, pcontext->wi.rcWindow.right, pcontext->wi.rcWindow.bottom }; + RECT rcClientPrev = { pcontext->wi.rcClient.left, pcontext->wi.rcClient.top, pcontext->wi.rcClient.right, pcontext->wi.rcClient.bottom }; + SetWindowPos(pcontext->hWnd, NULL, left, top, right - left, bottom - top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_DRAWFRAME | SWP_NOCOPYBITS); + RECT rcWindowNew = { left, top, right, bottom }; + pcontext->wi.rcWindow = rcWindowNew; + + BOOL hasVScrollBar = dwStyle & WS_VSCROLL; + if (hasVScrollBar) + { + SCROLLINFO dummyScrollInfo; + EnableScrollBar(pcontext->hWnd, SB_VERT, ESB_ENABLE_BOTH); + + dummyScrollInfo.cbSize = sizeof(dummyScrollInfo); + dummyScrollInfo.fMask = SIF_DISABLENOSCROLL | SIF_POS | SIF_RANGE; + dummyScrollInfo.nMin = 0; + dummyScrollInfo.nMax = rcWindowNew.bottom - rcWindowNew.top; + dummyScrollInfo.nPos = 0; + SetScrollInfo(pcontext->hWnd, SB_VERT, &dummyScrollInfo, TRUE); + } + + SetViewportOrgEx(hDC, rcWindowNew.left, rcWindowNew.top, NULL); + + INT offsetX = -rcWindowNew.left; + INT offsetY = -rcWindowNew.top; + OffsetRect(&rcWindowNew, offsetX, offsetY); + ThemeCalculateCaptionButtonsPosEx(&pcontext->wi, pcontext->hWnd, pcontext->theme, pcontext->CaptionHeight - pcontext->wi.cyWindowBorders); + + + INT leftBorderInset = pcontext->wi.cxWindowBorders; + INT titleBarInset = pcontext->CaptionHeight; // + pcontext->wi.cyWindowBorders; + INT rightBorderInset = pcontext->wi.cxWindowBorders; + INT bottomBorderInset = pcontext->wi.cyWindowBorders; + + RECT rcClientNew; + if (GetWindowRect(pcontext->hWnd, &rcClientNew)) + { + rcClientNew.left += leftBorderInset; + rcClientNew.top += titleBarInset; + rcClientNew.right -= rightBorderInset; + rcClientNew.bottom -= bottomBorderInset; + } + pcontext->wi.rcClient = rcClientNew; + + pcontext->wi.dwStyle &= ~(WS_HSCROLL | WS_VSCROLL); + ThemePaintWindow(pcontext, &rcWindowNew, FALSE); + pcontext->wi.dwStyle = dwStyle; + + if (hasVScrollBar && IsScrollBarVisible(pcontext->hWnd, OBJID_VSCROLL)) + { + SCROLLBARINFO sbi; + sbi.cbSize = sizeof(sbi); + GetScrollBarInfo(pcontext->hWnd, OBJID_VSCROLL, &sbi); + INT scWidth = sbi.rcScrollBar.right - sbi.rcScrollBar.left; + + sbi.rcScrollBar.right = rcClientNew.right; + rcClientNew.right -= scWidth; + sbi.rcScrollBar.left = rcClientNew.right; + + sbi.rcScrollBar.top = rcClientNew.top; + sbi.rcScrollBar.bottom = rcClientNew.bottom; + + ThemeDrawScrollBarEx(pcontext, SB_VERT, &sbi, NULL); + } + pcontext->wi.rcClient = rcClientNew; + + OffsetRect(&rcClientNew, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); + + if (drawClientAreaColor) + { + HBRUSH hbrWindow = GetThemeSysColorBrush(pcontext->theme, COLOR_WINDOW); + FillRect(hDC, &rcClientNew, hbrWindow); + DeleteObject(hbrWindow); + } + + pcontext->wi.rcWindow = rcWindowPrev; + pcontext->wi.rcClient = rcClientPrev; + + SetViewportOrgEx(hDC, 0, 0, NULL); + if (prcClient != NULL) + { + prcClient->left = rcClientNew.left; + prcClient->top = rcClientNew.top; + prcClient->right = rcClientNew.right; + prcClient->bottom = rcClientNew.bottom; + OffsetRect(prcClient, -offsetX, -offsetY); + } +} + HRESULT WINAPI DrawNCPreview(HDC hDC, DWORD DNCP_Flag, LPRECT prcPreview, @@ -1089,10 +1207,6 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, HRESULT hres; HTHEMEFILE hThemeFile; DRAW_CONTEXT context; - RECT rcCurrent; - - /* FIXME: We also need to implement drawing the rest of the preview windows - * and make use of the ncmetrics and colors passed as parameters */ /* Create a dummy window that will be used to trick the paint funtions */ memset(&DummyPreviewWindowClass, 0, sizeof(DummyPreviewWindowClass)); @@ -1104,7 +1218,7 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, if (!RegisterClassExW(&DummyPreviewWindowClass)) return E_FAIL; - hwndDummy = CreateWindowExW(0, L"DummyPreviewWindowClass", L"Active window", WS_OVERLAPPEDWINDOW,30,30,300,150,0,0,hDllInst,NULL); + hwndDummy = CreateWindowExW(0, L"DummyPreviewWindowClass", L"Active window", WS_OVERLAPPEDWINDOW | WS_VSCROLL, 30, 30, 300, 150, 0, 0, hDllInst, NULL); if (!hwndDummy) return E_FAIL; @@ -1121,22 +1235,86 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, context.scrolltheme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"SCROLLBAR", 0); if (!context.scrolltheme) return E_FAIL; - context.Active = TRUE; context.wi.cbSize = sizeof(context.wi); if (!GetWindowInfo(hwndDummy, &context.wi)) return E_FAIL; context.wi.dwStyle |= WS_VISIBLE; - context.CaptionHeight = context.wi.cyWindowBorders; - context.CaptionHeight += GetSystemMetrics(context.wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMCAPTION : SM_CYCAPTION ); + context.hRgn = CreateRectRgnIndirect(&context.wi.rcWindow); + RECT rcAdjPreview = { prcPreview->left, prcPreview->top, prcPreview->right, prcPreview->bottom }; + INT previewWidth = rcAdjPreview.right - rcAdjPreview.left; + INT previewHeight = rcAdjPreview.bottom - rcAdjPreview.top; - /* Paint the window on the preview hDC */ - rcCurrent = context.wi.rcWindow; - OffsetRect( &rcCurrent, -context.wi.rcWindow.left, -context.wi.rcWindow.top); - SetViewportOrgEx(hDC, context.wi.rcWindow.left, context.wi.rcWindow.top, NULL); - ThemeCalculateCaptionButtonsPos(hwndDummy, context.theme); - ThemePaintWindow(&context, &rcCurrent, FALSE); - SetViewportOrgEx(hDC, 0, 0, NULL); + /* Draw inactive preview window */ + context.Active = FALSE; + SetWindowTextW(hwndDummy, L"Inactive Window"); + DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left, rcAdjPreview.top, rcAdjPreview.right - 17, rcAdjPreview.bottom - 20, TRUE, NULL); + + /* Draw active preview window */ + context.Active = TRUE; + SetWindowTextW(hwndDummy, L"Active Window"); + + DWORD textDrawFlags = DT_NOPREFIX | DT_SINGLELINE | DT_WORDBREAK; + RECT rcWindowClient; + DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left + 10, rcAdjPreview.top + 22, rcAdjPreview.right, rcAdjPreview.bottom, TRUE, &rcWindowClient); + LOGFONTW lfText; + HFONT textFont = NULL; + if (SUCCEEDED(GetThemeSysFont(context.theme, TMT_MSGBOXFONT, &lfText))) + textFont = CreateFontIndirectW(&lfText); + + if (textFont) + SelectFont(hDC, textFont); + + + SetTextColor(hDC, GetThemeSysColor(context.theme, TMT_WINDOWTEXT)); + DrawThemeText(context.theme, hDC, WP_DIALOG, 0, L"Window Text", -1, DT_LEFT | DT_TOP | textDrawFlags, 0, &rcWindowClient); + + /* Draw preview dialog window */ + SetWindowTextW(hwndDummy, L"Message Box"); + DWORD dwStyleNew = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_DLGFRAME; + SetWindowLongPtr(hwndDummy, GWL_STYLE, dwStyleNew); + DWORD dwExStyleNew = WS_EX_DLGMODALFRAME; + SetWindowLongPtr(hwndDummy, GWL_EXSTYLE, dwExStyleNew); + + if (!GetWindowInfo(hwndDummy, &context.wi)) + return E_FAIL; + + context.wi.dwStyle = WS_VISIBLE | dwStyleNew; + context.wi.dwExStyle = dwExStyleNew; + + INT msgBoxHCenter = rcAdjPreview.left + (previewWidth / 2); + INT msgBoxVCenter = rcAdjPreview.top + (previewHeight / 2); + + DrawWindowForNCPreview(hDC, &context, msgBoxHCenter - NC_PREVIEW_MSGBOX_HALF_WIDTH, msgBoxVCenter + NC_PREVIEW_MSGBOX_OFFSET_X, msgBoxHCenter + NC_PREVIEW_MSGBOX_HALF_WIDTH, msgBoxVCenter + NC_PREVIEW_MSGBOX_OFFSET_Y, FALSE, &rcWindowClient); + DrawThemeBackground(context.theme, hDC, WP_DIALOG, 0, &rcWindowClient, NULL); + + /* Draw preview dialog button */ + HTHEME hBtnTheme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"BUTTON", OTD_NONCLIENT); + if (hBtnTheme) + { + INT btnCenterH = rcWindowClient.left + ((rcWindowClient.right - rcWindowClient.left) / 2); + INT btnCenterV = rcWindowClient.top + ((rcWindowClient.bottom - rcWindowClient.top) / 2); + RECT rcBtn = {btnCenterH - 40, btnCenterV - 15, btnCenterH + 40, btnCenterV + 15}; + int btnPart = BP_PUSHBUTTON; + int btnState = PBS_DEFAULTED; + DrawThemeBackground(hBtnTheme, hDC, btnPart, btnState, &rcBtn, NULL); + MARGINS btnContentMargins; + if (GetThemeMargins(hBtnTheme, hDC, btnPart, btnState, TMT_CONTENTMARGINS, NULL, &btnContentMargins) == S_OK) + { + rcBtn.left += btnContentMargins.cxLeftWidth; + rcBtn.top += btnContentMargins.cyTopHeight; + rcBtn.right -= btnContentMargins.cxRightWidth; + rcBtn.bottom -= btnContentMargins.cyBottomHeight; + } + + LPCWSTR btnText = L"OK"; + LOGFONTW lfBtn; + if ((GetThemeFont(hBtnTheme, hDC, btnPart, btnState, TMT_FONT, &lfBtn) != S_OK) && textFont) + SelectFont(hDC, textFont); + + DrawThemeText(hBtnTheme, hDC, btnPart, btnState, btnText, -1, DT_CENTER | DT_VCENTER | textDrawFlags, 0, &rcBtn); + CloseThemeData(hBtnTheme); + } context.hDC = NULL; CloseThemeData (context.theme); diff --git a/dll/win32/uxtheme/uxthemep.h b/dll/win32/uxtheme/uxthemep.h index af1ffd31a3d..6c8e62b8135 100644 --- a/dll/win32/uxtheme/uxthemep.h +++ b/dll/win32/uxtheme/uxthemep.h @@ -258,7 +258,9 @@ typedef enum { LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc); void ThemeCalculateCaptionButtonsPos(HWND hWnd, HTHEME htheme); -void ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); +LONG SCROLL_getObjectId(INT nBar); +void ThemeDrawScrollBarEx(PDRAW_CONTEXT pcontext, INT nBar, PSCROLLBARINFO psbi, POINT* pt); +void ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); VOID NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, HWND hWnd, HRGN hRgn); void ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext);

10 months, 2 weeks

[reactos] 01/01: [REACTOS] Standardize <imm.h> and <immdev.h> (#6493)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ea93d2ab28520dcd5e7e… commit 8ea93d2ab28520dcd5e7ea0a97b48be97353b802 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 13 20:33:14 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 13 20:33:14 2024 +0900 [REACTOS] Standardize <imm.h> and <immdev.h> (#6493) Improve header compatibility and code quality. JIRA issue: CORE-19268 - Improve <imm.h> and <immdev.h> compatibility by correctly choosing the items. - Use <immdev.h> instead of <ddk/immdev.h>. - Move INPUTCONTEXTDX, IMEINFOEX, IMEDPI, and CLIENTIMC into <imm32_undoc.h>. - Adapt to these changes. --- dll/ime/msctfime/msctfime.h | 5 +- dll/win32/comctl32/edit.c | 1 + dll/win32/imm32/precomp.h | 4 +- dll/win32/msctf/utils.cpp | 1 - dll/win32/msutb/precomp.h | 1 - dll/win32/riched20/editor.c | 3 +- modules/rostests/apitests/imm32/precomp.h | 4 +- modules/rostests/apitests/win32nt/win32nt.h | 2 + sdk/include/ddk/immdev.h | 362 +++++------ sdk/include/psdk/imm.h | 902 +++++++++++++--------------- sdk/include/reactos/imm32_undoc.h | 211 ++++++- win32ss/include/ntuser.h | 28 - win32ss/pch.h | 3 + win32ss/user/ntuser/focus.c | 2 +- win32ss/user/ntuser/kbdlayout.c | 2 +- win32ss/user/ntuser/window.c | 2 +- win32ss/user/ntuser/winpos.c | 2 +- win32ss/user/user32/include/user32.h | 2 + win32ss/user/user32/misc/imm.c | 2 +- win32ss/user/user32/windows/defwnd.c | 2 +- win32ss/user/winsrv/winsrv.h | 2 + 21 files changed, 798 insertions(+), 745 deletions(-) diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index 5e677abef8f..697aa8da684 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -15,7 +15,8 @@ #include <windows.h> #include <imm.h> -#include <ddk/immdev.h> +#include <immdev.h> +#include <imm32_undoc.h> #include <cguid.h> #include <tchar.h> #include <msctf.h> @@ -34,6 +35,4 @@ #include "resource.h" -#define IS_IME_HKL(hKL) ((((ULONG_PTR)(hKL)) & 0xF0000000) == 0xE0000000) - extern HINSTANCE g_hInst; diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index fc6b53755ef..ccd9373b199 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -47,6 +47,7 @@ #include "imm.h" #ifdef __REACTOS__ #include <immdev.h> + #include <imm32_undoc.h> #endif #include "usp10.h" #include "commctrl.h" diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 7bb2569777b..1f309737211 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -27,7 +27,8 @@ #include <winver.h> #include <imm.h> -#include <ddk/immdev.h> +#include <immdev.h> +#include <imm32_undoc.h> #define NTOS_MODE_USER #include <ndk/umtypes.h> @@ -40,7 +41,6 @@ /* Undocumented user definitions */ #include <undocuser.h> -#include <imm32_undoc.h> #include <strsafe.h> diff --git a/dll/win32/msctf/utils.cpp b/dll/win32/msctf/utils.cpp index 8e798094af7..1b26fa92684 100644 --- a/dll/win32/msctf/utils.cpp +++ b/dll/win32/msctf/utils.cpp @@ -16,7 +16,6 @@ #include <windows.h> #include <sddl.h> #include <imm.h> -#include <ddk/immdev.h> #include <cguid.h> #include <tchar.h> #include <msctf.h> diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index 08b64cdd9fb..53e68d549b5 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -16,7 +16,6 @@ #include <windows.h> #include <oleacc.h> #include <imm.h> -#include <ddk/immdev.h> #include <undocuser.h> #include <cguid.h> #include <msctf.h> diff --git a/dll/win32/riched20/editor.c b/dll/win32/riched20/editor.c index bf13c417542..cbc959851ec 100644 --- a/dll/win32/riched20/editor.c +++ b/dll/win32/riched20/editor.c @@ -234,7 +234,8 @@ #include "rtf.h" #include "imm.h" #ifdef __REACTOS__ - #include "immdev.h" + #include <immdev.h> + #include <imm32_undoc.h> #endif #include "res.h" diff --git a/modules/rostests/apitests/imm32/precomp.h b/modules/rostests/apitests/imm32/precomp.h index dbc03f99384..98d85372e68 100644 --- a/modules/rostests/apitests/imm32/precomp.h +++ b/modules/rostests/apitests/imm32/precomp.h @@ -4,13 +4,13 @@ #define WIN32_NO_STATUS #include <windows.h> #include <imm.h> -#include <ddk/immdev.h> +#include <immdev.h> +#include <imm32_undoc.h> #include <pseh/pseh2.h> #include <ndk/umtypes.h> #include <ndk/pstypes.h> #include "../../../win32ss/include/ntuser.h" #include <undocuser.h> -#include <imm32_undoc.h> #include <ndk/rtlfuncs.h> #include <wine/test.h> #include <stdio.h> diff --git a/modules/rostests/apitests/win32nt/win32nt.h b/modules/rostests/apitests/win32nt/win32nt.h index 001e15388da..3e5fd818f94 100644 --- a/modules/rostests/apitests/win32nt/win32nt.h +++ b/modules/rostests/apitests/win32nt/win32nt.h @@ -14,6 +14,8 @@ #include <wingdi.h> #include <objbase.h> #include <imm.h> +#include <immdev.h> +#include <imm32_undoc.h> #include <winddi.h> #include <prntfont.h> diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 3d3b4b5686a..40639571eee 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -2,7 +2,7 @@ * PROJECT: ReactOS headers * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Providing DDK-compatible <immdev.h> and IME/IMM development helper - * COPYRIGHT: Copyright 2021-2022 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + * COPYRIGHT: Copyright 2021-2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #ifndef _IMMDEV_ @@ -17,14 +17,70 @@ extern "C" { #endif +typedef struct _tagIMEINFO { + DWORD dwPrivateDataSize; + DWORD fdwProperty; + DWORD fdwConversionCaps; + DWORD fdwSentenceCaps; + DWORD fdwUICaps; + DWORD fdwSCSCaps; + DWORD fdwSelectCaps; +} IMEINFO, *PIMEINFO, NEAR *NPIMEINFO, FAR *LPIMEINFO; + +typedef struct tagCANDIDATEINFO { + DWORD dwSize; + DWORD dwCount; + DWORD dwOffset[32]; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} CANDIDATEINFO, *PCANDIDATEINFO, NEAR *NPCANDIDATEINFO, FAR *LPCANDIDATEINFO; + +#if (WINVER >= 0x040A) BOOL WINAPI ImmDisableTextFrameService(_In_ DWORD dwThreadId); -BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); +#endif -typedef struct tagSOFTKBDDATA -{ +typedef struct tagSOFTKBDDATA { UINT uCount; - WORD wCode[1][256]; -} SOFTKBDDATA, *PSOFTKBDDATA, *LPSOFTKBDDATA; + WORD wCode[ANYSIZE_ARRAY][256]; +} SOFTKBDDATA, *PSOFTKBDDATA, NEAR *NPSOFTKBDDATA, FAR *LPSOFTKBDDATA; + +typedef struct tagCOMPOSITIONSTRING { + DWORD dwSize; + DWORD dwCompReadAttrLen; + DWORD dwCompReadAttrOffset; + DWORD dwCompReadClauseLen; + DWORD dwCompReadClauseOffset; + DWORD dwCompReadStrLen; + DWORD dwCompReadStrOffset; + DWORD dwCompAttrLen; + DWORD dwCompAttrOffset; + DWORD dwCompClauseLen; + DWORD dwCompClauseOffset; + DWORD dwCompStrLen; + DWORD dwCompStrOffset; + DWORD dwCursorPos; + DWORD dwDeltaStart; + DWORD dwResultReadClauseLen; + DWORD dwResultReadClauseOffset; + DWORD dwResultReadStrLen; + DWORD dwResultReadStrOffset; + DWORD dwResultClauseLen; + DWORD dwResultClauseOffset; + DWORD dwResultStrLen; + DWORD dwResultStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} COMPOSITIONSTRING, *PCOMPOSITIONSTRING, NEAR *NPCOMPOSITIONSTRING, FAR *LPCOMPOSITIONSTRING; + +typedef struct tagGUIDELINE { + DWORD dwSize; + DWORD dwLevel; + DWORD dwIndex; + DWORD dwStrLen; + DWORD dwStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} GUIDELINE, *PGUIDELINE, NEAR *NPGUIDELINE, FAR *LPGUIDELINE; /* wParam for WM_IME_CONTROL */ #define IMC_GETCONVERSIONMODE 0x0001 @@ -90,70 +146,30 @@ typedef struct _tagINPUTCONTEXT { HIMCC hMsgBuf; DWORD fdwInit; DWORD dwReserve[3]; -} INPUTCONTEXT, *PINPUTCONTEXT, *LPINPUTCONTEXT; +} INPUTCONTEXT, *PINPUTCONTEXT, NEAR *NPINPUTCONTEXT, FAR *LPINPUTCONTEXT; -#ifdef _WIN64 -C_ASSERT(offsetof(INPUTCONTEXT, hWnd) == 0x0); -C_ASSERT(offsetof(INPUTCONTEXT, fOpen) == 0x8); -C_ASSERT(offsetof(INPUTCONTEXT, ptStatusWndPos) == 0xc); -C_ASSERT(offsetof(INPUTCONTEXT, ptSoftKbdPos) == 0x14); -C_ASSERT(offsetof(INPUTCONTEXT, fdwConversion) == 0x1c); -C_ASSERT(offsetof(INPUTCONTEXT, fdwSentence) == 0x20); -C_ASSERT(offsetof(INPUTCONTEXT, lfFont) == 0x24); -C_ASSERT(offsetof(INPUTCONTEXT, cfCompForm) == 0x80); -C_ASSERT(offsetof(INPUTCONTEXT, cfCandForm) == 0x9c); -C_ASSERT(offsetof(INPUTCONTEXT, hCompStr) == 0x120); -C_ASSERT(offsetof(INPUTCONTEXT, hCandInfo) == 0x128); -C_ASSERT(offsetof(INPUTCONTEXT, hGuideLine) == 0x130); -C_ASSERT(offsetof(INPUTCONTEXT, hPrivate) == 0x138); -C_ASSERT(offsetof(INPUTCONTEXT, dwNumMsgBuf) == 0x140); -C_ASSERT(offsetof(INPUTCONTEXT, hMsgBuf) == 0x148); -C_ASSERT(offsetof(INPUTCONTEXT, fdwInit) == 0x150); -C_ASSERT(offsetof(INPUTCONTEXT, dwReserve) == 0x154); -C_ASSERT(sizeof(INPUTCONTEXT) == 0x160); -#else +#ifndef _WIN64 C_ASSERT(offsetof(INPUTCONTEXT, hWnd) == 0x0); C_ASSERT(offsetof(INPUTCONTEXT, fOpen) == 0x4); C_ASSERT(offsetof(INPUTCONTEXT, ptStatusWndPos) == 0x8); C_ASSERT(offsetof(INPUTCONTEXT, ptSoftKbdPos) == 0x10); C_ASSERT(offsetof(INPUTCONTEXT, fdwConversion) == 0x18); -C_ASSERT(offsetof(INPUTCONTEXT, fdwSentence) == 0x1c); +C_ASSERT(offsetof(INPUTCONTEXT, fdwSentence) == 0x1C); C_ASSERT(offsetof(INPUTCONTEXT, lfFont) == 0x20); -C_ASSERT(offsetof(INPUTCONTEXT, cfCompForm) == 0x7c); +C_ASSERT(offsetof(INPUTCONTEXT, cfCompForm) == 0x7C); C_ASSERT(offsetof(INPUTCONTEXT, cfCandForm) == 0x98); C_ASSERT(offsetof(INPUTCONTEXT, hCompStr) == 0x118); -C_ASSERT(offsetof(INPUTCONTEXT, hCandInfo) == 0x11c); +C_ASSERT(offsetof(INPUTCONTEXT, hCandInfo) == 0x11C); C_ASSERT(offsetof(INPUTCONTEXT, hGuideLine) == 0x120); C_ASSERT(offsetof(INPUTCONTEXT, hPrivate) == 0x124); C_ASSERT(offsetof(INPUTCONTEXT, dwNumMsgBuf) == 0x128); -C_ASSERT(offsetof(INPUTCONTEXT, hMsgBuf) == 0x12c); +C_ASSERT(offsetof(INPUTCONTEXT, hMsgBuf) == 0x12C); C_ASSERT(offsetof(INPUTCONTEXT, fdwInit) == 0x130); C_ASSERT(offsetof(INPUTCONTEXT, dwReserve) == 0x134); C_ASSERT(sizeof(INPUTCONTEXT) == 0x140); #endif -struct IME_STATE; - -/* unconfirmed */ -#ifdef __cplusplus -typedef struct INPUTCONTEXTDX : INPUTCONTEXT -{ -#else -typedef struct INPUTCONTEXTDX -{ - INPUTCONTEXT; -#endif - UINT nVKey; // +0x140 - BOOL bNeedsTrans; // +0x144 - DWORD dwUnknown1; - DWORD dwUIFlags; // +0x14c - DWORD dwUnknown2; - struct IME_STATE *pState; // +0x154 - DWORD dwChange; // +0x158 - HIMCC hCtfImeContext; -} INPUTCONTEXTDX, *PINPUTCONTEXTDX, *LPINPUTCONTEXTDX; - -// bits of fdwInit of INPUTCONTEXT +/* bits of fdwInit of INPUTCONTEXT */ #define INIT_STATUSWNDPOS 0x00000001 #define INIT_CONVERSION 0x00000002 #define INIT_SENTENCE 0x00000004 @@ -162,7 +178,7 @@ typedef struct INPUTCONTEXTDX #define INIT_SOFTKBDPOS 0x00000020 #define INIT_GUIDMAP 0x00000040 -// bits for INPUTCONTEXTDX.dwChange +/* bits for INPUTCONTEXTDX.dwChange */ #define INPUTCONTEXTDX_CHANGE_OPEN 0x1 #define INPUTCONTEXTDX_CHANGE_CONVERSION 0x2 #define INPUTCONTEXTDX_CHANGE_SENTENCE 0x4 @@ -172,7 +188,7 @@ typedef struct INPUTCONTEXTDX #define WM_IME_REPORT 0x280 #endif -// WM_IME_REPORT wParam +/* WM_IME_REPORT wParam */ #define IR_STRINGSTART 0x100 #define IR_STRINGEND 0x101 #define IR_OPENCONVERT 0x120 @@ -186,193 +202,110 @@ typedef struct INPUTCONTEXTDX #define IR_STRINGEX 0x180 #define IR_MODEINFO 0x190 -// for IR_UNDETERMINE -typedef struct tagUNDETERMINESTRUCT -{ - DWORD dwSize; - UINT uDefIMESize; - UINT uDefIMEPos; - UINT uUndetTextLen; - UINT uUndetTextPos; - UINT uUndetAttrPos; - UINT uCursorPos; - UINT uDeltaStart; - UINT uDetermineTextLen; - UINT uDetermineTextPos; - UINT uDetermineDelimPos; - UINT uYomiTextLen; - UINT uYomiTextPos; - UINT uYomiDelimPos; -} UNDETERMINESTRUCT, *PUNDETERMINESTRUCT, *LPUNDETERMINESTRUCT; - -LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); - -typedef struct IME_SUBSTATE -{ - struct IME_SUBSTATE *pNext; - HKL hKL; - DWORD dwValue; -} IME_SUBSTATE, *PIME_SUBSTATE; +/* IMC */ -#ifndef _WIN64 -C_ASSERT(sizeof(IME_SUBSTATE) == 0xc); -#endif +LPINPUTCONTEXT WINAPI ImmLockIMC(_In_ HIMC hIMC); +BOOL WINAPI ImmUnlockIMC(_In_ HIMC hIMC); +DWORD WINAPI ImmGetIMCLockCount(_In_ HIMC hIMC); -typedef struct IME_STATE -{ - struct IME_STATE *pNext; - WORD wLang; - WORD fOpen; - DWORD dwConversion; - DWORD dwSentence; - DWORD dwInit; - PIME_SUBSTATE pSubState; -} IME_STATE, *PIME_STATE; +/* IMCC */ -#ifndef _WIN64 -C_ASSERT(sizeof(IME_STATE) == 0x18); +HIMCC WINAPI ImmCreateIMCC(_In_ DWORD size); +HIMCC WINAPI ImmDestroyIMCC(_In_ HIMCC block); +LPVOID WINAPI ImmLockIMCC(_In_ HIMCC imcc); +BOOL WINAPI ImmUnlockIMCC(_In_ HIMCC imcc); +DWORD WINAPI ImmGetIMCCLockCount(_In_ HIMCC imcc); +HIMCC WINAPI ImmReSizeIMCC(_In_ HIMCC imcc, _In_ DWORD size); +DWORD WINAPI ImmGetIMCCSize(_In_ HIMCC imcc); + +/* Messaging */ + +BOOL WINAPI ImmGenerateMessage(_In_ HIMC hIMC); + +BOOL WINAPI +ImmTranslateMessage( + _In_ HWND hwnd, + _In_ UINT msg, + _In_ WPARAM wParam, + _In_ LPARAM lKeyData); + +LRESULT WINAPI ImmRequestMessageA(_In_ HIMC hIMC, _In_ WPARAM wParam, _In_ LPARAM lParam); +LRESULT WINAPI ImmRequestMessageW(_In_ HIMC hIMC, _In_ WPARAM wParam, _In_ LPARAM lParam); + +#ifdef UNICODE + #define ImmRequestMessage ImmRequestMessageW +#else + #define ImmRequestMessage ImmRequestMessageA #endif -typedef struct _tagTRANSMSG -{ +typedef struct _tagTRANSMSG { UINT message; WPARAM wParam; LPARAM lParam; -} TRANSMSG, *PTRANSMSG, *LPTRANSMSG; +} TRANSMSG, *PTRANSMSG, NEAR *NPTRANSMSG, FAR *LPTRANSMSG; -typedef struct _tagTRANSMSGLIST -{ +typedef struct _tagTRANSMSGLIST { UINT uMsgCount; TRANSMSG TransMsg[ANYSIZE_ARRAY]; -} TRANSMSGLIST, *PTRANSMSGLIST, *LPTRANSMSGLIST; - -#define DEFINE_IME_ENTRY(type, name, params, extended) typedef type (WINAPI *FN_##name) params; -#include <imetable.h> -#undef DEFINE_IME_ENTRY - -typedef struct IMEDPI -{ - struct IMEDPI *pNext; - HINSTANCE hInst; - HKL hKL; - IMEINFO ImeInfo; - UINT uCodePage; - WCHAR szUIClass[16]; - DWORD cLockObj; - DWORD dwFlags; -#define DEFINE_IME_ENTRY(type, name, params, extended) FN_##name name; -#include <imetable.h> -#undef DEFINE_IME_ENTRY -} IMEDPI, *PIMEDPI; +} TRANSMSGLIST, *PTRANSMSGLIST, NEAR *NPTRANSMSGLIST, FAR *LPTRANSMSGLIST; -#ifndef _WIN64 -C_ASSERT(offsetof(IMEDPI, pNext) == 0x0); -C_ASSERT(offsetof(IMEDPI, hInst) == 0x4); -C_ASSERT(offsetof(IMEDPI, hKL) == 0x8); -C_ASSERT(offsetof(IMEDPI, ImeInfo) == 0xc); -C_ASSERT(offsetof(IMEDPI, uCodePage) == 0x28); -C_ASSERT(offsetof(IMEDPI, szUIClass) == 0x2c); -C_ASSERT(offsetof(IMEDPI, cLockObj) == 0x4c); -C_ASSERT(offsetof(IMEDPI, dwFlags) == 0x50); -C_ASSERT(offsetof(IMEDPI, ImeInquire) == 0x54); -C_ASSERT(offsetof(IMEDPI, ImeConversionList) == 0x58); -C_ASSERT(offsetof(IMEDPI, ImeRegisterWord) == 0x5c); -C_ASSERT(offsetof(IMEDPI, ImeUnregisterWord) == 0x60); -C_ASSERT(offsetof(IMEDPI, ImeGetRegisterWordStyle) == 0x64); -C_ASSERT(offsetof(IMEDPI, ImeEnumRegisterWord) == 0x68); -C_ASSERT(offsetof(IMEDPI, ImeConfigure) == 0x6c); -C_ASSERT(offsetof(IMEDPI, ImeDestroy) == 0x70); -C_ASSERT(offsetof(IMEDPI, ImeEscape) == 0x74); -C_ASSERT(offsetof(IMEDPI, ImeProcessKey) == 0x78); -C_ASSERT(offsetof(IMEDPI, ImeSelect) == 0x7c); -C_ASSERT(offsetof(IMEDPI, ImeSetActiveContext) == 0x80); -C_ASSERT(offsetof(IMEDPI, ImeToAsciiEx) == 0x84); -C_ASSERT(offsetof(IMEDPI, NotifyIME) == 0x88); -C_ASSERT(offsetof(IMEDPI, ImeSetCompositionString) == 0x8c); -C_ASSERT(offsetof(IMEDPI, ImeGetImeMenuItems) == 0x90); -C_ASSERT(offsetof(IMEDPI, CtfImeInquireExW) == 0x94); -C_ASSERT(offsetof(IMEDPI, CtfImeSelectEx) == 0x98); -C_ASSERT(offsetof(IMEDPI, CtfImeEscapeEx) == 0x9c); -C_ASSERT(offsetof(IMEDPI, CtfImeGetGuidAtom) == 0xa0); -C_ASSERT(offsetof(IMEDPI, CtfImeIsGuidMapEnable) == 0xa4); -C_ASSERT(sizeof(IMEDPI) == 0xa8); -#endif +/* Soft keyboard */ -/* flags for IMEDPI.dwFlags */ -#define IMEDPI_FLAG_UNLOADED 0x1 -#define IMEDPI_FLAG_LOCKED 0x2 - -/* unconfirmed */ -typedef struct tagCLIENTIMC -{ - HANDLE hInputContext; /* LocalAlloc'ed LHND */ - LONG cLockObj; - DWORD dwFlags; - DWORD dwCompatFlags; - RTL_CRITICAL_SECTION cs; - UINT uCodePage; - HKL hKL; - BOOL bCtfIme; -} CLIENTIMC, *PCLIENTIMC; +HWND WINAPI +ImmCreateSoftKeyboard( + _In_ UINT uType, + _In_ HWND hwndParent, + _In_ INT x, + _In_ INT y); -#ifndef _WIN64 -C_ASSERT(offsetof(CLIENTIMC, hInputContext) == 0x0); -C_ASSERT(offsetof(CLIENTIMC, cLockObj) == 0x4); -C_ASSERT(offsetof(CLIENTIMC, dwFlags) == 0x8); -C_ASSERT(offsetof(CLIENTIMC, dwCompatFlags) == 0xc); -C_ASSERT(offsetof(CLIENTIMC, cs) == 0x10); -C_ASSERT(offsetof(CLIENTIMC, uCodePage) == 0x28); -C_ASSERT(offsetof(CLIENTIMC, hKL) == 0x2c); -C_ASSERT(sizeof(CLIENTIMC) == 0x34); -#endif +BOOL WINAPI +ImmShowSoftKeyboard( + _In_ HWND hwndSoftKBD, + _In_ INT nCmdShow); -/* flags for CLIENTIMC */ -#define CLIENTIMC_WIDE 0x1 -#define CLIENTIMC_ACTIVE 0x2 -#define CLIENTIMC_UNKNOWN4 0x20 -#define CLIENTIMC_DESTROY 0x40 -#define CLIENTIMC_DISABLEIME 0x80 -#define CLIENTIMC_UNKNOWN2 0x100 +BOOL WINAPI +ImmDestroySoftKeyboard( + _In_ HWND hwndSoftKBD); /* IME file interface */ BOOL WINAPI ImeInquire( _Out_ LPIMEINFO lpIMEInfo, - _Out_ LPWSTR lpszWndClass, + _Out_ LPTSTR lpszWndClass, _In_ DWORD dwSystemInfoFlags); DWORD WINAPI ImeConversionList( _In_ HIMC hIMC, - _In_ LPCWSTR lpSrc, + _In_ LPCTSTR lpSrc, _Out_ LPCANDIDATELIST lpDst, _In_ DWORD dwBufLen, _In_ UINT uFlag); BOOL WINAPI ImeRegisterWord( - _In_ LPCWSTR lpszReading, + _In_ LPCTSTR lpszReading, _In_ DWORD dwStyle, - _In_ LPCWSTR lpszString); + _In_ LPCTSTR lpszString); BOOL WINAPI ImeUnregisterWord( - _In_ LPCWSTR lpszReading, + _In_ LPCTSTR lpszReading, _In_ DWORD dwStyle, - _In_ LPCWSTR lpszString); + _In_ LPCTSTR lpszString); UINT WINAPI ImeGetRegisterWordStyle( _In_ UINT nItem, - _Out_ LPSTYLEBUFW lpStyleBuf); + _Out_ LPSTYLEBUF lpStyleBuf); UINT WINAPI ImeEnumRegisterWord( - _In_ REGISTERWORDENUMPROCW lpfnEnumProc, - _In_opt_ LPCWSTR lpszReading, + _In_ REGISTERWORDENUMPROC lpfnEnumProc, + _In_opt_ LPCTSTR lpszReading, _In_ DWORD dwStyle, - _In_opt_ LPCWSTR lpszString, + _In_opt_ LPCTSTR lpszString, _In_opt_ LPVOID lpData); BOOL WINAPI @@ -439,12 +372,41 @@ ImeGetImeMenuItems( _In_ HIMC hIMC, _In_ DWORD dwFlags, _In_ DWORD dwType, - _Inout_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, - _Inout_opt_ LPIMEMENUITEMINFOW lpImeMenu, + _Inout_opt_ LPIMEMENUITEMINFO lpImeParentMenu, + _Inout_opt_ LPIMEMENUITEMINFO lpImeMenu, _In_ DWORD dwSize); #ifdef __cplusplus -} // extern "C" +} /* extern "C" */ #endif +/* IME Property bits */ +#define IME_PROP_END_UNLOAD 0x0001 +#define IME_PROP_KBD_CHAR_FIRST 0x0002 +#define IME_PROP_IGNORE_UPKEYS 0x0004 +#define IME_PROP_NEED_ALTKEY 0x0008 +#define IME_PROP_NO_KEYS_ON_CLOSE 0x0010 +#define IME_PROP_ACCEPT_WIDE_VKEY 0x0020 + +/* for NI_CONTEXTUPDATED */ +#define IMC_SETCONVERSIONMODE 0x0002 +#define IMC_SETSENTENCEMODE 0x0004 +#define IMC_SETOPENSTATUS 0x0006 + +/* dwAction for ImmNotifyIME */ +#define NI_CONTEXTUPDATED 0x0003 +#define NI_OPENCANDIDATE 0x0010 +#define NI_CLOSECANDIDATE 0x0011 +#define NI_SELECTCANDIDATESTR 0x0012 +#define NI_CHANGECANDIDATELIST 0x0013 +#define NI_FINALIZECONVERSIONRESULT 0x0014 +#define NI_COMPOSITIONSTR 0x0015 +#define NI_SETCANDIDATE_PAGESTART 0x0016 +#define NI_SETCANDIDATE_PAGESIZE 0x0017 +#define NI_IMEMENUSELECTED 0x0018 + +/* dwSystemInfoFlags bits */ +#define IME_SYSINFO_WINLOGON 0x0001 +#define IME_SYSINFO_WOW16 0x0002 + #endif /* ndef _IMMDEV_ */ diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 7d63409ad5f..9c2e8df039a 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -1,21 +1,9 @@ /* - * Declarations for IMM32 - * - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: ReactOS headers + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Declarations for IMM32 + * COPYRIGHT: Copyright (C) the Wine project + * Copyright (C) 2021-2024 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #ifndef __WINE_IMM_H @@ -25,116 +13,118 @@ extern "C" { #endif -#ifdef __REACTOS__ +#if (WINVER >= 0x040A) DECLARE_HANDLE(HIMC); DECLARE_HANDLE(HIMCC); -typedef HKL *LPHKL; #else -typedef HANDLE HIMC; -typedef HANDLE HIMCC; +typedef DWORD HIMC; +typedef DWORD HIMCC; #endif +typedef HKL FAR *LPHKL; +typedef UINT FAR *LPUINT; + typedef struct tagREGISTERWORDA { LPSTR lpReading; LPSTR lpWord; -} REGISTERWORDA, *PREGISTERWORDA, *NPREGISTERWORDA, *LPREGISTERWORDA; +} REGISTERWORDA, *PREGISTERWORDA, NEAR *NPREGISTERWORDA, FAR *LPREGISTERWORDA; typedef struct tagREGISTERWORDW { LPWSTR lpReading; LPWSTR lpWord; -} REGISTERWORDW, *PREGISTERWORDW, *NPREGISTERWORDW, *LPREGISTERWORDW; - -typedef int -(CALLBACK *REGISTERWORDENUMPROCA)( - _In_ LPCSTR, - _In_ DWORD, - _In_ LPCSTR, - _In_ LPVOID); - -typedef int -(CALLBACK *REGISTERWORDENUMPROCW)( - _In_ LPCWSTR, - _In_ DWORD, - _In_ LPCWSTR, - _In_ LPVOID); - -typedef struct tagCANDIDATEFORM -{ - DWORD dwIndex; - DWORD dwStyle; - POINT ptCurrentPos; - RECT rcArea; -} CANDIDATEFORM, *LPCANDIDATEFORM; - -typedef struct tagCANDIDATELIST -{ - DWORD dwSize; - DWORD dwStyle; - DWORD dwCount; - DWORD dwSelection; - DWORD dwPageStart; - DWORD dwPageSize; - DWORD dwOffset[1]; -} CANDIDATELIST, *LPCANDIDATELIST; - -typedef struct tagSTYLEBUFA -{ - DWORD dwStyle; - CHAR szDescription[32]; -} STYLEBUFA, *LPSTYLEBUFA; - -typedef struct tagSTYLEBUFW -{ - DWORD dwStyle; - WCHAR szDescription[32]; -} STYLEBUFW, *LPSTYLEBUFW; - -DECL_WINELIB_TYPE_AW(STYLEBUF) -DECL_WINELIB_TYPE_AW(LPSTYLEBUF) - -typedef struct tagRECONVERTSTRING -{ - DWORD dwSize; - DWORD dwVersion; - DWORD dwStrLen; - DWORD dwStrOffset; - DWORD dwCompStrLen; - DWORD dwCompStrOffset; - DWORD dwTargetStrLen; - DWORD dwTargetStrOffset; -} RECONVERTSTRING, *LPRECONVERTSTRING; +} REGISTERWORDW, *PREGISTERWORDW, NEAR *NPREGISTERWORDW, FAR *LPREGISTERWORDW; + +typedef INT (CALLBACK *REGISTERWORDENUMPROCA)( + _In_ LPCSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCSTR lpszRegister, + _Inout_opt_ LPVOID lpData); + +typedef INT (CALLBACK *REGISTERWORDENUMPROCW)( + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszRegister, + _Inout_opt_ LPVOID lpData); + +typedef struct tagCANDIDATEFORM { + DWORD dwIndex; + DWORD dwStyle; + POINT ptCurrentPos; + RECT rcArea; +} CANDIDATEFORM, *PCANDIDATEFORM, NEAR *NPCANDIDATEFORM, FAR *LPCANDIDATEFORM; + +typedef struct tagCANDIDATELIST { + DWORD dwSize; + DWORD dwStyle; + DWORD dwCount; + DWORD dwSelection; + DWORD dwPageStart; + DWORD dwPageSize; + DWORD dwOffset[ANYSIZE_ARRAY]; +} CANDIDATELIST, *PCANDIDATELIST, NEAR *NPCANDIDATELIST, FAR *LPCANDIDATELIST; + +#define STYLE_DESCRIPTION_SIZE 32 + +typedef struct tagSTYLEBUFA { + DWORD dwStyle; + CHAR szDescription[STYLE_DESCRIPTION_SIZE]; +} STYLEBUFA, *PSTYLEBUFA, NEAR *NPSTYLEBUFA, FAR *LPSTYLEBUFA; +typedef struct tagSTYLEBUFW { + DWORD dwStyle; + WCHAR szDescription[STYLE_DESCRIPTION_SIZE]; +} STYLEBUFW, *PSTYLEBUFW, NEAR *NPSTYLEBUFW, FAR *LPSTYLEBUFW; + +#if (WINVER >= 0x040A) + +typedef struct tagRECONVERTSTRING { + DWORD dwSize; + DWORD dwVersion; + DWORD dwStrLen; + DWORD dwStrOffset; + DWORD dwCompStrLen; + DWORD dwCompStrOffset; + DWORD dwTargetStrLen; + DWORD dwTargetStrOffset; +} RECONVERTSTRING, *PRECONVERTSTRING, NEAR *NPRECONVERTSTRING, FAR *LPRECONVERTSTRING; #define IMEMENUITEM_STRING_SIZE 80 -typedef struct tagIMEMENUITEMINFOA -{ - UINT cbSize; - UINT fType; - UINT fState; - UINT wID; - HBITMAP hbmpChecked; - HBITMAP hbmpUnchecked; - DWORD dwItemData; - CHAR szString[IMEMENUITEM_STRING_SIZE]; - HBITMAP hbmpItem; -} IMEMENUITEMINFOA, *LPIMEMENUITEMINFOA; - -typedef struct tagIMEMENUITEMINFOW -{ - UINT cbSize; - UINT fType; - UINT fState; - UINT wID; - HBITMAP hbmpChecked; - HBITMAP hbmpUnchecked; - DWORD dwItemData; - WCHAR szString[IMEMENUITEM_STRING_SIZE]; - HBITMAP hbmpItem; -} IMEMENUITEMINFOW, *LPIMEMENUITEMINFOW; - -DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO) -DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO) +typedef struct tagIMEMENUITEMINFOA { + UINT cbSize; + UINT fType; + UINT fState; + UINT wID; + HBITMAP hbmpChecked; + HBITMAP hbmpUnchecked; + DWORD dwItemData; + CHAR szString[IMEMENUITEM_STRING_SIZE]; + HBITMAP hbmpItem; +} IMEMENUITEMINFOA, *PIMEMENUITEMINFOA, NEAR *NPIMEMENUITEMINFOA, FAR *LPIMEMENUITEMINFOA; + +typedef struct tagIMEMENUITEMINFOW { + UINT cbSize; + UINT fType; + UINT fState; + UINT wID; + HBITMAP hbmpChecked; + HBITMAP hbmpUnchecked; + DWORD dwItemData; + WCHAR szString[IMEMENUITEM_STRING_SIZE]; + HBITMAP hbmpItem; +} IMEMENUITEMINFOW, *PIMEMENUITEMINFOW, NEAR *NPIMEMENUITEMINFOW, FAR *LPIMEMENUITEMINFOW; + +#ifdef UNICODE + typedef IMEMENUITEMINFOW IMEMENUITEMINFO; + typedef PIMEMENUITEMINFOW PIMEMENUITEMINFO; + typedef NPIMEMENUITEMINFOW NPIMEMENUITEMINFO; + typedef LPIMEMENUITEMINFOW LPIMEMENUITEMINFO; +#else + typedef IMEMENUITEMINFOA IMEMENUITEMINFO; + typedef PIMEMENUITEMINFOA PIMEMENUITEMINFO; + typedef NPIMEMENUITEMINFOA NPIMEMENUITEMINFO; + typedef LPIMEMENUITEMINFOA LPIMEMENUITEMINFO; +#endif typedef struct tagIMECHARPOSITION { DWORD dwSize; @@ -144,131 +134,15 @@ typedef struct tagIMECHARPOSITION { RECT rcDocument; } IMECHARPOSITION, *PIMECHARPOSITION, *NPIMECHARPOSITION, *LPIMECHARPOSITION; -typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); - -typedef struct _tagCOMPOSITIONFORM -{ - DWORD dwStyle; - POINT ptCurrentPos; - RECT rcArea; -} COMPOSITIONFORM, *LPCOMPOSITIONFORM; - -typedef struct _tagIMEINFO { - DWORD dwPrivateDataSize; - DWORD fdwProperty; - DWORD fdwConversionCaps; - DWORD fdwSentenceCaps; - DWORD fdwUICaps; - DWORD fdwSCSCaps; - DWORD fdwSelectCaps; -} IMEINFO, *LPIMEINFO; - -typedef struct tagCOMPOSITIONSTRING { - DWORD dwSize; - DWORD dwCompReadAttrLen; - DWORD dwCompReadAttrOffset; - DWORD dwCompReadClauseLen; - DWORD dwCompReadClauseOffset; - DWORD dwCompReadStrLen; - DWORD dwCompReadStrOffset; - DWORD dwCompAttrLen; - DWORD dwCompAttrOffset; - DWORD dwCompClauseLen; - DWORD dwCompClauseOffset; - DWORD dwCompStrLen; - DWORD dwCompStrOffset; - DWORD dwCursorPos; - DWORD dwDeltaStart; - DWORD dwResultReadClauseLen; - DWORD dwResultReadClauseOffset; - DWORD dwResultReadStrLen; - DWORD dwResultReadStrOffset; - DWORD dwResultClauseLen; - DWORD dwResultClauseOffset; - DWORD dwResultStrLen; - DWORD dwResultStrOffset; - DWORD dwPrivateSize; - DWORD dwPrivateOffset; -} COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; - -typedef struct tagGUIDELINE { - DWORD dwSize; - DWORD dwLevel; - DWORD dwIndex; - DWORD dwStrLen; - DWORD dwStrOffset; - DWORD dwPrivateSize; - DWORD dwPrivateOffset; -} GUIDELINE, *LPGUIDELINE; - -typedef struct tagCANDIDATEINFO { - DWORD dwSize; - DWORD dwCount; - DWORD dwOffset[32]; - DWORD dwPrivateSize; - DWORD dwPrivateOffset; -} CANDIDATEINFO, *LPCANDIDATEINFO; - -/* IME Property bits */ -#define IME_PROP_END_UNLOAD 0x0001 -#define IME_PROP_KBD_CHAR_FIRST 0x0002 -#define IME_PROP_IGNORE_UPKEYS 0x0004 -#define IME_PROP_NEED_ALTKEY 0x0008 -#define IME_PROP_NO_KEYS_ON_CLOSE 0x0010 -#define IME_PROP_ACCEPT_WIDE_VKEY 0x0020 - -/* for NI_CONTEXTUPDATED */ -#define IMC_SETCONVERSIONMODE 0x0002 -#define IMC_SETSENTENCEMODE 0x0004 -#define IMC_SETOPENSTATUS 0x0006 - -/* dwAction for ImmNotifyIME */ -#define NI_CONTEXTUPDATED 0x0003 -#define NI_OPENCANDIDATE 0x0010 -#define NI_CLOSECANDIDATE 0x0011 -#define NI_SELECTCANDIDATESTR 0x0012 -#define NI_CHANGECANDIDATELIST 0x0013 -#define NI_FINALIZECONVERSIONRESULT 0x0014 -#define NI_COMPOSITIONSTR 0x0015 -#define NI_SETCANDIDATE_PAGESTART 0x0016 -#define NI_SETCANDIDATE_PAGESIZE 0x0017 -#define NI_IMEMENUSELECTED 0x0018 - -/* dwSystemInfoFlags bits */ -#define IME_SYSINFO_WINLOGON 0x0001 -#define IME_SYSINFO_WOW16 0x0002 - -BOOL WINAPI ImmUnlockIMC(HIMC); -DWORD WINAPI ImmGetIMCLockCount(HIMC); -HIMCC WINAPI ImmCreateIMCC(DWORD); -HIMCC WINAPI ImmDestroyIMCC(HIMCC); -LPVOID WINAPI ImmLockIMCC(HIMCC); -BOOL WINAPI ImmUnlockIMCC(HIMCC); -DWORD WINAPI ImmGetIMCCLockCount(HIMCC); -HIMCC WINAPI ImmReSizeIMCC(HIMCC, DWORD); -DWORD WINAPI ImmGetIMCCSize(HIMCC); - -BOOL WINAPI ImmGenerateMessage(HIMC); -LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); -LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); -#define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); -BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); - -HWND WINAPI -ImmCreateSoftKeyboard( - _In_ UINT uType, - _In_ HWND hwndParent, - _In_ INT x, - _In_ INT y); +typedef BOOL (CALLBACK *IMCENUMPROC)(_In_ HIMC hIMC, _In_ LPARAM lParam); -BOOL WINAPI -ImmShowSoftKeyboard( - _In_ HWND hwndSoftKBD, - _In_ INT nCmdShow); +#endif /* WINVER >= 0x040A */ -BOOL WINAPI -ImmDestroySoftKeyboard( - _In_ HWND hwndSoftKBD); +typedef struct _tagCOMPOSITIONFORM { + DWORD dwStyle; + POINT ptCurrentPos; + RECT rcArea; +} COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, FAR *LPCOMPOSITIONFORM; /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 @@ -282,10 +156,7 @@ ImmDestroySoftKeyboard( #define IMC_CLOSESTATUSWINDOW 0x0021 #define IMC_OPENSTATUSWINDOW 0x0022 -/* - * wParam for WM_IME_CONTROL to the soft keyboard - * dwAction for ImmNotifyIME - */ +/* dwAction for ImmNotifyIME */ #define NI_OPENCANDIDATE 0x0010 #define NI_CLOSECANDIDATE 0x0011 #define NI_SELECTCANDIDATESTR 0x0012 @@ -294,7 +165,7 @@ ImmDestroySoftKeyboard( #define NI_COMPOSITIONSTR 0x0015 #define NI_SETCANDIDATE_PAGESTART 0x0016 #define NI_SETCANDIDATE_PAGESIZE 0x0017 -#define NI_IMEMENUSELECTED 0x0018 +#define NI_IMEMENUSELECTED 0x0018 /* lParam for WM_IME_SETCONTEXT */ #define ISC_SHOWUICANDIDATEWINDOW 0x00000001 @@ -303,14 +174,12 @@ ImmDestroySoftKeyboard( #define ISC_SHOWUIALLCANDIDATEWINDOW 0x0000000F #define ISC_SHOWUIALL 0xC000000F - /* dwIndex for ImmNotifyIME/NI_COMPOSITIONSTR */ #define CPS_COMPLETE 0x0001 #define CPS_CONVERT 0x0002 #define CPS_REVERT 0x0003 #define CPS_CANCEL 0x0004 - /* the modifiers of hot key */ #define MOD_ALT 0x0001 #define MOD_CONTROL 0x0002 @@ -322,7 +191,6 @@ ImmDestroySoftKeyboard( #define MOD_ON_KEYUP 0x0800 #define MOD_IGNORE_ALL_MODIFIER 0x0400 - /* Windows for Simplified Chinese Edition hot key ID from 0x10 - 0x2F */ #define IME_CHOTKEY_IME_NONIME_TOGGLE 0x10 #define IME_CHOTKEY_SHAPE_TOGGLE 0x11 @@ -349,14 +217,10 @@ ImmDestroySoftKeyboard( #define IME_ITHOTKEY_RESEND_RESULTSTR 0x200 #define IME_ITHOTKEY_PREVIOUS_COMPOSITION 0x201 #define IME_ITHOTKEY_UISTYLE_TOGGLE 0x202 -#define IME_ITHOTKEY_RECONVERTSTRING 0x203 +#define IME_ITHOTKEY_RECONVERTSTRING 0x203 #define IME_HOTKEY_PRIVATE_LAST 0x21F - -/* - * dwSystemInfoFlags bits - * parameter of ImmGetCompositionString - */ +/* parameter of ImmGetCompositionString */ #define GCS_COMPREADSTR 0x0001 #define GCS_COMPREADATTR 0x0002 #define GCS_COMPREADCLAUSE 0x0004 @@ -374,11 +238,7 @@ ImmDestroySoftKeyboard( #define CS_INSERTCHAR 0x2000 #define CS_NOMOVECARET 0x4000 - -/* - * bits of fdwInit of INPUTCONTEXT - * IME version constants - */ +/* IME version constants */ #define IMEVER_0310 0x0003000A #define IMEVER_0400 0x00040000 @@ -387,7 +247,7 @@ ImmDestroySoftKeyboard( #define IME_PROP_SPECIAL_UI 0x00020000 #define IME_PROP_CANDLIST_START_FROM_1 0x00040000 #define IME_PROP_UNICODE 0x00080000 -#define IME_PROP_COMPLETE_ON_UNSELECT 0x00100000 +#define IME_PROP_COMPLETE_ON_UNSELECT 0x00100000 /* IME UICapability bits */ #define UI_CAP_2700 0x00000001 @@ -398,14 +258,13 @@ ImmDestroySoftKeyboard( /* ImmSetCompositionString Capability bits */ #define SCS_CAP_COMPSTR 0x00000001 #define SCS_CAP_MAKEREAD 0x00000002 -#define SCS_CAP_SETRECONVERTSTRING 0x00000004 +#define SCS_CAP_SETRECONVERTSTRING 0x00000004 /* IME WM_IME_SELECT inheritance Capability bits */ #define SELECT_CAP_CONVERSION 0x00000001 #define SELECT_CAP_SENTENCE 0x00000002 - -/* ID for deIndex of ImmGetGuideLine */ +/* ID for dwIndex of ImmGetGuideLine */ #define GGL_LEVEL 0x00000001 #define GGL_INDEX 0x00000002 #define GGL_STRING 0x00000003 @@ -440,18 +299,17 @@ ImmDestroySoftKeyboard( #define IGP_GETIMEVERSION (DWORD)(-4) #define IGP_PROPERTY 0x00000004 #define IGP_CONVERSION 0x00000008 -#define IGP_SENTENCE 0x0000000c +#define IGP_SENTENCE 0x0000000C #define IGP_UI 0x00000010 #define IGP_SETCOMPSTR 0x00000014 #define IGP_SELECT 0x00000018 - /* dwIndex for ImmSetCompositionString API */ -#define SCS_SETSTR (GCS_COMPREADSTR|GCS_COMPSTR) -#define SCS_CHANGEATTR (GCS_COMPREADATTR|GCS_COMPATTR) -#define SCS_CHANGECLAUSE (GCS_COMPREADCLAUSE|GCS_COMPCLAUSE) -#define SCS_SETRECONVERTSTRING 0x00010000 -#define SCS_QUERYRECONVERTSTRING 0x00020000 +#define SCS_SETSTR (GCS_COMPREADSTR | GCS_COMPSTR) +#define SCS_CHANGEATTR (GCS_COMPREADATTR | GCS_COMPATTR) +#define SCS_CHANGECLAUSE (GCS_COMPREADCLAUSE | GCS_COMPCLAUSE) +#define SCS_SETRECONVERTSTRING 0x00010000 +#define SCS_QUERYRECONVERTSTRING 0x00020000 /* attribute for COMPOSITIONSTRING Structure */ #define ATTR_INPUT 0x00 @@ -459,8 +317,7 @@ ImmDestroySoftKeyboard( #define ATTR_CONVERTED 0x02 #define ATTR_TARGET_NOTCONVERTED 0x03 #define ATTR_INPUT_ERROR 0x04 -#define ATTR_FIXEDCONVERTED 0x05 - +#define ATTR_FIXEDCONVERTED 0x05 /* bit field for IMC_SETCOMPOSITIONWINDOW, IMC_SETCANDIDATEWINDOW */ #define CFS_DEFAULT 0x0000 @@ -475,7 +332,6 @@ ImmDestroySoftKeyboard( #define GCL_REVERSECONVERSION 0x0002 #define GCL_REVERSE_LENGTH 0x0003 - /* bit field for conversion mode */ #define IME_CMODE_ALPHANUMERIC 0x0000 #define IME_CMODE_NATIVE 0x0001 @@ -494,15 +350,15 @@ ImmDestroySoftKeyboard( #define IME_CMODE_NOCONVERSION 0x0100 #define IME_CMODE_EUDC 0x0200 #define IME_CMODE_SYMBOL 0x0400 -#define IME_CMODE_FIXED 0x0800 - +#define IME_CMODE_FIXED 0x0800 +/* bit field for sentence mode */ #define IME_SMODE_NONE 0x0000 #define IME_SMODE_PLAURALCLAUSE 0x0001 #define IME_SMODE_SINGLECONVERT 0x0002 #define IME_SMODE_AUTOMATIC 0x0004 #define IME_SMODE_PHRASEPREDICT 0x0008 -#define IME_SMODE_CONVERSATION 0x0010 +#define IME_SMODE_CONVERSATION 0x0010 /* style of candidate */ #define IME_CAND_UNKNOWN 0x0000 @@ -512,7 +368,6 @@ ImmDestroySoftKeyboard( #define IME_CAND_RADICAL 0x0004 #define IME_CAND_STROKE 0x0005 - /* wParam of report message WM_IME_NOTIFY */ #define IMN_CLOSESTATUSWINDOW 0x0001 #define IMN_OPENSTATUSWINDOW 0x0002 @@ -529,22 +384,23 @@ ImmDestroySoftKeyboard( #define IMN_GUIDELINE 0x000D #define IMN_PRIVATE 0x000E +#if (WINVER >= 0x040A) /* wParam of report message WM_IME_REQUEST */ -#define IMR_COMPOSITIONWINDOW 0x0001 -#define IMR_CANDIDATEWINDOW 0x0002 -#define IMR_COMPOSITIONFONT 0x0003 -#define IMR_RECONVERTSTRING 0x0004 -#define IMR_CONFIRMRECONVERTSTRING 0x0005 -#define IMR_QUERYCHARPOSITION 0x0006 -#define IMR_DOCUMENTFEED 0x0007 +#define IMR_COMPOSITIONWINDOW 0x0001 +#define IMR_CANDIDATEWINDOW 0x0002 +#define IMR_COMPOSITIONFONT 0x0003 +#define IMR_RECONVERTSTRING 0x0004 +#define IMR_CONFIRMRECONVERTSTRING 0x0005 +#define IMR_QUERYCHARPOSITION 0x0006 +#define IMR_DOCUMENTFEED 0x0007 +#endif /* error code of ImmGetCompositionString */ #define IMM_ERROR_NODATA (-1) #define IMM_ERROR_GENERAL (-2) - /* dialog mode of ImmConfigureIME */ #define IME_CONFIG_GENERAL 1 #define IME_CONFIG_REGISTERWORD 2 @@ -564,366 +420,426 @@ ImmDestroySoftKeyboard( #define IME_ESC_SYNC_HOTKEY 0x1007 #define IME_ESC_HANJA_MODE 0x1008 #define IME_ESC_AUTOMATA 0x1009 -#define IME_ESC_PRIVATE_HOTKEY 0x100a -#define IME_ESC_GETHELPFILENAME 0x100b - +#define IME_ESC_PRIVATE_HOTKEY 0x100A +#define IME_ESC_GETHELPFILENAME 0x100B /* style of word registration */ #define IME_REGWORD_STYLE_EUDC 0x00000001 #define IME_REGWORD_STYLE_USER_FIRST 0x80000000 #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF +#if (WINVER >= 0x040A) + /* dwFlags for ImmAssociateContextEx */ #define IACE_CHILDREN 0x0001 #define IACE_DEFAULT 0x0010 #define IACE_IGNORENOCONTEXT 0x0020 /* dwFlags for ImmGetImeMenuItems */ -#define IGIMIF_RIGHTMENU 0x0001 +#define IGIMIF_RIGHTMENU 0x0001 /* dwType for ImmGetImeMenuItems */ -#define IGIMII_CMODE 0x0001 -#define IGIMII_SMODE 0x0002 -#define IGIMII_CONFIGURE 0x0004 -#define IGIMII_TOOLS 0x0008 -#define IGIMII_HELP 0x0010 -#define IGIMII_OTHER 0x0020 -#define IGIMII_INPUTTOOLS 0x0040 +#define IGIMII_CMODE 0x0001 +#define IGIMII_SMODE 0x0002 +#define IGIMII_CONFIGURE 0x0004 +#define IGIMII_TOOLS 0x0008 +#define IGIMII_HELP 0x0010 +#define IGIMII_OTHER 0x0020 +#define IGIMII_INPUTTOOLS 0x0040 /* fType of IMEMENUITEMINFO structure */ -#define IMFT_RADIOCHECK 0x00001 -#define IMFT_SEPARATOR 0x00002 -#define IMFT_SUBMENU 0x00004 +#define IMFT_RADIOCHECK 0x00001 +#define IMFT_SEPARATOR 0x00002 +#define IMFT_SUBMENU 0x00004 /* fState of IMEMENUITEMINFO structure */ -#define IMFS_GRAYED MFS_GRAYED -#define IMFS_DISABLED MFS_DISABLED -#define IMFS_CHECKED MFS_CHECKED -#define IMFS_HILITE MFS_HILITE -#define IMFS_ENABLED MFS_ENABLED -#define IMFS_UNCHECKED MFS_UNCHECKED -#define IMFS_UNHILITE MFS_UNHILITE -#define IMFS_DEFAULT MFS_DEFAULT - - -/* - * type of soft keyboard - * for Windows Tranditional Chinese Edition - */ -#define SOFTKEYBOARD_TYPE_T1 0x0001 -/* for Windows Simplified Chinese Edition */ -#define SOFTKEYBOARD_TYPE_C1 0x0002 - - -HIMC WINAPI ImmAssociateContext(_In_ HWND, _In_ HIMC); -BOOL WINAPI ImmAssociateContextEx(_In_ HWND, _In_ HIMC, _In_ DWORD); - -BOOL WINAPI ImmConfigureIMEA(_In_ HKL, _In_ HWND, _In_ DWORD, _In_ LPVOID); -BOOL WINAPI ImmConfigureIMEW(_In_ HKL, _In_ HWND, _In_ DWORD, _In_ LPVOID); -#define ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME) +#define IMFS_GRAYED MFS_GRAYED +#define IMFS_DISABLED MFS_DISABLED +#define IMFS_CHECKED MFS_CHECKED +#define IMFS_HILITE MFS_HILITE +#define IMFS_ENABLED MFS_ENABLED +#define IMFS_UNCHECKED MFS_UNCHECKED +#define IMFS_UNHILITE MFS_UNHILITE +#define IMFS_DEFAULT MFS_DEFAULT + +#endif /* WINVER >= 0x040A */ + +/* types of soft keyboard */ +#define SOFTKEYBOARD_TYPE_T1 0x0001 /* for Tranditional Chinese */ +#define SOFTKEYBOARD_TYPE_C1 0x0002 /* for Simplified Chinese */ + +HIMC WINAPI ImmAssociateContext(_In_ HWND hWnd, _In_ HIMC hIMC); +#if (WINVER >= 0x040A) +BOOL WINAPI ImmAssociateContextEx(_In_ HWND hWnd, _In_ HIMC hIMC, _In_ DWORD dwFlags); +#endif -HIMC WINAPI ImmCreateContext(void); -BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC hIMC, BOOL fFlag); +BOOL WINAPI ImmConfigureIMEA(_In_ HKL hKL, _In_ HWND hWnd, _In_ DWORD dwMode, _In_ LPVOID lpData); +BOOL WINAPI ImmConfigureIMEW(_In_ HKL hKL, _In_ HWND hWnd, _In_ DWORD dwMode, _In_ LPVOID lpData); +HIMC WINAPI ImmCreateContext(VOID); BOOL WINAPI ImmDestroyContext(_In_ HIMC hIMC); +#if (WINVER >= 0x040A) BOOL WINAPI ImmDisableIME(_In_ DWORD idThread); -BOOL WINAPI ImmEnumInputContext(_In_ DWORD, _In_ IMCENUMPROC, _In_ LPARAM); -BOOL WINAPI ImmLoadIME(HKL hKL); -BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID); +BOOL WINAPI ImmEnumInputContext(_In_ DWORD dwThreadId, _In_ IMCENUMPROC lpfn, _In_ LPARAM lParam); +#endif UINT WINAPI ImmEnumRegisterWordA( - _In_ HKL, - _In_ REGISTERWORDENUMPROCA, - _In_opt_ LPCSTR lpszReading, - _In_ DWORD, - _In_opt_ LPCSTR lpszRegister, - _In_ LPVOID); + _In_ HKL hKL, + _In_ REGISTERWORDENUMPROCA lpfnEnumProc, + _In_opt_ LPCSTR lpszReading, + _In_ DWORD dwStyle, + _In_opt_ LPCSTR lpszRegister, + _Inout_opt_ LPVOID lpData); UINT WINAPI ImmEnumRegisterWordW( - _In_ HKL, - _In_ REGISTERWORDENUMPROCW, - _In_opt_ LPCWSTR lpszReading, - _In_ DWORD, - _In_opt_ LPCWSTR lpszRegister, - _In_ LPVOID); - -#define ImmEnumRegisterWord WINELIB_NAME_AW(ImmEnumRegisterWord) - -LRESULT WINAPI ImmEscapeA(_In_ HKL, _In_ HIMC, _In_ UINT, _In_ LPVOID); -LRESULT WINAPI ImmEscapeW(_In_ HKL, _In_ HIMC, _In_ UINT, _In_ LPVOID); -#define ImmEscape WINELIB_NAME_AW(ImmEscape) + _In_ HKL hKL, + _In_ REGISTERWORDENUMPROCW lpfnEnumProc, + _In_opt_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_opt_ LPCWSTR lpszRegister, + _Inout_opt_ LPVOID lpData); + +LRESULT WINAPI +ImmEscapeA( + _In_ HKL hKL, + _In_ HIMC hIMC, + _In_ UINT uSubFunc, + _Inout_opt_ LPVOID lpData); + +LRESULT WINAPI +ImmEscapeW( + _In_ HKL hKL, + _In_ HIMC hIMC, + _In_ UINT uSubFunc, + _Inout_opt_ LPVOID lpData); DWORD WINAPI ImmGetCandidateListA( - _In_ HIMC, - _In_ DWORD deIndex, - _Out_writes_bytes_opt_(dwBufLen) LPCANDIDATELIST lpCandList, - _In_ DWORD dwBufLen); + _In_ HIMC hIMC, + _In_ DWORD deIndex, + _Out_writes_bytes_opt_(dwBufLen) LPCANDIDATELIST lpCandList, + _In_ DWORD dwBufLen); DWORD WINAPI ImmGetCandidateListW( - _In_ HIMC, - _In_ DWORD deIndex, - _Out_writes_bytes_opt_(dwBufLen) LPCANDIDATELIST lpCandList, - _In_ DWORD dwBufLen); - -#define ImmGetCandidateList WINELIB_NAME_AW(ImmGetCandidateList) + _In_ HIMC hIMC, + _In_ DWORD deIndex, + _Out_writes_bytes_opt_(dwBufLen) LPCANDIDATELIST lpCandList, + _In_ DWORD dwBufLen); -DWORD WINAPI ImmGetCandidateListCountA(_In_ HIMC, _Out_ LPDWORD); -DWORD WINAPI ImmGetCandidateListCountW(_In_ HIMC, _Out_ LPDWORD); -#define ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount) +DWORD WINAPI ImmGetCandidateListCountA(_In_ HIMC hIMC, _Out_ LPDWORD lpdwListCount); +DWORD WINAPI ImmGetCandidateListCountW(_In_ HIMC hIMC, _Out_ LPDWORD lpdwListCount); BOOL WINAPI ImmGetCandidateWindow( - _In_ HIMC, - _In_ DWORD, - _Out_ LPCANDIDATEFORM lpCandidate); + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Out_ LPCANDIDATEFORM lpCandidate); #if defined(_WINGDI_) && !defined(NOGDI) -BOOL WINAPI ImmGetCompositionFontA(_In_ HIMC, _Out_ LPLOGFONTA); -BOOL WINAPI ImmGetCompositionFontW(_In_ HIMC, _Out_ LPLOGFONTW); -#define ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont) +BOOL WINAPI ImmGetCompositionFontA(_In_ HIMC hIMC, _Out_ LPLOGFONTA lplf); +BOOL WINAPI ImmGetCompositionFontW(_In_ HIMC hIMC, _Out_ LPLOGFONTW lplf); + +BOOL WINAPI ImmSetCompositionFontA(_In_ HIMC hIMC, _In_ LPLOGFONTA lplf); +BOOL WINAPI ImmSetCompositionFontW(_In_ HIMC hIMC, _In_ LPLOGFONTW lplf); -BOOL WINAPI ImmSetCompositionFontA(_In_ HIMC, _In_ LPLOGFONTA); -BOOL WINAPI ImmSetCompositionFontW(_In_ HIMC, _In_ LPLOGFONTW); -#define ImmSetCompositionFont WINELIB_NAME_AW(ImmSetCompositionFont) +#ifdef UNICODE + #define ImmGetCompositionFont ImmGetCompositionFontW +#else + #define ImmGetCompositionFont ImmGetCompositionFontA +#endif #endif LONG WINAPI ImmGetCompositionStringA( - _In_ HIMC, - _In_ DWORD, - _Out_writes_bytes_opt_(dwBufLen) LPVOID lpBuf, - _In_ DWORD dwBufLen); + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Out_writes_bytes_opt_(dwBufLen) LPVOID lpBuf, + _In_ DWORD dwBufLen); LONG WINAPI ImmGetCompositionStringW( - _In_ HIMC, - _In_ DWORD, - _Out_writes_bytes_opt_(dwBufLen) LPVOID lpBuf, - _In_ DWORD dwBufLen); - -#define ImmGetCompositionString WINELIB_NAME_AW(ImmGetCompositionString) + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Out_writes_bytes_opt_(dwBufLen) LPVOID lpBuf, + _In_ DWORD dwBufLen); -BOOL WINAPI ImmGetCompositionWindow(_In_ HIMC, _Out_ LPCOMPOSITIONFORM); -HIMC WINAPI ImmGetContext(_In_ HWND); +BOOL WINAPI ImmGetCompositionWindow(_In_ HIMC hIMC, _Out_ LPCOMPOSITIONFORM lpCompForm); +HIMC WINAPI ImmGetContext(_In_ HWND hWnd); DWORD WINAPI ImmGetConversionListA( - _In_ HKL, - _In_ HIMC, - _In_ LPCSTR lpSrc, - _Out_writes_bytes_(dwBufLen) LPCANDIDATELIST lpDst, - _In_ DWORD dwBufLen, - _In_ UINT uFlag); + _In_ HKL hKL, + _In_ HIMC hIMC, + _In_ LPCSTR lpSrc, + _Out_writes_bytes_(dwBufLen) LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag); DWORD WINAPI ImmGetConversionListW( - _In_ HKL, - _In_ HIMC, - _In_ LPCWSTR lpSrc, - _Out_writes_bytes_(dwBufLen) LPCANDIDATELIST lpDst, - _In_ DWORD dwBufLen, - _In_ UINT uFlag); - -#define ImmGetConversionList WINELIB_NAME_AW(ImmGetConversionList) + _In_ HKL hKL, + _In_ HIMC hIMC, + _In_ LPCWSTR lpSrc, + _Out_writes_bytes_(dwBufLen) LPCANDIDATELIST lpDst, + _In_ DWORD dwBufLen, + _In_ UINT uFlag); BOOL WINAPI ImmGetConversionStatus( - _In_ HIMC, - _Out_opt_ LPDWORD lpfdwConversion, - _Out_opt_ LPDWORD lpfdwSentence); + _In_ HIMC hIMC, + _Out_opt_ LPDWORD lpfdwConversion, + _Out_opt_ LPDWORD lpfdwSentence); -HWND WINAPI ImmGetDefaultIMEWnd(_In_ HWND); +HWND WINAPI ImmGetDefaultIMEWnd(_In_ HWND hWnd); UINT WINAPI ImmGetDescriptionA( - _In_ HKL, - _Out_writes_opt_(uBufLen) LPSTR lpszDescription, - _In_ UINT uBufLen); + _In_ HKL hKL, + _Out_writes_opt_(uBufLen) LPSTR lpszDescription, + _In_ UINT uBufLen); UINT WINAPI ImmGetDescriptionW( - _In_ HKL, - _Out_writes_opt_(uBufLen) LPWSTR lpszDescription, - _In_ UINT uBufLen); - -#define ImmGetDescription WINELIB_NAME_AW(ImmGetDescription) + _In_ HKL hKL, + _Out_writes_opt_(uBufLen) LPWSTR lpszDescription, + _In_ UINT uBufLen); DWORD WINAPI ImmGetGuideLineA( - _In_ HIMC, - _In_ DWORD dwIndex, - _Out_writes_bytes_opt_(dwBufLen) LPSTR lpBuf, - _In_ DWORD dwBufLen); + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Out_writes_bytes_opt_(dwBufLen) LPSTR lpBuf, + _In_ DWORD dwBufLen); DWORD WINAPI ImmGetGuideLineW( - _In_ HIMC, - _In_ DWORD dwIndex, - _Out_writes_bytes_opt_(dwBufLen) LPWSTR lpBuf, - _In_ DWORD dwBufLen); - -#define ImmGetGuideLine WINELIB_NAME_AW(ImmGetGuideLine) + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Out_writes_bytes_opt_(dwBufLen) LPWSTR lpBuf, + _In_ DWORD dwBufLen); UINT WINAPI ImmGetIMEFileNameA( - _In_ HKL, - _Out_writes_opt_(uBufLen) LPSTR lpszFileName, - _In_ UINT uBufLen); + _In_ HKL hKL, + _Out_writes_opt_(uBufLen) LPSTR lpszFileName, + _In_ UINT uBufLen); UINT WINAPI ImmGetIMEFileNameW( - _In_ HKL, - _Out_writes_opt_(uBufLen) LPWSTR lpszFileName, - _In_ UINT uBufLen); + _In_ HKL hKL, + _Out_writes_opt_(uBufLen) LPWSTR lpszFileName, + _In_ UINT uBufLen); -#define ImmGetIMEFileName WINELIB_NAME_AW(ImmGetIMEFileName) +#if (WINVER >= 0x040A) DWORD WINAPI ImmGetImeMenuItemsA( - _In_ HIMC, - _In_ DWORD, - _In_ DWORD, - _Out_opt_ LPIMEMENUITEMINFOA lpImeParentMenu, - _Out_writes_bytes_opt_(dwSize) LPIMEMENUITEMINFOA lpImeMenu, - _In_ DWORD dwSize); + _In_ HIMC hIMC, + _In_ DWORD dwFlags, + _In_ DWORD dwType, + _Out_opt_ LPIMEMENUITEMINFOA lpImeParentMenu, + _Out_writes_bytes_opt_(dwSize) LPIMEMENUITEMINFOA lpImeMenu, + _In_ DWORD dwSize); DWORD WINAPI ImmGetImeMenuItemsW( - _In_ HIMC, - _In_ DWORD, - _In_ DWORD, - _Out_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, - _Out_writes_bytes_opt_(dwSize) LPIMEMENUITEMINFOW lpImeMenu, - _In_ DWORD dwSize); + _In_ HIMC hIMC, + _In_ DWORD dwFlags, + _In_ DWORD dwType, + _Out_opt_ LPIMEMENUITEMINFOW lpImeParentMenu, + _Out_writes_bytes_opt_(dwSize) LPIMEMENUITEMINFOW lpImeMenu, + _In_ DWORD dwSize); + +#ifdef UNICODE + #define ImmGetImeMenuItems ImmGetImeMenuItemsW +#else + #define ImmGetImeMenuItems ImmGetImeMenuItemsA +#endif -#define ImmGetImeMenuItems WINELIB_NAME_AW(ImmGetImeMenuItems) +#endif /* WINVER >= 0x040A */ -BOOL WINAPI ImmGetOpenStatus(_In_ HIMC); -DWORD WINAPI ImmGetProperty(_In_ HKL, _In_ DWORD); +BOOL WINAPI ImmGetOpenStatus(_In_ HIMC hIMC); +DWORD WINAPI ImmGetProperty(_In_ HKL hKL, _In_ DWORD fdwIndex); UINT WINAPI ImmGetRegisterWordStyleA( - _In_ HKL, - _In_ UINT nItem, - _Out_writes_(nItem) LPSTYLEBUFA lpStyleBuf); + _In_ HKL hKL, + _In_ UINT nItem, + _Out_writes_(nItem) LPSTYLEBUFA lpStyleBuf); UINT WINAPI ImmGetRegisterWordStyleW( - _In_ HKL, - _In_ UINT nItem, - _Out_writes_(nItem) LPSTYLEBUFW lpStyleBuf); + _In_ HKL hKL, + _In_ UINT nItem, + _Out_writes_(nItem) LPSTYLEBUFW lpStyleBuf); -#define ImmGetRegisterWordStyle WINELIB_NAME_AW(ImmGetRegisterWordStyle) +BOOL WINAPI ImmGetStatusWindowPos(_In_ HIMC hIMC, _Out_ LPPOINT lpptPos); +UINT WINAPI ImmGetVirtualKey(_In_ HWND hWnd); -BOOL WINAPI ImmGetStatusWindowPos(_In_ HIMC, _Out_ LPPOINT); -UINT WINAPI ImmGetVirtualKey(_In_ HWND); +HKL WINAPI ImmInstallIMEA(_In_ LPCSTR lpszIMEFileName, _In_ LPCSTR lpszLayoutText); +HKL WINAPI ImmInstallIMEW(_In_ LPCWSTR lpszIMEFileName, _In_ LPCWSTR lpszLayoutText); -HKL WINAPI ImmInstallIMEA(_In_ LPCSTR, _In_ LPCSTR); -HKL WINAPI ImmInstallIMEW(_In_ LPCWSTR, _In_ LPCWSTR); -#define ImmInstallIME WINELIB_NAME_AW(ImmInstallIME) +BOOL WINAPI ImmIsIME(_In_ HKL hKL); -BOOL WINAPI ImmIsIME(_In_ HKL); - -BOOL WINAPI ImmIsUIMessageA(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); -BOOL WINAPI ImmIsUIMessageW(_In_ HWND, _In_ UINT, _In_ WPARAM, _In_ LPARAM); -#define ImmIsUIMessage WINELIB_NAME_AW(ImmIsUIMessage) +BOOL WINAPI +ImmIsUIMessageA( + _In_ HWND hWndIME, + _In_ UINT msg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); -BOOL WINAPI ImmNotifyIME(_In_ HIMC, _In_ DWORD, _In_ DWORD, _In_ DWORD_PTR); +BOOL WINAPI +ImmIsUIMessageW( + _In_ HWND hWndIME, + _In_ UINT msg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); -DWORD WINAPI ImmProcessKey(HWND, HKL, UINT, LPARAM, DWORD); +BOOL WINAPI +ImmNotifyIME( + _In_ HIMC hIMC, + _In_ DWORD dwAction, + _In_ DWORD dwIndex, + _In_ DWORD_PTR dwValue); BOOL WINAPI ImmRegisterWordA( - _In_ HKL, - _In_ LPCSTR lpszReading, - _In_ DWORD, - _In_ LPCSTR lpszRegister); + _In_ HKL hKL, + _In_ LPCSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCSTR lpszRegister); BOOL WINAPI ImmRegisterWordW( - _In_ HKL, - _In_ LPCWSTR lpszReading, - _In_ DWORD, - _In_ LPCWSTR lpszRegister); - -#define ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord) + _In_ HKL hKL, + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszRegister); -BOOL WINAPI ImmReleaseContext(_In_ HWND, _In_ HIMC); -BOOL WINAPI ImmSetCandidateWindow(_In_ HIMC, _In_ LPCANDIDATEFORM); +BOOL WINAPI ImmReleaseContext(_In_ HWND hWnd, _In_ HIMC hIMC); +BOOL WINAPI ImmSetCandidateWindow(_In_ HIMC hIMC, _In_ LPCANDIDATEFORM lpCandidate); BOOL WINAPI ImmSetCompositionStringA( - _In_ HIMC, - _In_ DWORD dwIndex, - _Inout_updates_bytes_opt_(dwCompLen) LPVOID lpComp, - _In_ DWORD dwCompLen, - _Inout_updates_bytes_opt_(dwReadLen) LPVOID lpRead, - _In_ DWORD dwReadLen); + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Inout_updates_bytes_opt_(dwCompLen) LPVOID lpComp, + _In_ DWORD dwCompLen, + _Inout_updates_bytes_opt_(dwReadLen) LPVOID lpRead, + _In_ DWORD dwReadLen); BOOL WINAPI ImmSetCompositionStringW( - _In_ HIMC, - _In_ DWORD dwIndex, - _Inout_updates_bytes_opt_(dwCompLen) LPVOID lpComp, - _In_ DWORD dwCompLen, - _Inout_updates_bytes_opt_(dwReadLen) LPVOID lpRead, - _In_ DWORD dwReadLen); + _In_ HIMC hIMC, + _In_ DWORD dwIndex, + _Inout_updates_bytes_opt_(dwCompLen) LPVOID lpComp, + _In_ DWORD dwCompLen, + _Inout_updates_bytes_opt_(dwReadLen) LPVOID lpRead, + _In_ DWORD dwReadLen); -#define ImmSetCompositionString WINELIB_NAME_AW(ImmSetCompositionString) +BOOL WINAPI ImmSetCompositionWindow(_In_ HIMC hIMC, _In_ LPCOMPOSITIONFORM lpCompForm); -BOOL WINAPI ImmSetCompositionWindow(_In_ HIMC, _In_ LPCOMPOSITIONFORM); -BOOL WINAPI ImmSetConversionStatus(_In_ HIMC, _In_ DWORD, _In_ DWORD); -BOOL WINAPI ImmSetOpenStatus(_In_ HIMC, _In_ BOOL); -BOOL WINAPI ImmSetStatusWindowPos(_In_ HIMC, _In_ LPPOINT); -BOOL WINAPI ImmSimulateHotKey(_In_ HWND, _In_ DWORD); +BOOL WINAPI +ImmSetConversionStatus( + _In_ HIMC hIMC, + _In_ DWORD fdwConversion, + _In_ DWORD fdwSentence); + +BOOL WINAPI ImmSetOpenStatus(_In_ HIMC hIMC, _In_ BOOL fOpen); +BOOL WINAPI ImmSetStatusWindowPos(_In_ HIMC hIMC, _In_ LPPOINT lpptPos); +BOOL WINAPI ImmSimulateHotKey(_In_ HWND hWnd, _In_ DWORD dwHotKeyID); BOOL WINAPI ImmUnregisterWordA( - _In_ HKL, - _In_ LPCSTR lpszReading, - _In_ DWORD, - _In_ LPCSTR lpszUnregister); + _In_ HKL hKL, + _In_ LPCSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCSTR lpszUnregister); BOOL WINAPI ImmUnregisterWordW( - _In_ HKL, - _In_ LPCWSTR lpszReading, - _In_ DWORD, - _In_ LPCWSTR lpszUnregister); - -#define ImmUnregisterWord WINELIB_NAME_AW(ImmUnregisterWord) - + _In_ HKL hKL, + _In_ LPCWSTR lpszReading, + _In_ DWORD dwStyle, + _In_ LPCWSTR lpszUnregister); + +#ifdef UNICODE + #define ImmConfigureIME ImmConfigureIMEW + #define ImmEnumRegisterWord ImmEnumRegisterWordW + #define ImmEscape ImmEscapeW + #define ImmGetCandidateList ImmGetCandidateListW + #define ImmGetCandidateListCount ImmGetCandidateListCountW + #define ImmGetCompositionString ImmGetCompositionStringW + #define ImmGetConversionList ImmGetConversionListW + #define ImmGetDescription ImmGetDescriptionW + #define ImmGetGuideLine ImmGetGuideLineW + #define ImmGetIMEFileName ImmGetIMEFileNameW + #define ImmGetRegisterWordStyle ImmGetRegisterWordStyleW + #define ImmInstallIME ImmInstallIMEW + #define ImmIsUIMessage ImmIsUIMessageW + #define ImmRegisterWord ImmRegisterWordW + #define ImmSetCompositionFont ImmSetCompositionFontW + #define ImmSetCompositionString ImmSetCompositionStringW + #define ImmUnregisterWord ImmUnregisterWordW + typedef LPSTYLEBUFW LPSTYLEBUF; + typedef NPSTYLEBUFW NPSTYLEBUF; + typedef PSTYLEBUFW PSTYLEBUF; + typedef REGISTERWORDENUMPROCW REGISTERWORDENUMPROC; + typedef STYLEBUFW STYLEBUF; +#else + #define ImmConfigureIME ImmConfigureIMEA + #define ImmEnumRegisterWord ImmEnumRegisterWordA + #define ImmEscape ImmEscapeA + #define ImmGetCandidateList ImmGetCandidateListA + #define ImmGetCandidateListCount ImmGetCandidateListCountA + #define ImmGetCompositionString ImmGetCompositionStringA + #define ImmGetConversionList ImmGetConversionListA + #define ImmGetDescription ImmGetDescriptionA + #define ImmGetGuideLine ImmGetGuideLineA + #define ImmGetIMEFileName ImmGetIMEFileNameA + #define ImmGetRegisterWordStyle ImmGetRegisterWordStyleA + #define ImmInstallIME ImmInstallIMEA + #define ImmIsUIMessage ImmIsUIMessageA + #define ImmRegisterWord ImmRegisterWordA + #define ImmSetCompositionFont ImmSetCompositionFontA + #define ImmSetCompositionString ImmSetCompositionStringA + #define ImmUnregisterWord ImmUnregisterWordA + typedef LPSTYLEBUFA LPSTYLEBUF; + typedef NPSTYLEBUFA NPSTYLEBUF; + typedef PSTYLEBUFA PSTYLEBUF; + typedef REGISTERWORDENUMPROCA REGISTERWORDENUMPROC; + typedef STYLEBUFA STYLEBUF; +#endif #ifdef __cplusplus } diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 75eb48f5692..a37c8ea4e58 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -11,18 +11,210 @@ extern "C" { #endif +#include <immdev.h> + +#define IS_IME_HKL(hkl) ((((ULONG_PTR)(hkl)) & 0xF0000000) == 0xE0000000) + +typedef struct tagIMEINFOEX +{ + HKL hkl; + IMEINFO ImeInfo; + WCHAR wszUIClass[16]; + ULONG fdwInitConvMode; + INT fInitOpen; + INT fLoadFlag; + DWORD dwProdVersion; + DWORD dwImeWinVersion; + WCHAR wszImeDescription[50]; + WCHAR wszImeFile[80]; + struct + { + INT fSysWow64Only:1; + INT fCUASLayer:1; + }; +} IMEINFOEX, *PIMEINFOEX, NEAR *NPIMEINFOEX, FAR *LPIMEINFOEX; + +typedef enum IMEINFOEXCLASS +{ + ImeInfoExKeyboardLayout, + ImeInfoExKeyboardLayoutTFS, + ImeInfoExImeWindow, + ImeInfoExImeFileName +} IMEINFOEXCLASS; + +#define DEFINE_IME_ENTRY(type, name, params, extended) typedef type (WINAPI *FN_##name) params; +#include <imetable.h> +#undef DEFINE_IME_ENTRY + +typedef struct IMEDPI +{ + struct IMEDPI *pNext; + HINSTANCE hInst; + HKL hKL; + IMEINFO ImeInfo; + UINT uCodePage; + WCHAR szUIClass[16]; + DWORD cLockObj; + DWORD dwFlags; +#define DEFINE_IME_ENTRY(type, name, params, extended) FN_##name name; +#include <imetable.h> +#undef DEFINE_IME_ENTRY +} IMEDPI, *PIMEDPI, NEAR *NPIMEDPI, FAR *LPIMEDPI; + +#ifndef _WIN64 +C_ASSERT(offsetof(IMEDPI, pNext) == 0x0); +C_ASSERT(offsetof(IMEDPI, hInst) == 0x4); +C_ASSERT(offsetof(IMEDPI, hKL) == 0x8); +C_ASSERT(offsetof(IMEDPI, ImeInfo) == 0xc); +C_ASSERT(offsetof(IMEDPI, uCodePage) == 0x28); +C_ASSERT(offsetof(IMEDPI, szUIClass) == 0x2c); +C_ASSERT(offsetof(IMEDPI, cLockObj) == 0x4c); +C_ASSERT(offsetof(IMEDPI, dwFlags) == 0x50); +C_ASSERT(offsetof(IMEDPI, ImeInquire) == 0x54); +C_ASSERT(offsetof(IMEDPI, ImeConversionList) == 0x58); +C_ASSERT(offsetof(IMEDPI, ImeRegisterWord) == 0x5c); +C_ASSERT(offsetof(IMEDPI, ImeUnregisterWord) == 0x60); +C_ASSERT(offsetof(IMEDPI, ImeGetRegisterWordStyle) == 0x64); +C_ASSERT(offsetof(IMEDPI, ImeEnumRegisterWord) == 0x68); +C_ASSERT(offsetof(IMEDPI, ImeConfigure) == 0x6c); +C_ASSERT(offsetof(IMEDPI, ImeDestroy) == 0x70); +C_ASSERT(offsetof(IMEDPI, ImeEscape) == 0x74); +C_ASSERT(offsetof(IMEDPI, ImeProcessKey) == 0x78); +C_ASSERT(offsetof(IMEDPI, ImeSelect) == 0x7c); +C_ASSERT(offsetof(IMEDPI, ImeSetActiveContext) == 0x80); +C_ASSERT(offsetof(IMEDPI, ImeToAsciiEx) == 0x84); +C_ASSERT(offsetof(IMEDPI, NotifyIME) == 0x88); +C_ASSERT(offsetof(IMEDPI, ImeSetCompositionString) == 0x8c); +C_ASSERT(offsetof(IMEDPI, ImeGetImeMenuItems) == 0x90); +C_ASSERT(offsetof(IMEDPI, CtfImeInquireExW) == 0x94); +C_ASSERT(offsetof(IMEDPI, CtfImeSelectEx) == 0x98); +C_ASSERT(offsetof(IMEDPI, CtfImeEscapeEx) == 0x9c); +C_ASSERT(offsetof(IMEDPI, CtfImeGetGuidAtom) == 0xa0); +C_ASSERT(offsetof(IMEDPI, CtfImeIsGuidMapEnable) == 0xa4); +C_ASSERT(sizeof(IMEDPI) == 0xa8); +#endif + +/* flags for IMEDPI.dwFlags */ +#define IMEDPI_FLAG_UNLOADED 0x1 +#define IMEDPI_FLAG_LOCKED 0x2 + +PIMEDPI WINAPI ImmLockImeDpi(_In_ HKL hKL); +VOID WINAPI ImmUnlockImeDpi(_Inout_ PIMEDPI pImeDpi); + +/* unconfirmed */ +typedef struct tagCLIENTIMC +{ + HANDLE hInputContext; /* LocalAlloc'ed LHND */ + LONG cLockObj; + DWORD dwFlags; + DWORD dwCompatFlags; + RTL_CRITICAL_SECTION cs; + UINT uCodePage; + HKL hKL; + BOOL bCtfIme; +} CLIENTIMC, *PCLIENTIMC, NEAR *NPCLIENTIMC, FAR *LPCLIENTIMC; + +#ifndef _WIN64 +C_ASSERT(offsetof(CLIENTIMC, hInputContext) == 0x0); +C_ASSERT(offsetof(CLIENTIMC, cLockObj) == 0x4); +C_ASSERT(offsetof(CLIENTIMC, dwFlags) == 0x8); +C_ASSERT(offsetof(CLIENTIMC, dwCompatFlags) == 0xc); +C_ASSERT(offsetof(CLIENTIMC, cs) == 0x10); +C_ASSERT(offsetof(CLIENTIMC, uCodePage) == 0x28); +C_ASSERT(offsetof(CLIENTIMC, hKL) == 0x2c); +C_ASSERT(sizeof(CLIENTIMC) == 0x34); +#endif + +/* flags for CLIENTIMC */ +#define CLIENTIMC_WIDE 0x1 +#define CLIENTIMC_ACTIVE 0x2 +#define CLIENTIMC_UNKNOWN4 0x20 +#define CLIENTIMC_DESTROY 0x40 +#define CLIENTIMC_DISABLEIME 0x80 +#define CLIENTIMC_UNKNOWN2 0x100 + +PCLIENTIMC WINAPI ImmLockClientImc(_In_ HIMC hImc); +VOID WINAPI ImmUnlockClientImc(_Inout_ PCLIENTIMC pClientImc); + +struct IME_STATE; + +/* unconfirmed */ +#ifdef __cplusplus +typedef struct INPUTCONTEXTDX : INPUTCONTEXT +{ +#else +typedef struct INPUTCONTEXTDX +{ + INPUTCONTEXT; +#endif + UINT nVKey; // +0x140 + BOOL bNeedsTrans; // +0x144 + DWORD dwUnknown1; + DWORD dwUIFlags; // +0x14c + DWORD dwUnknown2; + struct IME_STATE *pState; // +0x154 + DWORD dwChange; // +0x158 + HIMCC hCtfImeContext; +} INPUTCONTEXTDX, *PINPUTCONTEXTDX, NEAR *NPINPUTCONTEXTDX, FAR *LPINPUTCONTEXTDX; + +typedef struct IME_SUBSTATE +{ + struct IME_SUBSTATE *pNext; + HKL hKL; + DWORD dwValue; +} IME_SUBSTATE, *PIME_SUBSTATE, NEAR *NPIME_SUBSTATE, FAR *PIME_SUBSTATE; + +#ifndef _WIN64 +C_ASSERT(sizeof(IME_SUBSTATE) == 0xc); +#endif + +typedef struct IME_STATE +{ + struct IME_STATE *pNext; + WORD wLang; + WORD fOpen; + DWORD dwConversion; + DWORD dwSentence; + DWORD dwInit; + PIME_SUBSTATE pSubState; +} IME_STATE, *PIME_STATE, NEAR *NPIME_STATE, FAR *LPIME_STATE; + +#ifndef _WIN64 +C_ASSERT(sizeof(IME_STATE) == 0x18); +#endif + +/* for WM_IME_REPORT IR_UNDETERMINE */ +typedef struct tagUNDETERMINESTRUCT +{ + DWORD dwSize; + UINT uDefIMESize; + UINT uDefIMEPos; + UINT uUndetTextLen; + UINT uUndetTextPos; + UINT uUndetAttrPos; + UINT uCursorPos; + UINT uDeltaStart; + UINT uDetermineTextLen; + UINT uDetermineTextPos; + UINT uDetermineDelimPos; + UINT uYomiTextLen; + UINT uYomiTextPos; + UINT uYomiDelimPos; +} UNDETERMINESTRUCT, *PUNDETERMINESTRUCT, *LPUNDETERMINESTRUCT; + UINT WINAPI GetKeyboardLayoutCP(_In_ LANGID wLangId); BOOL WINAPI -ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearchKey); +ImmGetImeInfoEx( + _Out_ PIMEINFOEX pImeInfoEx, + _In_ IMEINFOEXCLASS SearchType, + _In_ PVOID pvSearchKey); -BOOL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx); -PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc); -VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc); -PIMEDPI WINAPI ImmLockImeDpi(HKL hKL); -VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi); -HRESULT WINAPI CtfImmTIMActivate(HKL hKL); -DWORD WINAPI ImmGetAppCompatFlags(HIMC hIMC); +BOOL WINAPI ImmLoadLayout(_In_ HKL hKL, _Inout_ PIMEINFOEX pImeInfoEx); +DWORD WINAPI ImmGetAppCompatFlags(_In_ HIMC hIMC); +BOOL WINAPI ImmSetActiveContext(_In_ HWND hwnd, _In_ HIMC hIMC, _In_ BOOL fFlag); +BOOL WINAPI ImmLoadIME(_In_ HKL hKL); +DWORD WINAPI ImmProcessKey(_In_ HWND, _In_ HKL, _In_ UINT, _In_ LPARAM, _In_ DWORD); HRESULT WINAPI CtfAImmActivate(_Out_opt_ HINSTANCE *phinstCtfIme); HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); @@ -37,6 +229,9 @@ VOID WINAPI CtfImmCoUninitialize(VOID); VOID WINAPI CtfImmEnterCoInitCountSkipMode(VOID); BOOL WINAPI CtfImmLeaveCoInitCountSkipMode(VOID); HRESULT WINAPI CtfImmLastEnabledWndDestroy(_In_ BOOL bCreate); +BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); +HRESULT WINAPI CtfImmTIMActivate(_In_ HKL hKL); +BOOL WINAPI CtfImmIsTextFrameServiceDisabled(VOID); LRESULT WINAPI CtfImmDispatchDefImeMessage( diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 4299e769a69..6c5691bbe8d 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1206,34 +1206,6 @@ typedef struct tagCURSORDATA #define CURSORF_LINKED 0x0100 #define CURSORF_CURRENT 0x0200 -typedef struct tagIMEINFOEX -{ - HKL hkl; - IMEINFO ImeInfo; - WCHAR wszUIClass[16]; - ULONG fdwInitConvMode; - INT fInitOpen; - INT fLoadFlag; - DWORD dwProdVersion; - DWORD dwImeWinVersion; - WCHAR wszImeDescription[50]; - WCHAR wszImeFile[80]; - struct - { - INT fSysWow64Only:1; - INT fCUASLayer:1; - }; -} IMEINFOEX, *PIMEINFOEX; - -typedef enum IMEINFOEXCLASS -{ - ImeInfoExKeyboardLayout, - ImeInfoExKeyboardLayoutTFS, - ImeInfoExImeWindow, - ImeInfoExImeFileName -} IMEINFOEXCLASS; - -#define IS_IME_HKL(hkl) ((((ULONG_PTR)(hkl)) & 0xF0000000) == 0xE0000000) #define IS_IMM_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_IMM32)) #define IS_CICERO_MODE() (gpsi && (gpsi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) #define IS_16BIT_MODE() (GetWin32ClientInfo()->dwTIFlags & TIF_16BIT) diff --git a/win32ss/pch.h b/win32ss/pch.h index 2cc72405405..dd49055606b 100644 --- a/win32ss/pch.h +++ b/win32ss/pch.h @@ -59,10 +59,13 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; #include <winddi.h> #define OEMRESOURCE #include <winuser.h> +#include <ndk/rtltypes.h> #include <prntfont.h> #define _NOCSECT_TYPE #include <ddrawi.h> #include <imm.h> +#include <immdev.h> +#include <imm32_undoc.h> #include <dbt.h> /* NDK headers */ diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 108ef8414dd..d641e163e0d 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -7,7 +7,7 @@ */ #include <win32k.h> -#include <ddk/immdev.h> +#include <immdev.h> DBG_DEFAULT_CHANNEL(UserFocus); PUSER_MESSAGE_QUEUE gpqForeground = NULL; diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 4efe2eec044..08ea9ee531e 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -10,7 +10,7 @@ */ #include <win32k.h> -#include <ddk/immdev.h> +#include <immdev.h> // Was included only because of CP_ACP and required the // definition of SYSTEMTIME in ndk\rtltypes.h diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 49200a53d9d..ea1d33624c3 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -8,7 +8,7 @@ */ #include <win32k.h> -#include <ddk/immdev.h> +#include <immdev.h> DBG_DEFAULT_CHANNEL(UserWnd); INT gNestedWindowLimit = 50; diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 80984a1d173..2e5822994f3 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -7,7 +7,7 @@ */ #include <win32k.h> -#include <ddk/immdev.h> +#include <immdev.h> DBG_DEFAULT_CHANNEL(UserWinpos); /* GLOBALS *******************************************************************/ diff --git a/win32ss/user/user32/include/user32.h b/win32ss/user/user32/include/user32.h index 2615fb61549..18aaf54f892 100644 --- a/win32ss/user/user32/include/user32.h +++ b/win32ss/user/user32/include/user32.h @@ -28,6 +28,8 @@ #include <winreg.h> #include <winuser.h> #include <imm.h> +#include <immdev.h> +#include <imm32_undoc.h> #include <ddeml.h> #include <dde.h> #include <windowsx.h> diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 451f49e4c7c..640902bbabf 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -9,7 +9,7 @@ #include <user32.h> #include <strsafe.h> -#include <ddk/immdev.h> +#include <immdev.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index dbc5b43e9ff..852f2281dd9 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -10,7 +10,7 @@ */ #include <user32.h> -#include <ddk/immdev.h> +#include <immdev.h> WINE_DEFAULT_DEBUG_CHANNEL(user32); diff --git a/win32ss/user/winsrv/winsrv.h b/win32ss/user/winsrv/winsrv.h index d439add6709..1a614b28e5c 100644 --- a/win32ss/user/winsrv/winsrv.h +++ b/win32ss/user/winsrv/winsrv.h @@ -23,6 +23,8 @@ #include <winreg.h> #include <winuser.h> #include <imm.h> +#include <immdev.h> +#include <imm32_undoc.h> /* Undocumented user definitions */ #include <undocuser.h>

10 months, 2 weeks

[reactos] 01/01: [CRYPTUI] Update Romanian (ro-RO) translation (#6487)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdcfc6bc8ed25b585db11… commit bdcfc6bc8ed25b585db114c73f7e3da2c6f2d092 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Mon Feb 12 19:10:25 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 12 18:10:25 2024 +0100 [CRYPTUI] Update Romanian (ro-RO) translation (#6487) --- dll/win32/cryptui/lang/cryptui_Ro.rc | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dll/win32/cryptui/lang/cryptui_Ro.rc b/dll/win32/cryptui/lang/cryptui_Ro.rc index f40beff7838..0d490f78b62 100644 --- a/dll/win32/cryptui/lang/cryptui_Ro.rc +++ b/dll/win32/cryptui/lang/cryptui_Ro.rc @@ -30,8 +30,8 @@ STRINGTABLE { IDS_CERTIFICATE "Certificat" IDS_CERTIFICATEINFORMATION "Informații certificat" - IDS_CERT_INFO_BAD_SIG "Acest certificat are o semnătură nevalidă. Este posibil ca certificatul să fi fost alterat sau corupt." - IDS_CERT_INFO_UNTRUSTED_CA "Acest certificat rădăcină nu este acreditat. Pentru a-l acredita, adăugați-l în depozitul de certificate rădăcină acreditate al sistemului." + IDS_CERT_INFO_BAD_SIG "Acest certificat are o semnătură nevalidă. Este posibil ca certificatul să fi fost alterat sau corupt." + IDS_CERT_INFO_UNTRUSTED_CA "Acest certificat rădăcină nu este acreditat. Pentru a-l acredita, adăugați-l în depozitul de certificate rădăcină acreditate al sistemului." IDS_CERT_INFO_UNTRUSTED_ROOT "Acest certificat nu a putut fi validat față de un certificat rădăcină acreditat." IDS_CERT_INFO_PARTIAL_CHAIN "Emitentul acestui certificat nu a putut fi aflat." IDS_CERT_INFO_BAD_PURPOSES "Nu au putut fi verificate toate rolurile intenționate pentru acest certificat." @@ -124,8 +124,8 @@ STRINGTABLE IDS_FRIENDLY_NAME_NONE "<Niciunul>" IDS_PURPOSE_SERVER_AUTH "Asigură identificarea unui calculator de la distanță" IDS_PURPOSE_CLIENT_AUTH "Vă dovedește identitatea pentru un calculator de la distanță" - IDS_PURPOSE_CODE_SIGNING "Garantează că aplicația provine de la un anumit autor\nProtejează aplicația de alterări după publicare" - IDS_PURPOSE_EMAIL_PROTECTION "Protejează mesajele de email" + IDS_PURPOSE_CODE_SIGNING "Garantare că aplicația provine de la un anumit autor\nProtejare aplicație de alterări după publicare" + IDS_PURPOSE_EMAIL_PROTECTION "Protejare a mesajelor de email" IDS_PURPOSE_IPSEC "Permite comunicarea securizată pe Internet" IDS_PURPOSE_TIMESTAMP_SIGNING "Permite semnarea datelor cu ora curentă" IDS_PURPOSE_CTL_USAGE_SIGNING "Vă permite să semnați digital o listă de certificate acreditate" @@ -203,7 +203,7 @@ CAPTION "Detalii" STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Afișează:", -1, 6,12,40,14 + LTEXT "&Afișare:", -1, 6,12,40,14 COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 @@ -220,7 +220,7 @@ BEGIN GROUPBOX "&Cale certificate", -1,6,10,245,165, BS_GROUPBOX CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, 13,22,231,130 - PUSHBUTTON "&Afișează certificat", IDC_VIEWCERTIFICATE,155,156,90,14 + PUSHBUTTON "&Afișare certificat", IDC_VIEWCERTIFICATE,155,156,90,14 LTEXT "Sta&re certificat:", IDC_CERTIFICATESTATUS,6,183,200,14 CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 @@ -247,11 +247,11 @@ BEGIN LTEXT "&Descriere:", -1, 6,32,60,14 EDITTEXT IDC_DESCRIPTION, 70,30,181,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL GROUPBOX "Rolurile certificatului", -1,6,48,245,185, BS_GROUPBOX - AUTORADIOBUTTON "A&ctivează toate rolurile acestui certificat", + AUTORADIOBUTTON "A&ctivare a tuturor rolurilor acestui certificat", IDC_ENABLE_ALL_PURPOSES, 12,58,230,14, BS_AUTORADIOBUTTON|WS_TABSTOP - AUTORADIOBUTTON "De&zactivează toate rolurile acestui certificat", + AUTORADIOBUTTON "De&zactivare a tuturor rolurilor acestui certificat", IDC_DISABLE_ALL_PURPOSES, 12,70,230,14, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "Activează d&oar următoarele roluri ale acestui certificat:", + AUTORADIOBUTTON "Activa d&oar a următoarelor roluri ale acestui certificat:", IDC_ENABLE_SELECTED_PURPOSES, 12,82,230,14, BS_AUTORADIOBUTTON CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, @@ -267,8 +267,8 @@ BEGIN LTEXT "Adăugați identificatorul de obiect (OID) pentru rolul de certificat pe care doriți să-l adăugați:", -1, 6,6,190,28 EDITTEXT IDC_NEW_PURPOSE, 6,28,190,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL - PUSHBUTTON "Con&firmă", IDOK, 33,48,60,14 - PUSHBUTTON "A&nulează", IDCANCEL, 100,48,60,14 + PUSHBUTTON "&OK", IDOK, 33,48,60,14 + PUSHBUTTON "&Revocare", IDCANCEL, 100,48,60,14 END IDD_SELECT_STORE DIALOGEX 0,0,200,136 @@ -280,8 +280,8 @@ BEGIN CONTROL "",IDC_STORE_LIST, "SysTreeView32", TVS_HASLINES|WS_BORDER|WS_TABSTOP, 6,28,188,70 CHECKBOX "Afișea&ză depozitele fizice", IDC_SHOW_PHYSICAL_STORES, 6,102,180,14, BS_AUTOCHECKBOX|WS_TABSTOP - PUSHBUTTON "Con&firmă", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON - PUSHBUTTON "A&nulează", IDCANCEL, 144,118,50,14 + PUSHBUTTON "&OK", IDOK, 90,118,50,14, BS_DEFPUSHBUTTON + PUSHBUTTON "&Revocare", IDCANCEL, 144,118,50,14 END IDD_IMPORT_WELCOME DIALOGEX 0,0,317,143 @@ -319,9 +319,9 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Wine poate selecta automat depozitul de certificate sau puteți să specificați o locație pentru certificate.", -1, 21,1,220,25 - AUTORADIOBUTTON "Selectează &automat depozitul de certificate", + AUTORADIOBUTTON "Selectare în mod &automat a depozitului de certificate", IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP - AUTORADIOBUTTON "&Plasează toate certificatele în următorul depozit:", + AUTORADIOBUTTON "&Punere a tuturor certificatelor în următorul depozit:", IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY PUSHBUTTON "&Căutare…", IDC_IMPORT_BROWSE_STORE, 236,61,60,14 @@ -374,8 +374,8 @@ BEGIN CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 14,51,220,90 - PUSHBUTTON "Con&firmă", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON - PUSHBUTTON "A&nulează", IDCANCEL, 190,155,51,14 + PUSHBUTTON "&OK", IDOK, 132,155,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "&Revocare", IDCANCEL, 190,155,51,14 END IDD_EXPORT_WELCOME DIALOGEX 0,0,317,143 @@ -431,7 +431,7 @@ BEGIN IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Incl&ude toate certificatele din calea de certificare, dacă este posibil", IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED - CHECKBOX "Acti&vează criptarea puternică", + CHECKBOX "Acti&vare criptare puternică", IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "Șt&erge cheia privată dacă exportarea reușește", IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED @@ -470,7 +470,7 @@ BEGIN LTEXT "Selectați un certificat dorit", IDC_SELECT_DISPLAY_STRING, 7,7,264,26 CONTROL "", IDC_SELECT_CERTS, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 7,40,264,89 - PUSHBUTTON "Con&firmă", IDOK, 91,136,51,14, BS_DEFPUSHBUTTON - PUSHBUTTON "A&nulare", IDCANCEL, 149,136,51,14 - PUSHBUTTON "&Afișează certificat", IDC_SELECT_VIEW_CERT, 207,136,65,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 91,136,51,14, BS_DEFPUSHBUTTON + PUSHBUTTON "&Revocare", IDCANCEL, 149,136,51,14 + PUSHBUTTON "&Afișare certificat", IDC_SELECT_VIEW_CERT, 207,136,65,14, WS_DISABLED END

10 months, 2 weeks

← Newer
1
2
3
4
5
6
7
...
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2024