Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMCTL32][USER32] EDIT control: Check bCaptureState on WM_CHAR (#6206)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=34068456a53047ab3bd97… commit 34068456a53047ab3bd97b8851a5d35a445a31d0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 20:24:44 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 21 20:24:44 2023 +0900 [COMCTL32][USER32] EDIT control: Check bCaptureState on WM_CHAR (#6206) Based on KRosUser's edit_v2.patch. Edit control should stop processing characters when left mouse button is down. If es->bCaptureState is set, then ignore WM_CHAR message. CORE-10259 --- dll/win32/comctl32/edit.c | 5 +++++ win32ss/user/user32/controls/edit.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index d17c7f20d30..67edb6b3e3f 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -3051,6 +3051,11 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; +#ifdef __REACTOS__ + if (es->bCaptureState) + return 0; +#endif + control = GetKeyState(VK_CONTROL) & 0x8000; switch (c) { diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index bfe910c8cde..21d2c24c64c 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -3286,6 +3286,11 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) { BOOL control; +#ifdef __REACTOS__ + if (es->bCaptureState) + return 0; +#endif + control = GetKeyState(VK_CONTROL) & 0x8000; switch (c) {

1 year, 6 months

[reactos] 01/01: [MSCTFIME][SDK] Improve CicArray (#6217)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df9c53554286346903fa2… commit df9c53554286346903fa20ba65c00bfc89d4479d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 20:17:35 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 21 20:17:35 2023 +0900 [MSCTFIME][SDK] Improve CicArray (#6217) - Add template type parameter. - Use size_t for indexing instead of INT. - Protect CicArray members. - Adapt msctfime to new CicArray. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 14 +++--- sdk/include/reactos/cicero/cicarray.h | 82 ++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 37 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index bfe55ed615f..36dcf4b68f3 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -348,7 +348,7 @@ typedef INT (CALLBACK *FN_EVENTSINK)(LPVOID, REFGUID); class CCompartmentEventSink : public ITfCompartmentEventSink { - CicArray m_array; + CicArray<CESMAP> m_array; LONG m_cRefs; FN_EVENTSINK m_fnEventSink; LPVOID m_pUserData; @@ -373,7 +373,7 @@ public: * @implemented */ CCompartmentEventSink::CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pUserData) - : m_array(8) + : m_array() , m_cRefs(1) , m_fnEventSink(fnEventSink) , m_pUserData(pUserData) @@ -438,7 +438,7 @@ STDMETHODIMP CCompartmentEventSink::OnChange(REFGUID rguid) HRESULT CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread) { - CESMAP *pCesMap = (CESMAP *)m_array.Append(1); + CESMAP *pCesMap = m_array.Append(1); if (!pCesMap) return E_OUTOFMEMORY; @@ -458,7 +458,7 @@ CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread) pCesMap->m_pComp->Release(); pCesMap->m_pComp = NULL; } - m_array.Remove(m_array.m_cItems - 1, 1); + m_array.Remove(m_array.size() - 1, 1); } else { @@ -478,11 +478,11 @@ CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread) */ HRESULT CCompartmentEventSink::_Unadvise() { - CESMAP *pCesMap = (CESMAP *)m_array.m_pb; - if (!m_array.m_cItems) + CESMAP *pCesMap = m_array.data(); + size_t cItems = m_array.size(); + if (!cItems) return S_OK; - INT cItems = m_array.m_cItems; do { ITfSource *pSource = NULL; diff --git a/sdk/include/reactos/cicero/cicarray.h b/sdk/include/reactos/cicero/cicarray.h index 9ce7cfa6b76..29c2e6e17ab 100644 --- a/sdk/include/reactos/cicero/cicarray.h +++ b/sdk/include/reactos/cicero/cicarray.h @@ -9,57 +9,79 @@ #include "cicbase.h" -class CicArray +class CicArrayBase { -public: +protected: LPBYTE m_pb; - INT m_cItems; - INT m_cbItem; - INT m_cCapacity; + size_t m_cItems, m_cbItem, m_cCapacity; + +public: + CicArrayBase(size_t cbItem); + virtual ~CicArrayBase(); + + BOOL Insert(size_t iItem, size_t cGrow); + LPVOID Append(size_t cGrow); + void Remove(size_t iItem, size_t cRemove); +}; + +template <typename T_ITEM> +class CicArray : protected CicArrayBase +{ +public: + CicArray() : CicArrayBase(sizeof(T_ITEM)) { } + + T_ITEM* data() const { return (T_ITEM*)m_pb; } + size_t size() const { return m_cItems; } + bool empty() const { return !size(); } - CicArray(INT cbItem); - virtual ~CicArray(); + T_ITEM& operator[](size_t iItem) + { + return *(T_ITEM*)&m_pb[iItem * m_cbItem]; + } + const T_ITEM& operator[](size_t iItem) const + { + return *(const T_ITEM*)&m_pb[iItem * m_cbItem]; + } - BOOL Insert(INT iItem, INT cGrow); - LPVOID Append(INT cGrow); - void Remove(INT iItem, INT cRemove); + T_ITEM* Append(size_t cGrow) + { + return (T_ITEM*)CicArrayBase::Append(cGrow); + } + + using CicArrayBase::Insert; + using CicArrayBase::Remove; }; /******************************************************************************/ -inline CicArray::CicArray(INT cbItem) +inline CicArrayBase::CicArrayBase(size_t cbItem) { m_cbItem = cbItem; m_pb = NULL; m_cItems = m_cCapacity = 0; } -inline CicArray::~CicArray() +inline CicArrayBase::~CicArrayBase() { cicMemFree(m_pb); } -inline LPVOID CicArray::Append(INT cGrow) +inline LPVOID CicArrayBase::Append(size_t cGrow) { if (!Insert(m_cItems, cGrow)) return NULL; return &m_pb[(m_cItems - cGrow) * m_cbItem]; } -inline BOOL CicArray::Insert(INT iItem, INT cGrow) +inline BOOL CicArrayBase::Insert(size_t iItem, size_t cGrow) { - INT cNewCapacity = m_cItems + cGrow; + size_t cNewCapacity = m_cItems + cGrow; if (m_cCapacity < cNewCapacity) { if (cNewCapacity <= m_cItems + m_cItems / 2) cNewCapacity = m_cItems + m_cItems / 2; - BYTE *pbNew; - if (m_pb) - pbNew = (BYTE *)cicMemReAlloc(m_pb, cNewCapacity * m_cbItem); - else - pbNew = (BYTE *)cicMemAlloc(cNewCapacity * m_cbItem); - + LPBYTE pbNew = (LPBYTE)cicMemReAlloc(m_pb, cNewCapacity * m_cbItem); if (!pbNew) return FALSE; @@ -78,7 +100,7 @@ inline BOOL CicArray::Insert(INT iItem, INT cGrow) return TRUE; } -inline void CicArray::Remove(INT iItem, INT cRemove) +inline void CicArrayBase::Remove(size_t iItem, size_t cRemove) { if (iItem + cRemove < m_cItems) { @@ -89,14 +111,14 @@ inline void CicArray::Remove(INT iItem, INT cRemove) m_cItems -= cRemove; - INT cHalfCapacity = m_cCapacity / 2; - if (cHalfCapacity > m_cItems) + size_t cHalfCapacity = m_cCapacity / 2; + if (cHalfCapacity <= m_cItems) + return; + + LPBYTE pb = (LPBYTE)cicMemReAlloc(m_pb, cHalfCapacity * m_cbItem); + if (pb) { - BYTE *pb = (BYTE *)cicMemReAlloc(m_pb, cHalfCapacity * m_cbItem); - if (pb) - { - m_pb = pb; - m_cCapacity = cHalfCapacity; - } + m_pb = pb; + m_cCapacity = cHalfCapacity; } }

1 year, 6 months

[reactos] 01/01: [CTFMON][MSCTFIME][SDK] Renaming for Cicero (#6216)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d6fc57ec96e2ff6bbd49… commit 7d6fc57ec96e2ff6bbd49ea5c943704224224a7b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 19:05:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 21 19:05:33 2023 +0900 [CTFMON][MSCTFIME][SDK] Renaming for Cicero (#6216) Keep consistency with Cicero naming rule. - s/CModulePath/CicSystemModulePath/. - s/GetOSInfo/cicGetOSInfo/. - s/IsWow64/cicIsWow64/. - s/GetSystemModuleHandle/cicGetSystemModuleHandle/. - s/LoadSystemLibrary/cicLoadSystemLibrary/. - Move cicGetOSInfo and cicIsWow64 to <cicero/cicbase.h>. - Delete some Cicero headers. - Adapt ctfmon and msctfime to these changes. CORE-19360 --- base/applications/ctfmon/CRegWatcher.cpp | 2 +- base/applications/ctfmon/ctfmon.cpp | 38 +---- base/applications/ctfmon/precomp.h | 4 - dll/ime/msctfime/msctfime.cpp | 4 +- dll/ime/msctfime/msctfime.h | 4 +- sdk/include/reactos/cicero/CModulePath.h | 90 ------------ sdk/include/reactos/cicero/cicbase.h | 158 ++++++++++++++++++++- sdk/include/reactos/cicero/{imclock.h => cicimc.h} | 0 sdk/include/reactos/cicero/osinfo.h | 47 ------ 9 files changed, 166 insertions(+), 181 deletions(-) diff --git a/base/applications/ctfmon/CRegWatcher.cpp b/base/applications/ctfmon/CRegWatcher.cpp index 7782b5c096d..f27ab57895c 100644 --- a/base/applications/ctfmon/CRegWatcher.cpp +++ b/base/applications/ctfmon/CRegWatcher.cpp @@ -138,7 +138,7 @@ CRegWatcher::UpdateSpTip() } // Get %WINDIR%/IME/sptip.dll!TF_CreateLangProfileUtil function - HINSTANCE hSPTIP = LoadSystemLibrary(L"IME\\sptip.dll", TRUE); + HINSTANCE hSPTIP = cicLoadSystemLibrary(L"IME\\sptip.dll", TRUE); FN_TF_CreateLangProfileUtil fnTF_CreateLangProfileUtil = (FN_TF_CreateLangProfileUtil)::GetProcAddress(hSPTIP, "TF_CreateLangProfileUtil"); if (fnTF_CreateLangProfileUtil) diff --git a/base/applications/ctfmon/ctfmon.cpp b/base/applications/ctfmon/ctfmon.cpp index ebeae0fd933..676c0657289 100644 --- a/base/applications/ctfmon/ctfmon.cpp +++ b/base/applications/ctfmon/ctfmon.cpp @@ -9,10 +9,6 @@ #include "CRegWatcher.h" #include "CLoaderWnd.h" -// ntdll!NtQueryInformationProcess -typedef NTSTATUS (WINAPI *FN_NtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); -FN_NtQueryInformationProcess g_fnNtQueryInformationProcess = NULL; - // kernel32!SetProcessShutdownParameters typedef BOOL (WINAPI *FN_SetProcessShutdownParameters)(DWORD, DWORD); FN_SetProcessShutdownParameters g_fnSetProcessShutdownParameters = NULL; @@ -29,31 +25,9 @@ HANDLE g_hCicMutex = NULL; // The Cicero mutex BOOL g_bOnWow64 = FALSE; // Is the app running on WoW64? BOOL g_fNoRunKey = FALSE; // Don't write registry key "Run"? BOOL g_fJustRunKey = FALSE; // Just write registry key "Run"? -DWORD g_dwOsInfo = 0; // The OS version info. See GetOSInfo +DWORD g_dwOsInfo = 0; // The OS version info. See cicGetOSInfo CLoaderWnd* g_pLoaderWnd = NULL; // TIP Bar loader window -// Is the current process on WoW64? -static BOOL -IsWow64(VOID) -{ - HMODULE hNTDLL = GetSystemModuleHandle(L"ntdll.dll", FALSE); - if (!hNTDLL) - return FALSE; - - g_fnNtQueryInformationProcess = - (FN_NtQueryInformationProcess)::GetProcAddress(hNTDLL, "NtQueryInformationProcess"); - if (!g_fnNtQueryInformationProcess) - return FALSE; - - ULONG_PTR Value = 0; - NTSTATUS Status = g_fnNtQueryInformationProcess(::GetCurrentProcess(), ProcessWow64Information, - &Value, sizeof(Value), NULL); - if (!NT_SUCCESS(Status)) - return FALSE; - - return !!Value; -} - static VOID ParseCommandLine( _In_ LPCWSTR pszCmdLine) @@ -107,7 +81,7 @@ WriteRegRun(VOID) return; // Write the module path - CModulePath ModPath; + CicSystemModulePath ModPath; if (ModPath.Init(L"ctfmon.exe", FALSE)) { DWORD cbData = (ModPath.m_cchPath + 1) * sizeof(WCHAR); @@ -172,7 +146,7 @@ CheckX64System( } // Get GetSystemWow64DirectoryW function - g_hKernel32 = GetSystemModuleHandle(L"kernel32.dll", FALSE); + g_hKernel32 = cicGetSystemModuleHandle(L"kernel32.dll", FALSE); g_fnGetSystemWow64DirectoryW = (FN_GetSystemWow64DirectoryW)::GetProcAddress(g_hKernel32, "GetSystemWow64DirectoryW"); if (!g_fnGetSystemWow64DirectoryW) @@ -204,8 +178,8 @@ InitApp( g_hInst = hInstance; // Save the instance handle g_uACP = ::GetACP(); // Save the active codepage - g_bOnWow64 = IsWow64(); // Is the current process on WoW64? - g_dwOsInfo = GetOSInfo(); // Get OS info + g_bOnWow64 = cicIsWow64(); // Is the current process on WoW64? + g_dwOsInfo = cicGetOSInfo(); // Get OS info // Create a mutex for Cicero g_hCicMutex = TF_CreateCicLoadMutex(&g_fWinLogon); @@ -218,7 +192,7 @@ InitApp( // Call SetProcessShutdownParameters if possible if (g_dwOsInfo & OSINFO_NT) { - g_hKernel32 = GetSystemModuleHandle(L"kernel32.dll", FALSE); + g_hKernel32 = cicGetSystemModuleHandle(L"kernel32.dll", FALSE); g_fnSetProcessShutdownParameters = (FN_SetProcessShutdownParameters) ::GetProcAddress(g_hKernel32, "SetProcessShutdownParameters"); diff --git a/base/applications/ctfmon/precomp.h b/base/applications/ctfmon/precomp.h index 636739eb9e1..541e1d6833a 100644 --- a/base/applications/ctfmon/precomp.h +++ b/base/applications/ctfmon/precomp.h @@ -9,7 +9,6 @@ #define WIN32_NO_STATUS #include <windows.h> -#include <ndk/pstypes.h> #include <shellapi.h> #include <shlwapi.h> #include <stdlib.h> @@ -17,10 +16,7 @@ #include <msctf.h> #include <ctfutb.h> #include <ctffunc.h> - #include <cicero/cicbase.h> -#include <cicero/osinfo.h> -#include <cicero/CModulePath.h> #include "resource.h" diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 86a7ddc325a..bfe55ed615f 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -88,7 +88,7 @@ DllShutDownInProgress(VOID) if (s_fnDllShutDownInProgress) return s_fnDllShutDownInProgress(); - hNTDLL = GetSystemModuleHandle(L"ntdll.dll", FALSE); + hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); s_fnDllShutDownInProgress = (FN_DllShutDownInProgress)GetProcAddress(hNTDLL, "RtlDllShutdownInProgress"); if (!s_fnDllShutDownInProgress) @@ -2841,7 +2841,7 @@ BOOL ProcessAttach(HINSTANCE hinstDLL) if (!TLS::Initialize()) return FALSE; - g_dwOSInfo = GetOSInfo(); + g_dwOSInfo = cicGetOSInfo(); // FIXME diff --git a/dll/ime/msctfime/msctfime.h b/dll/ime/msctfime/msctfime.h index daa9f74c66f..5fce8fb5c42 100644 --- a/dll/ime/msctfime/msctfime.h +++ b/dll/ime/msctfime/msctfime.h @@ -24,9 +24,7 @@ #include <cicero/cicbase.h> #include <cicero/cicarray.h> -#include <cicero/osinfo.h> -#include <cicero/CModulePath.h> -#include <cicero/imclock.h> +#include <cicero/cicimc.h> class CicInputContext; diff --git a/sdk/include/reactos/cicero/CModulePath.h b/sdk/include/reactos/cicero/CModulePath.h deleted file mode 100644 index 2418b157cdd..00000000000 --- a/sdk/include/reactos/cicero/CModulePath.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * PROJECT: ReactOS Cicero - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Manipulate module path - * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - */ - -#pragma once - -struct CModulePath -{ - WCHAR m_szPath[MAX_PATH]; - SIZE_T m_cchPath; - - CModulePath() - { - m_szPath[0] = UNICODE_NULL; - m_cchPath = 0; - } - - BOOL Init(_In_ LPCWSTR pszFileName, _In_ BOOL bSysWinDir); -}; - -// Get an instance handle that is already loaded -static inline HINSTANCE -GetSystemModuleHandle( - _In_ LPCWSTR pszFileName, - _In_ BOOL bSysWinDir) -{ - CModulePath ModPath; - if (!ModPath.Init(pszFileName, bSysWinDir)) - return NULL; - return GetModuleHandleW(ModPath.m_szPath); -} - -// Load a system library -static inline HINSTANCE -LoadSystemLibrary( - _In_ LPCWSTR pszFileName, - _In_ BOOL bSysWinDir) -{ - CModulePath ModPath; - if (!ModPath.Init(pszFileName, bSysWinDir)) - return NULL; - return ::LoadLibraryW(ModPath.m_szPath); -} - -/******************************************************************************/ - -inline BOOL -CModulePath::Init( - _In_ LPCWSTR pszFileName, - _In_ BOOL bSysWinDir) -{ - SIZE_T cchPath; - if (bSysWinDir) - { - // Usually C:\Windows or C:\ReactOS - cchPath = ::GetSystemWindowsDirectory(m_szPath, _countof(m_szPath)); - } - else - { - // Usually C:\Windows\system32 or C:\ReactOS\system32 - cchPath = ::GetSystemDirectoryW(m_szPath, _countof(m_szPath)); - } - - m_szPath[_countof(m_szPath) - 1] = UNICODE_NULL; // Avoid buffer overrun - - if ((cchPath == 0) || (cchPath > _countof(m_szPath) - 2)) - goto Failure; - - // Add backslash if necessary - if ((cchPath > 0) && (m_szPath[cchPath - 1] != L'\\')) - { - m_szPath[cchPath + 0] = L'\\'; - m_szPath[cchPath + 1] = UNICODE_NULL; - } - - // Append pszFileName - if (FAILED(StringCchCatW(m_szPath, _countof(m_szPath), pszFileName))) - goto Failure; - - m_cchPath = wcslen(m_szPath); - return TRUE; - -Failure: - m_szPath[0] = UNICODE_NULL; - m_cchPath = 0; - return FALSE; -} diff --git a/sdk/include/reactos/cicero/cicbase.h b/sdk/include/reactos/cicero/cicbase.h index 3e4184ac7fc..ff18ce94f72 100644 --- a/sdk/include/reactos/cicero/cicbase.h +++ b/sdk/include/reactos/cicero/cicbase.h @@ -7,6 +7,10 @@ #pragma once +#ifndef __cplusplus + #error Cicero needs C++. +#endif + static inline LPVOID cicMemAlloc(SIZE_T size) { return LocalAlloc(0, size); @@ -30,7 +34,6 @@ static inline void cicMemFree(LPVOID ptr) LocalFree(ptr); } -#ifdef __cplusplus inline void* __cdecl operator new(size_t size) noexcept { return cicMemAllocClear(size); @@ -45,7 +48,6 @@ inline void __cdecl operator delete(void* ptr, size_t size) noexcept { cicMemFree(ptr); } -#endif // __cplusplus // FIXME: Use msutb.dll and header static inline void ClosePopupTipbar(void) @@ -56,3 +58,155 @@ static inline void ClosePopupTipbar(void) static inline void GetPopupTipbar(HWND hwnd, BOOL fWinLogon) { } + +/* The flags of cicGetOSInfo() */ +#define OSINFO_NT 0x01 +#define OSINFO_CJK 0x10 +#define OSINFO_IMM 0x20 +#define OSINFO_DBCS 0x40 + +static inline DWORD +cicGetOSInfo(VOID) +{ + DWORD dwOsInfo = 0; + + /* Check OS version info */ + OSVERSIONINFOW VerInfo = { sizeof(VerInfo) }; + GetVersionExW(&VerInfo); + if (VerInfo.dwPlatformId == DLLVER_PLATFORM_NT) + dwOsInfo |= OSINFO_NT; + + /* Check codepage */ + switch (GetACP()) + { + case 932: /* Japanese (Japan) */ + case 936: /* Chinese (PRC, Singapore) */ + case 949: /* Korean (Korea) */ + case 950: /* Chinese (Taiwan, Hong Kong) */ + dwOsInfo |= OSINFO_CJK; + break; + } + + if (GetSystemMetrics(SM_IMMENABLED)) + dwOsInfo |= OSINFO_IMM; + + if (GetSystemMetrics(SM_DBCSENABLED)) + dwOsInfo |= OSINFO_DBCS; + + /* I'm not interested in other flags */ + + return dwOsInfo; +} + +struct CicSystemModulePath +{ + WCHAR m_szPath[MAX_PATH]; + SIZE_T m_cchPath; + + CicSystemModulePath() + { + m_szPath[0] = UNICODE_NULL; + m_cchPath = 0; + } + + BOOL Init(_In_ LPCWSTR pszFileName, _In_ BOOL bSysWinDir); +}; + +// Get an instance handle that is already loaded +static inline HINSTANCE +cicGetSystemModuleHandle( + _In_ LPCWSTR pszFileName, + _In_ BOOL bSysWinDir) +{ + CicSystemModulePath ModPath; + if (!ModPath.Init(pszFileName, bSysWinDir)) + return NULL; + return GetModuleHandleW(ModPath.m_szPath); +} + +// Load a system library +static inline HINSTANCE +cicLoadSystemLibrary( + _In_ LPCWSTR pszFileName, + _In_ BOOL bSysWinDir) +{ + CicSystemModulePath ModPath; + if (!ModPath.Init(pszFileName, bSysWinDir)) + return NULL; + return ::LoadLibraryW(ModPath.m_szPath); +} + +#include <ndk/pstypes.h> /* for PROCESSINFOCLASS */ + +/* ntdll!NtQueryInformationProcess */ +typedef NTSTATUS (WINAPI *FN_NtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); + +/* Is the current process on WoW64? */ +static inline BOOL cicIsWow64(VOID) +{ + static FN_NtQueryInformationProcess s_fnNtQueryInformationProcess = NULL; + ULONG_PTR Value; + NTSTATUS Status; + + if (!s_fnNtQueryInformationProcess) + { + HMODULE hNTDLL = cicGetSystemModuleHandle(L"ntdll.dll", FALSE); + if (!hNTDLL) + return FALSE; + + s_fnNtQueryInformationProcess = + (FN_NtQueryInformationProcess)GetProcAddress(hNTDLL, "NtQueryInformationProcess"); + if (!s_fnNtQueryInformationProcess) + return FALSE; + } + + Value = 0; + Status = s_fnNtQueryInformationProcess(GetCurrentProcess(), ProcessWow64Information, + &Value, sizeof(Value), NULL); + if (!NT_SUCCESS(Status)) + return FALSE; + + return !!Value; +} + +inline BOOL +CicSystemModulePath::Init( + _In_ LPCWSTR pszFileName, + _In_ BOOL bSysWinDir) +{ + SIZE_T cchPath; + if (bSysWinDir) + { + // Usually C:\Windows or C:\ReactOS + cchPath = ::GetSystemWindowsDirectory(m_szPath, _countof(m_szPath)); + } + else + { + // Usually C:\Windows\system32 or C:\ReactOS\system32 + cchPath = ::GetSystemDirectoryW(m_szPath, _countof(m_szPath)); + } + + m_szPath[_countof(m_szPath) - 1] = UNICODE_NULL; // Avoid buffer overrun + + if ((cchPath == 0) || (cchPath > _countof(m_szPath) - 2)) + goto Failure; + + // Add backslash if necessary + if ((cchPath > 0) && (m_szPath[cchPath - 1] != L'\\')) + { + m_szPath[cchPath + 0] = L'\\'; + m_szPath[cchPath + 1] = UNICODE_NULL; + } + + // Append pszFileName + if (FAILED(StringCchCatW(m_szPath, _countof(m_szPath), pszFileName))) + goto Failure; + + m_cchPath = wcslen(m_szPath); + return TRUE; + +Failure: + m_szPath[0] = UNICODE_NULL; + m_cchPath = 0; + return FALSE; +} diff --git a/sdk/include/reactos/cicero/imclock.h b/sdk/include/reactos/cicero/cicimc.h similarity index 100% rename from sdk/include/reactos/cicero/imclock.h rename to sdk/include/reactos/cicero/cicimc.h diff --git a/sdk/include/reactos/cicero/osinfo.h b/sdk/include/reactos/cicero/osinfo.h deleted file mode 100644 index b260000dfbc..00000000000 --- a/sdk/include/reactos/cicero/osinfo.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * PROJECT: ReactOS Cicero - * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) - * PURPOSE: Getting OS information - * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - */ - -#pragma once - -/* The flags of GetOSInfo() */ -#define OSINFO_NT 0x01 -#define OSINFO_CJK 0x10 -#define OSINFO_IMM 0x20 -#define OSINFO_DBCS 0x40 - -static inline DWORD -GetOSInfo(VOID) -{ - DWORD dwOsInfo = 0; - - /* Check OS version info */ - OSVERSIONINFOW VerInfo = { sizeof(VerInfo) }; - GetVersionExW(&VerInfo); - if (VerInfo.dwPlatformId == DLLVER_PLATFORM_NT) - dwOsInfo |= OSINFO_NT; - - /* Check codepage */ - switch (GetACP()) - { - case 932: /* Japanese (Japan) */ - case 936: /* Chinese (PRC, Singapore) */ - case 949: /* Korean (Korea) */ - case 950: /* Chinese (Taiwan, Hong Kong) */ - dwOsInfo |= OSINFO_CJK; - break; - } - - if (GetSystemMetrics(SM_IMMENABLED)) - dwOsInfo |= OSINFO_IMM; - - if (GetSystemMetrics(SM_DBCSENABLED)) - dwOsInfo |= OSINFO_DBCS; - - /* I'm not interested in other flags */ - - return dwOsInfo; -}

1 year, 6 months

[reactos] 01/01: [MSCTFIME][SDK] Implement CicInputContext::OnCleanupContext (#6213)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=814cb188c6470b3188e82… commit 814cb188c6470b3188e8294cc1216ea80f847762 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 16:23:23 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 21 16:23:23 2023 +0900 [MSCTFIME][SDK] Implement CicInputContext::OnCleanupContext (#6213) - Strengthen CicInputContext class. - Modify <cicero/imclock.h>. - add __cxa_pure_virtual function. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 174 ++++++++++++++++++++++++++++++++++- sdk/include/reactos/cicero/imclock.h | 17 ++++ 2 files changed, 186 insertions(+), 5 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 047dbfe3ccd..86a7ddc325a 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -17,6 +17,11 @@ CRITICAL_SECTION g_csLock; DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); +EXTERN_C void __cxa_pure_virtual(void) +{ + ERR("__cxa_pure_virtual\n"); +} + UINT WM_MSIME_SERVICE = 0; UINT WM_MSIME_UIREADY = 0; UINT WM_MSIME_RECONVERTREQUEST = 0; @@ -508,8 +513,12 @@ HRESULT CCompartmentEventSink::_Unadvise() class CInputContextOwnerCallBack; /* FIXME */ -class CicInputContext : public ITfContextOwnerCompositionSink +class CicInputContext + : public ITfCleanupContextSink + , public ITfContextOwnerCompositionSink + , public ITfCompositionSink { +public: DWORD m_dw[2]; LONG m_cRefs; HIMC m_hIMC; @@ -532,10 +541,7 @@ class CicInputContext : public ITfContextOwnerCompositionSink DWORD m_dw3[19]; public: - CicInputContext() - { - m_cRefs = 1; - } + CicInputContext(TfClientId cliendId, LIBTHREAD *pLibThread, HIMC hIMC); virtual ~CicInputContext() { } @@ -545,20 +551,38 @@ public: STDMETHODIMP_(ULONG) AddRef() override; STDMETHODIMP_(ULONG) Release() override; + // ITfCleanupContextSink interface + STDMETHODIMP OnCleanupContext(TfEditCookie ecWrite, ITfContext *pic) override; + // ITfContextOwnerCompositionSink interface STDMETHODIMP OnStartComposition(ITfCompositionView *pComposition, BOOL *pfOk) override; STDMETHODIMP OnUpdateComposition(ITfCompositionView *pComposition, ITfRange *pRangeNew) override; STDMETHODIMP OnEndComposition(ITfCompositionView *pComposition) override; + // ITfCompositionSink interface + STDMETHODIMP OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *pComposition) override; + HRESULT GetGuidAtom( _Inout_ IMCLock& imcLock, _In_ BYTE iAtom, _Out_opt_ LPDWORD pdwGuidAtom); + HRESULT CreateInputContext(ITfThreadMgr *pThreadMgr, IMCLock& imcLock); HRESULT DestroyInputContext(); }; +/** + * @unimplemented + */ +CicInputContext::CicInputContext(TfClientId cliendId, LIBTHREAD *pLibThread, HIMC hIMC) +{ + m_hIMC = hIMC; + m_guid = GUID_NULL; + m_dwQueryPos = 0; + m_cRefs = 1; +} + /** * @unimplemented */ @@ -661,6 +685,16 @@ CicInputContext::GetGuidAtom( return hr; } +/** + * @unimplemented + */ +HRESULT +CicInputContext::CreateInputContext(ITfThreadMgr *pThreadMgr, IMCLock& imcLock) +{ + //FIXME + return E_NOTIMPL; +} + /** * @unimplemented */ @@ -671,6 +705,15 @@ CicInputContext::DestroyInputContext() return E_NOTIMPL; } +/** + * @implemented + */ +STDMETHODIMP +CicInputContext::OnCompositionTerminated(TfEditCookie ecWrite, ITfComposition *pComposition) +{ + return S_OK; +} + /** * @implemented */ @@ -1025,6 +1068,7 @@ public: HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); void PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs); + void GetDocumentManager(IMCCLock<CTFIMECONTEXT>& imeContext); HRESULT ConfigureGeneral(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd); HRESULT ConfigureRegisterWord(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd, LPVOID lpData); @@ -1513,6 +1557,56 @@ CicProfile::InitProfileInstance(TLS *pTLS) return hr; } +/** + * @implemented + */ +STDMETHODIMP CicInputContext::OnCleanupContext(TfEditCookie ecWrite, ITfContext *pic) +{ + TLS *pTLS = TLS::PeekTLS(); + if (!pTLS || !pTLS->m_pProfile) + return E_OUTOFMEMORY; + + LANGID LangID; + pTLS->m_pProfile->GetLangId(&LangID); + + IMEINFO IMEInfo; + WCHAR szPath[MAX_PATH]; + if (Inquire(&IMEInfo, szPath, 0, (HKL)UlongToHandle(LangID)) != S_OK) + return E_FAIL; + + ITfProperty *pProp = NULL; + if (!(IMEInfo.fdwProperty & IME_PROP_COMPLETE_ON_UNSELECT)) + return S_OK; + + HRESULT hr = pic->GetProperty(GUID_PROP_COMPOSING, &pProp); + if (FAILED(hr)) + return S_OK; + + IEnumTfRanges *pRanges = NULL; + hr = pProp->EnumRanges(ecWrite, &pRanges, NULL); + if (SUCCEEDED(hr)) + { + ITfRange *pRange = NULL; + while (pRanges->Next(1, &pRange, 0) == S_OK) + { + VARIANT vari; + V_VT(&vari) = VT_EMPTY; + pProp->GetValue(ecWrite, pRange, &vari); + if (V_VT(&vari) == VT_I4) + { + if (V_I4(&vari)) + pProp->Clear(ecWrite, pRange); + } + pRange->Release(); + pRange = NULL; + } + pRanges->Release(); + } + pProp->Release(); + + return S_OK; +} + /*********************************************************************** * CicBridge */ @@ -1580,11 +1674,81 @@ CicBridge::~CicBridge() UnInitIMMX(pTLS); } +void CicBridge::GetDocumentManager(IMCCLock<CTFIMECONTEXT>& imeContext) +{ + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (pCicIC) + { + m_pDocMgr = pCicIC->m_pDocumentMgr; + m_pDocMgr->AddRef(); + } + else + { + m_pDocMgr->Release(); + m_pDocMgr = NULL; + } +} + /** * @unimplemented */ HRESULT CicBridge::CreateInputContext(TLS *pTLS, HIMC hIMC) { + IMCLock imcLock(hIMC); + HRESULT hr = imcLock.m_hr; + if (!imcLock) + hr = E_FAIL; + if (FAILED(hr)) + return hr; + + if (!imcLock.get().hCtfImeContext) + { + HIMCC hCtfImeContext = ImmCreateIMCC(sizeof(CTFIMECONTEXT)); + if (!hCtfImeContext) + return E_OUTOFMEMORY; + imcLock.get().hCtfImeContext = hCtfImeContext; + } + + IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCtfImeContext); + CicInputContext *pCicIC = imeContext.get().m_pCicIC; + if (!pCicIC) + { + pCicIC = new CicInputContext(m_cliendId, &m_LibThread, hIMC); + if (!pCicIC) + { + imeContext.unlock(); + imcLock.unlock(); + DestroyInputContext(pTLS, hIMC); + return E_OUTOFMEMORY; + } + + if (!pTLS->m_pThreadMgr) + { + pCicIC->Release(); + imeContext.unlock(); + imcLock.unlock(); + DestroyInputContext(pTLS, hIMC); + return E_NOINTERFACE; + } + + imeContext.get().m_pCicIC = pCicIC; + } + + hr = pCicIC->CreateInputContext(pTLS->m_pThreadMgr, imcLock); + if (FAILED(hr)) + { + pCicIC->Release(); + imeContext.get().m_pCicIC = NULL; + } + else + { + if (imcLock.get().hWnd && imcLock.get().hWnd == ::GetFocus()) + { + GetDocumentManager(imeContext); + //FIXME + } + } + return E_NOTIMPL; } diff --git a/sdk/include/reactos/cicero/imclock.h b/sdk/include/reactos/cicero/imclock.h index 3392c9a1107..81a642ec067 100644 --- a/sdk/include/reactos/cicero/imclock.h +++ b/sdk/include/reactos/cicero/imclock.h @@ -40,10 +40,19 @@ public: _LockIMCC(this->m_hIMCC, &this->m_pIMCC); } ~IMCCLock() + { + unlock(); + } + + void unlock() { if (this->m_pIMCC) + { _UnlockIMCC(this->m_hIMCC); + this->m_pIMCC = NULL; + } } + operator T_DATA*() const { return this->m_pIMCC; @@ -101,9 +110,17 @@ public: m_hr = _LockIMC(hIMC, &m_pIC); } ~IMCLock() + { + unlock(); + } + + void unlock() { if (m_pIC) + { _UnlockIMC(m_hIMC); + m_pIC = NULL; + } } void InitContext()

1 year, 6 months

[reactos] 01/01: [NTUSER] Remove RETURN() macro (#6194)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=533d877aaf692a16c8f3f… commit 533d877aaf692a16c8f3f06bfa228aa2aaf730a2 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Thu Dec 21 11:10:46 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 21 11:10:46 2023 +0700 [NTUSER] Remove RETURN() macro (#6194) Remove macro definition and the remaining uses. RETURN() macro is just a wrapper for goto, most of the time it makes the code more complicated than using goto directly. --- win32ss/user/ntuser/caret.c | 51 +++++++-------- win32ss/user/ntuser/cursoricon.c | 24 +++---- win32ss/user/ntuser/desktop.c | 50 +++++++-------- win32ss/user/ntuser/focus.c | 55 +++++++--------- win32ss/user/ntuser/hook.c | 59 +++++++++-------- win32ss/user/ntuser/message.c | 92 ++++++++++++++------------- win32ss/user/ntuser/misc.c | 36 +++++------ win32ss/user/ntuser/ntuser.h | 5 -- win32ss/user/ntuser/object.c | 15 +++-- win32ss/user/ntuser/painting.c | 84 +++++++++++-------------- win32ss/user/ntuser/scrollbar.c | 122 ++++++++++++++++++------------------ win32ss/user/ntuser/scrollex.c | 33 +++++----- win32ss/user/ntuser/windc.c | 12 ++-- win32ss/user/ntuser/winpos.c | 132 +++++++++++++++++---------------------- 14 files changed, 357 insertions(+), 413 deletions(-) diff --git a/win32ss/user/ntuser/caret.c b/win32ss/user/ntuser/caret.c index a4e4afc1acb..60594c50134 100644 --- a/win32ss/user/ntuser/caret.c +++ b/win32ss/user/ntuser/caret.c @@ -316,20 +316,20 @@ NtUserCreateCaret( PWND Window; PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserCreateCaret\n"); UserEnterExclusive(); if(!(Window = UserGetWindowObject(hWnd))) { - RETURN(FALSE); + goto Exit; // Return FALSE } if(Window->head.pti->pEThread != PsGetCurrentThread()) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN(FALSE); + goto Exit; // Return FALSE } pti = PsGetCurrentThreadWin32Thread(); @@ -368,12 +368,12 @@ NtUserCreateCaret( IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window, OBJID_CARET, CHILDID_SELF, 0); - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserCreateCaret, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserCreateCaret, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } UINT @@ -399,7 +399,7 @@ NtUserGetCaretPos( PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; NTSTATUS Status; - DECLARE_RETURN(BOOL); + BOOL Ret = TRUE; TRACE("Enter NtUserGetCaretPos\n"); UserEnterShared(); @@ -411,15 +411,12 @@ NtUserGetCaretPos( if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(FALSE); + Ret = FALSE; } - RETURN(TRUE); - -CLEANUP: - TRACE("Leave NtUserGetCaretPos, ret=%i\n",_ret_); + TRACE("Leave NtUserGetCaretPos, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL @@ -428,15 +425,14 @@ NtUserShowCaret(HWND hWnd OPTIONAL) { PWND Window = NULL; USER_REFERENCE_ENTRY Ref; - DECLARE_RETURN(BOOL); - BOOL ret; + BOOL ret = FALSE; TRACE("Enter NtUserShowCaret\n"); UserEnterExclusive(); if(hWnd && !(Window = UserGetWindowObject(hWnd))) { - RETURN(FALSE); + goto Exit; // Return FALSE } if (Window) UserRefObjectCo(Window, &Ref); @@ -445,12 +441,10 @@ NtUserShowCaret(HWND hWnd OPTIONAL) if (Window) UserDerefObjectCo(Window); - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserShowCaret, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserShowCaret, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } BOOL @@ -459,15 +453,14 @@ NtUserHideCaret(HWND hWnd OPTIONAL) { PWND Window = NULL; USER_REFERENCE_ENTRY Ref; - DECLARE_RETURN(BOOL); - BOOL ret; + BOOL ret = FALSE; TRACE("Enter NtUserHideCaret\n"); UserEnterExclusive(); if(hWnd && !(Window = UserGetWindowObject(hWnd))) { - RETURN(FALSE); + goto Exit; // Return FALSE } if (Window) UserRefObjectCo(Window, &Ref); @@ -476,10 +469,8 @@ NtUserHideCaret(HWND hWnd OPTIONAL) if (Window) UserDerefObjectCo(Window); - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserHideCaret, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserHideCaret, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } diff --git a/win32ss/user/ntuser/cursoricon.c b/win32ss/user/ntuser/cursoricon.c index bb72ffcdfba..1c51605a3e9 100644 --- a/win32ss/user/ntuser/cursoricon.c +++ b/win32ss/user/ntuser/cursoricon.c @@ -650,7 +650,6 @@ NtUserGetCursorInfo( NTSTATUS Status = STATUS_SUCCESS; PCURICON_OBJECT CurIcon; BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); TRACE("Enter NtUserGetCursorInfo\n"); UserEnterShared(); @@ -687,12 +686,9 @@ NtUserGetCursorInfo( SetLastNtError(Status); } - RETURN(Ret); - -CLEANUP: - TRACE("Leave NtUserGetCursorInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserGetCursorInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL @@ -999,18 +995,18 @@ NtUserGetClipCursor( PSYSTEM_CURSORINFO CurInfo; RECTL Rect; NTSTATUS Status; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserGetClipCursor\n"); UserEnterShared(); if (!CheckWinstaAttributeAccess(WINSTA_READATTRIBUTES)) { - RETURN(FALSE); + goto Exit; // Return FALSE } if (!lpRect) - RETURN(FALSE); + goto Exit; // Return FALSE CurInfo = IntGetSysCursorInfo(); if (CurInfo->bClipped) @@ -1029,15 +1025,15 @@ NtUserGetClipCursor( if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(FALSE); + goto Exit; // Return FALSE } - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserGetClipCursor, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserGetClipCursor, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c index 7f200cbfc92..c3ac7e034a0 100644 --- a/win32ss/user/ntuser/desktop.c +++ b/win32ss/user/ntuser/desktop.c @@ -2535,8 +2535,7 @@ NtUserCreateDesktop( { NTSTATUS Status; HDESK hDesk; - - DECLARE_RETURN(HDESK); + HDESK Ret = NULL; TRACE("Enter NtUserCreateDesktop\n"); UserEnterExclusive(); @@ -2552,15 +2551,15 @@ NtUserCreateDesktop( { ERR("IntCreateDesktop failed, Status 0x%08lx\n", Status); // SetLastNtError(Status); - RETURN(NULL); + goto Exit; // Return NULL } - RETURN(hDesk); + Ret = hDesk; -CLEANUP: - TRACE("Leave NtUserCreateDesktop, ret=0x%p\n", _ret_); +Exit: + TRACE("Leave NtUserCreateDesktop, ret=0x%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -2724,7 +2723,7 @@ NtUserCloseDesktop(HDESK hDesktop) { PDESKTOP pdesk; NTSTATUS Status; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("NtUserCloseDesktop(0x%p) called\n", hDesktop); UserEnterExclusive(); @@ -2733,14 +2732,14 @@ NtUserCloseDesktop(HDESK hDesktop) { ERR("Attempted to close thread desktop\n"); EngSetLastError(ERROR_BUSY); - RETURN(FALSE); + goto Exit; // Return FALSE } Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk); if (!NT_SUCCESS(Status)) { ERR("Validation of desktop handle 0x%p failed\n", hDesktop); - RETURN(FALSE); + goto Exit; // Return FALSE } ObDereferenceObject(pdesk); @@ -2750,15 +2749,15 @@ NtUserCloseDesktop(HDESK hDesktop) { ERR("Failed to close desktop handle 0x%p\n", hDesktop); SetLastNtError(Status); - RETURN(FALSE); + goto Exit; // Return FALSE } - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserCloseDesktop, ret=%i\n", _ret_); +Exit: + TRACE("Leave NtUserCloseDesktop, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -2939,7 +2938,7 @@ NtUserSwitchDesktop(HDESK hdesk) PDESKTOP pdesk; NTSTATUS Status; BOOL bRedrawDesktop; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; UserEnterExclusive(); TRACE("Enter NtUserSwitchDesktop(0x%p)\n", hdesk); @@ -2948,21 +2947,22 @@ NtUserSwitchDesktop(HDESK hdesk) if (!NT_SUCCESS(Status)) { ERR("Validation of desktop handle 0x%p failed\n", hdesk); - RETURN(FALSE); + goto Exit; // Return FALSE } if (PsGetCurrentProcessSessionId() != pdesk->rpwinstaParent->dwSessionId) { ObDereferenceObject(pdesk); ERR("NtUserSwitchDesktop called for a desktop of a different session\n"); - RETURN(FALSE); + goto Exit; // Return FALSE } if (pdesk == gpdeskInputDesktop) { ObDereferenceObject(pdesk); WARN("NtUserSwitchDesktop called for active desktop\n"); - RETURN(TRUE); + Ret = TRUE; + goto Exit; } /* @@ -2974,14 +2974,14 @@ NtUserSwitchDesktop(HDESK hdesk) { ObDereferenceObject(pdesk); ERR("Switching desktop 0x%p denied because the window station is locked!\n", hdesk); - RETURN(FALSE); + goto Exit; // Return FALSE } if (pdesk->rpwinstaParent != InputWindowStation) { ObDereferenceObject(pdesk); ERR("Switching desktop 0x%p denied because desktop doesn't belong to the interactive winsta!\n", hdesk); - RETURN(FALSE); + goto Exit; // Return FALSE } /* FIXME: Fail if the process is associated with a secured @@ -3014,12 +3014,12 @@ NtUserSwitchDesktop(HDESK hdesk) TRACE("SwitchDesktop gpdeskInputDesktop 0x%p\n", gpdeskInputDesktop); ObDereferenceObject(pdesk); - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserSwitchDesktop, ret=%i\n", _ret_); +Exit: + TRACE("Leave NtUserSwitchDesktop, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 3b11d47d5f4..2d6ed372a48 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -1441,17 +1441,16 @@ IntGetCapture(VOID) { PTHREADINFO pti; PUSER_MESSAGE_QUEUE ThreadQueue; - DECLARE_RETURN(HWND); + HWND Ret; TRACE("Enter IntGetCapture\n"); pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - RETURN( ThreadQueue ? (ThreadQueue->spwndCapture ? UserHMGetHandle(ThreadQueue->spwndCapture) : 0) : 0); + Ret = ((ThreadQueue && ThreadQueue->spwndCapture) ? UserHMGetHandle(ThreadQueue->spwndCapture) : NULL); -CLEANUP: - TRACE("Leave IntGetCapture, ret=%p\n", _ret_); - END_CLEANUP; + TRACE("Leave IntGetCapture, ret=%p\n", Ret); + return Ret; } HWND FASTCALL @@ -1647,17 +1646,16 @@ IntAllowSetForegroundWindow(DWORD dwProcessId) HWND APIENTRY NtUserGetForegroundWindow(VOID) { - DECLARE_RETURN(HWND); + HWND Ret; TRACE("Enter NtUserGetForegroundWindow\n"); UserEnterExclusive(); - RETURN( UserGetForegroundWindow()); + Ret = UserGetForegroundWindow(); -CLEANUP: - TRACE("Leave NtUserGetForegroundWindow, ret=%p\n",_ret_); + TRACE("Leave NtUserGetForegroundWindow, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } HWND APIENTRY @@ -1666,7 +1664,7 @@ NtUserSetActiveWindow(HWND hWnd) USER_REFERENCE_ENTRY Ref; HWND hWndPrev; PWND Window, pwndPrev; - DECLARE_RETURN(HWND); + HWND Ret = NULL; TRACE("Enter NtUserSetActiveWindow(%p)\n", hWnd); UserEnterExclusive(); @@ -1677,7 +1675,7 @@ NtUserSetActiveWindow(HWND hWnd) if (!(Window = UserGetWindowObject(hWnd))) { ERR("NtUserSetActiveWindow: Invalid handle 0x%p!\n",hWnd); - RETURN( NULL); + goto Exit; // Return NULL } } @@ -1689,14 +1687,13 @@ NtUserSetActiveWindow(HWND hWnd) if (Window) UserRefObjectCo(Window, &Ref); UserSetActiveWindow(Window); if (Window) UserDerefObjectCo(Window); - RETURN(hWndPrev ? (IntIsWindow(hWndPrev) ? hWndPrev : NULL) : NULL); + Ret = ((hWndPrev && IntIsWindow(hWndPrev)) ? hWndPrev : NULL); } - RETURN( NULL); -CLEANUP: - TRACE("Leave NtUserSetActiveWindow, ret=%p\n",_ret_); +Exit: + TRACE("Leave NtUserSetActiveWindow, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -1705,17 +1702,16 @@ CLEANUP: HWND APIENTRY NtUserSetCapture(HWND hWnd) { - DECLARE_RETURN(HWND); + HWND Ret; TRACE("Enter NtUserSetCapture(%p)\n", hWnd); UserEnterExclusive(); - RETURN( co_UserSetCapture(hWnd)); + Ret = co_UserSetCapture(hWnd); -CLEANUP: - TRACE("Leave NtUserSetCapture, ret=%p\n", _ret_); + TRACE("Leave NtUserSetCapture, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -1726,8 +1722,7 @@ NtUserSetFocus(HWND hWnd) { PWND Window; USER_REFERENCE_ENTRY Ref; - DECLARE_RETURN(HWND); - HWND ret; + HWND ret = NULL; TRACE("Enter NtUserSetFocus(%p)\n", hWnd); UserEnterExclusive(); @@ -1737,24 +1732,22 @@ NtUserSetFocus(HWND hWnd) if (!(Window = UserGetWindowObject(hWnd))) { ERR("NtUserSetFocus: Invalid handle 0x%p!\n",hWnd); - RETURN(NULL); + goto Exit; // Return NULL } UserRefObjectCo(Window, &Ref); ret = co_UserSetFocus(Window); UserDerefObjectCo(Window); - - RETURN(ret); } else { - RETURN( co_UserSetFocus(0)); + ret = co_UserSetFocus(NULL); } -CLEANUP: - TRACE("Leave NtUserSetFocus, ret=%p\n",_ret_); +Exit: + TRACE("Leave NtUserSetFocus, ret=%p\n", ret); UserLeave(); - END_CLEANUP; + return ret; } /* EOF */ diff --git a/win32ss/user/ntuser/hook.c b/win32ss/user/ntuser/hook.c index b9879c01320..b9da033e07b 100644 --- a/win32ss/user/ntuser/hook.c +++ b/win32ss/user/ntuser/hook.c @@ -1376,7 +1376,6 @@ NtUserCallNextHookEx( int Code, PHOOK HookObj, NextObj; PCLIENTINFO ClientInfo; LRESULT lResult = 0; - DECLARE_RETURN(LRESULT); TRACE("Enter NtUserCallNextHookEx\n"); UserEnterExclusive(); @@ -1385,7 +1384,8 @@ NtUserCallNextHookEx( int Code, HookObj = pti->sphkCurrent; - if (!HookObj) RETURN( 0); + if (!HookObj) + goto Exit; // Return 0 NextObj = HookObj->phkNext; @@ -1407,12 +1407,11 @@ NtUserCallNextHookEx( int Code, NextObj->phkNext = IntGetNextHook(NextObj); lResult = co_UserCallNextHookEx( NextObj, Code, wParam, lParam, NextObj->Ansi); } - RETURN( lResult); -CLEANUP: - TRACE("Leave NtUserCallNextHookEx, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserCallNextHookEx, ret=%i\n", lResult); UserLeave(); - END_CLEANUP; + return lResult; } HHOOK @@ -1450,7 +1449,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, NTSTATUS Status; HHOOK Handle; PTHREADINFO pti, ptiHook = NULL; - DECLARE_RETURN(HHOOK); + HHOOK Ret = NULL; TRACE("Enter NtUserSetWindowsHookEx\n"); UserEnterExclusive(); @@ -1460,13 +1459,13 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, if (HookId < WH_MINHOOK || WH_MAXHOOK < HookId ) { EngSetLastError(ERROR_INVALID_HOOK_FILTER); - RETURN( NULL); + goto Cleanup; // Return NULL } if (!HookProc) { EngSetLastError(ERROR_INVALID_FILTER_PROC); - RETURN( NULL); + goto Cleanup; // Return NULL } if (ThreadId) /* thread-local hook */ @@ -1480,21 +1479,21 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, TRACE("Local hook installing Global HookId: %d\n",HookId); /* these can only be global */ EngSetLastError(ERROR_GLOBAL_ONLY_HOOK); - RETURN( NULL); + goto Cleanup; // Return NULL } if ( !(ptiHook = IntTID2PTI( UlongToHandle(ThreadId) ))) { ERR("Invalid thread id 0x%x\n", ThreadId); EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( NULL); + goto Cleanup; // Return NULL } if ( ptiHook->rpdesk != pti->rpdesk) // gptiCurrent->rpdesk) { ERR("Local hook wrong desktop HookId: %d\n",HookId); EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( NULL); + goto Cleanup; // Return NULL } if (ptiHook->ppi != pti->ppi) @@ -1511,7 +1510,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, { ERR("Local hook needs hMod HookId: %d\n",HookId); EngSetLastError(ERROR_HOOK_NEEDS_HMOD); - RETURN( NULL); + goto Cleanup; // Return NULL } if ( (ptiHook->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && @@ -1525,7 +1524,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, HookId == WH_CALLWNDPROCRET) ) { EngSetLastError(ERROR_HOOK_TYPE_NOT_ALLOWED); - RETURN( NULL); + goto Cleanup; // Return NULL } } } @@ -1545,7 +1544,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, { ERR("Global hook needs hMod HookId: %d\n",HookId); EngSetLastError(ERROR_HOOK_NEEDS_HMOD); - RETURN( NULL); + goto Cleanup; // Return NULL } } @@ -1558,7 +1557,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( NULL); + goto Cleanup; // Return NULL } ObDereferenceObject(WinStaObj); @@ -1566,7 +1565,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, if (!Hook) { - RETURN( NULL); + goto Cleanup; // Return NULL } Hook->ihmod = (INT_PTR)Mod; // Module Index from atom table, Do this for now. @@ -1640,7 +1639,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, { IntRemoveHook(Hook); SetLastNtError(Status); - RETURN( NULL); + goto Cleanup; // Return NULL } Hook->ModuleName.Buffer = ExAllocatePoolWithTag( PagedPool, @@ -1650,7 +1649,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, { IntRemoveHook(Hook); EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - RETURN( NULL); + goto Cleanup; // Return NULL } Hook->ModuleName.MaximumLength = ModuleName.MaximumLength; @@ -1663,7 +1662,7 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, Hook->ModuleName.Buffer = NULL; IntRemoveHook(Hook); SetLastNtError(Status); - RETURN( NULL); + goto Cleanup; // Return NULL } Hook->ModuleName.Length = ModuleName.Length; @@ -1677,14 +1676,14 @@ NtUserSetWindowsHookEx( HINSTANCE Mod, Hook->offPfn = 0; TRACE("Installing: HookId %d Global %s\n", HookId, !ThreadId ? "TRUE" : "FALSE"); - RETURN( Handle); + Ret = Handle; -CLEANUP: +Cleanup: if (Hook) UserDereferenceObject(Hook); - TRACE("Leave NtUserSetWindowsHookEx, ret=%p\n", _ret_); + TRACE("Leave NtUserSetWindowsHookEx, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL @@ -1692,7 +1691,7 @@ APIENTRY NtUserUnhookWindowsHookEx(HHOOK Hook) { PHOOK HookObj; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserUnhookWindowsHookEx\n"); UserEnterExclusive(); @@ -1701,7 +1700,7 @@ NtUserUnhookWindowsHookEx(HHOOK Hook) { ERR("Invalid handle passed to NtUserUnhookWindowsHookEx\n"); /* SetLastNtError(Status); */ - RETURN( FALSE); + goto Exit; // Return FALSE } ASSERT(Hook == UserHMGetHandle(HookObj)); @@ -1710,12 +1709,12 @@ NtUserUnhookWindowsHookEx(HHOOK Hook) UserDereferenceObject(HookObj); - RETURN( TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserUnhookWindowsHookEx, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserUnhookWindowsHookEx, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL diff --git a/win32ss/user/ntuser/message.c b/win32ss/user/ntuser/message.c index 78a7956d88b..92d00192712 100644 --- a/win32ss/user/ntuser/message.c +++ b/win32ss/user/ntuser/message.c @@ -1466,20 +1466,20 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, ULONG_PTR *uResult ) { NTSTATUS Status = STATUS_SUCCESS; - PWND Window = NULL; + PWND Window; PMSGMEMORY MsgMemoryEntry; INT lParamBufferSize; LPARAM lParamPacked; PTHREADINFO Win32Thread, ptiSendTo = NULL; ULONG_PTR Result = 0; - DECLARE_RETURN(LRESULT); + LRESULT Ret = FALSE; USER_REFERENCE_ENTRY Ref; BOOL DoCallBack = TRUE; if (!(Window = UserGetWindowObject(hWnd))) { TRACE("SendMessageTimeoutSingle: Invalid handle 0x%p!\n",hWnd); - RETURN( FALSE); + return FALSE; } UserRefObjectCo(Window, &Ref); @@ -1493,7 +1493,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (!IntDdeSendMessageHook(Window, Msg, wParam, lParam)) { ERR("Sending Exit DDE 0x%x\n",Msg); - RETURN( FALSE); + goto Cleanup; // Return FALSE } } @@ -1502,7 +1502,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (Win32Thread->TIF_flags & TIF_INCLEANUP) { /* Never send messages to exiting threads */ - RETURN( FALSE); + goto Cleanup; // Return FALSE } if (Msg & 0x80000000) @@ -1510,7 +1510,8 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, TRACE("SMTS: Internal Message!\n"); Result = (ULONG_PTR)handle_internal_message( Window, Msg, wParam, lParam ); if (uResult) *uResult = Result; - RETURN( TRUE); + Ret = TRUE; + goto Cleanup; } // Only happens when calling the client! @@ -1523,7 +1524,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (IoGetRemainingStackSize() < PAGE_SIZE) { ERR("Server Callback Exceeded Stack!\n"); - RETURN( FALSE); + goto Cleanup; // Return FALSE } /* Return after server side call, IntCallWndProcRet will not be called. */ switch(Window->fnid) @@ -1541,7 +1542,8 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (!DoCallBack) { if (uResult) *uResult = Result; - RETURN( TRUE); + Ret = TRUE; + goto Cleanup; } } /* See if this message type is present in the table */ @@ -1560,7 +1562,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (! NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, FALSE))) { ERR("Failed to pack message parameters\n"); - RETURN( FALSE); + goto Cleanup; // Return FALSE } Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1578,20 +1580,22 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { ERR("Failed to unpack message parameters\n"); - RETURN( TRUE); + Ret = TRUE; + goto Cleanup; } // Only happens when calling the client! IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - RETURN( TRUE); + Ret = TRUE; + goto Cleanup; } if (Window->state & WNDS_DESTROYED) { /* FIXME: Last error? */ ERR("Attempted to send message to window %p that is being destroyed!\n", hWnd); - RETURN( FALSE); + goto Cleanup; // Return FALSE } if ((uFlags & SMTO_ABORTIFHUNG) && MsqIsHung(ptiSendTo, 4 * MSQ_HUNG)) @@ -1599,7 +1603,7 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, // FIXME: Set window hung and add to a list. /* FIXME: Set a LastError? */ ERR("Window %p (%p) (pti %p) is hung!\n", hWnd, Window, ptiSendTo); - RETURN( FALSE); + goto Cleanup; // Return FALSE } do @@ -1634,19 +1638,19 @@ co_IntSendMessageTimeoutSingle( HWND hWnd, * returns ERROR_TIMEOUT, then the function timed out. */ EngSetLastError(ERROR_TIMEOUT); - RETURN( FALSE); + goto Cleanup; // Return FALSE } else if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Cleanup; // Return FALSE } - RETURN( TRUE); + Ret = TRUE; -CLEANUP: - if (Window) UserDerefObjectCo(Window); - END_CLEANUP; +Cleanup: + UserDerefObjectCo(Window); + return Ret; } LRESULT FASTCALL @@ -1737,12 +1741,12 @@ co_IntSendMessageWithCallBack(HWND hWnd, ULONG_PTR *uResult) { ULONG_PTR Result; - PWND Window = NULL; + PWND Window; PMSGMEMORY MsgMemoryEntry; INT lParamBufferSize; LPARAM lParamPacked; PTHREADINFO Win32Thread, ptiSendTo = NULL; - DECLARE_RETURN(LRESULT); + LRESULT Ret = FALSE; USER_REFERENCE_ENTRY Ref; PUSER_SENT_MESSAGE Message; BOOL DoCallBack = TRUE; @@ -1750,7 +1754,7 @@ co_IntSendMessageWithCallBack(HWND hWnd, if (!(Window = UserGetWindowObject(hWnd))) { TRACE("SendMessageWithCallBack: Invalid handle 0x%p\n",hWnd); - RETURN(FALSE); + return FALSE; } UserRefObjectCo(Window, &Ref); @@ -1759,25 +1763,27 @@ co_IntSendMessageWithCallBack(HWND hWnd, { /* FIXME: last error? */ ERR("Attempted to send message to window %p that is being destroyed\n", hWnd); - RETURN(FALSE); + goto Cleanup; // Return FALSE } Win32Thread = PsGetCurrentThreadWin32Thread(); if (Win32Thread == NULL || Win32Thread->TIF_flags & TIF_INCLEANUP) - RETURN(FALSE); + goto Cleanup; // Return FALSE ptiSendTo = IntSendTo(Window, Win32Thread, Msg); if (Msg & 0x80000000 && !ptiSendTo) { - if (Win32Thread->TIF_flags & TIF_INCLEANUP) RETURN(FALSE); + if (Win32Thread->TIF_flags & TIF_INCLEANUP) + goto Cleanup; // Return FALSE TRACE("SMWCB: Internal Message\n"); Result = (ULONG_PTR)handle_internal_message(Window, Msg, wParam, lParam); if (uResult) *uResult = Result; - RETURN(TRUE); + Ret = TRUE; + goto Cleanup; } /* See if this message type is present in the table */ @@ -1795,7 +1801,7 @@ co_IntSendMessageWithCallBack(HWND hWnd, if (!NT_SUCCESS(PackParam(&lParamPacked, Msg, wParam, lParam, !!ptiSendTo))) { ERR("Failed to pack message parameters\n"); - RETURN(FALSE); + goto Cleanup; // Return FALSE } /* If it can be sent now, then send it. */ @@ -1805,7 +1811,7 @@ co_IntSendMessageWithCallBack(HWND hWnd, { UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE); /* Never send messages to exiting threads */ - RETURN(FALSE); + goto Cleanup; // Return FALSE } IntCallWndProc(Window, hWnd, Msg, wParam, lParam); @@ -1858,13 +1864,14 @@ co_IntSendMessageWithCallBack(HWND hWnd, { ERR("Failed to unpack message parameters\n"); } - RETURN(TRUE); + Ret = TRUE; + goto Cleanup; } if(!(Message = AllocateUserMessage(FALSE))) { ERR("Failed to allocate message\n"); - RETURN(FALSE); + goto Cleanup; // Return FALSE } Message->Msg.hwnd = hWnd; @@ -1890,11 +1897,11 @@ co_IntSendMessageWithCallBack(HWND hWnd, InsertTailList(&ptiSendTo->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(ptiSendTo, QS_SENDMESSAGE, TRUE); - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - if (Window) UserDerefObjectCo(Window); - END_CLEANUP; +Cleanup: + UserDerefObjectCo(Window); + return Ret; } #if 0 @@ -2156,7 +2163,7 @@ NtUserDragDetect( MSG msg; RECT rect; ULONG wDragWidth, wDragHeight; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserDragDetect(%p)\n", hWnd); UserEnterExclusive(); @@ -2181,7 +2188,7 @@ NtUserDragDetect( if ( msg.message == WM_LBUTTONUP ) { co_UserSetCapture(NULL); - RETURN( FALSE); + goto Exit; // Return FALSE } if ( msg.message == WM_MOUSEMOVE ) { @@ -2191,7 +2198,8 @@ NtUserDragDetect( if( !RECTL_bPointInRect( &rect, tmp.x, tmp.y ) ) { co_UserSetCapture(NULL); - RETURN( TRUE); + Ret = TRUE; + goto Exit; } } if ( msg.message == WM_KEYDOWN ) @@ -2199,7 +2207,8 @@ NtUserDragDetect( if ( msg.wParam == VK_ESCAPE ) { co_UserSetCapture(NULL); - RETURN( TRUE); + Ret = TRUE; + goto Exit; } } if ( msg.message == WM_QUEUESYNC ) @@ -2209,12 +2218,11 @@ NtUserDragDetect( } co_IntWaitMessage(NULL, 0, 0); } - RETURN( FALSE); -CLEANUP: - TRACE("Leave NtUserDragDetect, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserDragDetect, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL APIENTRY diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index b5b0f27ac0a..b1da3935d67 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -410,8 +410,7 @@ NtUserGetGUIThreadInfo( PDESKTOP Desktop; PUSER_MESSAGE_QUEUE MsgQueue; PTHREADINFO W32Thread, pti; - - DECLARE_RETURN(BOOLEAN); + BOOL Ret = FALSE; TRACE("Enter NtUserGetGUIThreadInfo\n"); UserEnterShared(); @@ -420,13 +419,13 @@ NtUserGetGUIThreadInfo( if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Exit; // Return FALSE } if(SafeGui.cbSize != sizeof(GUITHREADINFO)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + goto Exit; // Return FALSE } if (idThread) @@ -439,7 +438,7 @@ NtUserGetGUIThreadInfo( if ( !W32Thread ) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + goto Exit; // Return FALSE } Desktop = W32Thread->rpdesk; @@ -448,7 +447,7 @@ NtUserGetGUIThreadInfo( if ( !Desktop || Desktop != pti->rpdesk ) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + goto Exit; // Return FALSE } if ( W32Thread->MessageQueue ) @@ -465,7 +464,7 @@ NtUserGetGUIThreadInfo( if(!MsgQueue) { EngSetLastError(ERROR_ACCESS_DENIED); - RETURN( FALSE); + goto Exit; // Return FALSE } } @@ -518,15 +517,15 @@ NtUserGetGUIThreadInfo( if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Exit; // Return FALSE } - RETURN( TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserGetGUIThreadInfo, ret=%u\n",_ret_); +Exit: + TRACE("Leave NtUserGetGUIThreadInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } @@ -540,7 +539,6 @@ NtUserGetGuiResources( PPROCESSINFO W32Process; NTSTATUS Status; DWORD Ret = 0; - DECLARE_RETURN(DWORD); TRACE("Enter NtUserGetGuiResources\n"); UserEnterShared(); @@ -555,7 +553,7 @@ NtUserGetGuiResources( if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( 0); + goto Exit; // Return 0 } W32Process = (PPROCESSINFO)Process->Win32Process; @@ -563,7 +561,7 @@ NtUserGetGuiResources( { ObDereferenceObject(Process); EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( 0); + goto Exit; // Return 0 } switch(uiFlags) @@ -587,12 +585,10 @@ NtUserGetGuiResources( ObDereferenceObject(Process); - RETURN( Ret); - -CLEANUP: - TRACE("Leave NtUserGetGuiResources, ret=%lu\n",_ret_); +Exit: + TRACE("Leave NtUserGetGuiResources, ret=%lu\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } VOID FASTCALL diff --git a/win32ss/user/ntuser/ntuser.h b/win32ss/user/ntuser/ntuser.h index 7c878c4f793..28b9ac6e59c 100644 --- a/win32ss/user/ntuser/ntuser.h +++ b/win32ss/user/ntuser/ntuser.h @@ -1,10 +1,5 @@ #pragma once -#define DECLARE_RETURN(type) type _ret_ -#define RETURN(value) { _ret_ = value; goto _cleanup_; } -#define CLEANUP /*unreachable*/ ASSERT(FALSE); _cleanup_ -#define END_CLEANUP return _ret_; - #define UserEnterCo UserEnterExclusive #define UserLeaveCo UserLeave diff --git a/win32ss/user/ntuser/object.c b/win32ss/user/ntuser/object.c index d0b4b4cf364..36be69bedd4 100644 --- a/win32ss/user/ntuser/object.c +++ b/win32ss/user/ntuser/object.c @@ -795,14 +795,14 @@ NtUserValidateHandleSecure( UINT uType; PPROCESSINFO ppi; PUSER_HANDLE_ENTRY entry; + BOOL Ret = FALSE; - DECLARE_RETURN(BOOL); UserEnterExclusive(); if (!(entry = handle_to_entry(gHandleTable, handle ))) { EngSetLastError(ERROR_INVALID_HANDLE); - RETURN( FALSE); + goto Exit; // Return FALSE } uType = entry->type; switch (uType) @@ -824,16 +824,15 @@ NtUserValidateHandleSecure( break; } - if (!ppi) RETURN( FALSE); + if (!ppi) + goto Exit; // Return FALSE // Same process job returns TRUE. - if (gptiCurrent->ppi->pW32Job == ppi->pW32Job) RETURN( TRUE); + if (gptiCurrent->ppi->pW32Job == ppi->pW32Job) Ret = TRUE; - RETURN( FALSE); - -CLEANUP: +Exit: UserLeave(); - END_CLEANUP; + return Ret; } // Win: HMAssignmentLock diff --git a/win32ss/user/ntuser/painting.c b/win32ss/user/ntuser/painting.c index 57e006b7312..a79a631fbd1 100644 --- a/win32ss/user/ntuser/painting.c +++ b/win32ss/user/ntuser/painting.c @@ -1607,19 +1607,19 @@ IntFillWindow(PWND pWndParent, HDC APIENTRY NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs) { - PWND Window = NULL; + PWND Window; PAINTSTRUCT Ps; NTSTATUS Status; HDC hDC; USER_REFERENCE_ENTRY Ref; - DECLARE_RETURN(HDC); + HDC Ret = NULL; TRACE("Enter NtUserBeginPaint\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) { - RETURN( NULL); + goto Cleanup; // Return NULL } UserRefObjectCo(Window, &Ref); @@ -1630,18 +1630,17 @@ NtUserBeginPaint(HWND hWnd, PAINTSTRUCT* UnsafePs) if (! NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(NULL); + goto Cleanup; // Return NULL } - RETURN(hDC); + Ret = hDC; -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserBeginPaint, ret=%p\n",_ret_); + TRACE("Leave NtUserBeginPaint, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; - + return Ret; } /* @@ -1655,17 +1654,17 @@ BOOL APIENTRY NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* pUnsafePs) { NTSTATUS Status = STATUS_SUCCESS; - PWND Window = NULL; + PWND Window; PAINTSTRUCT Ps; USER_REFERENCE_ENTRY Ref; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserEndPaint\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) { - RETURN(FALSE); + goto Cleanup; // Return FALSE } UserRefObjectCo(Window, &Ref); // Here for the exception. @@ -1682,17 +1681,17 @@ NtUserEndPaint(HWND hWnd, CONST PAINTSTRUCT* pUnsafePs) _SEH2_END if (!NT_SUCCESS(Status)) { - RETURN(FALSE); + goto Cleanup; // Return FALSE } - RETURN(IntEndPaint(Window, &Ps)); + Ret = IntEndPaint(Window, &Ps); -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserEndPaint, ret=%i\n",_ret_); + TRACE("Leave NtUserEndPaint, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -1928,26 +1927,21 @@ co_UserGetUpdateRect(PWND Window, PRECT pRect, BOOL bErase) INT APIENTRY NtUserGetUpdateRgn(HWND hWnd, HRGN hRgn, BOOL bErase) { - DECLARE_RETURN(INT); PWND Window; - INT ret; + INT ret = ERROR; TRACE("Enter NtUserGetUpdateRgn\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) + Window = UserGetWindowObject(hWnd); + if (Window) { - RETURN(ERROR); + ret = co_UserGetUpdateRgn(Window, hRgn, bErase); } - ret = co_UserGetUpdateRgn(Window, hRgn, bErase); - - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserGetUpdateRgn, ret=%i\n",_ret_); + TRACE("Leave NtUserGetUpdateRgn, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } /* @@ -1963,15 +1957,14 @@ NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) PWND Window; RECTL Rect; NTSTATUS Status; - BOOL Ret; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserGetUpdateRect\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd))) { - RETURN(FALSE); + goto Exit; // Return FALSE } Ret = co_UserGetUpdateRect(Window, &Rect, bErase); @@ -1982,16 +1975,14 @@ NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(FALSE); + Ret = FALSE; } } - RETURN(Ret); - -CLEANUP: - TRACE("Leave NtUserGetUpdateRect, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserGetUpdateRect, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -2010,18 +2001,17 @@ NtUserRedrawWindow( { RECTL SafeUpdateRect; PWND Wnd; - BOOL Ret; + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; NTSTATUS Status = STATUS_SUCCESS; PREGION RgnUpdate = NULL; - DECLARE_RETURN(BOOL); TRACE("Enter NtUserRedrawWindow\n"); UserEnterExclusive(); if (!(Wnd = UserGetWindowObject(hWnd ? hWnd : IntGetDesktopWindow()))) { - RETURN( FALSE); + goto Exit; // Return FALSE } if (lprcUpdate) @@ -2039,7 +2029,7 @@ NtUserRedrawWindow( if (!NT_SUCCESS(Status)) { EngSetLastError(RtlNtStatusToDosError(Status)); - RETURN( FALSE); + goto Exit; // Return FALSE } } @@ -2049,7 +2039,7 @@ NtUserRedrawWindow( { /* RedrawWindow fails only in case that flags are invalid */ EngSetLastError(ERROR_INVALID_FLAGS); - RETURN( FALSE); + goto Exit; // Return FALSE } /* We can't hold lock on GDI objects while doing roundtrips to user mode, @@ -2061,7 +2051,7 @@ NtUserRedrawWindow( if (!RgnUpdate) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - RETURN(FALSE); + goto Exit; // Return FALSE } REGION_UnlockRgn(RgnUpdate); } @@ -2079,12 +2069,10 @@ NtUserRedrawWindow( UserDerefObjectCo(Wnd); - RETURN( Ret); - -CLEANUP: - TRACE("Leave NtUserRedrawWindow, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserRedrawWindow, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL diff --git a/win32ss/user/ntuser/scrollbar.c b/win32ss/user/ntuser/scrollbar.c index 63bb168ca34..0f1173bbd30 100644 --- a/win32ss/user/ntuser/scrollbar.c +++ b/win32ss/user/ntuser/scrollbar.c @@ -1144,8 +1144,7 @@ NtUserGetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) NTSTATUS Status; SCROLLBARINFO sbi; PWND Window; - BOOL Ret; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserGetScrollBarInfo\n"); @@ -1155,11 +1154,11 @@ NtUserGetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) if(!NT_SUCCESS(Status) || (sbi.cbSize != sizeof(SCROLLBARINFO))) { SetLastNtError(Status); - RETURN(FALSE); + goto Exit; // Return FALSE } if(!(Window = UserGetWindowObject(hWnd))) - RETURN(FALSE); + goto Exit; // Return FALSE UserRefObjectCo(Window, &Ref); Ret = co_IntGetScrollBarInfo(Window, idObject, &sbi); @@ -1172,12 +1171,10 @@ NtUserGetScrollBarInfo(HWND hWnd, LONG idObject, PSCROLLBARINFO psbi) Ret = FALSE; } - RETURN(Ret); - -CLEANUP: - TRACE("Leave NtUserGetScrollBarInfo, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserGetScrollBarInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL @@ -1190,9 +1187,8 @@ NtUserSBGetParms( { PWND Window; SCROLLINFO psi; - BOOL Ret; + BOOL Ret = FALSE; SBDATA SBDataSafe; - DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserGetScrollInfo\n"); @@ -1208,14 +1204,14 @@ NtUserSBGetParms( { ERR("NtUserGetScrollInfo Failed size\n"); SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN(FALSE)); + _SEH2_YIELD(goto Exit); // Return FALSE } _SEH2_END if(!(Window = UserGetWindowObject(hWnd))) { ERR("NtUserGetScrollInfo Bad window\n"); - RETURN(FALSE); + goto Exit; // Return FALSE } UserRefObjectCo(Window, &Ref); @@ -1230,16 +1226,15 @@ NtUserSBGetParms( { ERR("NtUserGetScrollInfo Failed copy to user\n"); SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN(FALSE)); + Ret = FALSE; + _SEH2_YIELD(goto Exit); } _SEH2_END - RETURN(Ret); - -CLEANUP: - TRACE("Leave NtUserGetScrollInfo, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserGetScrollInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } BOOL @@ -1253,19 +1248,19 @@ NtUserEnableScrollBar( PWND Window = NULL; PSCROLLBARINFO InfoV = NULL, InfoH = NULL; BOOL Chg = FALSE; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserEnableScrollBar\n"); UserEnterExclusive(); if (!(Window = UserGetWindowObject(hWnd)) || UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) - RETURN(FALSE); + goto Cleanup; // Return FALSE UserRefObjectCo(Window, &Ref); if (!co_IntCreateScrollBars(Window)) - RETURN(FALSE); + goto Cleanup; // Return FALSE OrigArrows = Window->pSBInfo->WSBflags; Window->pSBInfo->WSBflags = wArrows; @@ -1275,14 +1270,15 @@ NtUserEnableScrollBar( if ((wArrows == ESB_DISABLE_BOTH || wArrows == ESB_ENABLE_BOTH)) IntEnableWindow(hWnd, (wArrows == ESB_ENABLE_BOTH)); - RETURN(TRUE); + Ret = TRUE; + goto Cleanup; } if(wSBflags != SB_BOTH && !SBID_IS_VALID(wSBflags)) { EngSetLastError(ERROR_INVALID_PARAMETER); ERR("Trying to set scrollinfo for unknown scrollbar type %u\n", wSBflags); - RETURN(FALSE); + goto Cleanup; // Return FALSE } switch(wSBflags) @@ -1297,7 +1293,7 @@ NtUserEnableScrollBar( InfoV = IntGetScrollbarInfoFromWindow(Window, SB_VERT); break; default: - RETURN(FALSE); + goto Cleanup; // Return FALSE } if(InfoV) @@ -1310,17 +1306,24 @@ NtUserEnableScrollBar( // Done in user32: // SCROLL_RefreshScrollBar(hwnd, nBar, TRUE, TRUE); - RETURN(Chg); - if (OrigArrows == wArrows) RETURN(FALSE); - RETURN(TRUE); + Ret = Chg; + goto Cleanup; // FIXME + + if (OrigArrows == wArrows) + { + Ret = FALSE; + goto Cleanup; + } + + Ret = TRUE; -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserEnableScrollBar, ret=%i\n",_ret_); + TRACE("Leave NtUserEnableScrollBar, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } DWORD @@ -1334,14 +1337,14 @@ NtUserSetScrollInfo( PWND Window = NULL; NTSTATUS Status; SCROLLINFO ScrollInfo; - DECLARE_RETURN(DWORD); + DWORD Ret = 0; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserSetScrollInfo\n"); UserEnterExclusive(); if(!(Window = UserGetWindowObject(hWnd)) || UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) - RETURN(0); + goto Cleanup; // Return 0 UserRefObjectCo(Window, &Ref); @@ -1349,45 +1352,42 @@ NtUserSetScrollInfo( if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(0); + goto Cleanup; // Return 0 } - RETURN(co_IntSetScrollInfo(Window, fnBar, &ScrollInfo, bRedraw)); + Ret = co_IntSetScrollInfo(Window, fnBar, &ScrollInfo, bRedraw); -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserSetScrollInfo, ret=%lu\n", _ret_); + TRACE("Leave NtUserSetScrollInfo, ret=%lu\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } DWORD APIENTRY NtUserShowScrollBar(HWND hWnd, int nBar, DWORD bShow) { PWND Window; - DECLARE_RETURN(DWORD); - DWORD ret; + DWORD ret = 0; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserShowScrollBar\n"); UserEnterExclusive(); - if (!(Window = UserGetWindowObject(hWnd))) - RETURN(0); - - UserRefObjectCo(Window, &Ref); - ret = co_UserShowScrollBar(Window, nBar, (nBar == SB_VERT) ? 0 : bShow, - (nBar == SB_HORZ) ? 0 : bShow); - UserDerefObjectCo(Window); - - RETURN(ret); + Window = UserGetWindowObject(hWnd); + if (Window) + { + UserRefObjectCo(Window, &Ref); + ret = co_UserShowScrollBar(Window, nBar, (nBar == SB_VERT) ? 0 : bShow, + (nBar == SB_HORZ) ? 0 : bShow); + UserDerefObjectCo(Window); + } -CLEANUP: - TRACE("Leave NtUserShowScrollBar, ret%lu\n", _ret_); + TRACE("Leave NtUserShowScrollBar, ret=%lu\n", ret); UserLeave(); - END_CLEANUP; + return ret; } // Ugly NtUser API @@ -1405,14 +1405,14 @@ NtUserSetScrollBarInfo( LPSCROLLINFO psi; NTSTATUS Status; LONG Obj; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserSetScrollBarInfo\n"); UserEnterExclusive(); if(!(Window = UserGetWindowObject(hWnd))) - RETURN(FALSE); + goto Cleanup; // Return FALSE UserRefObjectCo(Window, &Ref); @@ -1421,17 +1421,17 @@ NtUserSetScrollBarInfo( { EngSetLastError(ERROR_INVALID_PARAMETER); ERR("Trying to set scrollinfo for unknown scrollbar type %d\n", Obj); - RETURN(FALSE); + goto Cleanup; // Return FALSE } if(!co_IntCreateScrollBars(Window)) - RETURN(FALSE); + goto Cleanup; // Return FALSE Status = MmCopyFromCaller(&Safeinfo, info, sizeof(SETSCROLLBARINFO)); if(!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(FALSE); + goto Cleanup; // Return FALSE } sbi = IntGetScrollbarInfoFromWindow(Window, Obj); @@ -1441,15 +1441,15 @@ NtUserSetScrollBarInfo( sbi->reserved = Safeinfo.reserved; RtlCopyMemory(&sbi->rgstate, &Safeinfo.rgstate, sizeof(Safeinfo.rgstate)); - RETURN(TRUE); + Ret = TRUE; -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserSetScrollBarInfo, ret=%i\n",_ret_); + TRACE("Leave NtUserSetScrollBarInfo, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* EOF */ diff --git a/win32ss/user/ntuser/scrollex.c b/win32ss/user/ntuser/scrollex.c index 82f248ec367..32370fabfc8 100644 --- a/win32ss/user/ntuser/scrollex.c +++ b/win32ss/user/ntuser/scrollex.c @@ -481,7 +481,7 @@ NtUserScrollDC( HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) { - DECLARE_RETURN(DWORD); + BOOL Ret = FALSE; DWORD Result; NTSTATUS Status = STATUS_SUCCESS; RECTL rcScroll, rcClip, rcUpdate; @@ -515,7 +515,7 @@ NtUserScrollDC( if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(FALSE); + goto Exit; // Return FALSE } Result = UserScrollDC( hDC, @@ -529,7 +529,7 @@ NtUserScrollDC( if(Result == ERROR) { /* FIXME: Only if hRgnUpdate is invalid we should SetLastError(ERROR_INVALID_HANDLE) */ - RETURN(FALSE); + goto Exit; // Return FALSE } if (prcUnsafeUpdate) @@ -548,16 +548,16 @@ NtUserScrollDC( { /* FIXME: SetLastError? */ /* FIXME: correct? We have already scrolled! */ - RETURN(FALSE); + goto Exit; // Return FALSE } } - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserScrollDC, ret=%lu\n",_ret_); +Exit: + TRACE("Leave NtUserScrollDC, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -578,8 +578,7 @@ NtUserScrollWindowEx( LPRECT prcUnsafeUpdate, UINT flags) { - DECLARE_RETURN(DWORD); - INT Result; + DWORD Result = ERROR; NTSTATUS Status = STATUS_SUCCESS; PWND Window = NULL; RECTL rcScroll, rcClip, rcUpdate; @@ -592,7 +591,7 @@ NtUserScrollWindowEx( if (!Window || !IntIsWindowDrawable(Window)) { Window = NULL; /* prevent deref at cleanup */ - RETURN(ERROR); + goto Cleanup; // Return ERROR } UserRefObjectCo(Window, &Ref); @@ -619,7 +618,7 @@ NtUserScrollWindowEx( if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(ERROR); + goto Cleanup; // Return ERROR } Result = IntScrollWindowEx(Window, @@ -647,19 +646,17 @@ NtUserScrollWindowEx( if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN(ERROR); + Result = ERROR; } } - RETURN(Result); - -CLEANUP: +Cleanup: if (Window) UserDerefObjectCo(Window); - TRACE("Leave NtUserScrollWindowEx, ret=%lu\n",_ret_); + TRACE("Leave NtUserScrollWindowEx, ret=%lu\n", Result); UserLeave(); - END_CLEANUP; + return Result; } /* EOF */ diff --git a/win32ss/user/ntuser/windc.c b/win32ss/user/ntuser/windc.c index 0f2d2781e30..40163ad443d 100644 --- a/win32ss/user/ntuser/windc.c +++ b/win32ss/user/ntuser/windc.c @@ -974,7 +974,7 @@ HDC APIENTRY NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) { PWND Wnd=NULL; - DECLARE_RETURN(HDC); + HDC Ret = NULL; TRACE("Enter NtUserGetDCEx: hWnd %p, ClipRegion %p, Flags %x.\n", hWnd, ClipRegion, Flags); @@ -982,14 +982,14 @@ NtUserGetDCEx(HWND hWnd OPTIONAL, HANDLE ClipRegion, ULONG Flags) if (hWnd && !(Wnd = UserGetWindowObject(hWnd))) { - RETURN(NULL); + goto Exit; // Return NULL } - RETURN( UserGetDCEx(Wnd, ClipRegion, Flags)); + Ret = UserGetDCEx(Wnd, ClipRegion, Flags); -CLEANUP: - TRACE("Leave NtUserGetDCEx, ret=%p\n", _ret_); +Exit: + TRACE("Leave NtUserGetDCEx, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 2ec319505d1..ccba1abcf9b 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -3392,21 +3392,21 @@ NtUserGetWindowPlacement(HWND hWnd, PWND Wnd; WINDOWPLACEMENT Safepl; NTSTATUS Status; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; TRACE("Enter NtUserGetWindowPlacement\n"); UserEnterShared(); if (!(Wnd = UserGetWindowObject(hWnd))) { - RETURN( FALSE); + goto Exit; // Return FALSE } Status = MmCopyFromCaller(&Safepl, lpwndpl, sizeof(WINDOWPLACEMENT)); if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Exit; // Return FALSE } Safepl.length = sizeof(WINDOWPLACEMENT); @@ -3417,15 +3417,15 @@ NtUserGetWindowPlacement(HWND hWnd, if (!NT_SUCCESS(Status)) { SetLastNtError(Status); - RETURN( FALSE); + goto Exit; // Return FALSE } - RETURN( TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserGetWindowPlacement, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserGetWindowPlacement, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } DWORD @@ -3512,9 +3512,8 @@ NtUserSetWindowPos( int cy, UINT uFlags) { - DECLARE_RETURN(BOOL); PWND Window, pWndIA; - BOOL ret; + BOOL ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserSetWindowPos\n"); @@ -3524,7 +3523,7 @@ NtUserSetWindowPos( UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { ERR("NtUserSetWindowPos bad window handle!\n"); - RETURN(FALSE); + goto Exit; // Return FALSE } if ( hWndInsertAfter != HWND_TOP && @@ -3536,7 +3535,7 @@ NtUserSetWindowPos( UserIsDesktopWindow(pWndIA) || UserIsMessageWindow(pWndIA)) { ERR("NtUserSetWindowPos bad insert window handle!\n"); - RETURN(FALSE); + goto Exit; // Return FALSE } } @@ -3560,12 +3559,10 @@ NtUserSetWindowPos( ret = co_WinPosSetWindowPos(Window, hWndInsertAfter, X, Y, cx, cy, uFlags); UserDerefObjectCo(Window); - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserSetWindowPos, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserSetWindowPos, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } /* @@ -3580,8 +3577,7 @@ NtUserSetWindowRgn( HRGN hrgnCopy = NULL; PWND Window; INT flags = (SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE); - BOOLEAN Ret = FALSE; - DECLARE_RETURN(INT); + INT Ret = 0; TRACE("Enter NtUserSetWindowRgn\n"); UserEnterExclusive(); @@ -3589,7 +3585,7 @@ NtUserSetWindowRgn( if (!(Window = UserGetWindowObject(hWnd)) || UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { - RETURN( 0); + goto Exit; // Return 0 } if (hRgn) // The region will be deleted in user32. @@ -3602,7 +3598,7 @@ NtUserSetWindowRgn( NtGdiCombineRgn( hrgnCopy, hRgn, 0, RGN_COPY); } else - RETURN( 0); + goto Exit; // Return 0 } //// HACK 1 : Work around the lack of supporting DeferWindowPos. @@ -3615,14 +3611,12 @@ NtUserSetWindowRgn( Window->hrgnNewFrame = HRGN_WINDOW; } //// HACK 2 - Ret = co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags|SWP_NOREDRAW) ); - - RETURN( (INT)Ret); + Ret = (INT)co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, bRedraw ? flags : (flags | SWP_NOREDRAW)); -CLEANUP: - TRACE("Leave NtUserSetWindowRgn, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserSetWindowRgn, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3640,7 +3634,7 @@ NtUserSetInternalWindowPos( PWND Wnd; RECT rect; POINT pt = {0}; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserSetWindowPlacement\n"); @@ -3649,7 +3643,7 @@ NtUserSetInternalWindowPos( if (!(Wnd = UserGetWindowObject(hwnd)) || // FIXME: UserIsDesktopWindow(Wnd) || UserIsMessageWindow(Wnd)) { - RETURN( FALSE); + goto Exit; // Return FALSE } _SEH2_TRY @@ -3668,7 +3662,7 @@ NtUserSetInternalWindowPos( _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( FALSE)); + _SEH2_YIELD(goto Exit); // Return FALSE } _SEH2_END @@ -3691,12 +3685,12 @@ NtUserSetInternalWindowPos( UserRefObjectCo(Wnd, &Ref); IntSetWindowPlacement(Wnd, &wndpl, flags); UserDerefObjectCo(Wnd); - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserSetWindowPlacement, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserSetWindowPlacement, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3709,7 +3703,7 @@ NtUserSetWindowPlacement(HWND hWnd, PWND Wnd; WINDOWPLACEMENT Safepl; UINT Flags; - DECLARE_RETURN(BOOL); + BOOL Ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserSetWindowPlacement\n"); @@ -3718,7 +3712,7 @@ NtUserSetWindowPlacement(HWND hWnd, if (!(Wnd = UserGetWindowObject(hWnd)) || UserIsDesktopWindow(Wnd) || UserIsMessageWindow(Wnd)) { - RETURN( FALSE); + goto Exit; // Return FALSE } _SEH2_TRY @@ -3729,13 +3723,13 @@ NtUserSetWindowPlacement(HWND hWnd, _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( FALSE)); + _SEH2_YIELD(goto Exit); // Return FALSE } _SEH2_END if(Safepl.length != sizeof(WINDOWPLACEMENT)) { - RETURN( FALSE); + goto Exit; // Return FALSE } Flags = PLACE_MAX | PLACE_RECT; @@ -3743,12 +3737,12 @@ NtUserSetWindowPlacement(HWND hWnd, UserRefObjectCo(Wnd, &Ref); IntSetWindowPlacement(Wnd, &Safepl, Flags); UserDerefObjectCo(Wnd); - RETURN(TRUE); + Ret = TRUE; -CLEANUP: - TRACE("Leave NtUserSetWindowPlacement, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserSetWindowPlacement, ret=%i\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* @@ -3758,8 +3752,8 @@ BOOL APIENTRY NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) { PWND Window; - BOOL ret; - DECLARE_RETURN(BOOL); + LRESULT Result; + BOOL ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserShowWindowAsync\n"); @@ -3768,26 +3762,24 @@ NtUserShowWindowAsync(HWND hWnd, LONG nCmdShow) if (!(Window = UserGetWindowObject(hWnd)) || UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { - RETURN(FALSE); + goto Exit; // Return FALSE } if ( nCmdShow > SW_MAX ) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(FALSE); + goto Exit; // Return FALSE } UserRefObjectCo(Window, &Ref); - ret = co_IntSendMessageNoWait( hWnd, WM_ASYNC_SHOWWINDOW, nCmdShow, 0 ); + Result = co_IntSendMessageNoWait( hWnd, WM_ASYNC_SHOWWINDOW, nCmdShow, 0 ); UserDerefObjectCo(Window); - if (-1 == (int) ret || !ret) ret = FALSE; - - RETURN(ret); + if (Result != -1 && Result != 0) ret = TRUE; -CLEANUP: - TRACE("Leave NtUserShowWindowAsync, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserShowWindowAsync, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } /* @@ -3797,8 +3789,7 @@ BOOL APIENTRY NtUserShowWindow(HWND hWnd, LONG nCmdShow) { PWND Window; - BOOL ret; - DECLARE_RETURN(BOOL); + BOOL ret = FALSE; USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserShowWindow hWnd %p SW_ %d\n",hWnd, nCmdShow); @@ -3807,25 +3798,23 @@ NtUserShowWindow(HWND hWnd, LONG nCmdShow) if (!(Window = UserGetWindowObject(hWnd)) || UserIsDesktopWindow(Window) || UserIsMessageWindow(Window)) { - RETURN(FALSE); + goto Exit; // Return FALSE } if ( nCmdShow > SW_MAX || Window->state2 & WNDS2_INDESTROY) { EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN(FALSE); + goto Exit; // Return FALSE } UserRefObjectCo(Window, &Ref); ret = co_WinPosShowWindow(Window, nCmdShow); UserDerefObjectCo(Window); - RETURN(ret); - -CLEANUP: - TRACE("Leave NtUserShowWindow, ret=%i\n",_ret_); +Exit: + TRACE("Leave NtUserShowWindow, ret=%i\n", ret); UserLeave(); - END_CLEANUP; + return ret; } @@ -3836,10 +3825,9 @@ HWND APIENTRY NtUserWindowFromPoint(LONG X, LONG Y) { POINT pt; - HWND Ret; - PWND DesktopWindow = NULL, Window = NULL; + HWND Ret = NULL; + PWND DesktopWindow, Window; USHORT hittest; - DECLARE_RETURN(HWND); USER_REFERENCE_ENTRY Ref; TRACE("Enter NtUserWindowFromPoint\n"); @@ -3858,23 +3846,17 @@ NtUserWindowFromPoint(LONG X, LONG Y) //pti = PsGetCurrentThreadWin32Thread(); Window = co_WinPosWindowFromPoint(DesktopWindow, &pt, &hittest, FALSE); - if (Window) { Ret = UserHMGetHandle(Window); - - RETURN( Ret); } - } - - RETURN( NULL); -CLEANUP: - if (DesktopWindow) UserDerefObjectCo(DesktopWindow); + UserDerefObjectCo(DesktopWindow); + } - TRACE("Leave NtUserWindowFromPoint, ret=%p\n", _ret_); + TRACE("Leave NtUserWindowFromPoint, ret=%p\n", Ret); UserLeave(); - END_CLEANUP; + return Ret; } /* EOF */

1 year, 6 months

[reactos] 01/01: [SDK] msctf.idl: Add ITfCleanupContextSink

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5b0c66a054be40da91b9… commit f5b0c66a054be40da91b9332f2798045f29bc75b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 12:44:07 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 21 12:44:07 2023 +0900 [SDK] msctf.idl: Add ITfCleanupContextSink CORE-19360 --- sdk/include/psdk/msctf.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sdk/include/psdk/msctf.idl b/sdk/include/psdk/msctf.idl index 4a4425f95fb..2cbb888f3d3 100644 --- a/sdk/include/psdk/msctf.idl +++ b/sdk/include/psdk/msctf.idl @@ -106,6 +106,7 @@ interface ITfCompositionView; interface ITfKeyEventSink; interface ITfPersistentPropertyLoaderACP; interface ITfRangeACP; +interface ITfCleanupContextSink; cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; @@ -1508,6 +1509,18 @@ interface ITfCompositionSink : IUnknown [in] ITfComposition *pComposition); } +[ + object, + uuid(01689689-7acb-4e9b-ab7c-7ea46b12b522), + pointer_default(unique) +] +interface ITfCleanupContextSink : IUnknown +{ + HRESULT OnCleanupContext( + [in] TfEditCookie ecWrite, + [in] ITfContext *pic); +} + [ object, uuid(d40C8aae-aC92-4fc7-9a11-0ee0e23aa39b),

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Half-implement CicBridge::ActivateIMMX/DeactivateIMMX

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3401a99e0f2bedb195f69… commit 3401a99e0f2bedb195f6978671063f9b2a3341e3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 12:02:21 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 21 12:02:21 2023 +0900 [MSCTFIME] Half-implement CicBridge::ActivateIMMX/DeactivateIMMX CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 172 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 168 insertions(+), 4 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index c63aab280f3..047dbfe3ccd 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -15,6 +15,8 @@ DWORD g_dwOSInfo = 0; BOOL gfTFInitLib = FALSE; CRITICAL_SECTION g_csLock; +DEFINE_GUID(GUID_COMPARTMENT_CTFIME_DIMFLAGS, 0xA94C5FD2, 0xC471, 0x4031, 0x95, 0x46, 0x70, 0x9C, 0x17, 0x30, 0x0C, 0xB9); + UINT WM_MSIME_SERVICE = 0; UINT WM_MSIME_UIREADY = 0; UINT WM_MSIME_RECONVERTREQUEST = 0; @@ -944,13 +946,52 @@ HRESULT CThreadMgrEventSink::_Unadvise() return hr; } +/* FIXME */ +class CFunctionProvider : public IUnknown +{ +public: + CFunctionProvider(TfClientId clientId) + { + } + + // IUnknown interface + STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppvObj) override; + STDMETHODIMP_(ULONG) AddRef() override; + STDMETHODIMP_(ULONG) Release() override; +}; + +/** + * @unimplemented + */ +STDMETHODIMP CFunctionProvider::QueryInterface(REFIID riid, LPVOID* ppvObj) +{ + return E_NOTIMPL; +} + +/** + * @unimplemented + */ +STDMETHODIMP_(ULONG) CFunctionProvider::AddRef() +{ + return 1; +} + +/** + * @unimplemented + */ +STDMETHODIMP_(ULONG) CFunctionProvider::Release() +{ + return 0; +} + /* FIXME */ class CicBridge : public ITfSysHookSink { protected: LONG m_cRefs; DWORD m_dwImmxInit; - DWORD m_dw[3]; + DWORD m_dw[2]; + DWORD m_cActivateLocks; ITfKeystrokeMgr *m_pKeystrokeMgr; ITfDocumentMgr *m_pDocMgr; CThreadMgrEventSink *m_pThreadMgrEventSink; @@ -958,6 +999,9 @@ protected: LIBTHREAD m_LibThread; DWORD m_dw21; + static BOOL CALLBACK EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam); + static BOOL CALLBACK EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam); + public: CicBridge(); virtual ~CicBridge(); @@ -976,6 +1020,8 @@ public: BOOL UnInitIMMX(TLS *pTLS); HRESULT ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); + + HRESULT CreateInputContext(TLS *pTLS, HIMC hIMC); HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); void PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs); @@ -1335,7 +1381,9 @@ public: CicBridge *m_pBridge; CicProfile *m_pProfile; ITfThreadMgr *m_pThreadMgr; - DWORD m_dwUnknown2[4]; + DWORD m_dwFlags1; + DWORD m_dwFlags2; + DWORD m_dwUnknown2[2]; DWORD m_dwNowOpening; DWORD m_NonEAComposition; DWORD m_cWnds; @@ -1532,6 +1580,14 @@ CicBridge::~CicBridge() UnInitIMMX(pTLS); } +/** + * @unimplemented + */ +HRESULT CicBridge::CreateInputContext(TLS *pTLS, HIMC hIMC) +{ + return E_NOTIMPL; +} + /** * @implemented */ @@ -1573,12 +1629,83 @@ HRESULT CicBridge::DestroyInputContext(TLS *pTLS, HIMC hIMC) return hr; } +typedef struct ENUM_CREATE_DESTROY_IC +{ + TLS *m_pTLS; + CicBridge *m_pBridge; +} ENUM_CREATE_DESTROY_IC, *PENUM_CREATE_DESTROY_IC; + +BOOL CALLBACK CicBridge::EnumCreateInputContextCallback(HIMC hIMC, LPARAM lParam) +{ + PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; + pData->m_pBridge->CreateInputContext(pData->m_pTLS, hIMC); + return TRUE; +} + +BOOL CALLBACK CicBridge::EnumDestroyInputContextCallback(HIMC hIMC, LPARAM lParam) +{ + PENUM_CREATE_DESTROY_IC pData = (PENUM_CREATE_DESTROY_IC)lParam; + pData->m_pBridge->DestroyInputContext(pData->m_pTLS, hIMC); + return TRUE; +} + /** * @unimplemented */ HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) { - return E_NOTIMPL; + //FIXME + + if (m_cActivateLocks++ != 0) + return S_OK; + + ITfSourceSingle *pSource = NULL; + HRESULT hr = pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void**)&pSource); + if (FAILED(hr)) + { + DeactivateIMMX(pTLS, pThreadMgr); + return hr; + } + + CFunctionProvider *pProvider = new CFunctionProvider(m_cliendId); + if (!pProvider) + { + hr = E_FAIL; + goto Finish; + } + + pSource->AdviseSingleSink(m_cliendId, IID_ITfFunctionProvider, pProvider); + pProvider->Release(); + + if (!m_pDocMgr) + { + hr = pThreadMgr->CreateDocumentMgr(&m_pDocMgr); + if (FAILED(hr)) + { + hr = E_FAIL; + goto Finish; + } + + SetCompartmentDWORD(m_cliendId, m_pDocMgr, GUID_COMPARTMENT_CTFIME_DIMFLAGS, TRUE, FALSE); + } + + //FIXME + + hr = S_OK; + if (pTLS->m_dwUnknown2[1] & 1) + { + ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; + ImmEnumInputContext(0, CicBridge::EnumCreateInputContextCallback, (LPARAM)&Data); + } + +Finish: + if (FAILED(hr)) + DeactivateIMMX(pTLS, pThreadMgr); + + if (pSource) + pSource->Release(); + + return hr; } /** @@ -1586,7 +1713,44 @@ HRESULT CicBridge::ActivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) */ HRESULT CicBridge::DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr) { - return E_NOTIMPL; + if (m_dw[1] & 1) + return TRUE; + + m_dw[1] |= 1; + + if (m_cliendId) + { + ENUM_CREATE_DESTROY_IC Data = { pTLS, this }; + ImmEnumInputContext(0, CicBridge::EnumDestroyInputContextCallback, (LPARAM)&Data); + pTLS->m_dwUnknown2[1] |= 1u; + + ITfSourceSingle *pSource = NULL; + if (pThreadMgr->QueryInterface(IID_ITfSourceSingle, (void **)&pSource) == S_OK) + pSource->UnadviseSingleSink(m_cliendId, IID_ITfFunctionProvider); + + m_cliendId = 0; + + while (m_cActivateLocks > 0) + { + --m_cActivateLocks; + pThreadMgr->Deactivate(); + } + + if (pSource) + pSource->Release(); + } + + if (m_pDocMgr) + { + m_pDocMgr->Release(); + m_pDocMgr = NULL; + } + + //FIXME + + m_dw[1] &= ~1; + + return S_OK; } /**

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Implement CicInputContext::GetGuidAtom

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6cb6d257a6f6d9c4aa28… commit e6cb6d257a6f6d9c4aa283419525ddc039edde96 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 11:04:02 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 21 11:04:02 2023 +0900 [MSCTFIME] Implement CicInputContext::GetGuidAtom CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index f5f2e592ea4..c63aab280f3 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -503,10 +503,32 @@ HRESULT CCompartmentEventSink::_Unadvise() * CicInputContext */ +class CInputContextOwnerCallBack; + /* FIXME */ class CicInputContext : public ITfContextOwnerCompositionSink { + DWORD m_dw[2]; LONG m_cRefs; + HIMC m_hIMC; + ITfDocumentMgr *m_pDocumentMgr; + ITfContext *m_pContext; + DWORD m_dw0_0[1]; + CInputContextOwnerCallBack *m_pICOwnerCallback; + DWORD m_dw0; + CCompartmentEventSink *m_pCompEventSink1; + CCompartmentEventSink *m_pCompEventSink2; + DWORD m_dw0_5[4]; + DWORD m_dw1[2]; + DWORD m_dwQueryPos; + DWORD m_dw1_5[1]; + GUID m_guid; + DWORD m_dw2[19]; + WORD m_cGuidAtoms; + WORD m_padding; + DWORD m_adwGuidAtoms[256]; + DWORD m_dw3[19]; + public: CicInputContext() { @@ -529,7 +551,7 @@ public: HRESULT GetGuidAtom( _Inout_ IMCLock& imcLock, - _In_ DWORD dwUnknown, + _In_ BYTE iAtom, _Out_opt_ LPDWORD pdwGuidAtom); HRESULT DestroyInputContext(); @@ -612,24 +634,28 @@ CicInputContext::OnEndComposition( } /** - * @unimplemented + * @implemented */ HRESULT CicInputContext::GetGuidAtom( _Inout_ IMCLock& imcLock, - _In_ DWORD dwUnknown, + _In_ BYTE iAtom, _Out_opt_ LPDWORD pdwGuidAtom) { IMCCLock<CTFIMECONTEXT> imeContext(imcLock.get().hCompStr); - HRESULT hr = imeContext.m_hr; if (!imeContext) hr = E_FAIL; - if (FAILED(hr)) return hr; - // FIXME + hr = E_FAIL; + if (iAtom < m_cGuidAtoms) + { + *pdwGuidAtom = m_adwGuidAtoms[iAtom]; + hr = S_OK; + } + return hr; }

1 year, 6 months

[reactos] 01/01: [MSCTFIME] Fix compartment code

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee73267db86fec0dd6dd8… commit ee73267db86fec0dd6dd85738d52b7db96f88e96 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 21 10:42:06 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Dec 21 10:42:06 2023 +0900 [MSCTFIME] Fix compartment code Fix some mistakes. CORE-19360 --- dll/ime/msctfime/msctfime.cpp | 94 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 14 deletions(-) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 5a3e8c94830..f5f2e592ea4 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -168,6 +168,9 @@ void TFUninitLib_Thread(PLIBTHREAD pLibThread) * Compartment */ +/** + * @implemented + */ HRESULT GetCompartment( IUnknown *pUnknown, @@ -175,10 +178,11 @@ GetCompartment( ITfCompartment **ppComp, BOOL bThread) { + *ppComp = NULL; + ITfThreadMgr *pThreadMgr = NULL; ITfCompartmentMgr *pCompMgr = NULL; - *ppComp = NULL; HRESULT hr; if (bThread) { @@ -195,10 +199,12 @@ GetCompartment( if (SUCCEEDED(hr)) { + hr = E_FAIL; if (pCompMgr) + { hr = pCompMgr->GetCompartment(rguid, ppComp); - else - hr = E_FAIL; + pCompMgr->Release(); + } } if (pThreadMgr) @@ -207,12 +213,15 @@ GetCompartment( return hr; } +/** + * @implemented + */ HRESULT SetCompartmentDWORD( TfEditCookie cookie, IUnknown *pUnknown, REFGUID rguid, - VARTYPE type, + DWORD dwValue, BOOL bThread) { ITfCompartment *pComp = NULL; @@ -221,38 +230,49 @@ SetCompartmentDWORD( return hr; VARIANT vari; - V_I4(&vari) = type; + V_I4(&vari) = dwValue; V_VT(&vari) = VT_I4; hr = pComp->SetValue(cookie, &vari); - pComp->Release(); + pComp->Release(); return hr; } +/** + * @implemented + */ HRESULT GetCompartmentDWORD( IUnknown *pUnknown, REFGUID rguid, - ITfCompartment *pComp, + LPDWORD pdwValue, BOOL bThread) { + *pdwValue = 0; + + ITfCompartment *pComp = NULL; HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, bThread); if (FAILED(hr)) return hr; VARIANT vari; hr = pComp->GetValue(&vari); - pComp->Release(); + if (hr == S_OK) + *pdwValue = V_I4(&vari); + pComp->Release(); return hr; } +/** + * @implemented + */ HRESULT SetCompartmentUnknown( TfEditCookie cookie, IUnknown *pUnknown, REFGUID rguid, - IUnknown *pUnknown2) + IUnknown *punkValue) { ITfCompartment *pComp = NULL; HRESULT hr = GetCompartment(pUnknown, rguid, &pComp, FALSE); @@ -260,14 +280,17 @@ SetCompartmentUnknown( return hr; VARIANT vari; - V_UNKNOWN(&vari) = pUnknown2; + V_UNKNOWN(&vari) = punkValue; V_VT(&vari) = VT_UNKNOWN; hr = pComp->SetValue(cookie, &vari); - pComp->Release(); + pComp->Release(); return hr; } +/** + * @implemented + */ HRESULT ClearCompartment( TfClientId tid, @@ -327,7 +350,7 @@ public: CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pUserData); virtual ~CCompartmentEventSink(); - HRESULT _Advise(IUnknown *pUnknown, REFGUID rguid, ITfCompartment *pComp); + HRESULT _Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread); HRESULT _Unadvise(); // IUnknown interface @@ -339,6 +362,9 @@ public: STDMETHODIMP OnChange(REFGUID rguid) override; }; +/** + * @implemented + */ CCompartmentEventSink::CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pUserData) : m_array(8) , m_cRefs(1) @@ -347,10 +373,16 @@ CCompartmentEventSink::CCompartmentEventSink(FN_EVENTSINK fnEventSink, LPVOID pU { } +/** + * @implemented + */ CCompartmentEventSink::~CCompartmentEventSink() { } +/** + * @implemented + */ STDMETHODIMP CCompartmentEventSink::QueryInterface(REFIID riid, LPVOID* ppvObj) { if (IsEqualIID(riid, IID_IUnknown) || IsEqualIID(riid, IID_ITfCompartmentEventSink)) @@ -364,11 +396,17 @@ STDMETHODIMP CCompartmentEventSink::QueryInterface(REFIID riid, LPVOID* ppvObj) return E_NOINTERFACE; } +/** + * @implemented + */ STDMETHODIMP_(ULONG) CCompartmentEventSink::AddRef() { return ::InterlockedIncrement(&m_cRefs); } +/** + * @implemented + */ STDMETHODIMP_(ULONG) CCompartmentEventSink::Release() { if (::InterlockedDecrement(&m_cRefs) == 0) @@ -379,13 +417,19 @@ STDMETHODIMP_(ULONG) CCompartmentEventSink::Release() return m_cRefs; } +/** + * @implemented + */ STDMETHODIMP CCompartmentEventSink::OnChange(REFGUID rguid) { return m_fnEventSink(m_pUserData, rguid); } +/** + * @implemented + */ HRESULT -CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, ITfCompartment *pComp) +CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, BOOL bThread) { CESMAP *pCesMap = (CESMAP *)m_array.Append(1); if (!pCesMap) @@ -393,7 +437,7 @@ CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, ITfCompartment ITfSource *pSource = NULL; - HRESULT hr = GetCompartment(pUnknown, rguid, &pCesMap->m_pComp, !!pComp); + HRESULT hr = GetCompartment(pUnknown, rguid, &pCesMap->m_pComp, bThread); if (FAILED(hr)) { hr = pCesMap->m_pComp->QueryInterface(IID_ITfSource, (void **)&pSource); @@ -422,6 +466,9 @@ CCompartmentEventSink::_Advise(IUnknown *pUnknown, REFGUID rguid, ITfCompartment return hr; } +/** + * @implemented + */ HRESULT CCompartmentEventSink::_Unadvise() { CESMAP *pCesMap = (CESMAP *)m_array.m_pb; @@ -905,6 +952,8 @@ public: HRESULT DeactivateIMMX(TLS *pTLS, ITfThreadMgr *pThreadMgr); HRESULT DestroyInputContext(TLS *pTLS, HIMC hIMC); + void PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs); + HRESULT ConfigureGeneral(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd); HRESULT ConfigureRegisterWord(TLS* pTLS, ITfThreadMgr *pThreadMgr, HKL hKL, HWND hWnd, LPVOID lpData); }; @@ -1644,6 +1693,20 @@ STDMETHODIMP CicBridge::OnSysShellProc(INT, UINT, LONG) return S_OK; } +/** + * @implemented + */ +void CicBridge::PostTransMsg(HWND hWnd, INT cTransMsgs, LPTRANSMSG pTransMsgs) +{ + for (INT i = 0; i < cTransMsgs; ++i, ++pTransMsgs) + { + ::PostMessageW(hWnd, pTransMsgs->message, pTransMsgs->wParam, pTransMsgs->lParam); + } +} + +/** + * @implemented + */ HRESULT CicBridge::ConfigureGeneral( TLS* pTLS, @@ -1680,6 +1743,9 @@ CicBridge::ConfigureGeneral( return hr; } +/** + * @implemented + */ HRESULT CicBridge::ConfigureRegisterWord( TLS* pTLS,

1 year, 6 months

[reactos] 01/01: [SETUPAPI] CMP_RegisterNotification: Do not fail if we cannot retrieve a window title

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9277f5352a48f247a393d… commit 9277f5352a48f247a393d02d50b1ecb713738dac Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Dec 20 15:20:01 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Dec 20 15:20:01 2023 +0100 [SETUPAPI] CMP_RegisterNotification: Do not fail if we cannot retrieve a window title --- dll/win32/setupapi/cfgmgr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index b292a3c391d..ef29d045f8c 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -636,6 +636,8 @@ CMP_RegisterNotification( pNotifyData->ulMagic = NOTIFY_MAGIC; pNotifyData->hNotifyHandle = NULL; + ZeroMemory(szNameBuffer, sizeof(szNameBuffer)); + if ((ulFlags & DEVICE_NOTIFY_SERVICE_HANDLE) == DEVICE_NOTIFY_WINDOW_HANDLE) { FIXME("Register a window\n"); @@ -645,8 +647,12 @@ CMP_RegisterNotification( ARRAYSIZE(szNameBuffer)); if (nLength == 0) { - HeapFree(GetProcessHeap(), 0, pNotifyData); - return CR_INVALID_DATA; + + } + + if (nLength == 0) + { + szNameBuffer[0] = UNICODE_NULL; } FIXME("Register window: %S\n", szNameBuffer);

1 year, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs