Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/02: [NTOS:EX][SDK:REACTOS] Fix capitalization of "LangId" in the ProbeFor*** functions.
by Hermès Bélusca-Maïto 08 Feb '22

08 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0540c2016750cf2e9097e… commit 0540c2016750cf2e9097ef076bab4b1a1a1e2c43 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 21 16:45:26 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Feb 8 15:56:34 2022 +0100 [NTOS:EX][SDK:REACTOS] Fix capitalization of "LangId" in the ProbeFor*** functions. --- ntoskrnl/ex/locale.c | 6 +++--- sdk/include/reactos/probe.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ex/locale.c b/ntoskrnl/ex/locale.c index 86894096382..9e0f57aa458 100644 --- a/ntoskrnl/ex/locale.c +++ b/ntoskrnl/ex/locale.c @@ -172,7 +172,7 @@ NtQueryDefaultLocale(IN BOOLEAN UserProfile, if (KeGetPreviousMode() != KernelMode) { /* Probe the language ID */ - ProbeForWriteLangid(DefaultLocaleId); + ProbeForWriteLangId(DefaultLocaleId); } /* Check if we have a user profile */ @@ -377,7 +377,7 @@ NtQueryInstallUILanguage(OUT LANGID* LanguageId) if (KeGetPreviousMode() != KernelMode) { /* Probe the Language ID */ - ProbeForWriteLangid(LanguageId); + ProbeForWriteLangId(LanguageId); } /* Return it */ @@ -415,7 +415,7 @@ NtQueryDefaultUILanguage(OUT LANGID* LanguageId) if (KeGetPreviousMode() != KernelMode) { /* Probe the Language ID */ - ProbeForWriteLangid(LanguageId); + ProbeForWriteLangId(LanguageId); } if (NT_SUCCESS(Status)) diff --git a/sdk/include/reactos/probe.h b/sdk/include/reactos/probe.h index 16ee4bd6e38..6c758f6ba29 100644 --- a/sdk/include/reactos/probe.h +++ b/sdk/include/reactos/probe.h @@ -41,7 +41,7 @@ static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL}; #define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) #define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) #define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) -#define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) +#define ProbeForWriteLangId(Ptr) ProbeForWriteGenericType(Ptr, LANGID) #define ProbeForWriteSize_t(Ptr) ProbeForWriteGenericType(Ptr, SIZE_T) #define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&((PLARGE_INTEGER)Ptr)->QuadPart, LONGLONG) #define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&((PULARGE_INTEGER)Ptr)->QuadPart, ULONGLONG) @@ -70,7 +70,7 @@ static const LARGE_STRING __emptyLargeString = {0, 0, 0, NULL}; #define ProbeForReadLonglong(Ptr) ProbeForReadGenericType(Ptr, LONGLONG, 0) #define ProbeForReadPointer(Ptr) ProbeForReadGenericType(Ptr, PVOID, NULL) #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) -#define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) +#define ProbeForReadLangId(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) #define ProbeForReadSize_t(Ptr) ProbeForReadGenericType(Ptr, SIZE_T, 0) #define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType((const LARGE_INTEGER *)(Ptr), LARGE_INTEGER, __emptyLargeInteger) #define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType((const ULARGE_INTEGER *)(Ptr), ULARGE_INTEGER, __emptyULargeInteger)

1 0

[reactos] 01/01: [NTUSER] Implement NtUserNotifyIMEStatus (#4345)
by Katayama Hirofumi MZ 08 Feb '22

08 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9db4437185c5891cbb690… commit 9db4437185c5891cbb690487b95d922d3ad4049e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 8 12:22:08 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 8 12:22:08 2022 +0900 [NTUSER] Implement NtUserNotifyIMEStatus (#4345) - Define "the special virtual keys for Japanese". - Add UserSetImeConversionKeyState helper function. - Implement NtUserNotifyIMEStatus function. CORE-11700 --- win32ss/user/ntuser/ime.c | 115 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 98007549568..5c67c673afe 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -16,6 +16,27 @@ DBG_DEFAULT_CHANNEL(UserMisc); (((pwnd)->pcls->style & CS_IME) || \ ((pwnd)->pcls->atomClassName == gpsi->atomSysClass[ICLS_IME])) +// The special virtual keys for Japanese: Used for key states. +// https://www.kthree.co.jp/kihelp/index.html?page=app/vkey&type=html +#define VK_DBE_ALPHANUMERIC 0xF0 +#define VK_DBE_KATAKANA 0xF1 +#define VK_DBE_HIRAGANA 0xF2 +#define VK_DBE_SBCSCHAR 0xF3 +#define VK_DBE_DBCSCHAR 0xF4 +#define VK_DBE_ROMAN 0xF5 +#define VK_DBE_NOROMAN 0xF6 +#define VK_DBE_ENTERWORDREGISTERMODE 0xF7 +#define VK_DBE_ENTERCONFIGMODE 0xF8 +#define VK_DBE_FLUSHSTRING 0xF9 +#define VK_DBE_CODEINPUT 0xFA +#define VK_DBE_NOCODEINPUT 0xFB +#define VK_DBE_DETERINESTRING 0xFC +#define VK_DBE_ENTERDLGCONVERSIONMODE 0xFD + +HIMC ghIMC = NULL; +BOOL gfImeOpen = (BOOL)-1; +DWORD gdwImeConversion = (DWORD)-1; + PWND FASTCALL IntGetTopLevelWindow(PWND pwnd) { if (!pwnd) @@ -184,11 +205,103 @@ NtUserGetImeHotKey(IN DWORD dwHotKey, return FALSE; } +static VOID FASTCALL UserSetImeConversionKeyState(PTHREADINFO pti, DWORD dwConversion) +{ + HKL hKL; + LANGID LangID; + LPBYTE KeyState; + BOOL bAlphaNumeric, bKatakana, bHiragana, bFullShape, bRoman, bCharCode; + + if (!pti->KeyboardLayout) + return; + + hKL = pti->KeyboardLayout->hkl; + LangID = LOWORD(hKL); + KeyState = pti->MessageQueue->afKeyState; + + switch (PRIMARYLANGID(LangID)) + { + case LANG_JAPANESE: + bAlphaNumeric = !(dwConversion & IME_CMODE_NATIVE); + bKatakana = !bAlphaNumeric && (dwConversion & IME_CMODE_KATAKANA); + bHiragana = !bAlphaNumeric && !(dwConversion & IME_CMODE_KATAKANA); + SET_KEY_DOWN(KeyState, VK_DBE_ALPHANUMERIC, bAlphaNumeric); + SET_KEY_LOCKED(KeyState, VK_DBE_ALPHANUMERIC, bAlphaNumeric); + SET_KEY_DOWN(KeyState, VK_DBE_HIRAGANA, bHiragana); + SET_KEY_LOCKED(KeyState, VK_DBE_HIRAGANA, bHiragana); + SET_KEY_DOWN(KeyState, VK_DBE_KATAKANA, bKatakana); + SET_KEY_LOCKED(KeyState, VK_DBE_KATAKANA, bKatakana); + + bFullShape = (dwConversion & IME_CMODE_FULLSHAPE); + SET_KEY_DOWN(KeyState, VK_DBE_DBCSCHAR, bFullShape); + SET_KEY_LOCKED(KeyState, VK_DBE_DBCSCHAR, bFullShape); + SET_KEY_DOWN(KeyState, VK_DBE_SBCSCHAR, !bFullShape); + SET_KEY_LOCKED(KeyState, VK_DBE_SBCSCHAR, !bFullShape); + + bRoman = (dwConversion & IME_CMODE_ROMAN); + SET_KEY_DOWN(KeyState, VK_DBE_ROMAN, bRoman); + SET_KEY_LOCKED(KeyState, VK_DBE_ROMAN, bRoman); + SET_KEY_DOWN(KeyState, VK_DBE_NOROMAN, !bRoman); + SET_KEY_LOCKED(KeyState, VK_DBE_NOROMAN, !bRoman); + + bCharCode = (dwConversion & IME_CMODE_CHARCODE); + SET_KEY_DOWN(KeyState, VK_DBE_CODEINPUT, bCharCode); + SET_KEY_LOCKED(KeyState, VK_DBE_CODEINPUT, bCharCode); + SET_KEY_DOWN(KeyState, VK_DBE_NOCODEINPUT, !bCharCode); + SET_KEY_LOCKED(KeyState, VK_DBE_NOCODEINPUT, !bCharCode); + break; + + case LANG_KOREAN: + SET_KEY_LOCKED(KeyState, VK_HANGUL, (dwConversion & IME_CMODE_NATIVE)); + SET_KEY_LOCKED(KeyState, VK_JUNJA, (dwConversion & IME_CMODE_FULLSHAPE)); + SET_KEY_LOCKED(KeyState, VK_HANJA, (dwConversion & IME_CMODE_HANJACONVERT)); + break; + + default: + break; + } +} + DWORD APIENTRY NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion) { - TRACE("NtUserNotifyIMEStatus(%p, %d, 0x%lX)\n", hwnd, fOpen, dwConversion); + PWND pwnd; + PTHREADINFO pti; + HKL hKL; + + UserEnterExclusive(); + + pwnd = ValidateHwndNoErr(hwnd); + if (!pwnd || !IS_IMM_MODE()) + goto Quit; + + pti = pwnd->head.pti; + if (!pti || !gptiForeground) + goto Quit; + if (pti != gptiForeground && pti->MessageQueue != gptiForeground->MessageQueue) + goto Quit; + if (ghIMC == pwnd->hImc && gfImeOpen == !!fOpen && gdwImeConversion == dwConversion) + goto Quit; + + ghIMC = pwnd->hImc; + if (ghIMC) + { + gfImeOpen = !!fOpen; + gdwImeConversion = dwConversion; + UserSetImeConversionKeyState(pti, (fOpen ? dwConversion : IME_CMODE_ALPHANUMERIC)); + } + + if (ISITHOOKED(WH_SHELL)) + { + hKL = (pti->KeyboardLayout ? pti->KeyboardLayout->hkl : NULL); + co_HOOK_CallHooks(WH_SHELL, HSHELL_LANGUAGE, (WPARAM)hwnd, (LPARAM)hKL); + } + + // TODO: + +Quit: + UserLeave(); return 0; }

1 0

[reactos] 01/01: [NTUSER] Cleanup the window lists (#4346)
by Katayama Hirofumi MZ 08 Feb '22

08 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61d4b5fd6c6604feaa2bd… commit 61d4b5fd6c6604feaa2bd97ebb58f8fe1a4cc671 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Feb 8 12:21:05 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Feb 8 12:21:05 2022 +0900 [NTUSER] Cleanup the window lists (#4346) Cleanup the window lists that are no longer needed at the thread / process termination. CORE-11700 --- win32ss/user/ntuser/main.c | 17 +++++++++++++++++ win32ss/user/ntuser/window.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/win32ss/user/ntuser/main.c b/win32ss/user/ntuser/main.c index 46364a10089..62e1f157271 100644 --- a/win32ss/user/ntuser/main.c +++ b/win32ss/user/ntuser/main.c @@ -180,6 +180,12 @@ UserProcessDestroy(PEPROCESS Process) if (ppiScrnSaver == ppiCurrent) ppiScrnSaver = NULL; + if (gpwlCache) + { + ExFreePoolWithTag(gpwlCache, USERTAG_WINDOWLIST); + gpwlCache = NULL; + } + /* Destroy user objects */ UserDestroyObjectsForOwner(gHandleTable, ppiCurrent); @@ -697,6 +703,7 @@ ExitThreadCallback(PETHREAD Thread) PPROCESSINFO ppiCurrent; PEPROCESS Process; PTHREADINFO ptiCurrent; + PWINDOWLIST pwl, pwlNext; Process = Thread->ThreadsProcess; @@ -714,6 +721,16 @@ ExitThreadCallback(PETHREAD Thread) IsRemoveAttachThread(ptiCurrent); + if (gpwlList) + { + for (pwl = gpwlList; pwl; pwl = pwlNext) + { + pwlNext = pwl->pNextList; + if (pwl->pti == ptiCurrent) + IntFreeHwndList(pwl); + } + } + ptiCurrent->TIF_flags |= TIF_DONTATTACHQUEUE; ptiCurrent->pClientInfo->dwTIFlags = ptiCurrent->TIF_flags; diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index fd63e1c920f..7086af36fc5 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -90,6 +90,9 @@ typedef struct tagWINDOWLIST HWND ahwnd[ANYSIZE_ARRAY]; /* Terminated by HWND_TERMINATOR */ } WINDOWLIST, *PWINDOWLIST; +extern PWINDOWLIST gpwlList; +extern PWINDOWLIST gpwlCache; + #define WL_IS_BAD(pwl) ((pwl)->phwndEnd <= (pwl)->phwndLast) #define WL_CAPACITY(pwl) ((pwl)->phwndEnd - &((pwl)->ahwnd[0]))

1 0

[reactos] 04/04: [SHELL32] Rename functions to fix ambiguity
by Mark Jansen 07 Feb '22

07 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce306b83dbd7c73e81520… commit ce306b83dbd7c73e815203239f4f1767e39a8281 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 6 21:08:52 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 7 20:56:46 2022 +0100 [SHELL32] Rename functions to fix ambiguity --- dll/win32/shell32/shlexec.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index a3a4a05a2c3..b8f3bb2ca16 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1511,7 +1511,7 @@ static HRESULT shellex_get_contextmenu(LPSHELLEXECUTEINFOW sei, CComPtr<IContext return shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IContextMenu, &cm)); } -static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei) +static HRESULT ShellExecute_ContextMenuVerb(LPSHELLEXECUTEINFOW sei) { TRACE("%p\n", sei); @@ -1564,7 +1564,7 @@ static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei) /************************************************************************* * ShellExecute_FromContextMenu [Internal] */ -static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei ) +static LONG ShellExecute_FromContextMenuHandlers( LPSHELLEXECUTEINFOW sei ) { HKEY hkey, hkeycm = 0; WCHAR szguid[39]; @@ -1983,7 +1983,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) if ((sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST) { - HRESULT hr = IContextMenu_exec(&sei_tmp); + HRESULT hr = ShellExecute_ContextMenuVerb(&sei_tmp); if (SUCCEEDED(hr)) { sei->hInstApp = (HINSTANCE)42; @@ -1997,7 +1997,7 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) } - if (ERROR_SUCCESS == ShellExecute_FromContextMenu(&sei_tmp)) + if (ERROR_SUCCESS == ShellExecute_FromContextMenuHandlers(&sei_tmp)) { sei->hInstApp = (HINSTANCE) 33; HeapFree(GetProcessHeap(), 0, wszApplicationName);

1 0

[reactos] 03/04: [SHELL32] Show properties dialog in a new thread
by Mark Jansen 07 Feb '22

07 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc5603d9d078c4c276d85… commit bc5603d9d078c4c276d852d636a2ba642288f984 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Feb 3 23:23:33 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 7 20:56:46 2022 +0100 [SHELL32] Show properties dialog in a new thread --- dll/win32/shell32/shlfolder.cpp | 81 ++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 21 deletions(-) diff --git a/dll/win32/shell32/shlfolder.cpp b/dll/win32/shell32/shlfolder.cpp index 03b4aa4ee11..01018b44ede 100644 --- a/dll/win32/shell32/shlfolder.cpp +++ b/dll/win32/shell32/shlfolder.cpp @@ -26,6 +26,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +static +HRESULT WINAPI _SHBindToFolder(LPCITEMIDLIST path, IShellFolder** newFolder) +{ + CComPtr<IShellFolder> desktop; + + HRESULT hr = ::SHGetDesktopFolder(&desktop); + if (FAILED_UNEXPECTEDLY(hr)) + return E_FAIL; + if (path == NULL || path->mkid.cb == 0) + { + *newFolder = desktop; + desktop.p->AddRef(); + return S_OK; + } + return desktop->BindToObject(path, NULL, IID_PPV_ARG(IShellFolder, newFolder)); +} + + /*************************************************************************** * GetNextElement (internal function) * @@ -422,33 +440,39 @@ SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, return E_FAIL; } -/* - * for internal use - */ -HRESULT WINAPI -Shell_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdtobj) + + +static +DWORD WINAPI +_ShowPropertiesDialogThread(LPVOID lpParameter) { - PIDLIST_ABSOLUTE pidlFolder; - PUITEMID_CHILD *apidl; - UINT cidl; - HRESULT hr = SH_GetApidlFromDataObject(pdtobj, &pidlFolder, &apidl, &cidl); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + CComPtr<IDataObject> pDataObject; + pDataObject.Attach((IDataObject*)lpParameter); + + CDataObjectHIDA cida(pDataObject); - if (cidl > 1) + if (FAILED_UNEXPECTEDLY(cida.hr())) + return cida.hr(); + + if (cida->cidl > 1) { ERR("SHMultiFileProperties is not yet implemented\n"); - SHFree(pidlFolder); - _ILFreeaPidl(apidl, cidl); return E_FAIL; } + PCUIDLIST_ABSOLUTE pidlFolder = HIDA_GetPIDLFolder(cida); + CComPtr<IShellFolder> psfParent; + HRESULT hr = _SHBindToFolder(pidlFolder, &psfParent); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + STRRET strFile; - hr = psf->GetDisplayNameOf(apidl[0], SHGDN_FORPARSING, &strFile); - if (SUCCEEDED(hr)) + PCUIDLIST_RELATIVE apidl = HIDA_GetPIDLItem(cida, 0); + hr = psfParent->GetDisplayNameOf(apidl, SHGDN_FORPARSING, &strFile); + if (!FAILED_UNEXPECTEDLY(hr)) { - hr = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, apidl); - if (FAILED(hr)) + BOOL bSuccess = SH_ShowPropertiesDialog(strFile.pOleStr, pidlFolder, &apidl); + if (!bSuccess) ERR("SH_ShowPropertiesDialog failed\n"); } else @@ -456,8 +480,23 @@ Shell_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdtobj) ERR("Failed to get display name\n"); } - SHFree(pidlFolder); - _ILFreeaPidl(apidl, cidl); + return 0; +} - return hr; +/* + * for internal use + */ +HRESULT WINAPI +Shell_DefaultContextMenuCallBack(IShellFolder *psf, IDataObject *pdtobj) +{ + pdtobj->AddRef(); + if (!SHCreateThread(_ShowPropertiesDialogThread, pdtobj, CTF_INSIST | CTF_COINIT, NULL)) + { + pdtobj->Release(); + return HRESULT_FROM_WIN32(GetLastError()); + } + else + { + return S_OK; + } }

1 0

[reactos] 02/04: [SHELL32] ShellExecute: Retry after searching for the file in the SEE_MASK_INVOKEIDLIST case
by Mark Jansen 07 Feb '22

07 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93fac5533d377e86f65cb… commit 93fac5533d377e86f65cb4c3ad2abe6ef44ea1a0 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Feb 3 23:22:37 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 7 20:56:46 2022 +0100 [SHELL32] ShellExecute: Retry after searching for the file in the SEE_MASK_INVOKEIDLIST case CORE-18035 --- dll/win32/shell32/shlexec.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 7cfc0021470..a3a4a05a2c3 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1486,7 +1486,18 @@ static HRESULT shellex_get_contextmenu(LPSHELLEXECUTEINFOW sei, CComPtr<IContext SFGAOF sfga = 0; HRESULT hr = SHParseDisplayName(sei->lpFile, NULL, &allocatedPidl, SFGAO_STORAGECAPMASK, &sfga); if (FAILED(hr)) - return hr; + { + WCHAR Buffer[MAX_PATH] = {}; + // FIXME: MAX_PATH..... + UINT retval = SHELL_FindExecutable(sei->lpDirectory, sei->lpFile, sei->lpVerb, Buffer, _countof(Buffer), NULL, NULL, NULL, sei->lpParameters); + if (retval <= 32) + return HRESULT_FROM_WIN32(retval); + + hr = SHParseDisplayName(Buffer, NULL, &allocatedPidl, SFGAO_STORAGECAPMASK, &sfga); + // This should not happen, we found it... + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } pidl = allocatedPidl; }

1 0

[reactos] 01/04: [SHELL32] ShellExecute: Implement SEE_MASK_INVOKEIDLIST
by Mark Jansen 07 Feb '22

07 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6f5490ab41a4446a6026… commit f6f5490ab41a4446a6026c81bea4cc8255584184 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Feb 3 21:54:12 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Feb 7 20:56:21 2022 +0100 [SHELL32] ShellExecute: Implement SEE_MASK_INVOKEIDLIST CORE-18035 Also simplify some error handling by using smart pointers --- dll/win32/shell32/folders/CFSFolder.cpp | 4 +- dll/win32/shell32/shlexec.cpp | 194 ++++++++++++++++++++++---------- 2 files changed, 138 insertions(+), 60 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 72325d3973b..c332d812d3a 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -1812,8 +1812,8 @@ HRESULT WINAPI CFSFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObjec PUITEMID_CHILD pidlChild = ILClone(ILFindLastID(m_pidlRoot)); LPITEMIDLIST pidlParent = ILClone(m_pidlRoot); ILRemoveLastID(pidlParent); - HRESULT hr = SH_ShowPropertiesDialog(m_sPathTarget, pidlParent, &pidlChild); - if (FAILED(hr)) + BOOL bSuccess = SH_ShowPropertiesDialog(m_sPathTarget, pidlParent, &pidlChild); + if (!bSuccess) ERR("SH_ShowPropertiesDialog failed\n"); ILFree(pidlChild); ILFree(pidlParent); diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 955d2af840e..7cfc0021470 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -1327,16 +1327,15 @@ static HKEY ShellExecute_GetClassKey(const SHELLEXECUTEINFOW *sei) return hkey; } -static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) +static HRESULT shellex_get_dataobj( LPSHELLEXECUTEINFOW sei, CComPtr<IDataObject>& dataObj) { - LPCITEMIDLIST pidllast = NULL; - CComPtr<IDataObject> dataobj; - CComPtr<IShellFolder> shf; + CComHeapPtr<ITEMIDLIST> allocatedPidl; LPITEMIDLIST pidl = NULL; - HRESULT r; if (sei->fMask & SEE_MASK_CLASSALL) + { pidl = (LPITEMIDLIST)sei->lpIDList; + } else { WCHAR fullpath[MAX_PATH]; @@ -1345,21 +1344,19 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei ) fullpath[0] = 0; ret = GetFullPathNameW(sei->lpFile, MAX_PATH, fullpath, NULL); if (!ret) - goto end; + return HRESULT_FROM_WIN32(GetLastError()); pidl = ILCreateFromPathW(fullpath); + allocatedPidl.Attach(pidl); } - r = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &shf), &pidllast); - if (FAILED(r)) - goto end; - - shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IDataObject, &dataobj)); + CComPtr<IShellFolder> shf; + LPCITEMIDLIST pidllast = NULL; + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &shf), &pidllast); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; -end: - if (pidl != sei->lpIDList) - ILFree(pidl); - return dataobj.Detach(); + return shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IDataObject, &dataObj)); } static HRESULT shellex_run_context_menu_default(IShellExtInit *obj, @@ -1431,60 +1428,128 @@ end: return r; } -static HRESULT shellex_load_object_and_run(HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei) +namespace { - // Can not use CComPtr here because of CoUninitialize at the end, before the destructors would run. - IDataObject *dataobj = NULL; - IObjectWithSite *ows = NULL; - IShellExtInit *obj = NULL; - HRESULT r; + struct CCoInit + { + CCoInit() { hres = CoInitialize(NULL); } + ~CCoInit() { if (SUCCEEDED(hres)) { CoUninitialize(); } } + HRESULT hres; + }; +} +static HRESULT shellex_load_object_and_run(HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei) +{ TRACE("%p %s %p\n", hkey, debugstr_guid(guid), sei); - r = CoInitialize(NULL); - if (FAILED(r)) - goto end; + CCoInit coInit; + + if (FAILED_UNEXPECTEDLY(coInit.hres)) + return coInit.hres; - r = CoCreateInstance(*guid, NULL, CLSCTX_INPROC_SERVER, + CComPtr<IShellExtInit> obj; + HRESULT hr = CoCreateInstance(*guid, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellExtInit, &obj)); - if (FAILED(r)) + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IDataObject> dataobj; + hr = shellex_get_dataobj(sei, dataobj); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = obj->Initialize(NULL, dataobj, hkey); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComPtr<IObjectWithSite> ows; + hr = obj->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + ows->SetSite(NULL); + + return shellex_run_context_menu_default(obj, sei); +} + +static HRESULT shellex_get_contextmenu(LPSHELLEXECUTEINFOW sei, CComPtr<IContextMenu>& cm) +{ + CComHeapPtr<ITEMIDLIST> allocatedPidl; + LPITEMIDLIST pidl = NULL; + + if (sei->lpIDList) { - ERR("failed %08x\n", r); - goto end; + pidl = (LPITEMIDLIST)sei->lpIDList; } - - dataobj = shellex_get_dataobj(sei); - if (!dataobj) + else { - ERR("failed to get data object\n"); - r = E_FAIL; - goto end; + SFGAOF sfga = 0; + HRESULT hr = SHParseDisplayName(sei->lpFile, NULL, &allocatedPidl, SFGAO_STORAGECAPMASK, &sfga); + if (FAILED(hr)) + return hr; + + pidl = allocatedPidl; } - r = obj->Initialize(NULL, dataobj, hkey); - if (FAILED(r)) - goto end; + CComPtr<IShellFolder> shf; + LPCITEMIDLIST pidllast = NULL; + HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &shf), &pidllast); + if (FAILED(hr)) + return hr; - r = obj->QueryInterface(IID_PPV_ARG(IObjectWithSite, &ows)); - if (FAILED(r)) - goto end; + return shf->GetUIObjectOf(NULL, 1, &pidllast, IID_NULL_PPV_ARG(IContextMenu, &cm)); +} - ows->SetSite(NULL); +static HRESULT IContextMenu_exec(LPSHELLEXECUTEINFOW sei) +{ + TRACE("%p\n", sei); - r = shellex_run_context_menu_default(obj, sei); + CCoInit coInit; -end: - if (ows) - ows->Release(); - if (dataobj) - dataobj->Release(); - if (obj) - obj->Release(); - CoUninitialize(); - return r; + if (FAILED_UNEXPECTEDLY(coInit.hres)) + return coInit.hres; + + CComPtr<IContextMenu> cm; + HRESULT hr = shellex_get_contextmenu(sei, cm); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + CComHeapPtr<char> verb, parameters; + __SHCloneStrWtoA(&verb, sei->lpVerb); + __SHCloneStrWtoA(&parameters, sei->lpParameters); + + CMINVOKECOMMANDINFOEX ici = {}; + ici.cbSize = sizeof ici; + ici.fMask = (sei->fMask & (SEE_MASK_NO_CONSOLE | SEE_MASK_ASYNCOK | SEE_MASK_FLAG_NO_UI)); + ici.nShow = sei->nShow; + ici.lpVerb = verb; + ici.hwnd = sei->hwnd; + ici.lpParameters = parameters; + + HMENU hMenu = CreatePopupMenu(); + BOOL fDefault = !ici.lpVerb || !ici.lpVerb[0]; + hr = cm->QueryContextMenu(hMenu, 0, 1, 0x7fff, fDefault ? CMF_DEFAULTONLY : 0); + if (!FAILED_UNEXPECTEDLY(hr)) + { + if (fDefault) + { + INT uDefault = GetMenuDefaultItem(hMenu, FALSE, 0); + uDefault = (uDefault != -1) ? uDefault - 1 : 0; + ici.lpVerb = MAKEINTRESOURCEA(uDefault); + } + + hr = cm->InvokeCommand((LPCMINVOKECOMMANDINFO)&ici); + if (!FAILED_UNEXPECTEDLY(hr)) + hr = S_OK; + } + + DestroyMenu(hMenu); + + return hr; } + /************************************************************************* * ShellExecute_FromContextMenu [Internal] */ @@ -1751,7 +1816,7 @@ static WCHAR *expand_environment( const WCHAR *str ) static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) { static const DWORD unsupportedFlags = - SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY | + SEE_MASK_ICON | SEE_MASK_HOTKEY | SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_UNICODE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR; @@ -1853,15 +1918,12 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) if (sei_tmp.fMask & unsupportedFlags) { - // SEE_MASK_IDLIST is not in unsupportedFlags, but the check above passes because SEE_MASK_INVOKEIDLIST is in it - if ((sei_tmp.fMask & unsupportedFlags) != SEE_MASK_IDLIST) - { - FIXME("flags ignored: 0x%08x\n", sei_tmp.fMask & unsupportedFlags); - } + FIXME("flags ignored: 0x%08x\n", sei_tmp.fMask & unsupportedFlags); } /* process the IDList */ - if (sei_tmp.fMask & SEE_MASK_IDLIST) + if (sei_tmp.fMask & SEE_MASK_IDLIST && + (sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) != SEE_MASK_INVOKEIDLIST) { CComPtr<IShellExecuteHookW> pSEH; @@ -1908,6 +1970,22 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) sei_tmp.lpDirectory = wszDir = tmp; } + if ((sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST) + { + HRESULT hr = IContextMenu_exec(&sei_tmp); + if (SUCCEEDED(hr)) + { + sei->hInstApp = (HINSTANCE)42; + HeapFree(GetProcessHeap(), 0, wszApplicationName); + if (wszParameters != parametersBuffer) + HeapFree(GetProcessHeap(), 0, wszParameters); + if (wszDir != dirBuffer) + HeapFree(GetProcessHeap(), 0, wszDir); + return TRUE; + } + } + + if (ERROR_SUCCESS == ShellExecute_FromContextMenu(&sei_tmp)) { sei->hInstApp = (HINSTANCE) 33;

1 0

[reactos] 01/01: [NTUSER] Rewrite NtUserDestroyInputContext (#4342)
by Katayama Hirofumi MZ 07 Feb '22

07 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bc9dda5e6ab80524aa00… commit 1bc9dda5e6ab80524aa0012bd7a75d162325a232 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Feb 7 10:45:02 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 7 10:45:02 2022 +0900 [NTUSER] Rewrite NtUserDestroyInputContext (#4342) CORE-11700 --- win32ss/user/ntuser/ime.c | 55 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 06b7eabe5fe..98007549568 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -27,6 +27,13 @@ PWND FASTCALL IntGetTopLevelWindow(PWND pwnd) return pwnd; } +HIMC FASTCALL IntAssociateInputContext(PWND pWnd, PIMC pImc) +{ + HIMC hOldImc = pWnd->hImc; + pWnd->hImc = (pImc ? UserHMGetHandle(pImc) : NULL); + return hOldImc; +} + DWORD APIENTRY NtUserSetThreadLayoutHandles(HKL hNewKL, HKL hOldKL) @@ -612,20 +619,49 @@ BOOL APIENTRY NtUserDestroyInputContext(HIMC hIMC) { PIMC pIMC; BOOL ret = FALSE; + HWND *phwnd; + PWND pWnd; + PWINDOWLIST pwl; + PTHREADINFO pti; UserEnterExclusive(); - if (!(gpsi->dwSRVIFlags & SRVINFO_IMM32)) + if (!IS_IMM_MODE()) { EngSetLastError(ERROR_CALL_NOT_IMPLEMENTED); - UserLeave(); - return FALSE; + goto Quit; } - pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); - if (pIMC) - ret = UserDereferenceObject(pIMC); + pIMC = UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + pti = pIMC->head.pti; + if (pti != GetW32ThreadInfo() || pIMC == pti->spDefaultImc) + goto Quit; + + UserMarkObjectDestroy(pIMC); + + pwl = IntBuildHwndList(pti->rpdesk->pDeskInfo->spwnd->spwndChild, + IACE_CHILDREN | IACE_LIST, pti); + if (pwl) + { + for (phwnd = pwl->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd) + { + pWnd = ValidateHwndNoErr(*phwnd); + if (!pWnd) + continue; + + if (pWnd->hImc == hIMC) + IntAssociateInputContext(pWnd, pti->spDefaultImc); + } + + IntFreeHwndList(pwl); + } + ret = UserDeleteObject(hIMC, TYPE_INPUTCONTEXT); + +Quit: UserLeave(); return ret; } @@ -695,13 +731,6 @@ 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;

1 0

[reactos] 01/01: [FREELDR:NTLDR] Adjust some debug traces. RegOpenKey(): demote an ERR to WARN. CORE-18040
by Hermès Bélusca-Maïto 06 Feb '22

06 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=914f14a8b9dbe2ed670ee… commit 914f14a8b9dbe2ed670ee1dd6c8299fa0c63ffd4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 7 00:26:08 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 7 00:26:30 2022 +0100 [FREELDR:NTLDR] Adjust some debug traces. RegOpenKey(): demote an ERR to WARN. CORE-18040 --- boot/freeldr/freeldr/ntldr/registry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 07438b52423..3db27582935 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -110,7 +110,7 @@ RegInitCurrentControlSet( &SelectKey); if (Error != ERROR_SUCCESS) { - ERR("RegOpenKey() failed (Error %u)\n", (int)Error); + ERR("RegOpenKey('SYSTEM\\Select') failed (Error %lu)\n", Error); return Error; } @@ -122,7 +122,7 @@ RegInitCurrentControlSet( &DataSize); if (Error != ERROR_SUCCESS) { - ERR("RegQueryValue('Default') failed (Error %u)\n", (int)Error); + ERR("RegQueryValue('Default') failed (Error %lu)\n", Error); RegCloseKey(SelectKey); return Error; } @@ -135,7 +135,7 @@ RegInitCurrentControlSet( &DataSize); if (Error != ERROR_SUCCESS) { - ERR("RegQueryValue('LastKnownGood') failed (Error %u)\n", (int)Error); + ERR("RegQueryValue('LastKnownGood') failed (Error %lu)\n", Error); RegCloseKey(SelectKey); return Error; } @@ -168,7 +168,7 @@ RegInitCurrentControlSet( &SystemKey); if (Error != ERROR_SUCCESS) { - ERR("RegOpenKey(SystemKey) failed (Error %lu)\n", Error); + ERR("RegOpenKey('SYSTEM') failed (Error %lu)\n", Error); return Error; } @@ -180,7 +180,7 @@ RegInitCurrentControlSet( if (Error != ERROR_SUCCESS) { - ERR("RegOpenKey(CurrentControlSetKey) failed (Error %lu)\n", Error); + ERR("RegOpenKey('%S') failed (Error %lu)\n", ControlSetKeyName, Error); return Error; } @@ -391,7 +391,7 @@ RegOpenKey( CellIndex = CmpFindSubKeyByName(Hive, KeyNode, &SubKeyName); if (CellIndex == HCELL_NIL) { - ERR("Did not find sub key '%wZ' (full %S)\n", &SubKeyName, KeyName); + WARN("Did not find sub key '%wZ' (full: %S)\n", &SubKeyName, KeyName); return ERROR_PATH_NOT_FOUND; }

1 0

[reactos] 03/03: [FREELDR:NTLDR] Implement support for the SOS option. CORE-9023, CORE-18033
by Hermès Bélusca-Maïto 06 Feb '22

06 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6a13d452cbeaddeee0b7… commit f6a13d452cbeaddeee0b75f74934d57c7b6a7939 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 7 15:39:25 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 6 23:53:41 2022 +0100 [FREELDR:NTLDR] Implement support for the SOS option. CORE-9023, CORE-18033 - Reset the UI to a minimal one in SOS mode. - In SOS mode, a trace of loaded files is displayed on the screen, instead of the usual progress bar. - Add a callback to the PE loader to notify when imported DLLs are loaded for a main image. This allows getting an accurate SOS trace. --- boot/freeldr/freeldr/include/peloader.h | 8 +++ boot/freeldr/freeldr/lib/peloader.c | 10 +++- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 4 +- boot/freeldr/freeldr/ntldr/setupldr.c | 8 ++- boot/freeldr/freeldr/ntldr/winldr.c | 83 ++++++++++++++++++++------- boot/freeldr/freeldr/ntldr/winldr.h | 22 +++++++ boot/freeldr/freeldr/ntldr/wlregistry.c | 15 ++++- 7 files changed, 123 insertions(+), 27 deletions(-) diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index a582f760c29..63ffa80471a 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -18,6 +18,14 @@ #pragma once +/* Optional user-provided callback used by the PE loader + * when it loads DLLs imported by a main image. */ +typedef VOID +(NTAPI *PELDR_IMPORTDLL_LOAD_CALLBACK)( + _In_ PCSTR FileName); + +extern PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback; + BOOLEAN PeLdrLoadImage( IN PCHAR FileName, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 935c0ee8212..b768aa9dea8 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -23,6 +23,11 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(PELOADER); +/* GLOBALS *******************************************************************/ + +PELDR_IMPORTDLL_LOAD_CALLBACK PeLdrImportDllLoadCallback = NULL; + + /* PRIVATE FUNCTIONS *********************************************************/ /* DllName - physical, UnicodeString->Buffer - virtual */ @@ -356,6 +361,9 @@ PeLdrpLoadAndScanReferencedDll( TRACE("Loading referenced DLL: %s\n", FullDllName); + if (PeLdrImportDllLoadCallback) + PeLdrImportDllLoadCallback(FullDllName); + /* Load the image */ Success = PeLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); if (!Success) @@ -722,7 +730,7 @@ PeLdrLoadImage( LARGE_INTEGER Position; ULONG i, BytesRead; - TRACE("PeLdrLoadImage(%s, %ld, *)\n", FileName, MemoryType); + TRACE("PeLdrLoadImage(%s, %ld)\n", FileName, MemoryType); /* Open the image file */ Status = ArcOpen((PSTR)FileName, OpenReadOnly, &FileId); diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index 759a72f108c..e28778b553f 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -254,7 +254,7 @@ static VOID MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT) { - //Print(L"Creating PDE Entry %X\n", Entry); + //TRACE("Creating PDE Entry %X\n", Entry); // Identity mapping *PhysicalPT = (PHARDWARE_PTE)&PhysicalPageTablesBuffer[PhysicalPageTables*MM_PAGE_SIZE]; @@ -297,7 +297,7 @@ MempSetupPaging(IN PFN_NUMBER StartPage, // We cannot map this as it requires more than 1 PDE // and in fact it's not possible at all ;) // - //Print(L"skipping...\n"); + //TRACE("skipping...\n"); return TRUE; } diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 89fde95d4b9..2deaf6ce5ba 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -490,6 +490,7 @@ LoadReactOSSetup( return EINVAL; } + /* Let the user know we started loading */ UiDrawBackdrop(); UiDrawStatusText("Setup is loading..."); UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); @@ -726,6 +727,11 @@ LoadReactOSSetup( TRACE("BootOptions: '%s'\n", BootOptions); + /* Handle the SOS option */ + SosEnabled = !!NtLdrGetOption(BootOptions, "SOS"); + if (SosEnabled) + UiResetForSOS(); + /* Allocate and minimally-initialize the Loader Parameter Block */ AllocateAndInitLPB(_WIN32_WINNT_WS03, &LoaderBlock); @@ -737,7 +743,7 @@ LoadReactOSSetup( SetupBlock->Flags = SETUPLDR_TEXT_MODE; /* Load the "setupreg.hiv" setup system hive */ - UiDrawProgressBarCenter(15, 100, "Loading setup system hive..."); + if (!SosEnabled) UiDrawProgressBarCenter(15, 100, "Loading setup system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath, TRUE); TRACE("Setup SYSTEM hive %s\n", (Success ? "loaded" : "not loaded")); /* Bail out if failure */ diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index b485835fcb4..3a21d2fe01a 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -39,6 +39,38 @@ BOOLEAN NoexecuteEnabled = FALSE; // debug stuff VOID DumpMemoryAllocMap(VOID); +/* PE loader import-DLL loading callback */ +static VOID +NTAPI +NtLdrImportDllLoadCallback( + _In_ PCSTR FileName) +{ + NtLdrOutputLoadMsg(FileName, NULL); +} + +VOID +NtLdrOutputLoadMsg( + _In_ PCSTR FileName, + _In_opt_ PCSTR Description) +{ + if (SosEnabled) + { + printf(" %s\n", FileName); + TRACE("Loading: %s\n", FileName); + } + else + { + /* Inform the user we load a file */ + CHAR ProgressString[256]; + + RtlStringCbPrintfA(ProgressString, sizeof(ProgressString), + "Loading %s...", + (Description ? Description : FileName)); + // UiDrawProgressBarCenter(1, 100, ProgressString); + UiDrawStatusText(ProgressString); + } +} + // Init "phase 0" VOID AllocateAndInitLPB( @@ -288,6 +320,8 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, // It's not loaded, we have to load it RtlStringCbPrintfA(FullPath, sizeof(FullPath), "%s%wZ", BootPath, FilePath); + + NtLdrOutputLoadMsg(FullPath, NULL); Success = PeLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); if (!Success) return FALSE; @@ -379,16 +413,10 @@ WinLdrLoadModule(PCSTR ModuleName, ARC_STATUS Status; ULONG BytesRead; - //CHAR ProgressString[256]; - - /* Inform user we are loading files */ - //RtlStringCbPrintfA(ProgressString, sizeof(ProgressString), "Loading %s...", FileName); - //UiDrawProgressBarCenter(1, 100, ProgressString); - - TRACE("Loading module %s\n", ModuleName); *Size = 0; /* Open the image file */ + NtLdrOutputLoadMsg(ModuleName, NULL); Status = ArcOpen((PSTR)ModuleName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -467,11 +495,12 @@ LoadModule( PVOID BaseAddress = NULL; RtlStringCbPrintfA(ProgressString, sizeof(ProgressString), "Loading %s...", File); - UiDrawProgressBarCenter(Percentage, 100, ProgressString); + if (!SosEnabled) UiDrawProgressBarCenter(Percentage, 100, ProgressString); RtlStringCbCopyA(FullFileName, sizeof(FullFileName), Path); RtlStringCbCatA(FullFileName, sizeof(FullFileName), File); + NtLdrOutputLoadMsg(FullFileName, NULL); Success = PeLdrLoadImage(FullFileName, MemoryType, &BaseAddress); if (!Success) { @@ -620,12 +649,6 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, FIXME("LoadWindowsCore: 3GB - TRUE (not implemented)\n"); VirtualBias = TRUE; } - if (NtLdrGetOption(BootOptions, "SOS")) - { - /* We found the SOS option. */ - FIXME("LoadWindowsCore: SOS - TRUE (not implemented)\n"); - SosEnabled = TRUE; - } if (OperatingSystemVersion > _WIN32_WINNT_NT4) { @@ -813,7 +836,9 @@ LoadAndBootWindows( return EINVAL; } + /* Let the user know we started loading */ UiDrawBackdrop(); + UiDrawStatusText("Loading..."); UiDrawProgressBarCenter(1, 100, "Loading NT..."); /* Retrieve the system path */ @@ -909,14 +934,16 @@ LoadAndBootWindows( } } - /* Let user know we started loading */ - //UiDrawStatusText("Loading..."); + /* Handle the SOS option */ + SosEnabled = !!NtLdrGetOption(BootOptions, "SOS"); + if (SosEnabled) + UiResetForSOS(); /* Allocate and minimally-initialize the Loader Parameter Block */ AllocateAndInitLPB(OperatingSystemVersion, &LoaderBlock); /* Load the system hive */ - UiDrawProgressBarCenter(15, 100, "Loading system hive..."); + if (!SosEnabled) UiDrawProgressBarCenter(15, 100, "Loading system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath, FALSE); TRACE("SYSTEM hive %s\n", (Success ? "loaded" : "not loaded")); /* Bail out if failure */ @@ -974,9 +1001,13 @@ LoadAndBootWindowsCommon( SystemRoot = strstr(BootPath, "\\"); /* Detect hardware */ - UiDrawProgressBarCenter(20, 100, "Detecting hardware..."); + if (!SosEnabled) UiDrawProgressBarCenter(20, 100, "Detecting hardware..."); LoaderBlock->ConfigurationRoot = MachHwDetect(); + /* Initialize the PE loader import-DLL callback, so that we can obtain + * feedback (for example during SOS) on the PE images that get loaded. */ + PeLdrImportDllLoadCallback = NtLdrImportDllLoadCallback; + /* Load the operating system core: the Kernel, the HAL and the Kernel Debugger Transport DLL */ Success = LoadWindowsCore(OperatingSystemVersion, LoaderBlock, @@ -985,17 +1016,27 @@ LoadAndBootWindowsCommon( &KernelDTE); if (!Success) { + /* Reset the PE loader import-DLL callback */ + PeLdrImportDllLoadCallback = NULL; + UiMessageBox("Error loading NTOS core."); return ENOEXEC; } + /* Cleanup INI file */ + IniCleanup(); + +/**** + **** WE HAVE NOW REACHED THE POINT OF NO RETURN !! + ****/ + /* Load boot drivers */ - UiDrawProgressBarCenter(100, 100, "Loading boot drivers..."); + if (!SosEnabled) UiDrawProgressBarCenter(100, 100, "Loading boot drivers..."); Success = WinLdrLoadBootDrivers(LoaderBlock, BootPath); TRACE("Boot drivers loading %s\n", Success ? "successful" : "failed"); - /* Cleanup ini file */ - IniCleanup(); + /* Reset the PE loader import-DLL callback */ + PeLdrImportDllLoadCallback = NULL; /* Initialize Phase 1 - no drivers loading anymore */ WinLdrInitializePhase1(LoaderBlock, diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index c89010e3e1a..03cc68f88c7 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -73,6 +73,28 @@ VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); // winldr.c +extern BOOLEAN SosEnabled; + +FORCEINLINE +VOID +UiResetForSOS(VOID) +{ +#ifdef _M_ARM + /* Re-initialize the UI */ + UiInitialize(TRUE); +#else + /* Reset the UI and switch to MiniTui */ + UiVtbl.UnInitialize(); + UiVtbl = MiniTuiVtbl; + UiVtbl.Initialize(); +#endif +} + +VOID +NtLdrOutputLoadMsg( + _In_ PCSTR FileName, + _In_opt_ PCSTR Description); + PVOID WinLdrLoadModule(PCSTR ModuleName, PULONG Size, TYPE_OF_MEMORY MemoryType); diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 83bbda92f84..4f82fb82b97 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -50,6 +50,7 @@ WinLdrLoadSystemHive( RtlStringCbCopyA(FullHiveName, sizeof(FullHiveName), DirectoryPath); RtlStringCbCatA(FullHiveName, sizeof(FullHiveName), HiveName); + NtLdrOutputLoadMsg(FullHiveName, NULL); Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -330,6 +331,8 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, /* Open file with ANSI and store its size */ RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); + + NtLdrOutputLoadMsg(FileName, NULL); Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -351,9 +354,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, } else { - //Print(L"Loading %s...\n", Filename); RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); + + NtLdrOutputLoadMsg(FileName, NULL); Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -370,9 +374,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, TRACE("OemFileSize: %d\n", OemFileSize); /* And finally open the language codepage file and store its length */ - //Print(L"Loading %s...\n", Filename); RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); + + NtLdrOutputLoadMsg(FileName, NULL); Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -415,6 +420,8 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, /* Now actually read the data into memory, starting with Ansi file */ RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); RtlStringCbCatA(FileName, sizeof(FileName), AnsiFileName); + + NtLdrOutputLoadMsg(FileName, NULL); Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -435,6 +442,8 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, { RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); RtlStringCbCatA(FileName, sizeof(FileName), OemFileName); + + NtLdrOutputLoadMsg(FileName, NULL); Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { @@ -454,6 +463,8 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, /* Finally the language file */ RtlStringCbCopyA(FileName, sizeof(FileName), DirectoryPath); RtlStringCbCatA(FileName, sizeof(FileName), LanguageFileName); + + NtLdrOutputLoadMsg(FileName, NULL); Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) {

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