Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[ashaposhnikov] 75384: [RAPPS] Improvements & multiple selections - Improved translations view - storing LCIDs now - Added checkboxes on list view and Select All button (although they do nothing ju...
by ashaposhnikov＠svn.reactos.org 20 Jul '17

20 Jul '17

Author: ashaposhnikov Date: Thu Jul 20 22:57:48 2017 New Revision: 75384 URL: http://svn.reactos.org/svn/reactos?rev=75384&view=rev Log: [RAPPS] Improvements & multiple selections - Improved translations view - storing LCIDs now - Added checkboxes on list view and Select All button (although they do nothing just yet) - Made download dialogs nonmodal (yay, download and install multiple apps at once!) - Minor code improvements Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -84,23 +84,30 @@ // Parse parameter string ATL::CStringW m_szLocale; + int iLCID; for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i) { - if (szBuffer[i] != cDelimiter) + if (szBuffer[i] != cDelimiter && szBuffer[i] != L'\n') { m_szLocale += szBuffer[i]; } else { - Languages.Add(m_szLocale); - m_szLocale.Empty(); + if (StrToIntExW(m_szLocale.GetString(), STIF_DEFAULT, &iLCID)) + { + Languages.Add(static_cast<LCID>(iLCID)); + m_szLocale.Empty(); + } } } // For the text after delimiter if (!m_szLocale.IsEmpty()) { - Languages.Add(m_szLocale); + if (StrToIntExW(m_szLocale.GetString(), STIF_DEFAULT, &iLCID)) + { + Languages.Add(static_cast<LCID>(iLCID)); + } } m_HasLanguageInfo = TRUE; @@ -120,12 +127,7 @@ } } -BOOL CAvailableApplicationInfo::HasLanguageInfo() const -{ - return m_HasLanguageInfo; -} - -BOOL CAvailableApplicationInfo::HasNativeLanguage() const +BOOL CAvailableApplicationInfo::FindInLanguages(LCID what) const { if (!m_HasLanguageInfo) { @@ -136,7 +138,7 @@ const INT nLanguagesSize = Languages.GetSize(); for (INT i = 0; i < nLanguagesSize; ++i) { - if (Languages[i] == CConfigParser::GetLocale()) + if (Languages[i] == what) { return TRUE; } @@ -145,39 +147,19 @@ return FALSE; } +BOOL CAvailableApplicationInfo::HasLanguageInfo() const +{ + return m_HasLanguageInfo; +} + +BOOL CAvailableApplicationInfo::HasNativeLanguage() const +{ + return FindInLanguages(GetUserDefaultLCID()); +} + BOOL CAvailableApplicationInfo::HasEnglishLanguage() const { - static ATL::CStringW szEnglishLocaleID; - const INT cchLocaleSize = m_Parser.GetLocaleSize(); - if (!m_HasLanguageInfo) - { - return FALSE; - } - - //Get English locale code - if (szEnglishLocaleID.IsEmpty()) - { - INT result = GetLocaleInfoW(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_ILANGUAGE, - szEnglishLocaleID.GetBuffer(cchLocaleSize), cchLocaleSize); - szEnglishLocaleID.ReleaseBuffer(); - if (result != ERROR_SUCCESS) - { - return FALSE; - } - - } - - //Find locale code in the list - const INT nLanguagesSize = Languages.GetSize(); - for (INT i = 0; i < nLanguagesSize; ++i) - { - if (Languages[i] == szEnglishLocaleID) - { - return TRUE; - } - } - - return FALSE; + return FindInLanguages(MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), SORT_DEFAULT)); } BOOL CAvailableApplicationInfo::IsInstalled() const @@ -397,7 +379,7 @@ // CAvailableApps // CConfigParser -ATL::CStringW CConfigParser::m_szLocale; +ATL::CStringW CConfigParser::m_szLocaleID; ATL::CStringW CConfigParser::m_szCachedINISectionLocale; ATL::CStringW CConfigParser::m_szCachedINISectionLocaleNeutral; @@ -410,7 +392,7 @@ ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) { ATL::CStringW szDir; - static ATL::CStringW szBuffer; + ATL::CStringW szBuffer; GetStorageDirectory(szDir); szBuffer.Format(L"%ls\\rapps\\%ls", szDir, FileName); @@ -420,24 +402,25 @@ VOID CConfigParser::CacheINILocaleLazy() { - if (m_szLocale.IsEmpty()) + if (m_szLocaleID.IsEmpty()) { // 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(LOCALE_USER_DEFAULT, LOCALE_ILANGUAGE, - m_szLocale.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); - m_szLocale.ReleaseBuffer(); - m_szCachedINISectionLocale = L"Section." + m_szLocale; + 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 - m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale + m_szLocale.Right(2); + m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale + m_szLocaleID.Right(2); } } const ATL::CStringW& CConfigParser::GetLocale() { CacheINILocaleLazy(); - return m_szLocale; + return m_szLocaleID; } INT CConfigParser::GetLocaleSize() @@ -486,8 +469,6 @@ UINT CConfigParser::GetInt(const ATL::CStringW& KeyName) { ATL::CStringW Buffer; - UNICODE_STRING BufferW; - ULONG Result; // grab the text version of our entry if (!GetString(KeyName, Buffer)) @@ -497,9 +478,8 @@ return FALSE; // convert it to an actual integer - RtlInitUnicodeString(&BufferW, Buffer.GetString()); - RtlUnicodeStringToInteger(&BufferW, 0, &Result); - - return (UINT) Result; -} -// CConfigParser + int result = StrToIntW(Buffer.GetString()); + + return (UINT) (result <= 0) ? 0 : result; +} +// CConfigParser Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -179,6 +179,7 @@ WCHAR szInstallBtn[MAX_STR_LEN]; WCHAR szUninstallBtn[MAX_STR_LEN]; WCHAR szModifyBtn[MAX_STR_LEN]; + WCHAR szSelectAll[MAX_STR_LEN]; VOID AddImageToImageList(HIMAGELIST hImageList, UINT ImageIndex) { @@ -217,6 +218,7 @@ AddImageToImageList(hImageList, IDI_INSTALL); AddImageToImageList(hImageList, IDI_UNINSTALL); AddImageToImageList(hImageList, IDI_MODIFY); + AddImageToImageList(hImageList, IDI_CHECK_ALL); AddImageToImageList(hImageList, IDI_REFRESH); AddImageToImageList(hImageList, IDI_UPDATE_DB); AddImageToImageList(hImageList, IDI_SETTINGS); @@ -272,17 +274,19 @@ { 0, ID_INSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szInstallBtn }, { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szUninstallBtn }, { 2, ID_MODIFY, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, (INT_PTR) szModifyBtn }, - { 5, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, - { 3, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - { 4, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0}, - { 5, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, - { 5, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, - { 6, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 } + { 3, ID_CHECK_ALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE,{0}, 0, (INT_PTR) szSelectAll}, + {-1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, + { 4, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 5, ID_RESETDB, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + {-1, 0, TBSTATE_ENABLED, BTNS_SEP, { 0 }, 0, 0 }, + { 6, ID_SETTINGS, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, + { 7, ID_EXIT, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, { 0 }, 0, 0 }, }; LoadStringW(hInst, IDS_INSTALL, szInstallBtn, _countof(szInstallBtn)); LoadStringW(hInst, IDS_UNINSTALL, szUninstallBtn, _countof(szUninstallBtn)); LoadStringW(hInst, IDS_MODIFY, szModifyBtn, _countof(szModifyBtn)); + LoadStringW(hInst, IDS_SELECT_ALL, szSelectAll, _countof(szSelectAll)); m_hWnd = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | TBSTYLE_LIST, @@ -324,6 +328,7 @@ int iSubItem; }; + BOOL HasAllChecked; public: BOOL bAscending; @@ -443,11 +448,20 @@ HWND hwnd = CListView::Create(hwndParent, r, NULL, style, WS_EX_CLIENTEDGE, menu); if (hwnd) - SetExtendedListViewStyle(LVS_EX_FULLROWSELECT); + { + SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT ); + } return hwnd; } + VOID CheckAll() + { + if (HasAllChecked) + { + + } + } }; class CSideTreeView : @@ -558,8 +572,8 @@ SearchEnabled(FALSE) { } + private: - VOID InitApplicationsList(VOID) { ATL::CStringW szText; @@ -574,7 +588,8 @@ szText.LoadStringW(hInst, IDS_APP_DESCRIPTION); m_ListView->AddColumn(3, szText, 250, LVCFMT_LEFT); - //UpdateApplicationsList(ENUM_ALL_COMPONENTS); + // Unnesesary since the list updates on every TreeView selection + // UpdateApplicationsList(ENUM_ALL_COMPONENTS); } HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) @@ -1012,7 +1027,7 @@ if (data->hwndFrom == m_ListView->m_hWnd && ((LPNMLISTVIEW) lParam)->iItem != -1) { /* this won't do anything if the program is already installed */ - SendMessage(hwnd, WM_COMMAND, ID_INSTALL, 0); + SendMessageW(hwnd, WM_COMMAND, ID_INSTALL, 0); } } break; @@ -1068,7 +1083,7 @@ if (wParam == SEARCH_TIMER_ID) { ::KillTimer(hwnd, SEARCH_TIMER_ID); - if(SearchEnabled) + if (SearchEnabled) UpdateApplicationsList(-1); } break; @@ -1247,6 +1262,9 @@ case ID_ABOUT: ShowAboutDialog(); + break; + + case ID_CHECK_ALL: break; } } Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -91,7 +91,7 @@ END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Downloading..." FONT 8, "MS Shell Dlg" BEGIN @@ -207,6 +207,8 @@ IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." + IDS_SELECT_ALL "Select/Desellect All" + IDS_INSTALL_SELECTED "Install Selected" END STRINGTABLE Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -602,7 +602,7 @@ return FALSE; case WM_CLOSE: - EndDialog(Dlg, 0); + DestroyWindow(Dlg); return TRUE; default: @@ -622,7 +622,7 @@ WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_INSTALL, AppInfo->szName.GetString()); - DialogBoxW(hInst, + CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG), hMainWnd, DownloadDlgProc); @@ -638,7 +638,7 @@ AppInfo = &IntInfo; - DialogBoxW(hInst, + CreateDialogW(hInst, MAKEINTRESOURCEW(IDD_DOWNLOAD_DIALOG), hMainWnd, DownloadDlgProc); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -101,7 +101,7 @@ ATL::CStringW szUrlSite; ATL::CStringW szUrlDownload; ATL::CStringW szCDPath; - ATL::CSimpleArray<ATL::CStringW> Languages; + ATL::CSimpleArray<LCID> Languages; /* caching mechanism related entries */ ATL::CStringW sFileName; @@ -146,7 +146,7 @@ class CConfigParser { // Loacale names cache - static ATL::CStringW m_szLocale; + static ATL::CStringW m_szLocaleID; const static INT m_cchLocaleSize = 5; static ATL::CStringW m_szCachedINISectionLocale; static ATL::CStringW m_szCachedINISectionLocaleNeutral; @@ -200,6 +200,7 @@ VOID RetrieveInstalledVersion(); VOID RetrieveLanguages(); VOID RetrieveLicenseType(); + inline BOOL FindInLanguages(LCID what) const; }; class CAvailableApps Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.rc [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -22,6 +22,7 @@ IDI_APPUPD ICON "res/appupd.ico" IDI_CATEGORY ICON "res/cat.ico" IDI_UPDATE_DB ICON "res/updatedb.ico" +IDI_CHECK_ALL ICON "res/checksheet.ico" /* Categories */ IDI_CAT_AUDIO ICON "res/cats/audio.ico" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -12,6 +12,7 @@ #define IDI_APPUPD 18 #define IDI_CATEGORY 19 #define IDI_UPDATE_DB 20 +#define IDI_CHECK_ALL 21 /* Icons for categories */ #define IDI_CAT_AUDIO 50 @@ -76,6 +77,7 @@ #define ID_REFRESH 559 #define ID_REGREMOVE 560 #define ID_RESETDB 561 +#define ID_CHECK_ALL 562 /* Strings */ #define IDS_APPTITLE 100 @@ -103,6 +105,8 @@ #define IDS_INTEG_CHECK_FAIL 123 #define IDS_INTERRUPTED_DOWNLOAD 124 #define IDS_UNABLE_TO_WRITE 125 +#define IDS_SELECT_ALL 126 +#define IDS_INSTALL_SELECTED 127 /* Tooltips */ #define IDS_TOOLTIP_INSTALL 200 Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Thu Jul 20 22:57:48 2017 @@ -188,15 +188,15 @@ GetAvailableApps()->UpdateAppsDB(); /* Load the menu hotkeys */ - KeyBrd = LoadAccelerators(NULL, MAKEINTRESOURCE(HOTKEYS)); + KeyBrd = LoadAcceleratorsW(NULL, MAKEINTRESOURCE(HOTKEYS)); /* Message Loop */ while (GetMessage(&Msg, NULL, 0, 0)) { - if (!TranslateAccelerator(hMainWnd, KeyBrd, &Msg)) + if (!TranslateAcceleratorW(hMainWnd, KeyBrd, &Msg)) { TranslateMessage(&Msg); - DispatchMessage(&Msg); + DispatchMessageW(&Msg); } }

1 0

[spetreolle] 75383: Revert r70669, it was a change in an unused 3rd party file. CORE-10629
by spetreolle＠svn.reactos.org 20 Jul '17

20 Jul '17

Author: spetreolle Date: Thu Jul 20 21:32:16 2017 New Revision: 75383 URL: http://svn.reactos.org/svn/reactos?rev=75383&view=rev Log: Revert r70669, it was a change in an unused 3rd party file. CORE-10629 Modified: trunk/reactos/dll/opengl/mesa/main/vsnprintf.c Modified: trunk/reactos/dll/opengl/mesa/main/vsnprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/vsnpr… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/vsnprintf.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/vsnprintf.c [iso-8859-1] Thu Jul 20 21:32:16 2017 @@ -150,16 +150,15 @@ va_dcl #endif { - int nchar; va_list ap; #if __STDC__ va_start(ap, fmt); #else va_start(ap); #endif - nchar = vsnprintf(str, n, fmt, ap) + + return (vsnprintf(str, n, fmt, ap)); va_end(ap); - return (nchar); }

1 0

[jimtabor] 75382: [NtUser] - Patch by Huw Davies : Explicitly set last error to ERROR_SUCCESS. - Remove hack and added a note.
by jimtabor＠svn.reactos.org 20 Jul '17

20 Jul '17

Author: jimtabor Date: Thu Jul 20 20:26:14 2017 New Revision: 75382 URL: http://svn.reactos.org/svn/reactos?rev=75382&view=rev Log: [NtUser] - Patch by Huw Davies : Explicitly set last error to ERROR_SUCCESS. - Remove hack and added a note. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Jul 20 20:26:14 2017 @@ -4158,6 +4158,7 @@ mt.TopMenu->TimeToHide = FALSE; } + EngSetLastError( ERROR_SUCCESS ); /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; if (executedMenuId == -1) executedMenuId = 0; @@ -4251,7 +4252,7 @@ */ VOID MENU_TrackMouseMenuBar( PWND pWnd, ULONG ht, POINT pt) { - PMENU pMenu = (ht == HTSYSMENU) ? IntGetSystemMenu(pWnd, FALSE) : IntGetMenu( UserHMGetHandle(pWnd) ); + PMENU pMenu = (ht == HTSYSMENU) ? IntGetSystemMenu(pWnd, FALSE) : IntGetMenu( UserHMGetHandle(pWnd) ); // See 74276 and CORE-12801 UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", pWnd, ht, pt.x, pt.y); @@ -4383,14 +4384,6 @@ MsqSetStateWindow(pti, MSQ_STATE_MENUOWNER, NULL); pti->MessageQueue->QF_flags &= ~QF_CAPTURELOCKED; co_UserSetCapture(NULL); /* release the capture */ - } - - // - // HACK : Until back trace fault in co_IntUpdateWindows and MENU_TrackMenu. - // - if (EngGetLastError() == ERROR_ACCESS_DENIED) - { - EngSetLastError(NO_ERROR); } MENU_ExitTracking(pWnd, TRUE, wFlags);

1 0

[jimtabor] 75381: [NtUser] - Patch by Fabian Maurer : Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests.
by jimtabor＠svn.reactos.org 20 Jul '17

20 Jul '17

Author: jimtabor Date: Thu Jul 20 19:57:25 2017 New Revision: 75381 URL: http://svn.reactos.org/svn/reactos?rev=75381&view=rev Log: [NtUser] - Patch by Fabian Maurer : Don't send WM_CHAR when a menu gets VK_ESCAPE and add tests. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Jul 20 19:57:25 2017 @@ -3936,7 +3936,6 @@ break; } - IntTranslateKbdMessage(&msg, 0); mt.Pt = msg.pt; if ( (msg.hwnd == mt.CurrentMenu->hWnd) || ((msg.message!=WM_TIMER) && (msg.message!=WM_SYSTIMER)) ) @@ -4066,6 +4065,7 @@ } default: + IntTranslateKbdMessage(&msg, 0); break; } break; /* WM_KEYDOWN */

1 0

[jimtabor] 75380: [NtUser] - Patch by Alex Henrie : Tell MENU_SuspendPopup which message to remove.
by jimtabor＠svn.reactos.org 20 Jul '17

20 Jul '17

Author: jimtabor Date: Thu Jul 20 19:46:17 2017 New Revision: 75380 URL: http://svn.reactos.org/svn/reactos?rev=75380&view=rev Log: [NtUser] - Patch by Alex Henrie : Tell MENU_SuspendPopup which message to remove. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Jul 20 19:46:17 2017 @@ -3729,7 +3729,7 @@ * * Handle a VK_LEFT key event in a menu. */ -static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags) +static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags, UINT msg) { PMENU MenuTmp, MenuPrev; UINT PrevCol; @@ -3765,7 +3765,7 @@ /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ - if (!MENU_SuspendPopup(pmt, WM_KEYDOWN)) + if (!MENU_SuspendPopup(pmt, msg)) pmt->CurrentMenu = MENU_ShowSubPopup(pmt->OwnerWnd, pmt->TopMenu, TRUE, Flags); } @@ -3777,7 +3777,7 @@ * * Handle a VK_RIGHT key event in a menu. */ -static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags) +static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags, UINT msg) { PMENU menutmp; UINT NextCol; @@ -3822,7 +3822,7 @@ if ( menutmp || pmt->TrackFlags & TF_SUSPENDPOPUP ) { - if ( !MENU_SuspendPopup(pmt, WM_KEYDOWN) ) + if ( !MENU_SuspendPopup(pmt, msg) ) pmt->CurrentMenu = MENU_ShowSubPopup(pmt->OwnerWnd, pmt->TopMenu, TRUE, Flags); } } @@ -4038,11 +4038,11 @@ break; case VK_LEFT: - MENU_KeyLeft( &mt, wFlags ); + MENU_KeyLeft( &mt, wFlags, msg.message ); break; case VK_RIGHT: - MENU_KeyRight( &mt, wFlags ); + MENU_KeyRight( &mt, wFlags, msg.message ); break; case VK_ESCAPE:

1 0

[jimtabor] 75379: [NtUser] - Remove unused code and reintegrate wine code.
by jimtabor＠svn.reactos.org 20 Jul '17

20 Jul '17

Author: jimtabor Date: Thu Jul 20 19:40:17 2017 New Revision: 75379 URL: http://svn.reactos.org/svn/reactos?rev=75379&view=rev Log: [NtUser] - Remove unused code and reintegrate wine code. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Jul 20 19:40:17 2017 @@ -56,10 +56,7 @@ #define MII_STATE_MASK (MFS_GRAYED|MFS_CHECKED|MFS_HILITE|MFS_DEFAULT) #define IS_SYSTEM_MENU(MenuInfo) \ - (0 == ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_SYSTEM_POPUP(MenuInfo) \ - (0 != ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) + (!((MenuInfo)->fFlags & MNF_POPUP) && ((MenuInfo)->fFlags & MNF_SYSMENU)) #define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) @@ -2200,6 +2197,7 @@ BOOL flat_menu = FALSE; int bkgnd; UINT arrow_bitmap_width = 0; + //RECT bmprc; if (!menuBar) { arrow_bitmap_width = gpsi->oembmi[OBI_MNARROW].cx; @@ -2356,7 +2354,7 @@ rc.left++; rc.right--; - rc.top += SEPARATOR_HEIGHT / 2; + rc.top = ( rc.top + rc.bottom) / 2; if (flat_menu) { oldPen = NtGdiSelectPen( hdc, NtGdiGetStockObject(DC_PEN) ); @@ -2369,7 +2367,6 @@ DrawEdge (hdc, &rc, EDGE_ETCHED, BF_TOP); return; } - #if 0 /* helper lines for debugging */ /* This is a very good test tool when hacking menus! (JT) 07/16/2006 */ @@ -2379,7 +2376,33 @@ GreMoveTo(hdc, rect.left, (rect.top + rect.bottom) / 2, NULL); NtGdiLineTo(hdc, rect.right, (rect.top + rect.bottom) / 2); #endif - +#if 0 // breaks mdi menu bar icons. + if (lpitem->hbmp) { + /* calculate the bitmap rectangle in coordinates relative + * to the item rectangle */ + if( menuBar) { + if( lpitem->hbmp == HBMMENU_CALLBACK) + bmprc.left = 3; + else + bmprc.left = lpitem->Xlpstr ? MenuCharSize.cx : 0; + } + else if ((Menu->fFlags & MNS_STYLE_MASK) & MNS_NOCHECK) + bmprc.left = 4; + else if ((Menu->fFlags & MNS_STYLE_MASK) & MNS_CHECKORBMP) + bmprc.left = 2; + else + bmprc.left = 4 + UserGetSystemMetrics(SM_CXMENUCHECK); + + bmprc.right = bmprc.left + lpitem->cxBmp; + + if( menuBar && !(lpitem->hbmp == HBMMENU_CALLBACK)) + bmprc.top = 0; + else + bmprc.top = (rect.bottom - rect.top - lpitem->cyBmp) / 2; + + bmprc.bottom = bmprc.top + lpitem->cyBmp; + } +#endif if (!menuBar) { HBITMAP bm; @@ -2411,28 +2434,22 @@ { RECT r; r = rect; - r.right = r.left + UserGetSystemMetrics(SM_CXMENUCHECK); + r.right = r.left + check_bitmap_width; DrawFrameControl( hdc, &r, DFC_MENU, (lpitem->fType & MFT_RADIOCHECK) ? DFCS_MENUBULLET : DFCS_MENUCHECK); checked = TRUE; } } - if ( lpitem->hbmp )//&& !( checked && (Menu->dwStyle & MNS_CHECKORBMP))) + if ( lpitem->hbmp )//&& !( checked && ((Menu->fFlags & MNS_STYLE_MASK) & MNS_CHECKORBMP))) { - RECT bmpRect; - //CopyRect(&bmpRect, &rect); - bmpRect = rect; + RECT bmpRect = rect; if (!((Menu->fFlags & MNS_STYLE_MASK) & MNS_CHECKORBMP) && !((Menu->fFlags & MNS_STYLE_MASK) & MNS_NOCHECK)) bmpRect.left += check_bitmap_width + 2; if (!(checked && ((Menu->fFlags & MNS_STYLE_MASK) & MNS_CHECKORBMP))) { - //POINT origorg; bmpRect.right = bmpRect.left + lpitem->cxBmp; - /* some applications make this assumption on the DC's origin */ - //SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); MENU_DrawBitmapItem(hdc, lpitem, &bmpRect, Menu, WndOwner, odaction, menuBar); - //SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); } } /* Draw the popup-menu arrow */ @@ -2440,21 +2457,17 @@ { RECT rectTemp; RtlCopyMemory(&rectTemp, &rect, sizeof(RECT)); - rectTemp.left = rectTemp.right - UserGetSystemMetrics(SM_CXMENUCHECK); + rectTemp.left = rectTemp.right - check_bitmap_width; DrawFrameControl(hdc, &rectTemp, DFC_MENU, DFCS_MENUARROW); } rect.left += 4; if( !((Menu->fFlags & MNS_STYLE_MASK) & MNS_NOCHECK)) rect.left += check_bitmap_width; - rect.right -= arrow_bitmap_width;//check_bitmap_width; + rect.right -= arrow_bitmap_width; } else if( lpitem->hbmp) { /* Draw the bitmap */ - //POINT origorg; - - //SetViewportOrgEx( hdc, rect.left, rect.top, &origorg); - MENU_DrawBitmapItem(hdc, lpitem, &rect, Menu, WndOwner, odaction, menuBar); - //SetViewportOrgEx( hdc, origorg.x, origorg.y, NULL); + MENU_DrawBitmapItem(hdc, lpitem, &rect/*bmprc*/, Menu, WndOwner, odaction, menuBar); } /* process text if present */ @@ -2483,14 +2496,12 @@ if( !(lpitem->hbmp == HBMMENU_CALLBACK)) rect.left += MenuCharSize.cx; rect.right -= MenuCharSize.cx; - //rect.left += MENU_BAR_ITEMS_SPACE / 2; - //rect.right -= MENU_BAR_ITEMS_SPACE / 2; } Text = lpitem->Xlpstr; if(Text) { - for (i = 0; L'\0' != Text[i]; i++) + for (i = 0; Text[i]; i++) if (Text[i] == L'\t' || Text[i] == L'\b') break; }

1 0

[spetreolle] 75378: Patch by Mike Swanson : This adds support for Esperanto as a language and a keyboard layout based on the one from X.Org. CORE-11021
by spetreolle＠svn.reactos.org 19 Jul '17

19 Jul '17

Author: spetreolle Date: Wed Jul 19 20:33:58 2017 New Revision: 75378 URL: http://svn.reactos.org/svn/reactos?rev=75378&view=rev Log: Patch by Mike Swanson : This adds support for Esperanto as a language and a keyboard layout based on the one from X.Org. CORE-11021 Added: trunk/reactos/dll/keyboard/kbdeo/ trunk/reactos/dll/keyboard/kbdeo/kbdeo.c (with props) trunk/reactos/dll/keyboard/kbdeo/kbdeo.rc (with props) trunk/reactos/dll/keyboard/kbdeo/kbdeo.spec (with props) trunk/reactos/dll/win32/kernel32/winnls/nls/eoa.nls (with props) Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc trunk/reactos/dll/cpl/input/lang/cs-CZ.rc trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/el-GR.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/input/lang/es-ES.rc trunk/reactos/dll/cpl/input/lang/fr-FR.rc trunk/reactos/dll/cpl/input/lang/he-IL.rc trunk/reactos/dll/cpl/input/lang/it-IT.rc trunk/reactos/dll/cpl/input/lang/no-NO.rc trunk/reactos/dll/cpl/input/lang/pl-PL.rc trunk/reactos/dll/cpl/input/lang/pt-BR.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/cpl/input/lang/ru-RU.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/input/lang/sq-AL.rc trunk/reactos/dll/cpl/input/lang/tr-TR.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/zh-CN.rc trunk/reactos/dll/cpl/input/lang/zh-TW.rc trunk/reactos/dll/cpl/input/resource.h trunk/reactos/dll/keyboard/CMakeLists.txt trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc trunk/reactos/media/inf/intl.inf Modified: trunk/reactos/dll/cpl/input/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/bg-BG.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "Dutch" + IDS_ESPERANTO_LAYOUT "ÐÑÐ¿ÐµÑÐ°Ð½ÑÐ¾" IDS_ESTONIAN_LAYOUT "Estonian" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/cs-CZ.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -165,6 +165,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "DivehÅ¡tina (FonetickÃ¡)" IDS_DIVEHI_TYPEWRITER_LAYOUT "DivehÅ¡tina (PsacÃ stroj)" IDS_DUTCH_LAYOUT "HolandÅ¡tina" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "EstonÅ¡tina" IDS_FAEROESE_LAYOUT "FaerÅ¡tina" IDS_FARSI_LAYOUT "FÃ¡rsÃ" Modified: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi (Phonetisch)" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi (Schreibmaschine)" IDS_DUTCH_LAYOUT "NiederlÃ¤ndisch" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estnisch" IDS_FAEROESE_LAYOUT "FÃ¤rÃ¶isch" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/el-GR.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "Dutch" + IDS_ESPERANTO_LAYOUT "ÎÏÏÎµÏÎ¬Î½ÏÎ¿" IDS_ESTONIAN_LAYOUT "ÎÏÎ¸Î¿Î½Î¹ÎºÎ¬" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "Dutch" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estonian" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/es-ES.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -162,6 +162,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi (fonÃ©tico)" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi (MÃ¡q. de escribir)" IDS_DUTCH_LAYOUT "HolandÃ©s" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estonio" IDS_FAEROESE_LAYOUT "FaroÃ©s" IDS_FARSI_LAYOUT "FarsÃ" Modified: trunk/reactos/dll/cpl/input/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/fr-FR.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -161,6 +161,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi PhonÃ©tique" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "NÃ©Ã©rlandais" + IDS_ESPERANTO_LAYOUT "EspÃ©ranto" IDS_ESTONIAN_LAYOUT "Estonien" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/he-IL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/he-IL.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -162,6 +162,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "×××× ×××ª" + IDS_ESPERANTO_LAYOUT "××¡×¤×¨× ××" IDS_ESTONIAN_LAYOUT "××¡××× ××ª" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "×¤×¨×¡××ª" Modified: trunk/reactos/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/it-IT.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi fonetica" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "Olandese" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estone" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/no-NO.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "Dutch" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estonian" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pl-PL.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -168,6 +168,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Malediwski (Fonetyczny)" IDS_DIVEHI_TYPEWRITER_LAYOUT "Malediwski (Maszynisty)" IDS_DUTCH_LAYOUT "Holenderski" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "EstoÅski" IDS_FAEROESE_LAYOUT "Farerski" IDS_FARSI_LAYOUT "Perski" Modified: trunk/reactos/dll/cpl/input/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/pt-BR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/pt-BR.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi fonÃ©tico" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "HolandÃªs" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estoniano" IDS_FAEROESE_LAYOUT "FaroÃªs" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -162,6 +162,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi (foneticÄ)" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi (dactilograficÄ)" IDS_DUTCH_LAYOUT "OlandezÄ" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "EstonÄ" IDS_FAEROESE_LAYOUT "FeroezÄ" IDS_FARSI_LAYOUT "PersanÄ" Modified: trunk/reactos/dll/cpl/input/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ru-RU.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -160,6 +160,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "ÐÐ¸Ð²Ð¸ÑÐ°Ð¹ ÑÐ¾Ð½ÐµÑÐ¸ÑÐµÑÐºÐ°Ñ" IDS_DIVEHI_TYPEWRITER_LAYOUT "ÐÐ¸Ð²Ð¸ÑÐ°Ð¹ Ð¼Ð°ÑÐ¸Ð½Ð¾Ð¿Ð¸ÑÑ" IDS_DUTCH_LAYOUT "ÐÐ¾Ð»Ð»Ð°Ð½Ð´ÑÐºÐ°Ñ" + IDS_ESPERANTO_LAYOUT "ÐÑÐ¿ÐµÑÐ°Ð½ÑÐ¾" IDS_ESTONIAN_LAYOUT "ÐÑÑÐ¾Ð½ÑÐºÐ°Ñ" IDS_FAEROESE_LAYOUT "Ð¤Ð°ÑÐµÑÑÐºÐ°Ñ" IDS_FARSI_LAYOUT "Ð¤Ð°ÑÑÐ¸" Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -165,6 +165,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "HolandskÃ©" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "EstÃ³nske" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sq-AL.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sq-AL.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -164,6 +164,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi Phonetic" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi Typewriter" IDS_DUTCH_LAYOUT "Hollandeze" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "Estoni" IDS_FAEROESE_LAYOUT "Faeroese" IDS_FARSI_LAYOUT "Farsi" Modified: trunk/reactos/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/tr-TR.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/tr-TR.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -162,6 +162,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "Divehi TÃ¼m Seslik" IDS_DIVEHI_TYPEWRITER_LAYOUT "Divehi YazÄ± Makinesi" IDS_DUTCH_LAYOUT "Hollandaca" + IDS_ESPERANTO_LAYOUT "Esperanto" IDS_ESTONIAN_LAYOUT "EstÃ§e" IDS_FAEROESE_LAYOUT "Faroece" IDS_FARSI_LAYOUT "FarsÃ§a" Modified: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -168,6 +168,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "ÐÐ°Ð»ÑÐ´ÑÐ²ÑÑÐºÐ° (ÑÐ¾Ð½ÐµÑÐ¸ÑÐ½Ð°)" IDS_DIVEHI_TYPEWRITER_LAYOUT "ÐÐ°Ð»ÑÐ´ÑÐ²ÑÑÐºÐ° (Ð´ÑÑÐºÐ°ÑÑÑÐºÐ° Ð¼Ð°ÑÐ¸Ð½ÐºÐ°)" IDS_DUTCH_LAYOUT "ÐÑÐ´ÐµÑÐ»Ð°Ð½Ð´ÑÑÐºÐ°" + IDS_ESPERANTO_LAYOUT "ÐÑÐ¿ÐµÑÐ°Ð½ÑÐ¾" IDS_ESTONIAN_LAYOUT "ÐÑÑÐ¾Ð½ÑÑÐºÐ°" IDS_FAEROESE_LAYOUT "Ð¤Ð°ÑÐµÑÑÑÐºÐ°" IDS_FARSI_LAYOUT "ÐÐµÑÑÑÐºÐ°" Modified: trunk/reactos/dll/cpl/input/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/zh-CN.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -162,6 +162,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "ç¬¬ç»´åè¯æ¼é³" IDS_DIVEHI_TYPEWRITER_LAYOUT "ç¬¬ç»´åè¯å°å·æå" IDS_DUTCH_LAYOUT "è·å°" + IDS_ESPERANTO_LAYOUT "ä¸çè¯" IDS_ESTONIAN_LAYOUT "ç±æ²å°¼äºæ" IDS_FAEROESE_LAYOUT "æ³ç½æ" IDS_FARSI_LAYOUT "æ³¢æ¯æ" Modified: trunk/reactos/dll/cpl/input/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-TW.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/zh-TW.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -162,6 +162,7 @@ IDS_DIVEHI_PHONETIC_LAYOUT "ç¬¬ç¶åèªæ¼é³" IDS_DIVEHI_TYPEWRITER_LAYOUT "ç¬¬ç¶åèªå°å·æå" IDS_DUTCH_LAYOUT "è·è" + IDS_ESPERANTO_LAYOUT "ä¸çèª" IDS_ESTONIAN_LAYOUT "ææ²å°¼äºæ" IDS_FAEROESE_LAYOUT "æ³ç¾æ" IDS_FARSI_LAYOUT "æ³¢æ¯æ" Modified: trunk/reactos/dll/cpl/input/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/resource.h [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -197,3 +197,4 @@ #define IDS_GERMAN_DE_ERGO_LAYOUT 5139 #define IDS_BURMESE_LAYOUT 5140 #define IDS_UKRAINIAN_STUDENT_LAYOUT 5141 +#define IDS_ESPERANTO_LAYOUT 5142 Modified: trunk/reactos/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/CMakeLists.tx… ============================================================================== --- trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/CMakeLists.txt [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -21,6 +21,7 @@ kbdcz1 kbdda kbddv + kbdeo kbdes kbdest kbdfc Added: trunk/reactos/dll/keyboard/kbdeo/kbdeo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdeo/kbdeo.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdeo/kbdeo.c (added) +++ trunk/reactos/dll/keyboard/kbdeo/kbdeo.c [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -0,0 +1,410 @@ +/* + * ReactOS Esperanto Keyboard layout + * Copyright (C) 2003-2016 ReactOS + * License: LGPL, see: LGPL.txt + * + * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php + * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html + * + * Esperanto layout recreated from the X.Org version + */ + +#define WIN32_NO_STATUS +#include <stdarg.h> +#include <windef.h> +#include <winuser.h> +#include <ndk/kbd.h> + +#ifdef _M_IA64 +#define ROSDATA static __declspec(allocate(".data")) +#else +#ifdef _MSC_VER +#pragma data_seg(".data") +#define ROSDATA static +#else +#define ROSDATA static __attribute__((section(".data"))) +#endif +#endif + +#define VK_EMPTY 0xff /* The non-existent VK */ + +#define KNUMS KBDNUMPAD|KBDSPECIAL /* Special + number pad */ +#define KMEXT KBDEXT|KBDMULTIVK /* Multi + ext */ + +ROSDATA USHORT scancode_to_vk[] = { + /* Numbers Row */ + /* - 00 - */ + /* 1 ... 2 ... 3 ... 4 ... */ + VK_EMPTY, VK_ESCAPE, '1', '2', + '3', '4', '5', '6', + '7', '8', '9', '0', + VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + /* - 0f - */ + /* First Letters Row */ + VK_TAB, 'Q', 'W', 'E', + 'R', 'T', 'Y', 'U', + 'I', 'O', 'P', + VK_OEM_4, VK_OEM_6, VK_RETURN, + /* - 1d - */ + /* Second Letters Row */ + VK_LCONTROL, + 'A', 'S', 'D', 'F', + 'G', 'H', 'J', 'K', + 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + VK_LSHIFT, VK_OEM_5, + /* - 2c - */ + /* Third letters row */ + 'Z', 'X', 'C', 'V', + 'B', 'N', 'M', VK_OEM_COMMA, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, + /* - 37 - */ + /* Bottom Row */ + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, + + /* - 3b - */ + /* F-Keys */ + VK_F1, VK_F2, VK_F3, VK_F4, VK_F5, VK_F6, + VK_F7, VK_F8, VK_F9, VK_F10, + /* - 45 - */ + /* Locks */ + VK_NUMLOCK | KMEXT, + VK_SCROLL | KBDMULTIVK, + /* - 47 - */ + /* Number-Pad */ + VK_HOME | KNUMS, VK_UP | KNUMS, VK_PRIOR | KNUMS, VK_SUBTRACT, + VK_LEFT | KNUMS, VK_CLEAR | KNUMS, VK_RIGHT | KNUMS, VK_ADD, + VK_END | KNUMS, VK_DOWN | KNUMS, VK_NEXT | KNUMS, + VK_INSERT | KNUMS, VK_DELETE | KNUMS, + /* - 54 - */ + /* Presumably PrtSc */ + VK_SNAPSHOT, + /* - 55 - */ + /* Oddities, and the remaining standard F-Keys */ + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, + /* - 59 - */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ + VK_HELP, + /* - 64 - */ + /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ + VK_F13, VK_F14, VK_F15, VK_F16, VK_F17, VK_F18, VK_F19, VK_F20, + VK_F21, VK_F22, VK_F23, + /* - 6f - */ + /* Not sure who uses these codes */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 72 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + /* - 76 - */ + /* One more f-key */ + VK_F24, + /* - 77 - */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, + /* - 80 - */ + 0 +}; + +ROSDATA VSC_VK extcode0_to_vk[] = { + { 0x10, VK_MEDIA_PREV_TRACK | KBDEXT }, + { 0x19, VK_MEDIA_NEXT_TRACK | KBDEXT }, + { 0x1D, VK_RCONTROL | KBDEXT }, + { 0x20, VK_VOLUME_MUTE | KBDEXT }, + { 0x21, VK_LAUNCH_APP2 | KBDEXT }, + { 0x22, VK_MEDIA_PLAY_PAUSE | KBDEXT }, + { 0x24, VK_MEDIA_STOP | KBDEXT }, + { 0x2E, VK_VOLUME_DOWN | KBDEXT }, + { 0x30, VK_VOLUME_UP | KBDEXT }, + { 0x32, VK_BROWSER_HOME | KBDEXT }, + { 0x35, VK_DIVIDE | KBDEXT }, + { 0x37, VK_SNAPSHOT | KBDEXT }, + { 0x38, VK_RMENU | KBDEXT }, + { 0x47, VK_HOME | KBDEXT }, + { 0x48, VK_UP | KBDEXT }, + { 0x49, VK_PRIOR | KBDEXT }, + { 0x4B, VK_LEFT | KBDEXT }, + { 0x4D, VK_RIGHT | KBDEXT }, + { 0x4F, VK_END | KBDEXT }, + { 0x50, VK_DOWN | KBDEXT }, + { 0x51, VK_NEXT | KBDEXT }, + { 0x52, VK_INSERT | KBDEXT }, + { 0x53, VK_DELETE | KBDEXT }, + { 0x5B, VK_LWIN | KBDEXT }, + { 0x5C, VK_RWIN | KBDEXT }, + { 0x5D, VK_APPS | KBDEXT }, + { 0x5F, VK_SLEEP | KBDEXT }, + { 0x65, VK_BROWSER_SEARCH | KBDEXT }, + { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, + { 0x67, VK_BROWSER_REFRESH | KBDEXT }, + { 0x68, VK_BROWSER_STOP | KBDEXT }, + { 0x69, VK_BROWSER_FORWARD | KBDEXT }, + { 0x6A, VK_BROWSER_BACK | KBDEXT }, + { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, + { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, + { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, + { 0x1C, VK_RETURN | KBDEXT }, + { 0x46, VK_CANCEL | KBDEXT }, + { 0, 0 }, +}; + +ROSDATA VSC_VK extcode1_to_vk[] = { + { 0x1d, VK_PAUSE }, + { 0, 0 }, +}; + +ROSDATA VK_TO_BIT modifier_keys[] = { + { VK_SHIFT, KBDSHIFT }, + { VK_CONTROL, KBDCTRL }, + { VK_MENU, KBDALT }, + { 0, 0 } +}; + +ROSDATA MODIFIERS modifier_bits = { + modifier_keys, + 7, + { + 0, // NONE + 1, // SHIFT + 2, // CTRL + 3, // SHIFT+CTRL + 0, // ALT (not used) + 0, // SHIFT-ALT (not used) + 4, // CTRL-ALT + 5, // SHIFT-CTRL-ALT + } +}; + +ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { + /* Normal vs Shifted */ + /* The alphabet */ + { 'B', CAPLOK, {'b', 'B'} }, + { 'C', CAPLOK, {'c', 'C'} }, + { 'E', CAPLOK, {'e', 'E'} }, + { 'G', CAPLOK, {'g', 'G'} }, + { 'H', CAPLOK, {'h', 'H'} }, + { 'I', CAPLOK, {'i', 'I'} }, + { 'J', CAPLOK, {'j', 'J'} }, + { 'K', CAPLOK, {'k', 'K'} }, + { 'L', CAPLOK, {'l', 'L'} }, + { 'R', CAPLOK, {'r', 'R'} }, + { 'T', CAPLOK, {'t', 'T'} }, + { 'U', CAPLOK, {'u', 'U'} }, + { 'V', CAPLOK, {'v', 'V'} }, + { 'Z', CAPLOK, {'z', 'Z'} }, + /* The numbers */ + { '1', 0, {'1', '!'} }, + { '3', 0, {'3', '#'} }, + { '7', 0, {'7', '&'} }, + { '8', 0, {'8', '*'} }, + { '9', 0, {'9', '('} }, + { '0', 0, {'0', ')'} }, + + /* Specials */ + /* Ctrl-_ generates US */ + { VK_OEM_PLUS, 0, {'=', '+'} }, + { VK_OEM_1, 0, {';', ':'} }, + { VK_OEM_7, 0, {'\'','\"'} }, + { VK_OEM_3, 0, {'`', '~'} }, + { VK_OEM_COMMA, 0, {',', '<'} }, + { VK_OEM_PERIOD, 0, {'.', '>'} }, + { VK_OEM_2, 0, {'/', '?'} }, + /* Keys that do not have shift states */ + { VK_TAB, 0, {'\t','\t'} }, + { VK_ADD, 0, {'+', '+'} }, + { VK_SUBTRACT, 0, {'-', '-'} }, + { VK_DECIMAL, 0, {'.', '.'} }, + { VK_MULTIPLY, 0, {'*', '*'} }, + { VK_DIVIDE, 0, {'/', '/'} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_OEM_102, 0, {'\\','|', 0x1c /* FS */} }, + { VK_BACK, 0, {0x8, 0x8, 0x7F } }, + { VK_ESCAPE, 0, {0x1b,0x1b,0x1b } }, + { VK_RETURN, 0, {'\r','\r','\n'} }, + { VK_SPACE, 0, {' ', ' ', ' '} }, + { VK_CANCEL, 0, {0x3, 0x3, 0x3} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { + /* Normal, Shifted, Ctrl, C-S-x */ + /* Legacy Ascii generators */ + { '2', 0, {'2', '@', WCH_NONE, 0} }, + { '6', 0, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, 0, {'-', '_', WCH_NONE, 0x1f /* US */} }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { + /* Normal, Shifted, Ctrl, C-S-x, AltGr */ + { 'A', 1, {'a', 'A', WCH_NONE, WCH_NONE, 0x2018 /* â */ } }, + { 'S', 1, {'s', 'S', WCH_NONE, WCH_NONE, 0x2019 /* â */ } }, + { 'D', 1, {'d', 'D', WCH_NONE, WCH_NONE, 0x201c /* â */ } }, + { 'F', 1, {'f', 'F', WCH_NONE, WCH_NONE, 0x201d /* â */ } }, + { 'M', 1, {'m', 'M', WCH_NONE, WCH_NONE, 0x2014 /* â */ } }, + { 'N', 1, {'n', 'N', WCH_NONE, WCH_NONE, 0x2013 /* â */ } }, + { 'O', 1, {'o', 'O', WCH_NONE, WCH_NONE, '{' } }, + { 'P', 1, {'p', 'P', WCH_NONE, WCH_NONE, '}' } }, + { '5', 0, {'5', '%', WCH_NONE, WCH_NONE, 0x20ac /* â¬ */ } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { + /* Normal, Shifted, Ctrl, C-S-x, AltGr, Shift-AltGr */ + { 'Q', 5, {0x015d, 0x015c, WCH_NONE, WCH_NONE, 'q', 'Q' /* ÅÅ */ } }, + { 'W', 5, {0x011d, 0x011c, WCH_NONE, WCH_NONE, 'w', 'W' /* ÄÄ */ } }, + { 'X', 5, {0x0109, 0x0108, WCH_NONE, WCH_NONE, 'x', 'X' /* ÄÄ */ } }, + { 'Y', 5, {0x016d, 0x016c, WCH_NONE, WCH_NONE, 'y', 'Y' /* ÅÅ¬ */ } }, + { VK_OEM_4, 1, {0x0135, 0x0134, 0x1b, WCH_NONE, '[', '{', /* ÄµÄ´, ESC */ } }, + { VK_OEM_6, 1, {0x0125, 0x0124, 0x1d, WCH_NONE, ']', '}', /* Ä¥Ä¤, GS */ } }, + { 0, 0 } +}; + +ROSDATA VK_TO_WCHARS1 keypad_numbers[] = { + { VK_NUMPAD0, 0, {'0'} }, + { VK_NUMPAD1, 0, {'1'} }, + { VK_NUMPAD2, 0, {'2'} }, + { VK_NUMPAD3, 0, {'3'} }, + { VK_NUMPAD4, 0, {'4'} }, + { VK_NUMPAD5, 0, {'5'} }, + { VK_NUMPAD6, 0, {'6'} }, + { VK_NUMPAD7, 0, {'7'} }, + { VK_NUMPAD8, 0, {'8'} }, + { VK_NUMPAD9, 0, {'9'} }, + { 0, 0 } +}; + +#define vk_master(n, x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } + +ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1, keypad_numbers), + vk_master(2, key_to_chars_2mod), + vk_master(3, key_to_chars_3mod), + vk_master(4, key_to_chars_4mod), + vk_master(5, key_to_chars_5mod), + vk_master(6, key_to_chars_6mod), + { 0, 0, 0 } +}; + +ROSDATA VSC_LPWSTR key_names[] = { + { 0x01, L"Eskapklavo" }, + { 0x0e, L"RetropaÅo" }, + { 0x0f, L"Tabo" }, + { 0x1c, L"Tirilo" }, + { 0x1d, L"Stirklavo" }, + { 0x2a, L"Majuskliga" }, + { 0x36, L"Dekstra majuskliga" }, + { 0x37, L"Nom *" }, + { 0x38, L"Alt" }, + { 0x39, L"Spaco" }, + { 0x3a, L"Majusklo Ålosi" }, + { 0x3b, L"F1" }, + { 0x3c, L"F2" }, + { 0x3d, L"F3" }, + { 0x3e, L"F4" }, + { 0x3f, L"F5" }, + { 0x40, L"F6" }, + { 0x41, L"F7" }, + { 0x42, L"F8" }, + { 0x43, L"F9" }, + { 0x44, L"F10" }, + { 0x45, L"PaÅzo" }, + { 0x46, L"Rulumi Ålosi" }, + { 0x47, L"Nom 7" }, + { 0x48, L"Nom 8" }, + { 0x49, L"Nom 9" }, + { 0x4a, L"Nom -" }, + { 0x4b, L"Nom 4" }, + { 0x4c, L"Nom 5" }, + { 0x4d, L"Nom 6" }, + { 0x4e, L"Nom +" }, + { 0x4f, L"Nom 1" }, + { 0x50, L"Nom 2" }, + { 0x51, L"Nom 3" }, + { 0x52, L"Nom 0" }, + { 0x53, L"Nom forviÅi" }, + { 0x54, L"Sistemo peto" }, + { 0x56, L"\\" }, + { 0x57, L"F11" }, + { 0x58, L"F12" }, + { 0x7c, L"F13" }, + { 0x7d, L"F14" }, + { 0x7e, L"F15" }, + { 0x7f, L"F16" }, + { 0x80, L"F17" }, + { 0x81, L"F18" }, + { 0x82, L"F19" }, + { 0x83, L"F20" }, + { 0x84, L"F21" }, + { 0x85, L"F22" }, + { 0x86, L"F23" }, + { 0x87, L"F24" }, + { 0, NULL }, +}; + +ROSDATA VSC_LPWSTR extended_key_names[] = { + { 0x1c, L"Nom Tirilo" }, + { 0x1d, L"Dekstra Stirklavo" }, + { 0x35, L"Nom /" }, + { 0x37, L"Presi Ekrano" }, + { 0x38, L"Dekstra Alt" }, + { 0x45, L"Nom Ålosi" }, + { 0x46, L"PaÅzi" }, + { 0x47, L"Hejmo" }, + { 0x48, L"Supren" }, + { 0x49, L"PaÄo Supren" }, + { 0x4a, L"-" }, + { 0x4b, L"Maldekstra" }, + { 0x4d, L"Dekstra" }, + { 0x4f, L"Fino" }, + { 0x50, L"DoÄn" }, + { 0x51, L"PaÄo DoÄn" }, + { 0x52, L"EnigaÄµo" }, + { 0x53, L"ForviÅi" }, + { 0x54, L"<00>" }, + { 0x56, L"Helpo" }, + { 0x5b, L"Maldesktra Windows" }, + { 0x5c, L"Desktra Windows" }, + { 0x5d, L"Apliko" }, + { 0, NULL }, +}; + +/* Finally, the master table */ +ROSDATA KBDTABLES keyboard_layout_table = { + /* modifier assignments */ + &modifier_bits, + + /* character from vk tables */ + vk_to_wchar_master_table, + + /* diacritical marks -- currently implemented by wine code */ + /* Esperanto doesn't have any, anyway */ + NULL, + + /* Key names */ + (VSC_LPWSTR *)key_names, + (VSC_LPWSTR *)extended_key_names, + NULL, /* Dead key names */ + + /* scan code to virtual key maps */ + scancode_to_vk, + sizeof(scancode_to_vk) / sizeof(scancode_to_vk[0]), + extcode0_to_vk, + extcode1_to_vk, + + MAKELONG(KLLF_ALTGR, 1), /* Version 1.0 */ + + /* Ligatures -- Esperanto doesn't have any */ + 0, + 0, + NULL +}; + +PKBDTABLES WINAPI KbdLayerDescriptor(VOID) { + return &keyboard_layout_table; +} Propchange: trunk/reactos/dll/keyboard/kbdeo/kbdeo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdeo/kbdeo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdeo/kbdeo.r… ============================================================================== --- trunk/reactos/dll/keyboard/kbdeo/kbdeo.rc (added) +++ trunk/reactos/dll/keyboard/kbdeo/kbdeo.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Esperanto Keyboard Layout" +#define REACTOS_STR_INTERNAL_NAME "kbdeo" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdeo.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/dll/keyboard/kbdeo/kbdeo.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/keyboard/kbdeo/kbdeo.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdeo/kbdeo.s… ============================================================================== --- trunk/reactos/dll/keyboard/kbdeo/kbdeo.spec (added) +++ trunk/reactos/dll/keyboard/kbdeo/kbdeo.spec [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -0,0 +1 @@ +@ stdcall KbdLayerDescriptor() Propchange: trunk/reactos/dll/keyboard/kbdeo/kbdeo.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -125,6 +125,9 @@ #include "nls/enp.nls" /* 0x3409 LANG_ENGLISH, SUBLANG_ENGLISH_PHILIPPINES */ #pragma code_page(1252) +#include "nls/eoa.nls" /* 0x048F LANG_ESPERANTO, SUBLANG_ESPERANTO */ + +#pragma code_page(1252) #include "nls/esp.nls" /* 0x040a LANG_SPANISH, SUBLANG_SPANISH */ #pragma code_page(1252) #include "nls/esm.nls" /* 0x080a LANG_SPANISH, SUBLANG_SPANISH_MEXICAN */ Added: trunk/reactos/dll/win32/kernel32/winnls/nls/eoa.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/nls/eoa.nls (added) +++ trunk/reactos/dll/win32/kernel32/winnls/nls/eoa.nls [iso-8859-1] Wed Jul 19 20:33:58 2017 @@ -0,0 +1,159 @@ +/* + * Locale definitions for Esperanto + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * Copyright 2016 ReactOS Contributors + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(1252) + +STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0003\x0000\x0000\x4000\x01ff\x003f\x8000\xffff" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "0" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "28593" + LOCALE_IDEFAULTCODEPAGE "437" + LOCALE_IDEFAULTCOUNTRY "0" + LOCALE_IDEFAULTEBCDICCODEPAGE "037" + LOCALE_IDEFAULTLANGUAGE "048F" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28593" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "048F" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "1" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "3" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "AM" + LOCALE_S2359 "PM" + LOCALE_SABBREVCTRYNAME "" + LOCALE_SABBREVDAYNAME1 "lun" + LOCALE_SABBREVDAYNAME2 "mar" + LOCALE_SABBREVDAYNAME3 "mer" + LOCALE_SABBREVDAYNAME4 "\274au" + LOCALE_SABBREVDAYNAME5 "ven" + LOCALE_SABBREVDAYNAME6 "sab" + LOCALE_SABBREVDAYNAME7 "dim" + LOCALE_SABBREVLANGNAME "EO" + LOCALE_SABBREVMONTHNAME1 "jan" + LOCALE_SABBREVMONTHNAME2 "feb" + LOCALE_SABBREVMONTHNAME3 "mar" + LOCALE_SABBREVMONTHNAME4 "apr" + LOCALE_SABBREVMONTHNAME5 "maj" + LOCALE_SABBREVMONTHNAME6 "jun" + LOCALE_SABBREVMONTHNAME7 "jul" + LOCALE_SABBREVMONTHNAME8 "au\370" + LOCALE_SABBREVMONTHNAME9 "sep" + LOCALE_SABBREVMONTHNAME10 "okt" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "" + LOCALE_SCURRENCY "\244" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "lundo" + LOCALE_SDAYNAME2 "mardo" + LOCALE_SDAYNAME3 "merkredo" + LOCALE_SDAYNAME4 "\274a\375do" + LOCALE_SDAYNAME5 "vendredo" + LOCALE_SDAYNAME6 "sabato" + LOCALE_SDAYNAME7 "diman\346o" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "" + LOCALE_SENGCURRNAME "" + LOCALE_SENGLANGUAGE "Esperanto" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "" + LOCALE_SISO3166CTRYNAME "" + LOCALE_SISO639LANGNAME "eo" + LOCALE_SLANGUAGE "Esperanto" + LOCALE_SLIST "," + LOCALE_SLONGDATE "dddd, dd MMMM, yyyy" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "januaro" + LOCALE_SMONTHNAME2 "februaro" + LOCALE_SMONTHNAME3 "marto" + LOCALE_SMONTHNAME4 "aprilo" + LOCALE_SMONTHNAME5 "majo" + LOCALE_SMONTHNAME6 "junio" + LOCALE_SMONTHNAME7 "julio" + LOCALE_SMONTHNAME8 "a\375gusto" + LOCALE_SMONTHNAME9 "septembro" + LOCALE_SMONTHNAME10 "oktobro" + LOCALE_SMONTHNAME11 "novembro" + LOCALE_SMONTHNAME12 "decembro" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," + LOCALE_SNAME "eo-AA" + LOCALE_SNATIVECTRYNAME "" + LOCALE_SNATIVECURRNAME "" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "Esperanto" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Okcidenta e\375ropo kaj Usono" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Centra e\375ropo" + LGRPID_BALTIC+LGRPID_RES_BASE "Balta" + LGRPID_GREEK+LGRPID_RES_BASE "Greka" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cirila" + LGRPID_TURKISH+LGRPID_RES_BASE "Turklingva" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japenese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korea" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Tradicia \346ino" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simpligita \346ino" + LGRPID_THAI+LGRPID_RES_BASE "Taja" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrea" + LGRPID_ARABIC+LGRPID_RES_BASE "Araba" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vjetnama" + LGRPID_INDIC+LGRPID_RES_BASE "Hindiaj" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} Propchange: trunk/reactos/dll/win32/kernel32/winnls/nls/eoa.nls ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/intl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/intl.inf?rev=753… ============================================================================== Binary files - no diff available.

1 0

[dreimer] 75377: [CAROOT] Updates root CAs to recent ones.
by dreimer＠svn.reactos.org 19 Jul '17

19 Jul '17

Author: dreimer Date: Wed Jul 19 19:23:47 2017 New Revision: 75377 URL: http://svn.reactos.org/svn/reactos?rev=75377&view=rev Log: [CAROOT] Updates root CAs to recent ones. Modified: trunk/reactos/boot/bootdata/caroots.inf Modified: trunk/reactos/boot/bootdata/caroots.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/caroots.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/caroots.inf [iso-8859-1] Wed Jul 19 19:23:47 2017 @@ -1,13 +1,90 @@ ; Automatically-generated list of fresh Root CA certificates ; with the data coming from Mozilla's NSS library. ; -- -; Created on 2017-03-20T20:06:35Z UTC with swyter's script. +; Created on 2017-07-19T19:14:29Z UTC with swyter's script. ; Data licensed under MPL 2.0 <https://mozilla.org/MPL/2.0/> [Version] Signature = "$ReactOS$" [AddReg] +; "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1" (1127 bytes) +HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\3143649BECCE27ECED3A3F0B8F0DE4E891DDEECA","Blob",0x00000001,\ + 0x20,0x00,0x00,0x00,\ + 0x01,0x00,0x00,0x00,\ + 0x67,0x04,0x00,0x00,\ + 0x30,0x82,0x04,0x63,0x30,0x82,0x03,0x4B,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x01,\ + 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,0x05,0x00,0x30,\ + 0x81,0xD2,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x54,0x52,0x31,\ + 0x18,0x30,0x16,0x06,0x03,0x55,0x04,0x07,0x13,0x0F,0x47,0x65,0x62,0x7A,0x65,0x20,\ + 0x2D,0x20,0x4B,0x6F,0x63,0x61,0x65,0x6C,0x69,0x31,0x42,0x30,0x40,0x06,0x03,0x55,\ + 0x04,0x0A,0x13,0x39,0x54,0x75,0x72,0x6B,0x69,0x79,0x65,0x20,0x42,0x69,0x6C,0x69,\ + 0x6D,0x73,0x65,0x6C,0x20,0x76,0x65,0x20,0x54,0x65,0x6B,0x6E,0x6F,0x6C,0x6F,0x6A,\ + 0x69,0x6B,0x20,0x41,0x72,0x61,0x73,0x74,0x69,0x72,0x6D,0x61,0x20,0x4B,0x75,0x72,\ + 0x75,0x6D,0x75,0x20,0x2D,0x20,0x54,0x55,0x42,0x49,0x54,0x41,0x4B,0x31,0x2D,0x30,\ + 0x2B,0x06,0x03,0x55,0x04,0x0B,0x13,0x24,0x4B,0x61,0x6D,0x75,0x20,0x53,0x65,0x72,\ + 0x74,0x69,0x66,0x69,0x6B,0x61,0x73,0x79,0x6F,0x6E,0x20,0x4D,0x65,0x72,0x6B,0x65,\ + 0x7A,0x69,0x20,0x2D,0x20,0x4B,0x61,0x6D,0x75,0x20,0x53,0x4D,0x31,0x36,0x30,0x34,\ + 0x06,0x03,0x55,0x04,0x03,0x13,0x2D,0x54,0x55,0x42,0x49,0x54,0x41,0x4B,0x20,0x4B,\ + 0x61,0x6D,0x75,0x20,0x53,0x4D,0x20,0x53,0x53,0x4C,0x20,0x4B,0x6F,0x6B,0x20,0x53,\ + 0x65,0x72,0x74,0x69,0x66,0x69,0x6B,0x61,0x73,0x69,0x20,0x2D,0x20,0x53,0x75,0x72,\ + 0x75,0x6D,0x20,0x31,0x30,0x1E,0x17,0x0D,0x31,0x33,0x31,0x31,0x32,0x35,0x30,0x38,\ + 0x32,0x35,0x35,0x35,0x5A,0x17,0x0D,0x34,0x33,0x31,0x30,0x32,0x35,0x30,0x38,0x32,\ + 0x35,0x35,0x35,0x5A,0x30,0x81,0xD2,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,\ + 0x13,0x02,0x54,0x52,0x31,0x18,0x30,0x16,0x06,0x03,0x55,0x04,0x07,0x13,0x0F,0x47,\ + 0x65,0x62,0x7A,0x65,0x20,0x2D,0x20,0x4B,0x6F,0x63,0x61,0x65,0x6C,0x69,0x31,0x42,\ + 0x30,0x40,0x06,0x03,0x55,0x04,0x0A,0x13,0x39,0x54,0x75,0x72,0x6B,0x69,0x79,0x65,\ + 0x20,0x42,0x69,0x6C,0x69,0x6D,0x73,0x65,0x6C,0x20,0x76,0x65,0x20,0x54,0x65,0x6B,\ + 0x6E,0x6F,0x6C,0x6F,0x6A,0x69,0x6B,0x20,0x41,0x72,0x61,0x73,0x74,0x69,0x72,0x6D,\ + 0x61,0x20,0x4B,0x75,0x72,0x75,0x6D,0x75,0x20,0x2D,0x20,0x54,0x55,0x42,0x49,0x54,\ + 0x41,0x4B,0x31,0x2D,0x30,0x2B,0x06,0x03,0x55,0x04,0x0B,0x13,0x24,0x4B,0x61,0x6D,\ + 0x75,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,0x6B,0x61,0x73,0x79,0x6F,0x6E,0x20,\ + 0x4D,0x65,0x72,0x6B,0x65,0x7A,0x69,0x20,0x2D,0x20,0x4B,0x61,0x6D,0x75,0x20,0x53,\ + 0x4D,0x31,0x36,0x30,0x34,0x06,0x03,0x55,0x04,0x03,0x13,0x2D,0x54,0x55,0x42,0x49,\ + 0x54,0x41,0x4B,0x20,0x4B,0x61,0x6D,0x75,0x20,0x53,0x4D,0x20,0x53,0x53,0x4C,0x20,\ + 0x4B,0x6F,0x6B,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,0x6B,0x61,0x73,0x69,0x20,\ + 0x2D,0x20,0x53,0x75,0x72,0x75,0x6D,0x20,0x31,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,\ + 0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,\ + 0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xAF,0x75,0x30,0x33,0xAA,0xBB,\ + 0x6B,0xD3,0x99,0x2C,0x12,0x37,0x84,0xD9,0x8D,0x7B,0x97,0x80,0xD3,0x6E,0xE7,0xFF,\ + 0x9B,0x50,0x95,0x3E,0x90,0x95,0x56,0x42,0xD7,0x19,0x7C,0x26,0x84,0x8D,0x92,0xFA,\ + 0x01,0x1D,0x3A,0x0F,0xE2,0x64,0x38,0xB7,0x8C,0xBC,0xE8,0x88,0xF9,0x8B,0x24,0xAB,\ + 0x2E,0xA3,0xF5,0x37,0xE4,0x40,0x8E,0x18,0x25,0x79,0x83,0x75,0x1F,0x3B,0xFF,0x6C,\ + 0xA8,0xC5,0xC6,0x56,0xF8,0xB4,0xED,0x8A,0x44,0xA3,0xAB,0x6C,0x4C,0xFC,0x1D,0xD0,\ + 0xDC,0xEF,0x68,0xBD,0xCF,0xE4,0xAA,0xCE,0xF0,0x55,0xF7,0xA2,0x34,0xD4,0x83,0x6B,\ + 0x37,0x7C,0x1C,0xC2,0xFE,0xB5,0x03,0xEC,0x57,0xCE,0xBC,0xB4,0xB5,0xC5,0xED,0x00,\ + 0x0F,0x53,0x37,0x2A,0x4D,0xF4,0x4F,0x0C,0x83,0xFB,0x86,0xCF,0xCB,0xFE,0x8C,0x4E,\ + 0xBD,0x87,0xF9,0xA7,0x8B,0x21,0x57,0x9C,0x7A,0xDF,0x03,0x67,0x89,0x2C,0x9D,0x97,\ + 0x61,0xA7,0x10,0xB8,0x55,0x90,0x7F,0x0E,0x2D,0x27,0x38,0x74,0xDF,0xE7,0xFD,0xDA,\ + 0x4E,0x12,0xE3,0x4D,0x15,0x22,0x02,0xC8,0xE0,0xE0,0xFC,0x0F,0xAD,0x8A,0xD7,0xC9,\ + 0x54,0x50,0xCC,0x3B,0x0F,0xCA,0x16,0x80,0x84,0xD0,0x51,0x56,0xC3,0x8E,0x56,0x7F,\ + 0x89,0x22,0x33,0x2F,0xE6,0x85,0x0A,0xBD,0xA5,0xA8,0x1B,0x36,0xDE,0xD3,0xDC,0x2C,\ + 0x6D,0x3B,0xC7,0x13,0xBD,0x59,0x23,0x2C,0xE6,0xE5,0xA4,0xF7,0xD8,0x0B,0xED,0xEA,\ + 0x90,0x40,0x44,0xA8,0x95,0xBB,0x93,0xD5,0xD0,0x80,0x34,0xB6,0x46,0x78,0x0E,0x1F,\ + 0x00,0x93,0x46,0xE1,0xEE,0xE9,0xF9,0xEC,0x4F,0x17,0x02,0x03,0x01,0x00,0x01,0xA3,\ + 0x42,0x30,0x40,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,0x65,0x3F,\ + 0xC7,0x8A,0x86,0xC6,0x3C,0xDD,0x3C,0x54,0x5C,0x35,0xF8,0x3A,0xED,0x52,0x0C,0x47,\ + 0x57,0xC8,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,\ + 0x01,0x06,0x30,0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,\ + 0x01,0x01,0xFF,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x0B,\ + 0x05,0x00,0x03,0x82,0x01,0x01,0x00,0x2A,0x3F,0xE1,0xF1,0x32,0x8E,0xAE,0xE1,0x98,\ + 0x5C,0x4B,0x5E,0xCF,0x6B,0x1E,0x6A,0x09,0xD2,0x22,0xA9,0x12,0xC7,0x5E,0x57,0x7D,\ + 0x73,0x56,0x64,0x80,0x84,0x7A,0x93,0xE4,0x09,0xB9,0x10,0xCD,0x9F,0x2A,0x27,0xE1,\ + 0x00,0x77,0xBE,0x48,0xC8,0x35,0xA8,0x81,0x9F,0xE4,0xB8,0x2C,0xC9,0x7F,0x0E,0xB0,\ + 0xD2,0x4B,0x37,0x5D,0xEA,0xB9,0xD5,0x0B,0x5E,0x34,0xBD,0xF4,0x73,0x29,0xC3,0xED,\ + 0x26,0x15,0x9C,0x7E,0x08,0x53,0x8A,0x58,0x8D,0xD0,0x4B,0x28,0xDF,0xC1,0xB3,0xDF,\ + 0x20,0xF3,0xF9,0xE3,0xE3,0x3A,0xDF,0xCC,0x9C,0x94,0xD8,0x4E,0x4F,0xC3,0x6B,0x17,\ + 0xB7,0xF7,0x72,0xE8,0xAD,0x66,0x33,0xB5,0x25,0x53,0xAB,0xE0,0xF8,0x4C,0xA9,0x9D,\ + 0xFD,0xF2,0x0D,0xBA,0xAE,0xB9,0xD9,0xAA,0xC6,0x6B,0xF9,0x93,0xBB,0xAE,0xAB,0xB8,\ + 0x97,0x3C,0x03,0x1A,0xBA,0x43,0xC6,0x96,0xB9,0x45,0x72,0x38,0xB3,0xA7,0xA1,0x96,\ + 0x3D,0x91,0x7B,0x7E,0xC0,0x21,0x53,0x4C,0x87,0xED,0xF2,0x0B,0x54,0x95,0x51,0x93,\ + 0xD5,0x22,0xA5,0x0D,0x8A,0xF1,0x93,0x0E,0x3E,0x54,0x0E,0xB0,0xD8,0xC9,0x4E,0xDC,\ + 0xF2,0x31,0x32,0x56,0xEA,0x64,0xF9,0xEA,0xB5,0x9D,0x16,0x66,0x42,0x72,0xF3,0x7F,\ + 0xD3,0xB1,0x31,0x43,0xFC,0xA4,0x8E,0x17,0xF1,0x6D,0x23,0xAB,0x94,0x66,0xF8,0xAD,\ + 0xFB,0x0F,0x08,0x6E,0x26,0x2D,0x7F,0x17,0x07,0x09,0xB2,0x8C,0xFB,0x50,0xC0,0x9F,\ + 0x96,0x8D,0xCF,0xB6,0xFD,0x00,0x9D,0x5A,0x14,0x9A,0xBF,0x02,0x44,0xF5,0xC1,0xC2,\ + 0x9F,0x22,0x5E,0xA2,0x0F,0xA1,0xE3 + ; "LuxTrust Global Root 2" (1479 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\1E0E56190AD18B2598B20444FF668A0417995F3F","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\ @@ -1457,79 +1534,6 @@ 0x81,0x09,0xDC,0x22,0xDC,0xEE,0x8E,0xB9,0xC4,0x8F,0x53,0xE1,0x67,0xBB,0x33,0xB8,\ 0x88,0x15,0x46,0xCF,0xED,0x69,0x35,0xFF,0x75,0x0D,0x46,0xF3,0xCE,0x71,0xE1,0xC5,\ 0x6B,0x86,0x42,0x06,0xB9,0x41 - -; "TÃRKTRUST Elektronik Sertifika Hizmet SaÄlayÄ±cÄ±sÄ± H6" (1066 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\8A5C8CEEA503E60556BAD81BD4F6C9B0EDE52FE0","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0x2A,0x04,0x00,0x00,\ - 0x30,0x82,0x04,0x26,0x30,0x82,0x03,0x0E,0xA0,0x03,0x02,0x01,0x02,0x02,0x06,0x7D,\ - 0xA1,0xF2,0x65,0xEC,0x8A,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,\ - 0x01,0x0B,0x05,0x00,0x30,0x81,0xB1,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,\ - 0x13,0x02,0x54,0x52,0x31,0x0F,0x30,0x0D,0x06,0x03,0x55,0x04,0x07,0x0C,0x06,0x41,\ - 0x6E,0x6B,0x61,0x72,0x61,0x31,0x4D,0x30,0x4B,0x06,0x03,0x55,0x04,0x0A,0x0C,0x44,\ - 0x54,0xC3,0x9C,0x52,0x4B,0x54,0x52,0x55,0x53,0x54,0x20,0x42,0x69,0x6C,0x67,0x69,\ - 0x20,0xC4,0xB0,0x6C,0x65,0x74,0x69,0xC5,0x9F,0x69,0x6D,0x20,0x76,0x65,0x20,0x42,\ - 0x69,0x6C,0x69,0xC5,0x9F,0x69,0x6D,0x20,0x47,0xC3,0xBC,0x76,0x65,0x6E,0x6C,0x69,\ - 0xC4,0x9F,0x69,0x20,0x48,0x69,0x7A,0x6D,0x65,0x74,0x6C,0x65,0x72,0x69,0x20,0x41,\ - 0x2E,0xC5,0x9E,0x2E,0x31,0x42,0x30,0x40,0x06,0x03,0x55,0x04,0x03,0x0C,0x39,0x54,\ - 0xC3,0x9C,0x52,0x4B,0x54,0x52,0x55,0x53,0x54,0x20,0x45,0x6C,0x65,0x6B,0x74,0x72,\ - 0x6F,0x6E,0x69,0x6B,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,0x6B,0x61,0x20,0x48,\ - 0x69,0x7A,0x6D,0x65,0x74,0x20,0x53,0x61,0xC4,0x9F,0x6C,0x61,0x79,0xC4,0xB1,0x63,\ - 0xC4,0xB1,0x73,0xC4,0xB1,0x20,0x48,0x36,0x30,0x1E,0x17,0x0D,0x31,0x33,0x31,0x32,\ - 0x31,0x38,0x30,0x39,0x30,0x34,0x31,0x30,0x5A,0x17,0x0D,0x32,0x33,0x31,0x32,0x31,\ - 0x36,0x30,0x39,0x30,0x34,0x31,0x30,0x5A,0x30,0x81,0xB1,0x31,0x0B,0x30,0x09,0x06,\ - 0x03,0x55,0x04,0x06,0x13,0x02,0x54,0x52,0x31,0x0F,0x30,0x0D,0x06,0x03,0x55,0x04,\ - 0x07,0x0C,0x06,0x41,0x6E,0x6B,0x61,0x72,0x61,0x31,0x4D,0x30,0x4B,0x06,0x03,0x55,\ - 0x04,0x0A,0x0C,0x44,0x54,0xC3,0x9C,0x52,0x4B,0x54,0x52,0x55,0x53,0x54,0x20,0x42,\ - 0x69,0x6C,0x67,0x69,0x20,0xC4,0xB0,0x6C,0x65,0x74,0x69,0xC5,0x9F,0x69,0x6D,0x20,\ - 0x76,0x65,0x20,0x42,0x69,0x6C,0x69,0xC5,0x9F,0x69,0x6D,0x20,0x47,0xC3,0xBC,0x76,\ - 0x65,0x6E,0x6C,0x69,0xC4,0x9F,0x69,0x20,0x48,0x69,0x7A,0x6D,0x65,0x74,0x6C,0x65,\ - 0x72,0x69,0x20,0x41,0x2E,0xC5,0x9E,0x2E,0x31,0x42,0x30,0x40,0x06,0x03,0x55,0x04,\ - 0x03,0x0C,0x39,0x54,0xC3,0x9C,0x52,0x4B,0x54,0x52,0x55,0x53,0x54,0x20,0x45,0x6C,\ - 0x65,0x6B,0x74,0x72,0x6F,0x6E,0x69,0x6B,0x20,0x53,0x65,0x72,0x74,0x69,0x66,0x69,\ - 0x6B,0x61,0x20,0x48,0x69,0x7A,0x6D,0x65,0x74,0x20,0x53,0x61,0xC4,0x9F,0x6C,0x61,\ - 0x79,0xC4,0xB1,0x63,0xC4,0xB1,0x73,0xC4,0xB1,0x20,0x48,0x36,0x30,0x82,0x01,0x22,\ - 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,\ - 0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0x9D,0xB0,0x68,\ - 0xD6,0xE8,0xBD,0x14,0x96,0xA3,0x00,0x0A,0x9A,0xF1,0xF4,0xC7,0xCC,0x91,0x4D,0x71,\ - 0x78,0x77,0xB9,0xF7,0x21,0x26,0x15,0x73,0x51,0x16,0x94,0x09,0x47,0x05,0xE2,0x33,\ - 0xF5,0x68,0x9A,0x35,0xFF,0xDC,0x4B,0x2F,0x32,0xC7,0xB0,0xED,0xE2,0x82,0xE5,0x6F,\ - 0xDA,0xDA,0xEA,0xAC,0xC6,0x06,0xCF,0x25,0x0D,0x41,0x81,0xF6,0xC1,0x38,0x22,0xBD,\ - 0xF9,0xB1,0xA5,0xA6,0xB3,0x01,0xBC,0x3F,0x50,0x17,0x2B,0xF6,0xE9,0x66,0x55,0xD4,\ - 0x33,0xB3,0x5C,0xF8,0x43,0x20,0x78,0x93,0x55,0x16,0x70,0x19,0x32,0xE6,0x89,0xD7,\ - 0x64,0xEB,0xBD,0x48,0x50,0xFD,0xF6,0xD0,0x41,0x03,0xC2,0x74,0xB7,0xFD,0xF6,0x80,\ - 0xCF,0x5B,0xC5,0xAB,0xA4,0xD6,0x95,0x12,0x9B,0xE7,0x97,0x13,0x32,0x03,0xE9,0xD4,\ - 0xAB,0x43,0x5B,0x16,0xED,0x33,0x22,0x64,0x29,0xB6,0xD2,0x93,0xAD,0x2F,0x6C,0xD8,\ - 0x3D,0xB6,0xF6,0x1D,0x0E,0x34,0xEE,0xD2,0x7D,0xA9,0x55,0x0F,0x20,0xF4,0xFD,0x29,\ - 0xBB,0x91,0x5B,0x1C,0x7D,0xC6,0x42,0x38,0x6D,0x42,0x28,0x6D,0xD4,0x01,0xFB,0xCD,\ - 0x88,0x97,0x49,0x7E,0xB8,0xF3,0x83,0xF8,0xB5,0x98,0x2F,0xB3,0x27,0x0B,0x48,0x5E,\ - 0x56,0xE7,0x4E,0xA3,0x33,0xB3,0x44,0xD6,0xA5,0xF2,0x18,0x94,0xED,0x1C,0x1E,0xA9,\ - 0x95,0x5C,0x62,0x4A,0xF8,0x0D,0x67,0x51,0xA9,0xAF,0x21,0xD5,0xF8,0x32,0x9D,0x79,\ - 0xBA,0x1A,0x5F,0xE5,0x04,0x55,0x4D,0x13,0x46,0xFF,0xF2,0xCF,0x74,0xC7,0x1A,0x63,\ - 0x6D,0xC3,0x1F,0x17,0x12,0xC3,0x1E,0x10,0x3E,0x60,0x08,0xB3,0x31,0x02,0x03,0x01,\ - 0x00,0x01,0xA3,0x42,0x30,0x40,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,\ - 0x14,0xDD,0x55,0x17,0x13,0xF6,0xAC,0xE8,0x48,0x21,0xCA,0xEF,0xB5,0xAF,0xD1,0x00,\ - 0x32,0xED,0x9E,0x8C,0xB5,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,0x04,\ - 0x04,0x03,0x02,0x01,0x06,0x30,0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,\ - 0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,\ - 0x01,0x01,0x0B,0x05,0x00,0x03,0x82,0x01,0x01,0x00,0x6F,0x58,0x0D,0x97,0x43,0xAA,\ - 0x16,0x54,0x3E,0xBF,0xA9,0xDF,0x92,0x45,0x3F,0x85,0x0B,0xBB,0x56,0xD3,0x0C,0x52,\ - 0xCC,0xC8,0xBF,0x76,0x67,0x5E,0xE6,0xAA,0xB3,0xA7,0xEF,0xB9,0xAC,0xB4,0x10,0x14,\ - 0x0D,0x74,0x7E,0x3D,0x6D,0xAD,0xD1,0x7D,0xD0,0x9A,0xA9,0xA5,0xCA,0x18,0x3B,0x02,\ - 0x40,0x2E,0x2A,0x9C,0x50,0x14,0x8B,0xFE,0x57,0x7E,0x57,0x5C,0x11,0x09,0x4B,0x36,\ - 0x45,0x52,0xF7,0x3D,0xAC,0x14,0xFD,0x44,0xDF,0x8B,0x97,0x23,0xD4,0xC3,0xC1,0xEE,\ - 0xD4,0x53,0x95,0xFE,0x2C,0x4A,0xFE,0x0D,0x70,0xAA,0xBB,0x8B,0x2F,0x2D,0xCB,0x32,\ - 0xA3,0x82,0xF2,0x54,0xDF,0xD8,0xF2,0xDD,0xD7,0x48,0x72,0xEE,0x4A,0xA3,0x29,0x96,\ - 0xC3,0x44,0xCE,0x6E,0xB5,0x92,0x87,0x76,0xA4,0xBB,0xF4,0x92,0x6C,0xCE,0x2C,0x14,\ - 0x09,0x66,0x8E,0x8D,0xAD,0x16,0xB5,0xC7,0x1B,0x09,0x61,0x3B,0xE3,0x20,0xA2,0x03,\ - 0x80,0x8E,0xAD,0x7E,0x51,0x00,0x4E,0xC7,0x96,0x86,0xFB,0x43,0x98,0x77,0x7D,0x28,\ - 0xC7,0x8F,0xD8,0x2A,0x6E,0xE7,0x84,0x6F,0x97,0x41,0x29,0x00,0x16,0x5E,0x4D,0xE2,\ - 0x13,0xEA,0x59,0xC0,0x63,0x67,0x3A,0x44,0xFB,0x98,0xFC,0x04,0xD3,0x30,0x72,0xA6,\ - 0xF6,0x87,0x09,0x57,0xAD,0x76,0xA6,0x1D,0x63,0x9A,0xFD,0xD7,0x65,0xC8,0x78,0x83,\ - 0x2B,0x75,0x3B,0xA5,0x5B,0xB8,0x0D,0x5D,0x7F,0xBE,0x23,0xAE,0x56,0x55,0x94,0x58,\ - 0xEF,0x1F,0x81,0x8C,0x2A,0xB2,0xCD,0xE6,0x9B,0x63,0x9E,0x18,0xBC,0xE5,0x6B,0x06,\ - 0xB4,0x0B,0x98,0x4B,0x28,0x5E,0xAF,0x88,0x58,0xCB ; "TÃRKTRUST Elektronik Sertifika Hizmet SaÄlayÄ±cÄ±sÄ± H5" (1067 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\C418F64D46D1DF003D2730137243A91211C675FB","Blob",0x00000001,\ @@ -7661,71 +7665,6 @@ 0xB2,0x99,0x22,0xE1,0xC1,0x2B,0xC7,0x9C,0xF8,0xF3,0x5F,0xA8,0x82,0x12,0xEB,0x19,\ 0x11,0x2D -; "ApplicationCA - Japanese Government" (932 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\7F8AB0CFD051876A66F3360F47C88D8CD335FC74","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0xA4,0x03,0x00,0x00,\ - 0x30,0x82,0x03,0xA0,0x30,0x82,0x02,0x88,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x31,\ - 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,\ - 0x43,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x4A,0x50,0x31,0x1C,\ - 0x30,0x1A,0x06,0x03,0x55,0x04,0x0A,0x13,0x13,0x4A,0x61,0x70,0x61,0x6E,0x65,0x73,\ - 0x65,0x20,0x47,0x6F,0x76,0x65,0x72,0x6E,0x6D,0x65,0x6E,0x74,0x31,0x16,0x30,0x14,\ - 0x06,0x03,0x55,0x04,0x0B,0x13,0x0D,0x41,0x70,0x70,0x6C,0x69,0x63,0x61,0x74,0x69,\ - 0x6F,0x6E,0x43,0x41,0x30,0x1E,0x17,0x0D,0x30,0x37,0x31,0x32,0x31,0x32,0x31,0x35,\ - 0x30,0x30,0x30,0x30,0x5A,0x17,0x0D,0x31,0x37,0x31,0x32,0x31,0x32,0x31,0x35,0x30,\ - 0x30,0x30,0x30,0x5A,0x30,0x43,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,\ - 0x02,0x4A,0x50,0x31,0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x0A,0x13,0x13,0x4A,0x61,\ - 0x70,0x61,0x6E,0x65,0x73,0x65,0x20,0x47,0x6F,0x76,0x65,0x72,0x6E,0x6D,0x65,0x6E,\ - 0x74,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0B,0x13,0x0D,0x41,0x70,0x70,0x6C,\ - 0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x43,0x41,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,\ - 0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,\ - 0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xA7,0x6D,0xE0,0x74,0x4E,0x87,\ - 0x8F,0xA5,0x06,0xDE,0x68,0xA2,0xDB,0x86,0x99,0x4B,0x64,0x0D,0x71,0xF0,0x0A,0x05,\ - 0x9B,0x8E,0xAA,0xE1,0xCC,0x2E,0xD2,0x6A,0x3B,0xC1,0x7A,0xB4,0x97,0x61,0x8D,0x8A,\ - 0xBE,0xC6,0x9A,0x9C,0x06,0xB4,0x86,0x51,0xE4,0x37,0x0E,0x74,0x78,0x7E,0x5F,0x8A,\ - 0x7F,0x94,0xA4,0xD7,0x47,0x08,0xFD,0x50,0x5A,0x56,0xE4,0x68,0xAC,0x28,0x73,0xA0,\ - 0x7B,0xE9,0x7F,0x18,0x92,0x40,0x4F,0x2D,0x9D,0xF5,0xAE,0x44,0x48,0x73,0x36,0x06,\ - 0x9E,0x64,0x2C,0x3B,0x34,0x23,0xDB,0x5C,0x26,0xE4,0x71,0x79,0x8F,0xD4,0x6E,0x79,\ - 0x22,0xB9,0x93,0xC1,0xCA,0xCD,0xC1,0x56,0xED,0x88,0x6A,0xD7,0xA0,0x39,0x21,0x04,\ - 0x57,0x2C,0xA2,0xF5,0xBC,0x47,0x41,0x4F,0x5E,0x34,0x22,0x95,0xB5,0x1F,0x29,0x6D,\ - 0x5E,0x4A,0xF3,0x4D,0x72,0xBE,0x41,0x56,0x20,0x87,0xFC,0xE9,0x50,0x47,0xD7,0x30,\ - 0x14,0xEE,0x5C,0x8C,0x55,0xBA,0x59,0x8D,0x87,0xFC,0x23,0xDE,0x93,0xD0,0x04,0x8C,\ - 0xFD,0xEF,0x6D,0xBD,0xD0,0x7A,0xC9,0xA5,0x3A,0x6A,0x72,0x33,0xC6,0x4A,0x0D,0x05,\ - 0x17,0x2A,0x2D,0x7B,0xB1,0xA7,0xD8,0xD6,0xF0,0xBE,0xF4,0x3F,0xEA,0x0E,0x28,0x6D,\ - 0x41,0x61,0x23,0x76,0x78,0xC3,0xB8,0x65,0xA4,0xF3,0x5A,0xAE,0xCC,0xC2,0xAA,0xD9,\ - 0xE7,0x58,0xDE,0xB6,0x7E,0x9D,0x85,0x6E,0x9F,0x2A,0x0A,0x6F,0x9F,0x03,0x29,0x30,\ - 0x97,0x28,0x1D,0xBC,0xB7,0xCF,0x54,0x29,0x4E,0x51,0x31,0xF9,0x27,0xB6,0x28,0x26,\ - 0xFE,0xA2,0x63,0xE6,0x41,0x16,0xF0,0x33,0x98,0x47,0x02,0x03,0x01,0x00,0x01,0xA3,\ - 0x81,0x9E,0x30,0x81,0x9B,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,0x04,0x16,0x04,0x14,\ - 0x54,0x5A,0xCB,0x26,0x3F,0x71,0xCC,0x94,0x46,0x0D,0x96,0x53,0xEA,0x6B,0x48,0xD0,\ - 0x93,0xFE,0x42,0x75,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,\ - 0x03,0x02,0x01,0x06,0x30,0x59,0x06,0x03,0x55,0x1D,0x11,0x04,0x52,0x30,0x50,0xA4,\ - 0x4E,0x30,0x4C,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x4A,0x50,\ - 0x31,0x18,0x30,0x16,0x06,0x03,0x55,0x04,0x0A,0x0C,0x0F,0xE6,0x97,0xA5,0xE6,0x9C,\ - 0xAC,0xE5,0x9B,0xBD,0xE6,0x94,0xBF,0xE5,0xBA,0x9C,0x31,0x23,0x30,0x21,0x06,0x03,\ - 0x55,0x04,0x0B,0x0C,0x1A,0xE3,0x82,0xA2,0xE3,0x83,0x97,0xE3,0x83,0xAA,0xE3,0x82,\ - 0xB1,0xE3,0x83,0xBC,0xE3,0x82,0xB7,0xE3,0x83,0xA7,0xE3,0x83,0xB3,0x43,0x41,0x30,\ - 0x0F,0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,\ - 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x03,\ - 0x82,0x01,0x01,0x00,0x39,0x6A,0x44,0x76,0x77,0x38,0x3A,0xEC,0xA3,0x67,0x46,0x0F,\ - 0xF9,0x8B,0x06,0xA8,0xFB,0x6A,0x90,0x31,0xCE,0x7E,0xEC,0xDA,0xD1,0x89,0x7C,0x7A,\ - 0xEB,0x2E,0x0C,0xBD,0x99,0x32,0xE7,0xB0,0x24,0xD6,0xC3,0xFF,0xF5,0xB2,0x88,0x09,\ - 0x87,0x2C,0xE3,0x54,0xE1,0xA3,0xA6,0xB2,0x08,0x0B,0xC0,0x85,0xA8,0xC8,0xD2,0x9C,\ - 0x71,0xF6,0x1D,0x9F,0x60,0xFC,0x38,0x33,0x13,0xE1,0x9E,0xDC,0x0B,0x5F,0xDA,0x16,\ - 0x50,0x29,0x7B,0x2F,0x70,0x91,0x0F,0x99,0xBA,0x34,0x34,0x8D,0x95,0x74,0xC5,0x7E,\ - 0x78,0xA9,0x66,0x5D,0xBD,0xCA,0x21,0x77,0x42,0x10,0xAC,0x66,0x26,0x3D,0xDE,0x91,\ - 0xAB,0xFD,0x15,0xF0,0x6F,0xED,0x6C,0x5F,0x10,0xF8,0xF3,0x16,0xF6,0x03,0x8A,0x8F,\ - 0xA7,0x12,0x11,0x0C,0xCB,0xFD,0x3F,0x79,0xC1,0x9C,0xFD,0x62,0xEE,0xA3,0xCF,0x54,\ - 0x0C,0xD1,0x2B,0x5F,0x17,0x3E,0xE3,0x3E,0xBF,0xC0,0x2B,0x3E,0x09,0x9B,0xFE,0x88,\ - 0xA6,0x7E,0xB4,0x92,0x17,0xFC,0x23,0x94,0x81,0xBD,0x6E,0xA7,0xC5,0x8C,0xC2,0xEB,\ - 0x11,0x45,0xDB,0xF8,0x41,0xC9,0x96,0x76,0xEA,0x70,0x5F,0x79,0x12,0x6B,0xE4,0xA3,\ - 0x07,0x5A,0x05,0xEF,0x27,0x49,0xCF,0x21,0x9F,0x8A,0x4C,0x09,0x70,0x66,0xA9,0x26,\ - 0xC1,0x2B,0x11,0x4E,0x33,0xD2,0x0E,0xFC,0xD6,0x6C,0xD2,0x0E,0x32,0x64,0x68,0xFF,\ - 0xAD,0x05,0x78,0x5F,0x03,0x1D,0xA8,0xE3,0x90,0xAC,0x24,0xE0,0x0F,0x40,0xA7,0x4B,\ - 0xAE,0x8B,0x28,0xB7,0x82,0xCA,0x18,0x07,0xE6,0xB7,0x5B,0x74,0xE9,0x20,0x19,0x7F,\ - 0xB2,0x1B,0x89,0x54 - ; "CNNIC ROOT" (857 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\ @@ -8225,135 +8164,6 @@ 0x5B,0x21,0xFC,0x11,0x91,0x34,0xBE,0x41,0xEF,0x7B,0x9D,0x97,0x75,0xFF,0x97,0x95,\ 0xC0,0x96,0x58,0x2F,0xEA,0xBB,0x46,0xD7,0xBB,0xE4,0xD9,0x2E -; "Microsec e-Szigno Root CA" (1964 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\2388C9D371CC9E963DFF7D3CA7CEFCD625EC190D","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0xAC,0x07,0x00,0x00,\ - 0x30,0x82,0x07,0xA8,0x30,0x82,0x06,0x90,0xA0,0x03,0x02,0x01,0x02,0x02,0x11,0x00,\ - 0xCC,0xB8,0xE7,0xBF,0x4E,0x29,0x1A,0xFD,0xA2,0xDC,0x66,0xA5,0x1C,0x2C,0x0F,0x11,\ - 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,\ - 0x72,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x48,0x55,0x31,0x11,\ - 0x30,0x0F,0x06,0x03,0x55,0x04,0x07,0x13,0x08,0x42,0x75,0x64,0x61,0x70,0x65,0x73,\ - 0x74,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,0x4D,0x69,0x63,0x72,\ - 0x6F,0x73,0x65,0x63,0x20,0x4C,0x74,0x64,0x2E,0x31,0x14,0x30,0x12,0x06,0x03,0x55,\ - 0x04,0x0B,0x13,0x0B,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,0x20,0x43,0x41,0x31,\ - 0x22,0x30,0x20,0x06,0x03,0x55,0x04,0x03,0x13,0x19,0x4D,0x69,0x63,0x72,0x6F,0x73,\ - 0x65,0x63,0x20,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,0x20,0x52,0x6F,0x6F,0x74,\ - 0x20,0x43,0x41,0x30,0x1E,0x17,0x0D,0x30,0x35,0x30,0x34,0x30,0x36,0x31,0x32,0x32,\ - 0x38,0x34,0x34,0x5A,0x17,0x0D,0x31,0x37,0x30,0x34,0x30,0x36,0x31,0x32,0x32,0x38,\ - 0x34,0x34,0x5A,0x30,0x72,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,\ - 0x48,0x55,0x31,0x11,0x30,0x0F,0x06,0x03,0x55,0x04,0x07,0x13,0x08,0x42,0x75,0x64,\ - 0x61,0x70,0x65,0x73,0x74,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,\ - 0x4D,0x69,0x63,0x72,0x6F,0x73,0x65,0x63,0x20,0x4C,0x74,0x64,0x2E,0x31,0x14,0x30,\ - 0x12,0x06,0x03,0x55,0x04,0x0B,0x13,0x0B,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,\ - 0x20,0x43,0x41,0x31,0x22,0x30,0x20,0x06,0x03,0x55,0x04,0x03,0x13,0x19,0x4D,0x69,\ - 0x63,0x72,0x6F,0x73,0x65,0x63,0x20,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,0x20,\ - 0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x30,0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,\ - 0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,\ - 0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,0xED,0xC8,0x00,0xD5,0x81,0x7B,0xCD,0x38,\ - 0x00,0x47,0xCC,0xDB,0x84,0xC1,0x21,0x69,0x2C,0x74,0x90,0x0C,0x21,0xD9,0x53,0x87,\ - 0xED,0x3E,0x43,0x44,0x53,0xAF,0xAB,0xF8,0x80,0x9B,0x3C,0x78,0x8D,0xD4,0x8D,0xAE,\ - 0xB8,0xEF,0xD3,0x11,0xDC,0x81,0xE6,0xCF,0x3B,0x96,0x8C,0xD6,0x6F,0x15,0xC6,0x77,\ - 0x7E,0xA1,0x2F,0xE0,0x5F,0x92,0xB6,0x27,0xD7,0x76,0x9A,0x1D,0x43,0x3C,0xEA,0xD9,\ - 0xEC,0x2F,0xEE,0x39,0xF3,0x6A,0x67,0x4B,0x8B,0x82,0xCF,0x22,0xF8,0x65,0x55,0xFE,\ - 0x2C,0xCB,0x2F,0x7D,0x48,0x7A,0x3D,0x75,0xF9,0xAA,0xA0,0x27,0xBB,0x78,0xC2,0x06,\ - 0xCA,0x51,0xC2,0x7E,0x66,0x4B,0xAF,0xCD,0xA2,0xA7,0x4D,0x02,0x82,0x3F,0x82,0xAC,\ - 0x85,0xC6,0xE1,0x0F,0x90,0x47,0x99,0x94,0x0A,0x71,0x72,0x93,0x2A,0xC9,0xA6,0xC0,\ - 0xBE,0x3C,0x56,0x4C,0x73,0x92,0x27,0xF1,0x6B,0xB5,0xF5,0xFD,0xFC,0x30,0x05,0x60,\ - 0x92,0xC6,0xEB,0x96,0x7E,0x01,0x91,0xC2,0x69,0xB1,0x1E,0x1D,0x7B,0x53,0x45,0xB8,\ - 0xDC,0x41,0x1F,0xC9,0x8B,0x71,0xD6,0x54,0x14,0xE3,0x8B,0x54,0x78,0x3F,0xBE,0xF4,\ - 0x62,0x3B,0x5B,0xF5,0xA3,0xEC,0xD5,0x92,0x74,0xE2,0x74,0x30,0xEF,0x01,0xDB,0xE1,\ - 0xD4,0xAB,0x99,0x9B,0x2A,0x6B,0xF8,0xBD,0xA6,0x1C,0x86,0x23,0x42,0x5F,0xEC,0x49,\ - 0xDE,0x9A,0x8B,0x5B,0xF4,0x72,0x3A,0x40,0xC5,0x49,0x3E,0xA5,0xBE,0x8E,0xAA,0x71,\ - 0xEB,0x6C,0xFA,0xF5,0x1A,0xE4,0x6A,0xFD,0x7B,0x7D,0x55,0x40,0xEF,0x58,0x6E,0xE6,\ - 0xD9,0xD5,0xBC,0x24,0xAB,0xC1,0xEF,0xB7,0x02,0x03,0x01,0x00,0x01,0xA3,0x82,0x04,\ - 0x37,0x30,0x82,0x04,0x33,0x30,0x67,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x01,\ - 0x01,0x04,0x5B,0x30,0x59,0x30,0x28,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x30,\ - 0x01,0x86,0x1C,0x68,0x74,0x74,0x70,0x73,0x3A,0x2F,0x2F,0x72,0x63,0x61,0x2E,0x65,\ - 0x2D,0x73,0x7A,0x69,0x67,0x6E,0x6F,0x2E,0x68,0x75,0x2F,0x6F,0x63,0x73,0x70,0x30,\ - 0x2D,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x30,0x02,0x86,0x21,0x68,0x74,0x74,\ - 0x70,0x3A,0x2F,0x2F,0x77,0x77,0x77,0x2E,0x65,0x2D,0x73,0x7A,0x69,0x67,0x6E,0x6F,\ - 0x2E,0x68,0x75,0x2F,0x52,0x6F,0x6F,0x74,0x43,0x41,0x2E,0x63,0x72,0x74,0x30,0x0F,\ - 0x06,0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,\ - 0x82,0x01,0x73,0x06,0x03,0x55,0x1D,0x20,0x04,0x82,0x01,0x6A,0x30,0x82,0x01,0x66,\ - 0x30,0x82,0x01,0x62,0x06,0x0C,0x2B,0x06,0x01,0x04,0x01,0x81,0xA8,0x18,0x02,0x01,\ - 0x01,0x01,0x30,0x82,0x01,0x50,0x30,0x28,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,\ - 0x02,0x01,0x16,0x1C,0x68,0x74,0x74,0x70,0x3A,0x2F,0x2F,0x77,0x77,0x77,0x2E,0x65,\ - 0x2D,0x73,0x7A,0x69,0x67,0x6E,0x6F,0x2E,0x68,0x75,0x2F,0x53,0x5A,0x53,0x5A,0x2F,\ - 0x30,0x82,0x01,0x22,0x06,0x08,0x2B,0x06,0x01,0x05,0x05,0x07,0x02,0x02,0x30,0x82,\ - 0x01,0x14,0x1E,0x82,0x01,0x10,0x00,0x41,0x00,0x20,0x00,0x74,0x00,0x61,0x00,0x6E,\ - 0x00,0xFA,0x00,0x73,0x00,0xED,0x00,0x74,0x00,0x76,0x00,0xE1,0x00,0x6E,0x00,0x79,\ - 0x00,0x20,0x00,0xE9,0x00,0x72,0x00,0x74,0x00,0x65,0x00,0x6C,0x00,0x6D,0x00,0x65,\ - 0x00,0x7A,0x00,0xE9,0x00,0x73,0x00,0xE9,0x00,0x68,0x00,0x65,0x00,0x7A,0x00,0x20,\ - 0x00,0xE9,0x00,0x73,0x00,0x20,0x00,0x65,0x00,0x6C,0x00,0x66,0x00,0x6F,0x00,0x67,\ - 0x00,0x61,0x00,0x64,0x00,0xE1,0x00,0x73,0x00,0xE1,0x00,0x68,0x00,0x6F,0x00,0x7A,\ - 0x00,0x20,0x00,0x61,0x00,0x20,0x00,0x53,0x00,0x7A,0x00,0x6F,0x00,0x6C,0x00,0x67,\ - 0x00,0xE1,0x00,0x6C,0x00,0x74,0x00,0x61,0x00,0x74,0x00,0xF3,0x00,0x20,0x00,0x53,\ - 0x00,0x7A,0x00,0x6F,0x00,0x6C,0x00,0x67,0x00,0xE1,0x00,0x6C,0x00,0x74,0x00,0x61,\ - 0x00,0x74,0x00,0xE1,0x00,0x73,0x00,0x69,0x00,0x20,0x00,0x53,0x00,0x7A,0x00,0x61,\ - 0x00,0x62,0x00,0xE1,0x00,0x6C,0x00,0x79,0x00,0x7A,0x00,0x61,0x00,0x74,0x00,0x61,\ - 0x00,0x20,0x00,0x73,0x00,0x7A,0x00,0x65,0x00,0x72,0x00,0x69,0x00,0x6E,0x00,0x74,\ - 0x00,0x20,0x00,0x6B,0x00,0x65,0x00,0x6C,0x00,0x6C,0x00,0x20,0x00,0x65,0x00,0x6C,\ - 0x00,0x6A,0x00,0xE1,0x00,0x72,0x00,0x6E,0x00,0x69,0x00,0x3A,0x00,0x20,0x00,0x68,\ - 0x00,0x74,0x00,0x74,0x00,0x70,0x00,0x3A,0x00,0x2F,0x00,0x2F,0x00,0x77,0x00,0x77,\ - 0x00,0x77,0x00,0x2E,0x00,0x65,0x00,0x2D,0x00,0x73,0x00,0x7A,0x00,0x69,0x00,0x67,\ - 0x00,0x6E,0x00,0x6F,0x00,0x2E,0x00,0x68,0x00,0x75,0x00,0x2F,0x00,0x53,0x00,0x5A,\ - 0x00,0x53,0x00,0x5A,0x00,0x2F,0x30,0x81,0xC8,0x06,0x03,0x55,0x1D,0x1F,0x04,0x81,\ - 0xC0,0x30,0x81,0xBD,0x30,0x81,0xBA,0xA0,0x81,0xB7,0xA0,0x81,0xB4,0x86,0x21,0x68,\ - 0x74,0x74,0x70,0x3A,0x2F,0x2F,0x77,0x77,0x77,0x2E,0x65,0x2D,0x73,0x7A,0x69,0x67,\ - 0x6E,0x6F,0x2E,0x68,0x75,0x2F,0x52,0x6F,0x6F,0x74,0x43,0x41,0x2E,0x63,0x72,0x6C,\ - 0x86,0x81,0x8E,0x6C,0x64,0x61,0x70,0x3A,0x2F,0x2F,0x6C,0x64,0x61,0x70,0x2E,0x65,\ - 0x2D,0x73,0x7A,0x69,0x67,0x6E,0x6F,0x2E,0x68,0x75,0x2F,0x43,0x4E,0x3D,0x4D,0x69,\ - 0x63,0x72,0x6F,0x73,0x65,0x63,0x25,0x32,0x30,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,\ - 0x6F,0x25,0x32,0x30,0x52,0x6F,0x6F,0x74,0x25,0x32,0x30,0x43,0x41,0x2C,0x4F,0x55,\ - 0x3D,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,0x25,0x32,0x30,0x43,0x41,0x2C,0x4F,\ - 0x3D,0x4D,0x69,0x63,0x72,0x6F,0x73,0x65,0x63,0x25,0x32,0x30,0x4C,0x74,0x64,0x2E,\ - 0x2C,0x4C,0x3D,0x42,0x75,0x64,0x61,0x70,0x65,0x73,0x74,0x2C,0x43,0x3D,0x48,0x55,\ - 0x3F,0x63,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x52,0x65,0x76,0x6F,\ - 0x63,0x61,0x74,0x69,0x6F,0x6E,0x4C,0x69,0x73,0x74,0x3B,0x62,0x69,0x6E,0x61,0x72,\ - 0x79,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,\ - 0x06,0x30,0x81,0x96,0x06,0x03,0x55,0x1D,0x11,0x04,0x81,0x8E,0x30,0x81,0x8B,0x81,\ - 0x10,0x69,0x6E,0x66,0x6F,0x40,0x65,0x2D,0x73,0x7A,0x69,0x67,0x6E,0x6F,0x2E,0x68,\ - 0x75,0xA4,0x77,0x30,0x75,0x31,0x23,0x30,0x21,0x06,0x03,0x55,0x04,0x03,0x0C,0x1A,\ - 0x4D,0x69,0x63,0x72,0x6F,0x73,0x65,0x63,0x20,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,\ - 0xC3,0xB3,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x41,0x31,0x16,0x30,0x14,0x06,0x03,\ - 0x55,0x04,0x0B,0x0C,0x0D,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0xC3,0xB3,0x20,0x48,\ - 0x53,0x5A,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,0x4D,0x69,0x63,\ - 0x72,0x6F,0x73,0x65,0x63,0x20,0x4B,0x66,0x74,0x2E,0x31,0x11,0x30,0x0F,0x06,0x03,\ - 0x55,0x04,0x07,0x13,0x08,0x42,0x75,0x64,0x61,0x70,0x65,0x73,0x74,0x31,0x0B,0x30,\ - 0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x48,0x55,0x30,0x81,0xAC,0x06,0x03,0x55,\ - 0x1D,0x23,0x04,0x81,0xA4,0x30,0x81,0xA1,0x80,0x14,0xC7,0xA0,0x49,0x75,0x16,0x61,\ - 0x84,0xDB,0x31,0x4B,0x84,0xD2,0xF1,0x37,0x40,0x90,0xEF,0x4E,0xDC,0xF7,0xA1,0x76,\ - 0xA4,0x74,0x30,0x72,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x48,\ - 0x55,0x31,0x11,0x30,0x0F,0x06,0x03,0x55,0x04,0x07,0x13,0x08,0x42,0x75,0x64,0x61,\ - 0x70,0x65,0x73,0x74,0x31,0x16,0x30,0x14,0x06,0x03,0x55,0x04,0x0A,0x13,0x0D,0x4D,\ - 0x69,0x63,0x72,0x6F,0x73,0x65,0x63,0x20,0x4C,0x74,0x64,0x2E,0x31,0x14,0x30,0x12,\ - 0x06,0x03,0x55,0x04,0x0B,0x13,0x0B,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,0x20,\ - 0x43,0x41,0x31,0x22,0x30,0x20,0x06,0x03,0x55,0x04,0x03,0x13,0x19,0x4D,0x69,0x63,\ - 0x72,0x6F,0x73,0x65,0x63,0x20,0x65,0x2D,0x53,0x7A,0x69,0x67,0x6E,0x6F,0x20,0x52,\ - 0x6F,0x6F,0x74,0x20,0x43,0x41,0x82,0x11,0x00,0xCC,0xB8,0xE7,0xBF,0x4E,0x29,0x1A,\ - 0xFD,0xA2,0xDC,0x66,0xA5,0x1C,0x2C,0x0F,0x11,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,\ - 0x04,0x16,0x04,0x14,0xC7,0xA0,0x49,0x75,0x16,0x61,0x84,0xDB,0x31,0x4B,0x84,0xD2,\ - 0xF1,0x37,0x40,0x90,0xEF,0x4E,0xDC,0xF7,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,\ - 0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x03,0x82,0x01,0x01,0x00,0xD3,0x13,0x9C,0x66,\ - 0x63,0x59,0x2E,0xCA,0x5C,0x70,0x0C,0xFC,0x83,0xBC,0x55,0xB1,0xF4,0x8E,0x07,0x6C,\ - 0x66,0x27,0xCE,0xC1,0x3B,0x20,0xA9,0x1C,0xBB,0x46,0x54,0x70,0xEE,0x5A,0xCC,0xA0,\ - 0x77,0xEA,0x68,0x44,0x27,0xEB,0xF2,0x29,0xDD,0x77,0xA9,0xD5,0xFB,0xE3,0xD4,0xA7,\ - 0x04,0xC4,0x95,0xB8,0x0B,0xE1,0x44,0x68,0x60,0x07,0x43,0x30,0x31,0x42,0x61,0xE5,\ - 0xEE,0xD9,0xE5,0x24,0xD5,0x1B,0xDF,0xE1,0x4A,0x1B,0xAA,0x9F,0xC7,0x5F,0xF8,0x7A,\ - 0x11,0xEA,0x13,0x93,0x00,0xCA,0x8A,0x58,0xB1,0xEE,0xED,0x0E,0x4D,0xB4,0xD7,0xA8,\ - 0x36,0x26,0x7C,0xE0,0x3A,0xC1,0xD5,0x57,0x82,0xF1,0x75,0xB6,0xFD,0x89,0x5F,0xDA,\ - 0xF3,0xA8,0x38,0x9F,0x35,0x06,0x08,0xCE,0x22,0x95,0xBE,0xCD,0xD5,0xFC,0xBE,0x5B,\ - 0xDE,0x79,0x6B,0xDC,0x7A,0xA9,0x65,0x66,0xBE,0xB1,0x25,0x5A,0x5F,0xED,0x7E,0xD3,\ - 0xAC,0x46,0x6D,0x4C,0xF4,0x32,0x87,0xB4,0x20,0x04,0xE0,0x6C,0x78,0xB0,0x77,0xD1,\ - 0x85,0x46,0x4B,0xA6,0x12,0xB7,0x75,0xE8,0x4A,0xC9,0x56,0x6C,0xD7,0x92,0xAB,0x9D,\ - 0xF5,0x49,0x38,0xD2,0x4F,0x53,0xE3,0x55,0x90,0x11,0xDB,0x98,0x96,0xC6,0x49,0xF2,\ - 0x3E,0xF4,0x9F,0x1B,0xE0,0xF7,0x88,0xDC,0x25,0x62,0x99,0x44,0xD8,0x73,0xBF,0x3F,\ - 0x30,0xF3,0x0C,0x37,0x3E,0xD4,0xC2,0x28,0x80,0x73,0xB1,0x01,0xB7,0x9D,0x5A,0x96,\ - 0x14,0x01,0x4B,0xA9,0x11,0x9D,0x29,0x6A,0x2E,0xD0,0x5D,0x81,0xC0,0xCF,0xB2,0x20,\ - 0x43,0xC7,0x03,0xE0,0x37,0x4E,0x5D,0x0A,0xDC,0x59,0x20,0x25 - ; "OISTE WISeKey Global Root GA CA" (1013 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\5922A1E15AEA163521F898396A4646B0441B0FA9","Blob",0x00000001,\ 0x20,0x00,0x00,0x00,\ @@ -8533,89 +8343,6 @@ 0x3C,0x49,0xA7,0x33,0x7A,0x90,0x46,0x47,0xB3,0x63,0x7D,0x13,0x9B,0x4E,0xB7,0x6F,\ 0x18,0x37,0x80,0x53,0xFE,0xDD,0x20,0xE0,0x35,0x9A,0x36,0xD1,0xC7,0x01,0xB9,0xE6,\ 0xDC,0xDD,0xF3,0xFF,0x1D,0x2C,0x3A,0x16,0x57,0xD9,0x92,0x39,0xD6 - -; "WellsSecure Public Root Certificate Authority" (1217 bytes) -HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\E7B4F69D61EC9069DB7E90A7401A3CF47D4FE8EE","Blob",0x00000001,\ - 0x20,0x00,0x00,0x00,\ - 0x01,0x00,0x00,0x00,\ - 0xC1,0x04,0x00,0x00,\ - 0x30,0x82,0x04,0xBD,0x30,0x82,0x03,0xA5,0xA0,0x03,0x02,0x01,0x02,0x02,0x01,0x01,\ - 0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x30,\ - 0x81,0x85,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,\ - 0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x0C,0x17,0x57,0x65,0x6C,0x6C,0x73,0x20,\ - 0x46,0x61,0x72,0x67,0x6F,0x20,0x57,0x65,0x6C,0x6C,0x73,0x53,0x65,0x63,0x75,0x72,\ - 0x65,0x31,0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x0B,0x0C,0x13,0x57,0x65,0x6C,0x6C,\ - 0x73,0x20,0x46,0x61,0x72,0x67,0x6F,0x20,0x42,0x61,0x6E,0x6B,0x20,0x4E,0x41,0x31,\ - 0x36,0x30,0x34,0x06,0x03,0x55,0x04,0x03,0x0C,0x2D,0x57,0x65,0x6C,0x6C,0x73,0x53,\ - 0x65,0x63,0x75,0x72,0x65,0x20,0x50,0x75,0x62,0x6C,0x69,0x63,0x20,0x52,0x6F,0x6F,\ - 0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,\ - 0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,0x1E,0x17,0x0D,0x30,0x37,0x31,0x32,0x31,\ - 0x33,0x31,0x37,0x30,0x37,0x35,0x34,0x5A,0x17,0x0D,0x32,0x32,0x31,0x32,0x31,0x34,\ - 0x30,0x30,0x30,0x37,0x35,0x34,0x5A,0x30,0x81,0x85,0x31,0x0B,0x30,0x09,0x06,0x03,\ - 0x55,0x04,0x06,0x13,0x02,0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,\ - 0x0C,0x17,0x57,0x65,0x6C,0x6C,0x73,0x20,0x46,0x61,0x72,0x67,0x6F,0x20,0x57,0x65,\ - 0x6C,0x6C,0x73,0x53,0x65,0x63,0x75,0x72,0x65,0x31,0x1C,0x30,0x1A,0x06,0x03,0x55,\ - 0x04,0x0B,0x0C,0x13,0x57,0x65,0x6C,0x6C,0x73,0x20,0x46,0x61,0x72,0x67,0x6F,0x20,\ - 0x42,0x61,0x6E,0x6B,0x20,0x4E,0x41,0x31,0x36,0x30,0x34,0x06,0x03,0x55,0x04,0x03,\ - 0x0C,0x2D,0x57,0x65,0x6C,0x6C,0x73,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x50,0x75,\ - 0x62,0x6C,0x69,0x63,0x20,0x52,0x6F,0x6F,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66,\ - 0x69,0x63,0x61,0x74,0x65,0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x30,\ - 0x82,0x01,0x22,0x30,0x0D,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x01,\ - 0x05,0x00,0x03,0x82,0x01,0x0F,0x00,0x30,0x82,0x01,0x0A,0x02,0x82,0x01,0x01,0x00,\ - 0xEE,0x6F,0xB4,0xBD,0x79,0xE2,0x8F,0x08,0x21,0x9E,0x38,0x04,0x41,0x25,0xEF,0xAB,\ - 0x5B,0x1C,0x53,0x92,0xAC,0x6D,0x9E,0xDD,0xC2,0xC4,0x2E,0x45,0x94,0x03,0x35,0x88,\ - 0x67,0x74,0x57,0xE3,0xDF,0x8C,0xB8,0xA7,0x76,0x8F,0x3B,0xF7,0xA8,0xC4,0xDB,0x29,\ - 0x63,0x0E,0x91,0x68,0x36,0x8A,0x97,0x8E,0x8A,0x71,0x68,0x09,0x07,0xE4,0xE8,0xD4,\ - 0x0E,0x4F,0xF8,0xD6,0x2B,0x4C,0xA4,0x16,0xF9,0xEF,0x43,0x98,0x8F,0xB3,0x9E,0x52,\ - 0xDF,0x6D,0x91,0x39,0x8F,0x38,0xBD,0x77,0x8B,0x43,0x63,0xEB,0xB7,0x93,0xFC,0x30,\ - 0x4C,0x1C,0x01,0x93,0xB6,0x13,0xFB,0xF7,0xA1,0x1F,0xBF,0x25,0xE1,0x74,0x37,0x2C,\ - 0x1E,0xA4,0x5E,0x3C,0x68,0xF8,0x4B,0xBF,0x0D,0xB9,0x1E,0x2E,0x36,0xE8,0xA9,0xE4,\ - 0xA7,0xF8,0x0F,0xCB,0x82,0x75,0x7C,0x35,0x2D,0x22,0xD6,0xC2,0xBF,0x0B,0xF3,0xB4,\ - 0xFC,0x6C,0x95,0x61,0x1E,0x57,0xD7,0x04,0x81,0x32,0x83,0x52,0x79,0xE6,0x83,0x63,\ - 0xCF,0xB7,0xCB,0x63,0x8B,0x11,0xE2,0xBD,0x5E,0xEB,0xF6,0x8D,0xED,0x95,0x72,0x28,\ - 0xB4,0xAC,0x12,0x62,0xE9,0x4A,0x33,0xE6,0x83,0x32,0xAE,0x05,0x75,0x95,0xBD,0x84,\ - 0x95,0xDB,0x2A,0x5C,0x9B,0x8E,0x2E,0x0C,0xB8,0x81,0x2B,0x41,0xE6,0x38,0x56,0x9F,\ - 0x49,0x9B,0x6C,0x76,0xFA,0x8A,0x5D,0xF7,0x01,0x79,0x81,0x7C,0xC1,0x83,0x40,0x05,\ - 0xFE,0x71,0xFD,0x0C,0x3F,0xCC,0x4E,0x60,0x09,0x0E,0x65,0x47,0x10,0x2F,0x01,0xC0,\ - 0x05,0x3F,0x8F,0xF8,0xB3,0x41,0xEF,0x5A,0x42,0x7E,0x59,0xEF,0xD2,0x97,0x0C,0x65,\ - 0x02,0x03,0x01,0x00,0x01,0xA3,0x82,0x01,0x34,0x30,0x82,0x01,0x30,0x30,0x0F,0x06,\ - 0x03,0x55,0x1D,0x13,0x01,0x01,0xFF,0x04,0x05,0x30,0x03,0x01,0x01,0xFF,0x30,0x39,\ - 0x06,0x03,0x55,0x1D,0x1F,0x04,0x32,0x30,0x30,0x30,0x2E,0xA0,0x2C,0xA0,0x2A,0x86,\ - 0x28,0x68,0x74,0x74,0x70,0x3A,0x2F,0x2F,0x63,0x72,0x6C,0x2E,0x70,0x6B,0x69,0x2E,\ - 0x77,0x65,0x6C,0x6C,0x73,0x66,0x61,0x72,0x67,0x6F,0x2E,0x63,0x6F,0x6D,0x2F,0x77,\ - 0x73,0x70,0x72,0x63,0x61,0x2E,0x63,0x72,0x6C,0x30,0x0E,0x06,0x03,0x55,0x1D,0x0F,\ - 0x01,0x01,0xFF,0x04,0x04,0x03,0x02,0x01,0xC6,0x30,0x1D,0x06,0x03,0x55,0x1D,0x0E,\ - 0x04,0x16,0x04,0x14,0x26,0x95,0x19,0x10,0xD9,0xE8,0xA1,0x97,0x91,0xFF,0xDC,0x19,\ - 0xD9,0xB5,0x04,0x3E,0xD2,0x73,0x0A,0x6A,0x30,0x81,0xB2,0x06,0x03,0x55,0x1D,0x23,\ - 0x04,0x81,0xAA,0x30,0x81,0xA7,0x80,0x14,0x26,0x95,0x19,0x10,0xD9,0xE8,0xA1,0x97,\ - 0x91,0xFF,0xDC,0x19,0xD9,0xB5,0x04,0x3E,0xD2,0x73,0x0A,0x6A,0xA1,0x81,0x8B,0xA4,\ - 0x81,0x88,0x30,0x81,0x85,0x31,0x0B,0x30,0x09,0x06,0x03,0x55,0x04,0x06,0x13,0x02,\ - 0x55,0x53,0x31,0x20,0x30,0x1E,0x06,0x03,0x55,0x04,0x0A,0x0C,0x17,0x57,0x65,0x6C,\ - 0x6C,0x73,0x20,0x46,0x61,0x72,0x67,0x6F,0x20,0x57,0x65,0x6C,0x6C,0x73,0x53,0x65,\ - 0x63,0x75,0x72,0x65,0x31,0x1C,0x30,0x1A,0x06,0x03,0x55,0x04,0x0B,0x0C,0x13,0x57,\ - 0x65,0x6C,0x6C,0x73,0x20,0x46,0x61,0x72,0x67,0x6F,0x20,0x42,0x61,0x6E,0x6B,0x20,\ - 0x4E,0x41,0x31,0x36,0x30,0x34,0x06,0x03,0x55,0x04,0x03,0x0C,0x2D,0x57,0x65,0x6C,\ - 0x6C,0x73,0x53,0x65,0x63,0x75,0x72,0x65,0x20,0x50,0x75,0x62,0x6C,0x69,0x63,0x20,\ - 0x52,0x6F,0x6F,0x74,0x20,0x43,0x65,0x72,0x74,0x69,0x66,0x69,0x63,0x61,0x74,0x65,\ - 0x20,0x41,0x75,0x74,0x68,0x6F,0x72,0x69,0x74,0x79,0x82,0x01,0x01,0x30,0x0D,0x06,\ - 0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x01,0x05,0x05,0x00,0x03,0x82,0x01,0x01,\ - 0x00,0xB9,0x15,0xB1,0x44,0x91,0xCC,0x23,0xC8,0x2B,0x4D,0x77,0xE3,0xF8,0x9A,0x7B,\ - 0x27,0x0D,0xCD,0x72,0xBB,0x99,0x00,0xCA,0x7C,0x66,0x19,0x50,0xC6,0xD5,0x98,0xED,\ - 0xAB,0xBF,0x03,0x5A,0xE5,0x4D,0xE5,0x1E,0xC8,0x4F,0x71,0x97,0x86,0xD5,0xE3,0x1D,\ - 0xFD,0x90,0xC9,0x3C,0x75,0x77,0x57,0x7A,0x7D,0xF8,0xDE,0xF4,0xD4,0xD5,0xF7,0x95,\ - 0xE6,0x74,0x6E,0x1D,0x3C,0xAE,0x7C,0x9D,0xDB,0x02,0x03,0x05,0x2C,0x71,0x4B,0x25,\ - 0x3E,0x07,0xE3,0x5E,0x9A,0xF5,0x66,0x17,0x29,0x88,0x1A,0x38,0x9F,0xCF,0xAA,0x41,\ - 0x03,0x84,0x97,0x6B,0x93,0x38,0x7A,0xCA,0x30,0x44,0x1B,0x24,0x44,0x33,0xD0,0xE4,\ - 0xD1,0xDC,0x28,0x38,0xF4,0x13,0x43,0x35,0x35,0x29,0x63,0xA8,0x7C,0xA2,0xB5,0xAD,\ - 0x38,0xA4,0xED,0xAD,0xFD,0xC6,0x9A,0x1F,0xFF,0x97,0x73,0xFE,0xFB,0xB3,0x35,0xA7,\ - 0x93,0x86,0xC6,0x76,0x91,0x00,0xE6,0xAC,0x51,0x16,0xC4,0x27,0x32,0x5C,0xDB,0x73,\ - 0xDA,0xA5,0x93,0x57,0x8E,0x3E,0x6D,0x35,0x26,0x08,0x59,0xD5,0xE7,0x44,0xD7,0x76,\ - 0x20,0x63,0xE7,0xAC,0x13,0x67,0xC3,0x6D,0xB1,0x70,0x46,0x7C,0xD5,0x96,0x11,0x3D,\ - 0x89,0x6F,0x5D,0xA8,0xA1,0xEB,0x8D,0x0A,0xDA,0xC3,0x1D,0x33,0x6C,0xA3,0xEA,0x67,\ - 0x19,0x9A,0x99,0x7F,0x4B,0x3D,0x83,0x51,0x2A,0x1D,0xCA,0x2F,0x86,0x0C,0xA2,0x7E,\ - 0x10,0x2D,0x2B,0xD4,0x16,0x95,0x0B,0x07,0xAA,0x2E,0x14,0x92,0x49,0xB7,0x29,0x6F,\ - 0xD8,0x6D,0x31,0x7D,0xF5,0xFC,0xA1,0x10,0x07,0x87,0xCE,0x2F,0x59,0xDC,0x3E,0x58,\ - 0xDB ; "Network Solutions Certificate Authority" (1002 bytes) HKLM,"SOFTWARE\Microsoft\SystemCertificates\AuthRoot\Certificates\74F8A3C3EFE7B390064B83903C21646020E5DFCE","Blob",0x00000001,\

1 0

[ashaposhnikov] 75376: [RAPPS] Fixed multiple redraws of the apps list
by ashaposhnikov＠svn.reactos.org 19 Jul '17

19 Jul '17

Author: ashaposhnikov Date: Wed Jul 19 11:35:46 2017 New Revision: 75376 URL: http://svn.reactos.org/svn/reactos?rev=75376&view=rev Log: [RAPPS] Fixed multiple redraws of the apps list Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Wed Jul 19 11:35:46 2017 @@ -555,7 +555,7 @@ CMainWindow() : m_ClientPanel(NULL), pLink(NULL), - SearchEnabled(TRUE) + SearchEnabled(FALSE) { } private: @@ -574,7 +574,7 @@ szText.LoadStringW(hInst, IDS_APP_DESCRIPTION); m_ListView->AddColumn(3, szText, 250, LVCFMT_LEFT); - UpdateApplicationsList(ENUM_ALL_COMPONENTS); + //UpdateApplicationsList(ENUM_ALL_COMPONENTS); } HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex) @@ -1068,7 +1068,8 @@ if (wParam == SEARCH_TIMER_ID) { ::KillTimer(hwnd, SEARCH_TIMER_ID); - UpdateApplicationsList(-1); + if(SearchEnabled) + UpdateApplicationsList(-1); } break; }

1 0

[ashaposhnikov] 75375: [RAPPS] Translations - Implemented HasNativeLanguage() and HasEnglishLanguage() - Moved config parser to it's own class CConfigParser - Added translation strings
by ashaposhnikov＠svn.reactos.org 19 Jul '17

19 Jul '17

Author: ashaposhnikov Date: Wed Jul 19 10:39:03 2017 New Revision: 75375 URL: http://svn.reactos.org/svn/reactos?rev=75375&view=rev Log: [RAPPS] Translations - Implemented HasNativeLanguage() and HasEnglishLanguage() - Moved config parser to it's own class CConfigParser - Added translation strings Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -13,48 +13,49 @@ // CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) + : m_Parser(sFileNameParam) { LicenseType = LICENSE_TYPE::None; sFileName = sFileNameParam; - RetrieveCategory(); + + RetrieveGeneralInfo(); } VOID CAvailableApplicationInfo::RefreshAppInfo() { - if (RetrieveGeneralInfo()) - { - RetrieveLicenseType(); - RetrieveLanguages(); - RetrieveInstalledStatus(); - if (m_IsInstalled) - { - RetrieveInstalledVersion(); - } - } -} - -BOOL CAvailableApplicationInfo::RetrieveGeneralInfo() -{ if (szUrlDownload.IsEmpty()) { - if (!GetString(L"Name", szName) - || !GetString(L"URLDownload", szUrlDownload)) - { - return FALSE; - } - - GetString(L"RegName", szRegName); - GetString(L"Version", szVersion); - GetString(L"License", szLicense); - GetString(L"Description", szDesc); - GetString(L"Size", szSize); - GetString(L"URLSite", szUrlSite); - GetString(L"CDPath", szCDPath); - GetString(L"Language", szRegName); - GetString(L"SHA1", szSHA1); - return TRUE; - } - return FALSE; + RetrieveGeneralInfo(); + } +} + +VOID CAvailableApplicationInfo::RetrieveGeneralInfo() +{ + Category = m_Parser.GetInt(L"Category"); + + if (!GetString(L"Name", szName) + || !GetString(L"URLDownload", szUrlDownload)) + { + return; + } + + GetString(L"RegName", szRegName); + GetString(L"Version", szVersion); + GetString(L"License", szLicense); + GetString(L"Description", szDesc); + GetString(L"Size", szSize); + GetString(L"URLSite", szUrlSite); + GetString(L"CDPath", szCDPath); + GetString(L"Language", szRegName); + GetString(L"SHA1", szSHA1); + + RetrieveLicenseType(); + RetrieveLanguages(); + RetrieveInstalledStatus(); + if (m_IsInstalled) + { + RetrieveInstalledVersion(); + } } VOID CAvailableApplicationInfo::RetrieveInstalledStatus() @@ -69,114 +70,146 @@ || ::GetInstalledVersion(&szInstalledVersion, szName); } -BOOL CAvailableApplicationInfo::RetrieveLanguages() +VOID CAvailableApplicationInfo::RetrieveLanguages() { const WCHAR cDelimiter = L'|'; ATL::CStringW szBuffer; // TODO: Get multiline parameter - if (!ParserGetString(L"Languages", sFileName, szBuffer)) - return FALSE; + if (!m_Parser.GetString(L"Languages", szBuffer)) + { + m_HasLanguageInfo = FALSE; + return; + } // Parse parameter string - ATL::CStringW szLocale; + ATL::CStringW m_szLocale; for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i) { if (szBuffer[i] != cDelimiter) { - szLocale += szBuffer[i]; + m_szLocale += szBuffer[i]; } else { - Languages.Add(szLocale); - szLocale.Empty(); + Languages.Add(m_szLocale); + m_szLocale.Empty(); } } // For the text after delimiter - if (!szLocale.IsEmpty()) - { - Languages.Add(szLocale); - } - + if (!m_szLocale.IsEmpty()) + { + Languages.Add(m_szLocale); + } + + m_HasLanguageInfo = TRUE; +} + +VOID CAvailableApplicationInfo::RetrieveLicenseType() +{ + INT IntBuffer = m_Parser.GetInt(L"LicenseType"); + + if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) + { + LicenseType = LICENSE_TYPE::None; + } + else + { + LicenseType = (LICENSE_TYPE) IntBuffer; + } +} + +BOOL CAvailableApplicationInfo::HasLanguageInfo() const +{ + return m_HasLanguageInfo; +} + +BOOL CAvailableApplicationInfo::HasNativeLanguage() const +{ + if (!m_HasLanguageInfo) + { + return FALSE; + } + + //Find locale code in the list + const INT nLanguagesSize = Languages.GetSize(); + for (INT i = 0; i < nLanguagesSize; ++i) + { + if (Languages[i] == CConfigParser::GetLocale()) + { + return TRUE; + } + } + + return FALSE; +} + +BOOL CAvailableApplicationInfo::HasEnglishLanguage() const +{ + static ATL::CStringW szEnglishLocaleID; + const INT cchLocaleSize = m_Parser.GetLocaleSize(); + if (!m_HasLanguageInfo) + { + return FALSE; + } + + //Get English locale code + if (szEnglishLocaleID.IsEmpty()) + { + INT result = GetLocaleInfoW(MAKELCID(LANG_ENGLISH, SORT_DEFAULT), LOCALE_ILANGUAGE, + szEnglishLocaleID.GetBuffer(cchLocaleSize), cchLocaleSize); + szEnglishLocaleID.ReleaseBuffer(); + if (result != ERROR_SUCCESS) + { + return FALSE; + } + + } + + //Find locale code in the list + const INT nLanguagesSize = Languages.GetSize(); + for (INT i = 0; i < nLanguagesSize; ++i) + { + if (Languages[i] == szEnglishLocaleID) + { + return TRUE; + } + } + + return FALSE; +} + +BOOL CAvailableApplicationInfo::IsInstalled() const +{ + return m_IsInstalled; +} + +BOOL CAvailableApplicationInfo::HasInstalledVersion() const +{ + return m_HasInstalledVersion; +} + +BOOL CAvailableApplicationInfo::HasUpdate() const +{ + return (szInstalledVersion.Compare(szVersion) < 0) ? TRUE : FALSE; +} + +VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) +{ + RtlCopyMemory(&ftCacheStamp, ftTime, sizeof(FILETIME)); +} + +inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString) +{ + if (!m_Parser.GetString(lpKeyName, ReturnedString)) + { + ReturnedString.Empty(); + return FALSE; + } return TRUE; } - -VOID CAvailableApplicationInfo::RetrieveLicenseType() -{ - INT IntBuffer = ParserGetInt(L"LicenseType", sFileName); - - if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max) - { - LicenseType = LICENSE_TYPE::None; - } - else - { - LicenseType = (LICENSE_TYPE) IntBuffer; - } -} - -VOID CAvailableApplicationInfo::RetrieveCategory() -{ - Category = ParserGetInt(L"Category", sFileName); -} - -BOOL CAvailableApplicationInfo::HasLanguageInfo() const -{ - return m_HasLanguageInfo; -} - -BOOL CAvailableApplicationInfo::HasNativeLanguage() const -{ - if (!m_HasLanguageInfo) - { - return FALSE; - } - - //TODO: make the actual check - return TRUE; -} - -BOOL CAvailableApplicationInfo::HasEnglishLanguage() const -{ - if (!m_HasLanguageInfo) - { - return FALSE; - } - - //TODO: make the actual check - return TRUE; -} - -BOOL CAvailableApplicationInfo::IsInstalled() const -{ - return m_IsInstalled; -} - -BOOL CAvailableApplicationInfo::HasInstalledVersion() const -{ - return m_HasInstalledVersion; -} - -BOOL CAvailableApplicationInfo::HasUpdate() const -{ - return (szInstalledVersion.Compare(szVersion) < 0) ? TRUE : FALSE; -} - -VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime) -{ - RtlCopyMemory(&ftCacheStamp, ftTime, sizeof(FILETIME)); -} - -inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString) -{ - if (!ParserGetString(lpKeyName, sFileName, ReturnedString)) - { - ReturnedString.Empty(); - return FALSE; - } - return TRUE; -} +// CAvailableApplicationInfo // CAvailableApps CAvailableApps::CAvailableApps() @@ -277,7 +310,7 @@ do { - /* loop for all the cached entries */ + // loop for all the cached entries POSITION CurrentListPosition = m_InfoList.GetHeadPosition(); CAvailableApplicationInfo* Info = NULL; @@ -286,13 +319,13 @@ POSITION LastListPosition = CurrentListPosition; Info = m_InfoList.GetNext(CurrentListPosition); - /* do we already have this entry in cache? */ + // do we already have this entry in cache? if (Info->sFileName == FindFileData.cFileName) { - /* is it current enough, or the file has been modified since our last time here? */ + // is it current enough, or the file has been modified since our last time here? if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->ftCacheStamp) == 1) { - /* recreate our cache, this is the slow path */ + // recreate our cache, this is the slow path m_InfoList.RemoveAt(LastListPosition); delete Info; @@ -301,16 +334,16 @@ } else { - /* speedy path, compare directly, we already have the data */ + // speedy path, compare directly, we already have the data goto skip_if_cached; } } } - /* create a new entry */ + // create a new entry Info = new CAvailableApplicationInfo(FindFileData.cFileName); - /* set a timestamp for the next time */ + // set a timestamp for the next time Info->SetLastWriteTime(&FindFileData.ftLastWriteTime); m_InfoList.AddTail(Info); @@ -361,3 +394,112 @@ { return m_szPath.GetString(); } +// CAvailableApps + +// CConfigParser +ATL::CStringW CConfigParser::m_szLocale; +ATL::CStringW CConfigParser::m_szCachedINISectionLocale; +ATL::CStringW CConfigParser::m_szCachedINISectionLocaleNeutral; + +CConfigParser::CConfigParser(const ATL::CStringW& FileName) : szConfigPath(GetINIFullPath(FileName)) +{ + // we don't have cached section strings for the current system language, create them, lazy + CacheINILocaleLazy(); +} + +ATL::CStringW CConfigParser::GetINIFullPath(const ATL::CStringW& FileName) +{ + ATL::CStringW szDir; + static ATL::CStringW szBuffer; + + GetStorageDirectory(szDir); + szBuffer.Format(L"%ls\\rapps\\%ls", szDir, FileName); + + return szBuffer; +} + +VOID CConfigParser::CacheINILocaleLazy() +{ + if (m_szLocale.IsEmpty()) + { + // 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(LOCALE_USER_DEFAULT, LOCALE_ILANGUAGE, + m_szLocale.GetBuffer(m_cchLocaleSize), m_cchLocaleSize); + m_szLocale.ReleaseBuffer(); + m_szCachedINISectionLocale = L"Section." + m_szLocale; + + // turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part + m_szCachedINISectionLocaleNeutral = m_szCachedINISectionLocale + m_szLocale.Right(2); + } +} + +const ATL::CStringW& CConfigParser::GetLocale() +{ + CacheINILocaleLazy(); + return m_szLocale; +} + +INT CConfigParser::GetLocaleSize() +{ + return m_cchLocaleSize; +} + +UINT CConfigParser::GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString) +{ + DWORD dwResult; + + LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); + // 1st - find localized strings (e.g. "Section.0c0a") + dwResult = GetPrivateProfileStringW(m_szCachedINISectionLocale.GetString(), + KeyName.GetString(), + NULL, + ResultStringBuffer, + MAX_PATH, + szConfigPath.GetString()); + + if (!dwResult) + { + // 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") + dwResult = GetPrivateProfileStringW(m_szCachedINISectionLocaleNeutral.GetString(), + KeyName.GetString(), + NULL, + ResultStringBuffer, + MAX_PATH, + szConfigPath.GetString()); + if (!dwResult) + { + // 3rd - if they weren't present fallback to standard english strings (just "Section") + dwResult = GetPrivateProfileStringW(L"Section", + KeyName.GetString(), + NULL, + ResultStringBuffer, + MAX_PATH, + szConfigPath.GetString()); + } + } + + ResultString.ReleaseBuffer(); + return (dwResult != 0 ? TRUE : FALSE); +} + +UINT CConfigParser::GetInt(const ATL::CStringW& KeyName) +{ + ATL::CStringW Buffer; + UNICODE_STRING BufferW; + ULONG Result; + + // grab the text version of our entry + if (!GetString(KeyName, Buffer)) + return FALSE; + + if (Buffer.IsEmpty()) + return FALSE; + + // convert it to an actual integer + RtlInitUnicodeString(&BufferW, Buffer.GetString()); + RtlUnicodeStringToInteger(&BufferW, 0, &Result); + + return (UINT) Result; +} +// CConfigParser Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -102,33 +102,48 @@ static VOID InsertLanguageInfo_RichEdit(CAvailableApplicationInfo* Info) { + if (!Info->HasLanguageInfo()) + { + return; + } + const INT nTranslations = Info->Languages.GetSize(); ATL::CStringW szLangInfo; ATL::CStringW szLoadedTextAvailability; ATL::CStringW szLoadedAInfoText; szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES); + + //TODO: replace those hardcoded strings if (Info->HasNativeLanguage()) { szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION); + if (nTranslations > 1) + { + szLangInfo.Format(L" (+%d more)", nTranslations - 1); + } + else + { + szLangInfo.LoadStringW(IDS_LANGUAGE_SINGLE); + szLangInfo = L" (" + szLangInfo + L")"; + } } else if (Info->HasEnglishLanguage()) { szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION); + if (nTranslations > 1) + { + szLangInfo.Format(L" (+%d available)", nTranslations - 1); + } + else + { + szLangInfo.LoadStringW(IDS_LANGUAGE_SINGLE); + szLangInfo = L" (" + szLangInfo + L")"; + } } else { szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_NO_TRANSLATION); - } - - if (nTranslations > 1) - { - szLangInfo.Format(L" (+%d more)", nTranslations - 1); - } - else - { - szLangInfo.LoadStringW(IDS_LANGUAGE_SINGLE); - szLangInfo = L" (" + szLangInfo + L")"; } InsertRichEditText(szLoadedAInfoText, CFE_BOLD); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -228,9 +228,8 @@ STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "In your language" - IDS_LANGUAGE_NO_TRANSLATION "In your language" - IDS_LANGUAGE_NOT_AVAILABLE "No translations" - IDS_LANGUAGE_ENGLISH_TRANSLATION "In English" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" + IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" IDS_LANGUAGE_SINGLE "Single language" END Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -223,4 +223,12 @@ IDS_LICENSE_OPENSOURCE "Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ ÐÐ" IDS_LICENSE_FREEWARE "ÐÐµÑÐ¿Ð»Ð°ÑÐ½Ð¾Ðµ ÐÐ" IDS_LICENSE_TRIAL "ÐÑÐ¾Ð±Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ" +END + +STRINGTABLE +BEGIN + IDS_LANGUAGE_AVAILABLE_TRANSLATION "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÑÐ·ÑÐºÐµ" + IDS_LANGUAGE_NO_TRANSLATION "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ Ð½Ð° Ð´ÑÑÐ³Ð¸Ñ ÑÐ·ÑÐºÐ°Ñ" + IDS_LANGUAGE_ENGLISH_TRANSLATION "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ Ð½Ð° ÐÐ½Ð³Ð»Ð¸Ð¹ÑÐºÐ¾Ð¼" + IDS_LANGUAGE_SINGLE "ÐÐ´Ð¸Ð½ ÑÐ·ÑÐº" END Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -231,4 +231,12 @@ IDS_LICENSE_OPENSOURCE "ÐÑÐ»ÑÐ½Ðµ ÐÐ" IDS_LICENSE_FREEWARE "ÐÐµÐ·ÐºÐ¾ÑÑÐ¾Ð²Ð½Ðµ ÐÐ" IDS_LICENSE_TRIAL "ÐÑÐ¾Ð±Ð½Ð° Ð²ÐµÑÑÑÑ" +END + +STRINGTABLE +BEGIN + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Ð Ð¿ÐµÑÐµÐºÐ»Ð°Ð´ Ð²Ð°ÑÐ¾Ñ Ð¼Ð¾Ð²Ð¾Ñ" + IDS_LANGUAGE_NO_TRANSLATION "ÐÐ¾ÑÑÑÐ¿Ð½Ð¾ ÑÐ½ÑÐ¸Ð¼Ð¸ Ð¼Ð¾Ð²Ð°Ð¼Ð¸" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Ð Ð¿ÐµÑÐµÐºÐ»Ð°Ð´ ÐÐ½Ð³Ð»ÑÐ¹ÑÑÐºÐ¾Ñ" + IDS_LANGUAGE_SINGLE "ÐÐ´Ð½Ð° Ð¼Ð¾Ð²Ð°" END Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -15,12 +15,6 @@ #define EXTRACT_EXTRACTFILES 0x00000002 static HANDLE hLog = NULL; -ATL::CStringW szCachedINISectionLocale = L"Section."; -ATL::CStringW szCachedINISectionLocaleNeutral; -BYTE bCachedSectionStatus = FALSE; - -#define LOCALIZED_STRING_LEN MAX_PATH -#define STR_VERSION_CURRENT L"CURRENT" typedef struct { @@ -404,91 +398,4 @@ } -ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName) -{ - ATL::CStringW szDir; - static ATL::CStringW szBuffer; - - GetStorageDirectory(szDir); - szBuffer.Format(L"%ls\\rapps\\%ls", szDir, FileName); - - return szBuffer; -} - -UINT ParserGetString(const ATL::CStringW& KeyName, const ATL::CStringW& FileName, ATL::CStringW& ResultString) -{ - ATL::CStringW FullFileName = GetINIFullPath(FileName); - DWORD dwResult; - - /* we don't have cached section strings for the current system language, create them */ - if (bCachedSectionStatus == FALSE) - { - ATL::CStringW szLocale; - const INT LocaleSize = 5; - - /* find out what is the current system lang code (e.g. "0a") and append it to SectionLocale */ - GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_ILANGUAGE, - szLocale.GetBuffer(LocaleSize), LocaleSize); - szLocale.ReleaseBuffer(); - - /* turn "Section.0c0a" into "Section.0a", keeping just the neutral lang part */ - szCachedINISectionLocaleNeutral = szCachedINISectionLocale + szLocale.Right(2); - szCachedINISectionLocale += szLocale; - - /* finally, mark us as cache-friendly for the next time */ - bCachedSectionStatus = TRUE; - } - - LPWSTR ResultStringBuffer = ResultString.GetBuffer(MAX_PATH); - /* 1st - find localized strings (e.g. "Section.0c0a") */ - dwResult = GetPrivateProfileStringW(szCachedINISectionLocale.GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - LOCALIZED_STRING_LEN, - FullFileName.GetString()); - - if (!dwResult) - { - /* 2nd - if they weren't present check for neutral sub-langs/ generic translations (e.g. "Section.0a") */ - dwResult = GetPrivateProfileStringW(szCachedINISectionLocaleNeutral.GetString(), - KeyName.GetString(), - NULL, - ResultStringBuffer, - LOCALIZED_STRING_LEN, - FullFileName.GetString()); - if (!dwResult) - { - /* 3rd - if they weren't present fallback to standard english strings (just "Section") */ - dwResult = GetPrivateProfileStringW(L"Section", - KeyName.GetString(), - NULL, - ResultStringBuffer, - LOCALIZED_STRING_LEN, - FullFileName.GetString()); - } - } - - ResultString.ReleaseBuffer(); - return (dwResult != 0 ? TRUE : FALSE); -} - -UINT ParserGetInt(const ATL::CStringW& KeyName, const ATL::CStringW& FileName) -{ - ATL::CStringW Buffer; - UNICODE_STRING BufferW; - ULONG Result; - - /* grab the text version of our entry */ - if (!ParserGetString(KeyName, FileName, Buffer)) - return FALSE; - - if (Buffer.IsEmpty()) - return FALSE; - - /* convert it to an actual integer */ - RtlInitUnicodeString(&BufferW, Buffer.GetString()); - RtlUnicodeStringToInteger(&BufferW, 0, &Result); - - return (UINT) Result; -} + Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/rapps.h [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -143,18 +143,38 @@ } SETTINGS_INFO, *PSETTINGS_INFO; /* available.cpp */ +class CConfigParser +{ + // Loacale names cache + static ATL::CStringW m_szLocale; + const static INT m_cchLocaleSize = 5; + static ATL::CStringW m_szCachedINISectionLocale; + static ATL::CStringW m_szCachedINISectionLocaleNeutral; + + const LPCWSTR STR_VERSION_CURRENT = L"CURRENT"; + const ATL::CStringW szConfigPath; + + static ATL::CStringW GetINIFullPath(const ATL::CStringW& FileName); + static VOID CacheINILocaleLazy(); + +public: + static const ATL::CStringW& GetLocale(); + static INT CConfigParser::GetLocaleSize(); + + CConfigParser(const ATL::CStringW& FileName); + + UINT GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); + UINT GetInt(const ATL::CStringW& KeyName); +}; + typedef BOOL (CALLBACK *AVAILENUMPROC)(PAPPLICATION_INFO Info, LPCWSTR szFolderPath); struct CAvailableApplicationInfo : public APPLICATION_INFO { ATL::CStringW szInstalledVersion; - CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam); // Load all info from the file VOID RefreshAppInfo(); - - - BOOL HasLanguageInfo() const; BOOL HasNativeLanguage() const; BOOL HasEnglishLanguage() const; @@ -169,17 +189,17 @@ BOOL m_IsInstalled = FALSE; BOOL m_HasLanguageInfo = FALSE; BOOL m_HasInstalledVersion = FALSE; + CConfigParser m_Parser; inline BOOL GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString); // Lazily load general info from the file - BOOL RetrieveGeneralInfo(); + VOID RetrieveGeneralInfo(); VOID RetrieveInstalledStatus(); VOID RetrieveInstalledVersion(); - BOOL RetrieveLanguages(); + VOID RetrieveLanguages(); VOID RetrieveLicenseType(); - VOID RetrieveCategory(); }; class CAvailableApps @@ -248,9 +268,6 @@ VOID FreeLogs(VOID); BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg); -UINT ParserGetString(const ATL::CStringW& KeyName, const ATL::CStringW& FileName, ATL::CStringW& ReturnedString); -UINT ParserGetInt(const ATL::CStringW& KeyName, const ATL::CStringW& FileName); - /* settingsdlg.cpp */ VOID CreateSettingsDlg(HWND hwnd); Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/resource.h [iso-8859-1] Wed Jul 19 10:39:03 2017 @@ -181,9 +181,8 @@ /* Language related strings */ #define IDS_LANGUAGE_AVAILABLE_TRANSLATION 910 #define IDS_LANGUAGE_NO_TRANSLATION 911 -#define IDS_LANGUAGE_NOT_AVAILABLE 912 -#define IDS_LANGUAGE_ENGLISH_TRANSLATION 913 -#define IDS_LANGUAGE_SINGLE 914 +#define IDS_LANGUAGE_ENGLISH_TRANSLATION 912 +#define IDS_LANGUAGE_SINGLE 913 /* Accelerators */ #define HOTKEYS 715

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

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 July 2017