Ros-diffs

ros-diffs@reactos.org

11 participants
81011 discussions

[reactos] 01/01: [GITHUB] build.yml: Use all matrix values to restore Linux build cache (#5595)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24dea07c3cc72c5480c2f… commit 24dea07c3cc72c5480c2f12619cf96c49ef1e029 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Feb 10 11:32:27 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 13:32:27 2024 +0300 [GITHUB] build.yml: Use all matrix values to restore Linux build cache (#5595) Do not mix different build configurations. Extend cache key. Addendum to 0.4.15-dev-2996-g f777e6bd and 0.4.15-dev-6472-g 732f223c. --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a58c3a7e4b..31c8af9fd33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,9 +53,9 @@ jobs: uses: actions/cache@v4 with: path: ccache - key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} + key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}-${{github.sha}} restore-keys: | - ccache-${{matrix.compiler}}-${{matrix.arch}}- + ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{matrix.dllver}}- - name: Set ccache settings run: | echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV @@ -133,7 +133,7 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DDLL_EXPORT_VERSION=${{matrix.dllver}} + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DDLL_EXPORT_VERSION=${{matrix.dllver}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - name: Build run: cmake --build build -- -k0 - name: Generate ISOs

11 months

[reactos] 01/01: [MSUTB] Disable Desk Band (#6472)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b548b05e893eb9c565434… commit b548b05e893eb9c5654349f20a67d57c897ad00d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 10 18:12:45 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 18:12:45 2024 +0900 [MSUTB] Disable Desk Band (#6472) Supporting Language Bar... JIRA issue: CORE-19363 - Add IDD_CLOSELANGBARNOBAND and IDD_MINIMIZELANGBARNOBAND resource dialogs. - Add IDB_BITMAP154 and IDB_BITMAP155 resource bitmaps. - Disable Desk Band by using g_bEnableDeskBand global variable. --- dll/win32/msutb/lang/en-US.rc | 31 +++++++++-- dll/win32/msutb/msutb.cpp | 104 +++++++++++++++++++++++++++---------- dll/win32/msutb/msutb.rc | 2 + dll/win32/msutb/res/Bitmap-154.bmp | Bin 0 -> 1702 bytes dll/win32/msutb/res/Bitmap-155.bmp | Bin 0 -> 2498 bytes dll/win32/msutb/resource.h | 5 ++ 6 files changed, 110 insertions(+), 32 deletions(-) diff --git a/dll/win32/msutb/lang/en-US.rc b/dll/win32/msutb/lang/en-US.rc index 5dc13e43ce7..6c1925f28fa 100644 --- a/dll/win32/msutb/lang/en-US.rc +++ b/dll/win32/msutb/lang/en-US.rc @@ -34,6 +34,17 @@ BEGIN IDS_LEFTCLICK "Left Click" END +IDD_CLOSELANGBARNOBAND DIALOGEX 0, 0, 200, 105 +CAPTION "Language Bar" +STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME +FONT 8, "MS Shell Dlg" +{ + LTEXT "You have closed Language Bar.\r\n\r\nTo use Language Bar later, check ""Show Language Bar on the desktop"" in Language Bar Settings dialog, which you can find within Text Services control panel.", -1, 5, 5, 190, 60 + AUTOCHECKBOX "&Don't show me this message again", IDC_CLOSELANGBAR_CHECK, 5, 70, 145, 10 + DEFPUSHBUTTON "OK", IDOK, 80, 85, 55, 15 + PUSHBUTTON "Cancel", IDCANCEL, 140, 85, 55, 15 +} + IDD_CLOSELANGBAR DIALOGEX 0, 0, 200, 105 CAPTION "Language Bar" STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME @@ -45,12 +56,24 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancel", IDCANCEL, 140, 85, 55, 15 } -IDD_MINIMIZELANGBAR DIALOGEX 0, 0, 205, 84 +IDD_MINIMIZELANGBARNOBAND DIALOGEX 0, 0, 205, 124 +CAPTION "Language Bar" +STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME +FONT 8, "MS Shell Dlg" +{ + LTEXT "You have minimized Language Bar. To restore it, just click Language Bar icon (near the clock) and select ""Restore Language Bar"" from the pop-up menu.", -1, 5, 5, 190, 50 + CONTROL IDB_BITMAP154, -1, "STATIC", SS_BITMAP, 72, 63, 60, 60, WS_EX_STATICEDGE + AUTOCHECKBOX "Don't show me this message again", IDC_MINIMIZELANGBAR_CHECK, 5, 105, 125, 10 + DEFPUSHBUTTON "OK", IDOK, 140, 105, 60, 15 +} + +IDD_MINIMIZELANGBAR DIALOGEX 0, 0, 205, 124 CAPTION "Language Bar" STYLE WS_POPUPWINDOW | WS_CAPTION | DS_MODALFRAME FONT 8, "MS Shell Dlg" { - LTEXT "You have minimized Language Bar. To restore it, just click Language Bar icon (near the clock) and choose ""Restore Language Bar"" from the pop-up menu.", -1, 5, 5, 190, 50 - AUTOCHECKBOX "Don't show me this message again", IDC_MINIMIZELANGBAR_CHECK, 5, 65, 125, 10 - DEFPUSHBUTTON "OK", IDOK, 140, 65, 60, 15 + LTEXT "You have minimized Language Bar. To restore it, just click Language Bar icon (near the clock) and select ""Restore Language Bar"" from the pop-up menu.", -1, 5, 5, 190, 50 + CONTROL IDB_BITMAP155, -1, "STATIC", SS_BITMAP, 53, 67, 60, 60, WS_EX_STATICEDGE + AUTOCHECKBOX "Don't show me this message again", IDC_MINIMIZELANGBAR_CHECK, 5, 105, 125, 10 + DEFPUSHBUTTON "OK", IDOK, 140, 105, 60, 15 } diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index be242369160..9d5e6d8f557 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -9,6 +9,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msutb); +//#define ENABLE_DESKBAND + HINSTANCE g_hInst = NULL; UINT g_wmTaskbarCreated = 0; UINT g_uACP = CP_ACP; @@ -18,6 +20,11 @@ LONG g_DllRefCount = 0; BOOL g_bWinLogon = FALSE; BOOL g_fInClosePopupTipbar = FALSE; HWND g_hwndParent = NULL; +#ifdef ENABLE_DESKBAND +BOOL g_bEnableDeskBand = TRUE; +#else +BOOL g_bEnableDeskBand = FALSE; +#endif BOOL g_bShowTipbar = TRUE; BOOL g_bShowDebugMenu = FALSE; @@ -67,10 +74,6 @@ class CMsUtbModule : public CComModule { }; -BEGIN_OBJECT_MAP(ObjectMap) - //OBJECT_ENTRY(CLSID_MSUTBDeskBand, CDeskBand) // FIXME: Implement this -END_OBJECT_MAP() - CMsUtbModule gModule; class CCicLibMenuItem; @@ -138,7 +141,11 @@ void InitSkipRedrawHKLArray(void) if (!g_prghklSkipRedrawing) return; - g_prghklSkipRedrawing->Add((HKL)UlongToHandle(0xE0010411)); // Japanese IME will be skipped + if (g_bEnableDeskBand && (g_dwOSInfo & CIC_OSINFO_XPPLUS)) + { + // Japanese IME will be skipped + g_prghklSkipRedrawing->Add((HKL)UlongToHandle(0xE0010411)); + } CicRegKey regKey; LSTATUS error = regKey.Open(HKEY_LOCAL_MACHINE, @@ -387,7 +394,7 @@ BOOL CheckEAFonts(void) BOOL IsDeskBandFromReg() { - if (!(g_dwOSInfo & CIC_OSINFO_XPPLUS)) // Desk band is for XP+ + if (!g_bEnableDeskBand || !(g_dwOSInfo & CIC_OSINFO_XPPLUS)) // Desk band is for XP+ return FALSE; CicRegKey regKey; @@ -536,12 +543,15 @@ BOOL InitFromReg(void) error = regKey2.QueryDword(TEXT("TimerElapseENSUREFOCUS"), &dwValue); if (error == ERROR_SUCCESS) g_uTimerElapseENSUREFOCUS = dwValue; - error = regKey2.QueryDword(TEXT("ShowDeskBand"), &dwValue); - if (error == ERROR_SUCCESS) - g_bShowDeskBand = !!dwValue; - error = regKey2.QueryDword(TEXT("TimerElapseSHOWWDESKBAND"), &dwValue); - if (error == ERROR_SUCCESS) - g_uTimerElapseSHOWDESKBAND = dwValue; + if (g_bEnableDeskBand && (g_dwOSInfo & CIC_OSINFO_XPPLUS)) + { + error = regKey2.QueryDword(TEXT("ShowDeskBand"), &dwValue); + if (error == ERROR_SUCCESS) + g_bShowDeskBand = !!dwValue; + error = regKey2.QueryDword(TEXT("TimerElapseSHOWWDESKBAND"), &dwValue); + if (error == ERROR_SUCCESS) + g_uTimerElapseSHOWDESKBAND = dwValue; + } } CicRegKey regKey3; @@ -1432,6 +1442,16 @@ public: STDMETHOD_(void, HandleMouseMsg)(UINT uMsg, LONG x, LONG y) override; }; +/***********************************************************************/ + +#ifdef ENABLE_DESKBAND +class CDeskBand +{ +public: + // FIXME: Implement this +}; +#endif + /*********************************************************************** * CUTBLangBarDlg */ @@ -1518,7 +1538,11 @@ CUTBLangBarDlg::DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) CUTBCloseLangBarDlg::CUTBCloseLangBarDlg() { m_cRefs = 1; - m_pszDialogName = MAKEINTRESOURCE(IDD_CLOSELANGBAR); + + if (!(g_dwOSInfo & CIC_OSINFO_XPPLUS)) + m_pszDialogName = MAKEINTRESOURCE(IDD_CLOSELANGBARNOBAND); + else + m_pszDialogName = MAKEINTRESOURCE(IDD_CLOSELANGBAR); } STDMETHODIMP_(BOOL) CUTBCloseLangBarDlg::DoModal(HWND hDlg) @@ -1581,7 +1605,10 @@ STDMETHODIMP_(void) CUTBCloseLangBarDlg::SetDlgShown(BOOL bShown) CUTBMinimizeLangBarDlg::CUTBMinimizeLangBarDlg() { m_cRefs = 1; - m_pszDialogName = MAKEINTRESOURCE(IDD_MINIMIZELANGBAR); + if (!(g_dwOSInfo & CIC_OSINFO_XPPLUS)) + m_pszDialogName = MAKEINTRESOURCE(IDD_MINIMIZELANGBARNOBAND); + else + m_pszDialogName = MAKEINTRESOURCE(IDD_MINIMIZELANGBAR); } STDMETHODIMP_(BOOL) CUTBMinimizeLangBarDlg::DoModal(HWND hDlg) @@ -2752,13 +2779,20 @@ BOOL CUTBContextMenu::SelectMenuItem(UINT nCommandId) case ID_DESKBAND: { - DWORD dwStatus; - m_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus); + if (!g_bEnableDeskBand || !(g_dwOSInfo & CIC_OSINFO_XPPLUS)) + { + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_MINIMIZED); + } + else + { + DWORD dwStatus; + m_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus); - if (dwStatus & TF_SFT_DESKBAND) - break; + if (dwStatus & TF_SFT_DESKBAND) + break; - m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND); + m_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND); + } CUTBMinimizeLangBarDlg *pDialog = new(cicNoThrow) CUTBMinimizeLangBarDlg(); if (pDialog) @@ -3667,15 +3701,19 @@ STDMETHODIMP_(void) CTipbarGripper::OnLButtonUp(LONG x, LONG y) { m_pTipbarWnd->RestoreFromStub(); - APPBARDATA AppBar = { sizeof(AppBar) }; - AppBar.hWnd = ::FindWindowW(L"Shell_TrayWnd", NULL); - if (::SHAppBarMessage(ABM_GETTASKBARPOS, &AppBar)) + if (g_bEnableDeskBand && (g_dwOSInfo & CIC_OSINFO_XPPLUS)) { - RECT rc = AppBar.rc; - POINT pt; - ::GetCursorPos(&pt); - if (g_pTipbarWnd && ::PtInRect(&rc, pt)) - g_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND | TF_SFT_EXTRAICONSONMINIMIZED); + APPBARDATA AppBar = { sizeof(AppBar) }; + AppBar.hWnd = ::FindWindowW(L"Shell_TrayWnd", NULL); + if (::SHAppBarMessage(ABM_GETTASKBARPOS, &AppBar)) + { + RECT rc = AppBar.rc; + POINT pt; + ::GetCursorPos(&pt); + if (g_pTipbarWnd && ::PtInRect(&rc, pt)) + g_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND | + TF_SFT_EXTRAICONSONMINIMIZED); + } } CUIFGripper::OnLButtonUp(x, y); @@ -4159,6 +4197,10 @@ BOOL CTipbarWnd::KillTimer(UINT_PTR uIDEvent) /// @unimplemented void CTipbarWnd::MoveToTray() { + if (!g_bEnableDeskBand || !(g_dwOSInfo & CIC_OSINFO_XPPLUS)) + { + //FIXME + } } void CTipbarWnd::MyClientToScreen(LPPOINT lpPoint, LPRECT prc) @@ -4858,7 +4900,7 @@ SetRegisterLangBand(BOOL bRegister) { TRACE("(%d)\n", bRegister); - if (!(g_dwOSInfo & CIC_OSINFO_XPPLUS)) // Desk band is for XP+ + if (!g_bEnableDeskBand || !(g_dwOSInfo & CIC_OSINFO_XPPLUS)) // Desk band is for XP+ return E_FAIL; BOOL bDeskBand = IsDeskBandFromReg(); @@ -4968,6 +5010,12 @@ MsUtbCoCreateInstance( return cicRealCoCreateInstance(rclsid, pUnkOuter, dwClsContext, iid, ppv); } +BEGIN_OBJECT_MAP(ObjectMap) +#ifdef ENABLE_DESKBAND + OBJECT_ENTRY(CLSID_MSUTBDeskBand, CDeskBand) // FIXME: Implement this +#endif +END_OBJECT_MAP() + /// @implemented BOOL ProcessAttach(HINSTANCE hinstDLL) { diff --git a/dll/win32/msutb/msutb.rc b/dll/win32/msutb/msutb.rc index 82ae823ce07..bc2ad8380ed 100644 --- a/dll/win32/msutb/msutb.rc +++ b/dll/win32/msutb/msutb.rc @@ -21,6 +21,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include <reactos/manifest_hosted.rc> IDI_MAINICON ICON "res/earth.ico" +IDB_BITMAP154 BITMAP "res/Bitmap-154.bmp" +IDB_BITMAP155 BITMAP "res/Bitmap-155.bmp" /* UTF-8 */ #pragma code_page(65001) diff --git a/dll/win32/msutb/res/Bitmap-154.bmp b/dll/win32/msutb/res/Bitmap-154.bmp new file mode 100644 index 00000000000..eb2498a58cd Binary files /dev/null and b/dll/win32/msutb/res/Bitmap-154.bmp differ diff --git a/dll/win32/msutb/res/Bitmap-155.bmp b/dll/win32/msutb/res/Bitmap-155.bmp new file mode 100644 index 00000000000..503b4894926 Binary files /dev/null and b/dll/win32/msutb/res/Bitmap-155.bmp differ diff --git a/dll/win32/msutb/resource.h b/dll/win32/msutb/resource.h index 40f76d3441b..e00fa496048 100644 --- a/dll/win32/msutb/resource.h +++ b/dll/win32/msutb/resource.h @@ -1,5 +1,8 @@ #pragma once +#define IDB_BITMAP154 154 +#define IDB_BITMAP155 155 + #define IDS_OK 100 #define IDS_CANCEL 101 #define IDS_ABORT 102 @@ -39,7 +42,9 @@ #define ID_ADJUSTDESKBAND 219 #define ID_SETTINGS 2000 +#define IDD_CLOSELANGBARNOBAND 1000 #define IDD_CLOSELANGBAR 1001 +#define IDD_MINIMIZELANGBARNOBAND 1003 #define IDD_MINIMIZELANGBAR 1004 #define IDC_CLOSELANGBAR_CHECK 1002

11 months

[reactos] 01/01: [MSUTB][SDK] Implement SetRegisterLangBand (#6471)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=152af475b19eafce551f6… commit 152af475b19eafce551f625d1ca38c78285432f5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 10 16:04:33 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 16:04:33 2024 +0900 [MSUTB][SDK] Implement SetRegisterLangBand (#6471) Supporting Language Bar... JIRA issue: CORE-19363 - Add some helper functions. - Implement SetRegisterLangBand function. --- dll/win32/msutb/msutb.cpp | 69 +++++++++++++++++++++++++++++++++++-- sdk/include/reactos/cicero/cicutb.h | 2 ++ 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index bc9c2ff510d..be242369160 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -375,6 +375,7 @@ FindEAEnumFontProc(ENUMLOGFONT *pLF, NEWTEXTMETRIC *pTM, INT nFontType, LPARAM l return FALSE; } +/// Are there East-Asian vertical fonts? BOOL CheckEAFonts(void) { BOOL bHasVertical = FALSE; @@ -384,6 +385,55 @@ BOOL CheckEAFonts(void) return bHasVertical; } +BOOL IsDeskBandFromReg() +{ + if (!(g_dwOSInfo & CIC_OSINFO_XPPLUS)) // Desk band is for XP+ + return FALSE; + + CicRegKey regKey; + if (regKey.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\"))) + { + DWORD dwValue = 0; + regKey.QueryDword(TEXT("ShowDeskBand"), &dwValue); + return !!dwValue; + } + + return FALSE; +} + +void SetDeskBandToReg(BOOL bShow) +{ + CicRegKey regKey; + if (regKey.Open(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\CTF\\MSUTB\\"), KEY_ALL_ACCESS)) + regKey.SetDword(TEXT("ShowDeskBand"), bShow); +} + +BOOL RegisterComCat(REFCLSID rclsid, REFCATID rcatid, BOOL bRegister) +{ + if (FAILED(::CoInitialize(NULL))) + return FALSE; + + ICatRegister *pCat; + HRESULT hr = ::CoCreateInstance(CLSID_StdComponentCategoriesMgr, NULL, CLSCTX_INPROC_SERVER, + IID_ICatRegister, (void**)&pCat); + if (SUCCEEDED(hr)) + { + if (bRegister) + hr = pCat->RegisterClassImplCategories(rclsid, 1, const_cast<CATID*>(&rcatid)); + else + hr = pCat->UnRegisterClassImplCategories(rclsid, 1, const_cast<CATID*>(&rcatid)); + + pCat->Release(); + } + + ::CoUninitialize(); + + //if (IsIE5()) + // ::RegDeleteKey(HKEY_CLASSES_ROOT, TEXT("Component Categories\\{00021492-0000-0000-C000-000000000046}\\Enum")); + + return SUCCEEDED(hr); +} + BOOL InitFromReg(void) { DWORD dwValue; @@ -4801,13 +4851,26 @@ GetPopupTipbar(HWND hWnd, BOOL fWinLogon) /*********************************************************************** * SetRegisterLangBand (MSUTB.@) * - * @unimplemented + * @implemented */ EXTERN_C HRESULT WINAPI SetRegisterLangBand(BOOL bRegister) { - FIXME("stub:(%d)\n", bRegister); - return E_NOTIMPL; + TRACE("(%d)\n", bRegister); + + if (!(g_dwOSInfo & CIC_OSINFO_XPPLUS)) // Desk band is for XP+ + return E_FAIL; + + BOOL bDeskBand = IsDeskBandFromReg(); + if (bDeskBand == bRegister) + return S_OK; + + SetDeskBandToReg(bRegister); + + if (!RegisterComCat(CLSID_MSUTBDeskBand, CATID_DeskBand, bRegister)) + return TF_E_NOLOCK; + + return S_OK; } /*********************************************************************** diff --git a/sdk/include/reactos/cicero/cicutb.h b/sdk/include/reactos/cicero/cicutb.h index e1f517d1915..774be036cb4 100644 --- a/sdk/include/reactos/cicero/cicutb.h +++ b/sdk/include/reactos/cicero/cicutb.h @@ -15,6 +15,8 @@ DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745C63, 0xB2F0, 0x4784, 0x8B, DEFINE_GUID(CLSID_SYSTEMLANGBARITEM, 0xBEBACC94, 0x5CD3, 0x4662, 0xA1, 0xE0, 0xF3, 0x31, 0x99, 0x49, 0x36, 0x69); DEFINE_GUID(IID_ITfLangBarMgr_P, 0xD72C0FA9, 0xADD5, 0x4AF0, 0x87, 0x06, 0x4F, 0xA9, 0xAE, 0x3E, 0x2E, 0xFF); DEFINE_GUID(IID_ITfLangBarEventSink_P, 0x7A460360, 0xDA21, 0x4B09, 0xA8, 0xA0, 0x8A, 0x69, 0xE7, 0x28, 0xD8, 0x93); +DEFINE_GUID(CLSID_MSUTBDeskBand, 0x540D8A8B, 0x1C3F, 0x4E32, 0x81, 0x32, 0x53, 0x0F, 0x6A, 0x50, 0x20, 0x90); +DEFINE_GUID(CATID_DeskBand, 0x00021492, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); EXTERN_C LPVOID WINAPI GetLibTls(VOID); EXTERN_C BOOL WINAPI GetPopupTipbar(HWND hWnd, BOOL fWinLogon);

11 months

[reactos] 01/01: [MSUTB] Implement GetPopupTipbar (#6469)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=463fec050376e8e935b51… commit 463fec050376e8e935b51ef71feb915240a7d6d6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 10 15:14:21 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 15:14:21 2024 +0900 [MSUTB] Implement GetPopupTipbar (#6469) Supporting Language Bar... JIRA issue: CORE-19363 - Add GetTipbarInternal helper function. - Implement GetPopupTipbar function. --- dll/win32/msutb/msutb.cpp | 64 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 5f3bc581fa3..bc9c2ff510d 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -17,6 +17,7 @@ CRITICAL_SECTION g_cs; LONG g_DllRefCount = 0; BOOL g_bWinLogon = FALSE; BOOL g_fInClosePopupTipbar = FALSE; +HWND g_hwndParent = NULL; BOOL g_bShowTipbar = TRUE; BOOL g_bShowDebugMenu = FALSE; @@ -1252,6 +1253,7 @@ class CTipbarWnd friend class CUTBContextMenu; friend class CTipbarGripper; friend VOID WINAPI ClosePopupTipbar(VOID); + friend BOOL GetTipbarInternal(HWND hWnd, DWORD dwFlags, CDeskBand *pDeskBand); public: CTipbarWnd(DWORD style); @@ -1267,7 +1269,7 @@ public: return static_cast<CTipbarAccItem*>(this); } - void Init(BOOL bFlag, CDeskBand *pDeskBand); + void Init(BOOL bChild, CDeskBand *pDeskBand); void InitHighContrast(); void InitMetrics(); void InitThemeMargins(); @@ -3713,7 +3715,7 @@ CTipbarWnd::~CTipbarWnd() } /// @unimplemented -void CTipbarWnd::Init(BOOL bFlag, CDeskBand *pDeskBand) +void CTipbarWnd::Init(BOOL bChild, CDeskBand *pDeskBand) { } @@ -4720,6 +4722,54 @@ STDMETHODIMP_(void) CTipbarWnd::HandleMouseMsg(UINT uMsg, LONG x, LONG y) { } +/*********************************************************************** + * GetTipbarInternal + */ +BOOL GetTipbarInternal(HWND hWnd, DWORD dwFlags, CDeskBand *pDeskBand) +{ + BOOL bParent = !!(dwFlags & 0x80000000); + g_bWinLogon = !!(dwFlags & 0x1); + + InitFromReg(); + + if (!g_bShowTipbar) + return FALSE; + + if (bParent) + { + g_pTrayIconWnd = new(cicNoThrow) CTrayIconWnd(); + if (!g_pTrayIconWnd) + return FALSE; + g_pTrayIconWnd->CreateWnd(); + } + + g_pTipbarWnd = new(cicNoThrow) CTipbarWnd(bParent ? g_dwWndStyle : g_dwChildWndStyle); + if (!g_pTipbarWnd || !g_pTipbarWnd->Initialize()) + return FALSE; + + g_pTipbarWnd->Init(!bParent, pDeskBand); + g_pTipbarWnd->CreateWnd(hWnd); + + ::SetWindowText(*g_pTipbarWnd, TEXT("TF_FloatingLangBar_WndTitle")); + + DWORD dwOldStatus = 0; + if (!bParent) + { + g_pTipbarWnd->m_pLangBarMgr->GetPrevShowFloatingStatus(&dwOldStatus); + g_pTipbarWnd->m_pLangBarMgr->ShowFloating(TF_SFT_DESKBAND); + } + + DWORD dwStatus; + g_pTipbarWnd->m_pLangBarMgr->GetShowFloatingStatus(&dwStatus); + g_pTipbarWnd->ShowFloating(dwStatus); + + if (!bParent && (dwOldStatus & TF_SFT_DESKBAND)) + g_pTipbarWnd->m_dwTipbarWndFlags |= 0x4000; + + g_hwndParent = hWnd; + return TRUE; +} + /*********************************************************************** * GetLibTls (MSUTB.@) * @@ -4735,13 +4785,17 @@ GetLibTls(VOID) /*********************************************************************** * GetPopupTipbar (MSUTB.@) * - * @unimplemented + * @implemented */ EXTERN_C BOOL WINAPI GetPopupTipbar(HWND hWnd, BOOL fWinLogon) { - FIXME("stub:(%p, %d)\n", hWnd, fWinLogon); - return FALSE; + TRACE("(%p, %d)\n", hWnd, fWinLogon); + + if (!fWinLogon) + TurnOffSpeechIfItsOn(); + + return GetTipbarInternal(hWnd, fWinLogon | 0x80000000, NULL); } /***********************************************************************

11 months

[reactos] 01/01: [MSUTB] Implement ClosePopupTipbar (#6468)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6ab8ca780d58d7c62de4… commit a6ab8ca780d58d7c62de4c4dadfbc5d5234fca57 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 10 14:25:12 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 14:25:12 2024 +0900 [MSUTB] Implement ClosePopupTipbar (#6468) Supporting Language Bar... JIRA issue: CORE-19363 - Implement ClosePopupTipbar function. --- dll/win32/msutb/msutb.cpp | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index f1c350035a3..5f3bc581fa3 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -16,6 +16,7 @@ DWORD g_dwOSInfo = 0; CRITICAL_SECTION g_cs; LONG g_DllRefCount = 0; BOOL g_bWinLogon = FALSE; +BOOL g_fInClosePopupTipbar = FALSE; BOOL g_bShowTipbar = TRUE; BOOL g_bShowDebugMenu = FALSE; @@ -1250,6 +1251,7 @@ class CTipbarWnd LONG m_cRefs; friend class CUTBContextMenu; friend class CTipbarGripper; + friend VOID WINAPI ClosePopupTipbar(VOID); public: CTipbarWnd(DWORD style); @@ -4757,12 +4759,36 @@ SetRegisterLangBand(BOOL bRegister) /*********************************************************************** * ClosePopupTipbar (MSUTB.@) * - * @unimplemented + * @implemented */ EXTERN_C VOID WINAPI ClosePopupTipbar(VOID) { - FIXME("stub:()\n"); + TRACE("()\n"); + + if (g_fInClosePopupTipbar) + return; + + g_fInClosePopupTipbar = TRUE; + + if (g_pTipbarWnd) + { + g_pTipbarWnd->m_pDeskBand = NULL; + g_pTipbarWnd->DestroyWnd(); + g_pTipbarWnd->Release(); + g_pTipbarWnd = NULL; + } + + if (g_pTrayIconWnd) + { + g_pTrayIconWnd->DestroyWnd(); + delete g_pTrayIconWnd; + g_pTrayIconWnd = NULL; + } + + UninitSkipRedrawHKLArray(); + + g_fInClosePopupTipbar = FALSE; } /***********************************************************************

11 months

[reactos] 01/01: [MSUTB] Add CTipbarWnd Part 3 (#6467)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6ceae3440679c664b093… commit c6ceae3440679c664b0936fbb81a20f1c15fbc7c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 10 13:04:37 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 13:04:37 2024 +0900 [MSUTB] Add CTipbarWnd Part 3 (#6467) Supporting Language Bar... JIRA issue: CORE-19363 - Add implementation to CTipbarWnd class. - Add delay link to imm32.dll. --- dll/win32/msutb/CMakeLists.txt | 2 +- dll/win32/msutb/msutb.cpp | 371 +++++++++++++++++++++++++++++++++++++---- dll/win32/msutb/precomp.h | 1 + 3 files changed, 344 insertions(+), 30 deletions(-) diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index b425c8d0328..ee8204be2ff 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -15,5 +15,5 @@ set_module_type(msutb win32dll) add_dependencies(msutb msctf psdk) target_link_libraries(msutb wine uuid atl_classes) add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_delay_importlibs(msutb uxtheme comctl32 msctf ole32 oleacc oleaut32 shell32) +add_delay_importlibs(msutb uxtheme imm32 comctl32 msctf ole32 oleacc oleaut32 shell32) add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index cfdfb54d8a7..f1c350035a3 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -364,6 +364,24 @@ BOOL IsTransparecyAvailable(void) return FALSE; } +static INT CALLBACK +FindEAEnumFontProc(ENUMLOGFONT *pLF, NEWTEXTMETRIC *pTM, INT nFontType, LPARAM lParam) +{ + if ((nFontType != TRUETYPE_FONTTYPE) || (pLF->elfLogFont.lfFaceName[0] != '@')) + return TRUE; + *(BOOL*)lParam = TRUE; + return FALSE; +} + +BOOL CheckEAFonts(void) +{ + BOOL bHasVertical = FALSE; + HDC hDC = ::GetDC(NULL); + ::EnumFonts(hDC, NULL, (FONTENUMPROC)FindEAEnumFontProc, (LPARAM)&bHasVertical); + ::ReleaseDC(NULL, hDC); + return bHasVertical; +} + BOOL InitFromReg(void) { DWORD dwValue; @@ -680,6 +698,7 @@ protected: CicArray<CTipbarAccItem*> m_AccItems; LONG m_cSelection; friend class CUTBMenuWnd; + friend class CTipbarWnd; public: CTipbarAccessible(CTipbarAccItem *pItem); @@ -968,6 +987,7 @@ class CTipbarGripper : public CUIFGripper protected: CTipbarWnd *m_pTipbarWnd; BOOL m_bInDebugMenu; + friend class CTipbarWnd; public: CTipbarGripper(CTipbarWnd *pTipbarWnd, LPCRECT prc, DWORD style); @@ -1187,7 +1207,8 @@ class CTipbarWnd , public CTipbarAccItem , public CUIFWindow { - DWORD m_dwUnknown19[2]; + CTipbarCoInitialize m_coInit; + DWORD m_dwSinkCookie; CModalMenu *m_pModalMenu; CTipbarThread *m_pThread; CicArray<GUID*> m_TipbarGUIDArray; @@ -1239,6 +1260,11 @@ public: return static_cast<CUIFWindow*>(this); } + CTipbarAccItem *GetAccItem() + { + return static_cast<CTipbarAccItem*>(this); + } + void Init(BOOL bFlag, CDeskBand *pDeskBand); void InitHighContrast(); void InitMetrics(); @@ -1286,7 +1312,7 @@ public: void MyClientToScreen(LPPOINT lpPoint, LPRECT prc); void SavePosition(); void SetAlpha(BYTE bAlpha, BOOL bFlag); - BOOL SetLangBand(BOOL bFlag1, BOOL bFlag2); + BOOL SetLangBand(BOOL bDeskBand, BOOL bFlag2); void SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight); void SetShowText(BOOL bShow); void SetShowTrayIcon(BOOL bShow); @@ -3627,8 +3653,6 @@ STDMETHODIMP_(BOOL) CTipbarGripper::OnSetCursor(UINT uMsg, LONG x, LONG y) CTipbarWnd::CTipbarWnd(DWORD style) : CUIFWindow(g_hInst, style) { - m_dwUnknown19[0] = 0; - m_dwUnknown23_1[4] = 0; m_dwUnknown23_1[5] = 0; m_dwUnknown23_1[6] = 0; @@ -3813,9 +3837,11 @@ void CTipbarWnd::MoveToStub(BOOL bFlag) { } -/// @unimplemented void CTipbarWnd::RestoreFromStub() { + m_dwTipbarWndFlags &= 0x3F; + KillTimer(1); + KillTimer(2); } /// @unimplemented @@ -3824,16 +3850,38 @@ INT CTipbarWnd::GetCtrlButtonWidth() return 0; } -/// @unimplemented INT CTipbarWnd::GetGripperWidth() { - return 0; + if (m_dwTipbarWndFlags & 2) + return 0; + + if (!m_pTipbarGripper || FAILED(m_pTipbarGripper->EnsureThemeData(m_hWnd))) + return 5; + + INT width = -1; + SIZE partSize; + HDC hDC = ::GetDC(m_hWnd); + if (SUCCEEDED(m_pTipbarGripper->GetThemePartSize(hDC, 1, 0, TS_TRUE, &partSize))) + { + INT cx = partSize.cx; + if (m_dwTipbarWndFlags & 4) + cx = partSize.cy; + width = cx + 4; + } + ::ReleaseDC(m_hWnd, hDC); + + return ((width < 0) ? 5 : width); } -/// @unimplemented INT CTipbarWnd::GetTipbarHeight() { - return 0; + SIZE size = { 0, 0 }; + if (m_pWndFrame) + m_pWndFrame->GetFrameSize(&size); + INT cy = m_Margins.cyBottomHeight + m_Margins.cyTopHeight + 2; + if (cy < 6) + cy = 6; + return m_cySmallIcon + cy + (2 * size.cy); } /// @unimplemented @@ -3853,19 +3901,93 @@ void CTipbarWnd::LocateCtrlButtons() { } -/// @unimplemented void CTipbarWnd::AdjustPosOnDisplayChange() { + RECT rcWorkArea; + RECT rc = { m_nLeft, m_nTop, m_nLeft + m_nWidth, m_nTop + m_nHeight }; + if (!GetWorkArea(&rc, &rcWorkArea)) + return; + + INT x = m_nLeft, y = m_nTop; + if (m_dwTipbarWndFlags & 0x200000) + x = rcWorkArea.left; + if (m_dwTipbarWndFlags & 0x40000) + y = rcWorkArea.top; + if (m_dwTipbarWndFlags & 0x100000) + x = rcWorkArea.right - m_nWidth; + if (m_dwTipbarWndFlags & 0x80000) + y = rcWorkArea.bottom - m_nHeight; + if (x != m_nLeft || y != m_nTop) + Move(x, y, m_nWidth, m_nHeight); } -/// @unimplemented void CTipbarWnd::SetVertical(BOOL bVertical) { + if (bVertical) + m_dwTipbarWndFlags |= 0x4; + else + m_dwTipbarWndFlags &= ~0x4; + + if (m_pTipbarGripper) + { + DWORD style = m_pTipbarGripper->m_style; + if (bVertical) + style |= 0x1; + else + style &= 0x1; + m_pTipbarGripper->SetStyle(style); + } + + if (g_fTaskbarTheme) + SetActiveTheme(L"TASKBAR", !!(m_dwTipbarWndFlags & 0x4), 1); + + if (!(m_dwTipbarWndFlags & 2)) + { + if (m_dwTipbarWndFlags & 4) + { + Move(m_nLeft, m_nTop, GetTipbarHeight(), 0); + } + else + { + Move(m_nLeft, m_nTop, 0, GetTipbarHeight()); + } + } + + if (m_hWnd) + { + KillTimer(7); + SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); + } } -/// @unimplemented void CTipbarWnd::UpdatePosFlags() { + if (m_dwTipbarWndFlags & 0x2) + return; + + RECT rc = { m_nLeft, m_nTop, m_nLeft + m_nWidth, m_nTop + m_nHeight }, rcWorkArea; + if (!GetWorkArea(&rc, &rcWorkArea)) + return; + + if (m_nLeft > rcWorkArea.left + 2) + m_dwTipbarWndFlags &= ~0x200000; + else + m_dwTipbarWndFlags |= 0x200000; + + if ( m_nTop> rcWorkArea.top + 2 ) + m_dwTipbarWndFlags &= ~0x40000; + else + m_dwTipbarWndFlags |= 0x40000; + + if (m_nLeft + m_nWidth < rcWorkArea.right - 2) + m_dwTipbarWndFlags &= ~0x100000; + else + m_dwTipbarWndFlags |= 0x100000; + + if (m_nTop + m_nHeight < rcWorkArea.bottom - 2) + m_dwTipbarWndFlags &= ~0x80000; + else + m_dwTipbarWndFlags |= 0x80000; } /// @unimplemented @@ -3873,10 +3995,9 @@ void CTipbarWnd::CancelMenu() { } -/// @unimplemented BOOL CTipbarWnd::CheckExcludeCaptionButtonMode(LPRECT prc1, LPCRECT prc2) { - return FALSE; + return (prc1->top < prc2->top + 5) && (prc2->right <= prc1->right + (5 * m_ButtonWidth)); } /// @unimplemented @@ -3884,10 +4005,35 @@ void CTipbarWnd::ClearLBItemList() { } -/// @unimplemented HFONT CTipbarWnd::CreateVerticalFont() { - return NULL; + if (!m_hWnd) + return NULL; + + CUIFTheme theme; + theme.m_iPartId = 1; + theme.m_iStateId = 0; + theme.m_pszClassList = L"TOOLBAR"; + + LOGFONTW lf; + if (FAILED(theme.InternalOpenThemeData(m_hWnd)) || + FAILED(::GetThemeFont(theme.m_hTheme, NULL, theme.m_iPartId, 0, 210, &lf))) + { + ::GetObject(::GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); + } + + lf.lfEscapement = lf.lfOrientation = 2700; + lf.lfOutPrecision = OUT_TT_ONLY_PRECIS; + + if (CheckEAFonts()) + { + WCHAR szText[LF_FACESIZE]; + szText[0] = L'@'; + StringCchCopyW(&szText[1], _countof(szText) - 1, lf.lfFaceName); + StringCchCopyW(lf.lfFaceName, _countof(lf.lfFaceName), szText); + } + + return ::CreateFontIndirectW(&lf); } void CTipbarWnd::UpdateVerticalFont() @@ -3991,15 +4137,85 @@ void CTipbarWnd::SetAlpha(BYTE bAlpha, BOOL bFlag) { } -/// @unimplemented -BOOL CTipbarWnd::SetLangBand(BOOL bFlag1, BOOL bFlag2) +BOOL CTipbarWnd::SetLangBand(BOOL bDeskBand, BOOL bFlag2) { - return FALSE; + if (bDeskBand == !!(m_dwShowType & TF_SFT_DESKBAND)) + return TRUE; + + BOOL ret = TRUE; + HWND hwndTray = m_ShellWndThread.GetWndTray(); + if (bFlag2 && hwndTray) + { + DWORD_PTR dwResult; + HWND hImeWnd = ::ImmGetDefaultIMEWnd(hwndTray); + if (hImeWnd) + ::SendMessageTimeout(hImeWnd, WM_IME_SYSTEM, 0x24 - bDeskBand, (LPARAM)hwndTray, + (SMTO_BLOCK | SMTO_ABORTIFHUNG), 5000, &dwResult); + else + ::SendMessageTimeout(hwndTray, 0x505, 0, bDeskBand, + (SMTO_BLOCK | SMTO_ABORTIFHUNG), 5000, &dwResult); + } + else + { + ret = FALSE; + } + + if (!(m_dwTipbarWndFlags & 2)) + { + if (bDeskBand) + { + KillTimer(7); + SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); + } + } + + return ret; } -/// @unimplemented void CTipbarWnd::SetMoveRect(INT X, INT Y, INT nWidth, INT nHeight) { + if (m_dwTipbarWndFlags & 0x2) + { + m_nWidth = nWidth; + m_nHeight = nHeight; + return; + } + + ++m_bInCallOn; + + m_dwTipbarWndFlags |= 0x400; + + m_X = X; + m_Y = Y; + m_CX = nWidth; + m_CY = nHeight; + + RECT rc; + SIZE size = { 0, 0 }; + if (m_pWndFrame) + { + ::SetRect(&rc, 0, 0, nWidth - m_cxDlgFrameX2, nHeight - m_cyDlgFrameX2); + m_pWndFrame->SetRect(&rc); + m_pWndFrame->GetFrameSize(&size); + } + + if (m_pTipbarGripper) + { + if (m_dwTipbarWndFlags & 4) + { + INT GripperWidth = GetGripperWidth(); + ::SetRect(&rc, size.cx, size.cy, nWidth - m_cxDlgFrameX2 - size.cx, size.cy + GripperWidth); + } + else + { + INT GripperWidth = GetGripperWidth(); + INT y1 = nHeight - m_cyDlgFrameX2 - size.cy; + ::SetRect(&rc, size.cx, size.cy, size.cx + GripperWidth, y1); + } + m_pTipbarGripper->SetRect(&rc); + } + + --m_bInCallOn; } /// @unimplemented @@ -4209,10 +4425,54 @@ STDMETHODIMP CTipbarWnd::OnThreadItemChange(DWORD dwThreadId) return E_NOTIMPL; } -/// @unimplemented STDMETHODIMP CTipbarWnd::OnModalInput(DWORD dwThreadId, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return E_NOTIMPL; + switch (uMsg) + { + case WM_NCLBUTTONDOWN: + case WM_NCRBUTTONDOWN: + case WM_NCMBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONUP: + case WM_MBUTTONUP: + break; + + case WM_NCLBUTTONUP: + case WM_NCRBUTTONUP: + case WM_NCMBUTTONUP: + if (m_pThread) + { + CUTBMenuWnd *pMenuUI = m_pModalMenu->m_pMenuUI; + if (pMenuUI) + { + HWND hWnd = *pMenuUI; + if (hWnd) + { + POINT pt = { (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam) }; + ::ScreenToClient(hWnd, &pt); + uMsg += WM_LBUTTONUP - WM_NCLBUTTONUP; + ::PostMessage(m_hWnd, uMsg, wParam, MAKELPARAM(pt.x, pt.y)); + } + } + } + break; + + default: + { + if (uMsg == WM_KEYDOWN || uMsg == WM_KEYUP) + { + if (m_pThread) + m_pModalMenu->PostKey(uMsg == WM_KEYUP, wParam, lParam); + } + else + { + CancelMenu(); + } + break; + } + } + + return 0; } /// @unimplemented @@ -4236,7 +4496,7 @@ STDMETHODIMP CTipbarWnd::OnLangBarUpdate(TfLBIClick click, BOOL bFlag) STDMETHODIMP_(BSTR) CTipbarWnd::GetAccName() { WCHAR szText[256]; - ::LoadStringW(g_hInst, IDS_LANGUAGEBAR, szText, _countof(szText)); + ::LoadStringW(g_hInst, IDS_LANGUAGEBAR, szText, _countof(szText)); return ::SysAllocString(szText); } @@ -4272,9 +4532,25 @@ STDMETHODIMP_(void) CTipbarWnd::OnCreate(HWND hWnd) { } -/// @unimplemented STDMETHODIMP_(void) CTipbarWnd::OnDestroy(HWND hWnd) { + CancelMenu(); + + if (m_pTipbarAccessible) + m_pTipbarAccessible->NotifyWinEvent(EVENT_OBJECT_DESTROY, GetAccItem()); + + OnTerminateToolbar(); + if (m_pTipbarAccessible) + { + m_pTipbarAccessible->ClearAccItems(); + m_pTipbarAccessible->Release(); + m_pTipbarAccessible = NULL; + } + + m_coInit.CoUninit(); + + if (m_pLangBarMgr) + m_pLangBarMgr->UnAdviseEventSink(m_dwSinkCookie); } /// @unimplemented @@ -4288,9 +4564,13 @@ STDMETHODIMP_(void) CTipbarWnd::OnSysColorChange() SetTimer(7, g_uTimerElapseSYSCOLORCHANGED); } -/// @unimplemented void CTipbarWnd::OnTerminateToolbar() { + m_dwTipbarWndFlags |= 0x10000; + DestroyOverScreenSizeBalloon(); + TerminateAllThreads(TRUE); + if (!(m_dwTipbarWndFlags & 0x2)) + SavePosition(); } STDMETHODIMP_(void) CTipbarWnd::OnEndSession(HWND hWnd, WPARAM wParam, LPARAM lParam) @@ -4349,11 +4629,22 @@ CTipbarWnd::OnWindowPosChanging(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } -/// @unimplemented STDMETHODIMP_(LRESULT) CTipbarWnd::OnShowWindow(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return 0; + if (m_pTipbarAccessible) + { + if (wParam) // Show? + { + m_pTipbarAccessible->NotifyWinEvent(EVENT_OBJECT_SHOW, GetAccItem()); + m_pTipbarAccessible->NotifyWinEvent(EVENT_OBJECT_FOCUS, GetAccItem()); + } + else + { + m_pTipbarAccessible->NotifyWinEvent(EVENT_OBJECT_HIDE, GetAccItem()); + } + } + return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } STDMETHODIMP_(LRESULT) @@ -4378,11 +4669,33 @@ CTipbarWnd::OnDisplayChange(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return ::DefWindowProc(hWnd, uMsg, wParam, lParam); } -/// @unimplemented STDMETHODIMP_(HRESULT) CTipbarWnd::OnGetObject(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - return E_NOTIMPL; + if (lParam != -4) + return S_OK; + if (!m_pTipbarAccessible) + return E_OUTOFMEMORY; + + if (m_pTipbarAccessible->m_bInitialized) + return m_pTipbarAccessible->CreateRefToAccObj(wParam); + + HRESULT hr = S_OK; + if (SUCCEEDED(m_coInit.EnsureCoInit())) + { + hr = m_pTipbarAccessible->Initialize(); + if (FAILED(hr)) + { + m_pTipbarAccessible->Release(); + m_pTipbarAccessible = NULL; + return hr; + } + + m_pTipbarAccessible->NotifyWinEvent(EVENT_OBJECT_CREATE, GetAccItem()); + return m_pTipbarAccessible->CreateRefToAccObj(wParam); + } + + return hr; } STDMETHODIMP_(BOOL) CTipbarWnd::OnEraseBkGnd(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) diff --git a/dll/win32/msutb/precomp.h b/dll/win32/msutb/precomp.h index 05b2a826e27..08b64cdd9fb 100644 --- a/dll/win32/msutb/precomp.h +++ b/dll/win32/msutb/precomp.h @@ -17,6 +17,7 @@ #include <oleacc.h> #include <imm.h> #include <ddk/immdev.h> +#include <undocuser.h> #include <cguid.h> #include <msctf.h> #include <ctffunc.h>

11 months

[reactos] 01/01: [GITHUB] Update Actions for Node.js 16 deprecation preparation (#5819)

by Maj Soklič

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5974982d9cf75b29442ba… commit 5974982d9cf75b29442badc2ad9873ddd371fea8 Author: Maj Soklič <majs.1236(a)gmail.com> AuthorDate: Sat Feb 10 00:50:59 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 10 02:50:59 2024 +0300 [GITHUB] Update Actions for Node.js 16 deprecation preparation (#5819) GitHub started to show deprecation warnings for all Node.js 16 based Actions: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-… In order to resolve this: - build.yml: Update cache to v4 - labeler.yml: - Remove the now optional 'repo-token' argument - Add 'sync-labels' to remove non-actual labels on PR updates - stale.yml: Remove useless issue permission since we don't have issues enabled --- .github/workflows/build.yml | 4 ++-- .github/workflows/labeler.yml | 2 +- .github/workflows/stale.yml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 207e2641073..6a58c3a7e4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: wget https://gist.githubusercontent.com/zefklop/b2d6a0b470c70183e93d5285a03f5899… - name: Get RosBE id: get_rosbe - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: RosBE-CI key: RosBE-CI-${{runner.os}}-${{steps.get_rosbe_spec.outputs.march-sha}}-${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}} @@ -50,7 +50,7 @@ jobs: with: path: src - name: Set up cache for ccache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ccache key: ccache-${{matrix.compiler}}-${{matrix.arch}}-${{matrix.config}}-${{github.sha}} diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 80bba040d0c..f31492a1bcf 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -8,4 +8,4 @@ jobs: steps: - uses: actions/labeler@v5 with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" + sync-labels: true diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3cdccf733e0..289dfc1d0c7 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -14,7 +14,6 @@ jobs: runs-on: ubuntu-latest permissions: - issues: write pull-requests: write steps:

11 months

[reactos] 01/01: [GITHUB] Fix Labeler rule for 'drivers'

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f874a4656128d386795c… commit 6f874a4656128d386795c7466141947e48d795ca Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Feb 10 02:08:04 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Feb 10 02:08:04 2024 +0300 [GITHUB] Fix Labeler rule for 'drivers' Addendum to d18b6fc4. --- .github/labeler.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 0cd5d283907..3588be7ed91 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -10,8 +10,9 @@ drivers: - any-glob-to-any-file: - drivers/** - sdk/lib/drivers/** + - all-globs-to-any-file: - win32ss/drivers/** - - all-globs-to-all-files: '!win32ss/drivers/font/**' + - '!win32ss/drivers/font/**' freeldr: - changed-files:

11 months

[reactos] 01/01: [GITHUB] Upgrade Labeler rules for v5

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d18b6fc43738517172fd6… commit d18b6fc43738517172fd6dbb4f52b1d99ba4ffc5 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Feb 10 01:42:13 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sat Feb 10 01:42:13 2024 +0300 [GITHUB] Upgrade Labeler rules for v5 Addendum to 51f3ef04. --- .github/labeler.yml | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 8028448ed45..0cd5d283907 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,29 +1,44 @@ # Labelling by the files touched ATL: - - sdk/lib/atl/** +- changed-files: + - any-glob-to-any-file: + - sdk/lib/atl/** drivers: - - drivers/** - - sdk/lib/drivers/** - - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"] +- changed-files: + - any-glob-to-any-file: + - drivers/** + - sdk/lib/drivers/** + - win32ss/drivers/** + - all-globs-to-all-files: '!win32ss/drivers/font/**' freeldr: - - boot/freeldr/** +- changed-files: + - any-glob-to-any-file: + - boot/freeldr/** "kernel&hal": - - hal/** - - ntoskrnl/** +- changed-files: + - any-glob-to-any-file: + - hal/** + - ntoskrnl/** ROSTESTS: - - modules/rostests/** +- changed-files: + - any-glob-to-any-file: + - modules/rostests/** shell: - - base/shell/explorer/** - - base/shell/rshell/** - - dll/shellext/** - - dll/win32/browseui/** - - dll/win32/shell32/** +- changed-files: + - any-glob-to-any-file: + - base/shell/explorer/** + - base/shell/rshell/** + - dll/shellext/** + - dll/win32/browseui/** + - dll/win32/shell32/** Win32SS: - - win32ss/** +- changed-files: + - any-glob-to-any-file: + - win32ss/**

11 months

[reactos] 01/01: [SETUPLIB][USETUP] Convert MUI_LANGUAGE GeoID values to numbers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88891d2ce70f2837c2d6a… commit 88891d2ce70f2837c2d6a372001cd1ab535daf95 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 9 22:33:30 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 9 22:33:30 2024 +0100 [SETUPLIB][USETUP] Convert MUI_LANGUAGE GeoID values to numbers. --- base/setup/lib/mui.c | 2 +- base/setup/lib/mui.h | 6 +- base/setup/lib/muilanguages.h | 288 +++++++++++++++++++++--------------------- base/setup/lib/settings.c | 22 +++- base/setup/lib/settings.h | 2 +- 5 files changed, 165 insertions(+), 155 deletions(-) diff --git a/base/setup/lib/mui.c b/base/setup/lib/mui.c index 9d677f8d307..48af986e908 100644 --- a/base/setup/lib/mui.c +++ b/base/setup/lib/mui.c @@ -100,7 +100,7 @@ MUIGetOEMCodePage( return MUILanguageList[lngIndex].OEMCPage; } -PCWSTR +GEOID MUIGetGeoID( IN PCWSTR LanguageId) { diff --git a/base/setup/lib/mui.h b/base/setup/lib/mui.h index fe2f206f659..219f69e551a 100644 --- a/base/setup/lib/mui.h +++ b/base/setup/lib/mui.h @@ -25,6 +25,8 @@ typedef struct KLID LayoutID; // Layout ID (like 0x00000409) } MUI_LAYOUTS; +typedef ULONG GEOID; // See winnls.h + typedef struct { PCWSTR LanguageID; @@ -32,7 +34,7 @@ typedef struct UINT OEMCPage; UINT MACCPage; PCWSTR LanguageDescriptor; - PCWSTR GeoID; + GEOID GeoID; const MUI_SUBFONT* MuiSubFonts; const MUI_LAYOUTS* MuiLayouts; } MUI_LANGUAGE; @@ -50,7 +52,7 @@ UINT MUIGetOEMCodePage( IN PCWSTR LanguageId); -PCWSTR +GEOID MUIGetGeoID( IN PCWSTR LanguageId); diff --git a/base/setup/lib/muilanguages.h b/base/setup/lib/muilanguages.h index f4871f0c7e8..636c8468f34 100644 --- a/base/setup/lib/muilanguages.h +++ b/base/setup/lib/muilanguages.h @@ -411,432 +411,432 @@ const MUI_LANGUAGE MUILanguageList[] = { - /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID, Fonts, KB Layouts */ + /* Lang ID, ANSI CP, OEM CP, MAC CP, Language Name, GeoID, Fonts, KB Layouts */ #ifdef LANGUAGE_AF_ZA - {L"00000436", 1252, 850, 10000, L"Afrikaans", L"209", LatinFonts, afZALayouts}, + {L"00000436", 1252, 850, 10000, L"Afrikaans", 209, LatinFonts, afZALayouts}, #endif #ifdef LANGUAGE_SQ_AL - {L"0000041C", 1250, 852, 10029, L"Albanian (Albania)", L"6", LatinFonts, sqALLayouts}, + {L"0000041C", 1250, 852, 10029, L"Albanian (Albania)", 6, LatinFonts, sqALLayouts}, #endif #ifdef LANGUAGE_AR_SA - {L"00000401", 1256, 720, 10004, L"Arabic (Saudi Arabia)", L"205", UnicodeFonts, arSALayouts}, + {L"00000401", 1256, 720, 10004, L"Arabic (Saudi Arabia)", 205, UnicodeFonts, arSALayouts}, #endif #ifdef LANGUAGE_AR_IQ - {L"00000801", 1256, 720, 10004, L"Arabic (Iraq)", L"121", UnicodeFonts, arIQLayouts}, + {L"00000801", 1256, 720, 10004, L"Arabic (Iraq)", 121, UnicodeFonts, arIQLayouts}, #endif #ifdef LANGUAGE_AR_EG - {L"00000C01", 1256, 720, 10004, L"Arabic (Egypt)", L"67", UnicodeFonts, arEGLayouts}, + {L"00000C01", 1256, 720, 10004, L"Arabic (Egypt)", 67, UnicodeFonts, arEGLayouts}, #endif #ifdef LANGUAGE_AR_LY - {L"00001001", 1256, 720, 10004, L"Arabic (Libya)", L"148", UnicodeFonts, arLYLayouts}, + {L"00001001", 1256, 720, 10004, L"Arabic (Libya)", 148, UnicodeFonts, arLYLayouts}, #endif #ifdef LANGUAGE_AR_DZ - {L"00001401", 1256, 720, 10004, L"Arabic (Algeria)", L"4", UnicodeFonts, arDZLayouts}, + {L"00001401", 1256, 720, 10004, L"Arabic (Algeria)", 4, UnicodeFonts, arDZLayouts}, #endif #ifdef LANGUAGE_AR_MA - {L"00001801", 1256, 720, 10004, L"Arabic (Morocco)", L"149", UnicodeFonts, arMALayouts}, + {L"00001801", 1256, 720, 10004, L"Arabic (Morocco)", 149, UnicodeFonts, arMALayouts}, #endif #ifdef LANGUAGE_AR_TN - {L"00001C01", 1256, 720, 10004, L"Arabic (Tunisia)", L"234", UnicodeFonts, arTNLayouts}, + {L"00001C01", 1256, 720, 10004, L"Arabic (Tunisia)", 234, UnicodeFonts, arTNLayouts}, #endif #ifdef LANGUAGE_AR_OM - {L"00002001", 1256, 720, 10004, L"Arabic (Oman)", L"164", UnicodeFonts, arOMLayouts}, + {L"00002001", 1256, 720, 10004, L"Arabic (Oman)", 164, UnicodeFonts, arOMLayouts}, #endif #ifdef LANGUAGE_AR_YE - {L"00002401", 1256, 720, 10004, L"Arabic (Yemen)", L"261", UnicodeFonts, arYELayouts}, + {L"00002401", 1256, 720, 10004, L"Arabic (Yemen)", 261, UnicodeFonts, arYELayouts}, #endif #ifdef LANGUAGE_AR_SY - {L"00002801", 1256, 720, 10004, L"Arabic (Syria)", L"222", UnicodeFonts, arSYLayouts}, + {L"00002801", 1256, 720, 10004, L"Arabic (Syria)", 222, UnicodeFonts, arSYLayouts}, #endif #ifdef LANGUAGE_AR_JO - {L"00002C01", 1256, 720, 10004, L"Arabic (Jordan)", L"126", UnicodeFonts, arJOLayouts}, + {L"00002C01", 1256, 720, 10004, L"Arabic (Jordan)", 126, UnicodeFonts, arJOLayouts}, #endif #ifdef LANGUAGE_AR_LB - {L"00003001", 1256, 720, 10004, L"Arabic (Lebanon)", L"139", UnicodeFonts, arLBLayouts}, + {L"00003001", 1256, 720, 10004, L"Arabic (Lebanon)", 139, UnicodeFonts, arLBLayouts}, #endif #ifdef LANGUAGE_AR_KW - {L"00003401", 1256, 720, 10004, L"Arabic (Kuwait)", L"136", UnicodeFonts, arKWLayouts}, + {L"00003401", 1256, 720, 10004, L"Arabic (Kuwait)", 136, UnicodeFonts, arKWLayouts}, #endif #ifdef LANGUAGE_AR_AE - {L"00003801", 1256, 720, 10004, L"Arabic (U.A.E.)", L"224", UnicodeFonts, arAELayouts}, + {L"00003801", 1256, 720, 10004, L"Arabic (U.A.E.)", 224, UnicodeFonts, arAELayouts}, #endif #ifdef LANGUAGE_AR_BH - {L"00003C01", 1256, 720, 10004, L"Arabic (Bahrain)", L"17", UnicodeFonts, arBHLayouts}, + {L"00003C01", 1256, 720, 10004, L"Arabic (Bahrain)", 17, UnicodeFonts, arBHLayouts}, #endif #ifdef LANGUAGE_AR_QA - {L"00004001", 1256, 720, 10004, L"Arabic (Qatar)", L"197", UnicodeFonts, arQALayouts}, + {L"00004001", 1256, 720, 10004, L"Arabic (Qatar)", 197, UnicodeFonts, arQALayouts}, #endif #ifdef LANGUAGE_HY_AM - {L"0000042B", 0, 1, 2, L"Armenian", L"7", UnicodeFonts, hyAMLayouts}, + {L"0000042B", 0, 1, 2, L"Armenian", 7, UnicodeFonts, hyAMLayouts}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000082C", 1251, 866, 10007, L"Azeri (Cyrillic)", L"5", CyrillicFonts, azAZLayouts}, + {L"0000082C", 1251, 866, 10007, L"Azeri (Cyrillic)", 5, CyrillicFonts, azAZLayouts}, #endif #ifdef LANGUAGE_AZ_AZ - {L"0000042C", 1254, 857, 10081, L"Azeri (Latin)", L"5", LatinFonts, azAZLayouts}, + {L"0000042C", 1254, 857, 10081, L"Azeri (Latin)", 5, LatinFonts, azAZLayouts}, #endif #ifdef LANGUAGE_EU_ES - {L"0000042D", 1252, 850, 10000, L"Basque", L"217", LatinFonts, euESLayouts}, + {L"0000042D", 1252, 850, 10000, L"Basque", 217, LatinFonts, euESLayouts}, #endif #ifdef LANGUAGE_BE_BY - {L"00000423", 1251, 866, 10007, L"Belarusian", L"29", CyrillicFonts, beBYLayouts}, + {L"00000423", 1251, 866, 10007, L"Belarusian", 29, CyrillicFonts, beBYLayouts}, #endif #ifdef LANGUAGE_BN_BD - {L"00000845", 0, 1, 2, L"Bengali (Bangladesh)", L"23", UnicodeFonts, bnBDLayouts}, + {L"00000845", 0, 1, 2, L"Bengali (Bangladesh)", 23, UnicodeFonts, bnBDLayouts}, #endif #ifdef LANGUAGE_BN_IN - {L"00000445", 0, 1, 2, L"Bengali (India)", L"113", UnicodeFonts, bnINLayouts}, + {L"00000445", 0, 1, 2, L"Bengali (India)", 113, UnicodeFonts, bnINLayouts}, #endif #ifdef LANGUAGE_BG_BG - {L"00000402", 1251, 866, 10007, L"Bulgarian", L"35", CyrillicFonts, bgBGLayouts}, + {L"00000402", 1251, 866, 10007, L"Bulgarian", 35, CyrillicFonts, bgBGLayouts}, #endif #ifdef LANGUAGE_MY_MM - {L"00000455", 0, 1, 2, L"Burmese", L"1", UnicodeFonts, myMMLayouts}, + {L"00000455", 0, 1, 2, L"Burmese", 1, UnicodeFonts, myMMLayouts}, #endif #ifdef LANGUAGE_CA_ES - {L"00000403", 1252, 850, 10000, L"Catalan", L"217", LatinFonts, caESLayouts}, + {L"00000403", 1252, 850, 10000, L"Catalan", 217, LatinFonts, caESLayouts}, #endif #ifdef LANGUAGE_ZH_TW - {L"00000404", 950, 950, 10008, L"Chinese (Taiwan)", L"237", ChineseTraditionalFonts, zhTWLayouts}, + {L"00000404", 950, 950, 10008, L"Chinese (Taiwan)", 237, ChineseTraditionalFonts, zhTWLayouts}, #endif #ifdef LANGUAGE_ZH_CN - {L"00000804", 936, 936, 10008, L"Chinese (PRC)", L"45", ChineseSimplifiedFonts, zhCNLayouts}, + {L"00000804", 936, 936, 10008, L"Chinese (PRC)", 45, ChineseSimplifiedFonts, zhCNLayouts}, #endif #ifdef LANGUAGE_ZH_HK - {L"00000C04", 950, 950, 10008, L"Chinese (Hong Kong S.A.R.)", L"104", ChineseTraditionalFonts, zhHKLayouts}, + {L"00000C04", 950, 950, 10008, L"Chinese (Hong Kong S.A.R.)", 104, ChineseTraditionalFonts, zhHKLayouts}, #endif #ifdef LANGUAGE_ZH_SG - {L"00001004", 936, 936, 10008, L"Chinese (Singapore)", L"215", ChineseSimplifiedFonts, zhSGLayouts}, + {L"00001004", 936, 936, 10008, L"Chinese (Singapore)", 215, ChineseSimplifiedFonts, zhSGLayouts}, #endif #ifdef LANGUAGE_ZH_MO - {L"00001404", 950, 950, 10002, L"Chinese (Macau S.A.R.)", L"151", ChineseTraditionalFonts, zhMOLayouts}, + {L"00001404", 950, 950, 10002, L"Chinese (Macau S.A.R.)", 151, ChineseTraditionalFonts, zhMOLayouts}, #endif #ifdef LANGUAGE_HR_HR - {L"0000041A", 1250, 852, 10029, L"Croatian", L"108", LatinFonts, hrHRLayouts}, + {L"0000041A", 1250, 852, 10029, L"Croatian", 108, LatinFonts, hrHRLayouts}, #endif #ifdef LANGUAGE_CS_CZ - {L"00000405", 1250, 852, 10029, L"Czech", L"75", LatinFonts, csCZLayouts}, + {L"00000405", 1250, 852, 10029, L"Czech", 75, LatinFonts, csCZLayouts}, #endif #ifdef LANGUAGE_DA_DK - {L"00000406", 1252, 850, 10000, L"Danish", L"61", LatinFonts, daDKLayouts}, + {L"00000406", 1252, 850, 10000, L"Danish", 61, LatinFonts, daDKLayouts}, #endif #ifdef LANGUAGE_DV_MV - {L"00000465", 0, 1, 2, L"Dhivehi (Maldives)", L"165", UnicodeFonts, dvMVLayouts}, + {L"00000465", 0, 1, 2, L"Dhivehi (Maldives)", 165, UnicodeFonts, dvMVLayouts}, #endif #ifdef LANGUAGE_NL_NL - {L"00000413", 1252, 850, 10000, L"Dutch (Netherlands)", L"176", LatinFonts, nlNLLayouts}, + {L"00000413", 1252, 850, 10000, L"Dutch (Netherlands)", 176, LatinFonts, nlNLLayouts}, #endif #ifdef LANGUAGE_NL_BE - {L"00000813", 1252, 850, 10000, L"Dutch (Belgium)", L"21", LatinFonts, nlBELayouts}, + {L"00000813", 1252, 850, 10000, L"Dutch (Belgium)", 21, LatinFonts, nlBELayouts}, #endif #ifdef LANGUAGE_EN_US - {L"00000409", 1252, 437, 10000, L"English (United States)", L"244", LatinFonts, enUSLayouts}, + {L"00000409", 1252, 437, 10000, L"English (United States)", 244, LatinFonts, enUSLayouts}, #endif #ifdef LANGUAGE_EN_GB - {L"00000809", 1252, 850, 10000, L"English (United Kingdom)", L"242", LatinFonts, enGBLayouts}, + {L"00000809", 1252, 850, 10000, L"English (United Kingdom)", 242, LatinFonts, enGBLayouts}, #endif #ifdef LANGUAGE_EN_AU - {L"00000C09", 1252, 850, 10000, L"English (Australia)", L"12", LatinFonts, enAULayouts}, + {L"00000C09", 1252, 850, 10000, L"English (Australia)", 12, LatinFonts, enAULayouts}, #endif #ifdef LANGUAGE_EN_CA - {L"00001009", 1252, 850, 10000, L"English (Canada)", L"39", LatinFonts, enCALayouts}, + {L"00001009", 1252, 850, 10000, L"English (Canada)", 39, LatinFonts, enCALayouts}, #endif #ifdef LANGUAGE_EN_NZ - {L"00001409", 1252, 850, 10000, L"English (New Zealand)", L"183", LatinFonts, enNZLayouts}, + {L"00001409", 1252, 850, 10000, L"English (New Zealand)", 183, LatinFonts, enNZLayouts}, #endif #ifdef LANGUAGE_EN_IE - {L"00001809", 1252, 850, 10000, L"English (Ireland)", L"68", LatinFonts, enIELayouts}, + {L"00001809", 1252, 850, 10000, L"English (Ireland)", 68, LatinFonts, enIELayouts}, #endif #ifdef LANGUAGE_EN_ZA - {L"00001C09", 1252, 437, 10000, L"English (South Africa)", L"209", LatinFonts, enZALayouts}, + {L"00001C09", 1252, 437, 10000, L"English (South Africa)", 209, LatinFonts, enZALayouts}, #endif #ifdef LANGUAGE_EN_JM - {L"00002009", 1252, 850, 10000, L"English (Jamaica)", L"124", LatinFonts, enJMLayouts}, + {L"00002009", 1252, 850, 10000, L"English (Jamaica)", 124, LatinFonts, enJMLayouts}, #endif #ifdef LANGUAGE_EN_CB - {L"00002409", 1252, 850, 10000, L"English (Caribbean)", L"1", LatinFonts, enCBLayouts}, + {L"00002409", 1252, 850, 10000, L"English (Caribbean)", 1, LatinFonts, enCBLayouts}, #endif #ifdef LANGUAGE_EN_BZ - {L"00002809", 1252, 850, 10000, L"English (Belize)", L"24", LatinFonts, enBZLayouts}, + {L"00002809", 1252, 850, 10000, L"English (Belize)", 24, LatinFonts, enBZLayouts}, #endif #ifdef LANGUAGE_EN_TT - {L"00002C09", 1252, 850, 10000, L"English (Trinidad)", L"225", LatinFonts, enTTLayouts}, + {L"00002C09", 1252, 850, 10000, L"English (Trinidad)", 225, LatinFonts, enTTLayouts}, #endif #ifdef LANGUAGE_EN_ZW - {L"00003009", 1252, 437, 10000, L"English (Zimbabwe)", L"264", LatinFonts, enZWLayouts}, + {L"00003009", 1252, 437, 10000, L"English (Zimbabwe)", 264, LatinFonts, enZWLayouts}, #endif #ifdef LANGUAGE_EN_PH - {L"00003409", 1252, 437, 10000, L"English (Philippines)", L"201", LatinFonts, enPHLayouts}, + {L"00003409", 1252, 437, 10000, L"English (Philippines)", 201, LatinFonts, enPHLayouts}, #endif #ifdef LANGUAGE_EO_AA - {L"0000048F", 1252, 437, 10000, L"Esperanto", L"1", LatinFonts, eoAALayouts}, + {L"0000048F", 1252, 437, 10000, L"Esperanto", 1, LatinFonts, eoAALayouts}, #endif #ifdef LANGUAGE_ET_EE - {L"00000425", 1252, 775, 10029, L"Estonian", L"70", LatinFonts, etEELayouts}, + {L"00000425", 1252, 775, 10029, L"Estonian", 70, LatinFonts, etEELayouts}, #endif #ifdef LANGUAGE_FO_FO - {L"00000438", 1252, 850, 10079, L"Faeroese", L"81", LatinFonts, foFOLayouts}, + {L"00000438", 1252, 850, 10079, L"Faeroese", 81, LatinFonts, foFOLayouts}, #endif #ifdef LANGUAGE_FA_IR - {L"00000429", 1256, 720, 10004, L"Farsi", L"116", UnicodeFonts, faIRLayouts}, + {L"00000429", 1256, 720, 10004, L"Farsi", 116, UnicodeFonts, faIRLayouts}, #endif #ifdef LANGUAGE_FI_FI - {L"0000040B", 1252, 850, 10000, L"Finnish", L"77", LatinFonts, fiFILayouts}, + {L"0000040B", 1252, 850, 10000, L"Finnish", 77, LatinFonts, fiFILayouts}, #endif #ifdef LANGUAGE_FR_CA - {L"00000C0C", 1252, 850, 10000, L"French (Canada)", L"39", LatinFonts, frCALayouts}, + {L"00000C0C", 1252, 850, 10000, L"French (Canada)", 39, LatinFonts, frCALayouts}, #endif #ifdef LANGUAGE_FR_FR - {L"0000040C", 1252, 850, 10000, L"French (France)", L"84", LatinFonts, frFRLayouts}, + {L"0000040C", 1252, 850, 10000, L"French (France)", 84, LatinFonts, frFRLayouts}, #endif #ifdef LANGUAGE_FR_BE - {L"0000080C", 1252, 850, 10000, L"French (Belgium)", L"21", LatinFonts, frBELayouts}, + {L"0000080C", 1252, 850, 10000, L"French (Belgium)", 21, LatinFonts, frBELayouts}, #endif #ifdef LANGUAGE_FR_CH - {L"0000100C", 1252, 850, 10000, L"French (Switzerland)", L"223", LatinFonts, frCHLayouts}, + {L"0000100C", 1252, 850, 10000, L"French (Switzerland)", 223, LatinFonts, frCHLayouts}, #endif #ifdef LANGUAGE_FR_LU - {L"0000140C", 1252, 850, 10000, L"French (Luxembourg)", L"147", LatinFonts, frLULayouts}, + {L"0000140C", 1252, 850, 10000, L"French (Luxembourg)", 147, LatinFonts, frLULayouts}, #endif #ifdef LANGUAGE_FR_MC - {L"0000180C", 1252, 850, 10000, L"French (Monaco)", L"158", LatinFonts, frMCLayouts}, + {L"0000180C", 1252, 850, 10000, L"French (Monaco)", 158, LatinFonts, frMCLayouts}, #endif #ifdef LANGUAGE_GL_ES - {L"00000456", 1252, 850, 10000, L"Galician (Spain)", L"217", LatinFonts, glESLayouts}, + {L"00000456", 1252, 850, 10000, L"Galician (Spain)", 217, LatinFonts, glESLayouts}, #endif #ifdef LANGUAGE_KA_GE - {L"00000437", 0, 1, 2, L"Georgian", L"88", UnicodeFonts, kaGELayouts}, + {L"00000437", 0, 1, 2, L"Georgian", 88, UnicodeFonts, kaGELayouts}, #endif #ifdef LANGUAGE_DE_DE - {L"00000407", 1252, 850, 10000, L"German (Germany)", L"94", LatinFonts, deDELayouts}, + {L"00000407", 1252, 850, 10000, L"German (Germany)", 94, LatinFonts, deDELayouts}, #endif #ifdef LANGUAGE_DE_CH - {L"00000807", 1252, 850, 10000, L"German (Switzerland)", L"223", LatinFonts, deCHLayouts}, + {L"00000807", 1252, 850, 10000, L"German (Switzerland)", 223, LatinFonts, deCHLayouts}, #endif #ifdef LANGUAGE_DE_AT - {L"00000C07", 1252, 850, 10000, L"German (Austria)", L"14", LatinFonts, deATLayouts}, + {L"00000C07", 1252, 850, 10000, L"German (Austria)", 14, LatinFonts, deATLayouts}, #endif #ifdef LANGUAGE_DE_LU - {L"00001007", 1252, 850, 10000, L"German (Luxembourg)", L"147", LatinFonts, deLULayouts}, + {L"00001007", 1252, 850, 10000, L"German (Luxembourg)", 147, LatinFonts, deLULayouts}, #endif #ifdef LANGUAGE_DE_LI - {L"00001407", 1252, 850, 10000, L"German (Liechtenstein)", L"145", LatinFonts, deLILayouts}, + {L"00001407", 1252, 850, 10000, L"German (Liechtenstein)", 145, LatinFonts, deLILayouts}, #endif #ifdef LANGUAGE_EL_GR - {L"00000408", 1253, 737, 10006, L"Greek", L"98", GreekFonts, elGRLayouts}, + {L"00000408", 1253, 737, 10006, L"Greek", 98, GreekFonts, elGRLayouts}, #endif #ifdef LANGUAGE_GU_IN - {L"00000447", 0, 1, 2, L"Gujarati (India)", L"113", UnicodeFonts, guINLayouts}, + {L"00000447", 0, 1, 2, L"Gujarati (India)", 113, UnicodeFonts, guINLayouts}, #endif #ifdef LANGUAGE_HE_IL - {L"0000040D", 1255, 862, 10005, L"Hebrew", L"117", HebrewFonts, heILLayouts}, + {L"0000040D", 1255, 862, 10005, L"Hebrew", 117, HebrewFonts, heILLayouts}, #endif #ifdef LANGUAGE_HI_IN - {L"00000439", 1252, 437, 10000, L"Hindi", L"113", HindiFonts, hiINLayouts }, + {L"00000439", 1252, 437, 10000, L"Hindi", 113, HindiFonts, hiINLayouts }, #endif #ifdef LANGUAGE_HU_HU - {L"0000040E", 1250, 852, 10029, L"Hungarian", L"109", LatinFonts, huHULayouts}, + {L"0000040E", 1250, 852, 10029, L"Hungarian", 109, LatinFonts, huHULayouts}, #endif #ifdef LANGUAGE_IS_IS - {L"0000040F", 1252, 850, 10079, L"Icelandic", L"110", LatinFonts, isISLayouts}, + {L"0000040F", 1252, 850, 10079, L"Icelandic", 110, LatinFonts, isISLayouts}, #endif #ifdef LANGUAGE_ID_ID - {L"00000421", 1252, 850, 10079, L"Indonesian", L"111", LatinFonts, idIDLayouts}, + {L"00000421", 1252, 850, 10079, L"Indonesian", 111, LatinFonts, idIDLayouts}, #endif #ifdef LANGUAGE_IT_IT - {L"00000410", 1252, 850, 10000, L"Italian (Italy)", L"118", LatinFonts, itITLayouts}, + {L"00000410", 1252, 850, 10000, L"Italian (Italy)", 118, LatinFonts, itITLayouts}, #endif #ifdef LANGUAGE_IT_CH - {L"00000810", 1252, 850, 10000, L"Italian (Switzerland)", L"223", LatinFonts, itCHLayouts}, + {L"00000810", 1252, 850, 10000, L"Italian (Switzerland)", 223, LatinFonts, itCHLayouts}, #endif #ifdef LANGUAGE_JA_JP - {L"00000411", 932, 932, 10001, L"Japanese", L"122", JapaneseFonts, jaJPLayouts}, + {L"00000411", 932, 932, 10001, L"Japanese", 122, JapaneseFonts, jaJPLayouts}, #endif #ifdef LANGUAGE_KN_IN - {L"0000044B", 1252, 437, 10079, L"Kannada (India)", L"113", LatinFonts, knINLayouts}, + {L"0000044B", 1252, 437, 10079, L"Kannada (India)", 113, LatinFonts, knINLayouts}, #endif #ifdef LANGUAGE_KK_KZ - {L"0000043F", 1251, 866, 10007, L"Kazakh", L"137", CyrillicFonts, kkKZLayouts}, + {L"0000043F", 1251, 866, 10007, L"Kazakh", 137, CyrillicFonts, kkKZLayouts}, #endif #ifdef LANGUAGE_KOK_IN - {L"00000457", 0, 437, 2, L"Konkani", L"113", UnicodeFonts, kokINLayouts}, + {L"00000457", 0, 437, 2, L"Konkani", 113, UnicodeFonts, kokINLayouts}, #endif #ifdef LANGUAGE_KO_KR - {L"00000412", 949, 949, 10003, L"Korean", L"134", KoreanFonts, koKRLayouts}, + {L"00000412", 949, 949, 10003, L"Korean", 134, KoreanFonts, koKRLayouts}, #endif #ifdef LANGUAGE_KY_KG - {L"00000440", 1251, 866, 10007, L"Kyrgyz (Kyrgyzstan)", L"130", CyrillicFonts, kyKGLayouts}, + {L"00000440", 1251, 866, 10007, L"Kyrgyz (Kyrgyzstan)", 130, CyrillicFonts, kyKGLayouts}, #endif #ifdef LANGUAGE_LV_LV - {L"00000426", 1257, 775, 10029, L"Latvian", L"140", LatinFonts, lvLVLayouts}, + {L"00000426", 1257, 775, 10029, L"Latvian", 140, LatinFonts, lvLVLayouts}, #endif #ifdef LANGUAGE_LT_LT - {L"00000427", 1257, 775, 10029, L"Lithuanian", L"141", LatinFonts, ltLTLayouts}, + {L"00000427", 1257, 775, 10029, L"Lithuanian", 141, LatinFonts, ltLTLayouts}, #endif #ifdef LANGUAGE_MK_MK - {L"0000042F", 1251, 866, 10007, L"FYRO Macedonian", L"19618", CyrillicFonts, mkMKLayouts}, + {L"0000042F", 1251, 866, 10007, L"FYRO Macedonian", 19618, CyrillicFonts, mkMKLayouts}, #endif #ifdef LANGUAGE_MS_BN - {L"0000083E", 1252, 850, 10000, L"Malay (Brunei Darussalam)", L"37", LatinFonts, msBNLayouts}, + {L"0000083E", 1252, 850, 10000, L"Malay (Brunei Darussalam)", 37, LatinFonts, msBNLayouts}, #endif #ifdef LANGUAGE_MS_MY - {L"0000043E", 1252, 850, 10000, L"Malay (Malaysia)", L"167", LatinFonts, msMYLayouts}, + {L"0000043E", 1252, 850, 10000, L"Malay (Malaysia)", 167, LatinFonts, msMYLayouts}, #endif #ifdef LANGUAGE_MR_IN - {L"0000044E", 0, 1, 2, L"Marathi", L"113", UnicodeFonts, mrINLayouts}, + {L"0000044E", 0, 1, 2, L"Marathi", 113, UnicodeFonts, mrINLayouts}, #endif #ifdef LANGUAGE_MN_MN - {L"00000450", 1251, 866, 10007, L"Mongolian (Mongolia)", L"154", CyrillicFonts, mnMNLayouts}, + {L"00000450", 1251, 866, 10007, L"Mongolian (Mongolia)", 154, CyrillicFonts, mnMNLayouts}, #endif #ifdef LANGUAGE_NB_NO - {L"00000414", 1252, 850, 10000, L"Norwegian (Bokmal)", L"177", LatinFonts, nbNOLayouts}, + {L"00000414", 1252, 850, 10000, L"Norwegian (Bokmal)", 177, LatinFonts, nbNOLayouts}, #endif #ifdef LANGUAGE_NN_NO - {L"00000814", 1252, 850, 10000, L"Norwegian (Nynorsk)", L"177", LatinFonts, nnNOLayouts}, + {L"00000814", 1252, 850, 10000, L"Norwegian (Nynorsk)", 177, LatinFonts, nnNOLayouts}, #endif #ifdef LANGUAGE_PL_PL - {L"00000415", 1250, 852, 10029, L"Polish", L"191", LatinFonts, plPLLayouts}, + {L"00000415", 1250, 852, 10029, L"Polish", 191, LatinFonts, plPLLayouts}, #endif #ifdef LANGUAGE_PT_PT - {L"00000816", 1252, 850, 10000, L"Portuguese (Portugal)", L"193", LatinFonts, ptPTLayouts}, + {L"00000816", 1252, 850, 10000, L"Portuguese (Portugal)", 193, LatinFonts, ptPTLayouts}, #endif #ifdef LANGUAGE_PT_BR - {L"00000416", 1252, 850, 10000, L"Portuguese (Brazil)", L"32", LatinFonts, ptBRLayouts}, + {L"00000416", 1252, 850, 10000, L"Portuguese (Brazil)", 32, LatinFonts, ptBRLayouts}, #endif #ifdef LANGUAGE_PA_IN - {L"00000446", 0, 1, 2, L"Punjabi (India)", L"113", UnicodeFonts, paINLayouts}, + {L"00000446", 0, 1, 2, L"Punjabi (India)", 113, UnicodeFonts, paINLayouts}, #endif #ifdef LANGUAGE_RO_RO - {L"00000418", 28606, 28606, 10029, L"Romanian", L"200", LatinFonts, roROLayouts}, + {L"00000418", 28606, 28606, 10029, L"Romanian", 200, LatinFonts, roROLayouts}, #endif #ifdef LANGUAGE_RM_CH - {L"00000417", 1252, 850, 10000, L"Romansh", L"223", LatinFonts, rmCHLayouts}, + {L"00000417", 1252, 850, 10000, L"Romansh", 223, LatinFonts, rmCHLayouts}, #endif #ifdef LANGUAGE_RU_RU - {L"00000419", 1251, 866, 10007, L"Russian", L"203", CyrillicFonts, ruRULayouts}, + {L"00000419", 1251, 866, 10007, L"Russian", 203, CyrillicFonts, ruRULayouts}, #endif #ifdef LANGUAGE_SA_IN - {L"0000044F", 0, 1, 2, L"Sanskrit", L"113", UnicodeFonts, saINLayouts}, + {L"0000044F", 0, 1, 2, L"Sanskrit", 113, UnicodeFonts, saINLayouts}, #endif #ifdef LANGUAGE_SR_SP - {L"00000C1A", 1251, 855, 10007, L"Serbian (Cyrillic)", L"271", CyrillicFonts, srSPLayouts}, + {L"00000C1A", 1251, 855, 10007, L"Serbian (Cyrillic)", 271, CyrillicFonts, srSPLayouts}, #endif #ifdef LANGUAGE_SR_SP - {L"0000081A", 1250, 852, 10029, L"Serbian (Latin)", L"271", LatinFonts, srSPLayouts}, + {L"0000081A", 1250, 852, 10029, L"Serbian (Latin)", 271, LatinFonts, srSPLayouts}, #endif #ifdef LANGUAGE_SK_SK - {L"0000041B", 1250, 852, 10029, L"Slovak", L"143", LatinFonts, skSKLayouts}, + {L"0000041B", 1250, 852, 10029, L"Slovak", 143, LatinFonts, skSKLayouts}, #endif #ifdef LANGUAGE_SL_SI - {L"00000424", 1250, 852, 10029, L"Slovenian", L"212", LatinFonts, slSILayouts}, + {L"00000424", 1250, 852, 10029, L"Slovenian", 212, LatinFonts, slSILayouts}, #endif #ifdef LANGUAGE_ES_ES - {L"0000040A", 1252, 850, 10000, L"Spanish (Traditional Sort)", L"217", LatinFonts, esESLayouts}, + {L"0000040A", 1252, 850, 10000, L"Spanish (Traditional Sort)", 217, LatinFonts, esESLayouts}, #endif #ifdef LANGUAGE_ES_MX - {L"0000080A", 1252, 850, 10000, L"Spanish (Mexico)", L"166", LatinFonts, esMXLayouts}, + {L"0000080A", 1252, 850, 10000, L"Spanish (Mexico)", 166, LatinFonts, esMXLayouts}, #endif #ifdef LANGUAGE_ES_ES - {L"00000C0A", 1252, 850, 10000, L"Spanish (International Sort)", L"217", LatinFonts, esESLayouts}, + {L"00000C0A", 1252, 850, 10000, L"Spanish (International Sort)", 217, LatinFonts, esESLayouts}, #endif #ifdef LANGUAGE_ES_GT - {L"0000100A", 1252, 850, 10000, L"Spanish (Guatemala)", L"99", LatinFonts, esGTLayouts}, + {L"0000100A", 1252, 850, 10000, L"Spanish (Guatemala)", 99, LatinFonts, esGTLayouts}, #endif #ifdef LANGUAGE_ES_CR - {L"0000140A", 1252, 850, 10000, L"Spanish (Costa Rica)", L"54", LatinFonts, esCRLayouts}, + {L"0000140A", 1252, 850, 10000, L"Spanish (Costa Rica)", 54, LatinFonts, esCRLayouts}, #endif #ifdef LANGUAGE_ES_PA - {L"0000180A", 1252, 850, 10000, L"Spanish (Panama)", L"192", LatinFonts, esPALayouts}, + {L"0000180A", 1252, 850, 10000, L"Spanish (Panama)", 192, LatinFonts, esPALayouts}, #endif #ifdef LANGUAGE_ES_DO - {L"00001C0A", 1252, 850, 10000, L"Spanish (Dominican Republic)", L"65", LatinFonts, esDOLayouts}, + {L"00001C0A", 1252, 850, 10000, L"Spanish (Dominican Republic)", 65, LatinFonts, esDOLayouts}, #endif #ifdef LANGUAGE_ES_VE - {L"0000200A", 1252, 850, 10000, L"Spanish (Venezuela)", L"249", LatinFonts, esVELayouts}, + {L"0000200A", 1252, 850, 10000, L"Spanish (Venezuela)", 249, LatinFonts, esVELayouts}, #endif #ifdef LANGUAGE_ES_CO - {L"0000240A", 1252, 850, 10000, L"Spanish (Colombia)", L"51", LatinFonts, esCOLayouts}, + {L"0000240A", 1252, 850, 10000, L"Spanish (Colombia)", 51, LatinFonts, esCOLayouts}, #endif #ifdef LANGUAGE_ES_PE - {L"0000280A", 1252, 850, 10000, L"Spanish (Peru)", L"187", LatinFonts, esPELayouts}, + {L"0000280A", 1252, 850, 10000, L"Spanish (Peru)", 187, LatinFonts, esPELayouts}, #endif #ifdef LANGUAGE_ES_AR - {L"00002C0A", 1252, 850, 10000, L"Spanish (Argentina)", L"11", LatinFonts, esARLayouts}, + {L"00002C0A", 1252, 850, 10000, L"Spanish (Argentina)", 11, LatinFonts, esARLayouts}, #endif #ifdef LANGUAGE_ES_EC - {L"0000300A", 1252, 850, 10000, L"Spanish (Ecuador)", L"66", LatinFonts, esECLayouts}, + {L"0000300A", 1252, 850, 10000, L"Spanish (Ecuador)", 66, LatinFonts, esECLayouts}, #endif #ifdef LANGUAGE_ES_CL - {L"0000340A", 1252, 850, 10000, L"Spanish (Chile)", L"46", LatinFonts, esCLLayouts}, + {L"0000340A", 1252, 850, 10000, L"Spanish (Chile)", 46, LatinFonts, esCLLayouts}, #endif #ifdef LANGUAGE_ES_UY - {L"0000380A", 1252, 850, 10000, L"Spanish (Uruguay)", L"246", LatinFonts, esUYLayouts}, + {L"0000380A", 1252, 850, 10000, L"Spanish (Uruguay)", 246, LatinFonts, esUYLayouts}, #endif #ifdef LANGUAGE_ES_PY - {L"00003C0A", 1252, 850, 10000, L"Spanish (Paraguay)", L"185", LatinFonts, esPYLayouts}, + {L"00003C0A", 1252, 850, 10000, L"Spanish (Paraguay)", 185, LatinFonts, esPYLayouts}, #endif #ifdef LANGUAGE_ES_BO - {L"0000400A", 1252, 850, 10000, L"Spanish (Bolivia)", L"26", LatinFonts, esBOLayouts}, + {L"0000400A", 1252, 850, 10000, L"Spanish (Bolivia)", 26, LatinFonts, esBOLayouts}, #endif #ifdef LANGUAGE_ES_SV - {L"0000440A", 1252, 850, 10000, L"Spanish (El Salvador)", L"72", LatinFonts, esSVLayouts}, + {L"0000440A", 1252, 850, 10000, L"Spanish (El Salvador)", 72, LatinFonts, esSVLayouts}, #endif #ifdef LANGUAGE_ES_HN - {L"0000480A", 1252, 850, 10000, L"Spanish (Honduras)", L"106", LatinFonts, esHNLayouts}, + {L"0000480A", 1252, 850, 10000, L"Spanish (Honduras)", 106, LatinFonts, esHNLayouts}, #endif #ifdef LANGUAGE_ES_NI - {L"00004C0A", 1252, 850, 10000, L"Spanish (Nicaragua)", L"182", LatinFonts, esNILayouts}, + {L"00004C0A", 1252, 850, 10000, L"Spanish (Nicaragua)", 182, LatinFonts, esNILayouts}, #endif #ifdef LANGUAGE_ES_PR - {L"0000500A", 1252, 850, 10000, L"Spanish (Puerto Rico)", L"202", LatinFonts, esPRLayouts}, + {L"0000500A", 1252, 850, 10000, L"Spanish (Puerto Rico)", 202, LatinFonts, esPRLayouts}, #endif #ifdef LANGUAGE_SW_KE - {L"00000441", 1252, 437, 10000, L"Swahili", L"129", LatinFonts, swKELayouts}, + {L"00000441", 1252, 437, 10000, L"Swahili", 129, LatinFonts, swKELayouts}, #endif #ifdef LANGUAGE_SV_SE - {L"0000041D", 1252, 850, 10000, L"Swedish", L"221", LatinFonts, svSELayouts}, + {L"0000041D", 1252, 850, 10000, L"Swedish", 221, LatinFonts, svSELayouts}, #endif #ifdef LANGUAGE_SV_FI - {L"0000081D", 1252, 850, 10000, L"Swedish (Finland)", L"77", LatinFonts, svFILayouts}, + {L"0000081D", 1252, 850, 10000, L"Swedish (Finland)", 77, LatinFonts, svFILayouts}, #endif #ifdef LANGUAGE_SYR_SY - {L"0000045A", 0, 1, 2, L"Syriac (Syria)", L"222", UnicodeFonts, syrSYLayouts}, + {L"0000045A", 0, 1, 2, L"Syriac (Syria)", 222, UnicodeFonts, syrSYLayouts}, #endif #ifdef LANGUAGE_TA_IN - {L"00000449", 0, 1, 2, L"Tamil", L"113", UnicodeFonts, taINLayouts}, + {L"00000449", 0, 1, 2, L"Tamil", 113, UnicodeFonts, taINLayouts}, #endif #ifdef LANGUAGE_TT_TA - {L"00000444", 1251, 866, 10007, L"Tatar", L"1", CyrillicFonts, ttTALayouts}, + {L"00000444", 1251, 866, 10007, L"Tatar", 1, CyrillicFonts, ttTALayouts}, #endif #ifdef LANGUAGE_TE_IN - {L"0000044A", 0, 1, 2, L"Telugu (India)", L"113", UnicodeFonts, teINLayouts}, + {L"0000044A", 0, 1, 2, L"Telugu (India)", 113, UnicodeFonts, teINLayouts}, #endif #ifdef LANGUAGE_TH_TH - {L"0000041E", 874, 874, 10021, L"Thai", L"227", UnicodeFonts, thTHLayouts}, + {L"0000041E", 874, 874, 10021, L"Thai", 227, UnicodeFonts, thTHLayouts}, #endif #ifdef LANGUAGE_TR_TR - {L"0000041F", 1254, 857, 10081, L"Turkish", L"235", LatinFonts, trTRLayouts}, + {L"0000041F", 1254, 857, 10081, L"Turkish", 235, LatinFonts, trTRLayouts}, #endif #ifdef LANGUAGE_UK_UA - {L"00000422", 1251, 866, 10017, L"Ukrainian", L"241", CyrillicFonts, ukUALayouts}, + {L"00000422", 1251, 866, 10017, L"Ukrainian", 241, CyrillicFonts, ukUALayouts}, #endif #ifdef LANGUAGE_UR_PK - {L"00000420", 1256, 720, 10004, L"Urdu", L"190", UnicodeFonts, urPKLayouts}, + {L"00000420", 1256, 720, 10004, L"Urdu", 190, UnicodeFonts, urPKLayouts}, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000443", 1254, 857, 10029, L"Uzbek (Latin)", L"247", LatinFonts, uzUZLayouts}, + {L"00000443", 1254, 857, 10029, L"Uzbek (Latin)", 247, LatinFonts, uzUZLayouts}, #endif #ifdef LANGUAGE_UZ_UZ - {L"00000843", 1251, 866, 10007, L"Uzbek (Cyrillic)", L"247", CyrillicFonts, uzUZLayouts}, + {L"00000843", 1251, 866, 10007, L"Uzbek (Cyrillic)", 247, CyrillicFonts, uzUZLayouts}, #endif #ifdef LANGUAGE_VI_VN - {L"0000042A", 1258, 1258, 10000, L"Vietnamese", L"251", UnicodeFonts, viVNLayouts}, + {L"0000042A", 1258, 1258, 10000, L"Vietnamese", 251, UnicodeFonts, viVNLayouts}, #endif #ifdef LANGUAGE_WA_BE - {L"00000490", 1252, 850, 10000, L"Walon", L"21", LatinFonts, waBELayouts}, + {L"00000490", 1252, 850, 10000, L"Walon", 21, LatinFonts, waBELayouts}, #endif #ifdef LANGUAGE_ZU_ZU - {L"00000435", 1252, 850, 10000, L"Zulu", L"1", LatinFonts, zuZULayouts}, + {L"00000435", 1252, 850, 10000, L"Zulu", 1, LatinFonts, zuZULayouts}, #endif - {NULL, 0, 0, 0, NULL, NULL, NULL, NULL} + {NULL, 0, 0, 0, NULL, 0, NULL, NULL} }; diff --git a/base/setup/lib/settings.c b/base/setup/lib/settings.c index 92670a12e7e..09d3c240fb4 100644 --- a/base/setup/lib/settings.c +++ b/base/setup/lib/settings.c @@ -1346,12 +1346,20 @@ ProcessKeyboardLayoutFiles( BOOLEAN SetGeoID( - IN PCWSTR Id) + _In_ GEOID GeoId) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; HANDLE KeyHandle; + /* + * Buffer big enough to hold the NULL-terminated string L"4294967295", + * corresponding to the literal 0xFFFFFFFF (MAXULONG) in decimal. + */ + WCHAR Value[sizeof("4294967295")]; + + Status = RtlStringCchPrintfW(Value, _countof(Value), L"%lu", GeoId); + ASSERT(NT_SUCCESS(Status)); RtlInitUnicodeString(&Name, L".DEFAULT\\Control Panel\\International\\Geo"); @@ -1360,9 +1368,9 @@ SetGeoID( OBJ_CASE_INSENSITIVE, GetRootKeyByPredefKey(HKEY_USERS, NULL), NULL); - Status = NtOpenKey(&KeyHandle, - KEY_SET_VALUE, - &ObjectAttributes); + Status = NtOpenKey(&KeyHandle, + KEY_SET_VALUE, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT1("NtOpenKey() failed (Status %lx)\n", Status); @@ -1374,12 +1382,12 @@ SetGeoID( &Name, 0, REG_SZ, - (PVOID)Id, - (wcslen(Id) + 1) * sizeof(WCHAR)); + (PVOID)Value, + (wcslen(Value) + 1) * sizeof(WCHAR)); NtClose(KeyHandle); if (!NT_SUCCESS(Status)) { - DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status); + DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status); return FALSE; } diff --git a/base/setup/lib/settings.h b/base/setup/lib/settings.h index 9c46123e434..e77f15684c0 100644 --- a/base/setup/lib/settings.h +++ b/base/setup/lib/settings.h @@ -85,7 +85,7 @@ ProcessLocaleRegistry( BOOLEAN SetGeoID( - IN PCWSTR Id); + _In_ GEOID GeoId); BOOLEAN SetDefaultPagefile(

11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs