Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:PNP][UMPNPMGR] GUID_DEVICE_ENUMERATED should be a DeviceInstallEvent
by Eric Kohl 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8ba5920a2914067a5bb4… commit d8ba5920a2914067a5bb404ef5d76ce5c3011e50 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 3 14:00:34 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 3 14:00:34 2023 +0100 [NTOS:PNP][UMPNPMGR] GUID_DEVICE_ENUMERATED should be a DeviceInstallEvent - Move the GUID_DEVICE_ENUMERATED event from the TargetDeviceChangeEvent category to the DeviceInstallEvent category - Create a new function that handles DeviceInstallEvent category events --- base/services/umpnpmgr/event.c | 72 ++++++++++++++++++++++++------------------ ntoskrnl/include/internal/io.h | 10 ++++-- ntoskrnl/io/pnpmgr/devaction.c | 8 +++-- ntoskrnl/io/pnpmgr/plugplay.c | 43 ++++++++++++++++++++++++- 4 files changed, 97 insertions(+), 36 deletions(-) diff --git a/base/services/umpnpmgr/event.c b/base/services/umpnpmgr/event.c index d9ae579cad2..5340431c005 100644 --- a/base/services/umpnpmgr/event.c +++ b/base/services/umpnpmgr/event.c @@ -42,34 +42,9 @@ ProcessTargetDeviceEvent( { RPC_STATUS RpcStatus; - if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) - { - DeviceInstallParams* Params; - DWORD len; - DWORD DeviceIdLength; - - DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); + DPRINT("ProcessTargetDeviceEvent(%p)\n", PnpEvent); - DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); - if (DeviceIdLength) - { - /* Allocate a new device-install event */ - len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); - Params = HeapAlloc(GetProcessHeap(), 0, len); - if (Params) - { - wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); - - /* Queue the event (will be dequeued by DeviceInstallThread) */ - WaitForSingleObject(hDeviceInstallListMutex, INFINITE); - InsertTailList(&DeviceInstallListHead, &Params->ListEntry); - ReleaseMutex(hDeviceInstallListMutex); - - SetEvent(hDeviceInstallListNotEmpty); - } - } - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) { // DWORD dwRecipient; @@ -143,8 +118,8 @@ VOID ProcessDeviceClassChangeEvent( _In_ PPLUGPLAY_EVENT_BLOCK PnpEvent) { - DPRINT("DeviceClassChangeEvent: %S\n", PnpEvent->DeviceClass.SymbolicLinkName); - + DPRINT("ProcessDeviceClassChangeEvent(%p)\n", PnpEvent); + DPRINT("SymbolicLink: %S\n", PnpEvent->DeviceClass.SymbolicLinkName); DPRINT("ClassGuid: {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", PnpEvent->DeviceClass.ClassGuid.Data1, PnpEvent->DeviceClass.ClassGuid.Data2, PnpEvent->DeviceClass.ClassGuid.Data3, PnpEvent->DeviceClass.ClassGuid.Data4[0], PnpEvent->DeviceClass.ClassGuid.Data4[1], PnpEvent->DeviceClass.ClassGuid.Data4[2], @@ -153,6 +128,39 @@ ProcessDeviceClassChangeEvent( } +static +VOID +ProcessDeviceInstallEvent( + _In_ PPLUGPLAY_EVENT_BLOCK PnpEvent) +{ + DeviceInstallParams* Params; + DWORD len; + DWORD DeviceIdLength; + + DPRINT("ProcessDeviceInstallEvent(%p)\n", PnpEvent); + DPRINT("Device enumerated: %S\n", PnpEvent->InstallDevice.DeviceId); + + DeviceIdLength = lstrlenW(PnpEvent->InstallDevice.DeviceId); + if (DeviceIdLength) + { + /* Allocate a new device-install event */ + len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); + Params = HeapAlloc(GetProcessHeap(), 0, len); + if (Params) + { + wcscpy(Params->DeviceIds, PnpEvent->InstallDevice.DeviceId); + + /* Queue the event (will be dequeued by DeviceInstallThread) */ + WaitForSingleObject(hDeviceInstallListMutex, INFINITE); + InsertTailList(&DeviceInstallListHead, &Params->ListEntry); + ReleaseMutex(hDeviceInstallListMutex); + + SetEvent(hDeviceInstallListNotEmpty); + } + } +} + + DWORD WINAPI PnpEventThread( @@ -213,7 +221,11 @@ PnpEventThread( break; // case CustomDeviceEvent: -// case DeviceInstallEvent: + + case DeviceInstallEvent: + ProcessDeviceInstallEvent(PnpEvent); + break; + // case DeviceArrivalEvent: // case PowerEvent: // case VetoEvent: diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 54a21832815..a349b48582d 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -676,9 +676,13 @@ IopQueueDeviceChangeEvent( NTSTATUS IopQueueTargetDeviceEvent( - const GUID *Guid, - PUNICODE_STRING DeviceIds -); + _In_ const GUID *Guid, + _In_ PUNICODE_STRING DeviceIds); + +NTSTATUS +IopQueueDeviceInstallEvent( + _In_ const GUID *Guid, + _In_ PUNICODE_STRING DeviceId); NTSTATUS NTAPI diff --git a/ntoskrnl/io/pnpmgr/devaction.c b/ntoskrnl/io/pnpmgr/devaction.c index 8b133ef80f4..94e384fac13 100644 --- a/ntoskrnl/io/pnpmgr/devaction.c +++ b/ntoskrnl/io/pnpmgr/devaction.c @@ -1331,8 +1331,8 @@ PiInitializeDevNode( if (!IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER)) { /* Report the device to the user-mode pnp manager */ - IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED, - &DeviceNode->InstancePath); + IopQueueDeviceInstallEvent(&GUID_DEVICE_ENUMERATED, + &DeviceNode->InstancePath); } return STATUS_SUCCESS; @@ -2580,6 +2580,10 @@ PipDeviceActionWorker( case PiActionResetDevice: // TODO: the operation is a no-op for everything except removed nodes // for removed nodes, it returns them back to DeviceNodeUninitialized + if (deviceNode->State == DeviceNodeRemoved) + { + deviceNode->State = DeviceNodeUninitialized; + } status = STATUS_SUCCESS; break; diff --git a/ntoskrnl/io/pnpmgr/plugplay.c b/ntoskrnl/io/pnpmgr/plugplay.c index 3b01ed06a1c..63556d0099b 100644 --- a/ntoskrnl/io/pnpmgr/plugplay.c +++ b/ntoskrnl/io/pnpmgr/plugplay.c @@ -93,6 +93,46 @@ IopQueueDeviceChangeEvent( return STATUS_SUCCESS; } +NTSTATUS +IopQueueDeviceInstallEvent( + _In_ const GUID *EventGuid, + _In_ PUNICODE_STRING DeviceId) +{ + PPNP_EVENT_ENTRY EventEntry; + UNICODE_STRING Copy; + ULONG TotalSize; + + /* Allocate a big enough buffer */ + Copy.Length = 0; + Copy.MaximumLength = DeviceId->Length + sizeof(UNICODE_NULL); + TotalSize = + FIELD_OFFSET(PLUGPLAY_EVENT_BLOCK, InstallDevice.DeviceId) + + Copy.MaximumLength; + + EventEntry = ExAllocatePool(NonPagedPool, + TotalSize + FIELD_OFFSET(PNP_EVENT_ENTRY, Event)); + if (!EventEntry) + return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(EventEntry, TotalSize + FIELD_OFFSET(PNP_EVENT_ENTRY, Event)); + + /* Fill the buffer with the event GUID */ + RtlCopyMemory(&EventEntry->Event.EventGuid, EventGuid, sizeof(GUID)); + EventEntry->Event.EventCategory = DeviceInstallEvent; + EventEntry->Event.TotalSize = TotalSize; + + /* Fill the symbolic link name */ + RtlCopyMemory(&EventEntry->Event.InstallDevice.DeviceId, + DeviceId->Buffer, DeviceId->Length); + EventEntry->Event.InstallDevice.DeviceId[DeviceId->Length / sizeof(WCHAR)] = UNICODE_NULL; + + InsertHeadList(&IopPnpEventQueueHead, &EventEntry->ListEntry); + + KeSetEvent(&IopPnpNotifyEvent, 0, FALSE); + + return STATUS_SUCCESS; +} + + NTSTATUS IopQueueTargetDeviceEvent(const GUID *Guid, PUNICODE_STRING DeviceIds) @@ -331,7 +371,8 @@ PiControlInitializeDevice( /* Insert as a root enumerated device node */ PiInsertDevNode(DeviceNode, IopRootDeviceNode); - IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED, &DeviceInstance); + /* Report the device to the user-mode pnp manager */ + IopQueueDeviceInstallEvent(&GUID_DEVICE_ENUMERATED, &DeviceNode->InstancePath); ZwClose(InstanceKey); done:

1 0

[reactos] 01/01: [UMPNPMGR] Split the notification code by event category
by Eric Kohl 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30b9be047f9679b7443f6… commit 30b9be047f9679b7443f678f62806cc29f36c9ca Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Dec 3 11:08:57 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Dec 3 11:08:57 2023 +0100 [UMPNPMGR] Split the notification code by event category - Move the TargetDeviceChangeEvent code into a separate function. - Add a new function for the DeviceClassChangeEvent category. --- base/services/umpnpmgr/event.c | 229 +++++++++++++++++++++++++---------------- 1 file changed, 139 insertions(+), 90 deletions(-) diff --git a/base/services/umpnpmgr/event.c b/base/services/umpnpmgr/event.c index 678022de61b..d9ae579cad2 100644 --- a/base/services/umpnpmgr/event.c +++ b/base/services/umpnpmgr/event.c @@ -35,13 +35,132 @@ /* FUNCTIONS *****************************************************************/ -DWORD WINAPI -PnpEventThread(LPVOID lpParameter) +static +VOID +ProcessTargetDeviceEvent( + _In_ PPLUGPLAY_EVENT_BLOCK PnpEvent) +{ + RPC_STATUS RpcStatus; + + if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) + { + DeviceInstallParams* Params; + DWORD len; + DWORD DeviceIdLength; + + DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); + + DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); + if (DeviceIdLength) + { + /* Allocate a new device-install event */ + len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); + Params = HeapAlloc(GetProcessHeap(), 0, len); + if (Params) + { + wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); + + /* Queue the event (will be dequeued by DeviceInstallThread) */ + WaitForSingleObject(hDeviceInstallListMutex, INFINITE); + InsertTailList(&DeviceInstallListHead, &Params->ListEntry); + ReleaseMutex(hDeviceInstallListMutex); + + SetEvent(hDeviceInstallListNotEmpty); + } + } + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + { +// DWORD dwRecipient; + + DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); + +// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; +// BroadcastSystemMessageW(BSF_POSTMESSAGE, +// &dwRecipient, +// WM_DEVICECHANGE, +// DBT_DEVNODES_CHANGED, +// 0); + SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) + { + DPRINT1("Eject vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus)) + { + DPRINT1("Kernel initiated eject: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus)) + { +// DWORD dwRecipient; + + DPRINT1("Safe removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + +// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; +// BroadcastSystemMessageW(BSF_POSTMESSAGE, +// &dwRecipient, +// WM_DEVICECHANGE, +// DBT_DEVNODES_CHANGED, +// 0); + SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus)) + { +// DWORD dwRecipient; + + DPRINT1("Surprise removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + +// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; +// BroadcastSystemMessageW(BSF_POSTMESSAGE, +// &dwRecipient, +// WM_DEVICECHANGE, +// DBT_DEVNODES_CHANGED, +// 0); + SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus)) + { + DPRINT1("Removal vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus)) + { + DPRINT1("Removal pending: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else + { + DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", + PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2, PnpEvent->EventGuid.Data3, + PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1], PnpEvent->EventGuid.Data4[2], + PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4], PnpEvent->EventGuid.Data4[5], + PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); + } +} + + +static +VOID +ProcessDeviceClassChangeEvent( + _In_ PPLUGPLAY_EVENT_BLOCK PnpEvent) +{ + DPRINT("DeviceClassChangeEvent: %S\n", PnpEvent->DeviceClass.SymbolicLinkName); + + DPRINT("ClassGuid: {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", + PnpEvent->DeviceClass.ClassGuid.Data1, PnpEvent->DeviceClass.ClassGuid.Data2, PnpEvent->DeviceClass.ClassGuid.Data3, + PnpEvent->DeviceClass.ClassGuid.Data4[0], PnpEvent->DeviceClass.ClassGuid.Data4[1], PnpEvent->DeviceClass.ClassGuid.Data4[2], + PnpEvent->DeviceClass.ClassGuid.Data4[3], PnpEvent->DeviceClass.ClassGuid.Data4[4], PnpEvent->DeviceClass.ClassGuid.Data4[5], + PnpEvent->DeviceClass.ClassGuid.Data4[6], PnpEvent->DeviceClass.ClassGuid.Data4[7]); +} + + +DWORD +WINAPI +PnpEventThread( + _In_ LPVOID lpParameter) { PLUGPLAY_CONTROL_USER_RESPONSE_DATA ResponseData = {0, 0, 0, 0}; DWORD dwRet = ERROR_SUCCESS; NTSTATUS Status; - RPC_STATUS RpcStatus; PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; ULONG PnpEventSize; @@ -81,98 +200,28 @@ PnpEventThread(LPVOID lpParameter) /* Process the PnP event */ DPRINT("Received PnP Event\n"); - if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) - { - DeviceInstallParams* Params; - DWORD len; - DWORD DeviceIdLength; - - DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); - - DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); - if (DeviceIdLength) - { - /* Allocate a new device-install event */ - len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); - Params = HeapAlloc(GetProcessHeap(), 0, len); - if (Params) - { - wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); - - /* Queue the event (will be dequeued by DeviceInstallThread) */ - WaitForSingleObject(hDeviceInstallListMutex, INFINITE); - InsertTailList(&DeviceInstallListHead, &Params->ListEntry); - ReleaseMutex(hDeviceInstallListMutex); - - SetEvent(hDeviceInstallListNotEmpty); - } - } - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) - { -// DWORD dwRecipient; - - DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); - -// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; -// BroadcastSystemMessageW(BSF_POSTMESSAGE, -// &dwRecipient, -// WM_DEVICECHANGE, -// DBT_DEVNODES_CHANGED, -// 0); - SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) + switch (PnpEvent->EventCategory) { - DPRINT1("Eject vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus)) - { - DPRINT1("Kernel initiated eject: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus)) - { -// DWORD dwRecipient; +// case HardwareProfileChangeEvent: - DPRINT1("Safe removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + case TargetDeviceChangeEvent: + ProcessTargetDeviceEvent(PnpEvent); + break; -// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; -// BroadcastSystemMessageW(BSF_POSTMESSAGE, -// &dwRecipient, -// WM_DEVICECHANGE, -// DBT_DEVNODES_CHANGED, -// 0); - SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus)) - { -// DWORD dwRecipient; + case DeviceClassChangeEvent: + ProcessDeviceClassChangeEvent(PnpEvent); + break; - DPRINT1("Surprise removal: %S\n", PnpEvent->TargetDevice.DeviceIds); +// case CustomDeviceEvent: +// case DeviceInstallEvent: +// case DeviceArrivalEvent: +// case PowerEvent: +// case VetoEvent: +// case BlockedDriverEvent: -// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; -// BroadcastSystemMessageW(BSF_POSTMESSAGE, -// &dwRecipient, -// WM_DEVICECHANGE, -// DBT_DEVNODES_CHANGED, -// 0); - SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus)) - { - DPRINT1("Removal vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus)) - { - DPRINT1("Removal pending: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else - { - DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", - PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2, PnpEvent->EventGuid.Data3, - PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1], PnpEvent->EventGuid.Data4[2], - PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4], PnpEvent->EventGuid.Data4[5], - PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); + default: + DPRINT1("Unsupported Event Category: %lu\n", PnpEvent->EventCategory); + break; } /* Dequeue the current PnP event and signal the next one */

1 0

[reactos] 01/01: [IMM32][SDK][NTUSER] Implement ImmProcessKey for Cicero (#6106)
by Katayama Hirofumi MZ 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=75cf6920bc62f70dc481b… commit 75cf6920bc62f70dc481be5f5d0e63e18cfafd81 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 3 17:33:22 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 3 17:33:22 2023 +0900 [IMM32][SDK][NTUSER] Implement ImmProcessKey for Cicero (#6106) Complete CTF IMM. - Add CtfImeProcessCicHotkey and CtfImeSetActiveContextAlways to access CTF IMEs. - Check whether Cicero is started in the current thread in ImmProcessKey. - Call CtfImeProcessCicHotkey if necessary in ImmProcessKey. - Modify <CtfImeTable.h>. - Add CI_CICERO_STARTED flag to "ntuser.h". - Fix Imm32JCloseOpen. CORE-19268 --- dll/win32/imm32/ctf.c | 106 +++++++++++++++++++++++++++++- dll/win32/imm32/imm.c | 9 +-- dll/win32/imm32/keymsg.c | 134 +++++++++++--------------------------- dll/win32/imm32/precomp.h | 18 +++++ sdk/include/reactos/CtfImeTable.h | 4 +- win32ss/include/ntuser.h | 1 + 6 files changed, 163 insertions(+), 109 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 23e4b41c3ed..f4463cc67f1 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -738,6 +738,20 @@ CtfImeCreateThreadMgr(VOID) return CTF_IME_FN(CtfImeCreateThreadMgr)(); } +/*********************************************************************** + * This function calls the same name function of the CTF IME side. + */ +BOOL +CtfImeProcessCicHotkey(_In_ HIMC hIMC, _In_ UINT vKey, _In_ LPARAM lParam) +{ + TRACE("(%p, %u, %p)\n", hIMC, vKey, lParam); + + if (!Imm32LoadCtfIme()) + return FALSE; + + return CTF_IME_FN(CtfImeProcessCicHotkey)(hIMC, vKey, lParam); +} + /*********************************************************************** * This function calls the same name function of the CTF IME side. */ @@ -775,7 +789,7 @@ BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID) { TRACE("()\n"); - return !!(GetWin32ClientInfo()->CI_flags & 0x200); + return !!(GetWin32ClientInfo()->CI_flags & CI_CICERO_STARTED); } /*********************************************************************** @@ -785,9 +799,9 @@ VOID WINAPI CtfImmSetCiceroStartInThread(_In_ BOOL bStarted) { TRACE("(%d)\n", bStarted); if (bStarted) - GetWin32ClientInfo()->CI_flags |= 0x200; + GetWin32ClientInfo()->CI_flags |= CI_CICERO_STARTED; else - GetWin32ClientInfo()->CI_flags &= ~0x200; + GetWin32ClientInfo()->CI_flags &= ~CI_CICERO_STARTED; } /*********************************************************************** @@ -832,6 +846,24 @@ CtfImeDestroyInputContext(_In_ HIMC hIMC) return CTF_IME_FN(CtfImeDestroyInputContext)(hIMC); } +/*********************************************************************** + * This function calls the same name function of the CTF IME side. + */ +HRESULT +CtfImeSetActiveContextAlways( + _In_ HIMC hIMC, + _In_ BOOL fActive, + _In_ HWND hWnd, + _In_ HKL hKL) +{ + TRACE("(%p, %d, %p, %p)\n", hIMC, fActive, hWnd, hKL); + + if (!Imm32LoadCtfIme()) + return E_FAIL; + + return CTF_IME_FN(CtfImeSetActiveContextAlways)(hIMC, fActive, hWnd, hKL); +} + /*********************************************************************** * The callback function to activate CTF IMEs. Used in CtfAImmActivate. */ @@ -1173,6 +1205,74 @@ CtfImmTIMActivate(_In_ HKL hKL) return hr; } +/*********************************************************************** + * Setting language band + */ + +typedef struct IMM_DELAY_SET_LANG_BAND +{ + HWND hWnd; + BOOL fSet; +} IMM_DELAY_SET_LANG_BAND, *PIMM_DELAY_SET_LANG_BAND; + +/* Sends a message to set the language band with delay. */ +static DWORD APIENTRY Imm32DelaySetLangBandProc(LPVOID arg) +{ + HWND hwndDefIME; + WPARAM wParam; + DWORD_PTR lResult; + PIMM_DELAY_SET_LANG_BAND pSetBand = arg; + + Sleep(3000); /* Delay 3 seconds! */ + + hwndDefIME = ImmGetDefaultIMEWnd(pSetBand->hWnd); + if (hwndDefIME) + { + wParam = (pSetBand->fSet ? IMS_SETLANGBAND : IMS_UNSETLANGBAND); + SendMessageTimeoutW(hwndDefIME, WM_IME_SYSTEM, wParam, (LPARAM)pSetBand->hWnd, + SMTO_BLOCK | SMTO_ABORTIFHUNG, 5000, &lResult); + } + ImmLocalFree(pSetBand); + return FALSE; +} + +/* Updates the language band. */ +LRESULT +CtfImmSetLangBand( + _In_ HWND hWnd, + _In_ BOOL fSet) +{ + HANDLE hThread; + PWND pWnd = NULL; + PIMM_DELAY_SET_LANG_BAND pSetBand; + DWORD_PTR lResult = 0; + + if (hWnd && gpsi) + pWnd = ValidateHwndNoErr(hWnd); + + if (IS_NULL_UNEXPECTEDLY(pWnd)) + return 0; + + if (pWnd->state2 & WNDS2_WMCREATEMSGPROCESSED) + { + SendMessageTimeoutW(hWnd, WM_USER + 0x105, 0, fSet, SMTO_BLOCK | SMTO_ABORTIFHUNG, + 5000, &lResult); + return lResult; + } + + pSetBand = ImmLocalAlloc(0, sizeof(IMM_DELAY_SET_LANG_BAND)); + if (IS_NULL_UNEXPECTEDLY(pSetBand)) + return 0; + + pSetBand->hWnd = hWnd; + pSetBand->fSet = fSet; + + hThread = CreateThread(NULL, 0, Imm32DelaySetLangBandProc, pSetBand, 0, NULL); + if (hThread) + CloseHandle(hThread); + return 0; +} + /*********************************************************************** * CtfImmGenerateMessage (IMM32.@) */ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 3ea5bae50ea..aa81c0935bd 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -183,7 +183,6 @@ Retry: return TRUE; } -// Win: SelectInputContext VOID APIENTRY Imm32SelectInputContext(HKL hNewKL, HKL hOldKL, HIMC hIMC) { PCLIENTIMC pClientImc; @@ -490,12 +489,6 @@ BOOL WINAPI ImmActivateLayout(HKL hKL) return TRUE; } -/* Win: Internal_CtfImeSetActiveContextAlways */ -static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) -{ - TRACE("We have to do something\n"); -} - /*********************************************************************** * ImmAssociateContext (IMM32.@) */ @@ -1196,7 +1189,7 @@ BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) hKL = GetKeyboardLayout(0); if (IS_CICERO_MODE() && !IS_16BIT_MODE()) { - Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL); + CtfImeSetActiveContextAlways(hIMC, fActive, hWnd, hKL); hKL = GetKeyboardLayout(0); } diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 4131b751071..f1dd211b607 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -158,7 +158,6 @@ BOOL APIENTRY Imm32CSymbolToggle(HIMC hIMC, HKL hKL, HWND hWnd) } /* Open or close Japanese IME */ -/* Win: JCloseOpen */ BOOL APIENTRY Imm32JCloseOpen(HIMC hIMC, HKL hKL, HWND hWnd) { BOOL fOpen; @@ -177,7 +176,7 @@ BOOL APIENTRY Imm32JCloseOpen(HIMC hIMC, HKL hKL, HWND hWnd) pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (pIC) { - pIC->dwChange |= INPUTCONTEXTDX_CHANGE_OPEN; /* Notify open change */ + pIC->dwChange |= INPUTCONTEXTDX_CHANGE_FORCE_OPEN; ImmUnlockIMC(hIMC); } } @@ -331,85 +330,23 @@ ImmIsUIMessageAW(HWND hWndIME, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAns return TRUE; } -typedef struct IMM_DELAY_SET_LANG_BAND -{ - HWND hWnd; - BOOL fSet; -} IMM_DELAY_SET_LANG_BAND, *PIMM_DELAY_SET_LANG_BAND; - -/* Sends a message to set the language band with delay. */ -/* Win: DelaySetLangBand */ -static DWORD APIENTRY Imm32DelaySetLangBandProc(LPVOID arg) -{ - HWND hwndDefIME; - WPARAM wParam; - DWORD_PTR lResult; - PIMM_DELAY_SET_LANG_BAND pSetBand = arg; - - Sleep(3000); /* Delay 3 seconds! */ - - hwndDefIME = ImmGetDefaultIMEWnd(pSetBand->hWnd); - if (hwndDefIME) - { - wParam = (pSetBand->fSet ? IMS_SETLANGBAND : IMS_UNSETLANGBAND); - SendMessageTimeoutW(hwndDefIME, WM_IME_SYSTEM, wParam, (LPARAM)pSetBand->hWnd, - SMTO_BLOCK | SMTO_ABORTIFHUNG, 5000, &lResult); - } - ImmLocalFree(pSetBand); - return FALSE; -} - -/* Updates the language band. */ -/* Win: CtfImmSetLangBand */ -LRESULT APIENTRY CtfImmSetLangBand(HWND hWnd, BOOL fSet) -{ - HANDLE hThread; - PWND pWnd = NULL; - PIMM_DELAY_SET_LANG_BAND pSetBand; - DWORD_PTR lResult = 0; - - if (hWnd && gpsi) - pWnd = ValidateHwndNoErr(hWnd); - - if (IS_NULL_UNEXPECTEDLY(pWnd)) - return 0; - - if (pWnd->state2 & WNDS2_WMCREATEMSGPROCESSED) - { - SendMessageTimeoutW(hWnd, WM_USER + 0x105, 0, fSet, SMTO_BLOCK | SMTO_ABORTIFHUNG, - 5000, &lResult); - return lResult; - } - - pSetBand = ImmLocalAlloc(0, sizeof(IMM_DELAY_SET_LANG_BAND)); - if (IS_NULL_UNEXPECTEDLY(pSetBand)) - return 0; - - pSetBand->hWnd = hWnd; - pSetBand->fSet = fSet; - - hThread = CreateThread(NULL, 0, Imm32DelaySetLangBandProc, pSetBand, 0, NULL); - if (hThread) - CloseHandle(hThread); - return 0; -} - -/* Win: SendNotificationProc */ -static BOOL CALLBACK Imm32SendNotificationProc(HIMC hIMC, LPARAM lParam) +static BOOL CALLBACK +Imm32SendNotificationProc( + _In_ HIMC hIMC, + _In_ LPARAM lParam) { HWND hWnd; LPINPUTCONTEXTDX pIC; + UNREFERENCED_PARAMETER(lParam); + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (IS_NULL_UNEXPECTEDLY(pIC)) return TRUE; hWnd = pIC->hWnd; - if (hWnd == NULL || !IsWindow(hWnd)) - { - ERR("\n"); + if (!IsWindow(hWnd)) goto Quit; - } TRACE("dwChange: 0x%08X\n", pIC->dwChange); @@ -427,7 +364,6 @@ Quit: return TRUE; } -/* Win: ImmSendNotification */ BOOL APIENTRY Imm32SendNotification(BOOL bProcess) { return ImmEnumInputContext((bProcess ? -1 : 0), Imm32SendNotificationProc, 0); @@ -783,11 +719,11 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) PIMEDPI pImeDpi; LPINPUTCONTEXTDX pIC; BYTE KeyState[256]; - UINT vk; - BOOL bUseIme = TRUE, bSkipThisKey = FALSE, bLowWordOnly = FALSE; + BOOL bLowWordOnly = FALSE, bSkipThisKey = FALSE, bHotKeyDone = TRUE; TRACE("(%p, %p, 0x%X, %p, 0x%lX)\n", hWnd, hKL, vKey, lParam, dwHotKeyID); + /* Process the key by the IME */ hIMC = ImmGetContext(hWnd); pImeDpi = ImmLockImeDpi(hKL); if (pImeDpi) @@ -795,7 +731,7 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); if (pIC) { - if (LOBYTE(vKey) == VK_PACKET && + if ((LOBYTE(vKey) == VK_PACKET) && !(pImeDpi->ImeInfo.fdwProperty & IME_PROP_ACCEPT_WIDE_VKEY)) { if (ImeDpi_IsUnicode(pImeDpi)) @@ -804,29 +740,23 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) } else { - bUseIme = FALSE; if (pIC->fOpen) - bSkipThisKey = TRUE; + ret |= IPHK_SKIPTHISKEY; + + bSkipThisKey = TRUE; } } - if (bUseIme) + if (!bSkipThisKey && GetKeyboardState(KeyState)) { - if (GetKeyboardState(KeyState)) + UINT vk = (bLowWordOnly ? LOWORD(vKey) : vKey); + if (pImeDpi->ImeProcessKey(hIMC, vk, lParam, KeyState)) { - vk = (bLowWordOnly ? LOWORD(vKey) : vKey); - if (pImeDpi->ImeProcessKey(hIMC, vk, lParam, KeyState)) - { - pIC->bNeedsTrans = TRUE; - pIC->nVKey = vKey; - ret |= IPHK_PROCESSBYIME; - } + pIC->bNeedsTrans = TRUE; + pIC->nVKey = vKey; + ret |= IPHK_PROCESSBYIME; } } - else if (bSkipThisKey) - { - ret |= IPHK_SKIPTHISKEY; - } ImmUnlockIMC(hIMC); } @@ -834,21 +764,32 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) ImmUnlockImeDpi(pImeDpi); } - if (dwHotKeyID != INVALID_HOTKEY_ID) /* Valid Hot-key */ + /* Process the hot-key if necessary */ + if (!CtfImmIsCiceroStartedInThread()) /* Not Cicero? */ + { + /* Process IMM IME hotkey */ + if ((dwHotKeyID == INVALID_HOTKEY_ID) || !Imm32ProcessHotKey(hWnd, hIMC, hKL, dwHotKeyID)) + bHotKeyDone = FALSE; + } + else if (!CtfImeProcessCicHotkey(hIMC, vKey, lParam)) /* CTF IME not processed the hotkey? */ { - if (Imm32ProcessHotKey(hWnd, hIMC, hKL, dwHotKeyID)) + /* Process IMM IME hotkey */ + if (!IS_IME_HKL(hKL) || + ((dwHotKeyID == INVALID_HOTKEY_ID) || !Imm32ProcessHotKey(hWnd, hIMC, hKL, dwHotKeyID))) { - if (vKey != VK_KANJI || dwHotKeyID != IME_JHOTKEY_CLOSE_OPEN) - ret |= IPHK_HOTKEY; + bHotKeyDone = FALSE; } } + if (bHotKeyDone && ((vKey != VK_KANJI) || (dwHotKeyID != IME_JHOTKEY_CLOSE_OPEN))) + ret |= IPHK_HOTKEY; + if ((ret & IPHK_PROCESSBYIME) && (ImmGetAppCompatFlags(hIMC) & 0x10000)) { /* The key has been processed by IME's ImeProcessKey */ LANGID wLangID = LANGIDFROMLCID(GetSystemDefaultLCID()); - if (PRIMARYLANGID(wLangID) == LANG_KOREAN && - (vKey == VK_PROCESSKEY || (ret & IPHK_HOTKEY))) + if ((PRIMARYLANGID(wLangID) == LANG_KOREAN) && + ((vKey == VK_PROCESSKEY) || (ret & IPHK_HOTKEY))) { /* Korean don't want VK_PROCESSKEY and IME hot-keys */ } @@ -856,6 +797,7 @@ ImmProcessKey(HWND hWnd, HKL hKL, UINT vKey, LPARAM lParam, DWORD dwHotKeyID) { /* Add WM_KEYDOWN:VK_PROCESSKEY message */ ImmTranslateMessage(hWnd, WM_KEYDOWN, VK_PROCESSKEY, lParam); + ret &= ~IPHK_PROCESSBYIME; ret |= IPHK_SKIPTHISKEY; } diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 3f667d1d6f5..cb87f48890c 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -201,3 +201,21 @@ HRESULT CtfImmCoInitialize(VOID); HRESULT CtfImeCreateThreadMgr(VOID); HRESULT CtfImeDestroyThreadMgr(VOID); HRESULT Imm32ActivateOrDeactivateTIM(_In_ BOOL bCreate); + +HRESULT +CtfImeSetActiveContextAlways( + _In_ HIMC hIMC, + _In_ BOOL fActive, + _In_ HWND hWnd, + _In_ HKL hKL); + +BOOL +CtfImeProcessCicHotkey( + _In_ HIMC hIMC, + _In_ UINT vKey, + _In_ LPARAM lParam); + +LRESULT +CtfImmSetLangBand( + _In_ HWND hWnd, + _In_ BOOL fSet); diff --git a/sdk/include/reactos/CtfImeTable.h b/sdk/include/reactos/CtfImeTable.h index 14f701b6c46..99a208e6f42 100644 --- a/sdk/include/reactos/CtfImeTable.h +++ b/sdk/include/reactos/CtfImeTable.h @@ -12,7 +12,7 @@ DEFINE_CTF_IME_FN(CtfImeCreateThreadMgr, HRESULT, (VOID)) DEFINE_CTF_IME_FN(CtfImeDestroyThreadMgr, HRESULT, (VOID)) DEFINE_CTF_IME_FN(CtfImeCreateInputContext, HRESULT, (HIMC hIMC)) DEFINE_CTF_IME_FN(CtfImeDestroyInputContext, HRESULT, (HIMC hIMC)) -DEFINE_CTF_IME_FN(CtfImeSetActiveContextAlways, HRESULT, (DWORD dwFIXME1, DWORD dwFIXME2, DWORD dwFIXME3, DWORD dwFIXME4)) -DEFINE_CTF_IME_FN(CtfImeProcessCicHotkey, HRESULT, (DWORD dwFIXME1, DWORD dwFIXME2, DWORD dwFIXME3)) +DEFINE_CTF_IME_FN(CtfImeSetActiveContextAlways, HRESULT, (HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL)) +DEFINE_CTF_IME_FN(CtfImeProcessCicHotkey, HRESULT, (HIMC hIMC, UINT vKey, LPARAM lParam)) DEFINE_CTF_IME_FN(CtfImeDispatchDefImeMessage, LRESULT, (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)) DEFINE_CTF_IME_FN(CtfImeIsIME, BOOL, (HKL hKL)) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 2763b4b24cc..c5e08f83ac2 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -305,6 +305,7 @@ typedef struct _CALLBACKWND #define CI_IMMACTIVATE 0x00000040 /* IMM/IME (Asian input) */ #define CI_CTFCOINIT 0x00000080 /* Did CTF CoInitialize? */ #define CI_CTFTIM 0x00000100 /* CTF Thread Input Manager (TIM) */ +#define CI_CICERO_STARTED 0x00000200 /* Is Cicero started in the thread? */ #define CI_TSFDISABLED 0x00000400 /* TSF (Text Services Framework a.k.a. Cicero) */ #define CI_AIMMACTIVATED 0x00000800 /* Active IMM (AIMM) */

1 0

[reactos] 01/01: [HH] Check LoadLibrary and GetProcAddress return value (#6082)
by Thamatip Chitpong 03 Dec '23

03 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ea2222967054bc086d6c… commit 9ea2222967054bc086d6cf5f2b75935b13f2d60e Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Sun Dec 3 08:15:08 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 3 08:15:08 2023 +0700 [HH] Check LoadLibrary and GetProcAddress return value (#6082) Handle failure cases. --- base/applications/hh/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/base/applications/hh/main.c b/base/applications/hh/main.c index 3d06156167b..beb2882ee4e 100644 --- a/base/applications/hh/main.c +++ b/base/applications/hh/main.c @@ -15,11 +15,14 @@ WinMain(HINSTANCE hInst, int ret = -1; hModule = LoadLibraryA("hhctrl.ocx"); - doWinMain = (DOWINMAIN*) GetProcAddress(hModule, "doWinMain"); + if (hModule) + { + doWinMain = (DOWINMAIN*)GetProcAddress(hModule, "doWinMain"); + if (doWinMain) + ret = doWinMain(hInst, cmdline); - ret = doWinMain(hInst, cmdline); - - FreeLibrary(hModule); + FreeLibrary(hModule); + } return ret; }

1 0

[reactos] 01/01: [IMM32][SDK] Implement GetKeyboardLayoutCP (#6068)
by Katayama Hirofumi MZ 02 Dec '23

02 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d795021a750e92f320c3a… commit d795021a750e92f320c3a07c73bfe3cbcc799567 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Dec 3 07:46:35 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Dec 3 07:46:35 2023 +0900 [IMM32][SDK] Implement GetKeyboardLayoutCP (#6068) - Add IMM32!GetKeyboardLayoutCP function. - Add it to <imm32_undoc.h>. - Delete ImmDisableLegacyIME and ImmSendMessageToActiveDefImeWndW functions (2k3/xp IMM32 doesn't have such functions). - Modify imm32.spec. - Refer ntdll!RtlDllShutdownInProgress function (that is WinXP+). CORE-19268 --- dll/win32/imm32/ctf.c | 21 ++++----------------- dll/win32/imm32/ime.c | 9 --------- dll/win32/imm32/imm.c | 32 +++++++++++++++++++++++++++----- dll/win32/imm32/imm32.spec | 3 +-- dll/win32/imm32/keymsg.c | 18 ------------------ sdk/include/reactos/imm32_undoc.h | 2 ++ 6 files changed, 34 insertions(+), 51 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index be1853f02c3..23e4b41c3ed 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS IMM32 * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Implementing the IMM32 Cicero-aware Text Framework (CTF) + * PURPOSE: Implementing IMM CTF (Collaborative Translation Framework) * COPYRIGHT: Copyright 2022-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ @@ -11,11 +11,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -/* FIXME: Use RTL */ -static BOOL WINAPI RtlDllShutdownInProgress(VOID) -{ - return FALSE; -} +/* FIXME: Use proper header */ +BOOLEAN WINAPI RtlDllShutdownInProgress(VOID); static BOOL Imm32InsideLoaderLock(VOID) { @@ -201,17 +198,7 @@ VOID Imm32TF_InvalidAssemblyListCacheIfExist(VOID) } /*********************************************************************** - * CTF IME support - * - * TSF stands for "Text Services Framework". "Cicero" is the code name of TSF. - * CTF stands for "Cicero-aware Text Framework". - * - * Comparing with old-style IMM IME, the combination of CTF IME and TSF provides - * new-style and high-level input method. - * - * The CTF IME file is a DLL file that the software developer distributes. - * The export functions of the CTF IME file are defined in <CtfImeTable.h> of - * this folder. + * CTF (Collaborative Translation Framework) IME support */ /* "Active IMM" compatibility flags */ diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 9268b66a0a7..a30b86af31b 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -925,15 +925,6 @@ BOOL WINAPI ImmNotifyIME(HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue return ret; } -/*********************************************************************** - * ImmDisableLegacyIME(IMM32.@) - */ -BOOL WINAPI ImmDisableLegacyIME(void) -{ - FIXME("stub\n"); - return TRUE; -} - /*********************************************************************** * ImmGetImeInfoEx (IMM32.@) */ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 5723fde1a59..3ea5bae50ea 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -14,13 +14,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); -HMODULE ghImm32Inst = NULL; // Win: ghInst -PSERVERINFO gpsi = NULL; // Win: gpsi -SHAREDINFO gSharedInfo = { NULL }; // Win: gSharedInfo -BYTE gfImmInitialized = FALSE; // Win: gfInitialized +HMODULE ghImm32Inst = NULL; /* The IMM32 instance */ +PSERVERINFO gpsi = NULL; +SHAREDINFO gSharedInfo = { NULL }; +BYTE gfImmInitialized = FALSE; /* Is IMM32 initialized? */ ULONG_PTR gHighestUserAddress = 0; -// Win: ImmInitializeGlobals static BOOL APIENTRY ImmInitializeGlobals(HMODULE hMod) { NTSTATUS status; @@ -1257,6 +1256,29 @@ BOOL WINAPI ImmSetActiveContextConsoleIME(HWND hwnd, BOOL fFlag) return ImmSetActiveContext(hwnd, hIMC, fFlag); } +/*********************************************************************** + * GetKeyboardLayoutCP (IMM32.@) + */ +UINT WINAPI GetKeyboardLayoutCP(_In_ LANGID wLangId) +{ + WCHAR szText[8]; + static LANGID s_wKeyboardLangIdCache = 0; + static UINT s_uKeyboardLayoutCPCache = 0; + + TRACE("(%u)\n", wLangId); + + if (wLangId == s_wKeyboardLangIdCache) + return s_uKeyboardLayoutCPCache; + + if (!GetLocaleInfoW(wLangId, LOCALE_IDEFAULTANSICODEPAGE, szText, _countof(szText))) + return 0; + + s_wKeyboardLangIdCache = wLangId; + szText[_countof(szText) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + s_uKeyboardLayoutCPCache = wcstol(szText, NULL, 10); + return s_uKeyboardLayoutCPCache; +} + #ifndef NDEBUG VOID APIENTRY Imm32UnitTest(VOID) { diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 2e84d6a143c..3bd4c297f44 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -17,6 +17,7 @@ @ stdcall CtfImmSetAppCompatFlags(long) @ stdcall CtfImmSetCiceroStartInThread(long) @ stdcall CtfImmTIMActivate(ptr) +@ stdcall GetKeyboardLayoutCP(long) @ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long) @@ -31,7 +32,6 @@ @ stdcall ImmDestroySoftKeyboard(ptr) @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME -@ stdcall ImmDisableLegacyIME() @ stdcall ImmDisableTextFrameService(long) @ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @@ -105,7 +105,6 @@ @ stdcall ImmRequestMessageW(ptr ptr ptr) @ stdcall ImmSendIMEMessageExA(ptr ptr) @ stdcall ImmSendIMEMessageExW(ptr ptr) -@ stdcall ImmSendMessageToActiveDefImeWndW(long ptr ptr) @ stdcall ImmSetActiveContext(ptr ptr long) @ stdcall ImmSetActiveContextConsoleIME(ptr long) @ stdcall ImmSetCandidateWindow(ptr ptr) diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 3f2fb48be31..4131b751071 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -1184,24 +1184,6 @@ LRESULT WINAPI ImmRequestMessageW(HIMC hIMC, WPARAM wParam, LPARAM lParam) return ImmRequestMessageAW(hIMC, wParam, lParam, FALSE); } -/*********************************************************************** - * ImmSendMessageToActiveDefImeWndW (IMM32.@) - */ -LRESULT WINAPI -ImmSendMessageToActiveDefImeWndW(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - HWND hwndIME; - - if (uMsg != WM_COPYDATA) - return 0; - - hwndIME = (HWND)NtUserQueryWindow((HWND)wParam, QUERY_WINDOW_DEFAULT_IME); - if (IS_NULL_UNEXPECTEDLY(hwndIME)) - return 0; - - return SendMessageW(hwndIME, uMsg, wParam, lParam); -} - /*********************************************************************** * ImmCallImeConsoleIME (IMM32.@) */ diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 08be32a2dcd..75eb48f5692 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -11,6 +11,8 @@ extern "C" { #endif +UINT WINAPI GetKeyboardLayoutCP(_In_ LANGID wLangId); + BOOL WINAPI ImmGetImeInfoEx(PIMEINFOEX pImeInfoEx, IMEINFOEXCLASS SearchType, PVOID pvSearchKey);

1 0

[reactos] 01/01: [HAL] Implement IPI support functions
by Timo Kreuzer 02 Dec '23

02 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40b6b1dab3169b1a59473… commit 40b6b1dab3169b1a59473bed06de9a9588f24d5b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 26 17:32:27 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Dec 3 00:07:53 2023 +0200 [HAL] Implement IPI support functions --- hal/hal.spec | 4 +- hal/halx86/apic/apicp.h | 2 +- hal/halx86/apic/apicsmp.c | 177 +++++++++++++++++++++++++++++++++++++++++++-- hal/halx86/generic/up.c | 19 +++++ hal/halx86/include/smp.h | 38 ++++++++++ hal/halx86/smp/ipi.c | 24 ++++++ sdk/include/ndk/halfuncs.h | 17 +++++ 7 files changed, 270 insertions(+), 11 deletions(-) diff --git a/hal/hal.spec b/hal/hal.spec index 94bb141afee..2a3285e1c81 100644 --- a/hal/hal.spec +++ b/hal/hal.spec @@ -41,8 +41,8 @@ @ stdcall HalRequestIpi(long) @ fastcall HalRequestSoftwareInterrupt(long) @ stdcall HalReturnToFirmware(long) -;@ stdcall -arch=x86_64 HalSendNMI() -;@ stdcall -arch=x86_64 HalSendSoftwareInterrupt() +@ stdcall -arch=x86_64 HalSendNMI(int64) +@ stdcall -arch=x86_64 HalSendSoftwareInterrupt(int64 long) @ stdcall HalSetBusData(long long long ptr long) @ stdcall HalSetBusDataByOffset(long long long ptr long long) @ stdcall HalSetDisplayParameters(long long) diff --git a/hal/halx86/apic/apicp.h b/hal/halx86/apic/apicp.h index 245ab197f59..0a91da45992 100644 --- a/hal/halx86/apic/apicp.h +++ b/hal/halx86/apic/apicp.h @@ -151,7 +151,7 @@ typedef enum _APIC_DSH APIC_DSH_Destination, APIC_DSH_Self, APIC_DSH_AllIncludingSelf, - APIC_DSH_AllExclusingSelf + APIC_DSH_AllExcludingSelf } APIC_DSH; /* Write Constants */ diff --git a/hal/halx86/apic/apicsmp.c b/hal/halx86/apic/apicsmp.c index d8684742268..47415bc84b6 100644 --- a/hal/halx86/apic/apicsmp.c +++ b/hal/halx86/apic/apicsmp.c @@ -106,14 +106,6 @@ ApicRequestGlobalInterrupt( /* SMP SUPPORT FUNCTIONS ******************************************************/ -VOID -NTAPI -HalpRequestIpi(_In_ KAFFINITY TargetProcessors) -{ - UNIMPLEMENTED; - __debugbreak(); -} - VOID ApicStartApplicationProcessor( _In_ ULONG NTProcessorNumber, @@ -138,3 +130,172 @@ ApicStartApplicationProcessor( ApicRequestGlobalInterrupt(HalpProcessorIdentity[NTProcessorNumber].LapicId, (StartupLoc.LowPart) >> 12, APIC_MT_Startup, APIC_TGM_Edge, APIC_DSH_Destination); } + +/* HAL IPI FUNCTIONS **********************************************************/ + +/*! + * \brief Broadcasts an IPI with a specified vector to all processors. + * + * \param Vector - Specifies the interrupt vector to be delivered. + * \param IncludeSelf - Specifies whether to include the current processor. + */ +VOID +NTAPI +HalpBroadcastIpiSpecifyVector( + _In_ UCHAR Vector, + _In_ BOOLEAN IncludeSelf) +{ + APIC_DSH DestinationShortHand = IncludeSelf ? + APIC_DSH_AllIncludingSelf : APIC_DSH_AllExcludingSelf; + + /* Request the interrupt targeted at all processors */ + ApicRequestGlobalInterrupt(0, // Ignored + Vector, + APIC_MT_Fixed, + APIC_TGM_Edge, + DestinationShortHand); +} + +/*! + * \brief Requests an IPI with a specified vector on the specified processors. + * + * \param TargetSet - Specifies the set of processors to send the IPI to. + * \param Vector - Specifies the interrupt vector to be delivered. + * + * \remarks This function is exported on Windows 10. + */ +VOID +NTAPI +HalRequestIpiSpecifyVector( + _In_ KAFFINITY TargetSet, + _In_ UCHAR Vector) +{ + KAFFINITY ActiveProcessors = KeQueryActiveProcessors(); + KAFFINITY RemainingSet, SetMember; + ULONG ProcessorIndex; + ULONG LApicId; + + /* Sanitize the target set */ + TargetSet &= ActiveProcessors; + + /* Check if all processors are requested */ + if (TargetSet == ActiveProcessors) + { + /* Send an IPI to all processors, including this processor */ + HalpBroadcastIpiSpecifyVector(Vector, TRUE); + return; + } + + /* Check if all processors except the current one are requested */ + if (TargetSet == (ActiveProcessors & ~KeGetCurrentPrcb()->SetMember)) + { + /* Send an IPI to all processors, excluding this processor */ + HalpBroadcastIpiSpecifyVector(Vector, FALSE); + return; + } + + /* Loop while we have more processors */ + RemainingSet = TargetSet; + while (RemainingSet != 0) + { + NT_VERIFY(BitScanForwardAffinity(&ProcessorIndex, RemainingSet) != 0); + ASSERT(ProcessorIndex < KeNumberProcessors); + SetMember = AFFINITY_MASK(ProcessorIndex); + RemainingSet &= ~SetMember; + + /* Send the interrupt to the target processor */ + LApicId = HalpProcessorIdentity[ProcessorIndex].LapicId; + ApicRequestGlobalInterrupt(LApicId, + Vector, + APIC_MT_Fixed, + APIC_TGM_Edge, + APIC_DSH_Destination); + } +} + +/*! + * \brief Requests an IPI interrupt on the specified processors. + * + * \param TargetSet - Specifies the set of processors to send the IPI to. + */ +VOID +NTAPI +HalpRequestIpi( + _In_ KAFFINITY TargetSet) +{ + /* Request the IPI vector */ + HalRequestIpiSpecifyVector(TargetSet, APIC_IPI_VECTOR); +} + +#ifdef _M_AMD64 + +/*! + * \brief Requests a software interrupt on the specified processors. + * + * \param TargetSet - Specifies the set of processors to send the IPI to. + * \param Irql - Specifies the IRQL of the software interrupt. + */ +VOID +NTAPI +HalpSendSoftwareInterrupt( + _In_ KAFFINITY TargetSet, + _In_ KIRQL Irql) +{ + UCHAR Vector; + + /* Get the vector for the requested IRQL */ + if (Irql == APC_LEVEL) + { + Vector = APC_VECTOR; + } + else if (Irql == DISPATCH_LEVEL) + { + Vector = DISPATCH_VECTOR; + } + else + { + ASSERT(FALSE); + return; + } + + /* Request the IPI with the specified vector */ + HalRequestIpiSpecifyVector(TargetSet, Vector); +} + +/*! + * \brief Requests an NMI interrupt on the specified processors. + * + * \param TargetSet - Specifies the set of processors to send the IPI to. + */ +VOID +NTAPI +HalpSendNMI( + _In_ KAFFINITY TargetSet) +{ + KAFFINITY RemainingSet, SetMember; + ULONG ProcessorIndex; + ULONG LApicId; + + /* Make sure we do not send an NMI to ourselves */ + ASSERT((TargetSet & ~KeGetCurrentPrcb()->SetMember) == 0); + + /* Loop while we have more processors */ + RemainingSet = TargetSet; + while (RemainingSet != 0) + { + NT_VERIFY(BitScanForwardAffinity(&ProcessorIndex, RemainingSet) != 0); + ASSERT(ProcessorIndex < KeNumberProcessors); + SetMember = AFFINITY_MASK(ProcessorIndex); + RemainingSet &= ~SetMember; + + /* Send and NMI to the target processor */ + LApicId = HalpProcessorIdentity[ProcessorIndex].LapicId; + ApicRequestGlobalInterrupt(LApicId, + 0, + APIC_MT_NMI, + APIC_TGM_Edge, + APIC_DSH_Destination); + } +} + +#endif // _M_AMD64 diff --git a/hal/halx86/generic/up.c b/hal/halx86/generic/up.c index a7162774d89..dd60cc1cffb 100644 --- a/hal/halx86/generic/up.c +++ b/hal/halx86/generic/up.c @@ -32,3 +32,22 @@ HalStartNextProcessor( /* Always return false on UP systems */ return FALSE; } + +#ifdef _M_AMD64 + +VOID +NTAPI +HalSendNMI( + _In_ KAFFINITY TargetSet) +{ +} + +VOID +NTAPI +HalSendSoftwareInterrupt( + _In_ KAFFINITY TargetSet, + _In_ KIRQL Irql) +{ +} + +#endif // _M_AMD64 diff --git a/hal/halx86/include/smp.h b/hal/halx86/include/smp.h index 86b1ded5f77..d35189801c5 100644 --- a/hal/halx86/include/smp.h +++ b/hal/halx86/include/smp.h @@ -7,6 +7,15 @@ #pragma once +#define AFFINITY_MASK(Id) ((KAFFINITY)1 << (Id)) + +/* Helper to find the lowest CPU in a KAFFINITY */ +#ifdef _WIN64 +#define BitScanForwardAffinity BitScanForward64 +#else +#define BitScanForwardAffinity BitScanForward +#endif + /* This table is filled for each physical processor on system */ typedef struct _PROCESSOR_IDENTITY { @@ -53,3 +62,32 @@ VOID NTAPI HalpRequestIpi( _In_ KAFFINITY TargetProcessors); + +VOID +NTAPI +HalpBroadcastIpiSpecifyVector( + _In_ UCHAR Vector, + _In_ BOOLEAN IncludeSelf); + +VOID +NTAPI +HalRequestIpiSpecifyVector( + _In_ KAFFINITY TargetSet, + _In_ UCHAR Vector); + +#ifdef _M_AMD64 + +NTHALAPI +VOID +NTAPI +HalpSendNMI( + _In_ KAFFINITY TargetSet); + +NTHALAPI +VOID +NTAPI +HalpSendSoftwareInterrupt( + _In_ KAFFINITY TargetSet, + _In_ KIRQL Irql); + +#endif // _M_AMD64 diff --git a/hal/halx86/smp/ipi.c b/hal/halx86/smp/ipi.c index b215508c622..a2411961dae 100644 --- a/hal/halx86/smp/ipi.c +++ b/hal/halx86/smp/ipi.c @@ -22,3 +22,27 @@ HalRequestIpi( { HalpRequestIpi(TargetProcessors); } + +#ifdef _M_AMD64 + +VOID +NTAPI +HalSendNMI( + _In_ KAFFINITY TargetSet) +{ + HalpSendNMI(TargetSet); +} + +// See: +// - https://www.virtualbox.org/browser/vbox/trunk/src/VBox/Runtime/r0drv/nt/int… +// https://github.com/mirror/vbox/blob/b9657cd5351cf17432b664009cc25bb480dc64c… +VOID +NTAPI +HalSendSoftwareInterrupt( + _In_ KAFFINITY TargetSet, + _In_ KIRQL Irql) +{ + HalpSendSoftwareInterrupt(TargetSet, Irql); +} + +#endif // _M_AMD64 diff --git a/sdk/include/ndk/halfuncs.h b/sdk/include/ndk/halfuncs.h index 2c4b56075ad..d5bb1aae56d 100644 --- a/sdk/include/ndk/halfuncs.h +++ b/sdk/include/ndk/halfuncs.h @@ -192,6 +192,23 @@ HalRequestSoftwareInterrupt( _In_ KIRQL SoftwareInterruptRequested ); +#ifdef _M_AMD64 + +NTHALAPI +VOID +NTAPI +HalSendNMI( + _In_ KAFFINITY TargetSet); + +NTHALAPI +VOID +NTAPI +HalSendSoftwareInterrupt( + _In_ KAFFINITY TargetSet, + _In_ KIRQL Irql); + +#endif // _M_AMD64 + NTHALAPI VOID NTAPI

1 0

[reactos] 01/01: [SHELL32][SDK][SHELL32_APITEST] Add PathIsTemporaryA/W (#6067)
by Katayama Hirofumi MZ 02 Dec '23

02 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bccb6e6c93df7566c726… commit 4bccb6e6c93df7566c7266e56cfbb66eece86191 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 2 23:07:28 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 2 23:07:28 2023 +0900 [SHELL32][SDK][SHELL32_APITEST] Add PathIsTemporaryA/W (#6067) - Implement PathIsTemporaryA and PathIsTemporaryW functions. - Add them to <undocshell.h>. - Add PathIsTemporary testcase. CORE-19278 --- dll/win32/shell32/wine/shellord.c | 45 +++++++++++++++++ modules/rostests/apitests/shell32/CMakeLists.txt | 1 + .../rostests/apitests/shell32/PathIsTemporary.cpp | 57 ++++++++++++++++++++++ modules/rostests/apitests/shell32/testlist.c | 2 + sdk/include/reactos/undocshell.h | 3 ++ 5 files changed, 108 insertions(+) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index 51cbd9e8218..f000f9030e7 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -47,6 +47,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pidl); #ifdef __REACTOS__ #include <comctl32_undoc.h> +#include <shlwapi_undoc.h> #else /* FIXME: !!! move CREATEMRULIST and flags to header file !!! */ /* !!! it is in both here and comctl32undoc.c !!! */ @@ -1918,19 +1919,63 @@ BOOL WINAPI GUIDFromStringW(LPCWSTR str, LPGUID guid) /************************************************************************* * PathIsTemporaryA [SHELL32.713] */ +#ifdef __REACTOS__ +/** @see https://undoc.airesoft.co.uk/shell32.dll/PathIsTemporaryA.php */ +BOOL WINAPI PathIsTemporaryA(_In_ LPCSTR Str) +#else BOOL WINAPI PathIsTemporaryA(LPSTR Str) +#endif { +#ifdef __REACTOS__ + WCHAR szWide[MAX_PATH]; + + TRACE("(%s)\n", debugstr_a(Str)); + + SHAnsiToUnicode(Str, szWide, _countof(szWide)); + return PathIsTemporaryW(szWide); +#else FIXME("(%s)stub\n", debugstr_a(Str)); return FALSE; +#endif } /************************************************************************* * PathIsTemporaryW [SHELL32.714] */ +#ifdef __REACTOS__ +/** @see https://undoc.airesoft.co.uk/shell32.dll/PathIsTemporaryW.php */ +BOOL WINAPI PathIsTemporaryW(_In_ LPCWSTR Str) +#else BOOL WINAPI PathIsTemporaryW(LPWSTR Str) +#endif { +#ifdef __REACTOS__ + WCHAR szLongPath[MAX_PATH], szTempPath[MAX_PATH]; + DWORD attrs; + LPCWSTR pszTarget = Str; + + TRACE("(%s)\n", debugstr_w(Str)); + + attrs = GetFileAttributesW(Str); + if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_TEMPORARY)) + return TRUE; + + if (!GetTempPathW(_countof(szTempPath), szTempPath) || + !GetLongPathNameW(szTempPath, szTempPath, _countof(szTempPath))) + { + return FALSE; + } + + if (GetLongPathNameW(Str, szLongPath, _countof(szLongPath))) + pszTarget = szLongPath; + + return (PathIsEqualOrSubFolder(szTempPath, pszTarget) || + PathIsEqualOrSubFolder(UlongToPtr(CSIDL_INTERNET_CACHE), pszTarget) || + PathIsEqualOrSubFolder(UlongToPtr(CSIDL_CDBURN_AREA), pszTarget)); +#else FIXME("(%s)stub\n", debugstr_w(Str)); return FALSE; +#endif } typedef struct _PSXA diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 82c1eeea279..0c62b2ed6a0 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -20,6 +20,7 @@ list(APPEND SOURCE IShellFolderViewCB.cpp OpenAs_RunDLL.cpp PathIsEqualOrSubFolder.cpp + PathIsTemporary.cpp PathResolve.cpp SHAppBarMessage.cpp SHChangeNotify.cpp diff --git a/modules/rostests/apitests/shell32/PathIsTemporary.cpp b/modules/rostests/apitests/shell32/PathIsTemporary.cpp new file mode 100644 index 00000000000..5600e7a1bfa --- /dev/null +++ b/modules/rostests/apitests/shell32/PathIsTemporary.cpp @@ -0,0 +1,57 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Tests for PathIsTemporaryA/W + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "shelltest.h" +#include <undocshell.h> + +static void Test_PathIsTemporaryA(void) +{ + CHAR szPath[MAX_PATH]; + ok_int(PathIsTemporaryA("C:\\"), FALSE); + ok_int(PathIsTemporaryA("C:\\TestTestTest"), FALSE); + + GetWindowsDirectoryA(szPath, _countof(szPath)); + ok_int(PathIsTemporaryA(szPath), FALSE); + + GetTempPathA(_countof(szPath), szPath); + ok_int(PathIsTemporaryA(szPath), TRUE); + + PathAppendA(szPath, "TestTestTest"); + ok_int(PathIsTemporaryA(szPath), FALSE); + + CreateDirectoryA(szPath, NULL); + ok_int(PathIsTemporaryA(szPath), TRUE); + + RemoveDirectoryA(szPath); +} + +static void Test_PathIsTemporaryW(void) +{ + WCHAR szPath[MAX_PATH]; + ok_int(PathIsTemporaryW(L"C:\\"), FALSE); + ok_int(PathIsTemporaryW(L"C:\\TestTestTest"), FALSE); + + GetWindowsDirectoryW(szPath, _countof(szPath)); + ok_int(PathIsTemporaryW(szPath), FALSE); + + GetTempPathW(_countof(szPath), szPath); + ok_int(PathIsTemporaryW(szPath), TRUE); + + PathAppendW(szPath, L"TestTestTest"); + ok_int(PathIsTemporaryW(szPath), FALSE); + + CreateDirectoryW(szPath, NULL); + ok_int(PathIsTemporaryW(szPath), TRUE); + + RemoveDirectoryW(szPath); +} + +START_TEST(PathIsTemporary) +{ + Test_PathIsTemporaryA(); + Test_PathIsTemporaryW(); +} diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 1a4952cfc17..265f58a5e83 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -22,6 +22,7 @@ extern void func_IShellFolderViewCB(void); extern void func_menu(void); extern void func_OpenAs_RunDLL(void); extern void func_PathIsEqualOrSubFolder(void); +extern void func_PathIsTemporary(void); extern void func_PathResolve(void); extern void func_SHAppBarMessage(void); extern void func_SHChangeNotify(void); @@ -59,6 +60,7 @@ const struct test winetest_testlist[] = { "menu", func_menu }, { "OpenAs_RunDLL", func_OpenAs_RunDLL }, { "PathIsEqualOrSubFolder", func_PathIsEqualOrSubFolder }, + { "PathIsTemporary", func_PathIsTemporary }, { "PathResolve", func_PathResolve }, { "SHAppBarMessage", func_SHAppBarMessage }, { "SHChangeNotify", func_SHChangeNotify }, diff --git a/sdk/include/reactos/undocshell.h b/sdk/include/reactos/undocshell.h index b768552f708..5d0689827f9 100644 --- a/sdk/include/reactos/undocshell.h +++ b/sdk/include/reactos/undocshell.h @@ -500,6 +500,9 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); BOOL WINAPI PathIsEqualOrSubFolder(_In_ LPCWSTR pszFile1OrCSIDL, _In_ LPCWSTR pszFile2); +BOOL WINAPI PathIsTemporaryA(_In_ LPCSTR Str); +BOOL WINAPI PathIsTemporaryW(_In_ LPCWSTR Str); + /**************************************************************************** * Shell File Operations error codes - SHFileOperationA/W */

1 0

[reactos] 01/01: [URL] Add icon resource for .url files (#6081)
by Whindmar Saksit 02 Dec '23

02 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f31f9facc925621150739… commit f31f9facc92562115073917fdc5432d2abb8e8ea Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sat Dec 2 12:38:09 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 2 12:38:09 2023 +0100 [URL] Add icon resource for .url files (#6081) Otherwise, the registration for .url files and the http/https protocols point to a missing icon in url.dll. --- dll/win32/url/CMakeLists.txt | 10 +++++++++- dll/win32/url/res/102.ico | Bin 0 -> 22486 bytes dll/win32/url/url.rc | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt index 6ccecd52884..834b7ba87df 100644 --- a/dll/win32/url/CMakeLists.txt +++ b/dll/win32/url/CMakeLists.txt @@ -8,7 +8,15 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/url_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/url.def) -add_library(url MODULE ${SOURCE}) +list(APPEND url_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/res/102.ico) + +set_source_files_properties(url.rc PROPERTIES OBJECT_DEPENDS "${url_rc_deps}") + +add_library(url MODULE + ${SOURCE} + url.rc) + set_module_type(url win32dll) target_link_libraries(url wine) add_importlibs(url shell32 shlwapi msvcrt kernel32 ntdll) diff --git a/dll/win32/url/res/102.ico b/dll/win32/url/res/102.ico new file mode 100644 index 00000000000..d42b5f112ce Binary files /dev/null and b/dll/win32/url/res/102.ico differ diff --git a/dll/win32/url/url.rc b/dll/win32/url/url.rc new file mode 100644 index 00000000000..e64407d5643 --- /dev/null +++ b/dll/win32/url/url.rc @@ -0,0 +1 @@ +102 ICON "res/102.ico"

1 0

[reactos] 01/01: [CRYPTUI] Update Romanian (ro-RO) translation (#6077)
by Andrei Miloiu 01 Dec '23

01 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cf6ce6b5a130bbe42c53… commit 1cf6ce6b5a130bbe42c533f495056ce1b62f2299 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 1 16:43:58 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 15:43:58 2023 +0100 [CRYPTUI] Update Romanian (ro-RO) translation (#6077) --- dll/win32/cryptui/lang/cryptui_Ro.rc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dll/win32/cryptui/lang/cryptui_Ro.rc b/dll/win32/cryptui/lang/cryptui_Ro.rc index 12deea92308..56a87254b23 100644 --- a/dll/win32/cryptui/lang/cryptui_Ro.rc +++ b/dll/win32/cryptui/lang/cryptui_Ro.rc @@ -4,7 +4,8 @@ * Copyright 2008 Juan Lang * Copyright 2010 Claudia Cotună * Michael Stefaniuc - * 2014 Ștefan Fulea + * Copyright 2014 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -68,7 +69,7 @@ STRINGTABLE IDS_CERTIFICATE_PURPOSE_EXISTS "OID introdus există deja." IDS_SELECT_STORE_TITLE "Selectare depozit de certificate" IDS_SELECT_STORE "Selectați un depozit de certificate." - IDS_IMPORT_WIZARD "Asistent de importare a certificatelor" + IDS_IMPORT_WIZARD "Expert de importare a certificatelor" IDS_IMPORT_TYPE_MISMATCH "Fișierul conține obiecte care nu respectă criteriile date. Selectați alt fișier." IDS_IMPORT_FILE_TITLE "Importare fișier" IDS_IMPORT_FILE_SUBTITLE "Specificați fișierul pe care doriți să-l importați." @@ -130,7 +131,7 @@ STRINGTABLE IDS_PURPOSE_CTL_USAGE_SIGNING "Vă permite să semnați digital o listă de certificate acreditate" IDS_PURPOSE_EFS "Permite criptarea datelor de pe disc" IDS_PURPOSE_EFS_RECOVERY "Recupererea fișierelor" - IDS_PURPOSE_WHQL "Verificarea modulelor-pilot din Windows" + IDS_PURPOSE_WHQL "Verificarea driverelor din Windows" IDS_PURPOSE_NT5 "Verificarea componentelor de sistem din Windows" IDS_PURPOSE_OEM_WHQL "Verificarea componentelor de sistem din Windows OEM" IDS_PURPOSE_EMBEDDED_NT "Verificarea componentelor de sistem din Windows Embedded" @@ -147,7 +148,7 @@ STRINGTABLE IDS_PURPOSE_CA_EXCHANGE "Arhivare chei private" IDS_PURPOSE_KEY_RECOVERY_AGENT "Agent recuperare chei" IDS_PURPOSE_DS_EMAIL_REPLICATION "Serviciu Registru pentru replicare email" - IDS_EXPORT_WIZARD "Asistent de exportare a certificatelor" + IDS_EXPORT_WIZARD "Expert de exportare a certificatelor" IDS_EXPORT_FORMAT_TITLE "Format pentru exportare" IDS_EXPORT_FORMAT_SUBTITLE "Alegeți formatul în care va fi salvat conținutul." IDS_EXPORT_FILE_TITLE "Nume de fișier pentru exportare"

1 0

[reactos] 01/01: [OPENGLCFG] Update Romanian (ro-RO) translation (#6073)
by Andrei Miloiu 01 Dec '23

01 Dec '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c1dacc0c674ec90cc716… commit 2c1dacc0c674ec90cc716f69444b5a45fc343506 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 1 16:40:13 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 15:40:13 2023 +0100 [OPENGLCFG] Update Romanian (ro-RO) translation (#6073) Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/cpl/openglcfg/lang/ro-RO.rc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/cpl/openglcfg/lang/ro-RO.rc b/dll/cpl/openglcfg/lang/ro-RO.rc index f5bb6802f7d..76dde167ff7 100644 --- a/dll/cpl/openglcfg/lang/ro-RO.rc +++ b/dll/cpl/openglcfg/lang/ro-RO.rc @@ -1,4 +1,10 @@ -// COYPRIGHT: Ștefan Fulea <stefan.fulea(a)mail.com> +/* + * PROJECT: ReactOS OpenGL Configuration Control Panel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -11,7 +17,7 @@ BEGIN GROUPBOX "Opțiuni de redare", -1, 5, 25, 230, 90 LTEXT "&Motor de redare:", -1, 15, 42, 65, 10 COMBOBOX IDC_RENDERER, 80, 40, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Acesta va înlocui configurația implicită pentru modulul-pilot grafic! Alegeți „Implicit” pentru a reveni la configurația originală.", -1, 15, 60, 210, 40 + LTEXT "Acesta va înlocui configurația implicită pentru driverul grafic! Alegeți „Implicit” pentru a reveni la configurația originală.", -1, 15, 60, 210, 40 GROUPBOX "Depanare", -1, 5, 125, 230, 90 LTEXT "DEBUGCHANNEL:", -1, 15, 142, 65, 10 COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST @@ -26,5 +32,5 @@ BEGIN IDS_CPLDESCRIPTION "Configurează motorul de redare OpenGL." IDS_DEBUG_SET "instituie" IDS_DEBUG_CLEAR "destituie" - IDS_DEBUG_DNM "nu modificați" + IDS_DEBUG_DNM "nu modifica" END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs