Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 74233: [SETUPAPI]: Partly sync parser.c with Wine Staging 2.2. CORE-9397 CORE-12823 Fixes all but 2 tests in setupapi_winetest:parser. e8aa851 setupapi: Fix parsing of inf files containi...
by hbelusca＠svn.reactos.org 27 Mar '17

27 Mar '17

Author: hbelusca Date: Mon Mar 27 16:29:50 2017 New Revision: 74233 URL: http://svn.reactos.org/svn/reactos?rev=74233&view=rev Log: [SETUPAPI]: Partly sync parser.c with Wine Staging 2.2. CORE-9397 CORE-12823 Fixes all but 2 tests in setupapi_winetest:parser. e8aa851 setupapi: Fix parsing of inf files containing garbage at the beginning of the file. Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/parser.c [iso-8859-1] Mon Mar 27 16:29:50 2017 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Partially synced with Wine Staging 1.7.37 */ +/* Partially synced with Wine Staging 2.2 */ #include "setupapi_private.h" @@ -103,6 +103,7 @@ int cur_section; /* index of section being parsed*/ struct line *line; /* current line */ unsigned int line_pos; /* current line position in file */ + unsigned int broken_line; /* first line containing invalid data (if any) */ unsigned int error; /* error code */ unsigned int token_len; /* current token len */ WCHAR token[MAX_FIELD_LEN+1]; /* current token */ @@ -634,12 +635,15 @@ set_state( parser, SECTION_NAME ); return p + 1; default: - if (!isspaceW(*p)) + if (isspaceW(*p)) break; + if (parser->cur_section != -1) { parser->start = p; set_state( parser, KEY_NAME ); return p; } + if (!parser->broken_line) + parser->broken_line = parser->line_pos; break; } } @@ -920,6 +924,7 @@ parser.stack_pos = 0; parser.cur_section = -1; parser.line_pos = 1; + parser.broken_line = 0; parser.error = 0; parser.token_len = 0; @@ -950,6 +955,13 @@ /* find the [strings] section */ file->strings_section = find_section( file, Strings ); + + if (file->strings_section == -1 && parser.broken_line) + { + if (error_line) *error_line = parser.broken_line; + return ERROR_EXPECTED_SECTION_NAME; + } + return 0; }

1 0

[ekohl] 74232: [LSASRV] Implement LsarpLookupPrivilegeDisplayName. Reading the resource strings is still buggy. CORE-12976 #comment Please retest!
by ekohl＠svn.reactos.org 26 Mar '17

26 Mar '17

Author: ekohl Date: Sun Mar 26 20:45:48 2017 New Revision: 74232 URL: http://svn.reactos.org/svn/reactos?rev=74232&view=rev Log: [LSASRV] Implement LsarpLookupPrivilegeDisplayName. Reading the resource strings is still buggy. CORE-12976 #comment Please retest! Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/privileges.c trunk/reactos/dll/win32/lsasrv/utils.c Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Mar 26 20:45:48 2017 @@ -479,6 +479,20 @@ LPWSTR lpBuffer, INT nBufferMax); +INT +LsapGetResourceStringLengthEx( + _In_ HINSTANCE hInstance, + _In_ UINT uId, + _In_ USHORT usLanguage); + +INT +LsapLoadStringEx( + _In_ HINSTANCE hInstance, + _In_ UINT uId, + _In_ USHORT usLanguage, + _Out_ LPWSTR lpBuffer, + _Out_ INT nBufferMax); + PSID LsapAppendRidToSid( PSID SrcSid, Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sun Mar 26 20:45:48 2017 @@ -4,15 +4,17 @@ * FILE: reactos/dll/win32/lsasrv/privileges.c * PURPOSE: Privilege lookup functions * - * PROGRAMMERS: Eric Kohl + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> */ #include "lsasrv.h" +#include "resources.h" typedef struct { LUID Luid; LPCWSTR Name; + INT DisplayNameId; } PRIVILEGE_DATA; typedef struct @@ -26,35 +28,35 @@ static const PRIVILEGE_DATA WellKnownPrivileges[] = { - {{SE_CREATE_TOKEN_PRIVILEGE, 0}, SE_CREATE_TOKEN_NAME}, - {{SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, 0}, SE_ASSIGNPRIMARYTOKEN_NAME}, - {{SE_LOCK_MEMORY_PRIVILEGE, 0}, SE_LOCK_MEMORY_NAME}, - {{SE_INCREASE_QUOTA_PRIVILEGE, 0}, SE_INCREASE_QUOTA_NAME}, - {{SE_MACHINE_ACCOUNT_PRIVILEGE, 0}, SE_MACHINE_ACCOUNT_NAME}, - {{SE_TCB_PRIVILEGE, 0}, SE_TCB_NAME}, - {{SE_SECURITY_PRIVILEGE, 0}, SE_SECURITY_NAME}, - {{SE_TAKE_OWNERSHIP_PRIVILEGE, 0}, SE_TAKE_OWNERSHIP_NAME}, - {{SE_LOAD_DRIVER_PRIVILEGE, 0}, SE_LOAD_DRIVER_NAME}, - {{SE_SYSTEM_PROFILE_PRIVILEGE, 0}, SE_SYSTEM_PROFILE_NAME}, - {{SE_SYSTEMTIME_PRIVILEGE, 0}, SE_SYSTEMTIME_NAME}, - {{SE_PROF_SINGLE_PROCESS_PRIVILEGE, 0}, SE_PROF_SINGLE_PROCESS_NAME}, - {{SE_INC_BASE_PRIORITY_PRIVILEGE, 0}, SE_INC_BASE_PRIORITY_NAME}, - {{SE_CREATE_PAGEFILE_PRIVILEGE, 0}, SE_CREATE_PAGEFILE_NAME}, - {{SE_CREATE_PERMANENT_PRIVILEGE, 0}, SE_CREATE_PERMANENT_NAME}, - {{SE_BACKUP_PRIVILEGE, 0}, SE_BACKUP_NAME}, - {{SE_RESTORE_PRIVILEGE, 0}, SE_RESTORE_NAME}, - {{SE_SHUTDOWN_PRIVILEGE, 0}, SE_SHUTDOWN_NAME}, - {{SE_DEBUG_PRIVILEGE, 0}, SE_DEBUG_NAME}, - {{SE_AUDIT_PRIVILEGE, 0}, SE_AUDIT_NAME}, - {{SE_SYSTEM_ENVIRONMENT_PRIVILEGE, 0}, SE_SYSTEM_ENVIRONMENT_NAME}, - {{SE_CHANGE_NOTIFY_PRIVILEGE, 0}, SE_CHANGE_NOTIFY_NAME}, - {{SE_REMOTE_SHUTDOWN_PRIVILEGE, 0}, SE_REMOTE_SHUTDOWN_NAME}, - {{SE_UNDOCK_PRIVILEGE, 0}, SE_UNDOCK_NAME}, - {{SE_SYNC_AGENT_PRIVILEGE, 0}, SE_SYNC_AGENT_NAME}, - {{SE_ENABLE_DELEGATION_PRIVILEGE, 0}, SE_ENABLE_DELEGATION_NAME}, - {{SE_MANAGE_VOLUME_PRIVILEGE, 0}, SE_MANAGE_VOLUME_NAME}, - {{SE_IMPERSONATE_PRIVILEGE, 0}, SE_IMPERSONATE_NAME}, - {{SE_CREATE_GLOBAL_PRIVILEGE, 0}, SE_CREATE_GLOBAL_NAME} + {{SE_CREATE_TOKEN_PRIVILEGE, 0}, SE_CREATE_TOKEN_NAME, IDS_CREATE_TOKEN_PRIVILEGE}, + {{SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, 0}, SE_ASSIGNPRIMARYTOKEN_NAME, IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE}, + {{SE_LOCK_MEMORY_PRIVILEGE, 0}, SE_LOCK_MEMORY_NAME, IDS_LOCK_MEMORY_PRIVILEGE}, + {{SE_INCREASE_QUOTA_PRIVILEGE, 0}, SE_INCREASE_QUOTA_NAME, IDS_INCREASE_QUOTA_PRIVILEGE}, + {{SE_MACHINE_ACCOUNT_PRIVILEGE, 0}, SE_MACHINE_ACCOUNT_NAME, IDS_MACHINE_ACCOUNT_PRIVILEGE}, + {{SE_TCB_PRIVILEGE, 0}, SE_TCB_NAME, IDS_TCB_PRIVILEGE}, + {{SE_SECURITY_PRIVILEGE, 0}, SE_SECURITY_NAME, IDS_SECURITY_PRIVILEGE}, + {{SE_TAKE_OWNERSHIP_PRIVILEGE, 0}, SE_TAKE_OWNERSHIP_NAME, IDS_TAKE_OWNERSHIP_PRIVILEGE}, + {{SE_LOAD_DRIVER_PRIVILEGE, 0}, SE_LOAD_DRIVER_NAME, IDS_LOAD_DRIVER_PRIVILEGE}, + {{SE_SYSTEM_PROFILE_PRIVILEGE, 0}, SE_SYSTEM_PROFILE_NAME, IDS_SYSTEM_PROFILE_PRIVILEGE}, + {{SE_SYSTEMTIME_PRIVILEGE, 0}, SE_SYSTEMTIME_NAME, IDS_SYSTEMTIME_PRIVILEGE}, + {{SE_PROF_SINGLE_PROCESS_PRIVILEGE, 0}, SE_PROF_SINGLE_PROCESS_NAME, IDS_PROF_SINGLE_PROCESS_PRIVILEGE}, + {{SE_INC_BASE_PRIORITY_PRIVILEGE, 0}, SE_INC_BASE_PRIORITY_NAME, IDS_INC_BASE_PRIORITY_PRIVILEGE}, + {{SE_CREATE_PAGEFILE_PRIVILEGE, 0}, SE_CREATE_PAGEFILE_NAME, IDS_CREATE_PAGEFILE_PRIVILEGE}, + {{SE_CREATE_PERMANENT_PRIVILEGE, 0}, SE_CREATE_PERMANENT_NAME, IDS_CREATE_PERMANENT_PRIVILEGE}, + {{SE_BACKUP_PRIVILEGE, 0}, SE_BACKUP_NAME, IDS_BACKUP_PRIVILEGE}, + {{SE_RESTORE_PRIVILEGE, 0}, SE_RESTORE_NAME, IDS_RESTORE_PRIVILEGE}, + {{SE_SHUTDOWN_PRIVILEGE, 0}, SE_SHUTDOWN_NAME, IDS_SHUTDOWN_PRIVILEGE}, + {{SE_DEBUG_PRIVILEGE, 0}, SE_DEBUG_NAME, IDS_DEBUG_PRIVILEGE}, + {{SE_AUDIT_PRIVILEGE, 0}, SE_AUDIT_NAME, IDS_AUDIT_PRIVILEGE}, + {{SE_SYSTEM_ENVIRONMENT_PRIVILEGE, 0}, SE_SYSTEM_ENVIRONMENT_NAME, IDS_SYSTEM_ENVIRONMENT_PRIVILEGE}, + {{SE_CHANGE_NOTIFY_PRIVILEGE, 0}, SE_CHANGE_NOTIFY_NAME, IDS_CHANGE_NOTIFY_PRIVILEGE}, + {{SE_REMOTE_SHUTDOWN_PRIVILEGE, 0}, SE_REMOTE_SHUTDOWN_NAME, IDS_REMOTE_SHUTDOWN_PRIVILEGE}, + {{SE_UNDOCK_PRIVILEGE, 0}, SE_UNDOCK_NAME, IDS_UNDOCK_PRIVILEGE}, + {{SE_SYNC_AGENT_PRIVILEGE, 0}, SE_SYNC_AGENT_NAME, IDS_SYNC_AGENT_PRIVILEGE}, + {{SE_ENABLE_DELEGATION_PRIVILEGE, 0}, SE_ENABLE_DELEGATION_NAME, IDS_ENABLE_DELEGATION_PRIVILEGE}, + {{SE_MANAGE_VOLUME_PRIVILEGE, 0}, SE_MANAGE_VOLUME_NAME, IDS_MANAGE_VOLUME_PRIVILEGE}, + {{SE_IMPERSONATE_PRIVILEGE, 0}, SE_IMPERSONATE_NAME, IDS_IMPERSONATE_PRIVILEGE}, + {{SE_CREATE_GLOBAL_PRIVILEGE, 0}, SE_CREATE_GLOBAL_NAME, IDS_CREATE_GLOBAL_PRIVILEGE} }; static const RIGHT_DATA WellKnownRights[] = @@ -118,6 +120,7 @@ return STATUS_NO_SUCH_PRIVILEGE; } + NTSTATUS LsarpLookupPrivilegeDisplayName(PRPC_UNICODE_STRING Name, USHORT ClientLanguage, @@ -126,30 +129,97 @@ USHORT *LanguageReturned) { PRPC_UNICODE_STRING DisplayNameBuffer; - UNIMPLEMENTED; - - /* For now, description is equal to privilege name */ - - DisplayNameBuffer = MIDL_user_allocate(sizeof(RPC_UNICODE_STRING)); - if (DisplayNameBuffer == NULL) - { - return STATUS_NO_MEMORY; - } - DisplayNameBuffer->Length = Name->Length; - DisplayNameBuffer->MaximumLength = Name->MaximumLength; - - DisplayNameBuffer->Buffer = MIDL_user_allocate(DisplayNameBuffer->MaximumLength); - if (DisplayNameBuffer->Buffer == NULL) - { - MIDL_user_free(DisplayNameBuffer); - return STATUS_NO_MEMORY; - } - - wcscpy(DisplayNameBuffer->Buffer, Name->Buffer); - - *DisplayName = DisplayNameBuffer; - - return STATUS_SUCCESS; + HINSTANCE hInstance; + ULONG Index; + UINT nLength; + + TRACE("LsarpLookupPrivilegeDisplayName(%p 0x%04hu 0x%04hu %p %p)", + Name, ClientLanguage, ClientSystemDefaultLanguage, DisplayName, LanguageReturned); + + if (Name->Length == 0 || Name->Buffer == NULL) + return STATUS_INVALID_PARAMETER; + + hInstance = GetModuleHandleW(L"lsasrv.dll"); + + for (Index = 0; Index < ARRAYSIZE(WellKnownPrivileges); Index++) + { + if (_wcsicmp(Name->Buffer, WellKnownPrivileges[Index].Name) == 0) + { + TRACE("Index: %u\n", Index); + nLength = LsapGetResourceStringLengthEx(hInstance, + IDS_CREATE_TOKEN_PRIVILEGE + Index, + ClientLanguage); + if (nLength != 0) + { + DisplayNameBuffer = MIDL_user_allocate(sizeof(RPC_UNICODE_STRING)); + if (DisplayNameBuffer == NULL) + return STATUS_NO_MEMORY; + + DisplayNameBuffer->Length = nLength * sizeof(WCHAR); + DisplayNameBuffer->MaximumLength = DisplayNameBuffer->Length + sizeof(WCHAR); + + DisplayNameBuffer->Buffer = MIDL_user_allocate(DisplayNameBuffer->MaximumLength); + if (DisplayNameBuffer->Buffer == NULL) + { + MIDL_user_free(DisplayNameBuffer); + return STATUS_NO_MEMORY; + } + + LsapLoadStringEx(hInstance, + IDS_CREATE_TOKEN_PRIVILEGE + Index, + ClientLanguage, + DisplayNameBuffer->Buffer, + nLength); + + *DisplayName = DisplayNameBuffer; + *LanguageReturned = ClientLanguage; + } + else + { + nLength = LsapGetResourceStringLengthEx(hInstance, + IDS_CREATE_TOKEN_PRIVILEGE + Index, + ClientSystemDefaultLanguage); + if (nLength != 0) + { + DisplayNameBuffer = MIDL_user_allocate(sizeof(RPC_UNICODE_STRING)); + if (DisplayNameBuffer == NULL) + return STATUS_NO_MEMORY; + + DisplayNameBuffer->Length = nLength * sizeof(WCHAR); + DisplayNameBuffer->MaximumLength = DisplayNameBuffer->Length + sizeof(WCHAR); + + DisplayNameBuffer->Buffer = MIDL_user_allocate(DisplayNameBuffer->MaximumLength); + if (DisplayNameBuffer->Buffer == NULL) + { + MIDL_user_free(DisplayNameBuffer); + return STATUS_NO_MEMORY; + } + + LsapLoadStringEx(hInstance, + IDS_CREATE_TOKEN_PRIVILEGE + Index, + ClientSystemDefaultLanguage, + DisplayNameBuffer->Buffer, + nLength); + + *DisplayName = DisplayNameBuffer; + *LanguageReturned = ClientSystemDefaultLanguage; + } + else + { + return STATUS_INVALID_PARAMETER; +#if 0 + nLength = LsapGetResourceStringLengthEx(hInstance, + IDS_CREATE_TOKEN_PRIVILEGE + Index, + 0x409); +#endif + } + } + + return STATUS_SUCCESS; + } + } + + return STATUS_NO_SUCH_PRIVILEGE; } Modified: trunk/reactos/dll/win32/lsasrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] Sun Mar 26 20:45:48 2017 @@ -26,6 +26,94 @@ int i; /* Use loword (incremented by 1) as resourceid */ + hrsrc = FindResourceW(hInstance, + MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), + (LPWSTR)RT_STRING); + if (!hrsrc) + return 0; + + hmem = LoadResource(hInstance, hrsrc); + if (!hmem) + return 0; + + p = LockResource(hmem); + string_num = uId & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + i = min(nBufferMax - 1, *p); + if (i > 0) + { + memcpy(lpBuffer, p + 1, i * sizeof(WCHAR)); + lpBuffer[i] = 0; + } + else + { + if (nBufferMax > 1) + { + lpBuffer[0] = 0; + return 0; + } + } + + return i; +} + + +INT +LsapGetResourceStringLengthEx( + _In_ HINSTANCE hInstance, + _In_ UINT uId, + _In_ USHORT usLanguage) +{ + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + UINT i, string_num; + + /* Use loword (incremented by 1) as resourceid */ +// hrsrc = FindResourceExW(hInstance, +// MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), +// (LPWSTR)RT_STRING, +// usLanguage); + hrsrc = FindResourceW(hInstance, + MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), + (LPWSTR)RT_STRING); + if (!hrsrc) + return 0; + + hmem = LoadResource(hInstance, hrsrc); + if (!hmem) + return 0; + + p = LockResource(hmem); + string_num = uId & 0x000f; + for (i = 0; i < string_num; i++) + p += *p + 1; + + return *p + 1; +} + + +INT +LsapLoadStringEx( + _In_ HINSTANCE hInstance, + _In_ UINT uId, + _In_ USHORT usLanguage, + _Out_ LPWSTR lpBuffer, + _Out_ INT nBufferMax) +{ + HGLOBAL hmem; + HRSRC hrsrc; + WCHAR *p; + int string_num; + int i; + + /* Use loword (incremented by 1) as resourceid */ +// hrsrc = FindResourceExW(hInstance, +// MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), +// (LPWSTR)RT_STRING, +// usLanguage); hrsrc = FindResourceW(hInstance, MAKEINTRESOURCEW((LOWORD(uId) >> 4) + 1), (LPWSTR)RT_STRING);

1 0

[gadamopoulos] 74231: [EXPLORER]: Fix most problems with the size of the taskbar. (Most problems when run in windows. Running on ros still isn't perfect.) - CTaskSwitchWnd: Use the height of the st...
by gadamopoulos＠svn.reactos.org 26 Mar '17

26 Mar '17

Author: gadamopoulos Date: Sun Mar 26 16:46:55 2017 New Revision: 74231 URL: http://svn.reactos.org/svn/reactos?rev=74231&view=rev Log: [EXPLORER]: Fix most problems with the size of the taskbar. (Most problems when run in windows. Running on ros still isn't perfect.) - CTaskSwitchWnd: Use the height of the start button as minimum height in horizontal mode. - CTrayClockWnd: Actually process WM_THEMECHANGED message. - CTaskSwitchWnd: Use SM_CYSIZE as the height of the buttons of the toolbar. - CStartButton: Simplify calculating the minimum size of the button. - CTrayWindow: Don't use IsThemeActive. Checking if OpenThemeData returned non null is enough. Modified: trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/taskband.cpp 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] Sun Mar 26 16:46:55 2017 @@ -233,7 +233,7 @@ */ extern const GUID CLSID_ITaskBand; /* Internal Task Band CLSID */ -HRESULT CTaskBand_CreateInstance(IN ITrayWindow *Tray, REFIID riid, void **ppv); +HRESULT CTaskBand_CreateInstance(IN ITrayWindow *Tray, HWND hWndStartButton, REFIID riid, void **ppv); /* * tbsite.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] Sun Mar 26 16:46:55 2017 @@ -40,6 +40,7 @@ CComPtr<IUnknown> m_Site; HWND m_hWnd; + HWND m_hWndStartButton; DWORD m_BandID; public: @@ -124,7 +125,10 @@ } else { - pdbi->ptMinSize.y = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); /* FIXME: Query */ + /* When the band is horizontal its minimum height is the height of the start button */ + RECT rcButton; + GetWindowRect(m_hWndStartButton, &rcButton); + pdbi->ptMinSize.y = rcButton.bottom - rcButton.top; pdbi->ptIntegral.y = pdbi->ptMinSize.y + (3 * GetSystemMetrics(SM_CYEDGE) / 2); /* FIXME: Query metrics */ /* We're not going to allow task bands where not even the minimum button size fits into the band */ pdbi->ptMinSize.x = pdbi->ptIntegral.y; @@ -327,10 +331,11 @@ /*****************************************************************************/ - HRESULT STDMETHODCALLTYPE Initialize(IN OUT ITrayWindow *tray) + HRESULT STDMETHODCALLTYPE Initialize(IN OUT ITrayWindow *tray, HWND hWndStartButton) { m_Tray = tray; m_BandID = (DWORD) -1; + m_hWndStartButton = hWndStartButton; return S_OK; } @@ -348,7 +353,7 @@ END_COM_MAP() }; -HRESULT CTaskBand_CreateInstance(IN ITrayWindow *Tray, REFIID riid, void **ppv) +HRESULT CTaskBand_CreateInstance(IN ITrayWindow *Tray, HWND hWndStartButton, REFIID riid, void **ppv) { - return ShellObjectCreatorInit<CTaskBand>(Tray, riid, ppv); + return ShellObjectCreatorInit<CTaskBand>(Tray, hWndStartButton, riid, ppv); } 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] Sun Mar 26 16:46:55 2017 @@ -1146,7 +1146,7 @@ BOOL Horizontal; int cx = GetSystemMetrics(SM_CXMINIMIZED); - int cy = m_ButtonSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); + int cy = m_ButtonSize.cy = GetSystemMetrics(SM_CYSIZE); m_TaskBar.SetButtonSize(cx, cy); if (GetClientRect(&rcClient) && !IsRectEmpty(&rcClient)) 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] Sun Mar 26 16:46:55 2017 @@ -1206,6 +1206,7 @@ MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_PRINTCLIENT, OnPaint) + MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) MESSAGE_HANDLER(WM_TIMER, OnTimer) MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest) MESSAGE_HANDLER(WM_SETFONT, OnSetFont) @@ -1229,10 +1230,7 @@ Create(hWndParent, 0, NULL, dwStyle); if (m_hWnd != NULL) - { SetWindowTheme(m_hWnd, L"TrayNotify", NULL); - OnThemeChanged(); - } return m_hWnd; 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] Sun Mar 26 16:46:55 2017 @@ -101,10 +101,7 @@ Size.cx = 2 * GetSystemMetrics(SM_CXEDGE) + GetSystemMetrics(SM_CYCAPTION) * 3; } - 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))); + Size.cy = max(Size.cy, GetSystemMetrics(SM_CYCAPTION)); /* Save the size of the start button */ m_Size = Size; @@ -732,6 +729,10 @@ void UpdateFonts() { + /* There is nothing to do if themes are not enabled */ + if (m_Theme) + return; + m_StartButton.UpdateFont(); NONCLIENTMETRICS ncm = {sizeof(ncm)}; @@ -902,7 +903,7 @@ *pRect = *pScreen; - if(!IsThemeActive()) + if(!m_Theme) { /* Move the border outside of the screen */ InflateRect(pRect, @@ -1407,7 +1408,7 @@ entire window size, not just the client size. However, we use a thinner border than a standard thick border, so that the start button and bands are not stuck to the screen border. */ - if(!IsThemeActive()) + if(!m_Theme) { sr.Size.cx = StartBtnSize.cx + (2 * (EdgeSize.cx + DlgFrameSize.cx)); sr.Size.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); @@ -1445,7 +1446,7 @@ loaded from the registry are at least. The windows explorer behaves the same way, it allows the user to save a zero width vertical tray window, but not a zero height horizontal tray window. */ - if(!IsThemeActive()) + if(!m_Theme) { WndSize.cx = 2 * (EdgeSize.cx + DlgFrameSize.cx); WndSize.cy = StartBtnSize.cy + (2 * (EdgeSize.cy + DlgFrameSize.cy)); @@ -1970,7 +1971,7 @@ dwExStyle |= WS_EX_TOPMOST; DWORD dwStyle = WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; - if(!IsThemeActive()) + if(!m_Theme) { dwStyle |= WS_THICKFRAME | WS_BORDER; } @@ -2098,7 +2099,7 @@ m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, 0); /* Create the task band */ - hRet = CTaskBand_CreateInstance(this, IID_PPV_ARG(IDeskBand, &m_TaskBand)); + hRet = CTaskBand_CreateInstance(this, m_StartButton.m_hWnd, IID_PPV_ARG(IDeskBand, &m_TaskBand)); if (FAILED_UNEXPECTEDLY(hRet)) return FALSE; @@ -2153,10 +2154,7 @@ if (m_Theme) CloseThemeData(m_Theme); - if (IsThemeActive()) - m_Theme = OpenThemeData(m_hWnd, L"TaskBar"); - else - m_Theme = NULL; + m_Theme = OpenThemeData(m_hWnd, L"TaskBar"); if (m_Theme) { @@ -2690,7 +2688,7 @@ { RECT *rc = NULL; /* Ignore WM_NCCALCSIZE if we are not themed or locked */ - if(!IsThemeActive() || Locked) + if(!m_Theme || Locked) { bHandled = FALSE; return 0;

1 0

[ekohl] 74230: [LSASRV] Add privilege display name resource strings. CORE-12976
by ekohl＠svn.reactos.org 26 Mar '17

26 Mar '17

Author: ekohl Date: Sun Mar 26 14:02:39 2017 New Revision: 74230 URL: http://svn.reactos.org/svn/reactos?rev=74230&view=rev Log: [LSASRV] Add privilege display name resource strings. CORE-12976 Modified: trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc trunk/reactos/dll/win32/lsasrv/lang/en-US.rc trunk/reactos/dll/win32/lsasrv/resources.h Modified: trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lang/de-DE.rc [iso-8859-1] Sun Mar 26 14:02:39 2017 @@ -42,3 +42,36 @@ IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Remotedesktopbenutzer" IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Netzwerk-Konfigurationsoperatoren" END + +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Erstellen eines Tokenobjekts" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Ersetzen eines Tokens auf Prozessebene" + IDS_LOCK_MEMORY_PRIVILEGE "Sperren von Seiten im Speicher" + IDS_INCREASE_QUOTA_PRIVILEGE "Anpassen von Speicherkontingenten fÃ¼r einen Prozess" + IDS_MACHINE_ACCOUNT_PRIVILEGE "HinzufÃ¼gen von Arbeitsstationen zur DomÃ¤ne" + IDS_TCB_PRIVILEGE "Einsetzen als Teil des Betriebssystems" + IDS_SECURITY_PRIVILEGE "Verwalten von Ãberwachungs- und Sicherheitsprotokollen" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Ãbernehmen des Besitzes von Dateien und Objekten" + IDS_LOAD_DRIVER_PRIVILEGE "Laden und Entfernen von GerÃ¤tetreibern" + IDS_SYSTEM_PROFILE_PRIVILEGE "Erstellen eines Profils der Systemleistung" + IDS_SYSTEMTIME_PRIVILEGE "Ãndern der Systemzeit" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Erstellen eines Profils fÃ¼r einen Einzelprozess" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Anheben der ZeitplanungsprioritÃ¤t" + IDS_CREATE_PAGEFILE_PRIVILEGE "Erstellen einer Auslagerungsdatei" + IDS_CREATE_PERMANENT_PRIVILEGE "Erstellen von dauerhaft freigegebenen Objekten" + IDS_BACKUP_PRIVILEGE "Sichern von Dateien und Verzeichnissen" + IDS_RESTORE_PRIVILEGE "Wiederherstellen von Dateien und Verzeichnissen" + IDS_SHUTDOWN_PRIVILEGE "Herunterfahren des Systems" + IDS_DEBUG_PRIVILEGE "Debuggen von Programmen" + IDS_AUDIT_PRIVILEGE "Generieren von SicherheitsÃ¼berwachungen" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "VerÃ¤ndern der Firmwareumgebungsvariablen" + IDS_CHANGE_NOTIFY_PRIVILEGE "Auslassen der durchsuchenden ÃberprÃ¼fung" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Erzwingen des Herunterfahrens von einem Remotesystem aus" + IDS_UNDOCK_PRIVILEGE "Entfernen des Computers von der Dockingstation" + IDS_SYNC_AGENT_PRIVILEGE "Synchronisieren von Verzeichnisdienstdaten" + IDS_ENABLE_DELEGATION_PRIVILEGE "ErmÃ¶glichen, dass Computer- und Benutzerkonten fÃ¼r Delegierungszwecke vertraut wird" + IDS_MANAGE_VOLUME_PRIVILEGE "DurchfÃ¼hren von Volumewartungsaufgaben" + IDS_IMPERSONATE_PRIVILEGE "Annehmen der ClientidentitÃ¤t nach Authentifizierung" + IDS_CREATE_GLOBAL_PRIVILEGE "Erstellen globaler Objekte" +END Modified: trunk/reactos/dll/win32/lsasrv/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lang/en-US.rc [iso-8859-1] Sun Mar 26 14:02:39 2017 @@ -42,3 +42,36 @@ IDS_ALIAS_RID_REMOTE_DESKTOP_USERS "Remote Desktop Users" IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS "Network Configuration Operators" END + +STRINGTABLE +BEGIN + IDS_CREATE_TOKEN_PRIVILEGE "Create a token object" + IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE "Replace a process level token" + IDS_LOCK_MEMORY_PRIVILEGE "Lock pages in memory" + IDS_INCREASE_QUOTA_PRIVILEGE "Adjust memory quotas for a process" + IDS_MACHINE_ACCOUNT_PRIVILEGE "Add workstations to domain" + IDS_TCB_PRIVILEGE "Act as part of the operating system" + IDS_SECURITY_PRIVILEGE "Manage auditing and security log" + IDS_TAKE_OWNERSHIP_PRIVILEGE "Take ownership of files or other objects" + IDS_LOAD_DRIVER_PRIVILEGE "Load and unload device drivers" + IDS_SYSTEM_PROFILE_PRIVILEGE "Profile system performance" + IDS_SYSTEMTIME_PRIVILEGE "Change the system time" + IDS_PROF_SINGLE_PROCESS_PRIVILEGE "Profile single process" + IDS_INC_BASE_PRIORITY_PRIVILEGE "Increase scheduling priority" + IDS_CREATE_PAGEFILE_PRIVILEGE "Create a pagefile" + IDS_CREATE_PERMANENT_PRIVILEGE "Create permanent shared objects" + IDS_BACKUP_PRIVILEGE "Back up files and directories" + IDS_RESTORE_PRIVILEGE "Restore files and directories" + IDS_SHUTDOWN_PRIVILEGE "Shut down the system" + IDS_DEBUG_PRIVILEGE "Debug programs" + IDS_AUDIT_PRIVILEGE "Generate security audits" + IDS_SYSTEM_ENVIRONMENT_PRIVILEGE "Modify firmware environment values" + IDS_CHANGE_NOTIFY_PRIVILEGE "Bypass traverse checking" + IDS_REMOTE_SHUTDOWN_PRIVILEGE "Force shutdown from a remote system" + IDS_UNDOCK_PRIVILEGE "Remove computer from docking station" + IDS_SYNC_AGENT_PRIVILEGE "Synchronize directory service data" + IDS_ENABLE_DELEGATION_PRIVILEGE "Enable computer and user accounts to be trusted for delegation" + IDS_MANAGE_VOLUME_PRIVILEGE "Perform volume maintenance tasks" + IDS_IMPERSONATE_PRIVILEGE "Impersonate a client after authentication" + IDS_CREATE_GLOBAL_PRIVILEGE "Create global objects" +END Modified: trunk/reactos/dll/win32/lsasrv/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/resources… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/resources.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/resources.h [iso-8859-1] Sun Mar 26 14:02:39 2017 @@ -48,3 +48,34 @@ #define IDS_ALIAS_RID_PREW2KCOMPACCESS 145 #define IDS_ALIAS_RID_REMOTE_DESKTOP_USERS 146 #define IDS_ALIAS_RID_NETWORK_CONFIGURATION_OPS 147 + + +#define IDS_CREATE_TOKEN_PRIVILEGE 200 +#define IDS_ASSIGNPRIMARYTOKEN_PRIVILEGE 201 +#define IDS_LOCK_MEMORY_PRIVILEGE 202 +#define IDS_INCREASE_QUOTA_PRIVILEGE 203 +#define IDS_MACHINE_ACCOUNT_PRIVILEGE 204 +#define IDS_TCB_PRIVILEGE 205 +#define IDS_SECURITY_PRIVILEGE 206 +#define IDS_TAKE_OWNERSHIP_PRIVILEGE 207 +#define IDS_LOAD_DRIVER_PRIVILEGE 208 +#define IDS_SYSTEM_PROFILE_PRIVILEGE 209 +#define IDS_SYSTEMTIME_PRIVILEGE 210 +#define IDS_PROF_SINGLE_PROCESS_PRIVILEGE 211 +#define IDS_INC_BASE_PRIORITY_PRIVILEGE 212 +#define IDS_CREATE_PAGEFILE_PRIVILEGE 213 +#define IDS_CREATE_PERMANENT_PRIVILEGE 214 +#define IDS_BACKUP_PRIVILEGE 215 +#define IDS_RESTORE_PRIVILEGE 216 +#define IDS_SHUTDOWN_PRIVILEGE 217 +#define IDS_DEBUG_PRIVILEGE 218 +#define IDS_AUDIT_PRIVILEGE 219 +#define IDS_SYSTEM_ENVIRONMENT_PRIVILEGE 220 +#define IDS_CHANGE_NOTIFY_PRIVILEGE 221 +#define IDS_REMOTE_SHUTDOWN_PRIVILEGE 222 +#define IDS_UNDOCK_PRIVILEGE 223 +#define IDS_SYNC_AGENT_PRIVILEGE 224 +#define IDS_ENABLE_DELEGATION_PRIVILEGE 225 +#define IDS_MANAGE_VOLUME_PRIVILEGE 226 +#define IDS_IMPERSONATE_PRIVILEGE 227 +#define IDS_CREATE_GLOBAL_PRIVILEGE 228

1 0

[ekohl] 74229: [STOBJECT] Fix a typo (wrong resource id).
by ekohl＠svn.reactos.org 25 Mar '17

25 Mar '17

Author: ekohl Date: Sat Mar 25 14:33:18 2017 New Revision: 74229 URL: http://svn.reactos.org/svn/reactos?rev=74229&view=rev Log: [STOBJECT] Fix a typo (wrong resource id). Modified: trunk/reactos/dll/shellext/stobject/lang/de-DE.rc Modified: trunk/reactos/dll/shellext/stobject/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/lang… ============================================================================== --- trunk/reactos/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/lang/de-DE.rc [iso-8859-1] Sat Mar 25 14:33:18 2017 @@ -8,7 +8,7 @@ BEGIN CONTROL "Energiestand", 1001, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 9, 20, 234, 189 CONTROL "Symbol in der &Taskleiste anzeigen", 1002, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 6, 6, 123, 10 - CONTROL "&Details fÃ¼r jede Batterie anzeigen", 1002, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 129, 6, 123, 10 + CONTROL "&Details fÃ¼r jede Batterie anzeigen", 1003, "Button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 129, 6, 123, 10 CONTROL "", 1000, "Static", SS_LEFT | WS_CHILD | WS_GROUP, 11, 29, 229, 178 END

1 0

[ekohl] 74228: [STOBJECT] Implement the power schemes popup menu.
by ekohl＠svn.reactos.org 25 Mar '17

25 Mar '17

Author: ekohl Date: Sat Mar 25 13:35:41 2017 New Revision: 74228 URL: http://svn.reactos.org/svn/reactos?rev=74228&view=rev Log: [STOBJECT] Implement the power schemes popup menu. Modified: trunk/reactos/dll/shellext/stobject/CMakeLists.txt trunk/reactos/dll/shellext/stobject/power.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] Sat Mar 25 13:35:41 2017 @@ -33,6 +33,7 @@ winmm ole32 oleaut32 + powrprof shlwapi shell32 comctl32 Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] Sat Mar 25 13:35:41 2017 @@ -8,6 +8,7 @@ */ #include "precomp.h" +#include "powrprof.h" #include <mmsystem.h> #include <mmddk.h> @@ -16,6 +17,13 @@ #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) WINE_DEFAULT_DEBUG_CHANNEL(stobject); + +typedef struct _PWRSCHEMECONTEXT +{ + HMENU hPopup; + UINT uiFirst; + UINT uiLast; +} PWRSCHEMECONTEXT, *PPWRSCHEMECONTEXT; //static HICON g_hIconBattery = NULL; static HICON g_hIconAC = NULL; @@ -120,6 +128,68 @@ } } +static +BOOLEAN +CALLBACK +PowerSchemesEnumProc( + UINT uiIndex, + DWORD dwName, + LPWSTR sName, + DWORD dwDesc, + LPWSTR sDesc, + PPOWER_POLICY pp, + LPARAM lParam) +{ + PPWRSCHEMECONTEXT PowerSchemeContext = (PPWRSCHEMECONTEXT)lParam; + + if (AppendMenuW(PowerSchemeContext->hPopup, MF_STRING, uiIndex + 1, sName)) + { + if (PowerSchemeContext->uiFirst == 0) + PowerSchemeContext->uiFirst = uiIndex + 1; + + PowerSchemeContext->uiLast = uiIndex + 1; + } + + return TRUE; +} + +static +VOID +ShowPowerSchemesPopupMenu( + CSysTray *pSysTray) +{ + PWRSCHEMECONTEXT PowerSchemeContext = {NULL, 0, 0}; + UINT uiActiveScheme; + DWORD id, msgPos; + + PowerSchemeContext.hPopup = CreatePopupMenu(); + EnumPwrSchemes(PowerSchemesEnumProc, (LPARAM)&PowerSchemeContext); + + if (GetActivePwrScheme(&uiActiveScheme)) + { + CheckMenuRadioItem(PowerSchemeContext.hPopup, + PowerSchemeContext.uiFirst, + PowerSchemeContext.uiLast, + uiActiveScheme + 1, + MF_BYCOMMAND); + } + + msgPos = GetMessagePos(); + + SetForegroundWindow(pSysTray->GetHWnd()); + id = TrackPopupMenuEx(PowerSchemeContext.hPopup, + TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, + GET_X_LPARAM(msgPos), + GET_Y_LPARAM(msgPos), + pSysTray->GetHWnd(), + NULL); + + DestroyMenu(PowerSchemeContext.hPopup); + + if (id != 0) + SetActivePwrScheme(id - 1, NULL, NULL); +} + 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); @@ -155,7 +225,7 @@ break; case WM_LBUTTONUP: - TRACE("TODO: display power options!\n"); + ShowPowerSchemesPopupMenu(pSysTray); break; case WM_LBUTTONDBLCLK: @@ -167,6 +237,7 @@ case WM_RBUTTONUP: _ShowContextMenu(pSysTray); + break; case WM_RBUTTONDBLCLK: break;

1 0

[ekohl] 74227: [MMSYS] Show and hide the volume systray icon.
by ekohl＠svn.reactos.org 23 Mar '17

23 Mar '17

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;

1 0

[ekohl] 74226: [POWERCFG] Show and hide the power systray icon.
by ekohl＠svn.reactos.org 23 Mar '17

23 Mar '17

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(); }

1 0

[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 23 Mar '17

23 Mar '17

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; +}

1 0

[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 23 Mar '17

23 Mar '17

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() };

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs