Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 58007: [FONTVIEW] - Lee Schroeder: Replaces the current fontview icon with the icon found in the tango icon set (apps/preferences-desktop-font.png). This creates better consistency since...
by fireball＠svn.reactos.org 25 Dec '12

25 Dec '12

Author: fireball Date: Tue Dec 25 18:11:55 2012 New Revision: 58007 URL: http://svn.reactos.org/svn/reactos?rev=58007&view=rev Log: [FONTVIEW] - Lee Schroeder: Replaces the current fontview icon with the icon found in the tango icon set (apps/preferences-desktop-font.png). This creates better consistency since that is where the majority of the icons come from. CORE-6827 #resolve Modified: trunk/reactos/base/applications/fontview/ttf.ico Modified: trunk/reactos/base/applications/fontview/ttf.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== Binary files - no diff available.

1 0

[hbelusca] 58006: [FREELDR] Remove commented-out code (since the new one works) - ThFabba: :P
by hbelusca＠svn.reactos.org 25 Dec '12

25 Dec '12

Author: hbelusca Date: Tue Dec 25 13:24:56 2012 New Revision: 58006 URL: http://svn.reactos.org/svn/reactos?rev=58006&view=rev Log: [FREELDR] Remove commented-out code (since the new one works) - ThFabba: :P Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Tue Dec 25 13:24:56 2012 @@ -909,7 +909,7 @@ } else { - VideoMode = (USHORT)strtoul(DisplayModeName, NULL, 0); // atoi(DisplayModeName); + VideoMode = (USHORT)strtoul(DisplayModeName, NULL, 0); } }

1 0

[hbelusca] 58005: [FREELDR] Allow VideoMode to be set via decimal, hexadecimal, ... number representation in bootcd/livecd/freeldr.ini (see the Brian Palmer's FREELDR.INI example).
by hbelusca＠svn.reactos.org 25 Dec '12

25 Dec '12

Author: hbelusca Date: Tue Dec 25 12:54:31 2012 New Revision: 58005 URL: http://svn.reactos.org/svn/reactos?rev=58005&view=rev Log: [FREELDR] Allow VideoMode to be set via decimal, hexadecimal, ... number representation in bootcd/livecd/freeldr.ini (see the Brian Palmer's FREELDR.INI example). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Tue Dec 25 12:54:31 2012 @@ -909,7 +909,7 @@ } else { - VideoMode = atoi(DisplayModeName); + VideoMode = (USHORT)strtoul(DisplayModeName, NULL, 0); // atoi(DisplayModeName); } }

1 0

[ekohl] 58004: [NETAPI32] - Implement NetLocalGreoupGetInfo. - Move shared code into separate functions.
by ekohl＠svn.reactos.org 25 Dec '12

25 Dec '12

Author: ekohl Date: Tue Dec 25 09:54:53 2012 New Revision: 58004 URL: http://svn.reactos.org/svn/reactos?rev=58004&view=rev Log: [NETAPI32] - Implement NetLocalGreoupGetInfo. - Move shared code into separate functions. 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] Tue Dec 25 09:54:53 2012 @@ -57,6 +57,109 @@ } ENUM_CONTEXT, *PENUM_CONTEXT; +static +NET_API_STATUS +BuildAliasInfoBuffer(PALIAS_GENERAL_INFORMATION AliasInfo, + DWORD level, + LPVOID *Buffer) +{ + LPVOID LocalBuffer = NULL; + PLOCALGROUP_INFO_0 LocalInfo0; + PLOCALGROUP_INFO_1 LocalInfo1; + LPWSTR Ptr; + ULONG Size = 0; + NET_API_STATUS ApiStatus = NERR_Success; + + *Buffer = NULL; + + switch (level) + { + case 0: + Size = sizeof(LOCALGROUP_INFO_0) + + AliasInfo->Name.Length + sizeof(WCHAR); + break; + + case 1: + Size = sizeof(LOCALGROUP_INFO_1) + + AliasInfo->Name.Length + sizeof(WCHAR) + + AliasInfo->AdminComment.Length + sizeof(WCHAR); + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + + ApiStatus = NetApiBufferAllocate(Size, &LocalBuffer); + if (ApiStatus != NERR_Success) + goto done; + + ZeroMemory(LocalBuffer, Size); + + switch (level) + { + case 0: + LocalInfo0 = (PLOCALGROUP_INFO_0)LocalBuffer; + + Ptr = (LPWSTR)LocalInfo0++; + LocalInfo0->lgrpi0_name = Ptr; + + memcpy(LocalInfo0->lgrpi0_name, + AliasInfo->Name.Buffer, + AliasInfo->Name.Length); + LocalInfo0->lgrpi0_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + + case 1: + LocalInfo1 = (PLOCALGROUP_INFO_1)LocalBuffer; + + Ptr = (LPWSTR)((ULONG_PTR)LocalInfo1 + sizeof(LOCALGROUP_INFO_1)); + LocalInfo1->lgrpi1_name = Ptr; + + memcpy(LocalInfo1->lgrpi1_name, + AliasInfo->Name.Buffer, + AliasInfo->Name.Length); + LocalInfo1->lgrpi1_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + AliasInfo->Name.Length + sizeof(WCHAR)); + LocalInfo1->lgrpi1_comment = Ptr; + + memcpy(LocalInfo1->lgrpi1_comment, + AliasInfo->AdminComment.Buffer, + AliasInfo->AdminComment.Length); + LocalInfo1->lgrpi1_comment[AliasInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; + break; + } + +done: + if (ApiStatus == NERR_Success) + { + *Buffer = LocalBuffer; + } + else + { + if (LocalBuffer != NULL) + NetApiBufferFree(LocalBuffer); + } + + return ApiStatus; +} + + +static +VOID +FreeAliasInfo(PALIAS_GENERAL_INFORMATION AliasInfo) +{ + if (AliasInfo->Name.Buffer != NULL) + SamFreeMemory(AliasInfo->Name.Buffer); + + if (AliasInfo->AdminComment.Buffer != NULL) + SamFreeMemory(AliasInfo->AdminComment.Buffer); + + SamFreeMemory(AliasInfo); +} + + /************************************************************ * NetLocalGroupAdd (NETAPI32.@) */ @@ -154,11 +257,7 @@ PSAM_RID_ENUMERATION CurrentAlias; PENUM_CONTEXT EnumContext = NULL; PSID DomainSid = NULL; - PLOCALGROUP_INFO_0 LocalInfo0; - PLOCALGROUP_INFO_1 LocalInfo1; - LPWSTR Ptr; ULONG i; - ULONG Size; SAM_HANDLE AliasHandle = NULL; PALIAS_GENERAL_INFORMATION AliasInfo = NULL; LPVOID Buffer = NULL; @@ -325,72 +424,15 @@ TRACE("Name: %S\n", AliasInfo->Name.Buffer); TRACE("Comment: %S\n", AliasInfo->AdminComment.Buffer); - switch (level) - { - case 0: - Size = sizeof(LOCALGROUP_INFO_0) + - AliasInfo->Name.Length + sizeof(WCHAR); - break; - - case 1: - Size = sizeof(LOCALGROUP_INFO_1) + - AliasInfo->Name.Length + sizeof(WCHAR) + - AliasInfo->AdminComment.Length + sizeof(WCHAR); - break; - - default: - ApiStatus = ERROR_INVALID_LEVEL; - goto done; - } - - ApiStatus = NetApiBufferAllocate(Size, &Buffer); + ApiStatus = BuildAliasInfoBuffer(AliasInfo, + level, + &Buffer); if (ApiStatus != NERR_Success) goto done; - switch (level) - { - case 0: - LocalInfo0 = (PLOCALGROUP_INFO_0)Buffer; - - Ptr = (LPWSTR)LocalInfo0++; - LocalInfo0->lgrpi0_name = Ptr; - - memcpy(LocalInfo0->lgrpi0_name, - AliasInfo->Name.Buffer, - AliasInfo->Name.Length); - LocalInfo0->lgrpi0_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; - break; - - case 1: - LocalInfo1 = (PLOCALGROUP_INFO_1)Buffer; - - Ptr = (LPWSTR)((ULONG_PTR)LocalInfo1 + sizeof(LOCALGROUP_INFO_1)); - LocalInfo1->lgrpi1_name = Ptr; - - memcpy(LocalInfo1->lgrpi1_name, - AliasInfo->Name.Buffer, - AliasInfo->Name.Length); - LocalInfo1->lgrpi1_name[AliasInfo->Name.Length / sizeof(WCHAR)] = UNICODE_NULL; - - Ptr = (LPWSTR)((ULONG_PTR)Ptr + AliasInfo->Name.Length + sizeof(WCHAR)); - LocalInfo1->lgrpi1_comment = Ptr; - - memcpy(LocalInfo1->lgrpi1_comment, - AliasInfo->AdminComment.Buffer, - AliasInfo->AdminComment.Length); - LocalInfo1->lgrpi1_comment[AliasInfo->AdminComment.Length / sizeof(WCHAR)] = UNICODE_NULL; - break; - } - if (AliasInfo != NULL) { - if (AliasInfo->Name.Buffer != NULL) - SamFreeMemory(AliasInfo->Name.Buffer); - - if (AliasInfo->AdminComment.Buffer != NULL) - SamFreeMemory(AliasInfo->AdminComment.Buffer); - - SamFreeMemory(AliasInfo); + FreeAliasInfo(AliasInfo); AliasInfo = NULL; } @@ -439,15 +481,7 @@ SamCloseHandle(AliasHandle); if (AliasInfo != NULL) - { - if (AliasInfo->Name.Buffer != NULL) - SamFreeMemory(AliasInfo->Name.Buffer); - - if (AliasInfo->AdminComment.Buffer != NULL) - SamFreeMemory(AliasInfo->AdminComment.Buffer); - - SamFreeMemory(AliasInfo); - } + FreeAliasInfo(AliasInfo); if (resumehandle != NULL) *resumehandle = (DWORD_PTR)EnumContext; @@ -459,19 +493,208 @@ return ApiStatus; } -/************************************************************ - * NetLocalGroupGetInfo (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetLocalGroupGetInfo( + +/************************************************************ + * NetLocalGroupGetInfo (NETAPI32.@) + */ +NET_API_STATUS +WINAPI +NetLocalGroupGetInfo( LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE* bufptr) { + UNICODE_STRING ServerName; + UNICODE_STRING GroupName; + SAM_HANDLE ServerHandle = NULL; + 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), debugstr_w(groupname), level, bufptr); - return NERR_Success; -} + + if (servername != NULL) + RtlInitUnicodeString(&ServerName, servername); + + RtlInitUnicodeString(&GroupName, groupname); + + /* 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; + } + + /* 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; + } + } + + 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, + &DomainSid); + 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); + ApiStatus = NetpNtStatusToApiStatus(Status); + 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); + goto done; + } + } + + Status = SamQueryInformationAlias(AliasHandle, + AliasGeneralInformation, + (PVOID *)&AliasInfo); + if (!NT_SUCCESS(Status)) + { + ERR("SamQueryInformationAlias failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + ApiStatus = BuildAliasInfoBuffer(AliasInfo, + level, + &Buffer); + if (ApiStatus != NERR_Success) + goto done; + +done: + if (AliasInfo != NULL) + FreeAliasInfo(AliasInfo); + + if (AliasHandle != NULL) + SamCloseHandle(AliasHandle); + + if (RelativeIds != NULL) + SamFreeMemory(RelativeIds); + + if (Use != NULL) + SamFreeMemory(Use); + + if (DomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, DomainSid); + + if (DomainHandle != NULL) + SamCloseHandle(DomainHandle); + + if (ServerHandle != NULL) + SamCloseHandle(ServerHandle); + + *bufptr = (LPBYTE)Buffer; + + return NERR_Success; +} + /************************************************************ * NetLocalGroupGetMembers (NETAPI32.@)

1 0

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

25 Dec '12

Author: hbelusca Date: Tue Dec 25 00:54:20 2012 New Revision: 58003 URL: http://svn.reactos.org/svn/reactos?rev=58003&view=rev Log: [FREELDR] Code formatting only Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/windows/winldr.c 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] Tue Dec 25 00:54:20 2012 @@ -20,4 +20,4 @@ #pragma once VOID DoOptionsMenu(VOID); -VOID AppendBootTimeOptions(PCHAR BootOptions); +VOID AppendBootTimeOptions(PCHAR BootOptions); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Tue Dec 25 00:54:20 2012 @@ -540,7 +540,7 @@ AllocateAndInitLPB(&LoaderBlock); #ifdef _M_IX86 - /* Setup redirection support */ + /* Setup redirection support */ WinLdrSetupEms(BootOptions); #endif

1 0

[hbelusca] 58002: [FREELDR] Use NULL string pointers as separators instead of a special "SEPARATOR" string.
by hbelusca＠svn.reactos.org 25 Dec '12

25 Dec '12

Author: hbelusca Date: Tue Dec 25 00:53:23 2012 New Revision: 58002 URL: http://svn.reactos.org/svn/reactos?rev=58002&view=rev Log: [FREELDR] Use NULL string pointers as separators instead of a special "SEPARATOR" string. Modified: trunk/reactos/boot/freeldr/freeldr/options.c trunk/reactos/boot/freeldr/freeldr/ui/directui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c 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] Tue Dec 25 00:53:23 2012 @@ -26,7 +26,7 @@ "Safe Mode with Networking", "Safe Mode with Command Prompt", - "SEPARATOR", + NULL, "Enable Boot Logging", "Enable VGA Mode", @@ -35,7 +35,7 @@ "Debugging Mode", "FreeLdr debugging", - "SEPARATOR", + NULL, #ifdef HAS_OPTION_MENU_CUSTOM_BOOT "Custom Boot", 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] Tue Dec 25 00:53:23 2012 @@ -297,7 +297,7 @@ for (i = 0; i < MenuInfo->MenuItemCount; i++) { /* Check if it's a separator */ - if (!(_stricmp(MenuInfo->MenuItemList[i], "SEPARATOR"))) + if (MenuInfo->MenuItemList[i] == NULL) { /* Draw the separator line */ UiDrawText(MenuInfo->Left, @@ -325,10 +325,11 @@ strcat(MenuLineText, " "); /* Now append the text string */ - strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); + if (MenuInfo->MenuItemList[MenuItemNumber]) + strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); /* If it is a separator */ - if (!(_stricmp(MenuInfo->MenuItemList[MenuItemNumber], "SEPARATOR"))) + if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { /* Make it a separator line and use menu colors */ memset(MenuLineText, 0, 80); @@ -436,7 +437,7 @@ /* Skip past any separators */ if ((Selected) && - !(_stricmp(MenuInfo->MenuItemList[Selected], "SEPARATOR"))) + (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem--; } @@ -450,7 +451,7 @@ /* Skip past any separators */ if ((Selected < Count) && - !(_stricmp(MenuInfo->MenuItemList[Selected], "SEPARATOR"))) + (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem++; } @@ -479,8 +480,11 @@ for (i = 0; i < MenuInfo->MenuItemCount; i++) { /* Get the string length and make it become the new width if necessary */ - Length = strlen(MenuInfo->MenuItemList[i]); - if (Length > Width) Width = Length; + if (MenuInfo->MenuItemList[i]) + { + Length = (ULONG)strlen(MenuInfo->MenuItemList[i]); + if (Length > Width) Width = Length; + } } /* Allow room for left & right borders, plus 8 spaces on each side */ 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] Tue Dec 25 00:53:23 2012 @@ -157,8 +157,11 @@ // // Get the string length and make it become the new width if necessary // - Length = (ULONG)strlen(MenuInfo->MenuItemList[i]); - if (Length > Width) Width = Length; + if (MenuInfo->MenuItemList[i]) + { + Length = (ULONG)strlen(MenuInfo->MenuItemList[i]); + if (Length > Width) Width = Length; + } } // @@ -334,7 +337,7 @@ // // Check if it's a separator // - if (!(_stricmp(MenuInfo->MenuItemList[i], "SEPARATOR"))) + if (MenuInfo->MenuItemList[i] == NULL) { // // Draw the separator line @@ -373,7 +376,8 @@ // how many spaces will be to the left and right // SpaceTotal = (MenuInfo->Right - MenuInfo->Left - 2) - - (ULONG)strlen(MenuInfo->MenuItemList[MenuItemNumber]); + (ULONG)(MenuInfo->MenuItemList[MenuItemNumber] ? + strlen(MenuInfo->MenuItemList[MenuItemNumber]) : 0); SpaceLeft = (SpaceTotal / 2) + 1; SpaceRight = (SpaceTotal - SpaceLeft) + 1; @@ -395,7 +399,8 @@ // // Now append the text string // - strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); + if (MenuInfo->MenuItemList[MenuItemNumber]) + strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); // // Check if using centered menu, and add spaces on the right if so @@ -405,7 +410,7 @@ // // If it is a separator // - if (!(_stricmp(MenuInfo->MenuItemList[MenuItemNumber], "SEPARATOR"))) + if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { // // Make it a separator line and use menu colors @@ -504,7 +509,7 @@ // Skip past any separators if ((Selected) && - !(_stricmp(MenuInfo->MenuItemList[Selected], "SEPARATOR"))) + (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem--; } @@ -520,7 +525,7 @@ // Skip past any separators if ((Selected < Count) && - !(_stricmp(MenuInfo->MenuItemList[Selected], "SEPARATOR"))) + (MenuInfo->MenuItemList[Selected] == NULL)) { MenuInfo->SelectedMenuItem++; }

1 0

[hbelusca] 58001: [FREELDR] - Menu titles --> Menu headers (see r57842). - In the same way we introduced menu headers, introduce menu footers, therefore we add the possibility, in mini-tui, of show...
by hbelusca＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: hbelusca Date: Mon Dec 24 23:03:11 2012 New Revision: 58001 URL: http://svn.reactos.org/svn/reactos?rev=58001&view=rev Log: [FREELDR] - Menu titles --> Menu headers (see r57842). - In the same way we introduced menu headers, introduce menu footers, therefore we add the possibility, in mini-tui, of showing or hiding the "For troubleshooting and advanced startup options for ReactOS, press F8." message, only useful for the main menu (the one which shows the list of available OSes installed on the system). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/custom.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c 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/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] Mon Dec 24 23:03:11 2012 @@ -43,7 +43,7 @@ ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; - if (!UiDisplayMenu("Please choose a boot method:", + if (!UiDisplayMenu("Please choose a boot method:", "", 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] Mon Dec 24 23:03:11 2012 @@ -266,12 +266,13 @@ for (;;) { - // Redraw the backdrop UiDrawBackdrop(); // Show the operating system list menu if (!UiDisplayMenu("Please select the operating system to start:", + "For troubleshooting and advanced startup options for " + "ReactOS, press F8.", OperatingSystemDisplayNames, OperatingSystemCount, DefaultOperatingSystem, 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] Mon Dec 24 23:03:11 2012 @@ -87,12 +87,25 @@ // /////////////////////////////////////////////////////////////////////////////////////// -struct tagUI_MENU_INFO; -typedef struct tagUI_MENU_INFO UI_MENU_INFO, *PUI_MENU_INFO; +typedef struct tagUI_MENU_INFO +{ + PCSTR MenuHeader; + PCSTR MenuFooter; + + PCSTR *MenuItemList; + ULONG MenuItemCount; + LONG MenuTimeRemaining; + ULONG SelectedMenuItem; + + ULONG Left; + ULONG Top; + ULONG Right; + ULONG Bottom; +} UI_MENU_INFO, *PUI_MENU_INFO; typedef BOOLEAN (*UiMenuKeyPressFilterCallback)(ULONG KeyPress); -BOOLEAN UiDisplayMenu(PCSTR MenuTitle, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN UiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); /////////////////////////////////////////////////////////////////////////////////////// // @@ -122,7 +135,7 @@ VOID (*FadeInBackdrop)(VOID); VOID (*FadeOut)(VOID); - BOOLEAN (*DisplayMenu)(PCSTR MenuTitle, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); + BOOLEAN (*DisplayMenu)(PCSTR MenuHeader, PCSTR MenuFooter, 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] Mon Dec 24 23:03:11 2012 @@ -48,6 +48,6 @@ // Menu Functions // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN GuiDisplayMenu(PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem); +BOOLEAN GuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, 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] Mon Dec 24 23:03:11 2012 @@ -41,5 +41,5 @@ // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuTitle, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, 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] Mon Dec 24 23:03:11 2012 @@ -58,27 +58,12 @@ // /////////////////////////////////////////////////////////////////////////////////////// -struct tagUI_MENU_INFO -{ - PCSTR MenuTitle; - - PCSTR *MenuItemList; - ULONG MenuItemCount; - LONG MenuTimeRemaining; - ULONG SelectedMenuItem; - - ULONG Left; - ULONG Top; - ULONG Right; - ULONG Bottom; -}; - VOID NTAPI TuiCalcMenuBoxSize(PUI_MENU_INFO MenuInfo); VOID TuiDrawMenu(PUI_MENU_INFO MenuInfo); 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 MenuTitle, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter); +BOOLEAN TuiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, 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] Mon Dec 24 23:03:11 2012 @@ -101,7 +101,7 @@ ULONG SelectedMenuItem; CHAR DebugChannelString[100]; - if (!UiDisplayMenu("Select an option:", + if (!UiDisplayMenu("Select an option:", "", OptionsMenuList, OptionsMenuItemCount, 0, -1, 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] Mon Dec 24 23:03:11 2012 @@ -353,13 +353,13 @@ { ULONG i; - /* No GUI status bar text, just minimal text. first to tell the user to choose */ + /* No GUI status bar text, just minimal text. Show the menu header. */ UiDrawText(0, MenuInfo->Top - 2, - MenuInfo->MenuTitle, + MenuInfo->MenuHeader, ATTR(UiMenuFgColor, UiMenuBgColor)); - /* Now tell him how to choose */ + /* Now tell the user how to choose */ UiDrawText(0, MenuInfo->Bottom + 1, "Use \x18 and \x19 to move the highlight to your choice.", @@ -369,11 +369,10 @@ "Press ENTER to choose.", ATTR(UiMenuFgColor, UiMenuBgColor)); - /* And offer F8 options */ + /* And show the menu footer */ UiDrawText(0, UiScreenHeight - 4, - "For troubleshooting and advanced startup options for " - "ReactOS, press F8.", + MenuInfo->MenuFooter, ATTR(UiMenuFgColor, UiMenuBgColor)); /* Draw the menu box */ @@ -497,7 +496,8 @@ } BOOLEAN -UiDisplayMenu(IN PCSTR MenuTitle, +UiDisplayMenu(IN PCSTR MenuHeader, + IN PCSTR MenuFooter, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, @@ -520,7 +520,8 @@ } /* Setup the MENU_INFO structure */ - MenuInformation.MenuTitle = MenuTitle; + MenuInformation.MenuHeader = MenuHeader; + MenuInformation.MenuFooter = MenuFooter; 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] Mon Dec 24 23:03:11 2012 @@ -83,16 +83,15 @@ UiDrawBackdrop(); // - // No GUI status bar text, just minimal text. first to tell the user to - // choose. + // No GUI status bar text, just minimal text. Show the menu header. // UiVtbl.DrawText(0, MenuInfo->Top - 2, - MenuInfo->MenuTitle, + MenuInfo->MenuHeader, ATTR(UiMenuFgColor, UiMenuBgColor)); // - // Now tell him how to choose + // Now tell the user how to choose // UiVtbl.DrawText(0, MenuInfo->Bottom + 1, @@ -104,12 +103,11 @@ ATTR(UiMenuFgColor, UiMenuBgColor)); // - // And offer F8 options + // And show the menu footer // UiVtbl.DrawText(0, UiScreenHeight - 4, - "For troubleshooting and advanced startup options for " - "ReactOS, press F8.", + MenuInfo->MenuFooter, ATTR(UiMenuFgColor, UiMenuBgColor)); // 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] Mon Dec 24 23:03:11 2012 @@ -109,7 +109,7 @@ // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN NoUiDisplayMenu(PCSTR MenuTitle, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) +BOOLEAN NoUiDisplayMenu(PCSTR MenuHeader, PCSTR MenuFooter, 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/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] Mon Dec 24 23:03:11 2012 @@ -14,7 +14,8 @@ /* FUNCTIONS *****************************************************************/ BOOLEAN -TuiDisplayMenu(PCSTR MenuTitle, +TuiDisplayMenu(PCSTR MenuHeader, + PCSTR MenuFooter, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, @@ -42,7 +43,8 @@ // // Setup the MENU_INFO structure // - MenuInformation.MenuTitle = MenuTitle; + MenuInformation.MenuHeader = MenuHeader; + MenuInformation.MenuFooter = MenuFooter; MenuInformation.MenuItemList = MenuItemList; MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; 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] Mon Dec 24 23:03:11 2012 @@ -442,9 +442,9 @@ } } -BOOLEAN UiDisplayMenu(PCSTR MenuTitle, PCSTR MenuItemList[], ULONG MenuItemCount, ULONG DefaultMenuItem, LONG MenuTimeOut, ULONG* SelectedMenuItem, BOOLEAN CanEscape, UiMenuKeyPressFilterCallback KeyPressFilter) -{ - return UiVtbl.DisplayMenu(MenuTitle, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter); +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); } VOID UiFadeInBackdrop(VOID)

1 0

[hbelusca] 58000: [WIN32K] Add some spacing (not too much) between the screen borders and the "Safe Mode" and the ReactOS version string labels, in Safe Mode.
by hbelusca＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: hbelusca Date: Mon Dec 24 17:34:13 2012 New Revision: 58000 URL: http://svn.reactos.org/svn/reactos?rev=58000&view=rev Log: [WIN32K] Add some spacing (not too much) between the screen borders and the "Safe Mode" and the ReactOS version string labels, in Safe Mode. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Mon Dec 24 17:34:13 2012 @@ -973,7 +973,7 @@ } else { - /* Find the upper left corner, can be negtive if the bitmap is bigger then the screen */ + /* Find the upper left corner, can be negative if the bitmap is bigger then the screen */ x = (sz.cx / 2) - (gspv.cxWallpaper / 2); y = (sz.cy / 2) - (gspv.cyWallpaper / 2); } @@ -987,14 +987,14 @@ if (x > 0 || y > 0) { /* FIXME: Clip out the bitmap - can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" - once we support DSTINVERT */ + can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" + once we support DSTINVERT */ PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); NtGdiSelectBrush(hDC, PreviousBrush); } - /*Do not fill the background after it is painted no matter the size of the picture */ + /* Do not fill the background after it is painted no matter the size of the picture */ doPatBlt = FALSE; hOldBitmap = NtGdiSelectBitmap(hWallpaperDC, gspv.hbmWallpaper); @@ -1003,17 +1003,17 @@ { if(Rect.right && Rect.bottom) NtGdiStretchBlt(hDC, - x, - y, - sz.cx, - sz.cy, - hWallpaperDC, - 0, - 0, - gspv.cxWallpaper, - gspv.cyWallpaper, - SRCCOPY, - 0); + x, + y, + sz.cx, + sz.cy, + hWallpaperDC, + 0, + 0, + gspv.cxWallpaper, + gspv.cyWallpaper, + SRCCOPY, + 0); } else if (gspv.WallpaperMode == wmTile) @@ -1073,7 +1073,7 @@ * Display system version on the desktop background */ - if (g_PaintDesktopVersion||UserGetSystemMetrics(SM_CLEANBOOT)) + if (g_PaintDesktopVersion || UserGetSystemMetrics(SM_CLEANBOOT)) { static WCHAR s_wszVersion[256] = {0}; RECTL rect; @@ -1101,24 +1101,26 @@ if(!UserGetSystemMetrics(SM_CLEANBOOT)) { - GreExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); + GreExtTextOutW(hDC, rect.right - 16, rect.bottom - 48, 0, NULL, s_wszVersion, len, NULL, 0); } else { /* Safe Mode */ + /* Version information text in top center */ - IntGdiSetTextAlign(hDC, TA_CENTER|TA_TOP); - GreExtTextOutW(hDC, (rect.right+rect.left)/2, rect.top, 0, NULL, s_wszVersion, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_CENTER | TA_TOP); + GreExtTextOutW(hDC, (rect.right + rect.left)/2, rect.top + 3, 0, NULL, s_wszVersion, len, NULL, 0); + /* Safe Mode text in corners */ len = wcslen(s_wszSafeMode); - IntGdiSetTextAlign(hDC, TA_RIGHT|TA_TOP); - GreExtTextOutW(hDC, rect.right, rect.top, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_RIGHT|TA_BASELINE); - GreExtTextOutW(hDC, rect.right, rect.bottom, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_LEFT|TA_TOP); - GreExtTextOutW(hDC, rect.left, rect.top, 0, NULL, s_wszSafeMode, len, NULL, 0); - IntGdiSetTextAlign(hDC, TA_LEFT|TA_BASELINE); - GreExtTextOutW(hDC, rect.left, rect.bottom, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_TOP); + GreExtTextOutW(hDC, rect.left, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_TOP); + GreExtTextOutW(hDC, rect.right, rect.top + 3, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_LEFT | TA_BASELINE); + GreExtTextOutW(hDC, rect.left, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); + IntGdiSetTextAlign(hDC, TA_RIGHT | TA_BASELINE); + GreExtTextOutW(hDC, rect.right, rect.bottom - 5, 0, NULL, s_wszSafeMode, len, NULL, 0); } IntGdiSetBkMode(hDC, mode_old);

1 0

[hbelusca] 57999: [USETUP/BOOTDATA/FONTS] Adjust fonts substitutions. [WIN32K] Adjust system stock fonts.
by hbelusca＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: hbelusca Date: Mon Dec 24 17:31:30 2012 New Revision: 57999 URL: http://svn.reactos.org/svn/reactos?rev=57999&view=rev Log: [USETUP/BOOTDATA/FONTS] Adjust fonts substitutions. [WIN32K] Adjust system stock fonts. Modified: trunk/reactos/base/setup/usetup/muifonts.h trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/livecd.inf trunk/reactos/media/inf/font.inf trunk/reactos/win32ss/gdi/ntgdi/stockobj.c Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -7,12 +7,15 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Tahoma" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Helv", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } }; @@ -21,12 +24,15 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Tahoma" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"Tahoma" }, + { L"Helvetica", L"Liberation Sans" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, - { L"Helv", L"Tahoma" }, + { L"Tahoma", L"Tahoma" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } }; @@ -35,26 +41,32 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"DejaVu Sans" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"Liberation Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } }; MUI_SUBFONT HebrewFonts[] = { - { L"Arial", L"DejaVu Sans" }, + { L"Arial", L"DejaVu Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"DejaVu Serif" }, - { L"Tahoma", L"DejaVu Sans" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"DejaVu Serif" }, { NULL, NULL } }; @@ -63,27 +75,33 @@ { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, - { L"Times New Roman", L"Liberation Serif" }, - { L"Tahoma", L"Droid Sans Fallback" }, - { L"MS Sans Serif", L"Tahoma" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"Droid Sans Fallback" }, + { L"Helvetica", L"Liberation Sans" }, + { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, - { L"Helv", L"Tahoma" }, + { L"Tahoma", L"Droid Sans Fallback" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"Liberation Serif" }, { NULL, NULL } }; MUI_SUBFONT UnicodeFonts[] = { - { L"Arial", L"DejaVu Sans" }, + { L"Arial", L"DejaVu Sans" }, { L"Courier", L"DejaVu Sans Mono" }, { L"Courier New", L"DejaVu Sans Mono" }, - { L"Times New Roman", L"DejaVu Serif" }, - { L"Tahoma", L"DejaVu Sans" }, + { L"Fixedsys", L"Fixedsys Excelsior 3.01" }, + { L"Helv", L"DejaVu Sans" }, + { L"Helvetica", L"DejaVu Sans" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, - { L"Helv", L"DejaVu Sans" }, + { L"Tahoma", L"DejaVu Sans" }, + { L"Terminal", L"DejaVu Sans Mono" }, + { L"Times New Roman", L"DejaVu Serif" }, { NULL, NULL } }; Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -122,6 +122,7 @@ ; Font substitutes ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes",,0x00000012 ; Time zone settings Modified: trunk/reactos/boot/bootdata/livecd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -43,11 +43,14 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"FreeMono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helvetica",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" ; FIXME: Registration Modified: trunk/reactos/media/inf/font.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/font.inf?rev=579… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/stockobj… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] Mon Dec 24 17:31:30 2012 @@ -62,40 +62,39 @@ { PS_NULL, { 0, 0 }, 0 }; static LOGFONTW OEMFixedFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" - }; // Bitstream Vera Sans Mono + { 12, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Terminal" + }; static LOGFONTW AnsiFixedFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" - }; // Bitstream Vera Sans Mono + { 14, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, /*CLIP_DEFAULT_PRECIS*/ CLIP_STROKE_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Courier" + }; static LOGFONTW AnsiVarFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" + OUT_DEFAULT_PRECIS, /*CLIP_DEFAULT_PRECIS*/ CLIP_STROKE_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"MS Sans Serif" }; static LOGFONTW SystemFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" - }; // Bitstream Vera Sans + { 12, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"System" + }; static LOGFONTW DeviceDefaultFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" - }; // Bitstream Vera Sans + { 12, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | VARIABLE_PITCH, L"System" + }; static LOGFONTW SystemFixedFont = - { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" - }; // Bitstream Vera Sans Mono - -/* FIXME: Is this correct? */ + { 16, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE | FIXED_PITCH, L"Fixedsys" + }; + static LOGFONTW DefaultGuiFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" - }; // Bitstream Vera Sans + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, /*DEFAULT_QUALITY*/ PROOF_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Shell Dlg" + }; HGDIOBJ StockObjects[NB_STOCK_OBJECTS];

1 0

[hbelusca] 57998: [FONTS] Add a suitable 'Fixedsys' TTF Unicode font, called 'Fixedsys Excelsior v3.01'. Released into the Public Domain. By Darien Gavin Valentine, http://www.fixedsysexcelsior.com/
by hbelusca＠svn.reactos.org 24 Dec '12

24 Dec '12

Author: hbelusca Date: Mon Dec 24 17:27:04 2012 New Revision: 57998 URL: http://svn.reactos.org/svn/reactos?rev=57998&view=rev Log: [FONTS] Add a suitable 'Fixedsys' TTF Unicode font, called 'Fixedsys Excelsior v3.01'. Released into the Public Domain. By Darien Gavin Valentine, http://www.fixedsysexcelsior.com/ Added: trunk/reactos/media/fonts/FSEX301-L2.ttf (with props) trunk/reactos/media/fonts/FSEX301.ttf (with props) trunk/reactos/media/fonts/doc/Fixedsys/ (with props) trunk/reactos/media/fonts/doc/Fixedsys/README.txt (with props) Modified: trunk/reactos/media/fonts/CMakeLists.txt Modified: trunk/reactos/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/CMakeLists.txt… ============================================================================== --- trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/fonts/CMakeLists.txt [iso-8859-1] Mon Dec 24 17:27:04 2012 @@ -32,6 +32,8 @@ FreeSerifBold.ttf FreeSerifBoldItalic.ttf FreeSerifItalic.ttf + FSEX301.ttf + FSEX301-L2.ttf LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf LiberationMono-Italic.ttf Added: trunk/reactos/media/fonts/FSEX301-L2.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FSEX301-L2.ttf… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/FSEX301-L2.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/fonts/FSEX301.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FSEX301.ttf?re… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/fonts/FSEX301.ttf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Propchange: trunk/reactos/media/fonts/doc/Fixedsys/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Dec 24 17:27:04 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/media/fonts/doc/Fixedsys/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/media/fonts/doc/Fixedsys/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/media/fonts/doc/Fixedsys/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/media/fonts/doc/Fixedsys/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/Fixedsys/R… ============================================================================== --- trunk/reactos/media/fonts/doc/Fixedsys/README.txt (added) +++ trunk/reactos/media/fonts/doc/Fixedsys/README.txt [iso-8859-1] Mon Dec 24 17:27:04 2012 @@ -1,0 +1,44 @@ +Fixedsys Excelsior 3.01 TrueType Multilingual Font (FSEX301.ttf) +================================================================ +Author : Darien Gavin Valentine +E-mail : valentinium(a)gmail.com +Address: 43 Electric Avenue - Apartment 1 - Somerville, Massachusetts, + United States of America + +http://www.fixedsysexcelsior.com/ + +The FAQ: http://www.fixedsysexcelsior.com/information/faq.htm + +"[...] +Q: I use this font a lot. Am I expected to give you money? +A: No, Fixedsys Excelsior is free. If you feel incredibly grateful, send me an + email or a letter or something else, maybe rose-flavored Turkish Delight + (my address is at the bottom). Other flavors are fine too but rose is my + favorite. And I am generally more concerned with music than fonts, so if you + have any of that stuff ... Also, if you use IRC, feel free to proselytize to + your friends. My real intention, if I have one at all, is to make IRC a more + natural world without removing its distinctive feeling. Sure, maybe you dont + speak Farsi, but next time you encounter someone who does, theyll be typing + in Arabic, not question marks or boxes. The ultimate form of this dream would + be to have Fixedsys Excelsior distributed with mIRC or other IRC clients. +[...]" + + +http://en.wikipedia.org/wiki/Fixedsys_Excelsior + +"Fixedsys Excelsior is free software and appears to have been released by + its author into the public domain." + + ++=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+= + + +Modified version of the Fixedsys Excelsior 3.01 font of Darien Valentine, +which seems to fix some problems (zero-width 'A' and ligatures): + +Fixedsys Excelsior 3.01-L2(FSEX301-L2.ttf) +========================================== +Authors: Jean-Baptiste Lallement, and Derek Veit +Credits: Darien Gavin Valentine + +https://bugs.launchpad.net/ubuntu/+bug/200671 Propchange: trunk/reactos/media/fonts/doc/Fixedsys/README.txt ------------------------------------------------------------------------------ svn:eol-style = native

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