Ros-diffs February 2022

ros-diffs@reactos.org

17 participants
108 discussions

[reactos] 02/02: [SHELL32_APITEST] ShellExecuteEx: Add test for 'properties' verb

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f80de47c854f81bc8f3a1… commit f80de47c854f81bc8f3a1d7e45905097dab2c286 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 1 23:22:44 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Feb 3 21:50:34 2022 +0100 [SHELL32_APITEST] ShellExecuteEx: Add test for 'properties' verb CORE-18035 --- .../rostests/apitests/shell32/ShellExecuteEx.cpp | 99 +++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp index 6f32157e66b..3e33c075d10 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp @@ -256,7 +256,11 @@ static VOID DoTestEntry(const TEST_ENTRY *pEntry) free(s_wi1.phwnd); ZeroMemory(&s_wi1, sizeof(s_wi1)); - WaitForSingleObject(info.hProcess, INFINITE); + if (WaitForSingleObject(info.hProcess, 10 * 1000) == WAIT_TIMEOUT) + { + TerminateProcess(info.hProcess, 11); + ok(0, "Process %s did not quit!\n", pEntry->file); + } CloseHandle(info.hProcess); } @@ -364,8 +368,101 @@ static void DoTestEntries(void) free(s_wi0.phwnd); } +WCHAR* ExeName = NULL; + +BOOL CALLBACK EnumProc(_In_ HWND hwnd, _In_ LPARAM lParam) +{ + DWORD pid = 0; + GetWindowThreadProcessId(hwnd, &pid); + if (pid == GetCurrentProcessId() && + IsWindowVisible(hwnd)) + { + WCHAR Buffer[512] = {0}; + + GetWindowTextW(hwnd, Buffer, _countof(Buffer) - 1); + if (Buffer[0] && StrStrIW(Buffer, ExeName)) + { + HWND* pHwnd = (HWND*)lParam; + *pHwnd = hwnd; + return FALSE; + } + } + return TRUE; +} + +BOOL WaitAndCloseWindow() +{ + HWND hWnd = NULL; + for (int n = 0; n < 100; ++n) + { + Sleep(50); + + EnumWindows(EnumProc, (LPARAM)&hWnd); + + if (hWnd) + { + SendMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + return TRUE; + break; + } + } + return FALSE; +} + +static void test_properties() +{ + WCHAR Buffer[MAX_PATH * 4]; + + CoInitialize(NULL); + + GetModuleFileNameW(NULL, Buffer, _countof(Buffer)); + SHELLEXECUTEINFOW info = { 0 }; + + info.cbSize = sizeof(SHELLEXECUTEINFOW); + info.fMask = SEE_MASK_INVOKEIDLIST | SEE_MASK_FLAG_NO_UI; + info.lpVerb = L"properties"; + info.lpFile = Buffer; + info.lpParameters = L""; + info.nShow = SW_SHOW; + + BOOL bRet = ShellExecuteExW(&info); + ok(bRet, "Failed! (GetLastError(): %d)\n", (int)GetLastError()); + ok_ptr(info.hInstApp, (HINSTANCE)42); + + ExeName = PathFindFileNameW(Buffer); + WCHAR* Extension = PathFindExtensionW(Buffer); + if (Extension) + { + // The inclusion of this depends on the file display settings! + *Extension = UNICODE_NULL; + } + + if (bRet) + { + ok(WaitAndCloseWindow(), "Could not find properties window!\n"); + } + + // Now retry it with the extension cut off + bRet = ShellExecuteExW(&info); + ok(bRet, "Failed! (GetLastError(): %d)\n", (int)GetLastError()); + ok_ptr(info.hInstApp, (HINSTANCE)42); + + if (bRet) + { + ok(WaitAndCloseWindow(), "Could not find properties window!\n"); + } + + info.lpFile = L"complete garbage, cannot run this!"; + + // Now retry it with complete garabage + bRet = ShellExecuteExW(&info); + ok(bRet == 0, "Succeeded!\n"); + ok_ptr(info.hInstApp, (HINSTANCE)2); +} + START_TEST(ShellExecuteEx) { DoAppPathTest(); DoTestEntries(); + test_properties(); }

2 years, 7 months

[reactos] 01/02: [PSDK] Add some parameter names

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d40d642f03cb928bd5442… commit d40d642f03cb928bd54422311086f2683570129a Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Feb 1 22:47:44 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Feb 3 21:50:34 2022 +0100 [PSDK] Add some parameter names --- sdk/include/psdk/shlobj.h | 10 +++++----- sdk/include/psdk/shlwapi.h | 44 +++++++++++++++++++++---------------------- sdk/include/psdk/shobjidl.idl | 2 ++ sdk/include/psdk/winbase.h | 6 +++--- sdk/include/psdk/winuser.h | 12 ++++++------ 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 9423e15c4b0..2fe6cf1d047 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -222,11 +222,11 @@ HRESULT WINAPI SHLoadOLE(LPARAM); HRESULT WINAPI SHParseDisplayName( - _In_ PCWSTR, - _In_opt_ IBindCtx*, - _Outptr_ PIDLIST_ABSOLUTE*, - _In_ SFGAOF, - _Out_opt_ SFGAOF*); + _In_ PCWSTR pszName, + _In_opt_ IBindCtx* pbc, + _Outptr_ PIDLIST_ABSOLUTE* ppidl, + _In_ SFGAOF sfgaoIn, + _Out_opt_ SFGAOF* psfgaoOut); HRESULT WINAPI diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 0532387388a..84241ba4a58 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -894,20 +894,20 @@ PathCreateFromUrlW( HRESULT WINAPI PathCreateFromUrlAlloc(_In_ LPCWSTR pszUrl, _Outptr_ LPWSTR* pszPath, DWORD dwReserved); -BOOL WINAPI PathFileExistsA(_In_ LPCSTR); -BOOL WINAPI PathFileExistsW(_In_ LPCWSTR); +BOOL WINAPI PathFileExistsA(_In_ LPCSTR pszPath); +BOOL WINAPI PathFileExistsW(_In_ LPCWSTR pszPath); #define PathFileExists WINELIB_NAME_AW(PathFileExists) -BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR,DWORD*); -BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR,DWORD*); +BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR lpszPath,DWORD* dwAttr); +BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR lpszPath,DWORD* dwAttr); #define PathFileExistsAndAttributes WINELIB_NAME_AW(PathFileExistsAndAttributes) -LPSTR WINAPI PathFindExtensionA(_In_ LPCSTR); -LPWSTR WINAPI PathFindExtensionW(_In_ LPCWSTR); +LPSTR WINAPI PathFindExtensionA(_In_ LPCSTR pszPath); +LPWSTR WINAPI PathFindExtensionW(_In_ LPCWSTR pszPath); #define PathFindExtension WINELIB_NAME_AW(PathFindExtension) -LPSTR WINAPI PathFindFileNameA(_In_ LPCSTR); -LPWSTR WINAPI PathFindFileNameW(_In_ LPCWSTR); +LPSTR WINAPI PathFindFileNameA(_In_ LPCSTR pszPath); +LPWSTR WINAPI PathFindFileNameW(_In_ LPCWSTR pszPath); #define PathFindFileName WINELIB_NAME_AW(PathFindFileName) LPSTR WINAPI PathFindNextComponentA(_In_ LPCSTR); @@ -918,12 +918,12 @@ BOOL WINAPI PathFindOnPathA(_Inout_updates_(MAX_PATH) LPSTR, _In_opt_ LPCSTR*); BOOL WINAPI PathFindOnPathW(_Inout_updates_(MAX_PATH) LPWSTR, _In_opt_ LPCWSTR*); #define PathFindOnPath WINELIB_NAME_AW(PathFindOnPath) -LPSTR WINAPI PathGetArgsA(_In_ LPCSTR); -LPWSTR WINAPI PathGetArgsW(_In_ LPCWSTR); +LPSTR WINAPI PathGetArgsA(_In_ LPCSTR pszPath); +LPWSTR WINAPI PathGetArgsW(_In_ LPCWSTR pszPath); #define PathGetArgs WINELIB_NAME_AW(PathGetArgs) -UINT WINAPI PathGetCharTypeA(_In_ UCHAR); -UINT WINAPI PathGetCharTypeW(_In_ WCHAR); +UINT WINAPI PathGetCharTypeA(_In_ UCHAR ch); +UINT WINAPI PathGetCharTypeW(_In_ WCHAR ch); #define PathGetCharType WINELIB_NAME_AW(PathGetCharType) int WINAPI PathGetDriveNumberA(_In_ LPCSTR); @@ -1632,16 +1632,16 @@ LPSTR WINAPI StrRStrIA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_ LPCSTR); LPWSTR WINAPI StrRStrIW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ LPCWSTR); #define StrRStrI WINELIB_NAME_AW(StrRStrI) -int WINAPI StrSpnA(_In_ LPCSTR, _In_ LPCSTR); -int WINAPI StrSpnW(_In_ LPCWSTR, _In_ LPCWSTR); +int WINAPI StrSpnA(_In_ LPCSTR psz, _In_ LPCSTR pszSet); +int WINAPI StrSpnW(_In_ LPCWSTR psz, _In_ LPCWSTR pszSet); #define StrSpn WINELIB_NAME_AW(StrSpn) -LPSTR WINAPI StrStrA(_In_ LPCSTR, _In_ LPCSTR); -LPWSTR WINAPI StrStrW(_In_ LPCWSTR, _In_ LPCWSTR); +LPSTR WINAPI StrStrA(_In_ LPCSTR pszFirst, _In_ LPCSTR pszSrch); +LPWSTR WINAPI StrStrW(_In_ LPCWSTR pszFirst, _In_ LPCWSTR pszSrch); #define StrStr WINELIB_NAME_AW(StrStr) -LPSTR WINAPI StrStrIA(_In_ LPCSTR, _In_ LPCSTR); -LPWSTR WINAPI StrStrIW(_In_ LPCWSTR, _In_ LPCWSTR); +LPSTR WINAPI StrStrIA(_In_ LPCSTR pszFirst, _In_ LPCSTR pszSrch); +LPWSTR WINAPI StrStrIW(_In_ LPCWSTR pszFirst, _In_ LPCWSTR pszSrch); #define StrStrI WINELIB_NAME_AW(StrStrI) LPWSTR WINAPI StrStrNW(_In_ LPCWSTR, _In_ LPCWSTR, UINT); @@ -1941,10 +1941,10 @@ HRESULT WINAPI SHReleaseThreadRef(void); BOOL WINAPI SHCreateThread( - _In_ LPTHREAD_START_ROUTINE, - _In_opt_ void*, - _In_ DWORD, - _In_opt_ LPTHREAD_START_ROUTINE); + _In_ LPTHREAD_START_ROUTINE pfnThreadProc, + _In_opt_ void* pData, + _In_ DWORD flags, + _In_opt_ LPTHREAD_START_ROUTINE pfnCallback); BOOL WINAPI SHSkipJunction(_In_opt_ struct IBindCtx*, _In_ const CLSID*); diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index cbb9892655c..54bf45a34c2 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -216,6 +216,8 @@ interface IShellFolder : IUnknown cpp_quote("#define SFGAO_NEWCONTENT 0x00200000L") cpp_quote("#define SFGAO_STREAM 0x00400000L") cpp_quote("#define SFGAO_STORAGEANCESTOR 0x00800000L") + cpp_quote("#define SFGAO_STORAGECAPMASK 0x70C50008L") + cpp_quote("#define SFGAO_PKEYSFGAOMASK 0x81044000L") typedef ULONG SFGAOF; diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 9cf4147563a..2db990d47c2 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -2549,7 +2549,7 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD); UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT); UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT); -DWORD WINAPI GetWindowThreadProcessId(HWND,PDWORD); +DWORD WINAPI GetWindowThreadProcessId(HWND hWnd,PDWORD lpdwProcessId); UINT WINAPI GetWriteWatch(DWORD,PVOID,SIZE_T,PVOID*,PULONG_PTR,PULONG); ATOM WINAPI GlobalAddAtomA(_In_opt_ LPCSTR); ATOM WINAPI GlobalAddAtomW(_In_opt_ LPCWSTR); @@ -3214,8 +3214,8 @@ void WINAPI SwitchToFiber(_In_ PVOID); BOOL WINAPI SwitchToThread(void); BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME); BOOL WINAPI SystemTimeToTzSpecificLocalTime(CONST TIME_ZONE_INFORMATION*,CONST SYSTEMTIME*,LPSYSTEMTIME); -BOOL WINAPI TerminateProcess(HANDLE,UINT); -BOOL WINAPI TerminateThread(HANDLE,DWORD); +BOOL WINAPI TerminateProcess(HANDLE hProcess, UINT uExitCode); +BOOL WINAPI TerminateThread(HANDLE hThread,DWORD dwExitCode); DWORD WINAPI TlsAlloc(VOID); BOOL WINAPI TlsFree(DWORD); PVOID WINAPI TlsGetValue(DWORD); diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 0b5f2cd04cd..4af5369cca5 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -4505,13 +4505,13 @@ BOOL WINAPI EnumDisplayDevicesW(_In_opt_ LPCWSTR, _In_ DWORD, _Inout_ PDISPLAY_D #endif int WINAPI EnumPropsA(_In_ HWND, _In_ PROPENUMPROCA); int WINAPI EnumPropsW(_In_ HWND, _In_ PROPENUMPROCW); -int WINAPI EnumPropsExA(_In_ HWND, _In_ PROPENUMPROCEXA, _In_ LPARAM); -int WINAPI EnumPropsExW(_In_ HWND, _In_ PROPENUMPROCEXW, _In_ LPARAM); +int WINAPI EnumPropsExA(_In_ HWND, _In_ PROPENUMPROCEXA, _In_ LPARAM lParam); +int WINAPI EnumPropsExW(_In_ HWND, _In_ PROPENUMPROCEXW, _In_ LPARAM lParam); #define EnumTaskWindows(h,f,p) EnumThreadWindows((DWORD)h,f,p) BOOL WINAPI EnumThreadWindows(_In_ DWORD, _In_ WNDENUMPROC, _In_ LPARAM); -BOOL WINAPI EnumWindows(_In_ WNDENUMPROC, _In_ LPARAM); -BOOL WINAPI EnumWindowStationsA(_In_ WINSTAENUMPROCA, _In_ LPARAM); -BOOL WINAPI EnumWindowStationsW(_In_ WINSTAENUMPROCW, _In_ LPARAM); +BOOL WINAPI EnumWindows(_In_ WNDENUMPROC lpEnumFunc, _In_ LPARAM lParam); +BOOL WINAPI EnumWindowStationsA(_In_ WINSTAENUMPROCA, _In_ LPARAM lParam); +BOOL WINAPI EnumWindowStationsW(_In_ WINSTAENUMPROCW, _In_ LPARAM lParam); BOOL WINAPI EqualRect(_In_ LPCRECT, _In_ LPCRECT); #define ExitWindows(r,c) ExitWindowsEx(EWX_LOGOFF,0) BOOL WINAPI ExitWindowsEx(_In_ UINT, _In_ DWORD); @@ -4658,7 +4658,7 @@ HWND WINAPI GetLastActivePopup(_In_ HWND); HMENU WINAPI GetMenu(_In_ HWND); LONG WINAPI GetMenuCheckMarkDimensions(void); DWORD WINAPI GetMenuContextHelpId(_In_ HMENU); -UINT WINAPI GetMenuDefaultItem(_In_ HMENU, _In_ UINT, _In_ UINT); +UINT WINAPI GetMenuDefaultItem(_In_ HMENU hMenu, _In_ UINT fByPos, _In_ UINT gmdiFlags); int WINAPI GetMenuItemCount(_In_opt_ HMENU); UINT WINAPI GetMenuItemID(_In_ HMENU, _In_ int); BOOL WINAPI GetMenuItemInfoA(_In_ HMENU, _In_ UINT, _In_ BOOL, _Inout_ LPMENUITEMINFOA);

2 years, 7 months

[reactos] 02/02: [KERNEL32] HeapCreateTagsW(): Sync' types and add annotations

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1944d7b71b55ac7319969… commit 1944d7b71b55ac731996936fc3b56de662b4b4df Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Feb 3 20:21:40 2022 +0100 [KERNEL32] HeapCreateTagsW(): Sync' types and add annotations See RtlCreateTagHeap(). --- dll/win32/kernel32/client/heapmem.c | 8 ++++---- dll/win32/kernel32/kernel32.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/client/heapmem.c b/dll/win32/kernel32/client/heapmem.c index 0ef199e6fb0..daae8028162 100644 --- a/dll/win32/kernel32/client/heapmem.c +++ b/dll/win32/kernel32/client/heapmem.c @@ -166,10 +166,10 @@ HeapValidate(HANDLE hHeap, */ DWORD WINAPI -HeapCreateTagsW(HANDLE hHeap, - DWORD dwFlags, - PWSTR lpTagName, - PWSTR lpTagSubName) +HeapCreateTagsW(_In_ HANDLE hHeap, + _In_ DWORD dwFlags, + _In_opt_ PWSTR lpTagName, + _In_ PWSTR lpTagSubName) { /* Call the RTL API */ return RtlCreateTagHeap(hHeap, diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 1b8dd416be9..14050c9447d 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -688,7 +688,7 @@ @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap @ stdcall HeapCompact(long long) @ stdcall HeapCreate(long long long) -@ stdcall -version=0x351-0x502 HeapCreateTagsW(long long wstr wstr) +@ stdcall -version=0x351-0x502 HeapCreateTagsW(ptr long wstr wstr) @ stdcall HeapDestroy(long) @ stdcall -version=0x351-0x502 HeapExtend(long long ptr long) @ stdcall HeapFree(long long long) ntdll.RtlFreeHeap

2 years, 7 months

[reactos] 01/02: [NDK][NTDLL][RTL] RtlCreateTagHeap(): Fix types and annotations

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=25bff3a1e0218b7d9e92c… commit 25bff3a1e0218b7d9e92c4ea9ade40a5f855f02a Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon May 24 08:56:17 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Feb 3 20:21:40 2022 +0100 [NDK][NTDLL][RTL] RtlCreateTagHeap(): Fix types and annotations According to https://processhacker.sourceforge.io/doc/ntrtl_8h.html --- dll/ntdll/def/ntdll.spec | 2 +- sdk/include/ndk/rtlfuncs.h | 2 +- sdk/lib/rtl/heap.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 3db2bf08b82..363ed834289 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -728,7 +728,7 @@ @ stdcall RtlCreateSecurityDescriptor(ptr long) @ stdcall RtlCreateServiceSid(ptr ptr ptr) # Exists in Windows 2003 SP 2 @ stdcall RtlCreateSystemVolumeInformationFolder(ptr) -@ stdcall RtlCreateTagHeap(ptr long str str) +@ stdcall RtlCreateTagHeap(ptr long wstr wstr) @ stdcall RtlCreateTimer(ptr ptr ptr ptr long long long) @ stdcall RtlCreateTimerQueue(ptr) @ stdcall RtlCreateUnicodeString(ptr wstr) diff --git a/sdk/include/ndk/rtlfuncs.h b/sdk/include/ndk/rtlfuncs.h index a99ba39fa0e..ffc3bb1bcae 100644 --- a/sdk/include/ndk/rtlfuncs.h +++ b/sdk/include/ndk/rtlfuncs.h @@ -861,7 +861,7 @@ NTAPI RtlCreateTagHeap( _In_ HANDLE HeapHandle, _In_ ULONG Flags, - _In_ PWSTR TagName, + _In_opt_ PWSTR TagName, _In_ PWSTR TagSubName ); diff --git a/sdk/lib/rtl/heap.c b/sdk/lib/rtl/heap.c index 019a4f80216..847051df44c 100644 --- a/sdk/lib/rtl/heap.c +++ b/sdk/lib/rtl/heap.c @@ -4028,10 +4028,10 @@ RtlExtendHeap(IN HANDLE Heap, ULONG NTAPI -RtlCreateTagHeap(IN HANDLE HeapHandle, - IN ULONG Flags, - IN PWSTR TagName, - IN PWSTR TagSubName) +RtlCreateTagHeap(_In_ HANDLE HeapHandle, + _In_ ULONG Flags, + _In_opt_ PWSTR TagName, + _In_ PWSTR TagSubName) { /* TODO */ UNIMPLEMENTED;

2 years, 7 months

[reactos] 01/01: [NTUSER] Half-implement NtUserSetImeOwnerWindow (#4332)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0519ae0ac586d29e413b5… commit 0519ae0ac586d29e413b53c233a69e792d37a728 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Feb 3 13:39:15 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Feb 3 13:39:15 2022 +0900 [NTUSER] Half-implement NtUserSetImeOwnerWindow (#4332) - Add some code to NtUserSetImeOwnerWindow function. - Add IntGetTopLevelWindow helper function. CORE-11700 --- win32ss/user/ntuser/ime.c | 72 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 5d01bf1397f..0e7d4cf66e6 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -12,6 +12,21 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define INVALID_THREAD_ID ((ULONG)-1) +#define IS_WND_IMELIKE(pwnd) \ + (((pwnd)->pcls->style & CS_IME) || \ + ((pwnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) + +PWND FASTCALL IntGetTopLevelWindow(PWND pwnd) +{ + if (!pwnd) + return NULL; + + while (pwnd->style & WS_CHILD) + pwnd = pwnd->spwndParent; + + return pwnd; +} + DWORD APIENTRY NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) @@ -472,8 +487,61 @@ Quit: BOOL APIENTRY NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) { - STUB - return 0; + BOOL ret = FALSE; + PWND pImeWnd, pwndFocus, pwndTopLevel, pwnd, pwndActive; + PTHREADINFO ptiIme; + + UserEnterExclusive(); + + pImeWnd = ValidateHwndNoErr(hImeWnd); + if (!IS_IMM_MODE() || !pImeWnd || pImeWnd->fnid != FNID_IME) + goto Quit; + + pwndFocus = ValidateHwndNoErr(hwndFocus); + if (pwndFocus) + { + if (IS_WND_IMELIKE(pwndFocus)) + goto Quit; + + pwndTopLevel = IntGetTopLevelWindow(pwndFocus); + + for (pwnd = pwndTopLevel; pwnd; pwnd = pwnd->spwndOwner) + { + if (pwnd->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME]) + { + pwndTopLevel = NULL; + break; + } + } + + pImeWnd->spwndOwner = pwndTopLevel; + // TODO: + } + else + { + ptiIme = pImeWnd->head.pti; + pwndActive = ptiIme->MessageQueue->spwndActive; + + if (!pwndActive || pwndActive != pImeWnd->spwndOwner) + { + if (pwndActive && ptiIme == pwndActive->head.pti && !IS_WND_IMELIKE(pwndActive)) + { + pImeWnd->spwndOwner = pwndActive; + } + else + { + // TODO: + } + + // TODO: + } + } + + ret = TRUE; + +Quit: + UserLeave(); + return ret; } PVOID

2 years, 7 months

[reactos] 01/01: [NTOS:CC] Unintialize private cache maps before purging the cache section

by George Bișoc

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bd980e483a1a9154922b… commit 8bd980e483a1a9154922bfa9bf96e1445575a894 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Sun Jan 30 11:12:31 2022 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Wed Feb 2 17:45:59 2022 +0100 [NTOS:CC] Unintialize private cache maps before purging the cache section Before purging the data cache of a certain section of a file from system cache, we have to unintialize the private cache maps of that section if a filesystem or any other component prompts the kernel to do so. --- ntoskrnl/cc/fs.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/cc/fs.c b/ntoskrnl/cc/fs.c index bef6502f73f..14e3a4141a0 100644 --- a/ntoskrnl/cc/fs.c +++ b/ntoskrnl/cc/fs.c @@ -161,6 +161,7 @@ CcPurgeCacheSection ( IN BOOLEAN UninitializeCacheMaps) { PROS_SHARED_CACHE_MAP SharedCacheMap; + PPRIVATE_CACHE_MAP PrivateCacheMap; LONGLONG StartOffset; LONGLONG EndOffset; LIST_ENTRY FreeList; @@ -173,11 +174,7 @@ CcPurgeCacheSection ( CCTRACE(CC_API_DEBUG, "SectionObjectPointer=%p\n FileOffset=%p Length=%lu UninitializeCacheMaps=%d", SectionObjectPointer, FileOffset, Length, UninitializeCacheMaps); - if (UninitializeCacheMaps) - { - DPRINT1("FIXME: CcPurgeCacheSection not uninitializing private cache maps\n"); - } - + /* Obtain the shared cache from the section */ SharedCacheMap = SectionObjectPointer->SharedCacheMap; if (!SharedCacheMap) { @@ -185,6 +182,28 @@ CcPurgeCacheSection ( goto purgeMm; } + if (UninitializeCacheMaps) + { + /* + * We have gotten the acknowledgement that + * the caller wants to unintialize the private + * cache maps so let's do this. Since we already + * have the shared cache map from above, iterate + * over that cache's private lists. + */ + while (!IsListEmpty(&SharedCacheMap->PrivateList)) + { + /* + * This list is not empty, grab the + * private cache map. + */ + PrivateCacheMap = CONTAINING_RECORD(SharedCacheMap->PrivateList.Flink, PRIVATE_CACHE_MAP, PrivateLinks); + + /* Unintialize the private cache now */ + CcUninitializeCacheMap(PrivateCacheMap->FileObject, NULL, NULL); + } + } + StartOffset = FileOffset != NULL ? FileOffset->QuadPart : 0; if (Length == 0 || FileOffset == NULL) {

2 years, 7 months

[reactos] 01/01: [USER32] Implement ImeWnd_OnImeSetContext (#4329)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c6dcdcf81867b701ef88… commit 8c6dcdcf81867b701ef8882565893ba8fa86d078 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 2 11:58:31 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 2 11:58:31 2022 +0900 [USER32] Implement ImeWnd_OnImeSetContext (#4329) - Modify NtUserSetImeOwnerWindow prototype. - Add User32GetTopLevelWindow function. - Add ImeWnd_OnImeSetContext function. - Implement WM_IME_SETCONTEXT message handling of the IME window. CORE-11700 --- sdk/include/ddk/immdev.h | 6 ++ sdk/include/psdk/imm.h | 3 - win32ss/include/ntuser.h | 4 +- win32ss/user/ntuser/ime.c | 4 +- win32ss/user/ntuser/simplecall.c | 4 + win32ss/user/user32/misc/imm.c | 171 ++++++++++++++++++++++++++++++++++++++- 6 files changed, 181 insertions(+), 11 deletions(-) diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index 8addb828bb9..61641ba1633 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -24,6 +24,12 @@ extern "C" { #define IMC_GETSOFTKBDPOS 0x0013 #define IMC_SETSOFTKBDPOS 0x0014 +#define IMMGWL_IMC 0 +#define IMMGWL_PRIVATE (sizeof(LONG)) + +#define IMMGWLP_IMC 0 +#define IMMGWLP_PRIVATE (sizeof(LONG_PTR)) + typedef struct _tagINPUTCONTEXT { HWND hWnd; BOOL fOpen; diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index ebd3bb4cb47..83908c9c191 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -209,9 +209,6 @@ typedef struct tagCANDIDATEINFO { DWORD dwPrivateOffset; } CANDIDATEINFO, *LPCANDIDATEINFO; -#define IMMGWL_IMC 0 -#define IMMGWL_PRIVATE (sizeof(LONG)) - /* IME Property bits */ #define IME_PROP_END_UNLOAD 0x0001 #define IME_PROP_KBD_CHAR_FIRST 0x0002 diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 705f5aa08a9..6f897a24736 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -3198,9 +3198,9 @@ NTAPI NtUserSetImeInfoEx( PIMEINFOEX pImeInfoEx); -DWORD +BOOL NTAPI -NtUserSetImeOwnerWindow(PIMEINFOEX pImeInfoEx, BOOL fFlag); +NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus); DWORD NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index c492f07507d..5d01bf1397f 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -469,8 +469,8 @@ Quit: return ret; } -DWORD APIENTRY -NtUserSetImeOwnerWindow(PIMEINFOEX pImeInfoEx, BOOL fFlag) +BOOL APIENTRY +NtUserSetImeOwnerWindow(HWND hImeWnd, HWND hwndFocus) { STUB return 0; diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index 42feafd0f44..ed7583b0bac 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -660,6 +660,10 @@ NtUserCallHwndLock( co_IntUpdateWindows(Window, RDW_ALLCHILDREN, FALSE); Ret = TRUE; break; + + case HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD: + // TODO: + break; } UserDerefObjectCo(Window); diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c index 7d84a2bb0f4..ee3f109419d 100644 --- a/win32ss/user/user32/misc/imm.c +++ b/win32ss/user/user32/misc/imm.c @@ -23,6 +23,19 @@ HINSTANCE ghImm32 = NULL; BOOL bImmInitializing = FALSE; +INT gnImmUnknownFlag1 = -1; + +PWND FASTCALL User32GetTopLevelWindow(PWND pwnd) +{ + if (!pwnd) + return NULL; + + while (pwnd->style & WS_CHILD) + pwnd = pwnd->spwndParent; + + return pwnd; +} + /* define stub functions */ #undef DEFINE_IMM_ENTRY #define DEFINE_IMM_ENTRY(type, name, params, retval, retkind) \ @@ -654,6 +667,157 @@ static LRESULT ImeWnd_OnImeSystem(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) return ret; } +LRESULT ImeWnd_OnImeSetContext(PIMEUI pimeui, WPARAM wParam, LPARAM lParam) +{ + LRESULT ret; + HIMC hIMC; + LPINPUTCONTEXTDX pIC; + HWND hwndFocus, hwndOldImc, hwndNewImc, hImeWnd, hwndActive; + PWND pwndFocus, pwndOldImc, pwndNewImc, pImeWnd, pwndOwner; + COMPOSITIONFORM CompForm; + + pimeui->fActivate = !!wParam; + hwndOldImc = pimeui->hwndIMC; + + if (wParam) + { + if (!pimeui->hwndUI) + pimeui->hwndUI = User32CreateImeUIWindow(pimeui, pimeui->hKL); + + if (gnImmUnknownFlag1 == -1) + { + gnImmUnknownFlag1 = (INT)NtUserGetThreadState(THREADSTATE_UNKNOWN17); + if (gnImmUnknownFlag1) + pimeui->fCtrlShowStatus = FALSE; + } + + if (gnImmUnknownFlag1) + { + pwndOwner = pimeui->spwnd->spwndOwner; + if (pwndOwner) + { + User32UpdateImcOfImeUI(pimeui, pwndOwner->hImc); + + if (pimeui->hwndUI) + SetWindowLongPtrW(pimeui->hwndUI, IMMGWLP_IMC, (LONG_PTR)pwndOwner->hImc); + } + + return User32SendImeUIMessage(pimeui, WM_IME_SETCONTEXT, wParam, lParam, TRUE); + } + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + hwndFocus = (HWND)NtUserQueryWindow(hImeWnd, QUERY_WINDOW_FOCUS); + + hIMC = IMM_FN(ImmGetContext)(hwndFocus); + + if (hIMC && !User32CanSetImeWindowToImc(hIMC, hImeWnd)) + { + User32UpdateImcOfImeUI(pimeui, NULL); + return 0; + } + + User32UpdateImcOfImeUI(pimeui, hIMC); + + if (pimeui->hwndUI) + SetWindowLongPtrW(pimeui->hwndUI, IMMGWLP_IMC, (LONG_PTR)hIMC); + + if (hIMC) + { + pIC = IMM_FN(ImmLockIMC)(hIMC); + if (!pIC) + return 0; + + if (hwndFocus != pIC->hWnd) + { + IMM_FN(ImmUnlockIMC)(hIMC); + return 0; + } + + if ((pIC->dwUIFlags & 0x40000) && hwndOldImc != hwndFocus) + { + RtlZeroMemory(&CompForm, sizeof(CompForm)); + IMM_FN(ImmSetCompositionWindow)(hIMC, &CompForm); + + pIC->dwUIFlags &= ~0x40000; + } + + IMM_FN(ImmUnlockIMC)(hIMC); + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + if (NtUserSetImeOwnerWindow(hImeWnd, hwndFocus)) + pimeui->hwndIMC = hwndFocus; + } + else + { + pimeui->hwndIMC = hwndFocus; + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + NtUserSetImeOwnerWindow(hImeWnd, NULL); + } + } + + ret = User32SendImeUIMessage(pimeui, WM_IME_SETCONTEXT, wParam, lParam, TRUE); + + if (!pimeui->spwnd) + return 0; + + if (!pimeui->fCtrlShowStatus || !User32GetImeShowStatus()) + return ret; + + hImeWnd = UserHMGetHandle(pimeui->spwnd); + hwndFocus = (HWND)NtUserQueryWindow(hImeWnd, QUERY_WINDOW_FOCUS); + pwndFocus = ValidateHwnd(hwndFocus); + + if (wParam) + { + if (pwndFocus && pimeui->spwnd->head.pti == pwndFocus->head.pti) + { + hwndNewImc = pimeui->hwndIMC; + if (pimeui->fShowStatus) + { + pwndNewImc = ValidateHwnd(hwndNewImc); + pwndOldImc = ValidateHwnd(hwndOldImc); + if (pwndNewImc && pwndOldImc && pwndNewImc != pwndOldImc && + User32GetTopLevelWindow(pwndNewImc) != User32GetTopLevelWindow(pwndOldImc)) + { + User32NotifyOpenStatus(pimeui, hwndOldImc, FALSE); + User32NotifyOpenStatus(pimeui, hwndNewImc, TRUE); + } + } + else + { + if (ValidateHwnd(hwndNewImc)) + User32NotifyOpenStatus(pimeui, hwndNewImc, TRUE); + } + } + + pImeWnd = pimeui->spwnd; + hImeWnd = (pImeWnd ? UserHMGetHandle(pImeWnd) : NULL); + if (hImeWnd) + NtUserCallHwndLock(hImeWnd, HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD); + } + else + { + pImeWnd = pimeui->spwnd; + hImeWnd = UserHMGetHandle(pImeWnd); + hwndActive = (HWND)NtUserQueryWindow(hImeWnd, QUERY_WINDOW_ACTIVE); + if (!pwndFocus || !hwndActive || pImeWnd->head.pti != pwndFocus->head.pti) + { + if (IsWindow(hwndOldImc)) + { + User32NotifyOpenStatus(pimeui, hwndOldImc, FALSE); + } + else + { + pimeui->fShowStatus = FALSE; + User32SendImeUIMessage(pimeui, WM_IME_NOTIFY, IMN_CLOSESTATUSWINDOW, 0, TRUE); + } + } + } + + return ret; +} + LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) // ReactOS { PWND pWnd; @@ -673,7 +837,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa NtUserSetWindowFNID(hwnd, FNID_IME); pimeui = HeapAlloc( GetProcessHeap(), 0, sizeof(IMEUI) ); pimeui->spwnd = pWnd; - SetWindowLongPtrW(hwnd, 0, (LONG_PTR)pimeui); + SetWindowLongPtrW(hwnd, IMMGWLP_IMC, (LONG_PTR)pimeui); } else { @@ -740,7 +904,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_NCDESTROY: HeapFree(GetProcessHeap(), 0, pimeui); - SetWindowLongPtrW(hwnd, 0, 0); + SetWindowLongPtrW(hwnd, IMMGWLP_IMC, 0); NtUserSetWindowFNID(hwnd, FNID_DESTROY); break; @@ -773,8 +937,7 @@ LRESULT WINAPI ImeWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; case WM_IME_SETCONTEXT: - // TODO: - break; + return ImeWnd_OnImeSetContext(pimeui, wParam, lParam); case WM_IME_SYSTEM: return ImeWnd_OnImeSystem(pimeui, wParam, lParam);

2 years, 7 months

[reactos] 01/01: [NTUSER] Move IMM-related code to ime.c (#4322)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=470aa2761033294f8f432… commit 470aa2761033294f8f43261ee98324be705f607c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Feb 2 11:56:40 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 2 11:56:40 2022 +0900 [NTUSER] Move IMM-related code to ime.c (#4322) Move the IMM-related code from ntstubs.c into ime.c. CORE-11700 --- win32ss/user/ntuser/ime.c | 203 +++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/ntstubs.c | 206 ------------------------------------------ 2 files changed, 203 insertions(+), 206 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 18806d68a8d..c492f07507d 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -12,6 +12,34 @@ DBG_DEFAULT_CHANNEL(UserMisc); #define INVALID_THREAD_ID ((ULONG)-1) +DWORD +APIENTRY +NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) +{ + PTHREADINFO pti; + PKL pOldKL, pNewKL; + + UserEnterExclusive(); + + pti = GetW32ThreadInfo(); + pOldKL = pti->KeyboardLayout; + if (pOldKL && pOldKL->hkl != hOldKL) + goto Quit; + + pNewKL = UserHklToKbl(hNewKL); + if (!pNewKL) + goto Quit; + + if (IS_IME_HKL(hNewKL) != IS_IME_HKL(hOldKL)) + pti->hklPrev = hOldKL; + + pti->KeyboardLayout = pNewKL; + +Quit: + UserLeave(); + return 0; +} + DWORD FASTCALL UserBuildHimcList(PTHREADINFO pti, DWORD dwCount, HIMC *phList) { PIMC pIMC; @@ -534,4 +562,179 @@ BOOL APIENTRY NtUserDestroyInputContext(HIMC hIMC) return ret; } +PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) +{ + PIMC pIMC; + PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); + PDESKTOP pdesk = pti->rpdesk; + + if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? + return NULL; + + if (!pdesk) // No desktop? + return NULL; + + // pti->spDefaultImc should be already set if non-first time. + if (dwClientImcData && !pti->spDefaultImc) + return NULL; + + // Create an input context user object. + pIMC = UserCreateObject(gHandleTable, pdesk, pti, NULL, TYPE_INPUTCONTEXT, sizeof(IMC)); + if (!pIMC) + return NULL; + + // Release the extra reference (UserCreateObject added 2 references). + UserDereferenceObject(pIMC); + + if (dwClientImcData) // Non-first time. + { + // Insert pIMC to the second position (non-default) of the list. + pIMC->pImcNext = pti->spDefaultImc->pImcNext; + pti->spDefaultImc->pImcNext = pIMC; + } + else // First time. It's the default IMC. + { + // Add the first one (default) to the list. + pti->spDefaultImc = pIMC; + pIMC->pImcNext = NULL; + } + + pIMC->dwClientImcData = dwClientImcData; // Set it. + return pIMC; +} + +HIMC +APIENTRY +NtUserCreateInputContext(ULONG_PTR dwClientImcData) +{ + PIMC pIMC; + HIMC ret = NULL; + + if (!dwClientImcData) + return NULL; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserCreateInputContext(dwClientImcData); + if (pIMC) + ret = UserHMGetHandle(pIMC); + +Quit: + UserLeave(); + return ret; +} + +DWORD +APIENTRY +NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) +{ + STUB + return 0; +} + +BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) +{ + PTHREADINFO pti = GetW32ThreadInfo(); + PTHREADINFO ptiIMC = pIMC->head.pti; + + if (pti->ppi != ptiIMC->ppi) // Different process? + return FALSE; + + switch (dwType) + { + case UIC_CLIENTIMCDATA: + if (pIMC->dwClientImcData) + return FALSE; // Already set + + pIMC->dwClientImcData = dwValue; + break; + + case UIC_IMEWINDOW: + if (!ValidateHwndNoErr((HWND)dwValue)) + return FALSE; // Invalid HWND + + pIMC->hImeWnd = (HWND)dwValue; + break; + + default: + return FALSE; + } + + return TRUE; +} + +BOOL +APIENTRY +NtUserUpdateInputContext( + HIMC hIMC, + DWORD dwType, + DWORD_PTR dwValue) +{ + PIMC pIMC; + BOOL ret = FALSE; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ret = UserUpdateInputContext(pIMC, dwType, dwValue); + +Quit: + UserLeave(); + return ret; +} + +DWORD_PTR +APIENTRY +NtUserQueryInputContext(HIMC hIMC, DWORD dwType) +{ + PIMC pIMC; + PTHREADINFO ptiIMC; + DWORD_PTR ret = 0; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ptiIMC = pIMC->head.pti; + + switch (dwType) + { + case QIC_INPUTPROCESSID: + ret = (DWORD_PTR)PsGetThreadProcessId(ptiIMC->pEThread); + break; + + case QIC_INPUTTHREADID: + ret = (DWORD_PTR)PsGetThreadId(ptiIMC->pEThread); + break; + + case QIC_DEFAULTWINDOWIME: + if (ptiIMC->spwndDefaultIme) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spwndDefaultIme); + break; + + case QIC_DEFAULTIMC: + if (ptiIMC->spDefaultImc) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spDefaultImc); + break; + } + +Quit: + UserLeave(); + return ret; +} + /* EOF */ diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index cdb801dc765..8f1a678be8d 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -9,14 +9,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(UserMisc); -DWORD -APIENTRY -NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) -{ - STUB - return 0; -} - // // Works like BitBlt, http://msdn.microsoft.com/en-us/library/ms532278(VS.85).aspx // @@ -338,63 +330,6 @@ NtUserSetSysColors( return Ret; } -BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) -{ - PTHREADINFO pti = GetW32ThreadInfo(); - PTHREADINFO ptiIMC = pIMC->head.pti; - - if (pti->ppi != ptiIMC->ppi) // Different process? - return FALSE; - - switch (dwType) - { - case UIC_CLIENTIMCDATA: - if (pIMC->dwClientImcData) - return FALSE; // Already set - - pIMC->dwClientImcData = dwValue; - break; - - case UIC_IMEWINDOW: - if (!ValidateHwndNoErr((HWND)dwValue)) - return FALSE; // Invalid HWND - - pIMC->hImeWnd = (HWND)dwValue; - break; - - default: - return FALSE; - } - - return TRUE; -} - -BOOL -APIENTRY -NtUserUpdateInputContext( - HIMC hIMC, - DWORD dwType, - DWORD_PTR dwValue) -{ - PIMC pIMC; - BOOL ret = FALSE; - - UserEnterExclusive(); - - if (!IS_IMM_MODE()) - goto Quit; - - pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); - if (!pIMC) - goto Quit; - - ret = UserUpdateInputContext(pIMC, dwType, dwValue); - -Quit: - UserLeave(); - return ret; -} - DWORD APIENTRY NtUserUpdateInstance( @@ -453,71 +388,6 @@ NtUserYieldTask(VOID) return 0; } -PIMC FASTCALL UserCreateInputContext(ULONG_PTR dwClientImcData) -{ - PIMC pIMC; - PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); - PDESKTOP pdesk = pti->rpdesk; - - if (!IS_IMM_MODE() || (pti->TIF_flags & TIF_DISABLEIME)) // Disabled? - return NULL; - - if (!pdesk) // No desktop? - return NULL; - - // pti->spDefaultImc should be already set if non-first time. - if (dwClientImcData && !pti->spDefaultImc) - return NULL; - - // Create an input context user object. - pIMC = UserCreateObject(gHandleTable, pdesk, pti, NULL, TYPE_INPUTCONTEXT, sizeof(IMC)); - if (!pIMC) - return NULL; - - // Release the extra reference (UserCreateObject added 2 references). - UserDereferenceObject(pIMC); - - if (dwClientImcData) // Non-first time. - { - // Insert pIMC to the second position (non-default) of the list. - pIMC->pImcNext = pti->spDefaultImc->pImcNext; - pti->spDefaultImc->pImcNext = pIMC; - } - else // First time. It's the default IMC. - { - // Add the first one (default) to the list. - pti->spDefaultImc = pIMC; - pIMC->pImcNext = NULL; - } - - pIMC->dwClientImcData = dwClientImcData; // Set it. - return pIMC; -} - -HIMC -APIENTRY -NtUserCreateInputContext(ULONG_PTR dwClientImcData) -{ - PIMC pIMC; - HIMC ret = NULL; - - if (!dwClientImcData) - return NULL; - - UserEnterExclusive(); - - if (!IS_IMM_MODE()) - goto Quit; - - pIMC = UserCreateInputContext(dwClientImcData); - if (pIMC) - ret = UserHMGetHandle(pIMC); - -Quit: - UserLeave(); - return ret; -} - DWORD APIENTRY NtUserGetRawInputBuffer( @@ -741,53 +611,6 @@ Quit: return Status; } -DWORD_PTR -APIENTRY -NtUserQueryInputContext( - HIMC hIMC, - DWORD dwType) -{ - PIMC pIMC; - PTHREADINFO ptiIMC; - DWORD_PTR ret = 0; - - UserEnterExclusive(); - - if (!IS_IMM_MODE()) - goto Quit; - - pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); - if (!pIMC) - goto Quit; - - ptiIMC = pIMC->head.pti; - - switch (dwType) - { - case QIC_INPUTPROCESSID: - ret = (DWORD_PTR)PsGetThreadProcessId(ptiIMC->pEThread); - break; - - case QIC_INPUTTHREADID: - ret = (DWORD_PTR)PsGetThreadId(ptiIMC->pEThread); - break; - - case QIC_DEFAULTWINDOWIME: - if (ptiIMC->spwndDefaultIme) - ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spwndDefaultIme); - break; - - case QIC_DEFAULTIMC: - if (ptiIMC->spDefaultImc) - ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spDefaultImc); - break; - } - -Quit: - UserLeave(); - return ret; -} - BOOL APIENTRY NtUserRealInternalGetMessage( @@ -1015,34 +838,6 @@ Quit: return Status; } -DWORD -APIENTRY -NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) -{ - PTHREADINFO pti; - PKL pOldKL, pNewKL; - - UserEnterExclusive(); - - pti = GetW32ThreadInfo(); - pOldKL = pti->KeyboardLayout; - if (pOldKL && pOldKL->hkl != hOldKL) - goto Quit; - - pNewKL = UserHklToKbl(hNewKL); - if (!pNewKL) - goto Quit; - - if (IS_IME_HKL(hNewKL) != IS_IME_HKL(hOldKL)) - pti->hklPrev = hOldKL; - - pti->KeyboardLayout = pNewKL; - -Quit: - UserLeave(); - return 0; -} - BOOL APIENTRY NtUserSoundSentry(VOID) @@ -1174,5 +969,4 @@ NtDxEngGetRedirectionBitmap( return 0; } - /* EOF */

2 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2022