Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [RAPPS] Speed up app loading by caching the INI sections
by Mark Jansen 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9bdeaca56e8e01473d985… commit 9bdeaca56e8e01473d9858a1b7ea4bbdbbc836cf Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 30 20:19:21 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 3 20:26:25 2021 +0200 [RAPPS] Speed up app loading by caching the INI sections --- base/applications/rapps/appview.cpp | 6 + base/applications/rapps/configparser.cpp | 182 ++++++++++++++++--------- base/applications/rapps/include/appview.h | 13 +- base/applications/rapps/include/configparser.h | 13 +- base/applications/rapps/include/gui.h | 7 - base/applications/rapps/misc.cpp | 35 +++-- 6 files changed, 157 insertions(+), 99 deletions(-) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index c15c3ab1172..631eecbad9c 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1705,6 +1705,12 @@ BOOL CApplicationView::CreateAppInfoDisplay() return m_AppsInfo->Create(m_hWnd) != NULL; } +void CApplicationView::SetRedraw(BOOL bRedraw) +{ + CWindow::SetRedraw(bRedraw); + m_ListView->SetRedraw(bRedraw); +} + VOID CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { if (wParam == SIZE_MINIMIZED) diff --git a/base/applications/rapps/configparser.cpp b/base/applications/rapps/configparser.cpp index 5e191da800b..d5c65991daa 100644 --- a/base/applications/rapps/configparser.cpp +++ b/base/applications/rapps/configparser.cpp @@ -2,18 +2,31 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Config parser - * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com) - * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) + * Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> */ #include "rapps.h" +#include <debug.h> -CConfigParser::CConfigParser(const ATL::CStringW& FileName) : szConfigPath(GetINIFullPath(FileName)) +struct CLocaleSections { - CacheINILocale(); -} + CStringW Locale; + CStringW LocaleNeutral; + CStringW Section; +}; -ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) +struct CSectionNames +{ + CLocaleSections ArchSpecific; + CLocaleSections ArchNeutral; +}; +static CSectionNames g_Names; + + +static +ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName) { ATL::CStringW szDir; ATL::CStringW szBuffer; @@ -24,79 +37,124 @@ ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) return szBuffer; } -VOID CConfigParser::CacheINILocale() +CConfigParser::CConfigParser(const ATL::CStringW& FileName) + : szConfigPath(GetINIFullPath(FileName)) { - // TODO: Set default locale if call fails - // find out what is the current system lang code (e.g. "0a") and append it to SectionLocale - GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, - m_szLocaleID.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); - - m_szLocaleID.ReleaseBuffer(); - m_szCachedINISectionLocale = L"Section." + m_szLocaleID; - - // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part - if (m_szLocaleID.GetLength() >= 2) - m_szCachedINISectionLocaleNeutral = L"Section." + m_szLocaleID.Right(2); - else - m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale; + CacheINI(); } -BOOL CConfigParser::GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString) +void CConfigParser::ReadSection(ATL::CStringW& Buffer, const ATL::CStringW& Section, BOOL isArch) { - DWORD dwResult; - - LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); - // 1st - find localized strings (e.g. "Section.0c0a") - dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocale + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - - if (!dwResult) + DWORD len = 512; + DWORD result; + + do { - // 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") - dwResult = GetPrivateProfileStringW((m_szCachedINISectionLocaleNeutral + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); - if (!dwResult) + len *= 2; + + result = GetPrivateProfileSectionW(Section, Buffer.GetBuffer(len), len, szConfigPath); + Buffer.ReleaseBuffer(result); + } while (result == len - 2); + + len = 0; + while (len < result) + { + // Explicitly use the null terminator! + CString tmp = Buffer.GetBuffer() + len; + if (tmp.GetLength() > 0) + { + len += tmp.GetLength() + 1; + + int idx = tmp.Find('='); + if (idx >= 0) + { + CString key = tmp.Left(idx); + +#ifndef _M_IX86 + // On non-x86 architecture we need the architecture specific URL + if (!isArch && key == "URLDownload") + { + continue; + } +#endif + + // Is this key already present from a more specific translation? + if (m_Keys.FindKey(key) >= 0) + { + continue; + } + + CString value = tmp.Mid(idx+1); + m_Keys.Add(key, value); + } + else + { + DPRINT1("ERROR: invalid key/value pair: '%S'\n", tmp.GetString()); + } + } + else { - // 3rd - if they weren't present fallback to standard english strings (just "Section") - dwResult = GetPrivateProfileStringW((ATL::CStringW(L"Section") + Suffix).GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - MAX_PATH, - szConfigPath.GetString()); + break; } } - - ResultString.ReleaseBuffer(); - return (dwResult != 0 ? TRUE : FALSE); } -BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +VOID CConfigParser::CacheINI() { - /* First try */ - if (GetStringWorker(KeyName, L"." CurrentArchitecture, ResultString)) + // Cache section names + if (g_Names.ArchSpecific.Locale.IsEmpty()) { - return TRUE; + CString szLocaleID; + const INT cchLocaleSize = 5; + + GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, szLocaleID.GetBuffer(cchLocaleSize), cchLocaleSize); + szLocaleID.ReleaseBuffer(); + CString INISectionLocale = L"Section." + szLocaleID; + + g_Names.ArchSpecific.Locale = INISectionLocale + L"." CurrentArchitecture; + g_Names.ArchNeutral.Locale = INISectionLocale; + + // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part + if (szLocaleID.GetLength() >= 2) + { + g_Names.ArchSpecific.LocaleNeutral = L"Section." + szLocaleID.Right(2) + L"." CurrentArchitecture; + g_Names.ArchNeutral.LocaleNeutral = L"Section." + szLocaleID.Right(2); + } + + g_Names.ArchSpecific.Section = L"Section." CurrentArchitecture; + g_Names.ArchNeutral.Section = L"Section"; } -#ifndef _M_IX86 - /* On non-x86 architecture we need the architecture specific URL */ - if (KeyName == L"URLDownload") + // Use a shared buffer so that we don't have to re-allocate it every time + CStringW Buffer; + + ReadSection(Buffer, g_Names.ArchSpecific.Locale, TRUE); + if (!g_Names.ArchSpecific.LocaleNeutral.IsEmpty()) { - return FALSE; + ReadSection(Buffer, g_Names.ArchSpecific.LocaleNeutral, TRUE); + } + ReadSection(Buffer, g_Names.ArchSpecific.Section, TRUE); + + + ReadSection(Buffer, g_Names.ArchNeutral.Locale, FALSE); + if (!g_Names.ArchNeutral.LocaleNeutral.IsEmpty()) + { + ReadSection(Buffer, g_Names.ArchNeutral.LocaleNeutral, FALSE); + } + ReadSection(Buffer, g_Names.ArchNeutral.Section, FALSE); +} + +BOOL CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +{ + int nIndex = m_Keys.FindKey(KeyName); + if (nIndex >= 0) + { + ResultString = m_Keys.GetValueAt(nIndex); + return TRUE; } -#endif - /* Fall back to default */ - return GetStringWorker(KeyName, L"", ResultString); + ResultString.Empty(); + return FALSE; } BOOL CConfigParser::GetInt(const ATL::CStringW& KeyName, INT& iResult) diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 192a59c7489..b625d5ed296 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -351,42 +351,31 @@ private: BOOL ProcessWindowMessage(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT &theResult, DWORD dwMapId); BOOL CreateToolbar(); - BOOL CreateSearchBar(); - BOOL CreateComboBox(); - BOOL CreateHSplitter(); - BOOL CreateListView(); - BOOL CreateAppInfoDisplay(); VOID OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam); - VOID OnCommand(WPARAM wParam, LPARAM lParam); public: CApplicationView(CMainWindow *MainWindow); - ~CApplicationView(); static ATL::CWndClassInfo &GetWndClassInfo(); HWND Create(HWND hwndParent); - + void SetRedraw(BOOL bRedraw); BOOL SetDisplayAppType(APPLICATION_VIEW_TYPE AppType); BOOL AddInstalledApplication(CInstalledApplicationInfo *InstAppInfo, LPVOID param); - BOOL AddAvailableApplication(CAvailableApplicationInfo *AvlbAppInfo, BOOL InitCheckState, LPVOID param); void CheckAll(); - PVOID GetFocusedItemData(); - int GetItemCount(); - VOID AppendTabOrderWindow(int Direction, ATL::CSimpleArray<HWND> &TabOrderList); // this function is called when a item of listview get focus. diff --git a/base/applications/rapps/include/configparser.h b/base/applications/rapps/include/configparser.h index 5df9150269c..7ccfa115bd4 100644 --- a/base/applications/rapps/include/configparser.h +++ b/base/applications/rapps/include/configparser.h @@ -5,18 +5,11 @@ class CConfigParser { - // Locale names cache - const static INT m_cchLocaleSize = 5; - - ATL::CStringW m_szLocaleID; - ATL::CStringW m_szCachedINISectionLocale; - ATL::CStringW m_szCachedINISectionLocaleNeutral; - const ATL::CStringW szConfigPath; + CSimpleMap<CStringW, CStringW> m_Keys; - ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); - VOID CacheINILocale(); - BOOL GetStringWorker(const ATL::CStringW& KeyName, PCWSTR Suffix, ATL::CStringW& ResultString); + void CacheINI(); + void ReadSection(ATL::CStringW& Buffer, const ATL::CStringW& Section, BOOL isArch); public: CConfigParser(const ATL::CStringW& FileName); diff --git a/base/applications/rapps/include/gui.h b/base/applications/rapps/include/gui.h index 1d8b6141ece..738379d7a1e 100644 --- a/base/applications/rapps/include/gui.h +++ b/base/applications/rapps/include/gui.h @@ -71,13 +71,9 @@ private: VOID InitCategoriesList(); BOOL CreateStatusBar(); - BOOL CreateTreeView(); - BOOL CreateApplicationView(); - BOOL CreateVSplitter(); - BOOL CreateLayout(); VOID LayoutCleanup(); @@ -99,11 +95,8 @@ private: VOID OnCommand(WPARAM wParam, LPARAM lParam); BOOL CALLBACK EnumInstalledAppProc(CInstalledApplicationInfo *Info); - BOOL CALLBACK EnumAvailableAppProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState); - static BOOL CALLBACK s_EnumInstalledAppProc(CInstalledApplicationInfo *Info, PVOID param); - static BOOL CALLBACK s_EnumAvailableAppProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param); static BOOL CALLBACK s_EnumSelectedAppForDownloadProc(CAvailableApplicationInfo *Info, BOOL bInitialCheckState, PVOID param); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 742d4d67bb4..b5d142828ff 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -140,17 +140,36 @@ BOOL StartProcess(const ATL::CStringW& Path, BOOL Wait) BOOL GetStorageDirectory(ATL::CStringW& Directory) { - LPWSTR DirectoryStr = Directory.GetBuffer(MAX_PATH); - if (!SHGetSpecialFolderPathW(NULL, DirectoryStr, CSIDL_LOCAL_APPDATA, TRUE)) + static CStringW CachedDirectory; + static BOOL CachedDirectoryInitialized = FALSE; + + if (!CachedDirectoryInitialized) { - Directory.ReleaseBuffer(); - return FALSE; - } + LPWSTR DirectoryStr = CachedDirectory.GetBuffer(MAX_PATH); + BOOL bHasPath = SHGetSpecialFolderPathW(NULL, DirectoryStr, CSIDL_LOCAL_APPDATA, TRUE); + if (bHasPath) + { + PathAppendW(DirectoryStr, L"rapps"); + } + CachedDirectory.ReleaseBuffer(); + + if (bHasPath) + { + if (!CreateDirectoryW(CachedDirectory, NULL) && GetLastError() != ERROR_ALREADY_EXISTS) + { + CachedDirectory.Empty(); + } + } + else + { + CachedDirectory.Empty(); + } - PathAppendW(DirectoryStr, L"rapps"); - Directory.ReleaseBuffer(); + CachedDirectoryInitialized = TRUE; + } - return (CreateDirectoryW(Directory.GetString(), NULL) || GetLastError() == ERROR_ALREADY_EXISTS); + Directory = CachedDirectory; + return !Directory.IsEmpty(); } VOID InitLogs()

1 0

[reactos] 01/02: [RAPPS] Cleanup
by Mark Jansen 03 Oct '21

03 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f9dd96dcf89b7f40f271… commit 6f9dd96dcf89b7f40f2717c30bce10c53ef95977 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 30 20:19:05 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Oct 3 20:26:19 2021 +0200 [RAPPS] Cleanup --- base/applications/rapps/include/misc.h | 12 +------- base/applications/rapps/misc.cpp | 51 ++++------------------------------ base/applications/rapps/winmain.cpp | 47 ++++++------------------------- 3 files changed, 15 insertions(+), 95 deletions(-) diff --git a/base/applications/rapps/include/misc.h b/base/applications/rapps/include/misc.h index 1a00feeb526..ff78d0a45bd 100644 --- a/base/applications/rapps/include/misc.h +++ b/base/applications/rapps/include/misc.h @@ -3,9 +3,6 @@ #include <windef.h> #include <atlstr.h> -#define EPOCH_DIFF 116444736000000000 //FILETIME starts from 1601-01-01 UTC, UnixTime starts from 1970-01-01 -#define RATE_DIFF 10000000 - #ifdef _M_IX86 #define CurrentArchitecture L"x86" #elif defined(_M_AMD64) @@ -20,16 +17,9 @@ #define CurrentArchitecture L"ppc" #endif -INT GetWindowWidth(HWND hwnd); -INT GetWindowHeight(HWND hwnd); -INT GetClientWindowWidth(HWND hwnd); -INT GetClientWindowHeight(HWND hwnd); - VOID CopyTextToClipboard(LPCWSTR lpszText); VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem); -VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem); -BOOL StartProcess(ATL::CStringW &Path, BOOL Wait); -BOOL StartProcess(LPWSTR lpPath, BOOL Wait); +BOOL StartProcess(const ATL::CStringW &Path, BOOL Wait); BOOL GetStorageDirectory(ATL::CStringW &lpDirectory); VOID InitLogs(); diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index 0380705f4e3..742d4d67bb4 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -15,38 +15,6 @@ static HANDLE hLog = NULL; static BOOL bIsSys64ResultCached = FALSE; static BOOL bIsSys64Result = FALSE; -INT GetWindowWidth(HWND hwnd) -{ - RECT Rect; - - GetWindowRect(hwnd, &Rect); - return (Rect.right - Rect.left); -} - -INT GetWindowHeight(HWND hwnd) -{ - RECT Rect; - - GetWindowRect(hwnd, &Rect); - return (Rect.bottom - Rect.top); -} - -INT GetClientWindowWidth(HWND hwnd) -{ - RECT Rect; - - GetClientRect(hwnd, &Rect); - return (Rect.right - Rect.left); -} - -INT GetClientWindowHeight(HWND hwnd) -{ - RECT Rect; - - GetClientRect(hwnd, &Rect); - return (Rect.bottom - Rect.top); -} - VOID CopyTextToClipboard(LPCWSTR lpszText) { if (!OpenClipboard(NULL)) @@ -112,18 +80,7 @@ VOID ShowPopupMenuEx(HWND hwnd, HWND hwndOwner, UINT MenuID, UINT DefaultItem) } } -VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem) -{ - ShowPopupMenuEx(hwnd, hMainWnd, MenuID, DefaultItem); -} - - -BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) -{ - return StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait);; -} - -BOOL StartProcess(LPWSTR lpPath, BOOL Wait) +BOOL StartProcess(const ATL::CStringW& Path, BOOL Wait) { PROCESS_INFORMATION pi; STARTUPINFOW si; @@ -135,7 +92,11 @@ BOOL StartProcess(LPWSTR lpPath, BOOL Wait) si.dwFlags = STARTF_USESHOWWINDOW; si.wShowWindow = SW_SHOW; - if (!CreateProcessW(NULL, lpPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + // The Unicode version of CreateProcess can modify the contents of this string. + CStringW Tmp = Path; + BOOL fSuccess = CreateProcessW(NULL, Tmp.GetBuffer(), NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + Tmp.ReleaseBuffer(); + if (!fSuccess) { return FALSE; } diff --git a/base/applications/rapps/winmain.cpp b/base/applications/rapps/winmain.cpp index 894bbb43f9c..cd2d82302b1 100644 --- a/base/applications/rapps/winmain.cpp +++ b/base/applications/rapps/winmain.cpp @@ -19,51 +19,20 @@ HWND hMainWnd; HINSTANCE hInst; SETTINGS_INFO SettingsInfo; -class CRAppsModule : public CComModule -{ -public: -}; - BEGIN_OBJECT_MAP(ObjectMap) END_OBJECT_MAP() -CRAppsModule gModule; +CComModule gModule; CAtlWinModule gWinModule; -Gdiplus::GdiplusStartupInput gdiplusStartupInput; -ULONG_PTR gdiplusToken; - - -static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) -{ - if (bInitialize) - { - gModule.Init(ObjectMap, hInstance, NULL); - } - else - { - gModule.Term(); - } -} - -VOID InitializeGDIPlus(BOOL bInitialize) -{ - if (bInitialize) - { - Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); - } - else - { - Gdiplus::GdiplusShutdown(gdiplusToken); - } -} INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) { - BOOL bIsFirstLaunch; + Gdiplus::GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; - InitializeAtlModule(hInstance, TRUE); - InitializeGDIPlus(TRUE); + gModule.Init(ObjectMap, hInstance, NULL); + Gdiplus::GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); if (GetUserDefaultUILanguage() == MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT)) { @@ -72,7 +41,7 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi hInst = hInstance; - bIsFirstLaunch = !LoadSettings(&SettingsInfo); + BOOL bIsFirstLaunch = !LoadSettings(&SettingsInfo); if (bIsFirstLaunch) { FillDefaultSettings(&SettingsInfo); @@ -84,8 +53,8 @@ INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi // parse cmd-line and perform the corresponding operation BOOL bSuccess = ParseCmdAndExecute(GetCommandLineW(), bIsFirstLaunch, SW_SHOWNORMAL); - InitializeGDIPlus(FALSE); - InitializeAtlModule(GetModuleHandle(NULL), FALSE); + Gdiplus::GdiplusShutdown(gdiplusToken); + gModule.Term(); return bSuccess ? 0 : 1; }

1 0

[reactos] 01/01: [SHELL32] Fix uninitialized variable usage. This fixes log spam about NM_CUSTOMDRAW not being handled
by Mark Jansen 01 Oct '21

01 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=22e58e68aa35a1ba49d28… commit 22e58e68aa35a1ba49d280b12f99f7f03f5f8633 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 30 20:44:05 2021 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Oct 1 17:40:01 2021 +0200 [SHELL32] Fix uninitialized variable usage. This fixes log spam about NM_CUSTOMDRAW not being handled --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 05ecbdfc8f8..9044e134359 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -258,6 +258,10 @@ HRESULT CMenuToolbarBase::OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResu } *theResult = TRUE; return S_OK; + + default: + *theResult = 0L; + break; } return S_OK; }

1 0

[reactos] 01/01: [IMM32] GetKeyboardLayout's parameter is a thread id
by Katayama Hirofumi MZ 30 Sep '21

30 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5bbd57d7329136d97d84… commit f5bbd57d7329136d97d8431a23b5eb9add5fb5d4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 1 03:13:52 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 1 03:13:52 2021 +0900 [IMM32] GetKeyboardLayout's parameter is a thread id s/dwLayout/dwThreadId/ CORE-11700 --- dll/win32/imm32/utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index cda20efc884..40512338d22 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -147,17 +147,17 @@ BOOL APIENTRY Imm32NotifyAction(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWORD_PTR dwValue, DWORD_PTR dwCommand, DWORD_PTR dwData) { - DWORD dwLayout; + DWORD dwThreadId; HKL hKL; PIMEDPI pImeDpi; if (dwAction) { - dwLayout = NtUserQueryInputContext(hIMC, 1); - if (dwLayout) + dwThreadId = NtUserQueryInputContext(hIMC, 1); + if (dwThreadId) { /* find keyboard layout and lock it */ - hKL = GetKeyboardLayout(dwLayout); + hKL = GetKeyboardLayout(dwThreadId); pImeDpi = ImmLockImeDpi(hKL); if (pImeDpi) {

1 0

[reactos] 01/01: [IMM32] Move ImmFreeLayout from ime.c to imm.c
by Katayama Hirofumi MZ 30 Sep '21

30 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6a51b54c4cb74d8cf502… commit e6a51b54c4cb74d8cf5021519b671fab4af129b1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 1 03:10:26 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Oct 1 03:10:26 2021 +0900 [IMM32] Move ImmFreeLayout from ime.c to imm.c CORE-11700 --- dll/win32/imm32/ime.c | 67 ----------------------------------------------- dll/win32/imm32/imm.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ dll/win32/imm32/precomp.h | 1 + 3 files changed, 68 insertions(+), 67 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 7ae3325f323..e831a81fcee 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -1677,70 +1677,3 @@ ImmGetImeMenuItemsW(HIMC hIMC, DWORD dwFlags, DWORD dwType, return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize, FALSE); } - -/*********************************************************************** - * ImmFreeLayout (IMM32.@) - */ -BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) -{ - WCHAR szKBD[9]; - UINT iKL, cKLs; - HKL hOldKL, hNewKL, *pList; - PIMEDPI pImeDpi; - LANGID LangID; - - TRACE("(0x%lX)\n", dwUnknown); - - hOldKL = GetKeyboardLayout(0); - - if (dwUnknown == 1) - { - if (!IS_IME_HKL(hOldKL)) - return TRUE; - - LangID = LANGIDFROMLCID(GetSystemDefaultLCID()); - - cKLs = GetKeyboardLayoutList(0, NULL); - if (cKLs) - { - pList = Imm32HeapAlloc(0, cKLs * sizeof(HKL)); - if (pList == NULL) - return FALSE; - - cKLs = GetKeyboardLayoutList(cKLs, pList); - for (iKL = 0; iKL < cKLs; ++iKL) - { - if (!IS_IME_HKL(pList[iKL])) - { - LangID = LOWORD(pList[iKL]); - break; - } - } - - Imm32HeapFree(pList); - } - - StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID); - if (!LoadKeyboardLayoutW(szKBD, KLF_ACTIVATE)) - LoadKeyboardLayoutW(L"00000409", KLF_ACTIVATE | 0x200); - } - else if (dwUnknown == 2) - { - RtlEnterCriticalSection(&g_csImeDpi); -Retry: - for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext) - { - if (Imm32ReleaseIME(pImeDpi->hKL)) - goto Retry; - } - RtlLeaveCriticalSection(&g_csImeDpi); - } - else - { - hNewKL = (HKL)(DWORD_PTR)dwUnknown; - if (IS_IME_HKL(hNewKL) && hNewKL != hOldKL) - Imm32ReleaseIME(hNewKL); - } - - return TRUE; -} diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 5cb72db884c..f458685e0ec 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -101,6 +101,73 @@ HKL WINAPI ImmLoadLayout(HKL hKL, PIMEINFOEX pImeInfoEx) return hKL; } +/*********************************************************************** + * ImmFreeLayout (IMM32.@) + */ +BOOL WINAPI ImmFreeLayout(DWORD dwUnknown) +{ + WCHAR szKBD[9]; + UINT iKL, cKLs; + HKL hOldKL, hNewKL, *pList; + PIMEDPI pImeDpi; + LANGID LangID; + + TRACE("(0x%lX)\n", dwUnknown); + + hOldKL = GetKeyboardLayout(0); + + if (dwUnknown == 1) + { + if (!IS_IME_HKL(hOldKL)) + return TRUE; + + LangID = LANGIDFROMLCID(GetSystemDefaultLCID()); + + cKLs = GetKeyboardLayoutList(0, NULL); + if (cKLs) + { + pList = Imm32HeapAlloc(0, cKLs * sizeof(HKL)); + if (pList == NULL) + return FALSE; + + cKLs = GetKeyboardLayoutList(cKLs, pList); + for (iKL = 0; iKL < cKLs; ++iKL) + { + if (!IS_IME_HKL(pList[iKL])) + { + LangID = LOWORD(pList[iKL]); + break; + } + } + + Imm32HeapFree(pList); + } + + StringCchPrintfW(szKBD, _countof(szKBD), L"%08X", LangID); + if (!LoadKeyboardLayoutW(szKBD, KLF_ACTIVATE)) + LoadKeyboardLayoutW(L"00000409", KLF_ACTIVATE | 0x200); + } + else if (dwUnknown == 2) + { + RtlEnterCriticalSection(&g_csImeDpi); +Retry: + for (pImeDpi = g_pImeDpiList; pImeDpi; pImeDpi = pImeDpi->pNext) + { + if (Imm32ReleaseIME(pImeDpi->hKL)) + goto Retry; + } + RtlLeaveCriticalSection(&g_csImeDpi); + } + else + { + hNewKL = (HKL)(DWORD_PTR)dwUnknown; + if (IS_IME_HKL(hNewKL) && hNewKL != hOldKL) + Imm32ReleaseIME(hNewKL); + } + + return TRUE; +} + typedef struct _tagImmHkl { struct list entry; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 1bcc18bbb30..c5522127cc3 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -81,6 +81,7 @@ LPVOID APIENTRY Imm32HeapAlloc(DWORD dwFlags, DWORD dwBytes); LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA); LPSTR APIENTRY Imm32AnsiFromWide(LPCWSTR pszW); PIMEDPI APIENTRY ImmLockOrLoadImeDpi(HKL hKL); +BOOL APIENTRY Imm32ReleaseIME(HKL hKL); static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) {

1 0

[reactos] 01/01: [IMM32] Rewrite ImmGetImeMenuItemsA/W (#3983)
by Katayama Hirofumi MZ 30 Sep '21

30 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33affbfecbc8a3a4c5c20… commit 33affbfecbc8a3a4c5c20a8776e46f34da898f40 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 1 03:04:00 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 1 03:04:00 2021 +0900 [IMM32] Rewrite ImmGetImeMenuItemsA/W (#3983) - Rewrite ImmGetImeMenuItemsA and ImmGetImeMenuItemsW functions. - Add Imm32GetImeMenuItemsAW, Imm32IsImcAnsi, Imm32ImeMenuAnsiToWide and Imm32ImeMenuWideToAnsi helper functions. - Make IME module's ImeGetImeMenuItems function optional. CORE-11700 --- dll/win32/imm32/ime.c | 177 ++++++++++++++++++++++++++++++++++++++++++++- dll/win32/imm32/imm.c | 142 ------------------------------------ dll/win32/imm32/precomp.h | 9 +++ dll/win32/imm32/utils.c | 60 +++++++++++++++ win32ss/include/imetable.h | 4 +- 5 files changed, 246 insertions(+), 146 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index b1b31ce9eeb..7ae3325f323 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -168,11 +168,11 @@ BOOL APIENTRY Imm32LoadImeInfo(PIMEINFOEX pImeInfoEx, PIMEDPI pImeDpi) } pImeDpi->hInst = hIME; -#define DEFINE_IME_ENTRY(type, name, params, extended) \ +#define DEFINE_IME_ENTRY(type, name, params, optional) \ do { \ fn = GetProcAddress(hIME, #name); \ if (fn) pImeDpi->name = (FN_##name)fn; \ - else if (!(extended)) goto Failed; \ + else if (!(optional)) goto Failed; \ } while (0); #include "imetable.h" #undef DEFINE_IME_ENTRY @@ -330,6 +330,151 @@ Quit: return ret; } +DWORD APIENTRY +Imm32GetImeMenuItemWCrossProcess(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu, + LPVOID lpImeMenu, DWORD dwSize) +{ + FIXME("We have to do something\n"); + return 0; +} + +DWORD APIENTRY +Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParentMenu, + LPVOID lpImeMenu, DWORD dwSize, BOOL bTargetIsAnsi) +{ + DWORD ret = 0, cbTotal, dwProcessId, dwThreadId, iItem; + LPINPUTCONTEXT pIC; + PIMEDPI pImeDpi = NULL; + IMEMENUITEMINFOA ParentA; + IMEMENUITEMINFOW ParentW; + LPIMEMENUITEMINFOA pItemA; + LPIMEMENUITEMINFOW pItemW; + LPVOID pNewItems = NULL, pNewParent = NULL; + BOOL bImcIsAnsi; + HKL hKL; + + if (!hIMC) + return 0; + + dwProcessId = NtUserQueryInputContext(hIMC, 0); + if (dwProcessId == 0) + return 0; + + if (dwProcessId != GetCurrentProcessId()) + { + if (bTargetIsAnsi) + return 0; + return Imm32GetImeMenuItemWCrossProcess(hIMC, dwFlags, dwType, lpImeParentMenu, + lpImeMenu, dwSize); + } + + pIC = ImmLockIMC(hIMC); + if (pIC == NULL) + return 0; + + dwThreadId = NtUserQueryInputContext(hIMC, 1); + if (dwThreadId == 0) + { + ImmUnlockIMC(hIMC); + return 0; + } + + hKL = GetKeyboardLayout(dwThreadId); + pImeDpi = ImmLockImeDpi(hKL); + if (!pImeDpi) + { + ImmUnlockIMC(hIMC); + return 0; + } + + if (pImeDpi->ImeGetImeMenuItems == NULL) + goto Quit; + + bImcIsAnsi = Imm32IsImcAnsi(hIMC); + + if (bImcIsAnsi != bTargetIsAnsi) + { + if (bTargetIsAnsi) + { + if (lpImeParentMenu) + pNewParent = &ParentW; + + if (lpImeMenu) + { + cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOA)) * sizeof(IMEMENUITEMINFOW)); + pNewItems = Imm32HeapAlloc(0, cbTotal); + if (!pNewItems) + goto Quit; + } + } + else + { + if (lpImeParentMenu) + pNewParent = &ParentA; + + if (lpImeMenu) + { + cbTotal = ((dwSize / sizeof(IMEMENUITEMINFOW)) * sizeof(IMEMENUITEMINFOA)); + pNewItems = Imm32HeapAlloc(0, cbTotal); + if (!pNewItems) + goto Quit; + } + } + } + else + { + pNewItems = lpImeMenu; + pNewParent = lpImeParentMenu; + } + + ret = pImeDpi->ImeGetImeMenuItems(hIMC, dwFlags, dwType, pNewParent, pNewItems, dwSize); + if (!ret || !lpImeMenu) + goto Quit; + + if (bImcIsAnsi != bTargetIsAnsi) + { + if (bTargetIsAnsi) + { + if (pNewParent) + Imm32ImeMenuWideToAnsi(pNewParent, lpImeParentMenu, CP_ACP); + + pItemW = pNewItems; + pItemA = lpImeMenu; + for (iItem = 0; iItem < ret; ++iItem, ++pItemW, ++pItemA) + { + if (!Imm32ImeMenuWideToAnsi(pItemW, pItemA, CP_ACP)) + { + ret = 0; + break; + } + } + } + else + { + if (pNewParent) + Imm32ImeMenuAnsiToWide(pNewParent, lpImeParentMenu, pImeDpi->uCodePage, TRUE); + + pItemA = pNewItems; + pItemW = lpImeMenu; + for (iItem = 0; iItem < dwSize; ++iItem, ++pItemA, ++pItemW) + { + if (!Imm32ImeMenuAnsiToWide(pItemA, pItemW, pImeDpi->uCodePage, TRUE)) + { + ret = 0; + break; + } + } + } + } + +Quit: + if (pNewItems != lpImeMenu) + Imm32HeapFree(pNewItems); + ImmUnlockImeDpi(pImeDpi); + ImmUnlockIMC(hIMC); + return ret; +} + /*********************************************************************** * ImmIsIME (IMM32.@) */ @@ -1505,6 +1650,34 @@ Quit: return ret; } +/*********************************************************************** + * ImmGetImeMenuItemsA (IMM32.@) + */ +DWORD WINAPI +ImmGetImeMenuItemsA(HIMC hIMC, DWORD dwFlags, DWORD dwType, + LPIMEMENUITEMINFOA lpImeParentMenu, + LPIMEMENUITEMINFOA lpImeMenu, DWORD dwSize) +{ + TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", + hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); + return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, + dwSize, TRUE); +} + +/*********************************************************************** + * ImmGetImeMenuItemsW (IMM32.@) + */ +DWORD WINAPI +ImmGetImeMenuItemsW(HIMC hIMC, DWORD dwFlags, DWORD dwType, + LPIMEMENUITEMINFOW lpImeParentMenu, + LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) +{ + TRACE("(%p, 0x%lX, 0x%lX, %p, %p, 0x%lX)\n", + hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, dwSize); + return Imm32GetImeMenuItemsAW(hIMC, dwFlags, dwType, lpImeParentMenu, lpImeMenu, + dwSize, FALSE); +} + /*********************************************************************** * ImmFreeLayout (IMM32.@) */ diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 07eb129bffc..5cb72db884c 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1425,148 +1425,6 @@ BOOL WINAPI ImmSetActiveContextConsoleIME(HWND hwnd, BOOL fFlag) return FALSE; } -/*********************************************************************** - * ImmGetImeMenuItemsA (IMM32.@) - */ -DWORD WINAPI -ImmGetImeMenuItemsA(HIMC hIMC, DWORD dwFlags, DWORD dwType, - LPIMEMENUITEMINFOA lpImeParentMenu, - LPIMEMENUITEMINFOA lpImeMenu, DWORD dwSize) -{ - InputContextData *data = get_imc_data(hIMC); - TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - - if (!data) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } - - if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) - { - if (!is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) - return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - (IMEMENUITEMINFOW*)lpImeParentMenu, - (IMEMENUITEMINFOW*)lpImeMenu, dwSize); - else - { - IMEMENUITEMINFOW lpImeParentMenuW; - IMEMENUITEMINFOW *lpImeMenuW, *parent = NULL; - DWORD rc; - - if (lpImeParentMenu) - parent = &lpImeParentMenuW; - if (lpImeMenu) - { - int count = dwSize / sizeof(LPIMEMENUITEMINFOA); - dwSize = count * sizeof(IMEMENUITEMINFOW); - lpImeMenuW = HeapAlloc(GetProcessHeap(), 0, dwSize); - } - else - lpImeMenuW = NULL; - - rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - parent, lpImeMenuW, dwSize); - - if (lpImeParentMenu) - { - memcpy(lpImeParentMenu,&lpImeParentMenuW,sizeof(IMEMENUITEMINFOA)); - lpImeParentMenu->hbmpItem = lpImeParentMenuW.hbmpItem; - WideCharToMultiByte(CP_ACP, 0, lpImeParentMenuW.szString, - -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE, - NULL, NULL); - } - if (lpImeMenu && rc) - { - unsigned int i; - for (i = 0; i < rc; i++) - { - memcpy(&lpImeMenu[i],&lpImeMenuW[1],sizeof(IMEMENUITEMINFOA)); - lpImeMenu[i].hbmpItem = lpImeMenuW[i].hbmpItem; - WideCharToMultiByte(CP_ACP, 0, lpImeMenuW[i].szString, - -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE, - NULL, NULL); - } - } - HeapFree(GetProcessHeap(),0,lpImeMenuW); - return rc; - } - } - else - return 0; -} - -/*********************************************************************** - * ImmGetImeMenuItemsW (IMM32.@) - */ -DWORD WINAPI -ImmGetImeMenuItemsW(HIMC hIMC, DWORD dwFlags, DWORD dwType, - LPIMEMENUITEMINFOW lpImeParentMenu, - LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize) -{ - InputContextData *data = get_imc_data(hIMC); - TRACE("(%p, %i, %i, %p, %p, %i):\n", hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - - if (!data) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } - - if (data->immKbd->hIME && data->immKbd->pImeGetImeMenuItems) - { - if (is_himc_ime_unicode(data) || (!lpImeParentMenu && !lpImeMenu)) - return data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - lpImeParentMenu, lpImeMenu, dwSize); - else - { - IMEMENUITEMINFOA lpImeParentMenuA; - IMEMENUITEMINFOA *lpImeMenuA, *parent = NULL; - DWORD rc; - - if (lpImeParentMenu) - parent = &lpImeParentMenuA; - if (lpImeMenu) - { - int count = dwSize / sizeof(LPIMEMENUITEMINFOW); - dwSize = count * sizeof(IMEMENUITEMINFOA); - lpImeMenuA = HeapAlloc(GetProcessHeap(), 0, dwSize); - } - else - lpImeMenuA = NULL; - - rc = data->immKbd->pImeGetImeMenuItems(hIMC, dwFlags, dwType, - (IMEMENUITEMINFOW*)parent, - (IMEMENUITEMINFOW*)lpImeMenuA, dwSize); - - if (lpImeParentMenu) - { - memcpy(lpImeParentMenu,&lpImeParentMenuA,sizeof(IMEMENUITEMINFOA)); - lpImeParentMenu->hbmpItem = lpImeParentMenuA.hbmpItem; - MultiByteToWideChar(CP_ACP, 0, lpImeParentMenuA.szString, - -1, lpImeParentMenu->szString, IMEMENUITEM_STRING_SIZE); - } - if (lpImeMenu && rc) - { - unsigned int i; - for (i = 0; i < rc; i++) - { - memcpy(&lpImeMenu[i],&lpImeMenuA[1],sizeof(IMEMENUITEMINFOA)); - lpImeMenu[i].hbmpItem = lpImeMenuA[i].hbmpItem; - MultiByteToWideChar(CP_ACP, 0, lpImeMenuA[i].szString, - -1, lpImeMenu[i].szString, IMEMENUITEM_STRING_SIZE); - } - } - HeapFree(GetProcessHeap(),0,lpImeMenuA); - return rc; - } - } - else - return 0; -} - BOOL WINAPI User32InitializeImmEntryTable(DWORD); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 7bab3b95031..1bcc18bbb30 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -95,6 +95,8 @@ static inline BOOL Imm32IsCrossProcessAccess(HWND hWnd) (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess); } +BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); + #define ImeDpi_IsUnicode(pImeDpi) ((pImeDpi)->ImeInfo.fdwProperty & IME_PROP_UNICODE) #define Imm32IsImmMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_IMM32)) #define Imm32IsCiceroMode() (g_psi && (g_psi->dwSRVIFlags & SRVINFO_CICERO_ENABLED)) @@ -112,3 +114,10 @@ Imm32NotifyAction(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWORD DWORD_PTR dwCommand, DWORD_PTR dwData); DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList); + +INT APIENTRY +Imm32ImeMenuAnsiToWide(const IMEMENUITEMINFOA *pItemA, LPIMEMENUITEMINFOW pItemW, + UINT uCodePage, BOOL bBitmap); +INT APIENTRY +Imm32ImeMenuWideToAnsi(const IMEMENUITEMINFOW *pItemW, LPIMEMENUITEMINFOA pItemA, + UINT uCodePage); diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index 64bd3d158be..cda20efc884 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -16,6 +16,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm); HANDLE g_hImm32Heap = NULL; +BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC) +{ + BOOL ret; + PCLIENTIMC pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return -1; + ret = !(pClientImc->dwFlags & CLIENTIMC_WIDE); + ImmUnlockClientImc(pClientImc); + return ret; +} + LPWSTR APIENTRY Imm32WideFromAnsi(LPCSTR pszA) { INT cch = lstrlenA(pszA); @@ -202,6 +213,55 @@ DWORD APIENTRY Imm32AllocAndBuildHimcList(DWORD dwThreadId, HIMC **pphList) #undef MAX_RETRY } +INT APIENTRY +Imm32ImeMenuAnsiToWide(const IMEMENUITEMINFOA *pItemA, LPIMEMENUITEMINFOW pItemW, + UINT uCodePage, BOOL bBitmap) +{ + INT ret; + pItemW->cbSize = pItemA->cbSize; + pItemW->fType = pItemA->fType; + pItemW->fState = pItemA->fState; + pItemW->wID = pItemA->wID; + if (bBitmap) + { + pItemW->hbmpChecked = pItemA->hbmpChecked; + pItemW->hbmpUnchecked = pItemA->hbmpUnchecked; + pItemW->hbmpItem = pItemA->hbmpItem; + } + pItemW->dwItemData = pItemA->dwItemData; + ret = MultiByteToWideChar(uCodePage, 0, pItemA->szString, -1, + pItemW->szString, _countof(pItemW->szString)); + if (ret >= _countof(pItemW->szString)) + { + ret = 0; + pItemW->szString[0] = 0; + } + return ret; +} + +INT APIENTRY +Imm32ImeMenuWideToAnsi(const IMEMENUITEMINFOW *pItemW, LPIMEMENUITEMINFOA pItemA, + UINT uCodePage) +{ + INT ret; + pItemA->cbSize = pItemW->cbSize; + pItemA->fType = pItemW->fType; + pItemA->fState = pItemW->fState; + pItemA->wID = pItemW->wID; + pItemA->hbmpChecked = pItemW->hbmpChecked; + pItemA->hbmpUnchecked = pItemW->hbmpUnchecked; + pItemA->dwItemData = pItemW->dwItemData; + pItemA->hbmpItem = pItemW->hbmpItem; + ret = WideCharToMultiByte(uCodePage, 0, pItemW->szString, -1, + pItemA->szString, _countof(pItemA->szString), NULL, NULL); + if (ret >= _countof(pItemA->szString)) + { + ret = 0; + pItemA->szString[0] = 0; + } + return ret; +} + /*********************************************************************** * ImmCreateIMCC(IMM32.@) */ diff --git a/win32ss/include/imetable.h b/win32ss/include/imetable.h index 09580a4ac95..70bc982a6dc 100644 --- a/win32ss/include/imetable.h +++ b/win32ss/include/imetable.h @@ -1,4 +1,4 @@ -/* DEFINE_IME_ENTRY(type, name, params, extended) */ +/* DEFINE_IME_ENTRY(type, name, params, optional) */ DEFINE_IME_ENTRY(BOOL, ImeInquire, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags), FALSE) DEFINE_IME_ENTRY(DWORD, ImeConversionList, (HIMC hIMC, LPCVOID lpSrc, LPCANDIDATELIST lpDst, DWORD dwBufLen, UINT uFlag), FALSE) DEFINE_IME_ENTRY(BOOL, ImeRegisterWord, (LPCVOID lpszReading, DWORD dwStyle, LPCVOID lpszString), FALSE) @@ -14,7 +14,7 @@ DEFINE_IME_ENTRY(BOOL, ImeSetActiveContext, (HIMC hIMC, BOOL fFlag), FALSE) DEFINE_IME_ENTRY(UINT, ImeToAsciiEx, (UINT uVirKey, UINT uScanCode, CONST LPBYTE lpbKeyState, LPTRANSMSGLIST lpTransMsgList, UINT fuState, HIMC hIMC), FALSE) DEFINE_IME_ENTRY(BOOL, NotifyIME, (HIMC hIMC, DWORD dwAction, DWORD dwIndex, DWORD dwValue), FALSE) DEFINE_IME_ENTRY(BOOL, ImeSetCompositionString, (HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, DWORD dwCompLen, LPCVOID lpRead, DWORD dwReadLen), FALSE) -DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), FALSE) +DEFINE_IME_ENTRY(DWORD, ImeGetImeMenuItems, (HIMC hIMC, DWORD dwFlags, DWORD dwType, LPIMEMENUITEMINFOW lpImeParentMenu, LPIMEMENUITEMINFOW lpImeMenu, DWORD dwSize), TRUE) DEFINE_IME_ENTRY(BOOL, CtfImeInquireExW, (LPIMEINFO lpIMEInfo, LPVOID lpszWndClass, DWORD dwSystemInfoFlags, HKL hKL), TRUE) DEFINE_IME_ENTRY(BOOL, CtfImeSelectEx, (HIMC hIMC, BOOL fSelect, HKL hKL), TRUE) DEFINE_IME_ENTRY(LRESULT, CtfImeEscapeEx, (HIMC hIMC, UINT uSubFunc, LPVOID lpData, HKL hKL), TRUE)

1 0

[reactos] 01/01: [IMM32] Rewrite ImmSetActiveContext (#3982)
by Katayama Hirofumi MZ 30 Sep '21

30 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9adc538c9c79ef735a75f… commit 9adc538c9c79ef735a75f76f3c02d8830fcd3cd7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Oct 1 03:02:56 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Oct 1 03:02:56 2021 +0900 [IMM32] Rewrite ImmSetActiveContext (#3982) - Re-implement ImmSetActiveContext function. - Modify NtUserNotifyIMEStatus prototype. - Improve ImmSetConversionStatus and ImmSetOpenStatus functions. CORE-11700 --- dll/win32/imm32/ime.c | 7 ++-- dll/win32/imm32/imm.c | 97 +++++++++++++++++++++++++++++++++++++++++++++-- win32ss/include/ntuser.h | 7 ++-- win32ss/user/ntuser/ime.c | 8 +--- 4 files changed, 103 insertions(+), 16 deletions(-) diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index 3eeb7169b22..b1b31ce9eeb 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -911,7 +911,7 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) { Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, 0, IMC_SETOPENSTATUS, IMN_SETOPENSTATUS, 0); - NtUserNotifyIMEStatus(hWnd, hIMC, dwConversion); + NtUserNotifyIMEStatus(hWnd, fOpen, dwConversion); } return TRUE; @@ -1346,7 +1346,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent HKL hKL; LPINPUTCONTEXT pIC; DWORD dwOldConversion, dwOldSentence; - BOOL fConversionChange = FALSE, fSentenceChange = FALSE, fUseCicero = FALSE; + BOOL fOpen = FALSE, fConversionChange = FALSE, fSentenceChange = FALSE, fUseCicero = FALSE; HWND hWnd; TRACE("(%p, 0x%lX, 0x%lX)\n", hIMC, fdwConversion, fdwSentence); @@ -1377,6 +1377,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent } hWnd = pIC->hWnd; + fOpen = pIC->fOpen; ImmUnlockIMC(hIMC); if (fConversionChange || fUseCicero) @@ -1384,7 +1385,7 @@ BOOL WINAPI ImmSetConversionStatus(HIMC hIMC, DWORD fdwConversion, DWORD fdwSent Imm32NotifyAction(hIMC, hWnd, NI_CONTEXTUPDATED, dwOldConversion, IMC_SETCONVERSIONMODE, IMN_SETCONVERSIONMODE, 0); if (fConversionChange) - NtUserNotifyIMEStatus(hWnd, hIMC, fdwConversion); + NtUserNotifyIMEStatus(hWnd, fOpen, fdwConversion); } if (fSentenceChange || fUseCicero) diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index ab97e052c9a..07eb129bffc 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -169,6 +169,11 @@ static InputContextData* get_imc_data(HIMC hIMC) return data; } +static VOID APIENTRY Imm32CiceroSetActiveContext(HIMC hIMC, BOOL fActive, HWND hWnd, HKL hKL) +{ + FIXME("We have to do something\n"); +} + /*********************************************************************** * ImmAssociateContext (IMM32.@) */ @@ -1314,10 +1319,96 @@ BOOL WINAPI ImmEnumInputContext(DWORD dwThreadId, IMCENUMPROC lpfn, LPARAM lPara /*********************************************************************** * ImmSetActiveContext(IMM32.@) */ -BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC hIMC, BOOL fFlag) +BOOL WINAPI ImmSetActiveContext(HWND hWnd, HIMC hIMC, BOOL fActive) { - FIXME("(%p, %p, %d): stub\n", hwnd, hIMC, fFlag); - return FALSE; + PCLIENTIMC pClientImc; + LPINPUTCONTEXTDX pIC; + PIMEDPI pImeDpi; + HKL hKL; + BOOL fOpen = FALSE; + DWORD dwConversion = 0, iShow = ISC_SHOWUIALL; + HWND hwndDefIME; + + TRACE("(%p, %p, %d)\n", hWnd, hIMC, fActive); + + if (!Imm32IsImmMode()) + return FALSE; + + pClientImc = ImmLockClientImc(hIMC); + + if (!fActive) + { + if (pClientImc) + pClientImc->dwFlags &= ~CLIENTIMC_UNKNOWN4; + } + else if (hIMC) + { + if (!pClientImc) + return FALSE; + + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (!pIC) + { + ImmUnlockClientImc(pClientImc); + return FALSE; + } + + pIC->hWnd = hWnd; + pClientImc->dwFlags |= CLIENTIMC_UNKNOWN5; + + if (pIC->dwUIFlags & 2) + iShow = (ISC_SHOWUIGUIDELINE | ISC_SHOWUIALLCANDIDATEWINDOW); + + fOpen = pIC->fOpen; + dwConversion = pIC->fdwConversion; + + ImmUnlockIMC(hIMC); + } + else + { + hIMC = Imm32GetContextEx(hWnd, TRUE); + pIC = (LPINPUTCONTEXTDX)ImmLockIMC(hIMC); + if (pIC) + { + pIC->hWnd = hWnd; + ImmUnlockIMC(hIMC); + } + hIMC = NULL; + } + + hKL = GetKeyboardLayout(0); + + if (Imm32IsCiceroMode() && !Imm32Is16BitMode()) + { + Imm32CiceroSetActiveContext(hIMC, fActive, hWnd, hKL); + hKL = GetKeyboardLayout(0); + } + + pImeDpi = ImmLockImeDpi(hKL); + if (pImeDpi) + { + if (IS_IME_HKL(hKL)) + pImeDpi->ImeSetActiveContext(hIMC, fActive); + ImmUnlockImeDpi(pImeDpi); + } + + if (IsWindow(hWnd)) + { + SendMessageW(hWnd, WM_IME_SETCONTEXT, fActive, iShow); + if (fActive) + NtUserNotifyIMEStatus(hWnd, fOpen, dwConversion); + } + else if (!fActive) + { + hwndDefIME = ImmGetDefaultIMEWnd(NULL); + if (hwndDefIME) + SendMessageW(hwndDefIME, WM_IME_SETCONTEXT, 0, iShow); + } + + if (pClientImc) + ImmUnlockClientImc(pClientImc); + + return TRUE; } /*********************************************************************** diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 7afe6906fba..a6a45af167b 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -1312,6 +1312,8 @@ C_ASSERT(sizeof(CLIENTIMC) == 0x34); /* flags for CLIENTIMC */ #define CLIENTIMC_WIDE 0x1 +#define CLIENTIMC_UNKNOWN5 0x2 +#define CLIENTIMC_UNKNOWN4 0x20 #define CLIENTIMC_UNKNOWN1 0x40 #define CLIENTIMC_UNKNOWN3 0x80 #define CLIENTIMC_UNKNOWN2 0x100 @@ -2769,10 +2771,7 @@ NtUserMoveWindow( DWORD NTAPI -NtUserNotifyIMEStatus( - HWND hwnd, - HIMC hIMC, - DWORD dwConversion); +NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion); BOOL NTAPI diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 031dc09ec64..1d84609186c 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -49,16 +49,12 @@ NtUserGetImeHotKey(IN DWORD dwHotKey, DWORD APIENTRY -NtUserNotifyIMEStatus( - HWND hwnd, - HIMC hIMC, - DWORD dwConversion) +NtUserNotifyIMEStatus(HWND hwnd, BOOL fOpen, DWORD dwConversion) { - TRACE("NtUserNotifyIMEStatus(%p, %p, 0x%lX)\n", hwnd, hIMC, dwConversion); + TRACE("NtUserNotifyIMEStatus(%p, %d, 0x%lX)\n", hwnd, fOpen, dwConversion); return 0; } - DWORD APIENTRY NtUserSetImeHotKey(

1 0

[reactos] 01/01: Revert "Disable some C++ code, which doesn't compile for me"
by Hervé Poussineau 29 Sep '21

29 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc5d8e466febafa906110… commit fc5d8e466febafa906110b5cb027bba591bda177 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Sep 29 22:58:31 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Sep 29 22:58:31 2021 +0200 Revert "Disable some C++ code, which doesn't compile for me" This reverts commit d8b1ff9056d869d512da88b9c9cc9301535f5a06. --- base/applications/CMakeLists.txt | 2 +- base/applications/network/CMakeLists.txt | 2 +- dll/shellext/CMakeLists.txt | 2 +- dll/win32/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 0212378100e..7c18212ed4f 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(charmap) add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) -#add_subdirectory(drwtsn32) +add_subdirectory(drwtsn32) add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index eca45a3e316..46246108408 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) if(NOT USE_CLANG_CL) - #add_subdirectory(telnet) + add_subdirectory(telnet) endif() add_subdirectory(tracert) add_subdirectory(whois) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 6eb0717474d..8d005319c4c 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -10,6 +10,6 @@ add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) add_subdirectory(sendmail) -#add_subdirectory(shellbtrfs) +add_subdirectory(shellbtrfs) add_subdirectory(stobject) add_subdirectory(zipfldr) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 555172cdcd0..c0238ebeea5 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -56,7 +56,7 @@ add_subdirectory(httpapi) add_subdirectory(iccvid) add_subdirectory(icmp) add_subdirectory(ieframe) -#add_subdirectory(iernonce) +add_subdirectory(iernonce) add_subdirectory(imaadp32.acm) add_subdirectory(imagehlp) add_subdirectory(imm32)

1 0

[reactos] 02/02: Disable some C++ code, which doesn't compile for me
by Hervé Poussineau 29 Sep '21

29 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8b1ff9056d869d512da8… commit d8b1ff9056d869d512da88b9c9cc9301535f5a06 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Jun 3 21:46:52 2020 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Sep 29 22:56:35 2021 +0200 Disable some C++ code, which doesn't compile for me --- base/applications/CMakeLists.txt | 2 +- base/applications/network/CMakeLists.txt | 2 +- dll/shellext/CMakeLists.txt | 2 +- dll/win32/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 7c18212ed4f..0212378100e 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(charmap) add_subdirectory(clipbrd) add_subdirectory(cmdutils) add_subdirectory(control) -add_subdirectory(drwtsn32) +#add_subdirectory(drwtsn32) add_subdirectory(dxdiag) add_subdirectory(extrac32) add_subdirectory(findstr) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index 46246108408..eca45a3e316 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) if(NOT USE_CLANG_CL) - add_subdirectory(telnet) + #add_subdirectory(telnet) endif() add_subdirectory(tracert) add_subdirectory(whois) diff --git a/dll/shellext/CMakeLists.txt b/dll/shellext/CMakeLists.txt index 8d005319c4c..6eb0717474d 100644 --- a/dll/shellext/CMakeLists.txt +++ b/dll/shellext/CMakeLists.txt @@ -10,6 +10,6 @@ add_subdirectory(netplwiz) add_subdirectory(netshell) add_subdirectory(ntobjshex) add_subdirectory(sendmail) -add_subdirectory(shellbtrfs) +#add_subdirectory(shellbtrfs) add_subdirectory(stobject) add_subdirectory(zipfldr) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index c0238ebeea5..555172cdcd0 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -56,7 +56,7 @@ add_subdirectory(httpapi) add_subdirectory(iccvid) add_subdirectory(icmp) add_subdirectory(ieframe) -add_subdirectory(iernonce) +#add_subdirectory(iernonce) add_subdirectory(imaadp32.acm) add_subdirectory(imagehlp) add_subdirectory(imm32)

1 0

[reactos] 01/02: [VIDEOPRT] Create and setup new registry key only for non-legacy drivers
by Hervé Poussineau 29 Sep '21

29 Sep '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92d0dd363346e7106a44a… commit 92d0dd363346e7106a44a52fd96a5c263e2fc495 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Aug 18 19:27:33 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Sep 29 22:56:35 2021 +0200 [VIDEOPRT] Create and setup new registry key only for non-legacy drivers CORE-17734 --- win32ss/drivers/videoprt/registry.c | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index 5a0f96c719f..4fed31e451d 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -302,6 +302,9 @@ IntSetupDeviceSettingsKey( OBJECT_ATTRIBUTES ObjectAttributes; NTSTATUS Status; + if (!DeviceExtension->PhysicalDeviceObject) + return STATUS_SUCCESS; + /* Open the software key: HKLM\System\CurrentControlSet\Control\Class\<ClassGUID>\<n> */ Status = IoOpenDeviceRegistryKey(DeviceExtension->PhysicalDeviceObject, PLUGPLAY_REGKEY_DRIVER, @@ -353,6 +356,52 @@ IntSetupDeviceSettingsKey( return STATUS_SUCCESS; } +NTSTATUS +IntDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || + DestinationString == NULL || + SourceString->Length > SourceString->MaximumLength || + (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || + Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + if ((SourceString->Length == 0) && + (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePoolWithTag(PagedPool, DestMaxLength, TAG_VIDEO_PORT); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IntCreateNewRegistryPath( @@ -372,6 +421,16 @@ IntCreateNewRegistryPath( OBJECT_ATTRIBUTES ObjectAttributes; PWCHAR InstanceIdBuffer; + if (!DeviceExtension->PhysicalDeviceObject) + { + Status = IntDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DeviceExtension->RegistryPath, + &DeviceExtension->NewRegistryPath); + if (!NT_SUCCESS(Status)) + ERR_(VIDEOPRT, "IntDuplicateUnicodeString() failed with status 0x%lx\n", Status); + return Status; + } + /* Open the hardware key: HKLM\System\CurrentControlSet\Enum\... */ Status = IoOpenDeviceRegistryKey(DeviceExtension->PhysicalDeviceObject, PLUGPLAY_REGKEY_DEVICE,

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