Ros-diffs January 2018

ros-diffs@reactos.org

37 participants
372 discussions

01/01: [SC] print.c: Minor code improvements. (#324)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e868f2604c73cb830e4c… commit 2e868f2604c73cb830e4cd8e17fdf345c82cad6d Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Sat Jan 27 20:54:26 2018 +0100 Commit: Ged Murphy <gedmurphy(a)reactos.org> CommitDate: Sat Jan 27 19:54:26 2018 +0000 [SC] print.c: Minor code improvements. (#324) - Plus: Update license header. - Re-use PrintServiceStatus(), as SERVICE_STATUS_PROCESS is in fact an extension of SERVICE_STATUS. - Use the "SERVICE_*" defines, not magic numbers. --- base/applications/sc/print.c | 124 +++++++++++-------------------------------- 1 file changed, 31 insertions(+), 93 deletions(-) diff --git a/base/applications/sc/print.c b/base/applications/sc/print.c index 7c3a26a2fd..caf82a4ae6 100644 --- a/base/applications/sc/print.c +++ b/base/applications/sc/print.c @@ -1,10 +1,10 @@ /* * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * FILE: base/applications/sc/print.c * PURPOSE: print service info * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * + * Copyright 2016 Eric Kohl <eric.kohl(a)reactos.org> */ #include "sc.h" @@ -16,81 +16,8 @@ PrintService(LPCTSTR lpServiceName, { _tprintf(_T("SERVICE_NAME: %s\n"), lpServiceName); - _tprintf(_T("\tTYPE : %x "), - (unsigned int)pStatus->dwServiceType); - switch (pStatus->dwServiceType) - { - case SERVICE_KERNEL_DRIVER: - _tprintf(_T("KERNEL_DRIVER\n")); - break; - - case SERVICE_FILE_SYSTEM_DRIVER: - _tprintf(_T("FILE_SYSTEM_DRIVER\n")); - break; - - case SERVICE_WIN32_OWN_PROCESS: - _tprintf(_T("WIN32_OWN_PROCESS\n")); - break; - - case SERVICE_WIN32_SHARE_PROCESS: - _tprintf(_T("WIN32_SHARE_PROCESS\n")); - break; - - case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: - _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); - break; - - case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: - _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); - break; - - default : _tprintf(_T("\n")); break; - } - - _tprintf(_T("\tSTATE : %x "), - (unsigned int)pStatus->dwCurrentState); - - switch (pStatus->dwCurrentState) - { - case 1 : _tprintf(_T("STOPPED\n")); break; - case 2 : _tprintf(_T("START_PENDING\n")); break; - case 3 : _tprintf(_T("STOP_PENDING\n")); break; - case 4 : _tprintf(_T("RUNNING\n")); break; - case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; - case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; - case 7 : _tprintf(_T("PAUSED\n")); break; - default : _tprintf(_T("\n")); break; - } - - _tprintf(_T("\t\t\t\t(")); - - if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_STOP) - _tprintf(_T("STOPPABLE,")); - else - _tprintf(_T("NOT_STOPPABLE,")); - - if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_PAUSE_CONTINUE) - _tprintf(_T("PAUSABLE,")); - else - _tprintf(_T("NOT_PAUSABLE,")); - - if (pStatus->dwControlsAccepted & SERVICE_ACCEPT_SHUTDOWN) - _tprintf(_T("ACCEPTS_SHUTDOWN")); - else - _tprintf(_T("IGNORES_SHUTDOWN")); - - _tprintf(_T(")\n")); - - _tprintf(_T("\tWIN32_EXIT_CODE : %u (0x%x)\n"), - (unsigned int)pStatus->dwWin32ExitCode, - (unsigned int)pStatus->dwWin32ExitCode); - _tprintf(_T("\tSERVICE_EXIT_CODE : %u (0x%x)\n"), - (unsigned int)pStatus->dwServiceSpecificExitCode, - (unsigned int)pStatus->dwServiceSpecificExitCode); - _tprintf(_T("\tCHECKPOINT : 0x%x\n"), - (unsigned int)pStatus->dwCheckPoint); - _tprintf(_T("\tWAIT_HINT : 0x%x\n"), - (unsigned int)pStatus->dwWaitHint); + // Re-use PrintServiceStatus(), as SERVICE_STATUS_PROCESS is in fact an extension of SERVICE_STATUS. + PrintServiceStatus((LPSERVICE_STATUS)pStatus); if (bExtended) { @@ -110,33 +37,29 @@ PrintServiceStatus( { _tprintf(_T("\tTYPE : %x "), (unsigned int)pStatus->dwServiceType); + switch (pStatus->dwServiceType) { case SERVICE_KERNEL_DRIVER: _tprintf(_T("KERNEL_DRIVER\n")); break; - case SERVICE_FILE_SYSTEM_DRIVER: _tprintf(_T("FILE_SYSTEM_DRIVER\n")); break; - case SERVICE_WIN32_OWN_PROCESS: _tprintf(_T("WIN32_OWN_PROCESS\n")); break; - case SERVICE_WIN32_SHARE_PROCESS: _tprintf(_T("WIN32_SHARE_PROCESS\n")); break; - case SERVICE_WIN32_OWN_PROCESS + SERVICE_INTERACTIVE_PROCESS: _tprintf(_T("WIN32_OWN_PROCESS (interactive)\n")); break; - case SERVICE_WIN32_SHARE_PROCESS + SERVICE_INTERACTIVE_PROCESS: _tprintf(_T("WIN32_SHARE_PROCESS (interactive)\n")); break; - - default : _tprintf(_T("\n")); break; + default: + _tprintf(_T("\n")); } _tprintf(_T("\tSTATE : %x "), @@ -144,14 +67,29 @@ PrintServiceStatus( switch (pStatus->dwCurrentState) { - case 1 : _tprintf(_T("STOPPED\n")); break; - case 2 : _tprintf(_T("START_PENDING\n")); break; - case 3 : _tprintf(_T("STOP_PENDING\n")); break; - case 4 : _tprintf(_T("RUNNING\n")); break; - case 5 : _tprintf(_T("CONTINUE_PENDING\n")); break; - case 6 : _tprintf(_T("PAUSE_PENDING\n")); break; - case 7 : _tprintf(_T("PAUSED\n")); break; - default : _tprintf(_T("\n")); break; + case SERVICE_STOPPED: + _tprintf(_T("STOPPED\n")); + break; + case SERVICE_START_PENDING: + _tprintf(_T("START_PENDING\n")); + break; + case SERVICE_STOP_PENDING: + _tprintf(_T("STOP_PENDING\n")); + break; + case SERVICE_RUNNING: + _tprintf(_T("RUNNING\n")); + break; + case SERVICE_CONTINUE_PENDING: + _tprintf(_T("CONTINUE_PENDING\n")); + break; + case SERVICE_PAUSE_PENDING: + _tprintf(_T("PAUSE_PENDING\n")); + break; + case SERVICE_PAUSED: + _tprintf(_T("PAUSED\n")); + break; + default: + _tprintf(_T("\n")); } _tprintf(_T("\t\t\t\t(")); @@ -183,4 +121,4 @@ PrintServiceStatus( (unsigned int)pStatus->dwCheckPoint); _tprintf(_T("\tWAIT_HINT : 0x%x\n"), (unsigned int)pStatus->dwWaitHint); -} \ No newline at end of file +}

6 years, 11 months

01/01: [EXPLORER] CTrayNotifyWnd: Simplify how it interacts with its parent and children. Clean up.

by Giannis Adamopoulos

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7f35908ad27b76a7e1d96… commit 7f35908ad27b76a7e1d9653fb7fe55abaf7f5c83 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sat Jan 27 01:27:24 2018 +0200 Commit: Giannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sat Jan 27 19:41:09 2018 +0200 [EXPLORER] CTrayNotifyWnd: Simplify how it interacts with its parent and children. Clean up. --- base/shell/explorer/precomp.h | 26 +----- base/shell/explorer/syspager.cpp | 143 ++++++++++++++++---------------- base/shell/explorer/syspager.h | 18 ++-- base/shell/explorer/trayclock.cpp | 68 +++++++++------ base/shell/explorer/trayclock.h | 10 +-- base/shell/explorer/trayntfy.cpp | 169 +++++++------------------------------- base/shell/explorer/traywnd.cpp | 25 ++---- 7 files changed, 167 insertions(+), 292 deletions(-) diff --git a/base/shell/explorer/precomp.h b/base/shell/explorer/precomp.h index 1aacb42ce3..2473096233 100644 --- a/base/shell/explorer/precomp.h +++ b/base/shell/explorer/precomp.h @@ -337,8 +337,6 @@ CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); /* TrayNotifyWnd */ #define TNWM_GETMINIMUMSIZE (WM_USER + 0x100) -#define TNWM_UPDATETIME (WM_USER + 0x101) -#define TNWM_SHOWCLOCK (WM_USER + 0x102) #define TNWM_SHOWTRAY (WM_USER + 0x103) #define TNWM_CHANGETRAYPOS (WM_USER + 0x104) @@ -346,20 +344,7 @@ CreateStartMenuSite(IN OUT ITrayWindow *Tray, const IID & riid, PVOID * ppv); class CTrayNotifyWnd; -BOOL -RegisterTrayNotifyWndClass(VOID); - -VOID -UnregisterTrayNotifyWndClass(VOID); - -HWND -CreateTrayNotifyWnd(IN OUT ITrayWindow *TrayWindow, CTrayNotifyWnd** ppTrayNotify); - -BOOL -TrayNotify_NotifyIconCmd(CTrayNotifyWnd* pTrayNotify, IN WPARAM wParam, IN LPARAM lParam); - -BOOL -TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock); +HWND CreateTrayNotifyWnd(IN HWND hwndParent, CTrayNotifyWnd** ppinstance); /* * taskswnd.c @@ -368,15 +353,8 @@ TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock); #define TSWM_ENABLEGROUPING (WM_USER + 1) #define TSWM_UPDATETASKBARPOS (WM_USER + 2) -BOOL -RegisterTaskSwitchWndClass(VOID); - -VOID -UnregisterTaskSwitchWndClass(VOID); - HWND -CreateTaskSwitchWnd(IN HWND hWndParent, -IN OUT ITrayWindow *Tray); +CreateTaskSwitchWnd(IN HWND hWndParent, IN OUT ITrayWindow *Tray); HRESULT Tray_OnStartMenuDismissed(ITrayWindow* Tray); diff --git a/base/shell/explorer/syspager.cpp b/base/shell/explorer/syspager.cpp index 7a55360853..c404d3a57f 100644 --- a/base/shell/explorer/syspager.cpp +++ b/base/shell/explorer/syspager.cpp @@ -93,7 +93,7 @@ void CIconWatcher::Uninitialize() LeaveCriticalSection(&m_ListLock); } -bool CIconWatcher::AddIconToWatcher(_In_ NOTIFYICONDATA *iconData) +bool CIconWatcher::AddIconToWatcher(_In_ CONST NOTIFYICONDATA *iconData) { DWORD ProcessId; (void)GetWindowThreadProcessId(iconData->hWnd, &ProcessId); @@ -132,7 +132,7 @@ bool CIconWatcher::AddIconToWatcher(_In_ NOTIFYICONDATA *iconData) return Added; } -bool CIconWatcher::RemoveIconFromWatcher(_In_ NOTIFYICONDATA *iconData) +bool CIconWatcher::RemoveIconFromWatcher(_In_ CONST NOTIFYICONDATA *iconData) { EnterCriticalSection(&m_ListLock); @@ -146,7 +146,7 @@ bool CIconWatcher::RemoveIconFromWatcher(_In_ NOTIFYICONDATA *iconData) return true; } -IconWatcherData* CIconWatcher::GetListEntry(_In_opt_ NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove) +IconWatcherData* CIconWatcher::GetListEntry(_In_opt_ CONST NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove) { IconWatcherData *Entry = NULL; POSITION NextPosition = m_WatcherList.GetHeadPosition(); @@ -236,9 +236,7 @@ UINT WINAPI CIconWatcher::WatcherThread(_In_opt_ LPVOID lpParam) data.lpData = pnotify_data; BOOL Success = FALSE; - HWND parentHWND = ::GetParent(GetParent(This->m_hwndSysTray)); - if (parentHWND) - Success = ::SendMessage(parentHWND, WM_COPYDATA, (WPARAM)&Icon->IconData, (LPARAM)&data); + ::SendMessage(This->m_hwndSysTray, WM_COPYDATA, (WPARAM)&Icon->IconData, (LPARAM)&data); delete pnotify_data; @@ -477,7 +475,7 @@ int CNotifyToolbar::FindExistingSharedIcon(HICON handle) return -1; } -BOOL CNotifyToolbar::AddButton(IN CONST NOTIFYICONDATA *iconData) +BOOL CNotifyToolbar::AddButton(_In_ CONST NOTIFYICONDATA *iconData) { TBBUTTON tbBtn; InternalIconData * notifyItem; @@ -575,7 +573,7 @@ BOOL CNotifyToolbar::AddButton(IN CONST NOTIFYICONDATA *iconData) return TRUE; } -BOOL CNotifyToolbar::SwitchVersion(IN CONST NOTIFYICONDATA *iconData) +BOOL CNotifyToolbar::SwitchVersion(_In_ CONST NOTIFYICONDATA *iconData) { InternalIconData * notifyItem; int index = FindItem(iconData->hWnd, iconData->uID, &notifyItem); @@ -598,7 +596,7 @@ BOOL CNotifyToolbar::SwitchVersion(IN CONST NOTIFYICONDATA *iconData) return TRUE; } -BOOL CNotifyToolbar::UpdateButton(IN CONST NOTIFYICONDATA *iconData) +BOOL CNotifyToolbar::UpdateButton(_In_ CONST NOTIFYICONDATA *iconData) { InternalIconData * notifyItem; TBBUTTONINFO tbbi = { 0 }; @@ -703,7 +701,7 @@ BOOL CNotifyToolbar::UpdateButton(IN CONST NOTIFYICONDATA *iconData) return TRUE; } -BOOL CNotifyToolbar::RemoveButton(IN CONST NOTIFYICONDATA *iconData) +BOOL CNotifyToolbar::RemoveButton(_In_ CONST NOTIFYICONDATA *iconData) { InternalIconData * notifyItem; @@ -819,8 +817,9 @@ VOID CNotifyToolbar::SendMouseEvent(IN WORD wIndex, IN UINT uMsg, IN WPARAM wPar RemoveButton(notifyItem); - HWND parentHWND = ::GetParent(::GetParent(GetParent())); - ::SendMessage(parentHWND, WM_SIZE, 0, 0); + /* Ask the parent to resize */ + NMHDR nmh = {GetParent(), 0, NTNWM_REALIGN}; + GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); return; } @@ -975,16 +974,6 @@ const WCHAR szSysPagerWndClass[] = L"SysPager"; CSysPagerWnd::CSysPagerWnd() {} CSysPagerWnd::~CSysPagerWnd() {} -LRESULT CSysPagerWnd::DrawBackground(HDC hdc) -{ - RECT rect; - - GetClientRect(&rect); - DrawThemeParentBackground(m_hWnd, hdc, &rect); - - return TRUE; -} - LRESULT CSysPagerWnd::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HDC hdc = (HDC) wParam; @@ -995,7 +984,11 @@ LRESULT CSysPagerWnd::OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, return 0; } - return DrawBackground(hdc); + RECT rect; + GetClientRect(&rect); + DrawThemeParentBackground(m_hWnd, hdc, &rect); + + return TRUE; } LRESULT CSysPagerWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -1038,60 +1031,50 @@ LRESULT CSysPagerWnd::OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& b return TRUE; } -BOOL CSysPagerWnd::NotifyIconCmd(WPARAM wParam, LPARAM lParam) +BOOL CSysPagerWnd::NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *iconData) { - PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT) lParam; - if (cpData->dwData == 1) - { - SYS_PAGER_COPY_DATA * data; - NOTIFYICONDATA *iconData; - BOOL ret = FALSE; - - int VisibleButtonCount = Toolbar.GetVisibleButtonCount(); + BOOL ret = FALSE; - data = (PSYS_PAGER_COPY_DATA) cpData->lpData; - iconData = &data->nicon_data; + int VisibleButtonCount = Toolbar.GetVisibleButtonCount(); - TRACE("NotifyIconCmd received. Code=%d\n", data->notify_code); - switch (data->notify_code) + TRACE("NotifyIcon received. Code=%d\n", notify_code); + switch (notify_code) + { + case NIM_ADD: + ret = Toolbar.AddButton(iconData); + if (ret == TRUE) { - case NIM_ADD: - ret = Toolbar.AddButton(iconData); - if (ret == TRUE) - { - (void)AddIconToWatcher(iconData); - } - break; - case NIM_MODIFY: - ret = Toolbar.UpdateButton(iconData); - break; - case NIM_DELETE: - ret = Toolbar.RemoveButton(iconData); - if (ret == TRUE) - { - (void)RemoveIconFromWatcher(iconData); - } - break; - case NIM_SETFOCUS: - Toolbar.SetFocus(); - ret = TRUE; - case NIM_SETVERSION: - ret = Toolbar.SwitchVersion(iconData); - default: - TRACE("NotifyIconCmd received with unknown code %d.\n", data->notify_code); - return FALSE; + (void)AddIconToWatcher(iconData); } - - if (VisibleButtonCount != Toolbar.GetVisibleButtonCount()) + break; + case NIM_MODIFY: + ret = Toolbar.UpdateButton(iconData); + break; + case NIM_DELETE: + ret = Toolbar.RemoveButton(iconData); + if (ret == TRUE) { - HWND parentHWND = ::GetParent(GetParent()); - ::SendMessage(parentHWND, WM_SIZE, 0, 0); + (void)RemoveIconFromWatcher(iconData); } + break; + case NIM_SETFOCUS: + Toolbar.SetFocus(); + ret = TRUE; + case NIM_SETVERSION: + ret = Toolbar.SwitchVersion(iconData); + default: + TRACE("NotifyIcon received with unknown code %d.\n", notify_code); + return FALSE; + } - return ret; + if (VisibleButtonCount != Toolbar.GetVisibleButtonCount()) + { + /* Ask the parent to resize */ + NMHDR nmh = {GetParent(), 0, NTNWM_REALIGN}; + GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); } - return TRUE; + return ret; } void CSysPagerWnd::GetSize(IN BOOL IsHorizontal, IN PSIZE size) @@ -1200,20 +1183,34 @@ LRESULT CSysPagerWnd::OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa return 0; } -void CSysPagerWnd::ResizeImagelist() +LRESULT CSysPagerWnd::OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - Toolbar.ResizeImagelist(); + PCOPYDATASTRUCT cpData = (PCOPYDATASTRUCT)lParam; + if (cpData->dwData == 1) + { + PSYS_PAGER_COPY_DATA pData = (PSYS_PAGER_COPY_DATA)cpData->lpData; + return NotifyIcon(pData->notify_code, &pData->nicon_data); + } + + return FALSE; +} + +LRESULT CSysPagerWnd::OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (wParam == SPI_SETNONCLIENTMETRICS) + { + Toolbar.ResizeImagelist(); + } + return 0; } -HWND CSysPagerWnd::_Init(IN HWND hWndParent, IN BOOL bVisible) +HWND CSysPagerWnd::_Init(IN HWND hWndParent) { DWORD dwStyle; /* Create the window. The tray window is going to move it to the correct position and resize it as needed. */ - dwStyle = WS_CHILD | WS_CLIPSIBLINGS; - if (bVisible) - dwStyle |= WS_VISIBLE; + dwStyle = WS_CHILD | WS_CLIPSIBLINGS | WS_VISIBLE; Create(hWndParent, 0, NULL, dwStyle); diff --git a/base/shell/explorer/syspager.h b/base/shell/explorer/syspager.h index 381c143a32..1df0798ebd 100644 --- a/base/shell/explorer/syspager.h +++ b/base/shell/explorer/syspager.h @@ -12,7 +12,7 @@ struct IconWatcherData DWORD ProcessId; NOTIFYICONDATA IconData; - IconWatcherData(NOTIFYICONDATA *iconData) : + IconWatcherData(CONST NOTIFYICONDATA *iconData) : hProcess(NULL), ProcessId(0) { IconData.cbSize = sizeof(NOTIFYICONDATA); @@ -47,10 +47,10 @@ public: bool Initialize(_In_ HWND hWndParent); void Uninitialize(); - bool AddIconToWatcher(_In_ NOTIFYICONDATA *iconData); - bool RemoveIconFromWatcher(_In_ NOTIFYICONDATA *iconData); + bool AddIconToWatcher(_In_ CONST NOTIFYICONDATA *iconData); + bool RemoveIconFromWatcher(_In_ CONST NOTIFYICONDATA *iconData); - IconWatcherData* GetListEntry(_In_opt_ NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove); + IconWatcherData* GetListEntry(_In_opt_ CONST NOTIFYICONDATA *iconData, _In_opt_ HANDLE hProcess, _In_ bool Remove); private: @@ -179,11 +179,13 @@ public: LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnBalloonPop(UINT uCode, LPNMHDR hdr, BOOL& bHandled); LRESULT OnTimer(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); public: - BOOL NotifyIconCmd(WPARAM wParam, LPARAM lParam); + + BOOL NotifyIcon(DWORD notify_code, _In_ CONST NOTIFYICONDATA *iconData); void GetSize(IN BOOL IsHorizontal, IN PSIZE size); - void ResizeImagelist(); DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) @@ -194,10 +196,12 @@ public: MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) MESSAGE_HANDLER(WM_TIMER, OnTimer) + MESSAGE_HANDLER(WM_COPYDATA, OnCopyData) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) NOTIFY_CODE_HANDLER(TTN_POP, OnBalloonPop) NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip) NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw) END_MSG_MAP() - HWND _Init(IN HWND hWndParent, IN BOOL bVisible); + HWND _Init(IN HWND hWndParent); }; diff --git a/base/shell/explorer/trayclock.cpp b/base/shell/explorer/trayclock.cpp index 125fc73b7d..1042214731 100644 --- a/base/shell/explorer/trayclock.cpp +++ b/base/shell/explorer/trayclock.cpp @@ -34,7 +34,6 @@ const WCHAR szTrayClockWndClass[] = L"TrayClockWClass"; #define TRAY_CLOCK_WND_SPACING_Y 0 CTrayClockWnd::CTrayClockWnd() : - hWndNotify(NULL), hFont(NULL), dwFlags(0), LineSpacing(0), @@ -265,20 +264,12 @@ VOID CTrayClockWnd::UpdateWnd() { InvalidateRect(NULL, TRUE); - if (hWndNotify != NULL && - (szPrevCurrent.cx != CurrentSize.cx || - szPrevCurrent.cy != CurrentSize.cy)) + if (szPrevCurrent.cx != CurrentSize.cx || + szPrevCurrent.cy != CurrentSize.cy) { - NMHDR nmh; - - nmh.hwndFrom = m_hWnd; - nmh.idFrom = GetWindowLongPtr(GWLP_ID); - nmh.code = NTNWM_REALIGN; - - ::SendMessage(hWndNotify, - WM_NOTIFY, - (WPARAM) nmh.idFrom, - (LPARAM) &nmh); + /* Ask the parent to resize */ + NMHDR nmh = {GetParent(), 0, NTNWM_REALIGN}; + GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh); } } } @@ -518,11 +509,6 @@ LRESULT CTrayClockWnd::OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, return (LRESULT) GetMinimumSize((BOOL) wParam, (PSIZE) lParam) != 0; } -LRESULT CTrayClockWnd::OnUpdateTime(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) -{ - return (LRESULT) ResetTime(); -} - LRESULT CTrayClockWnd::OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { return HTTRANSPARENT; @@ -554,16 +540,52 @@ LRESULT CTrayClockWnd::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa return TRUE; } -HWND CTrayClockWnd::_Init(IN HWND hWndParent, IN BOOL bVisible) +LRESULT CTrayClockWnd::OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - IsHorizontal = TRUE; + TaskbarSettings* newSettings = (TaskbarSettings*)lParam; + if (newSettings->bShowSeconds != g_TaskbarSettings.bShowSeconds) + { + g_TaskbarSettings.bShowSeconds = newSettings->bShowSeconds; + /* TODO: Toggle showing seconds */ + } + + if (newSettings->sr.HideClock != g_TaskbarSettings.sr.HideClock) + { + g_TaskbarSettings.sr.HideClock = newSettings->sr.HideClock; + /* TODO: Toggle hiding the clock */ + } + + return 0; +} - hWndNotify = hWndParent; +LRESULT CTrayClockWnd::OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + if (IsWindowVisible()) + { + RECT rcClock; + if (GetWindowRect(&rcClock)) + { + POINT ptClick; + ptClick.x = MAKEPOINTS(lParam).x; + ptClick.y = MAKEPOINTS(lParam).y; + if (PtInRect(&rcClock, ptClick)) + { + //FIXME: use SHRunControlPanel + ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); + } + } + } + return TRUE; +} + +HWND CTrayClockWnd::_Init(IN HWND hWndParent) +{ + IsHorizontal = TRUE; /* Create the window. The tray window is going to move it to the correct position and resize it as needed. */ DWORD dwStyle = WS_CHILD | WS_CLIPSIBLINGS; - if (bVisible) + if (!g_TaskbarSettings.sr.HideClock) dwStyle |= WS_VISIBLE; Create(hWndParent, 0, NULL, dwStyle); diff --git a/base/shell/explorer/trayclock.h b/base/shell/explorer/trayclock.h index 23911dfae9..4c152098cd 100644 --- a/base/shell/explorer/trayclock.h +++ b/base/shell/explorer/trayclock.h @@ -68,8 +68,8 @@ private: LRESULT OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); -public: - LRESULT OnUpdateTime(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); public: DECLARE_WND_CLASS_EX(szTrayClockWndClass, CS_DBLCLKS, COLOR_3DFACE) @@ -86,9 +86,9 @@ public: MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(TCWM_GETMINIMUMSIZE, OnGetMinimumSize) - MESSAGE_HANDLER(TCWM_UPDATETIME, OnUpdateTime) - + MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) + MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnNcLButtonDblClick) END_MSG_MAP() - HWND _Init(IN HWND hWndParent, IN BOOL bVisible); + HWND _Init(IN HWND hWndParent); }; \ No newline at end of file diff --git a/base/shell/explorer/trayntfy.cpp b/base/shell/explorer/trayntfy.cpp index 9a0294e500..4004184a94 100644 --- a/base/shell/explorer/trayntfy.cpp +++ b/base/shell/explorer/trayntfy.cpp @@ -34,13 +34,9 @@ class CTrayNotifyWnd : public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl < CTrayNotifyWnd, CWindow, CControlWinTraits > { - HWND hWndNotify; - CSysPagerWnd * m_pager; CTrayClockWnd * m_clock; - CComPtr<ITrayWindow> TrayWindow; - HTHEME TrayTheme; SIZE szTrayClockMin; SIZE szTrayNotify; @@ -49,7 +45,6 @@ class CTrayNotifyWnd : public: CTrayNotifyWnd() : - hWndNotify(NULL), m_pager(NULL), m_clock(NULL), TrayTheme(NULL), @@ -104,10 +99,10 @@ public: LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { m_clock = new CTrayClockWnd(); - m_clock->_Init(m_hWnd, !g_TaskbarSettings.sr.HideClock); + m_clock->_Init(m_hWnd); m_pager = new CSysPagerWnd(); - m_pager->_Init(m_hWnd, !g_TaskbarSettings.sr.HideClock); + m_pager->_Init(m_hWnd); return TRUE; } @@ -231,26 +226,6 @@ public: } } - LRESULT DrawBackground(HDC hdc) - { - HRESULT res; - RECT rect; - - GetClientRect(&rect); - - if (TrayTheme) - { - if (IsThemeBackgroundPartiallyTransparent(TrayTheme, TNP_BACKGROUND, 0)) - { - DrawThemeParentBackground(m_hWnd, hdc, &rect); - } - - res = DrawThemeBackground(TrayTheme, hdc, TNP_BACKGROUND, 0, &rect, 0); - } - - return res; - } - LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HDC hdc = (HDC) wParam; @@ -261,27 +236,16 @@ public: return 0; } - return DrawBackground(hdc); - } + RECT rect; + GetClientRect(&rect); + if (IsThemeBackgroundPartiallyTransparent(TrayTheme, TNP_BACKGROUND, 0)) + DrawThemeParentBackground(m_hWnd, hdc, &rect); - BOOL NotifyIconCmd(WPARAM wParam, LPARAM lParam) - { - if (m_pager) - { - return m_pager->NotifyIconCmd(wParam, lParam); - } + DrawThemeBackground(TrayTheme, hdc, TNP_BACKGROUND, 0, &rect, 0); return TRUE; } - BOOL GetClockRect(OUT PRECT rcClock) - { - if (!m_clock->IsWindowVisible()) - return FALSE; - - return m_clock->GetWindowRect(rcClock); - } - LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { BOOL Horizontal = (BOOL) wParam; @@ -298,16 +262,6 @@ public: return (LRESULT) GetMinimumSize((PSIZE) lParam); } - LRESULT OnUpdateTime(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - if (m_clock != NULL) - { - /* Forward the message to the tray clock window procedure */ - return m_clock->OnUpdateTime(uMsg, wParam, lParam, bHandled); - } - return FALSE; - } - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SIZE szClient; @@ -325,74 +279,30 @@ public: return HTTRANSPARENT; } - LRESULT OnShowClock(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - BOOL PrevHidden = g_TaskbarSettings.sr.HideClock; - g_TaskbarSettings.sr.HideClock = (wParam == 0); - - if (m_clock != NULL && PrevHidden != g_TaskbarSettings.sr.HideClock) - { - m_clock->ShowWindow(g_TaskbarSettings.sr.HideClock ? SW_HIDE : SW_SHOW); - } - - return (LRESULT) (!PrevHidden); - } - - LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - TaskbarSettings* newSettings = (TaskbarSettings*)lParam; - if (newSettings->bShowSeconds != g_TaskbarSettings.bShowSeconds) - { - g_TaskbarSettings.bShowSeconds = newSettings->bShowSeconds; - /* TODO: Toggle showing seconds */ - } - - if (newSettings->sr.HideClock != g_TaskbarSettings.sr.HideClock) - { - g_TaskbarSettings.sr.HideClock = newSettings->sr.HideClock; - /* TODO: Toggle hiding the clock */ - } - + bHandled = TRUE; return 0; } - LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) - { - const NMHDR *nmh = (const NMHDR *) lParam; - - if (nmh->hwndFrom == m_clock->m_hWnd) - { - /* Pass down notifications */ - return m_clock->SendMessage(WM_NOTIFY, wParam, lParam); - } - - return FALSE; - } - - LRESULT OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnClockMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_clock != NULL) - { - m_clock->SendMessageW(WM_SETFONT, wParam, lParam); - } - - bHandled = FALSE; - return FALSE; + return m_clock->SendMessageW(uMsg, wParam, lParam); + return TRUE; } - LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnPagerMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - bHandled = TRUE; - return 0; + if (m_pager) + return m_pager->SendMessage(uMsg, wParam, lParam); + return TRUE; } - LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + LRESULT OnRealign(INT uCode, LPNMHDR hdr, BOOL& bHandled) { - if (wParam == SPI_SETNONCLIENTMETRICS) - { - m_pager->ResizeImagelist(); - } - return 0; + hdr->hwndFrom = m_hWnd; + return GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM)hdr); } DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE) @@ -401,51 +311,30 @@ public: MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) - MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) - MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) // FIXME: This handler is not necessary in Windows + MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnClockMessage) + MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnClockMessage) + MESSAGE_HANDLER(WM_SETFONT, OnClockMessage) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnPagerMessage) + MESSAGE_HANDLER(WM_COPYDATA, OnPagerMessage) + NOTIFY_CODE_HANDLER(NTNWM_REALIGN, OnRealign) MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize) - MESSAGE_HANDLER(TNWM_UPDATETIME, OnUpdateTime) - MESSAGE_HANDLER(TNWM_SHOWCLOCK, OnShowClock) - MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged) END_MSG_MAP() - HWND _Init(IN OUT ITrayWindow *TrayWindow) + HWND _Init(IN HWND hwndParent) { - HWND hWndTrayWindow; - - hWndTrayWindow = TrayWindow->GetHWND(); - if (hWndTrayWindow == NULL) - return NULL; - - this->TrayWindow = TrayWindow; - this->hWndNotify = hWndTrayWindow; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; - return Create(hWndTrayWindow, 0, NULL, dwStyle, WS_EX_STATICEDGE); + return Create(hwndParent, 0, NULL, dwStyle, WS_EX_STATICEDGE); } }; -HWND CreateTrayNotifyWnd(IN OUT ITrayWindow *Tray, CTrayNotifyWnd** ppinstance) +HWND CreateTrayNotifyWnd(IN HWND hwndParent, CTrayNotifyWnd** ppinstance) { CTrayNotifyWnd * pTrayNotify = new CTrayNotifyWnd(); // TODO: Destroy after the window is destroyed *ppinstance = pTrayNotify; - return pTrayNotify->_Init(Tray); -} - -BOOL -TrayNotify_NotifyIconCmd(CTrayNotifyWnd* pTrayNotify, WPARAM wParam, LPARAM lParam) -{ - return pTrayNotify->NotifyIconCmd(wParam, lParam); -} - -BOOL -TrayNotify_GetClockRect(CTrayNotifyWnd* pTrayNotify, OUT PRECT rcClock) -{ - return pTrayNotify->GetClockRect(rcClock); + return pTrayNotify->_Init(hwndParent); } diff --git a/base/shell/explorer/traywnd.cpp b/base/shell/explorer/traywnd.cpp index d1f30e3b42..ac449131b5 100644 --- a/base/shell/explorer/traywnd.cpp +++ b/base/shell/explorer/traywnd.cpp @@ -2061,7 +2061,7 @@ ChangePos: SetWindowTheme(m_Rebar, L"TaskBar", NULL); /* Create the tray notification window */ - m_TrayNotify = CreateTrayNotifyWnd(this, &m_TrayNotifyInstance); + m_TrayNotify = CreateTrayNotifyWnd(m_hWnd, &m_TrayNotifyInstance); UpdateFonts(); @@ -2150,10 +2150,7 @@ ChangePos: LRESULT OnCopyData(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { if (m_TrayNotify) - { - TRACE("WM_COPYDATA notify message received. Handling...\n"); - return TrayNotify_NotifyIconCmd(m_TrayNotifyInstance, wParam, lParam); - } + ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); return TRUE; } @@ -2556,23 +2553,11 @@ HandleTrayContextMenu: LRESULT OnNcLButtonDblClick(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + /* Let the clock handle the double click */ + ::SendMessageW(m_TrayNotify, uMsg, wParam, lParam); + /* We "handle" this message so users can't cause a weird maximize/restore window animation when double-clicking the tray window! */ - - /* We should forward mouse messages to child windows here. - Right now, this is only clock double-click */ - RECT rcClock; - if (TrayNotify_GetClockRect(m_TrayNotifyInstance, &rcClock)) - { - POINT ptClick; - ptClick.x = MAKEPOINTS(lParam).x; - ptClick.y = MAKEPOINTS(lParam).y; - if (PtInRect(&rcClock, ptClick)) - { - //FIXME: use SHRunControlPanel - ShellExecuteW(m_hWnd, NULL, L"timedate.cpl", NULL, NULL, SW_NORMAL); - } - } return TRUE; }

6 years, 11 months

01/01: [NTOSKRNL] On file cache deletion, only manipulate VACB once locked. Should help avoiding race conditions with lazy write.

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78664ebe156f557b1f37b… commit 78664ebe156f557b1f37bec8c31039d3bf91561e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Jan 27 18:37:34 2018 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Jan 27 18:37:34 2018 +0100 [NTOSKRNL] On file cache deletion, only manipulate VACB once locked. Should help avoiding race conditions with lazy write. CORE-14263 --- ntoskrnl/cc/view.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 706623b0a5..1268fb5203 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -528,7 +528,7 @@ CcRosReleaseVacb ( WasDirty = FALSE; if (Dirty) { - if (!Vacb->Dirty && Dirty) + if (!Vacb->Dirty) { CcRosMarkDirtyVacb(Vacb); } @@ -658,7 +658,6 @@ CcRosMarkDirtyFile ( CcRosMarkDirtyVacb(Vacb); - CcRosReleaseVacbLock(Vacb); return STATUS_SUCCESS; @@ -688,7 +687,7 @@ CcRosUnmapVacb ( WasDirty = FALSE; if (NowDirty) { - if (!Vacb->Dirty && NowDirty) + if (!Vacb->Dirty) { CcRosMarkDirtyVacb(Vacb); } @@ -1154,7 +1153,10 @@ CcRosDeleteFileCache ( while (!IsListEmpty(&SharedCacheMap->CacheMapVacbListHead)) { current_entry = RemoveTailList(&SharedCacheMap->CacheMapVacbListHead); + KeReleaseSpinLock(&SharedCacheMap->CacheMapLock, oldIrql); + current = CONTAINING_RECORD(current_entry, ROS_VACB, CacheMapVacbListEntry); + CcRosAcquireVacbLock(current, NULL); RemoveEntryList(&current->VacbLruListEntry); if (current->Dirty) { @@ -1164,6 +1166,9 @@ CcRosDeleteFileCache ( DPRINT1("Freeing dirty VACB\n"); } InsertHeadList(&FreeList, &current->CacheMapVacbListEntry); + CcRosReleaseVacbLock(current); + + KeAcquireSpinLock(&SharedCacheMap->CacheMapLock, &oldIrql); } #if DBG SharedCacheMap->Trace = FALSE;

6 years, 11 months

01/01: [ACPPAGE] Improve the compatibility tab (#332)

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3889d8309a73d85486ae0… commit 3889d8309a73d85486ae0b1cca66206454162cf9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Jan 27 18:10:50 2018 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 27 18:10:50 2018 +0100 [ACPPAGE] Improve the compatibility tab (#332) - Use the tab title from the corresponding dialog resource caption string. - Fix some translations, and complete the french one. - Use DialogBoxParamW and MAKEINTRESOURCEW (with W). --- dll/shellext/acppage/CLayerUIPropPage.cpp | 10 ++++++++-- dll/shellext/acppage/lang/bg-BG.rc | 2 +- dll/shellext/acppage/lang/cs-CZ.rc | 2 +- dll/shellext/acppage/lang/de-DE.rc | 2 +- dll/shellext/acppage/lang/en-US.rc | 4 ++-- dll/shellext/acppage/lang/es-ES.rc | 2 +- dll/shellext/acppage/lang/eu-ES.rc | 2 +- dll/shellext/acppage/lang/fr-FR.rc | 22 +++++++++++----------- dll/shellext/acppage/lang/he-IL.rc | 2 +- dll/shellext/acppage/lang/hu-HU.rc | 2 +- dll/shellext/acppage/lang/id-ID.rc | 2 +- dll/shellext/acppage/lang/it-IT.rc | 2 +- dll/shellext/acppage/lang/nl-NL.rc | 4 ++-- dll/shellext/acppage/lang/no-NO.rc | 2 +- dll/shellext/acppage/lang/pl-PL.rc | 2 +- dll/shellext/acppage/lang/ro-RO.rc | 2 +- dll/shellext/acppage/lang/ru-RU.rc | 2 +- dll/shellext/acppage/lang/sk-SK.rc | 2 +- dll/shellext/acppage/lang/sq-AL.rc | 2 +- dll/shellext/acppage/lang/sv-SE.rc | 2 +- dll/shellext/acppage/lang/tr-TR.rc | 2 +- dll/shellext/acppage/lang/uk-UA.rc | 2 +- dll/shellext/acppage/lang/zh-CN.rc | 2 +- dll/shellext/acppage/lang/zh-TW.rc | 2 +- dll/shellext/acppage/resource.h | 2 +- 25 files changed, 44 insertions(+), 38 deletions(-) diff --git a/dll/shellext/acppage/CLayerUIPropPage.cpp b/dll/shellext/acppage/CLayerUIPropPage.cpp index a923281a55..116c8621b0 100644 --- a/dll/shellext/acppage/CLayerUIPropPage.cpp +++ b/dll/shellext/acppage/CLayerUIPropPage.cpp @@ -95,10 +95,16 @@ CLayerUIPropPage::CLayerUIPropPage() , m_RegistryEnabledLayers(0) , m_EnabledLayers(0) { + CComBSTR title; + title.LoadString(g_hModule, IDS_COMPAT_TITLE); + m_psp.pszTitle = title.Detach(); + m_psp.dwFlags |= PSP_USETITLE; } CLayerUIPropPage::~CLayerUIPropPage() { + CComBSTR title; + title.Attach((BSTR)m_psp.pszTitle); } HRESULT CLayerUIPropPage::InitFile(PCWSTR Filename) @@ -371,7 +377,7 @@ LRESULT CLayerUIPropPage::OnCtrlCommand(WORD wNotifyCode, WORD wID, HWND hWndCtl LRESULT CLayerUIPropPage::OnEditModes(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - if (DialogBoxParam(g_hModule, MAKEINTRESOURCE(IDD_EDITCOMPATIBILITYMODES), m_hWnd, EditModesProc, (LPARAM)this) == IDOK) + if (DialogBoxParamW(g_hModule, MAKEINTRESOURCEW(IDD_EDITCOMPATIBILITYMODES), m_hWnd, EditModesProc, (LPARAM)this) == IDOK) UpdateControls(); return 0; } @@ -499,7 +505,7 @@ INT_PTR CALLBACK CLayerUIPropPage::EditModesProc(HWND hWnd, UINT uMsg, WPARAM wP if (ComboHasData(hWnd)) { CComBSTR question, title; - title.LoadString(g_hModule, IDS_TABTITLE); + title.LoadString(g_hModule, IDS_COMPAT_TITLE); question.LoadString(g_hModule, IDS_YOU_DID_NOT_ADD); int result = ::MessageBoxW(hWnd, question, title, MB_YESNOCANCEL | MB_ICONQUESTION); switch (result) diff --git a/dll/shellext/acppage/lang/bg-BG.rc b/dll/shellext/acppage/lang/bg-BG.rc index abd7a8fedf..ec7422c608 100644 --- a/dll/shellext/acppage/lang/bg-BG.rc +++ b/dll/shellext/acppage/lang/bg-BG.rc @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Съвместимост" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/cs-CZ.rc b/dll/shellext/acppage/lang/cs-CZ.rc index 14cc9f3fc3..b0dfa91bfc 100644 --- a/dll/shellext/acppage/lang/cs-CZ.rc +++ b/dll/shellext/acppage/lang/cs-CZ.rc @@ -38,7 +38,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilita" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/de-DE.rc b/dll/shellext/acppage/lang/de-DE.rc index ae25d0bf32..2da78763e2 100644 --- a/dll/shellext/acppage/lang/de-DE.rc +++ b/dll/shellext/acppage/lang/de-DE.rc @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Kompatibilität" + IDS_COMPAT_TITLE "Kompatibilität" IDS_FAILED_NETWORK "Kompatibilitätsmodi können auf diesem Programm nicht angewendet werden, da es sich auf einem Netzlaufwerk befindet." IDS_FAILED_PROTECTED "Kompatibilitätsmodi können auf diesem Programm nicht angewendet werden, da es Teil von ReactOS ist." IDS_YOU_DID_NOT_ADD "Sie haben den Modus nicht hinzugefügt, möchten Sie ihn jetzt hinzufügen?" diff --git a/dll/shellext/acppage/lang/en-US.rc b/dll/shellext/acppage/lang/en-US.rc index 0f5f42ff2b..2febc3f856 100644 --- a/dll/shellext/acppage/lang/en-US.rc +++ b/dll/shellext/acppage/lang/en-US.rc @@ -11,7 +11,7 @@ BEGIN COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Run in 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibility" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/es-ES.rc b/dll/shellext/acppage/lang/es-ES.rc index 55a0e541b2..6e1ce690ef 100644 --- a/dll/shellext/acppage/lang/es-ES.rc +++ b/dll/shellext/acppage/lang/es-ES.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibilidad" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/eu-ES.rc b/dll/shellext/acppage/lang/eu-ES.rc index cbcafbf5b3..c43505acd8 100644 --- a/dll/shellext/acppage/lang/eu-ES.rc +++ b/dll/shellext/acppage/lang/eu-ES.rc @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Konpatibilitatea" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/fr-FR.rc b/dll/shellext/acppage/lang/fr-FR.rc index 299e56e88d..6aa27ee7f4 100644 --- a/dll/shellext/acppage/lang/fr-FR.rc +++ b/dll/shellext/acppage/lang/fr-FR.rc @@ -5,16 +5,16 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Compatibilité" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Si vous avez des difficultés à lancer ce programme sous ReactOS, sélectionner le système d'exploitation que ReactOS montrera à l'application.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Si vous avez des difficultés à lancer ce programme sous ReactOS, sélectionnez le système d'exploitation que ReactOS montrera à l'application.\nCette fonctionnalité est en cours de développement.", -1, 7, 7, 210, 31 GROUPBOX "Mode de compatibilité", IDC_COMPATGROUP, 7, 41, 210, 49 - CHECKBOX "Lancer ce programme en mode de compatibilité pour:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Lancer ce programme en mode de compatibilité pour :", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Réglages de l'écran", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Lancer en 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Lancer en resolution d'écran 640x480 ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Désactiver les thèmes visuels", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - PUSHBUTTON "E&diter les Modes de compatibilité", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 - CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY + CHECKBOX "Lancer en résolution d'écran 640x480 ", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Désactiver les thèmes visuels", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + PUSHBUTTON "É&diter les Modes de compatibilité", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 + CONTROL "En savoir plus sur <A>la compatibilité des programmes</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY END IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 @@ -25,7 +25,7 @@ BEGIN COMBOBOX IDC_NEWCOMPATIBILITYMODE, 9, 6, 148, 14, CBS_HASSTRINGS | CBS_DROPDOWN | WS_VSCROLL LISTBOX IDC_COMPATIBILITYMODE, 9, 25, 148, 86, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_BORDER PUSHBUTTON "&Ajouter...", IDC_ADD, 162, 6, 60, 14, WS_DISABLED - PUSHBUTTON "&Editer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED + PUSHBUTTON "&Éditer...", IDC_EDIT, 162, 24, 60, 14, WS_DISABLED PUSHBUTTON "&Supprimer", IDC_DELETE, 162, 42, 60, 14, WS_DISABLED PUSHBUTTON "&OK", IDOK, 95, 116, 60, 14 PUSHBUTTON "&Annuler", IDCANCEL, 162, 116, 60, 14 @@ -33,8 +33,8 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" - IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." - IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" + IDS_COMPAT_TITLE "Compatibilité" + IDS_FAILED_NETWORK "Les modes de compatibilité ne peuvent pas être appliqués sur ce programme car il se situe sur un lecteur réseau." + IDS_FAILED_PROTECTED "Les modes de compatibilité ne peuvent pas être appliqués sur ce programme car il fait partie de ReactOS." + IDS_YOU_DID_NOT_ADD "Vous n'avez pas ajouté le mode, voulez-vous l'ajouter maintenant ?" END diff --git a/dll/shellext/acppage/lang/he-IL.rc b/dll/shellext/acppage/lang/he-IL.rc index 91fd27252e..1853d1606d 100644 --- a/dll/shellext/acppage/lang/he-IL.rc +++ b/dll/shellext/acppage/lang/he-IL.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "תאימות" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/hu-HU.rc b/dll/shellext/acppage/lang/hu-HU.rc index a0ea969878..1a18c6022f 100644 --- a/dll/shellext/acppage/lang/hu-HU.rc +++ b/dll/shellext/acppage/lang/hu-HU.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilitás" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/id-ID.rc b/dll/shellext/acppage/lang/id-ID.rc index cbb5330fb7..822cdaee98 100644 --- a/dll/shellext/acppage/lang/id-ID.rc +++ b/dll/shellext/acppage/lang/id-ID.rc @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilitas" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/it-IT.rc b/dll/shellext/acppage/lang/it-IT.rc index 21b37513cb..e3dcd28852 100644 --- a/dll/shellext/acppage/lang/it-IT.rc +++ b/dll/shellext/acppage/lang/it-IT.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibilità" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/nl-NL.rc b/dll/shellext/acppage/lang/nl-NL.rc index 9488cf346c..301794f6ab 100644 --- a/dll/shellext/acppage/lang/nl-NL.rc +++ b/dll/shellext/acppage/lang/nl-NL.rc @@ -11,7 +11,7 @@ BEGIN COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED GROUPBOX "Display settings", -1, 7, 99, 210, 61, BS_GROUPBOX CHECKBOX "Run in 256 colors", IDC_CHKRUNIN256COLORS, 18, 114, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "Run in 640x480 screenresolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Run in 640x480 screen resolution", IDC_CHKRUNIN640480RES, 18, 129, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP CHECKBOX "Disable visual themes", IDC_CHKDISABLEVISUALTHEMES, 18, 144, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP PUSHBUTTON "E&dit compatibility modes...", IDC_EDITCOMPATIBILITYMODES, 117, 167, 100, 15 CONTROL "Learn more about <A>program compatibility</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7, 207, 210, 10, WS_EX_NOPARENTNOTIFY @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Compatibiliteit" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/no-NO.rc b/dll/shellext/acppage/lang/no-NO.rc index 6be87ecee6..47eca7d4f4 100644 --- a/dll/shellext/acppage/lang/no-NO.rc +++ b/dll/shellext/acppage/lang/no-NO.rc @@ -33,7 +33,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompaktibilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/pl-PL.rc b/dll/shellext/acppage/lang/pl-PL.rc index 36f566cb4f..d4fcca9692 100644 --- a/dll/shellext/acppage/lang/pl-PL.rc +++ b/dll/shellext/acppage/lang/pl-PL.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Zgodność" + IDS_COMPAT_TITLE "Zgodność" IDS_FAILED_NETWORK "Nie można ustawić trybu zgodnośći dla tego programu, ponieważ znajduje się na dysku sieciowym." IDS_FAILED_PROTECTED "Nie można ustawić trybu zgodnośći dla tego programu, ponieważ jest częścią systemu ReactOS." IDS_YOU_DID_NOT_ADD "Nie dodałeś trybu zgodności, czy chcesz to zrobić teraz?" diff --git a/dll/shellext/acppage/lang/ro-RO.rc b/dll/shellext/acppage/lang/ro-RO.rc index 0af15f9483..7c972eda00 100644 --- a/dll/shellext/acppage/lang/ro-RO.rc +++ b/dll/shellext/acppage/lang/ro-RO.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibilitate" + IDS_COMPAT_TITLE "Compatibilitate" IDS_FAILED_NETWORK "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece rezidă pe o unitate de stocare în rețea." IDS_FAILED_PROTECTED "Modurile de compatibilitate nu pot fi instituite pentru acest program deoarece este parte din ReactOS." IDS_YOU_DID_NOT_ADD "Nu ați specificat un mod. Doriți să specificați unul?" diff --git a/dll/shellext/acppage/lang/ru-RU.rc b/dll/shellext/acppage/lang/ru-RU.rc index 65d0d7fbde..7b69f2e263 100644 --- a/dll/shellext/acppage/lang/ru-RU.rc +++ b/dll/shellext/acppage/lang/ru-RU.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Совместимость" + IDS_COMPAT_TITLE "Совместимость" IDS_FAILED_NETWORK "Режим совместимости не может быть установлен для этой программы, потому что она находится на сетевом диске." IDS_FAILED_PROTECTED "Режим совместимости не может быть использован для компонентов ReactOS." IDS_YOU_DID_NOT_ADD "Вы не добавили режим, добавить его сейчас?" diff --git a/dll/shellext/acppage/lang/sk-SK.rc b/dll/shellext/acppage/lang/sk-SK.rc index e971d38b95..3822829720 100644 --- a/dll/shellext/acppage/lang/sk-SK.rc +++ b/dll/shellext/acppage/lang/sk-SK.rc @@ -40,7 +40,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Kompatibilita" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/sq-AL.rc b/dll/shellext/acppage/lang/sq-AL.rc index 57bf880dc0..2caa6bf8db 100644 --- a/dll/shellext/acppage/lang/sq-AL.rc +++ b/dll/shellext/acppage/lang/sq-AL.rc @@ -37,7 +37,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Pajtueshmëri" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/sv-SE.rc b/dll/shellext/acppage/lang/sv-SE.rc index 24e62c0e28..5cdf449682 100644 --- a/dll/shellext/acppage/lang/sv-SE.rc +++ b/dll/shellext/acppage/lang/sv-SE.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Kompabilitet" + IDS_COMPAT_TITLE "Kompatibilitet" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/tr-TR.rc b/dll/shellext/acppage/lang/tr-TR.rc index 0e3da586a4..a0c8d11463 100644 --- a/dll/shellext/acppage/lang/tr-TR.rc +++ b/dll/shellext/acppage/lang/tr-TR.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Uyumluluk" + IDS_COMPAT_TITLE "Uyumluluk" IDS_FAILED_NETWORK "Bir ağ sürücüsü üzerinde olduğundan bu programda uyumluluk kipleri ayarlanamaz." IDS_FAILED_PROTECTED "ReactOS'un bir parçası olduğundan bu programda uyumluluk kipleri ayarlanamaz." IDS_YOU_DID_NOT_ADD "Bu modu eklememeiştiniz, eklemek ister misiniz?" diff --git a/dll/shellext/acppage/lang/uk-UA.rc b/dll/shellext/acppage/lang/uk-UA.rc index 2f6db499fc..155f272f05 100644 --- a/dll/shellext/acppage/lang/uk-UA.rc +++ b/dll/shellext/acppage/lang/uk-UA.rc @@ -41,7 +41,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "Сумісність" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/lang/zh-CN.rc b/dll/shellext/acppage/lang/zh-CN.rc index 74b4df42c5..6f50d09ec6 100644 --- a/dll/shellext/acppage/lang/zh-CN.rc +++ b/dll/shellext/acppage/lang/zh-CN.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "兼容模式" + IDS_COMPAT_TITLE "兼容模式" IDS_FAILED_NETWORK "无法在上面设置兼容模式，因为这个程序在网络驱动器上。" IDS_FAILED_PROTECTED "无法在上面设置兼容模式，因为这个程序是 ReactOS 的一部分。" IDS_YOU_DID_NOT_ADD "目前没有此模式，你想要新建一个吗？" diff --git a/dll/shellext/acppage/lang/zh-TW.rc b/dll/shellext/acppage/lang/zh-TW.rc index 02cbf1c2a3..5991be9611 100644 --- a/dll/shellext/acppage/lang/zh-TW.rc +++ b/dll/shellext/acppage/lang/zh-TW.rc @@ -35,7 +35,7 @@ END STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" + IDS_COMPAT_TITLE "相容性" IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" diff --git a/dll/shellext/acppage/resource.h b/dll/shellext/acppage/resource.h index 7f45ee6cf8..9566a2020c 100644 --- a/dll/shellext/acppage/resource.h +++ b/dll/shellext/acppage/resource.h @@ -20,7 +20,7 @@ #define IDS_DESCRIPTION 101 /* strings */ -#define IDS_TABTITLE 2000 +#define IDS_COMPAT_TITLE 2000 #define IDS_FAILED_NETWORK 2001 #define IDS_FAILED_PROTECTED 2002 #define IDS_YOU_DID_NOT_ADD 2003

6 years, 11 months

01/01: [TRANSLATION] Add and fix translations for ping and tracert (#331)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd65d06270a3ae4d66063… commit dd65d06270a3ae4d660631b6c5e3ac881c103bab Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sat Jan 27 18:25:51 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 27 16:25:51 2018 +0100 [TRANSLATION] Add and fix translations for ping and tracert (#331) --- base/applications/network/ping/lang/bg-BG.rc | 2 +- base/applications/network/ping/lang/cs-CZ.rc | 2 +- base/applications/network/ping/lang/en-US.rc | 2 +- base/applications/network/ping/lang/es-ES.rc | 2 +- base/applications/network/ping/lang/it-IT.rc | 2 +- base/applications/network/ping/lang/pl-PL.rc | 2 +- base/applications/network/ping/lang/ru-RU.rc | 2 +- base/applications/network/ping/lang/sq-AL.rc | 2 +- base/applications/network/ping/lang/sv-SE.rc | 2 +- base/applications/network/ping/lang/uk-UA.rc | 2 +- base/applications/network/ping/lang/zh-CN.rc | 2 +- base/applications/network/ping/lang/zh-TW.rc | 2 +- base/applications/network/tracert/lang/ru-RU.rc | 41 +++++++++++++------------ 13 files changed, 33 insertions(+), 32 deletions(-) diff --git a/base/applications/network/ping/lang/bg-BG.rc b/base/applications/network/ping/lang/bg-BG.rc index 850a80c7e5..00e0a17ee5 100644 --- a/base/applications/network/ping/lang/bg-BG.rc +++ b/base/applications/network/ping/lang/bg-BG.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/cs-CZ.rc b/base/applications/network/ping/lang/cs-CZ.rc index 70f1eb404a..70cb108696 100644 --- a/base/applications/network/ping/lang/cs-CZ.rc +++ b/base/applications/network/ping/lang/cs-CZ.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Časový limit žádosti vypršel.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/en-US.rc b/base/applications/network/ping/lang/en-US.rc index 986f07b873..71f7f25ceb 100644 --- a/base/applications/network/ping/lang/en-US.rc +++ b/base/applications/network/ping/lang/en-US.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/es-ES.rc b/base/applications/network/ping/lang/es-ES.rc index f18f9e6d89..6d8d3b5229 100644 --- a/base/applications/network/ping/lang/es-ES.rc +++ b/base/applications/network/ping/lang/es-ES.rc @@ -50,7 +50,7 @@ Opciones:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "La petición ha caducado.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/it-IT.rc b/base/applications/network/ping/lang/it-IT.rc index 38032ce9f5..8cd2f6ad7e 100644 --- a/base/applications/network/ping/lang/it-IT.rc +++ b/base/applications/network/ping/lang/it-IT.rc @@ -50,7 +50,7 @@ Opzioni:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Richiesta scaduta.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/pl-PL.rc b/base/applications/network/ping/lang/pl-PL.rc index 28a8ba413b..368dc06299 100644 --- a/base/applications/network/ping/lang/pl-PL.rc +++ b/base/applications/network/ping/lang/pl-PL.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Brak odpowiedzi.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/ru-RU.rc b/base/applications/network/ping/lang/ru-RU.rc index 2f230ab7a7..23a037ab53 100644 --- a/base/applications/network/ping/lang/ru-RU.rc +++ b/base/applications/network/ping/lang/ru-RU.rc @@ -49,7 +49,7 @@ BEGIN IDS_REPLY_TIME_MS "время=%luмс " IDS_REPLY_TIME_0MS "время<1мс " IDS_REPLY_TTL "TTL=%d\n" - IDS_REPLY_STATUS "Ответ от %lu.\n" + IDS_REPLY_STATUS "Получен код %lu.\n" IDS_DEST_HOST_UNREACHABLE "Заданный узел недоступен.\n" IDS_DEST_NET_UNREACHABLE "Заданная сеть недоступна.\n" IDS_REQUEST_TIMED_OUT "Превышен интервал ожидания для запроса.\n" diff --git a/base/applications/network/ping/lang/sq-AL.rc b/base/applications/network/ping/lang/sq-AL.rc index 2e4afd8480..2365a3382a 100644 --- a/base/applications/network/ping/lang/sq-AL.rc +++ b/base/applications/network/ping/lang/sq-AL.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Kerkese kohe mbaroj.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/sv-SE.rc b/base/applications/network/ping/lang/sv-SE.rc index 21e1eab380..498e775bdd 100644 --- a/base/applications/network/ping/lang/sv-SE.rc +++ b/base/applications/network/ping/lang/sv-SE.rc @@ -50,7 +50,7 @@ Alternativ:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Förfrågan gjorde timeout.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/uk-UA.rc b/base/applications/network/ping/lang/uk-UA.rc index 9e08964492..120486c28c 100644 --- a/base/applications/network/ping/lang/uk-UA.rc +++ b/base/applications/network/ping/lang/uk-UA.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/zh-CN.rc b/base/applications/network/ping/lang/zh-CN.rc index 839feb456a..62e11434b4 100644 --- a/base/applications/network/ping/lang/zh-CN.rc +++ b/base/applications/network/ping/lang/zh-CN.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/ping/lang/zh-TW.rc b/base/applications/network/ping/lang/zh-TW.rc index 9d30281365..a03c20e6d4 100644 --- a/base/applications/network/ping/lang/zh-TW.rc +++ b/base/applications/network/ping/lang/zh-TW.rc @@ -50,7 +50,7 @@ Options:\n\ IDS_REPLY_TTL "TTL=%d\n" IDS_REPLY_STATUS "Echo reply returned %lu.\n" IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\n" - IDS_DEST_NET_UNREACHABLE "Destination net unreachable.\n" + IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\n" IDS_REQUEST_TIMED_OUT "Request timed out.\n" IDS_TTL_EXPIRED "TTL expired in transit.\n" IDS_TRANSMIT_FAILED "PING: transmit failed. (Error %u)\n" diff --git a/base/applications/network/tracert/lang/ru-RU.rc b/base/applications/network/tracert/lang/ru-RU.rc index d07b4f7e1d..82dae8d415 100644 --- a/base/applications/network/tracert/lang/ru-RU.rc +++ b/base/applications/network/tracert/lang/ru-RU.rc @@ -4,34 +4,35 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN IDS_USAGE "\r\n\ -Usage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name \r\n\r\n\ -Options:\r\n\ - -d Do not resolve addresses to hostnames.\r\n\ - -h maximum_hops Maximum number of hops to search for target.\r\n\ - -j host-list Loose source route along host-list.\r\n\ - -w timeout Wait timeout milliseconds for each reply.\r\n\ - -4 Force using IPv4.\r\n\ - -6 Force using IPv6.\r\n\ +Использование: tracert [-d] [-h максЧисло] [-j списокУзлов]\r\n\ + [-w таймаут] конечноеИмя\r\n\r\n\ +Параметры:\r\n\ + -d Без разрешения имён узлов.\r\n\ + -h максЧисло Максимальное число прыжков при поиске узла.\r\n\ + -j списокУзлов Свободный выбор маршрута по списку узлов.\r\n\ + -w таймаут Таймаут каждого ответа в миллисекундах.\r\n\ + -4 Принудительное использование IPv4.\r\n\ + -6 Принудительное использование IPv6.\r\n\ \r\n" - IDS_INVALID_OPTION "%1 is not a valid command option.\r\n" - IDS_TRACE_INFO "\r\nTracing route to %1 [%2]\r\nover a maximum of %3!u! hops:\r\n\r\n" - IDS_TRACE_COMPLETE "\r\nTrace complete.\r\n" - IDS_UNABLE_RESOLVE "Unable to resolve target system name %1.\r\n" + IDS_INVALID_OPTION "%1 не является допустимым параметром команды.\r\n" + IDS_TRACE_INFO "\r\nТрассировка маршрута к %1 [%2]\r\nс максимальным числом прыжков %3!u!:\r\n\r\n" + IDS_TRACE_COMPLETE "\r\nТрассировка завершена.\r\n" + IDS_UNABLE_RESOLVE "Не удается разрешить системное имя узла %1.\r\n" - IDS_GEN_FAILURE "General failure.\r\n" - IDS_TRANSMIT_FAILED "Transmit failed. (Error %1!u!)\r\n" + IDS_GEN_FAILURE "Общий сбой.\r\n" + IDS_TRANSMIT_FAILED "Ошибка передачи. (Код %1!u!)\r\n" IDS_HOP_COUNT "%1!3lu! %0\r\n" - IDS_HOP_TIME "%1!4lu! ms %0\r\n" - IDS_HOP_ZERO, " <1 ms %0\r\n" + IDS_HOP_TIME "%1!4lu! мс %0\r\n" + IDS_HOP_ZERO, " <1 мс %0\r\n" IDS_TIMEOUT " * %0\r\n" IDS_HOP_RES_INFO "%1 [%2]" IDS_HOP_IP_INFO "%1" IDS_LINEBREAK "\r\n" - IDS_REQ_TIMED_OUT "Request timed out.\r\n" - IDS_HOP_RESPONSE " reports: " - IDS_DEST_HOST_UNREACHABLE "Destination host unreachable.\r\n" - IDS_DEST_NET_UNREACHABLE "Destination network unreachable.\r\n" + IDS_REQ_TIMED_OUT "Превышен интервал ожидания для запроса.\r\n" + IDS_HOP_RESPONSE " сообщает: " + IDS_DEST_HOST_UNREACHABLE "Заданный узел недоступен.\r\n" + IDS_DEST_NET_UNREACHABLE "Заданная сеть недоступна.\r\n" END

6 years, 11 months

01/01: [EVTLIB] Make the header C++ compatible.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32c875032ba8bcc22aa97… commit 32c875032ba8bcc22aa97d80ce751b88b29d552e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 27 16:07:17 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 27 16:07:32 2018 +0100 [EVTLIB] Make the header C++ compatible. --- sdk/lib/evtlib/evtlib.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/lib/evtlib/evtlib.h b/sdk/lib/evtlib/evtlib.h index 66b7a0f64b..3853ce2954 100644 --- a/sdk/lib/evtlib/evtlib.h +++ b/sdk/lib/evtlib/evtlib.h @@ -14,6 +14,10 @@ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + /* PSDK/NDK Headers */ // #define WIN32_NO_STATUS // #include <windef.h> @@ -291,4 +295,7 @@ ElfGetFlags( VOID PRINT_HEADER(PEVENTLOGHEADER Header); #endif +#ifdef __cplusplus +} +#endif #endif /* __EVTLIB_H__ */

6 years, 11 months

01/01: [CONUTILS] Fix macro definition.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e9113338c6112ffc1db8d… commit e9113338c6112ffc1db8dc2d40eb3da93872f392 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 27 16:00:44 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 27 16:00:58 2018 +0100 [CONUTILS] Fix macro definition. --- sdk/lib/conutils/stream.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdk/lib/conutils/stream.h b/sdk/lib/conutils/stream.h index 9b70eb3c80..7b6038705b 100644 --- a/sdk/lib/conutils/stream.h +++ b/sdk/lib/conutils/stream.h @@ -117,11 +117,12 @@ do { \ * (not many terminals support UTF16 on the contrary). */ #define ConInitStdStreams() \ - ConInitStdStreamsAndMode(UTF8Text, INVALID_CP); // Cache code page unused + ConInitStdStreamsAndMode(UTF8Text, INVALID_CP) + /* Note that here the cache code page is unused */ #else /* Use ANSI by default for file output */ #define ConInitStdStreams() \ - ConInitStdStreamsAndMode(AnsiText, INVALID_CP); + ConInitStdStreamsAndMode(AnsiText, INVALID_CP) #endif /* defined(_UNICODE) */ /* Stream translation modes */

6 years, 11 months

01/01: [CONUTILS] Make the headers C++ compatible.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e87e2fa9df58a86f6492… commit 1e87e2fa9df58a86f649280817d50f4655bc07b8 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 27 15:48:59 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 27 15:49:17 2018 +0100 [CONUTILS] Make the headers C++ compatible. --- sdk/lib/conutils/pager.h | 7 +++++++ sdk/lib/conutils/screen.h | 7 +++++++ sdk/lib/conutils/stream.h | 7 +++++++ sdk/lib/conutils/utils.h | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/sdk/lib/conutils/pager.h b/sdk/lib/conutils/pager.h index 8a23875138..6c62ab955d 100644 --- a/sdk/lib/conutils/pager.h +++ b/sdk/lib/conutils/pager.h @@ -15,6 +15,10 @@ #error The ConUtils library at the moment only supports compilation with _UNICODE defined! #endif +#ifdef __cplusplus +extern "C" { +#endif + // #include <wincon.h> @@ -71,4 +75,7 @@ ConResPaging( IN BOOL StartPaging, IN UINT uID); +#ifdef __cplusplus +} +#endif #endif /* __PAGER_H__ */ diff --git a/sdk/lib/conutils/screen.h b/sdk/lib/conutils/screen.h index 01a95c5287..bc2cce9d14 100644 --- a/sdk/lib/conutils/screen.h +++ b/sdk/lib/conutils/screen.h @@ -15,6 +15,10 @@ #error The ConUtils library at the moment only supports compilation with _UNICODE defined! #endif +#ifdef __cplusplus +extern "C" { +#endif + #if 0 @@ -53,4 +57,7 @@ VOID ConClearScreen(IN PCON_SCREEN Screen); +#ifdef __cplusplus +} +#endif #endif /* __SCREEN_H__ */ diff --git a/sdk/lib/conutils/stream.h b/sdk/lib/conutils/stream.h index 7787d4b8d5..9b70eb3c80 100644 --- a/sdk/lib/conutils/stream.h +++ b/sdk/lib/conutils/stream.h @@ -25,6 +25,10 @@ #error The ConUtils library at the moment only supports compilation with _UNICODE defined! #endif +#ifdef __cplusplus +extern "C" { +#endif + /* * Console I/O streams */ @@ -264,4 +268,7 @@ VOID ConClearLine(IN PCON_STREAM Stream); +#ifdef __cplusplus +} +#endif #endif /* __STREAM_H__ */ diff --git a/sdk/lib/conutils/utils.h b/sdk/lib/conutils/utils.h index c118ac6502..52063c25bf 100644 --- a/sdk/lib/conutils/utils.h +++ b/sdk/lib/conutils/utils.h @@ -16,6 +16,10 @@ #error The ConUtils library at the moment only supports compilation with _UNICODE defined! #endif +#ifdef __cplusplus +extern "C" { +#endif + /* * General-purpose utility functions (wrappers around, * or reimplementations of, Win32 APIs). @@ -50,4 +54,7 @@ IsConsoleHandle(IN HANDLE hHandle); // #include <wincon.h> +#ifdef __cplusplus +} +#endif #endif /* __UTILS_H__ */

6 years, 11 months

04/04: [SDB] Define the layers GetShortPathNameNT4 and GetDiskFreeSpace2GB

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7520da3cef1c6fb9a99f… commit f7520da3cef1c6fb9a99f31fd5b2780a6aae9d96 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jan 24 22:43:35 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 27 15:12:24 2018 +0100 [SDB] Define the layers GetShortPathNameNT4 and GetDiskFreeSpace2GB --- media/sdb/sysmain.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index 7ab4a616f3..07a32edce6 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -196,6 +196,13 @@ <DLLFILE>aclayers.dll</DLLFILE> </SHIM> + <FLAG NAME="GetShortPathNameNT4"> + <FLAG_MASK_KERNEL>1</FLAG_MASK_KERNEL> + </FLAG> + <FLAG NAME="GetDiskFreeSpace2GB"> + <FLAG_MASK_KERNEL>8</FLAG_MASK_KERNEL> + </FLAG> + </LIBRARY>  @@ -306,5 +313,13 @@ <SHIM_REF NAME="VMHorizonSetup" /> </LAYER> +  + <LAYER NAME="GetShortPathNameNT4"> + <FLAG_REF NAME="GetShortPathNameNT4" /> + </LAYER> + <LAYER NAME="GetDiskFreeSpace2GB"> + <FLAG_REF NAME="GetDiskFreeSpace2GB" /> + </LAYER> + </DATABASE> </SDB> \ No newline at end of file

6 years, 11 months

03/04: [SHIMENG] Parse and apply [AppCompat] Flags.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7630bb0e79fb24640becb… commit 7630bb0e79fb24640becb9d9aa004f3404297308 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Jan 24 22:41:56 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Jan 27 15:12:24 2018 +0100 [SHIMENG] Parse and apply [AppCompat] Flags. --- dll/appcompat/apphelp/shimeng.c | 69 +++++++++++++++++++++++++++++++++++------ dll/appcompat/apphelp/shimeng.h | 7 +++++ 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 6beee4baff..e03a57389a 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -368,9 +368,17 @@ static DWORD SeiGetDWORD(PDB pdb, TAGID tag, TAG type) if (tagEntry == TAGID_NULL) return 0; - return SdbReadDWORDTag(pdb, tagEntry, TAGID_NULL); + return SdbReadDWORDTag(pdb, tagEntry, 0); } +static QWORD SeiGetQWORD(PDB pdb, TAGID tag, TAG type) +{ + TAGID tagEntry = SdbFindFirstTag(pdb, tag, type); + if (tagEntry == TAGID_NULL) + return 0; + + return SdbReadQWORDTag(pdb, tagEntry, 0); +} static VOID SeiAddShim(TAGREF trShimRef, PARRAY pShimRef) { @@ -383,6 +391,22 @@ static VOID SeiAddShim(TAGREF trShimRef, PARRAY pShimRef) *Data = trShimRef; } +static VOID SeiAddFlag(PDB pdb, TAGID tiFlagRef, PFLAGINFO pFlagInfo) +{ + ULARGE_INTEGER Flag; + + /* Resolve the FLAG_REF to the real FLAG node */ + TAGID FlagTag = SeiGetDWORD(pdb, tiFlagRef, TAG_FLAG_TAGID); + + if (FlagTag == TAGID_NULL) + return; + + pFlagInfo->AppCompatFlags.QuadPart |= SeiGetQWORD(pdb, FlagTag, TAG_FLAG_MASK_KERNEL); + pFlagInfo->AppCompatFlagsUser.QuadPart |= SeiGetQWORD(pdb, FlagTag, TAG_FLAG_MASK_USER); + Flag.QuadPart = SeiGetQWORD(pdb, FlagTag, TAG_FLAG_PROCESSPARAM); + pFlagInfo->ProcessParameters_Flags |= Flag.LowPart; +} + /* Propagate layers to child processes */ static VOID SeiSetLayerEnvVar(LPCWSTR wszLayer) { @@ -402,7 +426,7 @@ static VOID SeiSetLayerEnvVar(LPCWSTR wszLayer) #define MAX_LAYER_LENGTH 256 /* Translate all Exe and Layer entries to Shims, and propagate all layers */ -static VOID SeiBuildShimRefArray(HSDB hsdb, SDBQUERYRESULT* pQuery, PARRAY pShimRef) +static VOID SeiBuildShimRefArray(HSDB hsdb, SDBQUERYRESULT* pQuery, PARRAY pShimRef, PFLAGINFO pFlagInfo) { WCHAR wszLayerEnvVar[MAX_LAYER_LENGTH] = { 0 }; DWORD n; @@ -415,6 +439,7 @@ static VOID SeiBuildShimRefArray(HSDB hsdb, SDBQUERYRESULT* pQuery, PARRAY pShim { LPCWSTR ExeName = SeiGetStringPtr(pdb, tag, TAG_NAME); TAGID ShimRef = SdbFindFirstTag(pdb, tag, TAG_SHIM_REF); + TAGID FlagRef = SdbFindFirstTag(pdb, tag, TAG_FLAG_REF); if (ExeName) SeiDbgPrint(SEI_MSG, NULL, "ShimInfo(Exe(%S))\n", ExeName); @@ -425,11 +450,15 @@ static VOID SeiBuildShimRefArray(HSDB hsdb, SDBQUERYRESULT* pQuery, PARRAY pShim if (SdbTagIDToTagRef(hsdb, pdb, ShimRef, &trShimRef)) SeiAddShim(trShimRef, pShimRef); - ShimRef = SdbFindNextTag(pdb, tag, ShimRef); } - /* Handle FLAG_REF */ + while (FlagRef != TAGID_NULL) + { + SeiAddFlag(pdb, FlagRef, pFlagInfo); + + FlagRef = SdbFindNextTag(pdb, tag, FlagRef); + } } } @@ -442,6 +471,8 @@ static VOID SeiBuildShimRefArray(HSDB hsdb, SDBQUERYRESULT* pQuery, PARRAY pShim { LPCWSTR LayerName = SeiGetStringPtr(pdb, tag, TAG_NAME); TAGID ShimRef = SdbFindFirstTag(pdb, tag, TAG_SHIM_REF); + TAGID FlagRef = SdbFindFirstTag(pdb, tag, TAG_FLAG_REF); + if (LayerName) { HRESULT hr; @@ -464,7 +495,12 @@ static VOID SeiBuildShimRefArray(HSDB hsdb, SDBQUERYRESULT* pQuery, PARRAY pShim ShimRef = SdbFindNextTag(pdb, tag, ShimRef); } - /* Handle FLAG_REF */ + while (FlagRef != TAGID_NULL) + { + SeiAddFlag(pdb, FlagRef, pFlagInfo); + + FlagRef = SdbFindNextTag(pdb, tag, FlagRef); + } } } if (wszLayerEnvVar[0]) @@ -954,15 +990,12 @@ VOID SeiInitPaths(VOID) #undef WINSXS } -/* -Level(INFO) Using USER apphack flags 0x2080000 -*/ - VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) { DWORD n; ARRAY ShimRefArray; DWORD dwTotalHooks = 0; + FLAGINFO ShimFlags; PPEB Peb = NtCurrentPeb(); @@ -973,6 +1006,7 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) ARRAY_Init(&g_pShimInfo, PSHIMMODULE); ARRAY_Init(&g_pHookArray, HOOKMODULEINFO); ARRAY_Init(&g_InExclude, INEXCLUDE); + RtlZeroMemory(&ShimFlags, sizeof(ShimFlags)); SeiInitPaths(); @@ -984,7 +1018,22 @@ VOID SeiInit(PUNICODE_STRING ProcessImage, HSDB hsdb, SDBQUERYRESULT* pQuery) */ SeiDbgPrint(SEI_MSG, NULL, "ShimInfo(ExePath(%wZ))\n", ProcessImage); - SeiBuildShimRefArray(hsdb, pQuery, &ShimRefArray); + SeiBuildShimRefArray(hsdb, pQuery, &ShimRefArray, &ShimFlags); + if (ShimFlags.AppCompatFlags.QuadPart) + { + SeiDbgPrint(SEI_MSG, NULL, "Using KERNEL apphack flags 0x%I64x\n", ShimFlags.AppCompatFlags.QuadPart); + Peb->AppCompatFlags.QuadPart |= ShimFlags.AppCompatFlags.QuadPart; + } + if (ShimFlags.AppCompatFlagsUser.QuadPart) + { + SeiDbgPrint(SEI_MSG, NULL, "Using USER apphack flags 0x%I64x\n", ShimFlags.AppCompatFlagsUser.QuadPart); + Peb->AppCompatFlagsUser.QuadPart |= ShimFlags.AppCompatFlagsUser.QuadPart; + } + if (ShimFlags.ProcessParameters_Flags) + { + SeiDbgPrint(SEI_MSG, NULL, "Using ProcessParameters flags 0x%x\n", ShimFlags.ProcessParameters_Flags); + Peb->ProcessParameters->Flags |= ShimFlags.ProcessParameters_Flags; + } SeiDbgPrint(SEI_MSG, NULL, "ShimInfo(Complete)\n"); SHIMENG_INFO("Got %d shims\n", ARRAY_Size(&ShimRefArray)); diff --git a/dll/appcompat/apphelp/shimeng.h b/dll/appcompat/apphelp/shimeng.h index 735adf6421..0081c49bc9 100644 --- a/dll/appcompat/apphelp/shimeng.h +++ b/dll/appcompat/apphelp/shimeng.h @@ -72,6 +72,13 @@ typedef struct _HOOKMODULEINFO } HOOKMODULEINFO, *PHOOKMODULEINFO; +typedef struct _FLAGINFO +{ + ULARGE_INTEGER AppCompatFlags; + ULARGE_INTEGER AppCompatFlagsUser; + ULONG ProcessParameters_Flags; +} FLAGINFO, *PFLAGINFO; + #if SDBAPI_DEBUG_ALLOC

6 years, 11 months

← Newer
1
2
3
4
5
6
7
8
9
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2018