Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SYSSETUP] Disable debug messages on the process page
by Eric Kohl 06 Feb '22

06 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b76d49bcaadb9aea02220… commit b76d49bcaadb9aea0222054dd0d7d0a372b57041 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 6 16:30:53 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 6 16:30:53 2022 +0100 [SYSSETUP] Disable debug messages on the process page --- dll/win32/syssetup/wizard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 0dcebc6d12e..5404e3c28a0 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2371,14 +2371,14 @@ ProcessPageDlgProc(HWND hwndDlg, break; case PM_ITEM_START: - DPRINT1("PM_ITEM_START %lu\n", (ULONG)lParam); + DPRINT("PM_ITEM_START %lu\n", (ULONG)lParam); SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, (ULONG)lParam)); SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, 0, 0); SendDlgItemMessage(hwndDlg, IDC_TASKTEXT1 + wParam, WM_SETFONT, (WPARAM)SetupData->hBoldFont, (LPARAM)TRUE); break; case PM_ITEM_END: - DPRINT1("PM_ITEM_END\n"); + DPRINT("PM_ITEM_END\n"); if (lParam == ERROR_SUCCESS) { } @@ -2389,14 +2389,14 @@ ProcessPageDlgProc(HWND hwndDlg, break; case PM_STEP_START: - DPRINT1("PM_STEP_START\n"); + DPRINT("PM_STEP_START\n"); RegistrationNotify = (PREGISTRATIONNOTIFY)lParam; SendDlgItemMessage(hwndDlg, IDC_ITEM, WM_SETTEXT, 0, (LPARAM)((RegistrationNotify->CurrentItem != NULL)? RegistrationNotify->CurrentItem : L"")); break; case PM_STEP_END: - DPRINT1("PM_STEP_END\n"); + DPRINT("PM_STEP_END\n"); RegistrationNotify = (PREGISTRATIONNOTIFY)lParam; SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, RegistrationNotify->Progress, 0); if (RegistrationNotify->LastError != ERROR_SUCCESS) @@ -2406,7 +2406,7 @@ ProcessPageDlgProc(HWND hwndDlg, break; case PM_ITEMS_DONE: - DPRINT1("PM_ITEMS_DONE\n"); + DPRINT("PM_ITEMS_DONE\n"); /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT);

1 0

[reactos] 01/01: [NTUSER] Implement NtUserAssociateInputContext (#4334)
by Katayama Hirofumi MZ 05 Feb '22

05 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2c3167db312c67c673b1… commit f2c3167db312c67c673b1093230f4eb6de25c131 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 5 20:23:57 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 5 20:23:57 2022 +0900 [NTUSER] Implement NtUserAssociateInputContext (#4334) - Add IntReAllocatePoolWithTag function in window.c. - Define WINDOWLIST structure in "window.h". - Add IntBuildHwndList and IntFreeHwndList helper functions in window.c. - Add IntAssociateInputContext and IntAssociateInputContextEx helper functions in ime.c. - Implement NtUserAssociateInputContext function. CORE-11700 --- sdk/include/psdk/imm.h | 7 +- win32ss/user/ntuser/ime.c | 89 ++++++++++++++++++++++++- win32ss/user/ntuser/window.c | 150 ++++++++++++++++++++++++++++++++++++++++++- win32ss/user/ntuser/window.h | 20 ++++++ 4 files changed, 259 insertions(+), 7 deletions(-) diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 83908c9c191..95ac099d2e3 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -577,11 +577,10 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMEN #define IME_REGWORD_STYLE_USER_FIRST 0x80000000 #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF - /* dwFlags for ImmAssociateContextEx */ -#define IACE_CHILDREN 0x0001 -#define IACE_DEFAULT 0x0010 -#define IACE_IGNORENOCONTEXT 0x0020 +#define IACE_CHILDREN 0x0001 +#define IACE_DEFAULT 0x0010 +#define IACE_IGNORENOCONTEXT 0x0020 /* dwFlags for ImmGetImeMenuItems */ #define IGIMIF_RIGHTMENU 0x0001 diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 0e7d4cf66e6..06b7eabe5fe 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -695,12 +695,97 @@ Quit: return ret; } +HIMC FASTCALL IntAssociateInputContext(PWND pWnd, PIMC pImc) +{ + HIMC hOldImc = pWnd->hImc; + pWnd->hImc = (pImc ? UserHMGetHandle(pImc) : NULL); + return hOldImc; +} + +DWORD FASTCALL IntAssociateInputContextEx(PWND pWnd, PIMC pIMC, DWORD dwFlags) +{ + DWORD ret = 0; + PWINDOWLIST pwl; + BOOL bIgnoreNullImc = (dwFlags & IACE_IGNORENOCONTEXT); + PTHREADINFO pti = pWnd->head.pti; + PWND pwndTarget, pwndFocus = pti->MessageQueue->spwndFocus; + HWND *phwnd; + HIMC hIMC; + + if (dwFlags & IACE_DEFAULT) + { + pIMC = pti->spDefaultImc; + } + else + { + if (pIMC && pti != pIMC->head.pti) + return 2; + } + + if (pWnd->head.pti->ppi != GetW32ThreadInfo()->ppi || + (pIMC && pIMC->head.rpdesk != pWnd->head.rpdesk)) + { + return 2; + } + + if ((dwFlags & IACE_CHILDREN) && pWnd->spwndChild) + { + pwl = IntBuildHwndList(pWnd->spwndChild, IACE_CHILDREN | IACE_LIST, pti); + if (pwl) + { + for (phwnd = pwl->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd) + { + pwndTarget = ValidateHwndNoErr(*phwnd); + if (!pwndTarget) + continue; + + hIMC = (pIMC ? UserHMGetHandle(pIMC) : NULL); + if (pwndTarget->hImc == hIMC || (bIgnoreNullImc && !pwndTarget->hImc)) + continue; + + IntAssociateInputContext(pwndTarget, pIMC); + if (pwndTarget == pwndFocus) + ret = 1; + } + + IntFreeHwndList(pwl); + } + } + + if (!bIgnoreNullImc || pWnd->hImc) + { + hIMC = (pIMC ? UserHMGetHandle(pIMC) : NULL); + if (pWnd->hImc != hIMC) + { + IntAssociateInputContext(pWnd, pIMC); + if (pWnd == pwndFocus) + ret = 1; + } + } + + return ret; +} + DWORD APIENTRY NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - STUB - return 0; + DWORD ret = 2; + PWND pWnd; + PIMC pIMC; + + UserEnterExclusive(); + + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd || !IS_IMM_MODE()) + goto Quit; + + pIMC = (hIMC ? UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT) : NULL); + ret = IntAssociateInputContextEx(pWnd, pIMC, dwFlags); + +Quit: + UserLeave(); + return ret; } BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index d9cba3219d6..f3aeab5d344 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Windows * FILE: win32ss/user/ntuser/window.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -11,8 +12,28 @@ DBG_DEFAULT_CHANNEL(UserWnd); INT gNestedWindowLimit = 50; +PWINDOWLIST gpwlList = NULL; +PWINDOWLIST gpwlCache = NULL; + /* HELPER FUNCTIONS ***********************************************************/ +PVOID FASTCALL +IntReAllocatePoolWithTag( + POOL_TYPE PoolType, + PVOID pOld, + SIZE_T cbOld, + SIZE_T cbNew, + ULONG Tag) +{ + PVOID pNew = ExAllocatePoolWithTag(PoolType, cbNew, Tag); + if (!pNew) + return NULL; + + RtlCopyMemory(pNew, pOld, min(cbOld, cbNew)); + ExFreePoolWithTag(pOld, Tag); + return pNew; +} + BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam) { WORD Action = LOWORD(wParam); @@ -1320,6 +1341,133 @@ IntUnlinkWindow(PWND Wnd) Wnd->spwndPrev = Wnd->spwndNext = NULL; } +BOOL FASTCALL IntGrowHwndList(PWINDOWLIST *ppwl) +{ + PWINDOWLIST pwlOld, pwlNew; + SIZE_T ibOld, ibNew; + +#define GROW_COUNT 8 + pwlOld = *ppwl; + ibOld = (LPBYTE)pwlOld->phwndLast - (LPBYTE)pwlOld; + ibNew = ibOld + GROW_COUNT * sizeof(HWND); +#undef GROW_COUNT + pwlNew = IntReAllocatePoolWithTag(PagedPool, pwlOld, ibOld, ibNew, USERTAG_WINDOWLIST); + if (!pwlNew) + return FALSE; + + pwlNew->phwndLast = (HWND *)((LPBYTE)pwlNew + ibOld); + pwlNew->phwndEnd = (HWND *)((LPBYTE)pwlNew + ibNew); + *ppwl = pwlNew; + return TRUE; +} + +PWINDOWLIST FASTCALL IntPopulateHwndList(PWINDOWLIST pwl, PWND pwnd, DWORD dwFlags) +{ + ASSERT(!WL_IS_BAD(pwl)); + + for (; pwnd; pwnd = pwnd->spwndNext) + { + if (!pwl->pti || pwl->pti == pwnd->head.pti) + { + *(pwl->phwndLast) = UserHMGetHandle(pwnd); + ++(pwl->phwndLast); + + if (pwl->phwndLast == pwl->phwndEnd && !IntGrowHwndList(&pwl)) + break; + } + + if ((dwFlags & IACE_CHILDREN) && pwnd->spwndChild) + { + pwl = IntPopulateHwndList(pwl, pwnd->spwndChild, IACE_CHILDREN | IACE_LIST); + if (WL_IS_BAD(pwl)) + break; + } + + if (!(dwFlags & IACE_LIST)) + break; + } + + return pwl; +} + +PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti) +{ + PWINDOWLIST pwl; + DWORD cbWL; + + if (gpwlCache) + { + pwl = gpwlCache; + gpwlCache = NULL; + } + else + { +#define INITIAL_COUNT 32 + cbWL = sizeof(WINDOWLIST) + (INITIAL_COUNT - 1) * sizeof(HWND); + pwl = ExAllocatePoolWithTag(PagedPool, cbWL, USERTAG_WINDOWLIST); + if (!pwl) + return NULL; + + pwl->phwndEnd = &pwl->ahwnd[INITIAL_COUNT]; +#undef INITIAL_COUNT + } + + pwl->pti = pti; + pwl->phwndLast = pwl->ahwnd; + pwl = IntPopulateHwndList(pwl, pwnd, dwFlags); + if (WL_IS_BAD(pwl)) + { + ExFreePoolWithTag(pwl, USERTAG_WINDOWLIST); + return NULL; + } + + *(pwl->phwndLast) = HWND_TERMINATOR; + + if (dwFlags & 0x8) + { + // TODO: + } + + pwl->pti = GetW32ThreadInfo(); + pwl->pNextList = gpwlList; + gpwlList = pwl; + + return pwl; +} + +VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget) +{ + PWINDOWLIST pwl, *ppwl; + + for (ppwl = &gpwlList; *ppwl; ppwl = &(*ppwl)->pNextList) + { + if (*ppwl != pwlTarget) + continue; + + *ppwl = pwlTarget->pNextList; + + if (gpwlCache) + { + if (WL_CAPACITY(pwlTarget) > WL_CAPACITY(gpwlCache)) + { + pwl = gpwlCache; + gpwlCache = pwlTarget; + ExFreePoolWithTag(pwl, USERTAG_WINDOWLIST); + } + else + { + ExFreePoolWithTag(pwlTarget, USERTAG_WINDOWLIST); + } + } + else + { + gpwlCache = pwlTarget; + } + + break; + } +} + /* FUNCTIONS *****************************************************************/ /* diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index f2cd877b289..fd63e1c920f 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -79,4 +79,24 @@ LONG_PTR FASTCALL co_UserSetWindowLongPtr(HWND, DWORD, LONG_PTR, BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN); +#define HWND_TERMINATOR ((HWND)(ULONG_PTR)1) + +typedef struct tagWINDOWLIST +{ + struct tagWINDOWLIST *pNextList; + HWND *phwndLast; + HWND *phwndEnd; + PTHREADINFO pti; + HWND ahwnd[ANYSIZE_ARRAY]; /* Terminated by HWND_TERMINATOR */ +} WINDOWLIST, *PWINDOWLIST; + +#define WL_IS_BAD(pwl) ((pwl)->phwndEnd <= (pwl)->phwndLast) +#define WL_CAPACITY(pwl) ((pwl)->phwndEnd - &((pwl)->ahwnd[0])) + +PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti); +VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); + +/* Undocumented dwFlags for IntBuildHwndList */ +#define IACE_LIST 0x0002 + /* EOF */

1 0

[reactos] 01/01: [WIN32SS] Remove an ambiguous assert entirely CORE-16738
by Joachim Henze 05 Feb '22

05 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf164353035a2bc0f0d1d… commit bf164353035a2bc0f0d1d679d09f2e4076498fa1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 5 01:06:15 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Feb 5 01:06:15 2022 +0100 [WIN32SS] Remove an ambiguous assert entirely CORE-16738 It popped up very reliably when performing git-clone of the ros sources while having the taskmgr open in the processes-tab. Or when building 'ninja bootcd -j1' while having the taskmgr open in the processes-tab. It is always possible to ignore it and then continue using ros for days without noticing any side effects. James Tabor judged the assert to have a "questionable logic". Giannis who once added it, was also ok with commenting it. His words: This assertion isn't something fatal, the worst thing that can happen from continuing on it would be to make the thread get awake more times than it should. It was commented out already on 2020-04-21 via 0.4.14-dev-1519-g 87f6c82d854583f71546841f4432f57e4a2d6c99 --- win32ss/user/ntuser/misc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 00393431603..8fa8b0edb4d 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -749,8 +749,6 @@ void UserDbgAssertThreadInfo(BOOL showCaller) ASSERT(pci->ulClientDelta == DesktopHeapGetUserDelta()); if (pti->pcti && pci->pDeskInfo) ASSERT(pci->pClientThreadInfo == (PVOID)((ULONG_PTR)pti->pcti - pci->ulClientDelta)); - //if (pti->pcti && IsListEmpty(&pti->SentMessagesListHead)) - // ASSERT((pti->pcti->fsChangeBits & QS_SENDMESSAGE) == 0); if (pti->KeyboardLayout) ASSERT(pci->hKL == pti->KeyboardLayout->hkl); if(pti->rpdesk != NULL)

1 0

[reactos] 01/01: [CONSRV] Introduce a CON_SET_OUTPUT_CP() macro to simplify setting the console's output CP + associated changes. Simplify ConDrvSetConsoleCP() as well.
by Hermès Bélusca-Maïto 04 Feb '22

04 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f79c02bd8a9797ab18078… commit f79c02bd8a9797ab1807884862928ffb817d2d54 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 27 21:36:16 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 4 21:35:15 2022 +0100 [CONSRV] Introduce a CON_SET_OUTPUT_CP() macro to simplify setting the console's output CP + associated changes. Simplify ConDrvSetConsoleCP() as well. --- win32ss/user/winsrv/consrv/condrv/console.c | 24 +++++++++++------------- win32ss/user/winsrv/consrv/include/conio.h | 6 ++++++ win32ss/user/winsrv/consrv/settings.c | 4 ++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index fae7beb7de3..74d2229b4db 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -116,9 +116,10 @@ ConDrvInitConsole( /* Set-up the code page */ if (IsValidCodePage(ConsoleInfo->CodePage)) - Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; - - Console->IsCJK = IsCJKCodePage(Console->OutputCodePage); + { + CON_SET_OUTPUT_CP(Console, ConsoleInfo->CodePage); + Console->InputCodePage = ConsoleInfo->CodePage; + } /* Initialize a new text-mode screen buffer with default settings */ ScreenBufferInfo.ScreenBufferSize = ConsoleInfo->ScreenBufferSize; @@ -424,27 +425,24 @@ ConDrvSetConsoleCP(IN PCONSOLE Console, IN UINT CodePage, IN BOOLEAN OutputCP) { - BOOL Success = TRUE; - if (Console == NULL || !IsValidCodePage(CodePage)) return STATUS_INVALID_PARAMETER; if (OutputCP) { /* Request the terminal to change its code page support */ - Success = TermSetCodePage(Console, CodePage); - if (Success) - { - Console->OutputCodePage = CodePage; - Console->IsCJK = IsCJKCodePage(CodePage); - } + if (!TermSetCodePage(Console, CodePage)) + return STATUS_UNSUCCESSFUL; + + /* All is fine, actually set the output code page */ + CON_SET_OUTPUT_CP(Console, CodePage); + return STATUS_SUCCESS; } else { Console->InputCodePage = CodePage; + return STATUS_SUCCESS; } - - return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } /* EOF */ diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h index ead041e51df..0c8ae92631c 100644 --- a/win32ss/user/winsrv/consrv/include/conio.h +++ b/win32ss/user/winsrv/consrv/include/conio.h @@ -320,6 +320,12 @@ ConDrvUnpause(PCONSOLE Console); #define GetConsoleInputBufferMode(Console) \ (Console)->InputBuffer.Mode +#define CON_SET_OUTPUT_CP(Console, CodePage)\ +do { \ + (Console)->OutputCodePage = (CodePage); \ + (Console)->IsCJK = IsCJKCodePage((Console)->OutputCodePage); \ +} while (0) + /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); diff --git a/win32ss/user/winsrv/consrv/settings.c b/win32ss/user/winsrv/consrv/settings.c index 22cccc2d81c..4594d6e8e6d 100644 --- a/win32ss/user/winsrv/consrv/settings.c +++ b/win32ss/user/winsrv/consrv/settings.c @@ -68,8 +68,8 @@ ConSrvApplyUserSettings( // ConDrvSetConsoleCP(Console, ConsoleInfo->CodePage, FALSE); // Input if (TermSetCodePage(Console, ConsoleInfo->CodePage)) { - Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; - Console->IsCJK = IsCJKCodePage(Console->OutputCodePage); + CON_SET_OUTPUT_CP(Console, ConsoleInfo->CodePage); + Console->InputCodePage = ConsoleInfo->CodePage; } }

1 0

[reactos] 02/02: [SHELL32_APITEST] ShellExecuteEx: Add test for 'properties' verb
by Mark Jansen 03 Feb '22

03 Feb '22

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(); }

1 0

[reactos] 01/02: [PSDK] Add some parameter names
by Mark Jansen 03 Feb '22

03 Feb '22

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);

1 0

[reactos] 02/02: [KERNEL32] HeapCreateTagsW(): Sync' types and add annotations
by Serge Gautherie 03 Feb '22

03 Feb '22

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

1 0

[reactos] 01/02: [NDK][NTDLL][RTL] RtlCreateTagHeap(): Fix types and annotations
by Serge Gautherie 03 Feb '22

03 Feb '22

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;

1 0

[reactos] 01/01: [NTUSER] Half-implement NtUserSetImeOwnerWindow (#4332)
by Katayama Hirofumi MZ 03 Feb '22

03 Feb '22

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

1 0

[reactos] 01/01: [NTOS:CC] Unintialize private cache maps before purging the cache section
by George Bișoc 02 Feb '22

02 Feb '22

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) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs