Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/05: [WIN32SS:NTUSER] Move the keyboard layout debugging code to a separate dump function.
by Hermès Bélusca-Maïto 18 Sep '21

18 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69f905081c1d6537030c6… commit 69f905081c1d6537030c6c30c7c495fd1cc27603 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Sep 19 00:08:24 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 19 00:18:04 2021 +0200 [WIN32SS:NTUSER] Move the keyboard layout debugging code to a separate dump function. And fix its obvious bugs, e.g. not checking for possible NULL pointers for the optional keyboard layout sub-tables... --- win32ss/user/ntuser/kbdlayout.c | 153 +++++++++++++++++++++++++++------------- 1 file changed, 103 insertions(+), 50 deletions(-) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index f47ece5cbad..2a5fa212e36 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -27,6 +27,106 @@ typedef PVOID (*PFN_KBDLAYERDESCRIPTOR)(VOID); /* PRIVATE FUNCTIONS ******************************************************/ +#if DBG + +static VOID +DumpKbdLayout( + IN PKBDTABLES pKbdTbl) +{ + PVK_TO_BIT pVkToBit; + PVK_TO_WCHAR_TABLE pVkToWchTbl; + PVSC_VK pVscVk; + ULONG i; + + DbgPrint("Kbd layout: fLocaleFlags %x bMaxVSCtoVK %x\n", + pKbdTbl->fLocaleFlags, pKbdTbl->bMaxVSCtoVK); + DbgPrint("wMaxModBits %x\n", + pKbdTbl->pCharModifiers ? pKbdTbl->pCharModifiers->wMaxModBits + : 0); + + if (pKbdTbl->pCharModifiers) + { + pVkToBit = pKbdTbl->pCharModifiers->pVkToBit; + if (pVkToBit) + { + for (; pVkToBit->Vk; ++pVkToBit) + { + DbgPrint("VkToBit %x -> %x\n", pVkToBit->Vk, pVkToBit->ModBits); + } + } + + for (i = 0; i <= pKbdTbl->pCharModifiers->wMaxModBits; ++i) + { + DbgPrint("ModNumber %x -> %x\n", i, pKbdTbl->pCharModifiers->ModNumber[i]); + } + } + + pVkToWchTbl = pKbdTbl->pVkToWcharTable; + if (pVkToWchTbl) + { + for (; pVkToWchTbl->pVkToWchars; ++pVkToWchTbl) + { + PVK_TO_WCHARS1 pVkToWch = pVkToWchTbl->pVkToWchars; + + DbgPrint("pVkToWchTbl nModifications %x cbSize %x\n", + pVkToWchTbl->nModifications, pVkToWchTbl->cbSize); + if (pVkToWch) + { + while (pVkToWch->VirtualKey) + { + DbgPrint("pVkToWch VirtualKey %x Attributes %x wc { ", + pVkToWch->VirtualKey, pVkToWch->Attributes); + for (i = 0; i < pVkToWchTbl->nModifications; ++i) + { + DbgPrint("%x ", pVkToWch->wch[i]); + } + DbgPrint("}\n"); + pVkToWch = (PVK_TO_WCHARS1)(((PBYTE)pVkToWch) + pVkToWchTbl->cbSize); + } + } + } + } + +// TODO: DeadKeys, KeyNames, KeyNamesExt, KeyNamesDead + + DbgPrint("pusVSCtoVK: { "); + if (pKbdTbl->pusVSCtoVK) + { + for (i = 0; i < pKbdTbl->bMaxVSCtoVK; ++i) + { + DbgPrint("%x -> %x, ", i, pKbdTbl->pusVSCtoVK[i]); + } + } + DbgPrint("}\n"); + + DbgPrint("pVSCtoVK_E0: { "); + pVscVk = pKbdTbl->pVSCtoVK_E0; + if (pVscVk) + { + for (; pVscVk->Vsc; ++pVscVk) + { + DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); + } + } + DbgPrint("}\n"); + + DbgPrint("pVSCtoVK_E1: { "); + pVscVk = pKbdTbl->pVSCtoVK_E1; + if (pVscVk) + { + for (; pVscVk->Vsc; ++pVscVk) + { + DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); + } + } + DbgPrint("}\n"); + +// TODO: Ligatures +} + +#endif // DBG + + /* * UserLoadKbdDll * @@ -67,56 +167,9 @@ UserLoadKbdDll(WCHAR *pwszLayoutPath, return FALSE; } -#if 0 /* Dump keyboard layout */ - { - unsigned i; - PVK_TO_BIT pVkToBit = (*pKbdTables)->pCharModifiers->pVkToBit; - PVK_TO_WCHAR_TABLE pVkToWchTbl = (*pKbdTables)->pVkToWcharTable; - PVSC_VK pVscVk = (*pKbdTables)->pVSCtoVK_E0; - DbgPrint("Kbd layout: fLocaleFlags %x bMaxVSCtoVK %x\n", (*pKbdTables)->fLocaleFlags, (*pKbdTables)->bMaxVSCtoVK); - DbgPrint("wMaxModBits %x\n", (*pKbdTables)->pCharModifiers->wMaxModBits); - while (pVkToBit->Vk) - { - DbgPrint("VkToBit %x -> %x\n", pVkToBit->Vk, pVkToBit->ModBits); - ++pVkToBit; - } - for (i = 0; i <= (*pKbdTables)->pCharModifiers->wMaxModBits; ++i) - DbgPrint("ModNumber %x -> %x\n", i, (*pKbdTables)->pCharModifiers->ModNumber[i]); - while (pVkToWchTbl->pVkToWchars) - { - PVK_TO_WCHARS1 pVkToWch = pVkToWchTbl->pVkToWchars; - DbgPrint("pVkToWchTbl nModifications %x cbSize %x\n", pVkToWchTbl->nModifications, pVkToWchTbl->cbSize); - while (pVkToWch->VirtualKey) - { - DbgPrint("pVkToWch VirtualKey %x Attributes %x wc { ", pVkToWch->VirtualKey, pVkToWch->Attributes); - for (i = 0; i < pVkToWchTbl->nModifications; ++i) - DbgPrint("%x ", pVkToWch->wch[i]); - DbgPrint("}\n"); - pVkToWch = (PVK_TO_WCHARS1)(((PBYTE)pVkToWch) + pVkToWchTbl->cbSize); - } - ++pVkToWchTbl; - } - DbgPrint("pusVSCtoVK: { "); - for (i = 0; i < (*pKbdTables)->bMaxVSCtoVK; ++i) - DbgPrint("%x -> %x, ", i, (*pKbdTables)->pusVSCtoVK[i]); - DbgPrint("}\n"); - DbgPrint("pVSCtoVK_E0: { "); - while (pVscVk->Vsc) - { - DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); - ++pVscVk; - } - DbgPrint("}\n"); - pVscVk = (*pKbdTables)->pVSCtoVK_E1; - DbgPrint("pVSCtoVK_E1: { "); - while (pVscVk->Vsc) - { - DbgPrint("%x -> %x, ", pVscVk->Vsc, pVscVk->Vk); - ++pVscVk; - } - DbgPrint("}\n"); - DbgBreakPoint(); - } +#if 0 && DBG + /* Dump keyboard layout */ + DumpKbdLayout(*pKbdTables); #endif return TRUE;

1 0

[reactos] 04/05: [BOOTDATA] Fix "DllName" casing.
by Hermès Bélusca-Maïto 18 Sep '21

18 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e34a799f0c158bd23d0e9… commit e34a799f0c158bd23d0e98347e4f1b85c0f6549d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 17 18:59:16 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 19 00:17:05 2021 +0200 [BOOTDATA] Fix "DllName" casing. --- boot/bootdata/hivesft.inf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 8506712db0b..622c302cdb0 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -1509,18 +1509,18 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultUserName",0 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon","DefaultPassword",0x00000000,"" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","DllName",0x00020000,"wlnotify.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Lock",0x00000000,"SCardSuspendCertProp" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Logoff",0x00000000,"SCardStopCertProp" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Logon",0x00000000,"SCardStartCertProp" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\ScCertProp","Unlock",0x00000000,"SCardResumeCertProp" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","DllName",0x00020000,"wlnotify.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","Logoff",0x00000000,"SchedEventLogoff" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\Schedule","StartShell",0x00000000,"SchedStartShell" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Disconnect",0x00000000,"SensDisconnectEvent" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","DllName",0x00020000,"wlnotify.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Lock",0x00000000,"SensLockEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Logoff",0x00000000,"SensLogoffEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Logon",0x00000000,"SensLogonEvent" @@ -1534,7 +1534,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","St HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\SensLogn","Unlock",0x00000000,"SensUnlockEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Disconnect",0x00000000,"TSEventDisconnect" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","DllName",0x00020000,"wlnotify.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Logoff",0x00000000,"TSEventLogoff" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Logon",0x00000000,"TSEventLogon" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","PostShell",0x00000000,"TSEventPostShell" @@ -1543,7 +1543,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Shu HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","StartShell",0x00000000,"TSEventStartShell" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\termsrv","Startup",0x00000000,"TSEventStartup" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon",,0x00000012 -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","DlLName",0x00020000,"wlnotify.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","DllName",0x00020000,"wlnotify.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","Logoff",0x00000000,"UnregisterTicketExpiredNotificationEvent" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Notify\wlballoon","Logon",0x00000000,"RegisterTicketExpiredNotificationEvent"

1 0

[reactos] 03/05: [BROWSEUI] CAutoComplete::OnAutoCompStart(): Wait on the thread only when there is a handle.
by Hermès Bélusca-Maïto 18 Sep '21

18 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f8a10f32b0ce06e8cd2f… commit 5f8a10f32b0ce06e8cd2f1d445272bd790ebc670 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 17 19:16:02 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 19 00:17:05 2021 +0200 [BROWSEUI] CAutoComplete::OnAutoCompStart(): Wait on the thread only when there is a handle. Avoids spamming (ntoskrnl\ob\obwait.c:441) Failed to reference the handle with status 0xc0000008 CAutoComplete::FinishCompletion(): Remove two useless 'if (m_pThread || !m_hThread)' tests: No need to check these after each code instruction... --- dll/win32/browseui/CAutoComplete.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index 2b33198a5fe..6ff30edcefc 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -2092,13 +2092,16 @@ LRESULT CAutoComplete::OnAutoCompStart(UINT uMsg, WPARAM wParam, LPARAM lParam, delete pOld; BOOL bDoStart = FALSE; - DWORD dwWait = WaitForSingleObject(m_hThread, 0); - if (dwWait != WAIT_TIMEOUT) + if (m_hThread) { - CloseHandle(m_hThread); - bDoStart = TRUE; + if (WaitForSingleObject(m_hThread, 0) != WAIT_TIMEOUT) + { + CloseHandle(m_hThread); + m_hThread = NULL; + bDoStart = TRUE; + } } - else if (!m_hThread) + else { bDoStart = TRUE; } @@ -2131,15 +2134,9 @@ VOID CAutoComplete::FinishCompletion(PAC_THREAD pThread) if (!CanAutoSuggest() && !CanAutoAppend()) return; - if (m_pThread || !m_hThread) - return; - // set inner list m_innerList = pThread->m_innerList; - if (m_pThread || !m_hThread) - return; - // set the items of the virtual listview m_outerList = pThread->m_outerList; // FIXME: We need more speed! m_hwndList.SendMessageW(LVM_SETITEMCOUNT, m_outerList.GetSize(), 0);

1 0

[reactos] 02/05: [BROWSEUI] Fix early error handling, to be taken only when ParseNow() is run (and fixes "Use of uninitialized variable hr" RTC error). Addendum to commit d8e47d61.
by Hermès Bélusca-Maïto 18 Sep '21

18 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffc4febb0cda008e8f693… commit ffc4febb0cda008e8f693fc4d67c700bb7cb413f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 17 18:58:07 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 19 00:17:04 2021 +0200 [BROWSEUI] Fix early error handling, to be taken only when ParseNow() is run (and fixes "Use of uninitialized variable hr" RTC error). Addendum to commit d8e47d61. --- dll/win32/browseui/addresseditbox.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/addresseditbox.cpp b/dll/win32/browseui/addresseditbox.cpp index 4d7b3dc7c57..4e018cc5bc1 100644 --- a/dll/win32/browseui/addresseditbox.cpp +++ b/dll/win32/browseui/addresseditbox.cpp @@ -168,8 +168,8 @@ cleanup: if (pidlCurrent) ILFree(pidlCurrent); if (address != input) - delete [] address; - delete [] input; + delete[] address; + delete[] input; return hr; } @@ -192,19 +192,19 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Execute(long paramC) HRESULT hr; /* - * Parse the path is it wasn't parsed + * Parse the path if it wasn't parsed */ if (!pidlLastParsed) + { hr = ParseNow(0); - /* - * If the destination path doesn't exist then display an error message - */ - if (hr == HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) - return ShowFileNotFoundError(hr); + /* If the destination path doesn't exist then display an error message */ + if (hr == HRESULT_FROM_WIN32(ERROR_INVALID_DRIVE) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) + return ShowFileNotFoundError(hr); - if (!pidlLastParsed) - return E_FAIL; + if (!pidlLastParsed) + return E_FAIL; + } /* * Get the IShellBrowser and IBrowserService interfaces of the shell browser

1 0

[reactos] 01/05: [BROWSEUI] Minor formatting.
by Hermès Bélusca-Maïto 18 Sep '21

18 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6072ee976609ee5dd62d1… commit 6072ee976609ee5dd62d123330f22bddc52dc521 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 17 19:15:31 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 19 00:17:03 2021 +0200 [BROWSEUI] Minor formatting. --- dll/win32/browseui/CAutoComplete.cpp | 2 +- dll/win32/browseui/CAutoComplete.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dll/win32/browseui/CAutoComplete.cpp b/dll/win32/browseui/CAutoComplete.cpp index a6d6bc84817..2b33198a5fe 100644 --- a/dll/win32/browseui/CAutoComplete.cpp +++ b/dll/win32/browseui/CAutoComplete.cpp @@ -783,7 +783,7 @@ VOID CAutoComplete::SelectItem(INT iItem) m_hwndList.EnsureVisible(iItem, FALSE); } -VOID CAutoComplete::DoAutoAppend(AC_THREAD *pThread) +VOID CAutoComplete::DoAutoAppend(PAC_THREAD pThread) { if (!CanAutoAppend()) // can we auto-append? return; // don't append diff --git a/dll/win32/browseui/CAutoComplete.h b/dll/win32/browseui/CAutoComplete.h index 586a878d154..af3bddabde7 100644 --- a/dll/win32/browseui/CAutoComplete.h +++ b/dll/win32/browseui/CAutoComplete.h @@ -219,7 +219,8 @@ protected: WNDPROC m_fnOldEditProc; // old textbox procedure EDITWORDBREAKPROCW m_fnOldWordBreakProc; HANDLE m_hThread; - AC_THREAD *m_pThread; + PAC_THREAD m_pThread; + // The following variables are non-POD: CStringW m_strText; // internal text (used in selecting item and reverting text) CStringW m_strStemText; // dirname + '\\' @@ -231,6 +232,7 @@ protected: CComPtr<IACList> m_pACList; // for IACList::Expand to update the list CSimpleArray<CStringW> m_innerList; // inner list CSimpleArray<CStringW> m_outerList; // outer list + // protected methods VOID UpdateDropDownState(); VOID CalcRects(BOOL bDowner, RECT& rcListView, RECT& rcScrollBar, RECT& rcSizeBox) const; @@ -241,6 +243,7 @@ protected: VOID ExtractInnerList(CSimpleArray<CStringW>& outerList, const CSimpleArray<CStringW>& innerList, const CString& strText); + // message map BEGIN_MSG_MAP(CAutoComplete) MESSAGE_HANDLER(AUTOCOMP_START, OnAutoCompStart) @@ -261,6 +264,7 @@ protected: MESSAGE_HANDLER(WM_TIMER, OnTimer) MESSAGE_HANDLER(WM_VSCROLL, OnVScroll) END_MSG_MAP() + // message handlers LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnNCDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);

1 0

[reactos] 01/01: [IMM32] Define Imm32HeapFree macro and use it (#3962)
by Katayama Hirofumi MZ 18 Sep '21

18 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b522667a66bc8c9313e2… commit 5b522667a66bc8c9313e206af4316df02c8fe716 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 19 01:52:05 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 19 01:52:05 2021 +0900 [IMM32] Define Imm32HeapFree macro and use it (#3962) - Define Imm32HeapFree macro in precomp.h and use it. - Omit some NULL checks (for HeapFree). CORE-11700 --- dll/win32/imm32/ime.c | 30 ++++++++++---------------- dll/win32/imm32/imm.c | 14 ++++++------ dll/win32/imm32/keymsg.c | 10 ++++----- dll/win32/imm32/nt3.c | 2 +- dll/win32/imm32/precomp.h | 3 +++ dll/win32/imm32/regword.c | 54 ++++++++++++++++------------------------------- dll/win32/imm32/utils.c | 4 ++-- 7 files changed, 45 insertions(+), 72 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 80a2c50f33c..75f538c5c91 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -221,7 +221,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) if (!Imm32LoadImeInfo(&ImeInfoEx, pImeDpiNew)) { - HeapFree(g_hImm32Heap, 0, pImeDpiNew); + Imm32HeapFree(pImeDpiNew); return FALSE; } @@ -236,7 +236,7 @@ PIMEDPI APIENTRY Ime32LoadImeDpi(HKL hKL, BOOL bLock) RtlLeaveCriticalSection(&g_csImeDpi); Imm32FreeImeDpi(pImeDpiNew, FALSE); - HeapFree(g_hImm32Heap, 0, pImeDpiNew); + Imm32HeapFree(pImeDpiNew); return pImeDpiFound; } else @@ -477,7 +477,7 @@ VOID WINAPI ImmUnlockImeDpi(PIMEDPI pImeDpi) } Imm32FreeImeDpi(pImeDpi, TRUE); - HeapFree(g_hImm32Heap, 0, pImeDpi); + Imm32HeapFree(pImeDpi); RtlLeaveCriticalSection(&g_csImeDpi); } @@ -1228,10 +1228,8 @@ ImmGetConversionListA(HKL hKL, HIMC hIMC, LPCSTR pSrc, LPCANDIDATELIST lpDst, ret = CandidateListWideToAnsi(pCL, lpDst, dwBufLen, CP_ACP); Quit: - if (pszSrcW) - HeapFree(g_hImm32Heap, 0, pszSrcW); - if (pCL) - HeapFree(g_hImm32Heap, 0, pCL); + Imm32HeapFree(pszSrcW); + Imm32HeapFree(pCL); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -1285,10 +1283,8 @@ ImmGetConversionListW(HKL hKL, HIMC hIMC, LPCWSTR pSrc, LPCANDIDATELIST lpDst, ret = CandidateListAnsiToWide(pCL, lpDst, dwBufLen, CP_ACP); Quit: - if (pszSrcA) - HeapFree(g_hImm32Heap, 0, pszSrcA); - if (pCL) - HeapFree(g_hImm32Heap, 0, pCL); + Imm32HeapFree(pszSrcA); + Imm32HeapFree(pCL); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -1429,10 +1425,8 @@ DoIt: SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0); Quit: - if (RegWordW.lpReading) - HeapFree(g_hImm32Heap, 0, RegWordW.lpReading); - if (RegWordW.lpWord) - HeapFree(g_hImm32Heap, 0, RegWordW.lpWord); + Imm32HeapFree(RegWordW.lpReading); + Imm32HeapFree(RegWordW.lpWord); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -1488,10 +1482,8 @@ DoIt: SendMessageW(hWnd, WM_IME_SYSTEM, 0x1A, 0); Quit: - if (RegWordA.lpReading) - HeapFree(g_hImm32Heap, 0, RegWordA.lpReading); - if (RegWordA.lpWord) - HeapFree(g_hImm32Heap, 0, RegWordA.lpWord); + Imm32HeapFree(RegWordA.lpReading); + Imm32HeapFree(RegWordA.lpWord); ImmUnlockImeDpi(pImeDpi); return ret; } diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 6092b354d74..0351cdae680 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -321,7 +321,7 @@ HIMC WINAPI ImmCreateContext(void) hIMC = NtUserCreateInputContext(pClientImc); if (hIMC == NULL) { - HeapFree(g_hImm32Heap, 0, pClientImc); + Imm32HeapFree(pClientImc); return NULL; } @@ -464,7 +464,7 @@ PCLIENTIMC WINAPI ImmLockClientImc(HIMC hImc) if (!NtUserUpdateInputContext(hImc, 0, pClientImc)) { - HeapFree(g_hImm32Heap, 0, pClientImc); + Imm32HeapFree(pClientImc); return NULL; } @@ -499,7 +499,7 @@ VOID WINAPI ImmUnlockClientImc(PCLIENTIMC pClientImc) LocalFree(hImc); RtlDeleteCriticalSection(&pClientImc->cs); - HeapFree(g_hImm32Heap, 0, pClientImc); + Imm32HeapFree(pClientImc); } static HIMC APIENTRY Imm32GetContextEx(HWND hWnd, DWORD dwContextFlags) @@ -867,10 +867,8 @@ HKL WINAPI ImmInstallIMEA(LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) hKL = ImmInstallIMEW(pszFileNameW, pszLayoutTextW); Quit: - if (pszFileNameW) - HeapFree(g_hImm32Heap, 0, pszFileNameW); - if (pszLayoutTextW) - HeapFree(g_hImm32Heap, 0, pszLayoutTextW); + Imm32HeapFree(pszFileNameW); + Imm32HeapFree(pszLayoutTextW); return hKL; } @@ -1183,7 +1181,7 @@ BOOL WINAPI ImmEnumInputContext(DWORD dwThreadId, IMCENUMPROC lpfn, LPARAM lPara break; } - HeapFree(g_hImm32Heap, 0, phList); + Imm32HeapFree(phList); return ret; } diff --git a/dll/win32/imm32/keymsg.c b/dll/win32/imm32/keymsg.c index 6c5ad757db6..69a26aed9be 100644 --- a/dll/win32/imm32/keymsg.c +++ b/dll/win32/imm32/keymsg.c @@ -497,8 +497,7 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) } Quit: - if (pTrans) - HeapFree(g_hImm32Heap, 0, pTrans); + Imm32HeapFree(pTrans); if (hMsgBuf) ImmUnlockIMCC(hMsgBuf); pIC->dwNumMsgBuf = 0; /* done */ @@ -557,8 +556,8 @@ Imm32PostMessages(HWND hwnd, HIMC hIMC, DWORD dwCount, LPTRANSMSG lpTransMsg) } #ifdef IMM_NT3_SUPPORT - if (pNewTransMsg && pNewTransMsg != lpTransMsg) - HeapFree(g_hImm32Heap, 0, pNewTransMsg); + if (pNewTransMsg != lpTransMsg) + Imm32HeapFree(pNewTransMsg); #endif } @@ -678,8 +677,7 @@ BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lKeyD } Quit: - if (pList) - HeapFree(g_hImm32Heap, 0, pList); + Imm32HeapFree(pList); ImmUnlockImeDpi(pImeDpi); ImmUnlockIMC(hIMC); ImmReleaseContext(hwnd, hIMC); diff --git a/dll/win32/imm32/nt3.c b/dll/win32/imm32/nt3.c index 14171de8df2..e1e8b263311 100644 --- a/dll/win32/imm32/nt3.c +++ b/dll/win32/imm32/nt3.c @@ -166,7 +166,7 @@ DoDefault: } } - HeapFree(g_hImm32Heap, 0, pTempList); + Imm32HeapFree(pTempList); return ret; } diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index b96a9afa695..ecd05ca85f0 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -72,7 +72,10 @@ BOOL Imm32GetSystemLibraryPath(LPWSTR pszPath, DWORD cchPath, LPCWSTR pszFileNam VOID APIENTRY LogFontAnsiToWide(const LOGFONTA *plfA, LPLOGFONTW plfW); VOID APIENTRY LogFontWideToAnsi(const LOGFONTW *plfW, LPLOGFONTA plfA); PWND FASTCALL ValidateHwndNoErr(HWND hwnd); + LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); +#define Imm32HeapFree(lpData) HeapFree(g_hImm32Heap, 0, (lpData)) + LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL); diff --git a/dll/win32/imm32/regword.c b/dll/win32/imm32/regword.c index ceac66e8e38..8d9fa43fa3e 100644 --- a/dll/win32/imm32/regword.c +++ b/dll/win32/imm32/regword.c @@ -51,10 +51,8 @@ Imm32EnumWordProcA2W(LPCSTR pszReadingA, DWORD dwStyle, LPCSTR pszRegisterA, LPV lpEnumData->ret = ret; Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszRegisterW) - HeapFree(g_hImm32Heap, 0, pszRegisterW); + Imm32HeapFree(pszReadingW); + Imm32HeapFree(pszRegisterW); return ret; } @@ -83,10 +81,8 @@ Imm32EnumWordProcW2A(LPCWSTR pszReadingW, DWORD dwStyle, LPCWSTR pszRegisterW, L lpEnumData->ret = ret; Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszRegisterA) - HeapFree(g_hImm32Heap, 0, pszRegisterA); + Imm32HeapFree(pszReadingA); + Imm32HeapFree(pszRegisterA); return ret; } @@ -140,10 +136,8 @@ ImmEnumRegisterWordA(HKL hKL, REGISTERWORDENUMPROCA lpfnEnumProc, ret = EnumDataW2A.ret; Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszRegisterW) - HeapFree(g_hImm32Heap, 0, pszRegisterW); + Imm32HeapFree(pszReadingW); + Imm32HeapFree(pszRegisterW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -198,10 +192,8 @@ ImmEnumRegisterWordW(HKL hKL, REGISTERWORDENUMPROCW lpfnEnumProc, ret = EnumDataA2W.ret; Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszRegisterA) - HeapFree(g_hImm32Heap, 0, pszRegisterA); + Imm32HeapFree(pszReadingA); + Imm32HeapFree(pszRegisterA); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -259,8 +251,7 @@ UINT WINAPI ImmGetRegisterWordStyleA(HKL hKL, UINT nItem, LPSTYLEBUFA lpStyleBuf } Quit: - if (pNewStylesW) - HeapFree(g_hImm32Heap, 0, pNewStylesW); + Imm32HeapFree(pNewStylesW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -317,8 +308,7 @@ UINT WINAPI ImmGetRegisterWordStyleW(HKL hKL, UINT nItem, LPSTYLEBUFW lpStyleBuf } Quit: - if (pNewStylesA) - HeapFree(g_hImm32Heap, 0, pNewStylesA); + Imm32HeapFree(pNewStylesA); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -364,10 +354,8 @@ ImmRegisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszRegister ret = pImeDpi->ImeRegisterWord(pszReadingW, dwStyle, pszRegisterW); Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszRegisterW) - HeapFree(g_hImm32Heap, 0, pszRegisterW); + Imm32HeapFree(pszReadingW); + Imm32HeapFree(pszRegisterW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -413,10 +401,8 @@ ImmRegisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszRegist ret = pImeDpi->ImeRegisterWord(pszReadingA, dwStyle, pszRegisterA); Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszRegisterA) - HeapFree(g_hImm32Heap, 0, pszRegisterA); + Imm32HeapFree(pszReadingA); + Imm32HeapFree(pszRegisterA); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -462,10 +448,8 @@ ImmUnregisterWordA(HKL hKL, LPCSTR lpszReading, DWORD dwStyle, LPCSTR lpszUnregi ret = pImeDpi->ImeUnregisterWord(pszReadingW, dwStyle, pszUnregisterW); Quit: - if (pszReadingW) - HeapFree(g_hImm32Heap, 0, pszReadingW); - if (pszUnregisterW) - HeapFree(g_hImm32Heap, 0, pszUnregisterW); + Imm32HeapFree(pszReadingW); + Imm32HeapFree(pszUnregisterW); ImmUnlockImeDpi(pImeDpi); return ret; } @@ -511,10 +495,8 @@ ImmUnregisterWordW(HKL hKL, LPCWSTR lpszReading, DWORD dwStyle, LPCWSTR lpszUnre ret = pImeDpi->ImeUnregisterWord(pszReadingA, dwStyle, pszUnregisterA); Quit: - if (pszReadingA) - HeapFree(g_hImm32Heap, 0, pszReadingA); - if (pszUnregisterA) - HeapFree(g_hImm32Heap, 0, pszUnregisterA); + Imm32HeapFree(pszReadingA); + Imm32HeapFree(pszUnregisterA); ImmUnlockImeDpi(pImeDpi); return ret; } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index c6c277efba3..2289ea895e0 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -162,7 +162,7 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) Status = NtUserBuildHimcList(dwThreadId, dwCount, phNewList, &dwCount); while (Status == STATUS_BUFFER_TOO_SMALL) { - HeapFree(g_hImm32Heap, 0, phNewList); + Imm32HeapFree(phNewList); if (cRetry++ >= MAX_RETRY) return 0; @@ -175,7 +175,7 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) if (NT_ERROR(Status) || !dwCount) { - HeapFree(g_hImm32Heap, 0, phNewList); + Imm32HeapFree(phNewList); return 0; }

1 0

[reactos] 01/01: [IMM32] Rewrite ImmAssociateContextEx (#3961)
by Katayama Hirofumi MZ 16 Sep '21

16 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df6fff78bbe6563fedd0e… commit df6fff78bbe6563fedd0e5c20ee2b51bf704c462 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 16 19:29:49 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 16 19:29:49 2021 +0900 [IMM32] Rewrite ImmAssociateContextEx (#3961) - Rewrite ImmAssociateContextEx function. - Modify NtUserAssociateInputContext prototype. CORE-11700 --- dll/win32/imm32/imm.c | 68 ++++++++++++++++++++++--------------------- sdk/include/psdk/imm.h | 1 + win32ss/include/ntuser.h | 5 +--- win32ss/user/ntuser/ntstubs.c | 5 +--- 4 files changed, 38 insertions(+), 41 deletions(-) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 21832a5a3bc..6092b354d74 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -254,48 +254,50 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) return old; } -/* - * Helper function for ImmAssociateContextEx - */ -static BOOL CALLBACK _ImmAssociateContextExEnumProc(HWND hwnd, LPARAM lParam) -{ - HIMC hImc = (HIMC)lParam; - ImmAssociateContext(hwnd,hImc); - return TRUE; -} - /*********************************************************************** * ImmAssociateContextEx (IMM32.@) */ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags); + HWND hwndFocus; + PWND pFocusWnd; + HIMC hOldIMC = NULL; + DWORD dwValue; - if (!hWnd) + TRACE("(%p, %p, 0x%lX)\n", hWnd, hIMC, dwFlags); + + if (!g_psi || !(g_psi->dwSRVIFlags & SRVINFO_IMM32)) return FALSE; - switch (dwFlags) - { - case 0: - ImmAssociateContext(hWnd,hIMC); - return TRUE; - case IACE_DEFAULT: - { - HIMC defaultContext = get_default_context( hWnd ); - if (!defaultContext) return FALSE; - ImmAssociateContext(hWnd,defaultContext); - return TRUE; - } - case IACE_IGNORENOCONTEXT: - if (GetPropW(hWnd,szwWineIMCProperty)) - ImmAssociateContext(hWnd,hIMC); - return TRUE; - case IACE_CHILDREN: - EnumChildWindows(hWnd,_ImmAssociateContextExEnumProc,(LPARAM)hIMC); - return TRUE; - default: - FIXME("Unknown dwFlags 0x%x\n",dwFlags); + if (hIMC && !(dwFlags & IACE_DEFAULT) && Imm32IsCrossThreadAccess(hIMC)) return FALSE; + + hwndFocus = (HWND)NtUserQueryWindow(hWnd, QUERY_WINDOW_FOCUS); + pFocusWnd = ValidateHwndNoErr(hwndFocus); + if (pFocusWnd) + hOldIMC = pFocusWnd->hImc; + + dwValue = NtUserAssociateInputContext(hWnd, hIMC, dwFlags); + switch (dwValue) + { + case 0: + return TRUE; + + case 1: + pFocusWnd = ValidateHwndNoErr(hwndFocus); + if (pFocusWnd) + { + hIMC = pFocusWnd->hImc; + if (hIMC != hOldIMC) + { + ImmSetActiveContext(hwndFocus, hOldIMC, FALSE); + ImmSetActiveContext(hwndFocus, hIMC, TRUE); + } + } + return TRUE; + + default: + return FALSE; } } diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index f28b8e69f3c..6232ee115ff 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -627,6 +627,7 @@ BOOL WINAPI ImmConfigureIMEW(_In_ HKL, _In_ HWND, _In_ DWORD, _In_ LPVOID); #define ImmConfigureIME WINELIB_NAME_AW(ImmConfigureIME) HIMC WINAPI ImmCreateContext(void); +BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC hIMC, BOOL fFlag); BOOL WINAPI ImmDestroyContext(_In_ HIMC hIMC); BOOL WINAPI ImmDisableIME(_In_ DWORD idThread); BOOL WINAPI ImmEnumInputContext(_In_ DWORD, _In_ IMCENUMPROC, _In_ LPARAM); diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 636392365fb..6d463ddb69a 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1317,10 +1317,7 @@ C_ASSERT(sizeof(CLIENTIMC) == 0x34); DWORD NTAPI -NtUserAssociateInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3); +NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags); NTSTATUS NTAPI diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 4de9ea36a58..6a1b3c4673e 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -11,10 +11,7 @@ DBG_DEFAULT_CHANNEL(UserMisc); DWORD APIENTRY -NtUserAssociateInputContext( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3) +NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) { STUB return 0;

1 0

[reactos] 01/01: [IMM32] Rewrite ImmEscapeA/W (#3959)
by Katayama Hirofumi MZ 16 Sep '21

16 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=afb6c8a12957f4b3f138a… commit afb6c8a12957f4b3f138ae434a741dcb20bb0fcb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Sep 16 19:27:43 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Sep 16 19:27:43 2021 +0900 [IMM32] Rewrite ImmEscapeA/W (#3959) - Rewrite ImmEscapeA and ImmEscapeW functions. - Delete useless legacy code. CORE-11700 --- dll/win32/imm32/ime.c | 178 ++++++++++++++++++++++++++++++++++++++++ dll/win32/imm32/imm.c | 199 --------------------------------------------- dll/win32/imm32/precomp.h | 1 + win32ss/include/imetable.h | 2 +- 4 files changed, 180 insertions(+), 200 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 3edb95b08ef..80a2c50f33c 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -276,6 +276,20 @@ PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL) return pImeDpi; } +static LRESULT APIENTRY +ImeDpi_Escape(PIMEDPI pImeDpi, HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL) +{ + if (IS_IME_HKL(hKL)) + return pImeDpi->ImeEscape(hIMC, uSubFunc, lpData); + + if (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) + { + if (pImeDpi->CtfImeEscapeEx) + return pImeDpi->CtfImeEscapeEx(hIMC, uSubFunc, lpData, hKL); + } + return 0; +} + /*********************************************************************** * ImmIsIME (IMM32.@) */ @@ -650,6 +664,170 @@ DWORD WINAPI ImmGetProperty(HKL hKL, DWORD fdwIndex) return dwValue; } +/*********************************************************************** + * ImmEscapeA (IMM32.@) + */ +LRESULT WINAPI ImmEscapeA(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData) +{ + LRESULT ret; + PIMEDPI pImeDpi; + INT cch; + CHAR szA[MAX_IMM_FILENAME]; + WCHAR szW[MAX_IMM_FILENAME]; + + TRACE("(%p, %p, %u, %p)\n", hKL, hIMC, uSubFunc, lpData); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (!pImeDpi) + return 0; + + if (!(pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) || !lpData) + { + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, lpData, hKL); + ImmUnlockImeDpi(pImeDpi); + return ret; + } + + switch (uSubFunc) + { + case IME_ESC_SEQUENCE_TO_INTERNAL: + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, lpData, hKL); + + cch = 0; + if (HIWORD(ret)) + szW[cch++] = HIWORD(ret); + if (LOWORD(ret)) + szW[cch++] = LOWORD(ret); + + cch = WideCharToMultiByte(pImeDpi->uCodePage, 0, szW, cch, szA, _countof(szA), + NULL, NULL); + switch (cch) + { + case 1: + ret = MAKEWORD(szA[0], 0); + break; + case 2: + ret = MAKEWORD(szA[1], szA[0]); + break; + case 3: + ret = MAKELONG(MAKEWORD(szA[2], szA[1]), MAKEWORD(szA[0], 0)); + break; + case 4: + ret = MAKELONG(MAKEWORD(szA[3], szA[2]), MAKEWORD(szA[1], szA[0])); + break; + default: + ret = 0; + break; + } + break; + + case IME_ESC_GET_EUDC_DICTIONARY: + case IME_ESC_IME_NAME: + case IME_ESC_GETHELPFILENAME: + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szW, hKL); + if (ret) + { + szW[_countof(szW) - 1] = 0; + WideCharToMultiByte(pImeDpi->uCodePage, 0, szW, -1, + lpData, MAX_IMM_FILENAME, NULL, NULL); + ((LPSTR)lpData)[MAX_IMM_FILENAME - 1] = 0; + } + break; + + case IME_ESC_SET_EUDC_DICTIONARY: + case IME_ESC_HANJA_MODE: + MultiByteToWideChar(pImeDpi->uCodePage, MB_PRECOMPOSED, + lpData, -1, szW, _countof(szW)); + szW[_countof(szW) - 1] = 0; + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szW, hKL); + break; + + default: + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, lpData, hKL); + break; + } + + ImmUnlockImeDpi(pImeDpi); + return ret; +} + +/*********************************************************************** + * ImmEscapeW (IMM32.@) + */ +LRESULT WINAPI ImmEscapeW(HKL hKL, HIMC hIMC, UINT uSubFunc, LPVOID lpData) +{ + LRESULT ret; + PIMEDPI pImeDpi; + INT cch; + CHAR szA[MAX_IMM_FILENAME]; + WCHAR szW[MAX_IMM_FILENAME]; + WORD word; + + TRACE("(%p, %p, %u, %p)\n", hKL, hIMC, uSubFunc, lpData); + + pImeDpi = ImmLockOrLoadImeDpi(hKL); + if (!pImeDpi) + return 0; + + if ((pImeDpi->ImeInfo.fdwProperty & IME_PROP_UNICODE) || !lpData) + { + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, lpData, hKL); + ImmUnlockImeDpi(pImeDpi); + return ret; + } + + switch (uSubFunc) + { + case IME_ESC_SEQUENCE_TO_INTERNAL: + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, lpData, hKL); + + word = LOWORD(ret); + cch = 0; + if (HIBYTE(word)) + szA[cch++] = HIBYTE(word); + if (LOBYTE(word)) + szA[cch++] = LOBYTE(word); + + cch = MultiByteToWideChar(pImeDpi->uCodePage, MB_PRECOMPOSED, + szA, cch, szW, _countof(szW)); + switch (cch) + { + case 1: ret = szW[0]; break; + case 2: ret = MAKELONG(szW[1], szW[0]); break; + default: ret = 0; break; + } + break; + + case IME_ESC_GET_EUDC_DICTIONARY: + case IME_ESC_IME_NAME: + case IME_ESC_GETHELPFILENAME: + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szA, hKL); + if (ret) + { + szA[_countof(szA) - 1] = 0; + MultiByteToWideChar(pImeDpi->uCodePage, MB_PRECOMPOSED, + szA, -1, lpData, MAX_IMM_FILENAME); + ((LPWSTR)lpData)[MAX_IMM_FILENAME - 1] = 0; + } + break; + + case IME_ESC_SET_EUDC_DICTIONARY: + case IME_ESC_HANJA_MODE: + WideCharToMultiByte(pImeDpi->uCodePage, 0, + lpData, -1, szA, _countof(szA), NULL, NULL); + szA[_countof(szA) - 1] = 0; + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, szA, hKL); + break; + + default: + ret = ImeDpi_Escape(pImeDpi, hIMC, uSubFunc, lpData, hKL); + break; + } + + ImmUnlockImeDpi(pImeDpi); + return ret; +} + /*********************************************************************** * ImmGetOpenStatus (IMM32.@) */ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index a07a6c6965a..21832a5a3bc 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -146,21 +146,7 @@ typedef struct tagInputContextData #define WINE_IMC_VALID_MAGIC 0x56434D49 -typedef struct _tagIMMThreadData -{ - struct list entry; - DWORD threadID; - HIMC defaultContext; - HWND hwndDefault; - BOOL disableIME; - DWORD windowRefs; -} IMMThreadData; - -static struct list ImmHklList = LIST_INIT(ImmHklList); -static struct list ImmThreadDataList = LIST_INIT(ImmThreadDataList); - static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; - static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','l','x',0}; @@ -170,115 +156,6 @@ static inline BOOL is_himc_ime_unicode(const InputContextData *data) return !!(data->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE); } -static inline BOOL is_kbd_ime_unicode(const ImmHkl *hkl) -{ - return !!(hkl->imeInfo.fdwProperty & IME_PROP_UNICODE); -} - -static InputContextData* get_imc_data(HIMC hIMC); - -static HMODULE load_graphics_driver(void) -{ - static const WCHAR display_device_guid_propW[] = { - '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', - 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR key_pathW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'V','i','d','e','o','\\','{',0}; - static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; - static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - - HMODULE ret = 0; - HKEY hkey; - DWORD size; - WCHAR path[MAX_PATH]; - WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; - UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); - - if (!guid_atom) return 0; - memcpy( key, key_pathW, sizeof(key_pathW) ); - if (!GlobalGetAtomNameW( guid_atom, key + lstrlenW(key), 40 )) return 0; - lstrcatW( key, displayW ); - if (RegOpenKeyW( HKEY_LOCAL_MACHINE, key, &hkey )) return 0; - size = sizeof(path); - if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) ret = LoadLibraryW( path ); - RegCloseKey( hkey ); - TRACE( "%s %p\n", debugstr_w(path), ret ); - return ret; -} - -/* ImmHkl loading and freeing */ -#define LOAD_FUNCPTR(f) if((ptr->p##f = (LPVOID)GetProcAddress(ptr->hIME, #f)) == NULL){WARN("Can't find function %s in ime\n", #f);} -static ImmHkl *IMM_GetImmHkl(HKL hkl) -{ - ImmHkl *ptr; - WCHAR filename[MAX_PATH]; - - TRACE("Seeking ime for keyboard %p\n",hkl); - - LIST_FOR_EACH_ENTRY(ptr, &ImmHklList, ImmHkl, entry) - { - if (ptr->hkl == hkl) - return ptr; - } - /* not found... create it */ - - ptr = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ImmHkl)); - - ptr->hkl = hkl; - if (ImmGetIMEFileNameW(hkl, filename, MAX_PATH)) ptr->hIME = LoadLibraryW(filename); - if (!ptr->hIME) ptr->hIME = load_graphics_driver(); - if (ptr->hIME) - { - LOAD_FUNCPTR(ImeInquire); - if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) - { - FreeLibrary(ptr->hIME); - ptr->hIME = NULL; - } - else - { - LOAD_FUNCPTR(ImeDestroy); - LOAD_FUNCPTR(ImeSelect); - if (!ptr->pImeSelect || !ptr->pImeDestroy) - { - FreeLibrary(ptr->hIME); - ptr->hIME = NULL; - } - else - { - LOAD_FUNCPTR(ImeConfigure); - LOAD_FUNCPTR(ImeEscape); - LOAD_FUNCPTR(ImeSetActiveContext); - LOAD_FUNCPTR(ImeToAsciiEx); - LOAD_FUNCPTR(NotifyIME); - LOAD_FUNCPTR(ImeRegisterWord); - LOAD_FUNCPTR(ImeUnregisterWord); - LOAD_FUNCPTR(ImeEnumRegisterWord); - LOAD_FUNCPTR(ImeSetCompositionString); - LOAD_FUNCPTR(ImeConversionList); - LOAD_FUNCPTR(ImeProcessKey); - LOAD_FUNCPTR(ImeGetRegisterWordStyle); - LOAD_FUNCPTR(ImeGetImeMenuItems); - /* make sure our classname is WCHAR */ - if (!is_kbd_ime_unicode(ptr)) - { - WCHAR bufW[17]; - MultiByteToWideChar(CP_ACP, 0, (LPSTR)ptr->imeClassName, - -1, bufW, 17); - lstrcpyW(ptr->imeClassName, bufW); - } - } - } - } - list_add_head(&ImmHklList,&ptr->entry); - - return ptr; -} -#undef LOAD_FUNCPTR - static InputContextData* get_imc_data(HIMC hIMC) { InputContextData *data = (InputContextData *)hIMC; @@ -553,82 +430,6 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) return Imm32CleanupContext(hIMC, hKL, FALSE); } -static inline BOOL EscapeRequiresWA(UINT uEscape) -{ - if (uEscape == IME_ESC_GET_EUDC_DICTIONARY || - uEscape == IME_ESC_SET_EUDC_DICTIONARY || - uEscape == IME_ESC_IME_NAME || - uEscape == IME_ESC_GETHELPFILENAME) - return TRUE; - return FALSE; -} - -/*********************************************************************** - * ImmEscapeA (IMM32.@) - */ -LRESULT WINAPI ImmEscapeA(HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) -{ - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); - - if (immHkl->hIME && immHkl->pImeEscape) - { - if (!EscapeRequiresWA(uEscape) || !is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEscape(hIMC,uEscape,lpData); - else - { - WCHAR buffer[81]; /* largest required buffer should be 80 */ - LRESULT rc; - if (uEscape == IME_ESC_SET_EUDC_DICTIONARY) - { - MultiByteToWideChar(CP_ACP,0,lpData,-1,buffer,81); - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - } - else - { - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - WideCharToMultiByte(CP_ACP,0,buffer,-1,lpData,80, NULL, NULL); - } - return rc; - } - } - else - return 0; -} - -/*********************************************************************** - * ImmEscapeW (IMM32.@) - */ -LRESULT WINAPI ImmEscapeW(HKL hKL, HIMC hIMC, UINT uEscape, LPVOID lpData) -{ - ImmHkl *immHkl = IMM_GetImmHkl(hKL); - TRACE("(%p, %p, %d, %p):\n", hKL, hIMC, uEscape, lpData); - - if (immHkl->hIME && immHkl->pImeEscape) - { - if (!EscapeRequiresWA(uEscape) || is_kbd_ime_unicode(immHkl)) - return immHkl->pImeEscape(hIMC,uEscape,lpData); - else - { - CHAR buffer[81]; /* largest required buffer should be 80 */ - LRESULT rc; - if (uEscape == IME_ESC_SET_EUDC_DICTIONARY) - { - WideCharToMultiByte(CP_ACP,0,lpData,-1,buffer,81, NULL, NULL); - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - } - else - { - rc = immHkl->pImeEscape(hIMC,uEscape,buffer); - MultiByteToWideChar(CP_ACP,0,buffer,-1,lpData,80); - } - return rc; - } - } - else - return 0; -} - static PCLIENTIMC APIENTRY Imm32GetClientImcCache(void) { // FIXME: Do something properly here diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 6efcbf70fe1..b96a9afa695 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -49,6 +49,7 @@ #define IMM_INVALID_CANDFORM ULONG_MAX #define INVALID_HOTKEY_ID 0xFFFFFFFF #define MAX_CANDIDATEFORM 4 +#define MAX_IMM_FILENAME 80 #define LANGID_CHINESE_SIMPLIFIED MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED) #define LANGID_CHINESE_TRADITIONAL MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL) diff --git a/win32ss/include/imetable.h b/win32ss/include/imetable.h index 96d18de18b4..d9d0929757d 100644 --- a/win32ss/include/imetable.h +++ b/win32ss/include/imetable.h @@ -17,6 +17,6 @@ DEFINE_IME_ENTRY(BOOL, ImeSetCompositionString, (HIMC hIMC, DWORD dwIndex, LPCVO DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), FALSE) DEFINE_IME_ENTRY(DWORD, CtfImeInquireExW, (VOID /* FIXME: unknown */), TRUE) DEFINE_IME_ENTRY(DWORD, CtfImeSelectEx, (VOID /* FIXME: unknown */), TRUE) -DEFINE_IME_ENTRY(DWORD, CtfImeEscapeEx, (VOID /* FIXME: unknown */), TRUE) +DEFINE_IME_ENTRY(LRESULT, CtfImeEscapeEx, (HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL), TRUE) DEFINE_IME_ENTRY(DWORD, CtfImeGetGuidAtom, (VOID /* FIXME: unknown */), TRUE) DEFINE_IME_ENTRY(DWORD, CtfImeIsGuidMapEnable, (VOID /* FIXME: unknown */), TRUE)

1 0

[reactos] 06/06: [GITHUB] Use 64bit LLVM for both 32bit and 64bit clang-cl builds
by Victor Perevertkin 14 Sep '21

14 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f17c2c0db9cf20762d07f… commit f17c2c0db9cf20762d07f559413b90fdda6b435e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Sep 13 23:42:19 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Sep 14 17:58:23 2021 +0300 [GITHUB] Use 64bit LLVM for both 32bit and 64bit clang-cl builds --- .github/workflows/build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d96b52c09c..2ccb6da912a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,13 +173,7 @@ jobs: steps: - name: Install ninja run: choco install -y ninja - - name: Install LLVM (x86) - if: ${{ matrix.arch == 'i386' }} - run: | - choco install --x86 -y llvm - echo "LLVM_PATH=${env:PROGRAMFILES(X86)}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - name: Install LLVM (amd64) - if: ${{ matrix.arch == 'amd64' }} + - name: Install LLVM run: | choco install -y llvm echo "LLVM_PATH=${env:PROGRAMFILES}\llvm\bin" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

1 0

[reactos] 05/06: [CMAKE] Fixes for clang-cl build
by Victor Perevertkin 14 Sep '21

14 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62d1a2c884da401adb381… commit 62d1a2c884da401adb381798d712490930aeff83 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon Sep 13 23:39:03 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Sep 14 17:58:23 2021 +0300 [CMAKE] Fixes for clang-cl build - User lib.exe instead of llvm-lib due to incompatibility - Avoid wrapping resource compiler with cmcldeps - Fix several conditional flags --- ntoskrnl/CMakeLists.txt | 2 +- sdk/cmake/config.cmake | 2 +- toolchain-msvc.cmake | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index b0cf73eec86..9109a7bc3c7 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -8,7 +8,7 @@ endif() include(ntos.cmake) -if (CMAKE_C_COMPILER_ID MATCHES "GNU|Clang") +if(NOT MSVC) # Make sure we don't duplicate some symbols add_compile_options(-fno-common) endif() diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 63e5d71f0dd..75a63261eb6 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -79,7 +79,7 @@ else() message("WARNING: the compiler has not been recognized") endif() -if(MSVC AND (NOT USE_CLANG_CL)) +if(MSVC) set(KDBG FALSE CACHE BOOL "Whether to compile in the integrated kernel debugger.") if(CMAKE_BUILD_TYPE STREQUAL "Release") diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 97921b216f7..12e499fd3ad 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -24,6 +24,10 @@ if(USE_CLANG_CL) set(CMAKE_CXX_COMPILER clang-cl) # Clang now defaults to lld-link which we're not compatible with yet set(CMAKE_LINKER link) + # llvm-lib with link.exe can't generate proper delayed imports + set(CMAKE_AR lib) + set(CMAKE_C_COMPILER_AR lib) + set(CMAKE_CXX_COMPILER_AR lib) # Explicitly set target so CMake doesn't get confused if (ARCH STREQUAL "amd64") set(CMAKE_C_COMPILER_TARGET "x86_64-pc-windows-msvc") @@ -38,6 +42,11 @@ if(USE_CLANG_CL) set(CMAKE_C_COMPILER_TARGET "i686-pc-windows-msvc") set(CMAKE_CXX_COMPILER_TARGET "i686-pc-windows-msvc") endif() + + # Avoid wrapping RC compiler with cmcldeps utility for clang-cl. + # Otherwise it breaks cross-compilation (32bit ReactOS cannot be compiled by 64bit LLVM), + # target architecture is not passed properly + set(CMAKE_NINJA_CMCLDEPS_RC OFF) else() set(CMAKE_C_COMPILER cl) set(CMAKE_CXX_COMPILER cl)

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