Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[ekohl] 74227: [MMSYS] Show and hide the volume systray icon.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Mar 23 20:07:29 2017 New Revision: 74227 URL: http://svn.reactos.org/svn/reactos?rev=74227&view=rev Log: [MMSYS] Show and hide the volume systray icon. Modified: trunk/reactos/dll/cpl/mmsys/volume.c Modified: trunk/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/volume.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Thu Mar 23 20:07:29 2017 @@ -219,6 +219,34 @@ } +static +VOID +SetSystrayVolumeIconState(BOOL bEnabled) +{ + HWND hwndTaskBar; + + hwndTaskBar = FindWindowW(L"SystemTray_Main", NULL); + if (hwndTaskBar == NULL) + return; + + SendMessageW(hwndTaskBar, WM_USER + 220, 4, bEnabled); +} + +static +BOOL +GetSystrayVolumeIconState(VOID) +{ + HWND hwndTaskBar; + + hwndTaskBar = FindWindowW(L"SystemTray_Main", NULL); + if (hwndTaskBar == NULL) + { + return FALSE; + } + + return (BOOL)SendMessageW(hwndTaskBar, WM_USER + 221, 4, 0); +} + VOID InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { @@ -226,6 +254,10 @@ MIXERCAPS mxc; TCHAR szNoDevices[256]; + CheckDlgButton(hwndDlg, + IDC_ICON_IN_TASKBAR, + GetSystrayVolumeIconState() ? BST_CHECKED : BST_UNCHECKED); + LoadString(hApplet, IDS_NO_DEVICES, szNoDevices, _countof(szNoDevices)); NumMixers = mixerGetNumDevs(); @@ -233,7 +265,6 @@ { EnableWindow(GetDlgItem(hwndDlg, IDC_VOLUME_TRACKBAR), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_MUTE_CHECKBOX), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_ICON_IN_TASKBAR), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SPEAKER_VOL_BTN), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVANCED2_BTN), FALSE); @@ -280,6 +311,15 @@ SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER); } +VOID +SaveData(HWND hwndDlg) +{ + BOOL bShowIcon; + + bShowIcon = (IsDlgButtonChecked(hwndDlg, IDC_ICON_IN_TASKBAR) == BST_CHECKED); + + SetSystrayVolumeIconState(!bShowIcon); +} VOID LaunchSoundControl(HWND hwndDlg) @@ -380,18 +420,29 @@ switch (LOWORD(wParam)) { case IDC_MUTE_CHECKBOX: - SwitchMuteState(pGlobalData); - if (pGlobalData->muteVal) + if (HIWORD(wParam) == BN_CLICKED) + { + SwitchMuteState(pGlobalData); + if (pGlobalData->muteVal) { - SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconMuted); } else { - SendDlgItemMessage(hwndDlg, IDC_MUTE_CHECKBOX, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); SendDlgItemMessage(hwndDlg, IDC_MUTE_ICON, STM_SETIMAGE, IMAGE_ICON, (LPARAM)pGlobalData->hIconUnMuted); } + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } break; + + case IDC_ICON_IN_TASKBAR: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + case IDC_ADVANCED_BTN: LaunchSoundControl(hwndDlg); break; @@ -419,6 +470,13 @@ DestroyIcon(pGlobalData->hIconNoHW); HeapFree(GetProcessHeap(), 0, pGlobalData); break; + + case WM_NOTIFY: + if (((LPNMHDR)lParam)->code == (UINT)PSN_APPLY) + { + SaveData(hwndDlg); + } + return TRUE; } return FALSE;

7 years, 9 months

[ekohl] 74226: [POWERCFG] Show and hide the power systray icon.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Mar 23 20:00:54 2017 New Revision: 74226 URL: http://svn.reactos.org/svn/reactos?rev=74226&view=rev Log: [POWERCFG] Show and hide the power systray icon. Modified: trunk/reactos/dll/cpl/powercfg/advanced.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c [iso-8859-1] Thu Mar 23 20:00:54 2017 @@ -17,6 +17,32 @@ static POWER_ACTION g_PowerButton[5]; static POWER_ACTION g_SleepButton[5]; + +static +VOID +SetSystrayPowerIconState(BOOL bEnabled) +{ + HWND hwndTaskBar; + + hwndTaskBar = FindWindowW(L"SystemTray_Main", NULL); + if (hwndTaskBar == NULL) + return; + + SendMessageW(hwndTaskBar, WM_USER + 220, 1, bEnabled); +} + +static +BOOL +GetSystrayPowerIconState(VOID) +{ + HWND hwndTaskBar; + + hwndTaskBar = FindWindowW(L"SystemTray_Main", NULL); + if (hwndTaskBar == NULL) + return FALSE; + + return (BOOL)SendMessageW(hwndTaskBar, WM_USER + 221, 1, 0); +} static VOID AddItem(HWND hDlgCtrl, INT ResourceId, LPARAM lParam, POWER_ACTION * lpAction) @@ -278,6 +304,11 @@ SYSTEM_POWER_CAPABILITIES spc; + if (GetSystrayPowerIconState()) + gGPP.user.GlobalFlags |= EnableSysTrayBatteryMeter; + else + gGPP.user.GlobalFlags &= ~EnableSysTrayBatteryMeter; + CheckDlgButton(hAdv, IDC_SYSTRAYBATTERYMETER, gGPP.user.GlobalFlags & EnableSysTrayBatteryMeter ? BST_CHECKED : BST_UNCHECKED); @@ -351,7 +382,7 @@ ShowWindow(hList2, FALSE); } - hList3=GetDlgItem(hAdv, IDC_SLEEPBUTTON); + hList3 = GetDlgItem(hAdv, IDC_SLEEPBUTTON); SendMessage(hList3, CB_RESETCONTENT, 0, 0); memset(g_SleepButton, 0x0, sizeof(g_SleepButton)); @@ -469,6 +500,8 @@ { MessageBox(hwndDlg, L"WriteGlobalPwrPolicy failed", NULL, MB_OK); } + + SetSystrayPowerIconState(!bSystrayBatteryMeter); Adv_InitDialog(); }

7 years, 9 months

[ekohl] 74225: [STOBJECT] Implement code to show and hide the power and volume icons in the notification area aka systray. Control panel applications send WM_USR+220 messages to the systray window ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Mar 23 19:51:53 2017 New Revision: 74225 URL: http://svn.reactos.org/svn/reactos?rev=74225&view=rev Log: [STOBJECT] Implement code to show and hide the power and volume icons in the notification area aka systray. Control panel applications send WM_USR+220 messages to the systray window in order to show or hide an icon in the systray. The wParam parameter identifies the icon: 1=power, 4=volume. The lParam parameter indicates the new icon status: 0:show, 1:hide. Control panel applications also send WM_USER+221 messages to the systray window in order to retrieve the current status of a systray icon. The wParam parameter identifies the icon, just like in the WM_SUER+220 messages. The lParam parameter is ignored. The return value indicates the status of the icon: 1:visible, 0:hidden. Added: trunk/reactos/dll/shellext/stobject/power.cpp (with props) Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt trunk/reactos/dll/shellext/stobject/csystray.cpp trunk/reactos/dll/shellext/stobject/csystray.h trunk/reactos/dll/shellext/stobject/precomp.h trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/CMak… ============================================================================== --- trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/CMakeLists.txt [iso-8859-1] Thu Mar 23 19:51:53 2017 @@ -21,6 +21,7 @@ csystray.cpp stobject.cpp stobject.rc + power.cpp volume.cpp ${CMAKE_CURRENT_BINARY_DIR}/stobject.def) Modified: trunk/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Thu Mar 23 19:51:53 2017 @@ -11,9 +11,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(stobject); SysTrayIconHandlers_t g_IconHandlers [] = { - { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message } + { Volume_Init, Volume_Shutdown, Volume_Update, Volume_Message }, + { Power_Init, Power_Shutdown, Power_Update, Power_Message } }; -const int g_NumIcons = _countof(g_IconHandlers); +const int g_NumIcons = _countof(g_IconHandlers); CSysTray::CSysTray() {} CSysTray::~CSysTray() {} @@ -79,11 +80,11 @@ return S_OK; } -HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - for (int i = 0; i < g_NumIcons; i++) - { - HRESULT hr = g_IconHandlers[i].pfnMessage(this, uMsg, wParam, lParam); +HRESULT CSysTray::ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) +{ + for (int i = 0; i < g_NumIcons; i++) + { + HRESULT hr = g_IconHandlers[i].pfnMessage(this, uMsg, wParam, lParam, lResult); if (FAILED(hr)) return hr; @@ -225,7 +226,7 @@ TRACE("SysTray message received %u (%08p %08p)\n", uMsg, wParam, lParam); - hr = ProcessIconMessage(uMsg, wParam, lParam); + hr = ProcessIconMessage(uMsg, wParam, lParam, lResult); if (FAILED(hr)) return FALSE; Modified: trunk/reactos/dll/shellext/stobject/csystray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/csys… ============================================================================== --- trunk/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] Thu Mar 23 19:51:53 2017 @@ -4,7 +4,7 @@ * FILE: dll/shellext/stobject/csystray.h * PURPOSE: Systray shell service object * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * David Quintana <gigaherz(a)gmail.com> */ #pragma once @@ -37,7 +37,7 @@ HRESULT InitIcons(); HRESULT ShutdownIcons(); HRESULT UpdateIcons(); - HRESULT ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT ProcessIconMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); HRESULT InitNetShell(); HRESULT ShutdownNetShell(); Added: trunk/reactos/dll/shellext/stobject/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/powe… ============================================================================== --- trunk/reactos/dll/shellext/stobject/power.cpp (added) +++ trunk/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] Thu Mar 23 19:51:53 2017 @@ -0,0 +1,185 @@ +/* + * PROJECT: ReactOS system libraries + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/shellext/stobject/power.cpp + * PURPOSE: Power notification icon handler + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + * David Quintana <gigaherz(a)gmail.com> + */ + +#include "precomp.h" + +#include <mmsystem.h> +#include <mmddk.h> + +#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) +#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) + +WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +//static HICON g_hIconBattery = NULL; +static HICON g_hIconAC = NULL; + +static BOOL g_IsRunning = FALSE; + + +HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray) +{ + WCHAR strTooltip[128]; + + TRACE("Power_Init\n"); + +// g_hIconBattery = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); + g_hIconAC = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_BATTERY)); + + + HICON icon; +// if (g_IsMute) +// icon = g_hIconBattery; +// else + icon = g_hIconAC; + + LoadStringW(g_hInstance, IDS_PWR_AC, strTooltip, _countof(strTooltip)); + + g_IsRunning = TRUE; + + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, icon, strTooltip); +} + +HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) +{ +// BOOL PrevState; + + TRACE("Power_Update\n"); + +#if 0 + PrevState = g_IsMute; + Volume_IsMute(); + + if (PrevState != g_IsMute) + { + WCHAR strTooltip[128]; + HICON icon; + if (g_IsMute) { + icon = g_hIconMute; + LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); + } + else { + icon = g_hIconVolume; + LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); + } + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, icon, strTooltip); + } + else + { + return S_OK; + } +#endif + return S_OK; +} + +HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray) +{ + TRACE("Power_Shutdown\n"); + + g_IsRunning = FALSE; + + return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_POWER, NULL, NULL); +} + +static void _RunPower() +{ + ShellExecuteW(NULL, NULL, L"powercfg.cpl", NULL, NULL, SW_SHOWNORMAL); +} + +static void _ShowContextMenu(CSysTray * pSysTray) +{ + WCHAR strOpen[128]; + + LoadStringW(g_hInstance, IDS_PWR_PROPERTIES, strOpen, _countof(strOpen)); + + HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, strOpen); + + DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; + DWORD msgPos = GetMessagePos(); + + SetForegroundWindow(pSysTray->GetHWnd()); + DWORD id = TrackPopupMenuEx(hPopup, flags, + GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), + pSysTray->GetHWnd(), NULL); + + DestroyMenu(hPopup); + + switch (id) + { + case IDS_PWR_PROPERTIES: + _RunPower(); + break; + } +} + +HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) +{ + TRACE("Power_Message uMsg=%d, wParam=%x, lParam=%x\n", uMsg, wParam, lParam); + + switch (uMsg) + { + case WM_USER + 220: + TRACE("Power_Message: WM_USER+220\n"); + if (wParam == 1) + { + if (lParam == FALSE) + return Power_Init(pSysTray); + else + return Power_Shutdown(pSysTray); + } + return S_FALSE; + + case WM_USER + 221: + TRACE("Power_Message: WM_USER+221\n"); + if (wParam == 1) + { + lResult = (LRESULT)g_IsRunning; + return S_OK; + } + return S_FALSE; + + case ID_ICON_POWER: + Power_Update(pSysTray); + + switch (lParam) + { + case WM_LBUTTONDOWN: + break; + + case WM_LBUTTONUP: + TRACE("TODO: display power options!\n"); + break; + + case WM_LBUTTONDBLCLK: + _RunPower(); + break; + + case WM_RBUTTONDOWN: + break; + + case WM_RBUTTONUP: + _ShowContextMenu(pSysTray); + + case WM_RBUTTONDBLCLK: + break; + + case WM_MOUSEMOVE: + break; + } + return S_OK; + + default: + TRACE("Power_Message received for unknown ID %d, ignoring.\n"); + return S_FALSE; + } + + return S_FALSE; +} Propchange: trunk/reactos/dll/shellext/stobject/power.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/shellext/stobject/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/prec… ============================================================================== --- trunk/reactos/dll/shellext/stobject/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/precomp.h [iso-8859-1] Thu Mar 23 19:51:53 2017 @@ -39,13 +39,14 @@ extern HINSTANCE g_hInstance; #define ID_ICON_VOLUME (WM_APP + 0x4CB) +#define ID_ICON_POWER (WM_APP + 0x4CC) #include "csystray.h" typedef HRESULT(STDMETHODCALLTYPE * PFNSTINIT) (_In_ CSysTray * pSysTray); typedef HRESULT(STDMETHODCALLTYPE * PFNSTSHUTDOWN) (_In_ CSysTray * pSysTray); typedef HRESULT(STDMETHODCALLTYPE * PFNSTUPDATE) (_In_ CSysTray * pSysTray); -typedef HRESULT(STDMETHODCALLTYPE * PFNSTMESSAGE) (_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam); +typedef HRESULT(STDMETHODCALLTYPE * PFNSTMESSAGE) (_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); struct SysTrayIconHandlers_t { @@ -63,4 +64,9 @@ extern HRESULT STDMETHODCALLTYPE Volume_Init(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray); extern HRESULT STDMETHODCALLTYPE Volume_Update(_In_ CSysTray * pSysTray); -extern HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam); +extern HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); + +extern HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray); +extern HRESULT STDMETHODCALLTYPE Power_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult); Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Thu Mar 23 19:51:53 2017 @@ -26,7 +26,8 @@ UINT g_mmDeviceChange; -BOOL g_IsMute = FALSE; +static BOOL g_IsMute = FALSE; +static BOOL g_IsRunning = FALSE; static HRESULT __stdcall Volume_FindMixerControl(CSysTray * pSysTray) { @@ -161,6 +162,8 @@ Volume_IsMute(); + g_IsRunning = TRUE; + HICON icon; if (g_IsMute) icon = g_hIconMute; @@ -184,11 +187,13 @@ { WCHAR strTooltip[128]; HICON icon; - if (g_IsMute) { + if (g_IsMute) + { icon = g_hIconMute; LoadStringW(g_hInstance, IDS_VOL_MUTED, strTooltip, _countof(strTooltip)); } - else { + else + { icon = g_hIconVolume; LoadStringW(g_hInstance, IDS_VOL_VOLUME, strTooltip, _countof(strTooltip)); } @@ -204,6 +209,8 @@ HRESULT STDMETHODCALLTYPE Volume_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Volume_Shutdown\n"); + + g_IsRunning = FALSE; return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_VOLUME, NULL, NULL); } @@ -256,40 +263,70 @@ } } -HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT STDMETHODCALLTYPE Volume_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) { if (uMsg == g_mmDeviceChange) return Volume_OnDeviceChange(pSysTray, wParam, lParam); - if (uMsg != ID_ICON_VOLUME) - { - TRACE("Volume_Message received for unknown ID %d, ignoring.\n"); - return S_FALSE; - } - - TRACE("Volume_Message uMsg=%d, w=%x, l=%x\n", uMsg, wParam, lParam); - - Volume_Update(pSysTray); - - switch (lParam) - { - case WM_LBUTTONDOWN: - break; - case WM_LBUTTONUP: - TRACE("TODO: display volume slider\n"); - break; - case WM_LBUTTONDBLCLK: - _RunVolume(); - break; - case WM_RBUTTONDOWN: - break; - case WM_RBUTTONUP: - _ShowContextMenu(pSysTray); - case WM_RBUTTONDBLCLK: - break; - case WM_MOUSEMOVE: - break; - } - - return S_OK; -} + switch (uMsg) + { + case WM_USER + 220: + TRACE("Volume_Message: WM_USER+220\n"); + if (wParam == 4) + { + if (lParam == FALSE) + return Volume_Init(pSysTray); + else + return Volume_Shutdown(pSysTray); + } + return S_FALSE; + + case WM_USER + 221: + TRACE("Volume_Message: WM_USER+221\n"); + if (wParam == 4) + { + lResult = (LRESULT)g_IsRunning; + return S_OK; + } + return S_FALSE; + + case ID_ICON_VOLUME: + TRACE("Volume_Message uMsg=%d, w=%x, l=%x\n", uMsg, wParam, lParam); + + Volume_Update(pSysTray); + + switch (lParam) + { + case WM_LBUTTONDOWN: + break; + + case WM_LBUTTONUP: + TRACE("TODO: display volume slider\n"); + break; + + case WM_LBUTTONDBLCLK: + _RunVolume(); + break; + + case WM_RBUTTONDOWN: + break; + + case WM_RBUTTONUP: + _ShowContextMenu(pSysTray); + break; + + case WM_RBUTTONDBLCLK: + break; + + case WM_MOUSEMOVE: + break; + } + return S_OK; + + default: + TRACE("Volume_Message received for unknown ID %d, ignoring.\n"); + return S_FALSE; + } + + return S_FALSE; +}

7 years, 9 months

[gadamopoulos] 74224: [EXPLORER]: Simplify the creation of the tray band site and the tasks band. - CTrayBandSite: Rename its constructor to CTrayBandSite_CreateInstance. Let the CTrayWindow create...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Mar 23 15:39:34 2017 New Revision: 74224 URL: http://svn.reactos.org/svn/reactos?rev=74224&view=rev Log: [EXPLORER]: Simplify the creation of the tray band site and the tasks band. - CTrayBandSite: Rename its constructor to CTrayBandSite_CreateInstance. Let the CTrayWindow create the CTasksBand and pass it to the constructor. Use a standard com interface to see if the tasks band was added while loading and don't use an explorer specific interface for it. Make CTrayBandSite::_Init a bit clearer. - CTrayWindow: Implement the IOleWindow interface and create the CTaskBand before creating the CTrayBandSite. Then use standard com interfaces to get their respective HRND. - CTaskBand: Rename its constructor to CTaskBand_CreateInstance. Remove a hack that was using its IOleWindow to act like the IOleWindow of the CTrayWindow during the creation of the CTrayBandSite. This is possible since the IOleWindow of the CTrayWindow is passed to the SetDeskBarSite method of CTrayBandSite. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/taskband.cpp trunk/reactos/base/shell/explorer/tbsite.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Thu Mar 23 15:39:34 2017 @@ -232,32 +232,8 @@ * taskband.cpp */ -/* Internal Task Band CLSID */ -extern const GUID CLSID_ITaskBand; - -#define INTERFACE ITaskBand -DECLARE_INTERFACE_(ITaskBand, IUnknown) -{ - /*** IUnknown methods ***/ - STDMETHOD_(HRESULT, QueryInterface) (THIS_ REFIID riid, void** ppvObject) PURE; - STDMETHOD_(ULONG, AddRef) (THIS) PURE; - STDMETHOD_(ULONG, Release) (THIS) PURE; - /*** ITaskBand methods ***/ - STDMETHOD_(HRESULT, GetRebarBandID)(THIS_ DWORD *pdwBandID) PURE; -}; -#undef INTERFACE - -#if defined(COBJMACROS) -/*** IUnknown methods ***/ -#define ITaskBand_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define ITaskBand_AddRef(p) (p)->lpVtbl->AddRef(p) -#define ITaskBand_Release(p) (p)->lpVtbl->Release(p) -/*** ITaskBand methods ***/ -#define ITaskBand_GetRebarBandID(p,a) (p)->lpVtbl->GetRebarBandID(p,a) -#endif - -ITaskBand * -CreateTaskBand(IN OUT ITrayWindow *Tray); +extern const GUID CLSID_ITaskBand; /* Internal Task Band CLSID */ +HRESULT CTaskBand_CreateInstance(IN ITrayWindow *Tray, REFIID riid, void **ppv); /* * tbsite.cpp @@ -296,10 +272,7 @@ #define ITrayBandSite_Lock(p,a) (p)->lpVtbl->Lock(p,a) #endif -ITrayBandSite * -CreateTrayBandSite(IN OUT ITrayWindow *Tray, -OUT HWND *phWndRebar, -OUT HWND *phWndTaskSwitch); +HRESULT CTrayBandSite_CreateInstance(IN ITrayWindow *tray, IN IDeskBand* pTaskBand, OUT ITrayBandSite** pBandSite); /* * startmnu.cpp Modified: trunk/reactos/base/shell/explorer/taskband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskband.cpp [iso-8859-1] Thu Mar 23 15:39:34 2017 @@ -21,7 +21,7 @@ #include "precomp.h" /***************************************************************************** - ** ITaskBand **************************************************************** + ** CTaskBand **************************************************************** *****************************************************************************/ const GUID CLSID_ITaskBand = { 0x68284FAA, 0x6A48, 0x11D0, { 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4 } }; @@ -30,7 +30,6 @@ public CComCoClass<CTaskBand>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, - public ITaskBand, public IDeskBand, public IDeskBar, public IPersistStream, @@ -53,41 +52,16 @@ virtual ~CTaskBand() { } - virtual HRESULT STDMETHODCALLTYPE GetRebarBandID( - OUT DWORD *pdwBandID) - { - if (m_BandID != (DWORD) -1) - { - if (pdwBandID != NULL) - *pdwBandID = m_BandID; - - return S_OK; - } - - return E_FAIL; - } - - /*****************************************************************************/ - - virtual HRESULT STDMETHODCALLTYPE GetWindow( - OUT HWND *phwnd) - { - - /* NOTE: We have to return the tray window here so that ITaskBarClient - knows the parent window of the Rebar control it creates when - calling ITaskBarClient::SetDeskBarSite()! However, once we - created a window we return the task switch window! */ - if (m_hWnd != NULL) - *phwnd = m_hWnd; - else - *phwnd = m_Tray->GetHWND(); - - TRACE("ITaskBand::GetWindow(0x%p->0x%p)\n", phwnd, *phwnd); - - if (*phwnd != NULL) - return S_OK; - - return E_FAIL; + /*****************************************************************************/ + + virtual HRESULT STDMETHODCALLTYPE GetWindow(OUT HWND *phwnd) + { + if (!m_hWnd) + return E_FAIL; + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd; + return S_OK; } virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp( @@ -125,7 +99,7 @@ IN DWORD dwViewMode, IN OUT DESKBANDINFO *pdbi) { - TRACE("ITaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); + TRACE("CTaskBand::GetBandInfo(0x%x,0x%x,0x%p) hWnd=0x%p\n", dwBandID, dwViewMode, pdbi, m_hWnd); if (m_hWnd != NULL) { @@ -231,7 +205,7 @@ virtual HRESULT STDMETHODCALLTYPE GetClassID( OUT CLSID *pClassID) { - TRACE("ITaskBand::GetClassID(0x%p)\n", pClassID); + TRACE("CTaskBand::GetClassID(0x%p)\n", pClassID); /* We're going to return the (internal!) CLSID of the task band interface */ *pClassID = CLSID_ITaskBand; return S_OK; @@ -246,7 +220,7 @@ virtual HRESULT STDMETHODCALLTYPE Load( IN IStream *pStm) { - TRACE("ITaskBand::Load called\n"); + TRACE("CTaskBand::Load called\n"); /* Nothing to do */ return S_OK; } @@ -262,7 +236,7 @@ virtual HRESULT STDMETHODCALLTYPE GetSizeMax( OUT ULARGE_INTEGER *pcbSize) { - TRACE("ITaskBand::GetSizeMax called\n"); + TRACE("CTaskBand::GetSizeMax called\n"); /* We don't need any space for the task band */ pcbSize->QuadPart = 0; return S_OK; @@ -275,7 +249,7 @@ HRESULT hRet; HWND hwndSite; - TRACE("ITaskBand::SetSite(0x%p)\n", pUnkSite); + TRACE("CTaskBand::SetSite(0x%p)\n", pUnkSite); hRet = IUnknown_GetWindow(pUnkSite, &hwndSite); if (FAILED(hRet)) @@ -303,7 +277,7 @@ IN REFIID riid, OUT VOID **ppvSite) { - TRACE("ITaskBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); + TRACE("CTaskBand::GetSite(0x%p,0x%p)\n", riid, ppvSite); if (m_Site != NULL) { @@ -323,7 +297,7 @@ IN LPARAM lParam, OUT LRESULT *plrResult) { - TRACE("ITaskBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); + TRACE("CTaskBand: IWinEventHandler::ProcessMessage(0x%p, 0x%x, 0x%p, 0x%p, 0x%p)\n", hWnd, uMsg, wParam, lParam, plrResult); return E_NOTIMPL; } @@ -333,7 +307,7 @@ if (hWnd == m_hWnd || IsChild(m_hWnd, hWnd)) { - TRACE("ITaskBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); + TRACE("CTaskBand::ContainsWindow(0x%p) returns S_OK\n", hWnd); return S_OK; } @@ -353,7 +327,7 @@ /*****************************************************************************/ - HRESULT STDMETHODCALLTYPE _Init(IN OUT ITrayWindow *tray) + HRESULT STDMETHODCALLTYPE Initialize(IN OUT ITrayWindow *tray) { m_Tray = tray; m_BandID = (DWORD) -1; @@ -374,21 +348,7 @@ END_COM_MAP() }; -ITaskBand * CreateTaskBand(IN OUT ITrayWindow *Tray) +HRESULT CTaskBand_CreateInstance(IN ITrayWindow *Tray, REFIID riid, void **ppv) { - HRESULT hr; - - CTaskBand * tb = new CComObject<CTaskBand>(); - - if (!tb) - return NULL; - - hr = tb->AddRef(); - - hr = tb->_Init(Tray); - - if (FAILED_UNEXPECTEDLY(hr)) - tb->Release(); - - return tb; + return ShellObjectCreatorInit<CTaskBand>(Tray, riid, ppv); } Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… ============================================================================== --- trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] Thu Mar 23 15:39:34 2017 @@ -40,7 +40,7 @@ CComPtr<IUnknown> m_Inner; CComPtr<IBandSite> m_BandSite; - CComPtr<ITaskBand> m_TaskBand; + CComPtr<IDeskBand> m_TaskBand; CComPtr<IWinEventHandler> m_WindowEventHandler; CComPtr<IContextMenu> m_ContextMenu; @@ -447,38 +447,28 @@ virtual BOOL HasTaskBand() { - ASSERT(m_TaskBand != NULL); - - return SUCCEEDED(m_TaskBand->GetRebarBandID(NULL)); - } - - virtual HRESULT AddTaskBand() - { -#if 0 - /* FIXME: This is the code for the simple taskbar */ - IObjectWithSite *pOws; - HRESULT hRet; - - hRet = TaskBand->QueryInterface( - &IID_IObjectWithSite, - (PVOID*) &pOws); - if (SUCCEEDED(hRet)) - { - hRet = pOws->SetSite( - (IUnknown *)TaskBand); - - pOws->Release(); - } - - return hRet; -#else - if (!HasTaskBand()) - { - return m_BandSite->AddBand(m_TaskBand); - } - - return S_OK; -#endif + CComPtr<IPersist> pBand; + CLSID BandCLSID; + DWORD dwBandID; + UINT uBand = 0; + + /* Enumerate all bands */ + while (SUCCEEDED(m_BandSite->EnumBands(uBand, &dwBandID))) + { + if (SUCCEEDED(m_BandSite->GetBandObject(dwBandID, IID_PPV_ARG(IPersist, &pBand)))) + { + if (SUCCEEDED(pBand->GetClassID(&BandCLSID))) + { + if (IsEqualGUID(BandCLSID, CLSID_ITaskBand)) + { + return TRUE; + } + } + } + uBand++; + } + + return FALSE; } virtual HRESULT Update() @@ -642,139 +632,103 @@ return hRet; } - HRESULT _Init(IN OUT ITrayWindow *tray, OUT HWND *phWndRebar, OUT HWND *phwndTaskSwitch) + HRESULT _Init(IN ITrayWindow *tray, IN IDeskBand* pTaskBand) { CComPtr<IDeskBarClient> pDbc; CComPtr<IDeskBand> pDb; CComPtr<IOleWindow> pOw; HRESULT hRet; - *phWndRebar = NULL; - *phwndTaskSwitch = NULL; - m_Tray = tray; - - /* Create a RebarBandSite provided by the shell */ + m_TaskBand = pTaskBand; + + /* Create the RebarBandSite */ hRet = CoCreateInstance(CLSID_RebarBandSite, - static_cast<IBandSite*>(this), - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IUnknown, &m_Inner)); - if (!SUCCEEDED(hRet)) - { + static_cast<IBandSite*>(this), + CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IUnknown, &m_Inner)); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - } hRet = m_Inner->QueryInterface(IID_PPV_ARG(IBandSite, &m_BandSite)); - if (!SUCCEEDED(hRet)) - { + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - } hRet = m_Inner->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WindowEventHandler)); - if (!SUCCEEDED(hRet)) - { + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - } - - m_TaskBand = CreateTaskBand(m_Tray); - if (m_TaskBand != NULL) - { - /* Add the task band to the site */ - hRet = m_BandSite->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pDbc)); - if (SUCCEEDED(hRet)) - { - hRet = m_TaskBand->QueryInterface(IID_PPV_ARG(IOleWindow, &pOw)); - if (SUCCEEDED(hRet)) - { - /* We cause IDeskBarClient to create the rebar control by passing the new - task band to it. The band reports the tray window handle as window handle - so that IDeskBarClient knows the parent window of the Rebar control that - it wants to create. */ - hRet = pDbc->SetDeskBarSite(pOw); - - if (SUCCEEDED(hRet)) - { - /* The Rebar control is now created, we can query the window handle */ - hRet = pDbc->GetWindow(&m_Rebar); - - if (SUCCEEDED(hRet)) - { - /* We need to manually remove the RBS_BANDBORDERS style! */ - SetWindowStyle(m_Rebar, RBS_BANDBORDERS, 0); - } - } - } - - if (SUCCEEDED(hRet)) - { - DWORD dwMode = 0; - - /* Set the Desk Bar mode to the current one */ - - /* FIXME: We need to set the mode (and update) whenever the user docks - the tray window to another monitor edge! */ - - if (!m_Tray->IsHorizontal()) - dwMode = DBIF_VIEWMODE_VERTICAL; - - hRet = pDbc->SetModeDBC(dwMode); - } - - pDbc->Release(); - } - - /* Load the saved state of the task band site */ - /* FIXME: We should delay loading shell extensions, also see DBID_DELAYINIT */ - Load(); - - /* Add the task bar band if it hasn't been added already */ - hRet = AddTaskBand(); - if (SUCCEEDED(hRet)) - { - hRet = m_TaskBand->QueryInterface(IID_PPV_ARG(IDeskBand, &pDb)); - if (SUCCEEDED(hRet)) - { - hRet = pDb->GetWindow(phwndTaskSwitch); - if (!SUCCEEDED(hRet)) - *phwndTaskSwitch = NULL; - } - } - - /* Should we send this after showing it? */ - Update(); - - /* FIXME: When should we send this? Does anyone care anyway? */ - FinishInit(); - - /* Activate the band site */ - Show( - TRUE); - } - - *phWndRebar = m_Rebar; + + hRet = m_Inner->QueryInterface(IID_PPV_ARG(IDeskBarClient, &pDbc)); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + + + + /* Crete the rebar in the tray */ + hRet = pDbc->SetDeskBarSite(tray); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + hRet = pDbc->GetWindow(&m_Rebar); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + SetWindowStyle(m_Rebar, RBS_BANDBORDERS, 0); + + /* Set the Desk Bar mode to the current one */ + DWORD dwMode = 0; + /* FIXME: We need to set the mode (and update) whenever the user docks + the tray window to another monitor edge! */ + if (!m_Tray->IsHorizontal()) + dwMode = DBIF_VIEWMODE_VERTICAL; + + hRet = pDbc->SetModeDBC(dwMode); + + /* Load the saved state of the task band site */ + /* FIXME: We should delay loading shell extensions, also see DBID_DELAYINIT */ + Load(); + + /* Add the task bar band if it hasn't been added while loading */ + if (!HasTaskBand()) + { + hRet = m_BandSite->AddBand(m_TaskBand); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + } + + /* Should we send this after showing it? */ + Update(); + + /* FIXME: When should we send this? Does anyone care anyway? */ + FinishInit(); + + /* Activate the band site */ + Show(TRUE); return S_OK; } }; /*******************************************************************/ -ITrayBandSite* -CreateTrayBandSite(IN OUT ITrayWindow *Tray, - OUT HWND *phWndRebar, - OUT HWND *phWndTaskSwitch) +HRESULT CTrayBandSite_CreateInstance(IN ITrayWindow *tray, IN IDeskBand* pTaskBand, OUT ITrayBandSite** pBandSite) { HRESULT hr; CTrayBandSite * tb = new CTrayBandSite(); - if (!tb) - return NULL; + return E_FAIL; tb->AddRef(); - hr = tb->_Init(Tray, phWndRebar, phWndTaskSwitch); + hr = tb->_Init(tray, pTaskBand); if (FAILED_UNEXPECTEDLY(hr)) + { tb->Release(); - - return tb; + return hr; + } + + *pBandSite = tb; + + return S_OK; } Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Thu Mar 23 15:39:34 2017 @@ -177,13 +177,15 @@ public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl < CTrayWindow, CWindow, CControlWinTraits >, public ITrayWindow, - public IShellDesktopTray + public IShellDesktopTray, + public IOleWindow { CStartButton m_StartButton; CComPtr<IMenuBand> m_StartMenuBand; CComPtr<IMenuPopup> m_StartMenuPopup; + CComPtr<IDeskBand> m_TaskBand; HTHEME m_Theme; HFONT m_Font; @@ -2079,6 +2081,8 @@ LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + HRESULT hRet; + ((ITrayWindow*)this)->AddRef(); SetWindowTheme(m_hWnd, L"TaskBar", NULL); @@ -2093,8 +2097,26 @@ HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, MAKEINTRESOURCEW(IDB_STARTMENU)); m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, 0); - /* Create the tray band site and its rebar */ - m_TrayBandSite = CreateTrayBandSite(this, &m_Rebar, &m_TaskSwitch); + /* Create the task band */ + hRet = CTaskBand_CreateInstance(this, IID_PPV_ARG(IDeskBand, &m_TaskBand)); + if (FAILED_UNEXPECTEDLY(hRet)) + return FALSE; + + /* Create the rebar band site. This actually creates the rebar and the tasks toolbar. */ + hRet = CTrayBandSite_CreateInstance(this, m_TaskBand, &m_TrayBandSite); + if (FAILED_UNEXPECTEDLY(hRet)) + return FALSE; + + /* Get the hwnd of the rebar */ + hRet = IUnknown_GetWindow(m_TrayBandSite, &m_Rebar); + if (FAILED_UNEXPECTEDLY(hRet)) + return FALSE; + + /* Get the hwnd of the tasks toolbar */ + hRet = IUnknown_GetWindow(m_TaskBand, &m_TaskSwitch); + if (FAILED_UNEXPECTEDLY(hRet)) + return FALSE; + SetWindowTheme(m_Rebar, L"TaskBar", NULL); /* Create the tray notification window */ @@ -2890,6 +2912,19 @@ return S_OK; } + HRESULT WINAPI GetWindow(HWND* phwnd) + { + if (!phwnd) + return E_INVALIDARG; + *phwnd = m_hWnd; + return S_OK; + } + + HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode) + { + return E_NOTIMPL; + } + void _Init() { m_Position = (DWORD) -1; @@ -2901,6 +2936,7 @@ BEGIN_COM_MAP(CTrayWindow) /*COM_INTERFACE_ENTRY_IID(IID_ITrayWindow, ITrayWindow)*/ COM_INTERFACE_ENTRY_IID(IID_IShellDesktopTray, IShellDesktopTray) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) END_COM_MAP() };

7 years, 9 months

[tfaber] 74223: [AT] - Fix MSVC build

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Mar 22 23:35:50 2017 New Revision: 74223 URL: http://svn.reactos.org/svn/reactos?rev=74223&view=rev Log: [AT] - Fix MSVC build Modified: trunk/reactos/base/applications/cmdutils/at/resource.h Modified: trunk/reactos/base/applications/cmdutils/at/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] Wed Mar 22 23:35:50 2017 @@ -28,4 +28,4 @@ #define IDS_CONFIRM_QUESTION 130 #define IDS_CONFIRM_INVALID 131 #define IDS_CONFIRM_YES 132 -#define IDS_CONFIRM_NO 133 +#define IDS_CONFIRM_NO 133

7 years, 9 months

[ekohl] 74222: [AT] - Confirm deleting all jobs. - Fix typos in resources and add missing usage text.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Mar 22 21:59:06 2017 New Revision: 74222 URL: http://svn.reactos.org/svn/reactos?rev=74222&view=rev Log: [AT] - Confirm deleting all jobs. - Fix typos in resources and add missing usage text. Modified: trunk/reactos/base/applications/cmdutils/at/at.c trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc trunk/reactos/base/applications/cmdutils/at/resource.h Modified: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Wed Mar 22 21:59:06 2017 @@ -239,6 +239,57 @@ szBuffer[79] = UNICODE_NULL; ConPrintf(StdOut, L"%s\n", szBuffer); +} + + +static +BOOL +Confirm(VOID) +{ + HINSTANCE hInstance; + WCHAR szYesBuffer[8]; + WCHAR szNoBuffer[8]; + WCHAR szInput[80]; + DWORD dwOldMode; + DWORD dwRead = 0; + BOOL ret = FALSE; + HANDLE hFile; + + hInstance = GetModuleHandleW(NULL); + LoadStringW(hInstance, IDS_CONFIRM_YES, szYesBuffer, _countof(szYesBuffer)); + LoadStringW(hInstance, IDS_CONFIRM_NO, szNoBuffer, _countof(szNoBuffer)); + + ZeroMemory(szInput, sizeof(szInput)); + + hFile = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hFile, &dwOldMode); + + SetConsoleMode(hFile, ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT); + + for (;;) + { + ConResPrintf(StdOut, IDS_CONFIRM_QUESTION); + + ReadConsoleW(hFile, szInput, _countof(szInput), &dwRead, NULL); + + szInput[0] = towupper(szInput[0]); + if (szInput[0] == szYesBuffer[0]) + { + ret = TRUE; + break; + } + else if (szInput[0] == 13 || szInput[0] == szNoBuffer[0]) + { + ret = FALSE; + break; + } + + ConResPrintf(StdOut, IDS_CONFIRM_INVALID); + } + + SetConsoleMode(hFile, dwOldMode); + + return ret; } @@ -585,8 +636,9 @@ if (ulJobId == (ULONG)-1 && bForceDelete == FALSE) { - ConResPrintf(StdOut, IDS_CONFIRM_DELETE); - return 0; + ConResPrintf(StdOut, IDS_DELETE_ALL); + if (!Confirm()) + return 0; } Status = NetScheduleJobDel(pszComputerName, Modified: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] Wed Mar 22 21:59:06 2017 @@ -2,26 +2,41 @@ STRINGTABLE BEGIN - IDS_USAGE "Mit dem AT Befeht kÃ¶nnen Befehle und Programme zu einem vorbestimmten\n\ + IDS_USAGE "Mit dem AT Befehl kÃ¶nnen Befehle und Programme zu einem vorbestimmten\n\ Termin gestartet werden. Der Zeitplandienst muss gestartet sein, um den\n\ -Befeht AT zu verwenden.\n\n\ +Befehl AT zu verwenden.\n\n\ AT [\\\\Computername] [ [Kennung] [/DELETE] | /DELETE [/YES]]\n\ AT [\\\\Computername] Zeit [/INTERACTIVE]\n\ [ /EVERY:Datum[,...] | /NEXT:Datum[,...]] ""Befehl""\n\n\ -\\\\Computername ...\n\ -Kennung ...\n\ -/DELETE ...\n\ -/YES ...\n\ +\\\\Computername Gibt einen Remotecomputer an. Ohne diesen Parameter werden\n\ + die Befehle auf dem lokalen Computer ausgefÃ¼hrt.\n\ +Kennung Eine Identifikationsnummer, die dem geplanten Befehl\n\ + zugeteilt wird.\n\ +/DELETE LÃ¶scht geplante Befehle. Ohne Kennung werden alle geplanten\n\ + Befehle auf dem Computer gelÃ¶scht.\n\ +/YES In Verbindung mit /DELETE werden die geplanten Befehle ohne\n\ + weitere BestÃ¤tiging gelÃ¶scht.\n\ Zeit Gibt die Zeit an, zu der ein Befehl ausgefÃ¼hrt werden soll.\n\ -/INTERACTIVE ...\n\ -/EVERY:Datum[,...] ...\n\ -/NEXT:Datum[,...] ...\n\ +/INTERACTIVE ErmÃ¶glicht dem Aufrag, Eingaben von dem Benutzer\n\ + anzunehmen, der angemeldet ist, wenn der Auftrag ausgefÃ¼hrt\n\ + wird.\n\ +/EVERY:Datum[,...] FÃ¼hrt den Befehl zu jedem der angegebenen Tage der Woche\n\ + oder des Monats aus. Ohne Angabe eines Datums wird der\n\ + aktuelle Tag des Monats angenommen.\n\ +/NEXT:Datum[,...] FÃ¼hrt den Befehl am nÃ¤chsten angegebenen Tage der Woche\n\ + oder des Monats (z.B. nÃ¤chsten Montag) aus. Ohne Angabe\n\ + eines Datums wird der aktuelle Tag des Monats angenommen.\n\ ""Befehl"" Ist der auszufÃ¼hrende Befehl oder das Stapelprogramm.\n" - IDS_CONFIRM_DELETE "Dieser Vorgang wird alle geplanten AufrÃ¤ge lÃ¶schen.\nMÃ¶chten Sie diesen Vorgang fortsetzen? (J/N) [N] " + IDS_DELETE_ALL "Dieser Vorgang wird alle geplanten AuftrÃ¤ge lÃ¶schen.\n" IDS_NEW_JOB "Neuer Auftrag hinzugefÃ¼gt. Kennung = %lu\n" IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" IDS_NO_ENTRIES "Es sind keine EintrÃ¤ge in der Liste.\n" + + IDS_CONFIRM_QUESTION "MÃ¶chten Sie diesen Vorgang fortsetzen? (J/N) [N]: " + IDS_CONFIRM_INVALID "\nDies ist eine ungÃ¼ltige Antwort.\n" + IDS_CONFIRM_YES "J" + IDS_CONFIRM_NO "N" IDS_TODAY "Heute" IDS_TOMORROW "Morgen" Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Wed Mar 22 21:59:06 2017 @@ -16,8 +16,8 @@ scheduled commands on the computer are canceled.\n\ /YES Used with cancel all jobs command when no further\n\ confirmation is desired.\n\ -Zeit Specifies the time when command is to run.\n\ -/INTERACTIVE Allows the ob to interact with the desktop of the user\n\ +time Specifies the time when command is to run.\n\ +/INTERACTIVE Allows the job to interact with the desktop of the user\n\ who is logged on at the time the job runs.\n\ /EVERY:date[,...] Runs the command on each specified day(s) of the week or\n\ month. If date is omitted, the current day of the month\n\ @@ -27,10 +27,15 @@ current day of the month is assumed.\n\ ""command"" Is the command or batch program to be run.\n" - IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N] " + IDS_DELETE_ALL "This operation will delete all scheduled jobs.\n" IDS_NEW_JOB "Added a new job with job ID = %lu\n" IDS_JOBS_LIST "Status ID Day Time Command Line\n" IDS_NO_ENTRIES "There are no entries in the list.\n" + + IDS_CONFIRM_QUESTION "Do you want to continue this operation? (Y/N) [N]: " + IDS_CONFIRM_INVALID "\nThis is an invalid response.\n" + IDS_CONFIRM_YES "Y" + IDS_CONFIRM_NO "N" IDS_TODAY "Today" IDS_TOMORROW "Tomorrow" Modified: trunk/reactos/base/applications/cmdutils/at/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/resource.h [iso-8859-1] Wed Mar 22 21:59:06 2017 @@ -2,7 +2,7 @@ #define IDS_USAGE 100 -#define IDS_CONFIRM_DELETE 105 +#define IDS_DELETE_ALL 105 #define IDS_NEW_JOB 106 #define IDS_JOBS_LIST 107 #define IDS_NO_ENTRIES 108 @@ -24,3 +24,8 @@ #define IDS_TIME 125 #define IDS_INTERACTIVE 126 #define IDS_COMMAND 127 + +#define IDS_CONFIRM_QUESTION 130 +#define IDS_CONFIRM_INVALID 131 +#define IDS_CONFIRM_YES 132 +#define IDS_CONFIRM_NO 133

7 years, 9 months

[gadamopoulos] 74221: [EXPLORER] - Simplify the mess with the font handling in explorer. Make it respond to changes in the system metrics and use the correct fonts. - Make CheckTrayWndPosition resi...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Mar 22 01:09:45 2017 New Revision: 74221 URL: http://svn.reactos.org/svn/reactos?rev=74221&view=rev Log: [EXPLORER] - Simplify the mess with the font handling in explorer. Make it respond to changes in the system metrics and use the correct fonts. - Make CheckTrayWndPosition resize the taskbar based on the optimal size that the rebar returns. - Without losing my sanity (yet), I managed to make it have exactly the same size as windows explorer when I run it in windows with the classic theme. - Themes still aren't sized perfectly. Running on ros shows lots of bugs in our common controls. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Wed Mar 22 01:09:45 2017 @@ -135,7 +135,6 @@ STDMETHOD_(HWND, GetHWND) (THIS) PURE; STDMETHOD_(BOOL, IsSpecialHWND) (THIS_ HWND hWnd) PURE; STDMETHOD_(BOOL, IsHorizontal) (THIS) PURE; - STDMETHOD_(HFONT, GetCaptionFonts) (THIS_ HFONT *phBoldCaption) PURE; STDMETHOD_(HWND, DisplayProperties) (THIS) PURE; STDMETHOD_(BOOL, ExecContextMenuCmd) (THIS_ UINT uiCmd) PURE; STDMETHOD_(BOOL, Lock) (THIS_ BOOL bLock) PURE; @@ -153,7 +152,6 @@ #define ITrayWindow_GetHWND(p) (p)->lpVtbl->GetHWND(p) #define ITrayWindow_IsSpecialHWND(p,a) (p)->lpVtbl->IsSpecialHWND(p,a) #define ITrayWindow_IsHorizontal(p) (p)->lpVtbl->IsHorizontal(p) -#define ITrayWindow_GetCaptionFonts(p,a) (p)->lpVtbl->GetCaptionFonts(p,a) #define ITrayWindow_DisplayProperties(p) (p)->lpVtbl->DisplayProperties(p) #define ITrayWindow_ExecContextMenuCmd(p,a) (p)->lpVtbl->ExecContextMenuCmd(p,a) #define ITrayWindow_Lock(p,a) (p)->lpVtbl->Lock(p,a) Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Wed Mar 22 01:09:45 2017 @@ -241,8 +241,6 @@ } virtual ~CTaskSwitchWnd() { } - VOID TaskSwitchWnd_UpdateButtonsSize(IN BOOL bRedrawDisabled); - INT GetWndTextFromTaskItem(IN PTASK_ITEM TaskItem, LPWSTR szBuf, DWORD cchBuf) { /* Get the window text without sending a message so we don't hang if an @@ -1146,6 +1144,10 @@ UINT uiRows, uiMax, uiMin, uiBtnsPerLine, ui; LONG NewBtnSize; BOOL Horizontal; + + int cx = GetSystemMetrics(SM_CXMINIMIZED); + int cy = m_ButtonSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); + m_TaskBar.SetButtonSize(cx, cy); if (GetClientRect(&rcClient) && !IsRectEmpty(&rcClient)) { @@ -1313,12 +1315,6 @@ m_ImageList = ImageList_Create(16, 16, ILC_COLOR32 | ILC_MASK, 0, 1000); m_TaskBar.SetImageList(m_ImageList); - - /* Calculate the default button size. Don't save this in m_ButtonSize.cx so that - the actual button width gets updated correctly on the first recalculation */ - int cx = GetSystemMetrics(SM_CXMINIMIZED); - int cy = m_ButtonSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); - m_TaskBar.SetButtonSize(cx, cy); /* Set proper spacing between buttons */ m_TaskBar.UpdateTbButtonSpacing(m_Tray->IsHorizontal(), m_Theme != NULL); @@ -1813,6 +1809,22 @@ return TRUE; } + LRESULT OnSetFont(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + return m_TaskBar.SendMessageW(uMsg, wParam, lParam); + } + + LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (wParam == SPI_SETNONCLIENTMETRICS) + { + /* Don't update the font, this will be done when we get a WM_SETFONT from our parent */ + UpdateButtonsSize(FALSE); + } + + return 0; + } + DECLARE_WND_CLASS_EX(szTaskSwitchWndClass, CS_DBLCLKS, COLOR_3DFACE) BEGIN_MSG_MAP(CTaskSwitchWnd) @@ -1828,6 +1840,8 @@ MESSAGE_HANDLER(TSWM_UPDATETASKBARPOS, OnUpdateTaskbarPos) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) MESSAGE_HANDLER(WM_TIMER, OnTimer) + MESSAGE_HANDLER(WM_SETFONT, OnSetFont) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) MESSAGE_HANDLER(m_ShellHookMsg, HandleShellHookMsg) END_MSG_MAP() Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Wed Mar 22 01:09:45 2017 @@ -1208,6 +1208,7 @@ MESSAGE_HANDLER(WM_PRINTCLIENT, OnPaint) MESSAGE_HANDLER(WM_TIMER, OnTimer) MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) + MESSAGE_HANDLER(WM_SETFONT, OnSetFont) MESSAGE_HANDLER(TCWM_GETMINIMUMSIZE, OnGetMinimumSize) MESSAGE_HANDLER(TCWM_UPDATETIME, OnUpdateTime) Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Wed Mar 22 01:09:45 2017 @@ -53,8 +53,6 @@ #define IDHK_DESKTOP 0x1fe #define IDHK_PAGER 0x1ff -static LONG TrayWndCount = 0; - static const WCHAR szTrayWndClass[] = L"Shell_TrayWnd"; /* @@ -88,17 +86,12 @@ DeleteObject(m_Font); } - HFONT GetFont() - { - return m_Font; - } - SIZE GetSize() { return m_Size; } - VOID UpdateSize(IN HBITMAP hbmStart = NULL) + VOID UpdateSize() { SIZE Size = { 0, 0 }; @@ -106,26 +99,36 @@ !SendMessageW(BCM_GETIDEALSIZE, 0, (LPARAM) &Size)) { Size.cx = 2 * GetSystemMetrics(SM_CXEDGE) + GetSystemMetrics(SM_CYCAPTION) * 3; - Size.cy = 2 * GetSystemMetrics(SM_CYEDGE) + GetSystemMetrics(SM_CYCAPTION); - } + } + + if (GetWindowTheme(m_hWnd)) + Size.cy = max(Size.cy, GetSystemMetrics(SM_CYCAPTION)); + else + Size.cy = max(Size.cy, GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE))); /* Save the size of the start button */ m_Size = Size; } - VOID Initialize() - { - SetWindowTheme(m_hWnd, L"Start", NULL); - + VOID UpdateFont() + { /* Get the system fonts, we use the caption font, always bold, though. */ NONCLIENTMETRICS ncm = {sizeof(ncm)}; - if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) - { - ncm.lfCaptionFont.lfWeight = FW_BOLD; - m_Font = CreateFontIndirect(&ncm.lfCaptionFont); - } + if (!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) + return; + + if (m_Font) + DeleteObject(m_Font); + + ncm.lfCaptionFont.lfWeight = FW_BOLD; + m_Font = CreateFontIndirect(&ncm.lfCaptionFont); SetFont(m_Font, FALSE); + } + + VOID Initialize() + { + SetWindowTheme(m_hWnd, L"Start", NULL); m_ImageList = ImageList_LoadImageW(hExplorerInstance, MAKEINTRESOURCEW(IDB_START), @@ -183,7 +186,6 @@ HTHEME m_Theme; - HFONT m_CaptionFont; HFONT m_Font; HWND m_DesktopWnd; @@ -236,7 +238,6 @@ CTrayWindow() : m_StartButton(), m_Theme(NULL), - m_CaptionFont(NULL), m_Font(NULL), m_DesktopWnd(NULL), m_Rebar(NULL), @@ -267,12 +268,6 @@ m_ShellServices = NULL; } - if (m_CaptionFont != NULL) - { - DeleteObject(m_CaptionFont); - m_CaptionFont = NULL; - } - if (m_Font != NULL) { DeleteObject(m_Font); @@ -285,8 +280,7 @@ m_Theme = NULL; } - if (InterlockedDecrement(&TrayWndCount) == 0) - PostQuitMessage(0); + PostQuitMessage(0); } @@ -734,28 +728,31 @@ * ##### moving and sizing handling ##### */ - BOOL UpdateNonClientMetrics() - { - NONCLIENTMETRICS ncm; - ncm.cbSize = sizeof(ncm); - if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0)) - { - if (m_Font != NULL) - DeleteObject(m_Font); - - m_Font = CreateFontIndirect(&ncm.lfMessageFont); - return TRUE; - } - - return FALSE; - } - - VOID SetWindowsFont() - { - if (m_TrayNotify != NULL) - { - SendMessage(m_TrayNotify, WM_SETFONT, (WPARAM) m_Font, TRUE); - } + void UpdateFonts() + { + m_StartButton.UpdateFont(); + + NONCLIENTMETRICS ncm = {sizeof(ncm)}; + if (!SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) + { + ERR("SPI_GETNONCLIENTMETRICS failed\n"); + return; + } + + if (m_Font != NULL) + DeleteObject(m_Font); + + ncm.lfCaptionFont.lfWeight = FW_NORMAL; + m_Font = CreateFontIndirect(&ncm.lfCaptionFont); + if (!m_Font) + { + ERR("CreateFontIndirect failed\n"); + return; + } + + SendMessage(m_Rebar, WM_SETFONT, (WPARAM) m_Font, TRUE); + SendMessage(m_TaskSwitch, WM_SETFONT, (WPARAM) m_Font, TRUE); + SendMessage(m_TrayNotify, WM_SETFONT, (WPARAM) m_Font, TRUE); } HMONITOR GetScreenRectFromRect( @@ -1318,6 +1315,16 @@ rcTray.bottom += m_AutoHideOffset.cy; } + IUnknown_Exec(m_TrayBandSite, + IID_IDeskBand, + DBID_BANDINFOCHANGED, + 0, + NULL, + NULL); + + FitToRebar(&rcTray); + m_TrayRects[m_Position] = rcTray; + /* Move the tray window */ SetWindowPos(NULL, rcTray.left, @@ -1605,6 +1612,42 @@ /* Update the task switch window configuration */ SendMessage(m_TaskSwitch, TSWM_UPDATETASKBARPOS, 0, 0); } + } + + void FitToRebar(PRECT pRect) + { + /* Get the rect of the rebar */ + RECT rebarRect, taskbarRect; + ::GetWindowRect(m_Rebar, &rebarRect); + ::GetWindowRect(m_hWnd, &taskbarRect); + OffsetRect(&rebarRect, -taskbarRect.left, -taskbarRect.top); + + /* Calculate the difference of size of the taskbar and the rebar */ + SIZE margins; + margins.cx = taskbarRect.right - taskbarRect.left - rebarRect.right + rebarRect.left; + margins.cy = taskbarRect.bottom - taskbarRect.top - rebarRect.bottom + rebarRect.top; + + /* Calculate the new size of the rebar and make it resize, then change the new taskbar size */ + switch (m_Position) + { + case ABE_TOP: + rebarRect.bottom = rebarRect.top + pRect->bottom - pRect->top - margins.cy; + ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); + pRect->bottom = pRect->top + rebarRect.bottom - rebarRect.top + margins.cy; + break; + case ABE_BOTTOM: + rebarRect.top = rebarRect.bottom - (pRect->bottom - pRect->top - margins.cy); + ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); + ERR("rebarRect: %d, %d, %d,%d\n", rebarRect.top, rebarRect.left, rebarRect.right, rebarRect.bottom); + pRect->top = pRect->bottom - (rebarRect.bottom - rebarRect.top + margins.cy); + break; + case ABE_LEFT: + case ABE_RIGHT: + /* FIXME: what to do here? */ + break; + } + + CalculateValidSize(m_Position, pRect); } void PopupStartMenu() @@ -1917,13 +1960,6 @@ If it was somehow destroyed just create a new tray window. */ if (m_hWnd != NULL && IsWindow()) { - if (!IsWindowVisible()) - { - CheckTrayWndPosition(); - - ShowWindow(SW_SHOW); - } - return S_OK; } @@ -1943,6 +1979,12 @@ if (!Create(NULL, rcWnd, NULL, dwStyle, dwExStyle)) return E_FAIL; + + /* Align all controls on the tray window */ + AlignControls(NULL); + + /* Move the tray window to the right position and resize it if necessary */ + CheckTrayWndPosition(); return S_OK; } @@ -1974,14 +2016,6 @@ BOOL STDMETHODCALLTYPE IsHorizontal() { return IsPosHorizontal(); - } - - HFONT STDMETHODCALLTYPE GetCaptionFonts(OUT HFONT *phBoldCaption OPTIONAL) - { - if (phBoldCaption != NULL) - *phBoldCaption = m_StartButton.GetFont(); - - return m_CaptionFont; } BOOL STDMETHODCALLTYPE Lock(IN BOOL bLock) @@ -2027,6 +2061,8 @@ } } SetWindowPos(NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOOWNERZORDER); + ResizeWorkArea(); + ApplyClipping(TRUE); } return bPrevLock; @@ -2047,25 +2083,6 @@ SetWindowTheme(m_hWnd, L"TaskBar", NULL); - InterlockedIncrement(&TrayWndCount); - - if (m_CaptionFont == NULL) - { - NONCLIENTMETRICS ncm; - - /* Get the system fonts, we use the caption font, - always bold, though. */ - ncm.cbSize = sizeof(ncm); - if (SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE)) - { - if (m_CaptionFont == NULL) - { - ncm.lfCaptionFont.lfWeight = FW_NORMAL; - m_CaptionFont = CreateFontIndirect(&ncm.lfCaptionFont); - } - } - } - /* Create the Start button */ m_StartButton.Create(m_hWnd); @@ -2076,23 +2093,14 @@ HBITMAP hbmBanner = LoadBitmapW(hExplorerInstance, MAKEINTRESOURCEW(IDB_STARTMENU)); m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, 0); - /* Load the tray band site */ + /* Create the tray band site and its rebar */ m_TrayBandSite = CreateTrayBandSite(this, &m_Rebar, &m_TaskSwitch); SetWindowTheme(m_Rebar, L"TaskBar", NULL); /* Create the tray notification window */ m_TrayNotify = CreateTrayNotifyWnd(this, HideClock, &m_TrayNotifyInstance); - if (UpdateNonClientMetrics()) - { - SetWindowsFont(); - } - - /* Move the tray window to the right position and resize it if necessary */ - CheckTrayWndPosition(); - - /* Align all controls on the tray window */ - AlignControls(NULL); + UpdateFonts(); InitShellServices(&m_ShellServices); @@ -2141,6 +2149,19 @@ return TRUE; } + LRESULT OnSettingChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) + { + if (wParam == SPI_SETNONCLIENTMETRICS) + { + SendMessage(m_TaskSwitch, uMsg, wParam, lParam); + UpdateFonts(); + AlignControls(NULL); + CheckTrayWndPosition(); + } + + return 0; + } + LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { HDC hdc = (HDC) wParam; @@ -2156,14 +2177,8 @@ LRESULT OnDisplayChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - /* Load the saved tray window settings */ - RegLoadSettings(); - /* Move the tray window to the right position and resize it if necessary */ CheckTrayWndPosition(); - - /* Align all controls on the tray window */ - AlignControls(NULL); return TRUE; } @@ -2285,37 +2300,7 @@ if (!Locked) { - /* Get the rect of the rebar */ - RECT rebarRect, taskbarRect; - ::GetWindowRect(m_Rebar, &rebarRect); - ::GetWindowRect(m_hWnd, &taskbarRect); - OffsetRect(&rebarRect, -taskbarRect.left, -taskbarRect.top); - - /* Calculate the difference of size of the taskbar and the rebar */ - SIZE margins; - margins.cx = taskbarRect.right - taskbarRect.left - rebarRect.right + rebarRect.left; - margins.cy = taskbarRect.bottom - taskbarRect.top - rebarRect.bottom + rebarRect.top; - - /* Calculate the new size of the rebar and make it resize, then change the new taskbar size */ - switch (m_Position) - { - case ABE_TOP: - rebarRect.bottom = rebarRect.top + pRect->bottom - pRect->top - margins.cy; - ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); - pRect->bottom = pRect->top + rebarRect.bottom - rebarRect.top + margins.cy; - break; - case ABE_BOTTOM: - rebarRect.top = rebarRect.bottom - (pRect->bottom - pRect->top - margins.cy); - ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); - pRect->top = pRect->bottom - (rebarRect.bottom - rebarRect.top + margins.cy); - break; - case ABE_LEFT: - case ABE_RIGHT: - /* FIXME: what to do here? */ - break; - } - - CalculateValidSize(m_Position, pRect); + FitToRebar(pRect); } else { @@ -2341,7 +2326,6 @@ LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { RECT rcClient; - InvalidateRect(NULL, TRUE); if (wParam == SIZE_RESTORED && lParam == 0) { ResizeWorkArea(); @@ -2782,6 +2766,7 @@ lParam = Msg.lParam; } MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) + MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChanged) NOTIFY_CODE_HANDLER(RBN_AUTOSIZE, OnRebarAutoSize) // Doesn't quite work ;P MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize)

7 years, 9 months

[ekohl] 74220: [AT] - Retrieve the users short day names instead of hardcoded day names. - Fix resources.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Mar 21 20:32:54 2017 New Revision: 74220 URL: http://svn.reactos.org/svn/reactos?rev=74220&view=rev Log: [AT] - Retrieve the users short day names instead of hardcoded day names. - Fix resources. Modified: trunk/reactos/base/applications/cmdutils/at/at.c trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc Modified: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Tue Mar 21 20:32:54 2017 @@ -20,7 +20,55 @@ #include "resource.h" -PWSTR pszDaysOfWeekArray[] = {L"M", L"T", L"W", L"TH", L"F", L"S", L"SU", NULL}; + +PWSTR pszDaysOfWeekArray[7] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL}; + + +static +VOID +FreeDaysOfWeekArray(VOID) +{ + INT i; + + for (i = 0; i < 7; i++) + { + if (pszDaysOfWeekArray[i] != NULL) + HeapFree(GetProcessHeap(), 0, pszDaysOfWeekArray[i]); + } +} + + +static +BOOL +InitDaysOfWeekArray(VOID) +{ + INT i, nLength; + + for (i = 0; i < 7; i++) + { + nLength = GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_SABBREVDAYNAME1 + i, + NULL, + 0); + + pszDaysOfWeekArray[i] = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + nLength * sizeof(WCHAR)); + if (pszDaysOfWeekArray[i] == NULL) + { + FreeDaysOfWeekArray(); + return FALSE; + } + + GetLocaleInfo(LOCALE_USER_DEFAULT, + LOCALE_SABBREVDAYNAME1 + i, + pszDaysOfWeekArray[i], + nLength); + } + + return TRUE; +} + static BOOL @@ -572,6 +620,9 @@ /* Initialize the Console Standard Streams */ ConInitStdStreams(); + if (!InitDaysOfWeekArray()) + return 1; + /* Parse the computer name */ i = 1; minIdx = 1; @@ -726,6 +777,8 @@ } done: + FreeDaysOfWeekArray(); + if (bPrintUsage == TRUE) ConResPuts(StdOut, IDS_USAGE); Modified: trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/de-DE.rc [iso-8859-1] Tue Mar 21 20:32:54 2017 @@ -18,7 +18,7 @@ /NEXT:Datum[,...] ...\n\ ""Befehl"" Ist der auszufÃ¼hrende Befehl oder das Stapelprogramm.\n" - IDS_CONFIRM_DELETE "Dieser Vorgang wird alle geplanten AufrÃ¤ge lÃ¶schen.\nMÃ¶chten Sie diesen Vorgang fortsetzen? (J/N) [N]" + IDS_CONFIRM_DELETE "Dieser Vorgang wird alle geplanten AufrÃ¤ge lÃ¶schen.\nMÃ¶chten Sie diesen Vorgang fortsetzen? (J/N) [N] " IDS_NEW_JOB "Neuer Auftrag hinzugefÃ¼gt. Kennung = %lu\n" IDS_JOBS_LIST "Statuskenn. Tag Zeit Befehlszeile\n" IDS_NO_ENTRIES "Es sind keine EintrÃ¤ge in der Liste.\n" @@ -26,7 +26,7 @@ IDS_TODAY "Heute" IDS_TOMORROW "Morgen" IDS_EVERY "Jeden" - IDS_NEXT "NÃ¤chsten" + IDS_NEXT "Kommenden" IDS_YES "Ja" IDS_NO "Nein" Modified: trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/lang/en-US.rc [iso-8859-1] Tue Mar 21 20:32:54 2017 @@ -27,7 +27,7 @@ current day of the month is assumed.\n\ ""command"" Is the command or batch program to be run.\n" - IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N]: " + IDS_CONFIRM_DELETE "This operation will delete all seduled jobs.\nDo you want to continue this operation? (Y/N) [N] " IDS_NEW_JOB "Added a new job with job ID = %lu\n" IDS_JOBS_LIST "Status ID Day Time Command Line\n" IDS_NO_ENTRIES "There are no entries in the list.\n"

7 years, 9 months

[dreimer] 74219: [FONTSUB] Added German Translation DIALOG -> DIALOGEX Windows -> system (not yet done in japanese translation...)

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Mar 21 16:00:05 2017 New Revision: 74219 URL: http://svn.reactos.org/svn/reactos?rev=74219&view=rev Log: [FONTSUB] Added German Translation DIALOG -> DIALOGEX Windows -> system (not yet done in japanese translation...) Added: trunk/rosapps/applications/sysutils/fontsub/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc Modified: trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/fontsub/fontsub_res.rc [iso-8859-1] Tue Mar 21 16:00:05 2017 @@ -29,6 +29,9 @@ 3 BITMAP "down.bmp" 4 BITMAP "nil.bmp" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif Added: trunk/rosapps/applications/sysutils/fontsub/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/lang/de-DE.rc (added) +++ trunk/rosapps/applications/sysutils/fontsub/lang/de-DE.rc [iso-8859-1] Tue Mar 21 16:00:05 2017 @@ -0,0 +1,106 @@ +/* FontSub by Katayama Hirofumi MZ + * + * To the extent possible under law, the person who associated CC0 with + * FontSub has waived all copyright and related or neighboring rights + * to FontSub. + * + * You should have received a copy of the CC0 legalcode along with this + * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>. + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +1 MENU +BEGIN + POPUP "&Datei" + BEGIN + MENUITEM "&Import von...\tStrg+O", ID_IMPORT + MENUITEM "&Export nach...\tStrg+S", ID_EXPORT + MENUITEM SEPARATOR + MENUITEM "Neu&laden aus Registry\tStrg+L", ID_RELOAD + MENUITEM "&Registry aktualisieren\tStrg+U", ID_UPDATE_REGISTRY + MENUITEM SEPARATOR + MENUITEM "Ãffne in Reg&edit", ID_OPEN_REGKEY + MENUITEM SEPARATOR + MENUITEM "B&eenden\tAlt+F4", ID_EXIT + END + POPUP "&Bearbeiten" + BEGIN + MENUITEM "&Neues Item\tStrg+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "B&earbeite Item\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "&LÃ¶sche Item\tEntf", ID_DELETE + END + POPUP "&Hilfe" + BEGIN + MENUITEM "&Ãber...", ID_ABOUT + END +END + +2 MENU +BEGIN + POPUP "Popup" + BEGIN + MENUITEM "&Neues Item\tStrg+N", ID_NEW + MENUITEM SEPARATOR + MENUITEM "B&earbeite Item\tEnter", ID_EDIT + MENUITEM SEPARATOR + MENUITEM "&LÃ¶sche Item\tDel", ID_DELETE + END +END + +STRINGTABLE +BEGIN + IDS_TITLE, "Font Substitute Editor" + IDS_FONTNAME, "Schriftname" + IDS_SUBSTITUTE, "Ersetzung" + IDS_ENTERNAME, "(Geben Sie einen Schriftnamen ein...)" + IDS_IMPORT, "Import" + IDS_EXPORT, "Export" + IDS_CANTIMPORT, "Import fehlgeschlagen." + IDS_CANTEXPORT, "Export fehlgeschlagen." + IDS_INPFILTER, "Registrierungsdateien (*.reg)|*.reg|Alle Dateien (*.*)|*.*|" + IDS_OUTFILTER, "Registrierungsdateien (*.reg)|*.reg|" + IDS_QUERYUPDATE, "Ersetzungsinfo wurde verÃ¤ndert. Registrierung aktualisieren?" + IDS_ALREADYEXISTS, "Der selbe Name existiert bereits." + IDS_ENTERNAME2, "Geben Sie den Schriftnamen ein." + IDS_QUERYDELETE, "MÃ¶chten Sie das Item wirklich lÃ¶schen?" + IDS_CANTOPENKEY, "RegistrierungsschlÃ¼ssel konnte nicht geÃ¶ffnet werden." + IDS_REBOOTNOW, "Registrierung wurde aktualisiert. MÃ¶chten Sie das System Neustarten?" + IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nvon Katayama Hirofumi MZ und dem ReactOS Team\r\n\r\nDiese Software wurde unter CC0 1.0 Lizenz verÃ¶ffentlicht." +END + +IDD_ADD DIALOGEX 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "Ersetzung hinzufÃ¼gen" +FONT 10, "MS Shell Dlg" +BEGIN + CONTROL "Schrift&name:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 + CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 + CONTROL "Er&setzung:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 + CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 + CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Abbrechen", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 +END + +IDD_EDIT DIALOGEX 0, 0, 315, 65 +STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU +CAPTION "Ersetzung bearbeiten" +FONT 10, "MS Shell Dlg" +BEGIN + CONTROL "Schrift&name:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 + CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 + CONTROL "Er&setzung:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 + CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 + CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Abbrechen", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "&LÃ¶schen", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 +END Propchange: trunk/rosapps/applications/sysutils/fontsub/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/fontsub/lang/en-US.rc [iso-8859-1] Tue Mar 21 16:00:05 2017 @@ -70,11 +70,11 @@ IDS_ENTERNAME2, "Enter the font name." IDS_QUERYDELETE, "Do you really want to delete this item?" IDS_CANTOPENKEY, "Could not open the registry key." - IDS_REBOOTNOW, "Registry was updated. Reboot Windows now?" + IDS_REBOOTNOW, "Registry was updated. Reboot system now?" IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nby Katayama Hirofumi MZ and The ReactOS Team\r\n\r\nThis software was released under CC0 1.0 license." END -IDD_ADD DIALOG 0, 0, 315, 65 +IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "Add Substitute Item" FONT 10, "MS Shell Dlg" @@ -89,7 +89,7 @@ CONTROL "Cancel", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 END -IDD_EDIT DIALOG 0, 0, 315, 65 +IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "Edit Substitute Item" FONT 10, "MS Shell Dlg" Modified: trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/font… ============================================================================== --- trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/fontsub/lang/ja-JP.rc [iso-8859-1] Tue Mar 21 16:00:05 2017 @@ -74,7 +74,7 @@ IDS_ABOUT, "FontSub (Font Substitute Editor) Version 0.5\r\nby Katayama Hirofumi MZ and The ReactOS Team\r\n\r\nThis software was released under CC0 1.0 license." END -IDD_ADD DIALOG 0, 0, 315, 65 +IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "ä»£æ¿é ç®ãè¿½å ãã" FONT 10, "MS UI Gothic" @@ -89,7 +89,7 @@ CONTROL "ãã£ã³ã»ã«", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 END -IDD_EDIT DIALOG 0, 0, 315, 65 +IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU CAPTION "ä»£æ¿é ç®ãç·¨éãã" FONT 10, "MS UI Gothic"

7 years, 9 months

[ekohl] 74218: [AT] - Implement the DaysOfWeek parser and display code. - ParseDaysOfMonth: Handle a failure case. - Fix display bugs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 20 22:55:08 2017 New Revision: 74218 URL: http://svn.reactos.org/svn/reactos?rev=74218&view=rev Log: [AT] - Implement the DaysOfWeek parser and display code. - ParseDaysOfMonth: Handle a failure case. - Fix display bugs. Modified: trunk/reactos/base/applications/cmdutils/at/at.c Modified: trunk/reactos/base/applications/cmdutils/at/at.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.c [iso-8859-1] Mon Mar 20 22:55:08 2017 @@ -20,6 +20,7 @@ #include "resource.h" +PWSTR pszDaysOfWeekArray[] = {L"M", L"T", L"W", L"TH", L"F", L"S", L"SU", NULL}; static BOOL @@ -98,6 +99,8 @@ for (;;) { ulValue = wcstoul(startPtr, &endPtr, 10); + if (ulValue == 0) + return FALSE; if (ulValue > 0 && ulValue <= 31) *pulDaysOfMonth |= (1 << (ulValue - 1)); @@ -119,8 +122,8 @@ PWSTR pszBuffer, PUCHAR pucDaysOfWeek) { -#if 0 PWSTR startPtr, endPtr; + INT nLength, i; if (wcslen(pszBuffer) == 0) return FALSE; @@ -130,8 +133,20 @@ for (;;) { endPtr = wcschr(startPtr, L','); - - + if (endPtr == NULL) + nLength = wcslen(startPtr); + else + nLength = (INT)((ULONG_PTR)endPtr - (ULONG_PTR)startPtr) / sizeof(WCHAR); + + for (i = 0; i < 7; i++) + { + if (nLength == wcslen(pszDaysOfWeekArray[i]) && + _wcsnicmp(startPtr, pszDaysOfWeekArray[i], nLength) == 0) + { + *pucDaysOfWeek |= (1 << i); + break; + } + } if (endPtr == NULL) return TRUE; @@ -139,7 +154,6 @@ startPtr = endPtr + 1; endPtr = NULL; } -#endif return FALSE; } @@ -160,7 +174,7 @@ 0, NULL); - ConPuts(StdErr, pszBuffer); + ConPrintf(StdErr, L"%s\n", pszBuffer); LocalFree(pszBuffer); } @@ -169,14 +183,14 @@ VOID PrintHorizontalLine(VOID) { - WCHAR szBuffer[80]; - INT i; - - for (i = 0; i < 79; i++) - szBuffer[i] = L'-'; - szBuffer[79] = UNICODE_NULL; - - ConPuts(StdOut, szBuffer); + WCHAR szBuffer[80]; + INT i; + + for (i = 0; i < 79; i++) + szBuffer[i] = L'-'; + szBuffer[79] = UNICODE_NULL; + + ConPrintf(StdOut, L"%s\n", szBuffer); } @@ -292,7 +306,6 @@ } else if (pBuffer->DaysOfWeek != 0) { -#if 0 if (pBuffer->Flags & JOB_RUN_PERIODICALLY) LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer)); else @@ -303,12 +316,20 @@ { if (pBuffer->DaysOfWeek & (1 << i)) { - - } - } -#endif - - wcscpy(szScheduleBuffer, L"TODO: DaysOfWeek!"); + swprintf(szDateBuffer, L" %s", pszDaysOfWeekArray[i]); + nDateLength = wcslen(szDateBuffer); + if (nScheduleLength + nDateLength <= 55) + { + wcscat(szScheduleBuffer, szDateBuffer); + nScheduleLength += nDateLength; + } + else + { + wcscat(szScheduleBuffer, L"..."); + break; + } + } + } } else { @@ -413,7 +434,6 @@ } else if (pBuffer[i].DaysOfWeek != 0) { -#if 0 if (pBuffer[i].Flags & JOB_RUN_PERIODICALLY) LoadStringW(hInstance, IDS_EVERY, szScheduleBuffer, _countof(szScheduleBuffer)); else @@ -424,9 +444,9 @@ { if (pBuffer[i].DaysOfWeek & (1 << j)) { - swprintf(szDateBuffer, L" %d", j + 1); + swprintf(szDateBuffer, L" %s", pszDaysOfWeekArray[j]); nDateLength = wcslen(szDateBuffer); - if (nScheduleLength + nDateLength <= 19) + if (nScheduleLength + nDateLength <= 55) { wcscat(szScheduleBuffer, szDateBuffer); nScheduleLength += nDateLength; @@ -438,9 +458,6 @@ } } } -#endif - - wcscpy(szScheduleBuffer, L"TODO: DaysOfWeek"); } else { @@ -457,7 +474,7 @@ (WORD)((pBuffer[i].JobTime % 3600000) / 60000)); ConPrintf(StdOut, - L" %7lu %-22s %-11s %s\n", + L" %6lu %-21s %-11s %s\n", pBuffer[i].JobId, szScheduleBuffer, szTimeBuffer,

7 years, 9 months

← Newer
1
2
3
4
5
6
7
...
26
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 March 2017