Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[gadamopoulos] 74237: [EXPLORER] -Try to fix a crash in explorer. CORE-12991

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Mar 28 09:28:06 2017 New Revision: 74237 URL: http://svn.reactos.org/svn/reactos?rev=74237&view=rev Log: [EXPLORER] -Try to fix a crash in explorer. CORE-12991 Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp 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] Tue Mar 28 09:28:06 2017 @@ -1162,7 +1162,11 @@ tbm.dwMask = TBMF_BUTTONSPACING; m_TaskBar.GetMetrics(&tbm); - uiRows = (rcClient.bottom + tbm.cyButtonSpacing) / (m_ButtonSize.cy + tbm.cyButtonSpacing); + if (m_ButtonSize.cy + tbm.cyButtonSpacing != 0) + uiRows = (rcClient.bottom + tbm.cyButtonSpacing) / (m_ButtonSize.cy + tbm.cyButtonSpacing); + else + uiRows = 1; + if (uiRows == 0) uiRows = 1;

7 years, 9 months

[tfaber] 74236: [NTOS:KE] - Addendum to r74235. CORE-12985

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 27 20:23:37 2017 New Revision: 74236 URL: http://svn.reactos.org/svn/reactos?rev=74236&view=rev Log: [NTOS:KE] - Addendum to r74235. CORE-12985 Modified: trunk/reactos/ntoskrnl/ke/amd64/stubs.c trunk/reactos/ntoskrnl/ke/arm/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/stubs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Mon Mar 27 20:23:37 2017 @@ -115,15 +115,15 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - /* Initialize the idle loop: disable interrupts */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); - /* Now loop forever */ while (TRUE) { + /* Start of the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -161,12 +161,6 @@ /* Go back to DISPATCH_LEVEL */ KeLowerIrql(DISPATCH_LEVEL); - - /* We are back in the idle thread -- disable interrupts again */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); } else { Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Mon Mar 27 20:23:37 2017 @@ -155,15 +155,15 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - /* Initialize the idle loop: disable interrupts */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); - /* Now loop forever */ while (TRUE) { + /* Start of the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -195,12 +195,6 @@ /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); - - /* We are back in the idle thread -- disable interrupts again */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); } else {

7 years, 9 months

[tfaber] 74235: [NTOS:KE] - Make sure to disable interrupts each iteration of the idle loop, since IdleFunction can leave them enabled. CORE-12985 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Mar 27 20:16:59 2017 New Revision: 74235 URL: http://svn.reactos.org/svn/reactos?rev=74235&view=rev Log: [NTOS:KE] - Make sure to disable interrupts each iteration of the idle loop, since IdleFunction can leave them enabled. CORE-12985 #resolve Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Mon Mar 27 20:16:59 2017 @@ -270,15 +270,15 @@ PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD OldThread, NewThread; - /* Initialize the idle loop: disable interrupts */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); - /* Now loop forever */ while (TRUE) { + /* Start of the idle loop: disable interrupts */ + _enable(); + YieldProcessor(); + YieldProcessor(); + _disable(); + /* Check for pending timers, pending DPCs, or pending ready threads */ if ((Prcb->DpcData[0].DpcQueueDepth) || (Prcb->TimerRequest) || @@ -310,12 +310,6 @@ /* Switch away from the idle thread */ KiSwapContext(APC_LEVEL, OldThread); - - /* We are back in the idle thread -- disable interrupts again */ - _enable(); - YieldProcessor(); - YieldProcessor(); - _disable(); } else {

7 years, 9 months

[gadamopoulos] 74234: [UXTHEME] -Fix drawing the themed scrollbar. CORE-12933

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Mar 27 19:56:36 2017 New Revision: 74234 URL: http://svn.reactos.org/svn/reactos?rev=74234&view=rev Log: [UXTHEME] -Fix drawing the themed scrollbar. CORE-12933 Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c Modified: trunk/reactos/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/ncscroll… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/ncscrollbar.c [iso-8859-1] Mon Mar 27 19:56:36 2017 @@ -182,14 +182,18 @@ { RECT r, rcPart; + /* thumbPos is relative to the edge of the scrollbar */ + r = psbi->rcScrollBar; if (vertical) { + thumbPos += pcontext->wi.rcClient.top - pcontext->wi.rcWindow.top; r.top += psbi->dxyLineButton; r.bottom -= (psbi->dxyLineButton); } else { + thumbPos += pcontext->wi.rcClient.left - pcontext->wi.rcWindow.left; r.left += psbi->dxyLineButton; r.right -= psbi->dxyLineButton; }

7 years, 9 months

[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

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

7 years, 9 months

[ekohl] 74232: [LSASRV] Implement LsarpLookupPrivilegeDisplayName. Reading the resource strings is still buggy. CORE-12976 #comment Please retest!

by ekohl＠svn.reactos.org

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

7 years, 9 months

[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

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;

7 years, 9 months

[ekohl] 74230: [LSASRV] Add privilege display name resource strings. CORE-12976

by ekohl＠svn.reactos.org

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

7 years, 9 months

[ekohl] 74229: [STOBJECT] Fix a typo (wrong resource id).

by ekohl＠svn.reactos.org

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

7 years, 9 months

[ekohl] 74228: [STOBJECT] Implement the power schemes popup menu.

by ekohl＠svn.reactos.org

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;

7 years, 9 months

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