Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 58017: [NETAPI32] - Include a netapi32.h in most files and move the other includes into netapi32.h. - Add functions to open account and builtin domains directly and use these functions.
by ekohl＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: ekohl Date: Wed Dec 26 21:07:13 2012 New Revision: 58017 URL: http://svn.reactos.org/svn/reactos?rev=58017&view=rev Log: [NETAPI32] - Include a netapi32.h in most files and move the other includes into netapi32.h. - Add functions to open account and builtin domains directly and use these functions. Modified: trunk/reactos/dll/win32/netapi32/access.c trunk/reactos/dll/win32/netapi32/apibuf.c trunk/reactos/dll/win32/netapi32/browsr.c trunk/reactos/dll/win32/netapi32/ds.c trunk/reactos/dll/win32/netapi32/group.c trunk/reactos/dll/win32/netapi32/local_group.c trunk/reactos/dll/win32/netapi32/misc.c trunk/reactos/dll/win32/netapi32/netapi32.h trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/access.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/access.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); Modified: trunk/reactos/dll/win32/netapi32/apibuf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/apibuf.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/apibuf.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "lmcons.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "winerror.h" -#include "wine/debug.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); Modified: trunk/reactos/dll/win32/netapi32/browsr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/browsr.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/browsr.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmbrowsr.h" -#include "lmshare.h" +#include "netapi32.h" /************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) Modified: trunk/reactos/dll/win32/netapi32/ds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/ds.c?re… ============================================================================== --- trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/ds.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,17 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "dsrole.h" -#include "dsgetdc.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(ds); Modified: trunk/reactos/dll/win32/netapi32/group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/group.c… ============================================================================== --- trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/group.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,22 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" +#include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,25 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "winreg.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> -#include "ntsam.h" #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); @@ -232,7 +213,6 @@ SAM_HANDLE ServerHandle = NULL; SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; - PSID DomainSid = NULL; LPWSTR aliasname = NULL; LPWSTR aliascomment = NULL; ULONG RelativeId; @@ -277,23 +257,13 @@ goto done; } - /* Get the Builtin Domain SID */ - Status = GetBuiltinDomainSid(&DomainSid); + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Builtin Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -314,29 +284,15 @@ ApiStatus = NERR_Success; - /* Free the Builtin Domain SID */ - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - DomainSid = NULL; - /* Close the Builtin Domain */ SamCloseHandle(DomainHandle); DomainHandle = NULL; - /* Get the account domain SID */ - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - /* Open the account domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_CREATE_ALIAS | DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_CREATE_ALIAS | DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { ERR("SamOpenDomain failed (Status %08lx)\n", Status); @@ -383,9 +339,6 @@ if (AliasHandle != NULL) SamCloseHandle(AliasHandle); - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - if (DomainHandle != NULL) SamCloseHandle(DomainHandle); @@ -478,7 +431,6 @@ UNICODE_STRING ServerName; PSAM_RID_ENUMERATION CurrentAlias; PENUM_CONTEXT EnumContext = NULL; - PSID DomainSid = NULL; ULONG i; SAM_HANDLE AliasHandle = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; @@ -523,47 +475,23 @@ goto done; } - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + Status = OpenAccountDomain(EnumContext->ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->AccountDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->AccountDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - + Status = OpenBuiltinDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->BuiltinDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = GetBuiltinDomainSid(&DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->BuiltinDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -732,7 +660,6 @@ SAM_HANDLE ServerHandle = NULL; SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; - PSID DomainSid = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; @@ -758,23 +685,13 @@ goto done; } - /* Get the Builtin Domain SID */ - Status = GetBuiltinDomainSid(&DomainSid); + /* Open the Builtin Domain */ + Status = OpenBuiltinDomain(ServerHandle, + DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Builtin Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -792,30 +709,17 @@ if (AliasHandle == NULL) { - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - if (DomainHandle != NULL) SamCloseHandle(DomainHandle); - /* Get the Account Domain SID */ - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + /* Open the Acount Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LOOKUP, + &DomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Acount Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LOOKUP, - DomainSid, - &DomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -854,9 +758,6 @@ if (AliasHandle != NULL) SamCloseHandle(AliasHandle); - - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); if (DomainHandle != NULL) SamCloseHandle(DomainHandle); Modified: trunk/reactos/dll/win32/netapi32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/misc.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -9,20 +9,6 @@ /* INCLUDES ******************************************************************/ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "ntsecapi.h" -#include "wine/debug.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> -#include "ntsam.h" #include "netapi32.h" @@ -125,4 +111,68 @@ return Status; } + +NTSTATUS +OpenAccountDomain(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING ServerName, + IN ULONG DesiredAccess, + OUT PSAM_HANDLE DomainHandle) +{ + PSID DomainSid = NULL; + NTSTATUS Status; + + Status = GetAccountDomainSid(ServerName, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + return Status; + } + + Status = SamOpenDomain(ServerHandle, + DesiredAccess, + DomainSid, + DomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + } + + return Status; +} + + +NTSTATUS +OpenBuiltinDomain(IN SAM_HANDLE ServerHandle, + IN ULONG DesiredAccess, + OUT PSAM_HANDLE DomainHandle) +{ + PSID DomainSid = NULL; + NTSTATUS Status; + + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + return Status; + } + + Status = SamOpenDomain(ServerHandle, + DesiredAccess, + DomainSid, + DomainHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + } + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.h [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -1,6 +1,32 @@ #ifndef __WINE_NETAPI32_H__ #define __WINE_NETAPI32_H__ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "lmcons.h" +#include "lmaccess.h" +#include "lmapibuf.h" +#include "lmbrowsr.h" +#include "lmerr.h" +#include "lmshare.h" +#include "lmuse.h" +#include "ntsecapi.h" +#include "dsrole.h" +#include "dsgetdc.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "wine/list.h" + +#define NTOS_MODE_USER +#include <ndk/rtlfuncs.h> +#include "ntsam.h" + NET_API_STATUS WINAPI @@ -15,4 +41,15 @@ NTSTATUS GetBuiltinDomainSid(OUT PSID *BuiltinDomainSid); +NTSTATUS +OpenAccountDomain(IN SAM_HANDLE ServerHandle, + IN PUNICODE_STRING ServerName, + IN ULONG DesiredAccess, + OUT PSAM_HANDLE DomainHandle); + +NTSTATUS +OpenBuiltinDomain(IN SAM_HANDLE ServerHandle, + IN ULONG DesiredAccess, + OUT SAM_HANDLE *DomainHandle); + #endif Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Wed Dec 26 21:07:13 2012 @@ -18,26 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "lmcons.h" -#include "lmaccess.h" -#include "lmapibuf.h" -#include "lmerr.h" -#include "lmuse.h" -#include "ntsecapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" -#include "wine/list.h" - -#define NTOS_MODE_USER -#include <ndk/rtlfuncs.h> -#include "ntsam.h" #include "netapi32.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); @@ -177,7 +157,7 @@ if (UserInfo->AdminComment.Length > 0) Size += UserInfo->AdminComment.Length + sizeof(WCHAR); - /* FIXME: Add user comment here */ + /* FIXME: usri10_usr_comment */ if (UserInfo->FullName.Length > 0) Size += UserInfo->FullName.Length + sizeof(WCHAR); @@ -239,9 +219,8 @@ UserInfo1->usri1_password = NULL; - UserInfo1->usri1_password_age = 0; /* FIXME */ - - UserInfo1->usri1_priv = 0; /* FIXME */ + /* FIXME: UserInfo1->usri1_password_age */ + /* FIXME: UserInfo1->usri1_priv */ if (UserInfo->HomeDirectory.Length > 0) { @@ -310,7 +289,7 @@ Ptr = (LPWSTR)((ULONG_PTR)Ptr + UserInfo->AdminComment.Length + sizeof(WCHAR)); } - /* FIXME: Add user comment here */ + /* FIXME: UserInfo10->usri10_usr_comment */ if (UserInfo->FullName.Length > 0) { @@ -322,7 +301,6 @@ UserInfo10->usri10_full_name[UserInfo->FullName.Length / sizeof(WCHAR)] = UNICODE_NULL; } break; - // case 11: @@ -592,10 +570,7 @@ PSAM_RID_ENUMERATION CurrentUser; PENUM_CONTEXT EnumContext = NULL; LPVOID Buffer = NULL; - PSID DomainSid = NULL; - ULONG i; - SAM_HANDLE UserHandle = NULL; PUSER_ACCOUNT_INFORMATION UserInfo = NULL; @@ -639,47 +614,23 @@ goto done; } - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + Status = OpenAccountDomain(EnumContext->ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->AccountDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->AccountDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - + Status = OpenBuiltinDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &EnumContext->BuiltinDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = GetBuiltinDomainSid(&DomainSid); - if (!NT_SUCCESS(Status)) - { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - Status = SamOpenDomain(EnumContext->ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &EnumContext->BuiltinDomainHandle); - - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); - - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenBuiltinDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -871,7 +822,6 @@ SAM_HANDLE ServerHandle = NULL; SAM_HANDLE AccountDomainHandle = NULL; SAM_HANDLE UserHandle = NULL; - PSID DomainSid = NULL; PULONG RelativeIds = NULL; PSID_NAME_USE Use = NULL; PUSER_ACCOUNT_INFORMATION UserInfo = NULL; @@ -899,24 +849,14 @@ goto done; } - /* Get the Account Domain SID */ - Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, - &DomainSid); + /* Open the Account Domain */ + Status = OpenAccountDomain(ServerHandle, + (servername != NULL) ? &ServerName : NULL, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + &AccountDomainHandle); if (!NT_SUCCESS(Status)) { - ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* Open the Account Domain */ - Status = SamOpenDomain(ServerHandle, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - DomainSid, - &AccountDomainHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ERR("OpenAccountDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -988,9 +928,6 @@ if (Use != NULL) SamFreeMemory(Use); - - if (DomainSid != NULL) - RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); if (AccountDomainHandle != NULL) SamCloseHandle(AccountDomainHandle);

1 0

[hbelusca] 58016: [MSVCRT] Export __crtLCMapStringW and correct __crtLCMapStringA: their prototypes are : int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int srclen, wcha...
by hbelusca＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: hbelusca Date: Wed Dec 26 19:26:08 2012 New Revision: 58016 URL: http://svn.reactos.org/svn/reactos?rev=58016&view=rev Log: [MSVCRT] Export __crtLCMapStringW and correct __crtLCMapStringA: their prototypes are : int CDECL __crtLCMapStringW(LCID lcid, DWORD mapflags, const wchar_t *src, int srclen, wchar_t *dst, int dstlen, unsigned int codepage, int xflag) and int CDECL __crtLCMapStringA(LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst, int dstlen, unsigned int codepage, int xflag) Needed by SVN. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed Dec 26 19:26:08 2012 @@ -143,8 +143,8 @@ @ cdecl __crtCompareStringW(long long wstr long wstr long) kernel32.CompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) -@ cdecl __crtLCMapStringA(long long str long ptr long long long) -# stub __crtLCMapStringW +@ cdecl __crtLCMapStringA(long long str long str long long long) +@ cdecl __crtLCMapStringW(long long wstr long wstr long long long) @ cdecl __daylight() __p__daylight @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno()

1 0

[ekohl] 58015: [NETAPI32] - Implement NetLocalGroupAdd. - Implement and use a helper function that opens aliases by name.
by ekohl＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: ekohl Date: Wed Dec 26 16:31:28 2012 New Revision: 58015 URL: http://svn.reactos.org/svn/reactos?rev=58015&view=rev Log: [NETAPI32] - Implement NetLocalGroupAdd. - Implement and use a helper function that opens aliases by name. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Wed Dec 26 16:31:28 2012 @@ -160,19 +160,241 @@ } -/************************************************************ - * NetLocalGroupAdd (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetLocalGroupAdd( +static +NET_API_STATUS +OpenAliasByName(SAM_HANDLE DomainHandle, + PUNICODE_STRING AliasName, + ULONG DesiredAccess, + PSAM_HANDLE AliasHandle) +{ + PULONG RelativeIds = NULL; + PSID_NAME_USE Use = NULL; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get the RID for the given user name */ + Status = SamLookupNamesInDomain(DomainHandle, + 1, + AliasName, + &RelativeIds, + &Use); + if (!NT_SUCCESS(Status)) + { + ERR("SamLookupNamesInDomain failed (Status %08lx)\n", Status); + return NetpNtStatusToApiStatus(Status); + } + + /* Fail, if it is not an alias account */ + if (Use[0] != SidTypeAlias) + { + ERR("Object is not an Alias!\n"); + ApiStatus = NERR_GroupNotFound; + goto done; + } + + /* Open the alias account */ + Status = SamOpenAlias(DomainHandle, + DesiredAccess, + RelativeIds[0], + AliasHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + +done: + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + return ApiStatus; +} + + +/************************************************************ + * NetLocalGroupAdd (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetLocalGroupAdd( LPCWSTR servername, DWORD level, LPBYTE buf, LPDWORD parm_err) { - FIXME("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, + ALIAS_ADM_COMMENT_INFORMATION AdminComment; + UNICODE_STRING ServerName; + UNICODE_STRING AliasName; + SAM_HANDLE ServerHandle = NULL; + SAM_HANDLE DomainHandle = NULL; + SAM_HANDLE AliasHandle = NULL; + PSID DomainSid = NULL; + LPWSTR aliasname = NULL; + LPWSTR aliascomment = NULL; + ULONG RelativeId; + NET_API_STATUS ApiStatus = NERR_Success; + NTSTATUS Status = STATUS_SUCCESS; + + TRACE("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, parm_err); - return NERR_Success; -} + + /* Initialize the Server name*/ + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + /* Initialize the Alias name*/ + switch (level) + { + case 0: + aliasname = ((PLOCALGROUP_INFO_0)buf)->lgrpi0_name; + aliascomment = NULL; + break; + + case 1: + aliasname = ((PLOCALGROUP_INFO_1)buf)->lgrpi1_name; + aliascomment = ((PLOCALGROUP_INFO_1)buf)->lgrpi1_comment; + break; + + default: + return ERROR_INVALID_LEVEL; + } + + RtlInitUnicodeString(&AliasName, aliasname); + + /* Connect to the SAM Server */ + Status = SamConnect((servername != NULL) ? &ServerName : NULL, + &ServerHandle, + SAM_SERVER_CONNECT | SAM_SERVER_LOOKUP_DOMAIN, + NULL); + if (!NT_SUCCESS(Status)) + { + ERR("SamConnect failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Get the Builtin Domain SID */ + Status = GetBuiltinDomainSid(&DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetBuiltinDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Builtin Domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Try to open the Alias Account in the Builtin Domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &AliasName, + ALIAS_READ_INFORMATION, + &AliasHandle); + if (ApiStatus == NERR_Success) + { + ERR("OpenAliasByName: alias %wZ already exists!\n", &AliasName); + + SamCloseHandle(AliasHandle); + ApiStatus = ERROR_ALIAS_EXISTS; + goto done; + } + + ApiStatus = NERR_Success; + + /* Free the Builtin Domain SID */ + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + DomainSid = NULL; + + /* Close the Builtin Domain */ + SamCloseHandle(DomainHandle); + DomainHandle = NULL; + + /* Get the account domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the account domain */ + Status = SamOpenDomain(ServerHandle, + DOMAIN_CREATE_ALIAS | DOMAIN_LOOKUP, + DomainSid, + &DomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Create the alias */ + Status = SamCreateAliasInDomain(DomainHandle, + &AliasName, + DELETE | ALIAS_WRITE_ACCOUNT, + &AliasHandle, + &RelativeId); + if (!NT_SUCCESS(Status)) + { + ERR("SamCreateAliasInDomain failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + TRACE("Created alias \"%wZ\" (RID: %lu)\n", &AliasName, RelativeId); + + /* Set the admin comment */ + if (level == 1) + { + RtlInitUnicodeString(&AdminComment.AdminComment, aliascomment); + + Status = SamSetInformationAlias(AliasHandle, + AliasAdminCommentInformation, + &AdminComment); + if (!NT_SUCCESS(Status)) + { + ERR("SamSetInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + + /* Delete the Alias if the Comment could not be set */ + SamDeleteAlias(AliasHandle); + + goto done; + } + } + +done: + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + return ApiStatus; +} + /************************************************************ * NetLocalGroupAddMember (NETAPI32.@) @@ -264,7 +486,7 @@ NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - FIXME("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), + TRACE("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); *entriesread = 0; @@ -511,14 +733,12 @@ SAM_HANDLE DomainHandle = NULL; SAM_HANDLE AliasHandle = NULL; PSID DomainSid = NULL; - PULONG RelativeIds = NULL; - PSID_NAME_USE Use = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; LPVOID Buffer = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - FIXME("(%s %s %d %p) stub!\n", debugstr_w(servername), + TRACE("(%s %s %d %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); if (servername != NULL) @@ -559,49 +779,24 @@ goto done; } - /* Get the RID for the given user name */ - Status = SamLookupNamesInDomain(DomainHandle, - 1, - &GroupName, - &RelativeIds, - &Use); - if (!NT_SUCCESS(Status) && Status != STATUS_NONE_MAPPED) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - if (Status == STATUS_SUCCESS) - { - /* FIXME: Check Use*/ - - Status = SamOpenAlias(DomainHandle, - ALIAS_READ_INFORMATION, - RelativeIds[0], - &AliasHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } + /* Open the alias account in the builtin domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &GroupName, + ALIAS_READ_INFORMATION, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); + goto done; } if (AliasHandle == NULL) { - if (RelativeIds != NULL) - SamFreeMemory(RelativeIds); - - if (Use != NULL) - SamFreeMemory(Use); - if (DomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); if (DomainHandle != NULL) SamCloseHandle(DomainHandle); - /* Get the Account Domain SID */ Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, @@ -625,29 +820,14 @@ goto done; } - /* Get the RID for the given user name */ - Status = SamLookupNamesInDomain(DomainHandle, - 1, - &GroupName, - &RelativeIds, - &Use); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); - goto done; - } - - /* FIXME: Check Use*/ - - Status = SamOpenAlias(DomainHandle, - ALIAS_READ_INFORMATION, - RelativeIds[0], - &AliasHandle); - if (!NT_SUCCESS(Status)) - { - ERR("SamOpenDomain failed (Status %08lx)\n", Status); - ApiStatus = NetpNtStatusToApiStatus(Status); + /* Open the alias account in the account domain */ + ApiStatus = OpenAliasByName(DomainHandle, + &GroupName, + ALIAS_READ_INFORMATION, + &AliasHandle); + if (ApiStatus != NERR_Success) + { + ERR("OpenAliasByName failed (ApiStatus %lu)\n", ApiStatus); goto done; } } @@ -675,12 +855,6 @@ if (AliasHandle != NULL) SamCloseHandle(AliasHandle); - if (RelativeIds != NULL) - SamFreeMemory(RelativeIds); - - if (Use != NULL) - SamFreeMemory(Use); - if (DomainSid != NULL) RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); @@ -692,7 +866,7 @@ *bufptr = (LPBYTE)Buffer; - return NERR_Success; + return ApiStatus; }

1 0

[hbelusca] 58014: [MSVCRT] Export ___lc_collate_cp_func since it exists in Win2k3 msvcrt.dll AND it is needed by SVN in RosBE 2.1.
by hbelusca＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: hbelusca Date: Wed Dec 26 16:28:44 2012 New Revision: 58014 URL: http://svn.reactos.org/svn/reactos?rev=58014&view=rev Log: [MSVCRT] Export ___lc_collate_cp_func since it exists in Win2k3 msvcrt.dll AND it is needed by SVN in RosBE 2.1. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Wed Dec 26 16:28:44 2012 @@ -131,7 +131,7 @@ @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) @ cdecl ___lc_codepage_func() -# @ cdecl ___lc_collate_cp_func() +@ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() @ cdecl ___setlc_active_func()

1 0

[tfaber] 58013: [EXPLORER_NEW] - Fix some formatting and GetWindowLong[Ptr] confusion
by tfaber＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: tfaber Date: Wed Dec 26 15:48:49 2012 New Revision: 58013 URL: http://svn.reactos.org/svn/reactos?rev=58013&view=rev Log: [EXPLORER_NEW] - Fix some formatting and GetWindowLong[Ptr] confusion Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/trayprop.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -41,17 +41,17 @@ ASSERT((~dwStyleMask & dwStyle) == 0); - PrevStyle = GetWindowLongPtr(hWnd, - GWL_STYLE); + PrevStyle = GetWindowLong(hWnd, + GWL_STYLE); if (PrevStyle != 0 && (PrevStyle & dwStyleMask) != dwStyle) { Style = PrevStyle & ~dwStyleMask; Style |= dwStyle; - PrevStyle = SetWindowLongPtr(hWnd, - GWL_STYLE, - Style); + PrevStyle = SetWindowLong(hWnd, + GWL_STYLE, + Style); } return PrevStyle; @@ -66,17 +66,17 @@ ASSERT((~dwStyleMask & dwStyle) == 0); - PrevStyle = GetWindowLongPtr(hWnd, - GWL_EXSTYLE); + PrevStyle = GetWindowLong(hWnd, + GWL_EXSTYLE); if (PrevStyle != 0 && (PrevStyle & dwStyleMask) != dwStyle) { Style = PrevStyle & ~dwStyleMask; Style |= dwStyle; - PrevStyle = SetWindowLongPtr(hWnd, - GWL_EXSTYLE, - Style); + PrevStyle = SetWindowLong(hWnd, + GWL_EXSTYLE, + Style); } return PrevStyle; @@ -291,11 +291,11 @@ BOOL bRet = FALSE; unsigned int i; - dwLen = GetFileVersionInfoSize(szFileName,&dwHandle); + dwLen = GetFileVersionInfoSize(szFileName, &dwHandle); if (dwLen > 0) { - lpData = HeapAlloc(hProcessHeap,0,dwLen); + lpData = HeapAlloc(hProcessHeap, 0, dwLen); if (lpData != NULL) { @@ -324,14 +324,15 @@ sizeof(szSubBlock) / sizeof(szSubBlock[0]), TEXT("\\StringFileInfo\\%04X%04X\\%s"), lpTranslate[i].wLanguage, - lpTranslate[i].wCodePage,szVersionInfo); + lpTranslate[i].wCodePage, + szVersionInfo); if (VerQueryValue(lpData, szSubBlock, (LPVOID *)&lpszLocalBuf, &cbLen) != 0) { - wcsncpy(szBuffer,lpszLocalBuf,cbBufLen); + wcsncpy(szBuffer, lpszLocalBuf, cbBufLen); bRet = TRUE; break; @@ -339,7 +340,7 @@ } } } - HeapFree(hProcessHeap,0,lpData); + HeapFree(hProcessHeap, 0, lpData); lpData = NULL; } } Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -15,7 +15,7 @@ MENUITEM "&Undo", ID_SHELL_CMD_UNDO_ACTION MENUITEM SEPARATOR MENUITEM "ÐÐ°Ð´Ð°ÑÐµÐ½ ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»", ID_SHELL_CMD_OPEN_TASKMGR - MENUITEM SEPARATOR + MENUITEM SEPARATOR MENUITEM "&ÐÐ°ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð´Ð°ÑÐ½Ð°ÑÐ° Ð»ÐµÐ½ÑÐ°", ID_LOCKTASKBAR MENUITEM "Ð¡&Ð²Ð¾Ð¹ÑÑÐ²Ð°", ID_SHELL_CMD_PROPERTIES END Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta… ============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -431,7 +431,9 @@ TaskItem); icon = TaskSwitchWnd_GetWndIcon(TaskItem->hWnd); - TaskItem->IconIndex = ImageList_ReplaceIcon(This->TaskIcons,TaskItem->IconIndex,icon); + TaskItem->IconIndex = ImageList_ReplaceIcon(This->TaskIcons, + TaskItem->IconIndex, + icon); tbbi.iImage = TaskItem->IconIndex; if (!SendMessage(This->hWndToolbar, @@ -452,9 +454,9 @@ IN PTASK_ITEM TaskItem) { TBBUTTONINFO tbbi; - PTASK_ITEM currentTaskItem,LastItem; - - if (TaskItem->IconIndex==-1) + PTASK_ITEM currentTaskItem, LastItem; + + if (TaskItem->IconIndex == -1) return; tbbi.cbSize = sizeof(tbbi); @@ -1377,8 +1379,8 @@ /* Don't list popup windows and also no tool windows */ if (GetWindow(hWnd, GW_OWNER) == NULL && - !(GetWindowLongPtr(hWnd, - GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + !(GetWindowLong(hWnd, + GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) { TaskSwitchWnd_AddTask(This, hWnd); @@ -2126,7 +2128,7 @@ #if DUMP_TASKS != 0 case WM_TIMER: - switch(wParam) + switch (wParam) { case 1: TaskSwitchWnd_DumpTasks(This); Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -187,7 +187,7 @@ tbBtn.dwData = notifyItem->Index; tbBtn.iString = (INT_PTR)text; - tbBtn.idCommand=notifyItem->Index; + tbBtn.idCommand = notifyItem->Index; if (iconData->uFlags & NIF_MESSAGE) { @@ -237,7 +237,7 @@ { PNOTIFY_ITEM deleteItem; PNOTIFY_ITEM updateItem; - deleteItem=*NotifyPointer; + deleteItem = *NotifyPointer; SendMessage(This->hWndToolbar, @@ -245,7 +245,7 @@ deleteItem->Index, 0); - *NotifyPointer=updateItem=deleteItem->next; + *NotifyPointer = updateItem = deleteItem->next; if (!(deleteItem->iconData.dwState & NIS_HIDDEN)) This->VisibleButtonCount--; @@ -382,13 +382,10 @@ SendMessage(This->hWndToolbar, TB_SETIMAGELIST, 0, (LPARAM)This->SysIcons); BtnSize.cx = BtnSize.cy = 18; - //BtnSize.cx = GetSystemMetrics(SM_CXMINIMIZED); - //This->ButtonSize.cy = BtnSize.cy = GetSystemMetrics(SM_CYSIZE) + (2 * GetSystemMetrics(SM_CYEDGE)); SendMessage(This->hWndToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(BtnSize.cx, BtnSize.cy)); - /*SysPagerWnd_AddButton(This);*/ SetWindowSubclass(This->hWndToolbar, SysPagerWnd_ToolbarSubclassedProc, @@ -427,6 +424,7 @@ parentHWND = GetParent(parentHWND); GetClientRect(parentHWND, &windowRect); + /* FIXME: ever heard of "struct"? */ trayCommand = *(DWORD *) (((BYTE *)cpData->lpData) + 4); iconData = (NOTIFYICONDATA *) (((BYTE *)cpData->lpData) + 8); @@ -448,7 +446,7 @@ PPNOTIFY_ITEM NotifyPointer; NotifyPointer = SysPagerWnd_FindPPNotifyItemByIconData(This, iconData); - if(!NotifyPointer) + if (!NotifyPointer) { SysPagerWnd_AddButton(This, iconData); } @@ -697,10 +695,10 @@ BOOL IsTime; DWORD dwFormatFlags; LPCTSTR lpFormat; -}ClockWndFormats[]= { -{TRUE, 0, NULL}, -{FALSE, 0, TEXT("dddd")}, -{FALSE, DATE_SHORTDATE, NULL} +} ClockWndFormats[] = { + { TRUE, 0, NULL }, + { FALSE, 0, TEXT("dddd") }, + { FALSE, DATE_SHORTDATE, NULL } }; HRESULT RegGetDWord(HKEY hKey, LPCTSTR szValueName, DWORD * lpdwResult) @@ -997,7 +995,7 @@ nmh.hwndFrom = This->hWnd; nmh.idFrom = GetWindowLongPtr(This->hWnd, - GWL_ID); + GWLP_ID); nmh.code = NTNWM_REALIGN; SendMessage(This->hWndNotify, @@ -1491,9 +1489,9 @@ if (This->TrayTheme) { - style = GetWindowLongPtr(This->hWnd, GWL_EXSTYLE); + style = GetWindowLong(This->hWnd, GWL_EXSTYLE); style = style & ~WS_EX_STATICEDGE; - SetWindowLongPtr(This->hWnd, GWL_EXSTYLE, style); + SetWindowLong(This->hWnd, GWL_EXSTYLE, style); GetThemeMargins(This->TrayTheme, NULL, @@ -1505,9 +1503,9 @@ } else { - style = GetWindowLongPtr(This->hWnd, GWL_EXSTYLE); + style = GetWindowLong(This->hWnd, GWL_EXSTYLE); style = style | WS_EX_STATICEDGE; - SetWindowLongPtr(This->hWnd, GWL_EXSTYLE, style); + SetWindowLong(This->hWnd, GWL_EXSTYLE, style); This->ContentMargin.cxLeftWidth = 0; This->ContentMargin.cxRightWidth = 0; Modified: trunk/reactos/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -142,7 +142,7 @@ break; case WM_COMMAND: - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_TASKBARPROP_LOCK: case IDC_TASKBARPROP_HIDE: @@ -163,7 +163,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; @@ -259,7 +259,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; @@ -294,7 +294,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; @@ -329,7 +329,7 @@ { LPNMHDR pnmh = (LPNMHDR)lParam; - switch(pnmh->code) + switch (pnmh->code) { case PSN_SETACTIVE: break; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Dec 26 15:48:49 2012 @@ -372,11 +372,11 @@ RECT rcMin = {0}; AdjustWindowRectEx(&rcMin, - GetWindowLongPtr(This->hWnd, - GWL_STYLE), + GetWindowLong(This->hWnd, + GWL_STYLE), FALSE, - GetWindowLongPtr(This->hWnd, - GWL_EXSTYLE)); + GetWindowLong(This->hWnd, + GWL_EXSTYLE)); *pRect = rcMin; } @@ -655,7 +655,7 @@ RECT rcTray,rcWorkArea; /* If monitor has changed then fix the previous monitors work area */ - if(This->PreviousMonitor!=This->Monitor) + if (This->PreviousMonitor != This->Monitor) { ITrayWindowImpl_GetScreenRect(This, This->PreviousMonitor, @@ -671,25 +671,25 @@ ITrayWindowImpl_GetScreenRect(This, This->Monitor, &rcWorkArea); - This->PreviousMonitor=This->Monitor; + This->PreviousMonitor = This->Monitor; /* If AutoHide is false then change the workarea to exclude the area that the taskbar covers. */ - if(!This->AutoHide) - { - switch(This->Position) + if (!This->AutoHide) + { + switch (This->Position) { case ABE_TOP: - rcWorkArea.top=rcTray.bottom; + rcWorkArea.top = rcTray.bottom; break; case ABE_LEFT: - rcWorkArea.left=rcTray.right; + rcWorkArea.left = rcTray.right; break; case ABE_RIGHT: - rcWorkArea.right=rcTray.left; + rcWorkArea.right = rcTray.left; break; case ABE_BOTTOM: - rcWorkArea.bottom=rcTray.top; + rcWorkArea.bottom = rcTray.top; break; } } @@ -1978,7 +1978,7 @@ static DWORD WINAPI RunFileDlgThread(IN OUT PVOID pParam) -{ +{ ITrayWindowImpl *This = pParam; HANDLE hShell32; RUNFILEDLG RunFileDlg; @@ -2007,7 +2007,7 @@ DestroyWindow(hwnd); - return 0; + return 0; } static LRESULT CALLBACK @@ -2519,7 +2519,7 @@ lParam, &Ret))) { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { /* FIXME: Handle these commands as well */ case IDM_TASKBARANDSTARTMENU:

1 0

[hbelusca] 58012: [MAGNIFY] Fix French translation
by hbelusca＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: hbelusca Date: Wed Dec 26 15:28:28 2012 New Revision: 58012 URL: http://svn.reactos.org/svn/reactos?rev=58012&view=rev Log: [MAGNIFY] Fix French translation Modified: trunk/reactos/base/applications/magnify/lang/fr-FR.rc Modified: trunk/reactos/base/applications/magnify/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/fr-FR.rc [iso-8859-1] Wed Dec 26 15:28:28 2012 @@ -54,7 +54,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,193,76,50,14 ICON IDI_ICON,IDC_STATIC,7,17,20,20 - LTEXT "La loupe a Ã©tÃ© rÃ©alisÃ©e pour fournir quelques fonctionnalitÃ©s aux utilisateurs souffrants de dÃ©ficiences visuelles. La majoritÃ© de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalitÃ©s pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 + LTEXT "La loupe a Ã©tÃ© rÃ©alisÃ©e pour fournir quelques fonctionnalitÃ©s aux utilisateurs souffrant de dÃ©ficiences visuelles. La majoritÃ© de ces utilisateurs aura besoin d'un utilitaire d'agrandissement avec plus de fonctionnalitÃ©s pour une utilisation quotidienne.",IDC_STATIC,36,7,207,33 CONTROL "Ne plus montrer ce message",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 END

1 0

[tfaber] 58011: [EXPLORER_NEW] - Add Advanced tab in task bar properties to support ReactOS-specific options (currently: show seconds in tray clock). Patch by Edijs Kolesnikovics. CORE-5410 #commen...
by tfaber＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: tfaber Date: Wed Dec 26 15:14:41 2012 New Revision: 58011 URL: http://svn.reactos.org/svn/reactos?rev=58011&view=rev Log: [EXPLORER_NEW] - Add Advanced tab in task bar properties to support ReactOS-specific options (currently: show seconds in tray clock). Patch by Edijs Kolesnikovics. CORE-5410 #comment Patch committed, thanks! Awaiting the updated save-to-registry functionality. Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/en-US.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/resource.h trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/trayprop.c Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -124,6 +124,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -128,6 +128,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/en-US.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/es-ES.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/it-IT.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -136,6 +136,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -126,6 +126,14 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Rodyti s&ekundes", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/nl-NL.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -122,6 +122,14 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/no-NO.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pl-PL.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -131,6 +131,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/pt-BR.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -124,6 +124,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -123,6 +123,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/ru-RU.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -124,6 +124,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -127,6 +127,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -130,6 +130,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/zh-CN.rc [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -130,6 +130,15 @@ CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE END +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Advanced" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "Advanced options", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "Show s&econds", IDC_TASKBARPROP_SECONDS, 13,18,200,10 +END + STRINGTABLE DISCARDABLE BEGIN Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -26,6 +26,13 @@ #include "initguid.h" #include "undoc.h" +/* Structure to hold non-default options*/ +typedef struct _ADVANCED_SETTINGS { + BOOL bShowSeconds; +} ADVANCED_SETTINGS, *PADVANCED_SETTINGS; + +extern ADVANCED_SETTINGS AdvancedSettings; + /* dynamic imports due to lack of support in msvc linker libs */ typedef INT (APIENTRY *REGSHELLHOOK)(HWND, DWORD); #ifdef UNICODE Modified: trunk/reactos/base/shell/explorer-new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/re… ============================================================================== --- trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/resource.h [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -80,6 +80,7 @@ #define IDB_TASKBARPROP_NOLOCK_NOGROUP_NOQL 2056 #define IDB_TASKBARPROP_NOLOCK_NOGROUP_QL 2057 #define IDB_TASKBARPROP_NOLOCK_GROUP_QL 2058 +#define IDC_TASKBARPROP_SECONDS 2059 /* Taskbar properties, startmenu*/ #define IDD_TASKBARPROP_STARTMENU 2100 @@ -99,6 +100,7 @@ #define IDC_TASKBARPROP_VOLUME 2205 #define IDC_TASKBARPROP_NETWORK 2206 #define IDC_TASKBARPROP_POWER 2207 +#define IDD_TASKBARPROP_ADVANCED 2208 /* Taskbar properties, toolbars */ #define IDD_TASKBARPROP_TOOLBARS 2300 Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -688,8 +688,6 @@ */ static const TCHAR szTrayClockWndClass[] = TEXT("TrayClockWClass"); -static LPCTSTR s_szRegistryKey = _T("Software\\ReactOS\\Features\\Explorer"); -BOOL blShowSeconds; #define ID_TRAYCLOCK_TIMER 0 #define ID_TRAYCLOCK_TIMER_INIT 1 @@ -722,27 +720,6 @@ else if (dwType != REG_DWORD) return DISP_E_TYPEMISMATCH; return NOERROR; -} - -void LoadSettings(void) -{ - HKEY hKey = NULL; - DWORD dwValue; - - if (RegOpenKey(HKEY_CURRENT_USER, s_szRegistryKey, &hKey) == ERROR_SUCCESS) - { - RegGetDWord(hKey, TEXT("blShowSeconds"), &dwValue); - if (dwValue == 1) - { - blShowSeconds = TRUE; - } - else - { - blShowSeconds = FALSE; - } - - RegCloseKey(hKey); - } } #define CLOCKWND_FORMAT_COUNT (sizeof(ClockWndFormats) / sizeof(ClockWndFormats[0])) @@ -965,7 +942,7 @@ if (ClockWndFormats[i].IsTime) { iRet = GetTimeFormat(LOCALE_USER_DEFAULT, - ClockWndFormats[i].dwFormatFlags, + AdvancedSettings.bShowSeconds ? ClockWndFormats[i].dwFormatFlags : TIME_NOSECONDS, &This->LocalTime, ClockWndFormats[i].lpFormat, This->szLines[i], @@ -983,11 +960,6 @@ if (iRet != 0 && i == 0) { - if (blShowSeconds == FALSE) - { - This->szLines[0][5] = '\0'; - } - /* Set the window text to the time only */ SetWindowText(This->hWnd, This->szLines[i]); @@ -1051,7 +1023,7 @@ /* Calculate the due time */ GetLocalTime(&This->LocalTime); uiDueTime = 1000 - (UINT)This->LocalTime.wMilliseconds; - if (blShowSeconds == TRUE) + if (AdvancedSettings.bShowSeconds) uiDueTime += (UINT)This->LocalTime.wSecond * 100; else uiDueTime += (59 - (UINT)This->LocalTime.wSecond) * 1000; @@ -1117,7 +1089,7 @@ uiDueTime = TrayClockWnd_CalculateDueTime(This); - if (blShowSeconds == TRUE) + if (AdvancedSettings.bShowSeconds) { uiWait1 = 1000 - 200; uiWait2 = 1000; @@ -1403,7 +1375,6 @@ PTRAY_CLOCK_WND_DATA TcData; DWORD dwStyle; HWND hWnd = NULL; - LoadSettings(); TcData = HeapAlloc(hProcessHeap, 0, Modified: trunk/reactos/base/shell/explorer-new/trayprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayprop.c [iso-8859-1] Wed Dec 26 15:14:41 2012 @@ -30,6 +30,8 @@ HBITMAP hTaskbarBitmap; } PROPSHEET_INFO, *PPROPSHEET_INFO; +ADVANCED_SETTINGS AdvancedSettings = { FALSE }; + static BOOL UpdateTaskbarBitmap(PPROPSHEET_INFO pPropInfo) @@ -38,7 +40,7 @@ HWND hwndBitmap; BOOL bLock, bHide, bGroup, bShowQL; LPTSTR lpImageName = NULL; - BOOL bRet = FALSE; + BOOL bRet = FALSE; hwndLock = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_LOCK); hwndHide = GetDlgItem(pPropInfo->hTaskbarWnd, IDC_TASKBARPROP_HIDE); @@ -188,8 +190,58 @@ return FALSE; } - -INT_PTR CALLBACK +static INT_PTR CALLBACK +AdvancedSettingsPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + CheckDlgButton(hwndDlg, IDC_TASKBARPROP_SECONDS, AdvancedSettings.bShowSeconds ? BST_CHECKED : BST_UNCHECKED); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_TASKBARPROP_SECONDS: + if (HIWORD(wParam) == BN_CLICKED) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; + } + break; + + case WM_NOTIFY: + { + LPNMHDR pnmh = (LPNMHDR)lParam; + + switch (pnmh->code) + { + case PSN_SETACTIVE: + break; + + case PSN_APPLY: + AdvancedSettings.bShowSeconds = IsDlgButtonChecked(hwndDlg, IDC_TASKBARPROP_SECONDS); + break; + } + + break; + } + + case WM_DESTROY: + break; + + default: + return FALSE; + } + + return FALSE; +} + +static INT_PTR CALLBACK StartMenuPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -224,7 +276,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK NotificationPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -259,7 +311,7 @@ } -INT_PTR CALLBACK +static INT_PTR CALLBACK ToolbarsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, @@ -315,7 +367,7 @@ { PPROPSHEET_INFO pPropInfo; PROPSHEETHEADER psh; - PROPSHEETPAGE psp[4]; + PROPSHEETPAGE psp[5]; TCHAR szCaption[256]; pPropInfo = (PPROPSHEET_INFO)HeapAlloc(hProcessHeap, @@ -349,10 +401,11 @@ psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, (DLGPROC)TaskbarPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, (DLGPROC)StartMenuPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, (DLGPROC)NotificationPageProc, (LPARAM)pPropInfo); - InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, (DLGPROC)ToolbarsPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[0], IDD_TASKBARPROP_TASKBAR, TaskbarPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[1], IDD_TASKBARPROP_STARTMENU, StartMenuPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[2], IDD_TASKBARPROP_NOTIFICATION, NotificationPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[3], IDD_TASKBARPROP_TOOLBARS, ToolbarsPageProc, (LPARAM)pPropInfo); + InitPropSheetPage(&psp[4], IDD_TASKBARPROP_ADVANCED, AdvancedSettingsPageProc, (LPARAM)pPropInfo); PropertySheet(&psh);

1 0

[hbelusca] 58010: [FREELDR] Improve the way we are doing the timing: When the timeout is > 0, we refresh its display. When it becomes == 0, we exit the waiting-loop and do the right action (start t...
by hbelusca＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: hbelusca Date: Wed Dec 26 02:14:46 2012 New Revision: 58010 URL: http://svn.reactos.org/svn/reactos?rev=58010&view=rev Log: [FREELDR] Improve the way we are doing the timing: When the timeout is > 0, we refresh its display. When it becomes == 0, we exit the waiting-loop and do the right action (start the default OS, ...). However, when we press a key, it is set to -1 by convention, that means, no timeout. The timeout display is then cleared ONLY ONCE since there is no need to refresh it each time we do a waiting-loop-turn when the timeout is == -1. Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Wed Dec 26 02:14:46 2012 @@ -560,7 +560,7 @@ if (CanEscape && KeyPress == KEY_ESC) return FALSE; /* Check if there is a countdown */ - if (MenuInformation.MenuTimeRemaining) + if (MenuInformation.MenuTimeRemaining > 0) { /* Get the updated time, seconds only */ CurrentClockSecond = ArcGetTime()->Second; @@ -576,7 +576,7 @@ UiDrawMenuBox(&MenuInformation); } } - else + else if (MenuInformation.MenuTimeRemaining == 0) { /* A time out occurred, exit this loop and return default OS */ break; Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Wed Dec 26 02:14:46 2012 @@ -93,7 +93,7 @@ // // Check if there is a countdown // - if (MenuInformation.MenuTimeRemaining) + if (MenuInformation.MenuTimeRemaining > 0) { // // Get the updated time, seconds only @@ -118,7 +118,7 @@ VideoCopyOffScreenBufferToVRAM(); } } - else + else if (MenuInformation.MenuTimeRemaining == 0) { // // A time out occurred, exit this loop and return default OS

1 0

[hbelusca] 58009: [FREELDR] Code formatting only
by hbelusca＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: hbelusca Date: Wed Dec 26 01:59:39 2012 New Revision: 58009 URL: http://svn.reactos.org/svn/reactos?rev=58009&view=rev Log: [FREELDR] Code formatting only Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Wed Dec 26 01:59:39 2012 @@ -128,7 +128,7 @@ // // Draw title text // - TuiDrawText( (UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, + TuiDrawText((UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, 2, UiTitleBoxTitleText, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor));

1 0

[hbelusca] 58008: [FREELDR] - Show the selected boot options as NTLDR does (in light blue under the "For troubleshooting... press F8" message).- The different safe modes are now mutually exclusive, ...
by hbelusca＠svn.reactos.org 26 Dec '12

26 Dec '12

Author: hbelusca Date: Wed Dec 26 01:40:18 2012 New Revision: 58008 URL: http://svn.reactos.org/svn/reactos?rev=58008&view=rev Log: [FREELDR] - Show the selected boot options as NTLDR does (in light blue under the "For troubleshooting... press F8" message).- The different safe modes are now mutually exclusive, as they must be. - They can be coupled to the "boot logging", "vga mode" and "debugging" modes, enlarging possibilities (contrary to NTLDR. However you'll remark that these combinations are allowed when set with msconfig...). - Since the safe modes come by default with boot logging, don't show "Boot Logging" when one of the safe modes is selected, but instead show the corresponding safe mode name. - Modify the needed functions. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/include/ui.h trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h trunk/reactos/boot/freeldr/freeldr/options.c trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/minitui.c trunk/reactos/boot/freeldr/freeldr/ui/noui.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -44,6 +44,7 @@ ULONG SelectedMenuItem; if (!UiDisplayMenu("Please choose a boot method:", "", + FALSE, CustomBootMenuList, CustomBootMenuCount, 0, -1, Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -273,6 +273,7 @@ if (!UiDisplayMenu("Please select the operating system to start:", "For troubleshooting and advanced startup options for " "ReactOS, press F8.", + TRUE, OperatingSystemDisplayNames, OperatingSystemCount, DefaultOperatingSystem, Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/options.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -20,4 +20,5 @@ #pragma once VOID DoOptionsMenu(VOID); +VOID DisplayBootTimeOptions(VOID); VOID AppendBootTimeOptions(PCHAR BootOptions); Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -70,7 +70,7 @@ VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID UiShowMessageBoxesInSection(PCSTR SectionName); // Displays all the message boxes in a given section -VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurances of "\n" to '\n' +VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurrences of "\n" to '\n' BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR UiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value @@ -91,8 +91,9 @@ { PCSTR MenuHeader; PCSTR MenuFooter; + BOOLEAN ShowBootOptions; - PCSTR *MenuItemList; + PCSTR* MenuItemList; ULONG MenuItemCount; LONG MenuTimeRemaining; ULONG SelectedMenuItem; @@ -105,7 +106,7 @@ typedef BOOLEAN (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); -BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); /////////////////////////////////////////////////////////////////////////////////////// // @@ -135,7 +136,7 @@ VOID (*FadeInBackdrop)(VOID); VOID (*FadeOut)(VOID); - BOOLEAN (*DisplayMenu)(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); + BOOLEAN (*DisplayMenu)(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); VOID (*DrawMenu)(PUI_MENU_INFO MenuInfo); } UIVTBL, *PUIVTBL; Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/gui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -48,6 +48,6 @@ // Menu Functions // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN GuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); +BOOLEAN GuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); extern const UIVTBL GuiVtbl; Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/noui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -41,5 +41,5 @@ // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo); Modified: trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ui/tui.h [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -63,7 +63,7 @@ VOID NTAPI TuiDrawMenuBox(PUI_MENU_INFO MenuInfo); VOID NTAPI TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber); ULONG NTAPI TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, UiMenuKeyPressFilterCallback KeyPressFilter); -BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); /* Definitions for corners, depending on HORIZ and VERT */ #define UL (0xda) Modified: trunk/reactos/boot/freeldr/freeldr/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/optio… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/options.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -37,6 +37,7 @@ NULL, + "Start ReactOS normally", #ifdef HAS_OPTION_MENU_CUSTOM_BOOT "Custom Boot", #endif @@ -60,41 +61,27 @@ " +peloader\n" "NOTE: all letters must be lowercase, no spaces allowed."; -enum OptionMenuItems -{ - SAFE_MODE = 0, - SAFE_MODE_WITH_NETWORKING = 1, - SAFE_MODE_WITH_COMMAND_PROMPT = 2, - - SEPARATOR1 = 3, - - ENABLE_BOOT_LOGGING = 4, - ENABLE_VGA_MODE = 5, - LAST_KNOWN_GOOD_CONFIGURATION = 6, - DIRECTORY_SERVICES_RESTORE_MODE = 7, - DEBUGGING_MODE = 8, - FREELDR_DEBUGGING = 9, - - SEPARATOR2 = 10, - -#ifdef HAS_OPTION_MENU_CUSTOM_BOOT - CUSTOM_BOOT = 11, -#endif -#ifdef HAS_OPTION_MENU_REBOOT - REBOOT = 12, -#endif +// +// The boot options are mutually exclusive. +// +enum BootOption +{ + NO_OPTION = 0, + + SAFE_MODE, + SAFE_MODE_WITH_NETWORKING, + SAFE_MODE_WITH_COMMAND_PROMPT, + + LAST_KNOWN_GOOD_CONFIGURATION, + DIRECTORY_SERVICES_RESTORE_MODE, }; ULONG OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]); -BOOLEAN SafeMode = FALSE; -BOOLEAN SafeModeWithNetworking = FALSE; -BOOLEAN SafeModeWithCommandPrompt = FALSE; -BOOLEAN BootLogging = FALSE; -BOOLEAN VgaMode = FALSE; -BOOLEAN LastKnownGoodConfiguration = FALSE; -BOOLEAN DirectoryServicesRepairMode = FALSE; -BOOLEAN DebuggingMode = FALSE; +static enum BootOption BootOptionChoice = NO_OPTION; +static BOOLEAN BootLogging = FALSE; +static BOOLEAN VgaMode = FALSE; +static BOOLEAN DebuggingMode = FALSE; VOID DoOptionsMenu(VOID) { @@ -102,6 +89,7 @@ CHAR DebugChannelString[100]; if (!UiDisplayMenu("Select an option:", "", + TRUE, OptionsMenuList, OptionsMenuItemCount, 0, -1, @@ -118,77 +106,170 @@ switch (SelectedMenuItem) { - case SAFE_MODE: - SafeMode = TRUE; - BootLogging = TRUE; - break; - case SAFE_MODE_WITH_NETWORKING: - SafeModeWithNetworking = TRUE; - BootLogging = TRUE; - break; - case SAFE_MODE_WITH_COMMAND_PROMPT: - SafeModeWithCommandPrompt = TRUE; - BootLogging = TRUE; - break; - //case SEPARATOR1: - // break; - case ENABLE_BOOT_LOGGING: - BootLogging = TRUE; - break; - case ENABLE_VGA_MODE: - VgaMode = TRUE; - break; - case LAST_KNOWN_GOOD_CONFIGURATION: - LastKnownGoodConfiguration = TRUE; - break; - case DIRECTORY_SERVICES_RESTORE_MODE: - DirectoryServicesRepairMode = TRUE; - break; - case DEBUGGING_MODE: - DebuggingMode = TRUE; - break; - case FREELDR_DEBUGGING: - DebugChannelString[0]=0; - if (UiEditBox(FrldrDbgMsg, DebugChannelString, 100)) - DbgParseDebugChannels(DebugChannelString); - break; - //case SEPARATOR2: - // break; + case 0: // Safe Mode + BootOptionChoice = SAFE_MODE; + BootLogging = TRUE; + break; + case 1: // Safe Mode with Networking + BootOptionChoice = SAFE_MODE_WITH_NETWORKING; + BootLogging = TRUE; + break; + case 2: // Safe Mode with Command Prompt + BootOptionChoice = SAFE_MODE_WITH_COMMAND_PROMPT; + BootLogging = TRUE; + break; + // case 3: // Separator + // break; + case 4: // Enable Boot Logging + BootLogging = TRUE; + break; + case 5: // Enable VGA Mode + VgaMode = TRUE; + break; + case 6: // Last Known Good Configuration + BootOptionChoice = LAST_KNOWN_GOOD_CONFIGURATION; + break; + case 7: // Directory Services Restore Mode + BootOptionChoice = DIRECTORY_SERVICES_RESTORE_MODE; + break; + case 8: // Debugging Mode + DebuggingMode = TRUE; + break; + case 9: // FreeLdr debugging + DebugChannelString[0] = 0; + if (UiEditBox(FrldrDbgMsg, + DebugChannelString, + sizeof(DebugChannelString) / sizeof(DebugChannelString[0]))) + { + DbgParseDebugChannels(DebugChannelString); + } + break; + // case 10: // Separator + // break; + case 11: // Start ReactOS normally + // Reset all the parameters to their default values. + BootOptionChoice = NO_OPTION; + BootLogging = FALSE; + VgaMode = FALSE; + DebuggingMode = FALSE; + break; #ifdef HAS_OPTION_MENU_CUSTOM_BOOT - case CUSTOM_BOOT: - OptionMenuCustomBoot(); - break; + case 12: // Custom Boot + OptionMenuCustomBoot(); + break; #endif #ifdef HAS_OPTION_MENU_REBOOT - case REBOOT: - OptionMenuReboot(); - break; + case 13: // Reboot + OptionMenuReboot(); + break; #endif } } +VOID DisplayBootTimeOptions(VOID) +{ + CHAR BootOptions[260] = ""; + + switch (BootOptionChoice) + { + case SAFE_MODE: + strcat(BootOptions, OptionsMenuList[0]); + break; + + case SAFE_MODE_WITH_NETWORKING: + strcat(BootOptions, OptionsMenuList[1]); + break; + + case SAFE_MODE_WITH_COMMAND_PROMPT: + strcat(BootOptions, OptionsMenuList[2]); + break; + + case LAST_KNOWN_GOOD_CONFIGURATION: + strcat(BootOptions, OptionsMenuList[6]); + break; + + case DIRECTORY_SERVICES_RESTORE_MODE: + strcat(BootOptions, OptionsMenuList[7]); + break; + + default: + break; + } + + if (BootLogging) + { + if ( (BootOptionChoice != SAFE_MODE) && + (BootOptionChoice != SAFE_MODE_WITH_NETWORKING) && + (BootOptionChoice != SAFE_MODE_WITH_COMMAND_PROMPT) ) + { + if (BootOptionChoice != NO_OPTION) + { + strcat(BootOptions, ", "); + } + strcat(BootOptions, OptionsMenuList[4]); + } + } + + if (VgaMode) + { + if ((BootOptionChoice != NO_OPTION) || + BootLogging) + { + strcat(BootOptions, ", "); + } + strcat(BootOptions, OptionsMenuList[5]); + } + + if (DebuggingMode) + { + if ((BootOptionChoice != NO_OPTION) || + BootLogging || VgaMode) + { + strcat(BootOptions, ", "); + } + strcat(BootOptions, OptionsMenuList[8]); + } + + /* Display the chosen boot options */ + UiDrawText(0, + UiScreenHeight - 2, + BootOptions, + ATTR(COLOR_LIGHTBLUE, UiMenuBgColor)); +} + VOID AppendBootTimeOptions(PCHAR BootOptions) { - if (SafeMode) - strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); //FIXME: NOGUIBOOT should also be specified - - if (SafeModeWithNetworking) - strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); //FIXME: NOGUIBOOT should also be specified - - if (SafeModeWithCommandPrompt) - strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); //FIXME: NOGUIBOOT should also be specified + switch (BootOptionChoice) + { + case SAFE_MODE: + strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); //FIXME: NOGUIBOOT should also be specified + break; + + case SAFE_MODE_WITH_NETWORKING: + strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); //FIXME: NOGUIBOOT should also be specified + break; + + case SAFE_MODE_WITH_COMMAND_PROMPT: + strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); //FIXME: NOGUIBOOT should also be specified + break; + + case LAST_KNOWN_GOOD_CONFIGURATION: + DbgPrint("Last known good configuration is not supported yet!\n"); + break; + + case DIRECTORY_SERVICES_RESTORE_MODE: + strcat(BootOptions, " /SAFEBOOT:DSREPAIR /SOS"); + break; + + default: + break; + } if (BootLogging) strcat(BootOptions, " /BOOTLOG"); if (VgaMode) strcat(BootOptions, " /BASEVIDEO"); - - if (LastKnownGoodConfiguration) - DbgPrint("Last known good configuration is not supported yet!\n"); - - if (DirectoryServicesRepairMode) - strcat(BootOptions, " /SAFEBOOT:DSREPAIR /SOS"); if (DebuggingMode) strcat(BootOptions, " /DEBUG"); Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -384,6 +384,12 @@ { UiDrawMenuItem(MenuInfo, i); } + + /* Display the boot options if needed */ + if (MenuInfo->ShowBootOptions) + { + DisplayBootTimeOptions(); + } } ULONG @@ -502,6 +508,7 @@ BOOLEAN UiDisplayMenu(IN PCSTR MenuHeader, IN PCSTR MenuFooter, + IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, @@ -526,6 +533,7 @@ /* Setup the MENU_INFO structure */ MenuInformation.MenuHeader = MenuHeader; MenuInformation.MenuFooter = MenuFooter; + MenuInformation.ShowBootOptions = ShowBootOptions; MenuInformation.MenuItemList = MenuItemList; MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -123,6 +123,14 @@ TuiDrawMenuItem(MenuInfo, i); } + // + // Display the boot options if needed + // + if (MenuInfo->ShowBootOptions) + { + DisplayBootTimeOptions(); + } + VideoCopyOffScreenBufferToVRAM(); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/noui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/no… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/noui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/noui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -109,7 +109,7 @@ // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) { *SelectedMenuItem = DefaultMenuItem; return TRUE; Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -128,7 +128,7 @@ // // Draw title text // - TuiDrawText( (UiScreenWidth / 2) - ((ULONG)strlen(UiTitleBoxTitleText) / 2), + TuiDrawText( (UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, 2, UiTitleBoxTitleText, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -16,6 +16,7 @@ BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, + BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, @@ -45,6 +46,7 @@ // MenuInformation.MenuHeader = MenuHeader; MenuInformation.MenuFooter = MenuFooter; + MenuInformation.ShowBootOptions = ShowBootOptions; MenuInformation.MenuItemList = MenuItemList; MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; @@ -223,6 +225,12 @@ for (i = 0; i < MenuInfo->MenuItemCount; i++) { TuiDrawMenuItem(MenuInfo, i); + } + + /* Display the boot options if needed */ + if (MenuInfo->ShowBootOptions) + { + DisplayBootTimeOptions(); } VideoCopyOffScreenBufferToVRAM(); Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Wed Dec 26 01:40:18 2012 @@ -442,9 +442,9 @@ } } -BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) -{ - return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter); +BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, BOOLEAN ShowBootOptions, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +{ + return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, ShowBootOptions, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter); } VOID UiFadeInBackdrop(VOID)

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