Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 03/04: [FREELDR] Whitespace, minor code styles and comments fixes only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b978d42bd9ef8d0992947… commit b978d42bd9ef8d099294716828881ec52225a9ad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 4 17:29:07 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:04 2019 +0200 [FREELDR] Whitespace, minor code styles and comments fixes only. --- boot/freeldr/freeldr/ntldr/setupldr.c | 9 ++++----- boot/freeldr/freeldr/ntldr/winldr.c | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 10bfe3dff37..20a7eff355e 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -73,7 +73,7 @@ SetupLdrLoadNlsData(PLOADER_PARAMETER_BLOCK LoaderBlock, HINF InfHandle, LPCSTR return; } - TRACE("NLS data %s %s %s\n", AnsiName, OemName, LangName); + TRACE("NLS data '%s' '%s' '%s'\n", AnsiName, OemName, LangName); #if DBG { @@ -130,7 +130,7 @@ SetupLdrScanBootDrivers(PLIST_ENTRY BootDriverListHead, HINF InfHandle, LPCSTR S ServiceName); if (!Success) { - ERR("could not add boot driver %s, %s\n", SearchPath, DriverName); + ERR("Could not add boot driver '%s', '%s'\n", SearchPath, DriverName); return; } } @@ -191,8 +191,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); /* Read the system path is set in the .ini file */ - if (!HasSection || - !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) + if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { /* * IMPROVE: I don't want to call MachDiskGetBootPath here as a @@ -203,7 +202,7 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, */ // MachDiskGetBootPath(BootPath, sizeof(BootPath)); // strcpy(BootPath, SectionName); - BootPath[0] = '\0'; + BootPath[0] = ANSI_NULL; } /* diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index c9bdd84b0ea..d888634da98 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -99,9 +99,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, strncpy(ArcBoot, BootPath, PathSeparator); ArcBoot[PathSeparator] = ANSI_NULL; - TRACE("ArcBoot: %s\n", ArcBoot); - TRACE("SystemRoot: %s\n", SystemRoot); - TRACE("Options: %s\n", Options); + TRACE("ArcBoot: '%s'\n", ArcBoot); + TRACE("SystemRoot: '%s'\n", SystemRoot); + TRACE("Options: '%s'\n", Options); /* Fill ARC BootDevice */ LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName; @@ -122,7 +122,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, strncpy(LoaderBlock->NtHalPathName, HalPath, MAX_PATH); LoaderBlock->NtHalPathName = PaToVa(LoaderBlock->NtHalPathName); - /* Fill LoadOptions and strip the '/' commutator symbol in front of each option */ + /* Fill LoadOptions and strip the '/' switch symbol in front of each option */ NewLoadOptions = LoadOptions = LoaderBlock->LoadOptions = WinLdrSystemBlock->LoadOptions; strncpy(LoaderBlock->LoadOptions, Options, MAX_OPTIONS_LENGTH); @@ -252,7 +252,7 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, DriverPath[0] = ANSI_NULL; } - TRACE("DriverPath: %s, DllName: %s, LPB\n", DriverPath, DllName); + TRACE("DriverPath: '%s', DllName: '%s', LPB\n", DriverPath, DllName); // Check if driver is already loaded Success = WinLdrCheckForLoadedDll(LoadOrderListHead, DllName, DriverDTE); @@ -506,7 +506,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Skip possible initial whitespace */ Options += strspn(Options, " \t"); - /* Check whether a new commutator starts and it is either KERNEL or HAL */ + /* Check whether a new option starts and it is either KERNEL or HAL */ if (*Options != '/' || (++Options, !(_strnicmp(Options, "KERNEL=", 7) == 0 || _strnicmp(Options, "HAL=", 4) == 0)) ) @@ -524,7 +524,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, break; } - /* We have found either KERNEL or HAL commutator */ + /* We have found either KERNEL or HAL options */ if (_strnicmp(Options, "KERNEL=", 7) == 0) { Options += 7; i -= 7; @@ -589,7 +589,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Skip possible initial whitespace */ Options += strspn(Options, " \t"); - /* Check whether a new commutator starts and it is the DEBUGPORT one */ + /* Check whether a new option starts and it is the DEBUGPORT one */ if (*Options != '/' || _strnicmp(++Options, "DEBUGPORT=", 10) != 0) { /* Search for another whitespace */ @@ -598,7 +598,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, } else { - /* We found the DEBUGPORT commutator. Move to the port name. */ + /* We found the DEBUGPORT option. Move to the port name. */ Options += 10; break; } @@ -607,7 +607,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, if (Options) { /* - * We have found the DEBUGPORT commutator. Parse the port name. + * We have found the DEBUGPORT option. Parse the port name. * Format: /DEBUGPORT=COM1 or /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log or /DEBUGPORT=FOO * If we only have /DEBUGPORT= (i.e. without any port name), defaults it to "COM". */ @@ -673,8 +673,7 @@ LoadAndBootWindows(IN OperatingSystemItem* OperatingSystem, UiDrawProgressBarCenter(1, 100, "Loading NT..."); /* Read the system path is set in the .ini file */ - if (!HasSection || - !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) + if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { strcpy(BootPath, SectionName); }

5 years, 4 months

[reactos] 02/04: [FREELDR] Unload freeldr.ini file before booting.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e79e7bf53c491f8c2dce0… commit e79e7bf53c491f8c2dce064746feffdec72cb7b2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 30 02:11:26 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:03 2019 +0200 [FREELDR] Unload freeldr.ini file before booting. --- boot/freeldr/freeldr/bootmgr.c | 1 + boot/freeldr/freeldr/linuxboot.c | 1 + boot/freeldr/freeldr/miscboot.c | 3 +++ boot/freeldr/freeldr/ntldr/winldr.c | 13 +++++++------ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 69b7d98359c..5df8182c901 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -280,5 +280,6 @@ VOID RunLoader(VOID) Reboot: UiUnInitialize("Rebooting..."); + IniCleanup(); return; } diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index 23258941eb8..d59ae161801 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -164,6 +164,7 @@ LoadAndBootLinux(IN OperatingSystemItem* OperatingSystem, RtlCopyMemory((PVOID)0x99000, LinuxCommandLine, LinuxCommandLineSize); UiUnInitialize("Booting Linux..."); + IniCleanup(); DiskStopFloppyMotor(); diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 50f68e9afc5..4ad2daa90c6 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -73,6 +73,7 @@ LoadAndBootBootSector(IN OperatingSystemItem* OperatingSystem, } UiUnInitialize("Booting..."); + IniCleanup(); /* * Don't stop the floppy drive motor when we @@ -148,6 +149,7 @@ LoadAndBootPartition(IN OperatingSystemItem* OperatingSystem, } UiUnInitialize("Booting..."); + IniCleanup(); /* * Don't stop the floppy drive motor when we @@ -206,6 +208,7 @@ LoadAndBootDrive(IN OperatingSystemItem* OperatingSystem, } UiUnInitialize("Booting..."); + IniCleanup(); /* * Don't stop the floppy drive motor when we diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 1127f2e88c7..c9bdd84b0ea 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -103,12 +103,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, TRACE("SystemRoot: %s\n", SystemRoot); TRACE("Options: %s\n", Options); - /* Fill Arc BootDevice */ + /* Fill ARC BootDevice */ LoaderBlock->ArcBootDeviceName = WinLdrSystemBlock->ArcBootDeviceName; strncpy(LoaderBlock->ArcBootDeviceName, ArcBoot, MAX_PATH); LoaderBlock->ArcBootDeviceName = PaToVa(LoaderBlock->ArcBootDeviceName); - /* Fill Arc HalDevice, it matches ArcBoot path */ + /* Fill ARC HalDevice, it matches ArcBoot path */ LoaderBlock->ArcHalDeviceName = WinLdrSystemBlock->ArcBootDeviceName; LoaderBlock->ArcHalDeviceName = PaToVa(LoaderBlock->ArcHalDeviceName); @@ -136,7 +136,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, LoaderBlock->LoadOptions = PaToVa(LoaderBlock->LoadOptions); - /* Arc devices */ + /* ARC devices */ LoaderBlock->ArcDiskInformation = &WinLdrSystemBlock->ArcDiskInformation; InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); @@ -784,6 +784,7 @@ LoadAndBootWindowsCommon( PLDR_DATA_TABLE_ENTRY KernelDTE; KERNEL_ENTRY_POINT KiSystemStartup; LPCSTR SystemRoot; + TRACE("LoadAndBootWindowsCommon()\n"); #ifdef _M_IX86 @@ -820,6 +821,9 @@ LoadAndBootWindowsCommon( Success = WinLdrLoadBootDrivers(LoaderBlock, BootPath); TRACE("Boot drivers loading %s\n", Success ? "successful" : "failed"); + /* Cleanup ini file */ + IniCleanup(); + /* Initialize Phase 1 - no drivers loading anymore */ WinLdrInitializePhase1(LoaderBlock, BootOptions, @@ -834,9 +838,6 @@ LoadAndBootWindowsCommon( /* "Stop all motors", change videomode */ MachPrepareForReactOS(); - /* Cleanup ini file */ - IniCleanup(); - /* Debugging... */ //DumpMemoryAllocMap();

5 years, 4 months

[reactos] 01/04: [FREELDR] Use NOGUIBOOT when booting in Safe-Mode.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cdb76094cafa93cb3537… commit 5cdb76094cafa93cb35371470b33ebaf1ad09ad7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 30 01:49:23 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Aug 4 17:47:03 2019 +0200 [FREELDR] Use NOGUIBOOT when booting in Safe-Mode. --- boot/freeldr/freeldr/options.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index 0300b025af4..78338f2c5d5 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -246,15 +246,15 @@ VOID AppendBootTimeOptions(PCHAR BootOptions) switch (BootOptionChoice) { case SAFE_MODE: - strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS"); // FIXME: NOGUIBOOT should also be specified + strcat(BootOptions, " /SAFEBOOT:MINIMAL /SOS /NOGUIBOOT"); break; case SAFE_MODE_WITH_NETWORKING: - strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS"); // FIXME: NOGUIBOOT should also be specified + strcat(BootOptions, " /SAFEBOOT:NETWORK /SOS /NOGUIBOOT"); break; case SAFE_MODE_WITH_COMMAND_PROMPT: - strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS"); // FIXME: NOGUIBOOT should also be specified + strcat(BootOptions, " /SAFEBOOT:MINIMAL(ALTERNATESHELL) /SOS /NOGUIBOOT"); break; case LAST_KNOWN_GOOD_CONFIGURATION:

5 years, 4 months

[reactos] 01/01: [NTOSKRNL] Implement SeRegisterLogonSessionTerminatedRoutine() and SeUnregisterLogonSessionTerminatedRoutine().

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4614c5b57c5b1652499e1… commit 4614c5b57c5b1652499e105109f099cc6ceae656 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 13:59:39 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 14:01:26 2019 +0200 [NTOSKRNL] Implement SeRegisterLogonSessionTerminatedRoutine() and SeUnregisterLogonSessionTerminatedRoutine(). --- ntoskrnl/se/srm.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 85 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/se/srm.c b/ntoskrnl/se/srm.c index d67305036a9..6517d997c1d 100644 --- a/ntoskrnl/se/srm.c +++ b/ntoskrnl/se/srm.c @@ -20,6 +20,7 @@ extern LUID SeAnonymousAuthenticationId; /* PRIVATE DEFINITIONS ********************************************************/ #define SEP_LOGON_SESSION_TAG 'sLeS' +#define SEP_LOGON_NOTIFICATION_TAG 'nLeS' typedef struct _SEP_LOGON_SESSION_REFERENCES { @@ -31,6 +32,12 @@ typedef struct _SEP_LOGON_SESSION_REFERENCES LIST_ENTRY TokenList; } SEP_LOGON_SESSION_REFERENCES, *PSEP_LOGON_SESSION_REFERENCES; +typedef struct _SEP_LOGON_SESSION_TERMINATED_NOTIFICATION +{ + struct _SEP_LOGON_SESSION_TERMINATED_NOTIFICATION *Next; + PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine; +} SEP_LOGON_SESSION_TERMINATED_NOTIFICATION, *PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION; + VOID NTAPI SepRmCommandServerThread( @@ -61,7 +68,8 @@ ULONG SepAdtMaxListLength = 0x3000; UCHAR SeAuditingState[POLICY_AUDIT_EVENT_TYPE_COUNT]; KGUARDED_MUTEX SepRmDbLock; -PSEP_LOGON_SESSION_REFERENCES SepLogonSessions; +PSEP_LOGON_SESSION_REFERENCES SepLogonSessions = NULL; +PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION SepLogonNotifications = NULL; /* PRIVATE FUNCTIONS **********************************************************/ @@ -1118,26 +1126,96 @@ SeMarkLogonSessionForTerminationNotification( /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI SeRegisterLogonSessionTerminatedRoutine( IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION Notification; + PAGED_CODE(); + + /* Fail, if we don not have a callback routine */ + if (CallbackRoutine == NULL) + return STATUS_INVALID_PARAMETER; + + /* Allocate a new notification item */ + Notification = ExAllocatePoolWithTag(PagedPool, + sizeof(SEP_LOGON_SESSION_TERMINATED_NOTIFICATION), + SEP_LOGON_NOTIFICATION_TAG); + if (Notification == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Acquire the database lock */ + KeAcquireGuardedMutex(&SepRmDbLock); + + /* Set the callback routine */ + Notification->CallbackRoutine = CallbackRoutine; + + /* Insert the new notification item into the list */ + Notification->Next = SepLogonNotifications; + SepLogonNotifications = Notification; + + /* Release the database lock */ + KeReleaseGuardedMutex(&SepRmDbLock); + + return STATUS_SUCCESS; } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI SeUnregisterLogonSessionTerminatedRoutine( IN PSE_LOGON_SESSION_TERMINATED_ROUTINE CallbackRoutine) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PSEP_LOGON_SESSION_TERMINATED_NOTIFICATION Current, Previous = NULL; + NTSTATUS Status; + PAGED_CODE(); + + /* Fail, if we don not have a callback routine */ + if (CallbackRoutine == NULL) + return STATUS_INVALID_PARAMETER; + + /* Acquire the database lock */ + KeAcquireGuardedMutex(&SepRmDbLock); + + /* Loop all registered notification items */ + for (Current = SepLogonNotifications; + Current != NULL; + Current = Current->Next) + { + /* Check if the callback routine matches the provided one */ + if (Current->CallbackRoutine == CallbackRoutine) + break; + + Previous = Current; + } + + if (Current == NULL) + { + Status = STATUS_NOT_FOUND; + } + else + { + /* Remove the current notification item from the list */ + if (Previous == NULL) + SepLogonNotifications = Current->Next; + else + Previous->Next = Current->Next; + + /* Free the current notification item */ + ExFreePoolWithTag(Current, + SEP_LOGON_NOTIFICATION_TAG); + + Status = STATUS_SUCCESS; + } + + /* Release the database lock */ + KeReleaseGuardedMutex(&SepRmDbLock); + + return Status; }

5 years, 4 months

[reactos] 01/01: [CODEOWNERS] Remove 'CMakeLists.txt' rule, which is too noisy.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f370ea5fdfe43115b2a8… commit 4f370ea5fdfe43115b2a82134ae13869ba7a2405 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sun Aug 4 12:55:45 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 4 12:55:51 2019 +0200 [CODEOWNERS] Remove 'CMakeLists.txt' rule, which is too noisy. --- CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/CODEOWNERS b/CODEOWNERS index 07865197b38..852cba37869 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -123,7 +123,6 @@ # R: ThFabba, Thomas Faber # S: Maintained /sdk/cmake/ @learn-more @ThFabba -CMakeLists.txt @learn-more @ThFabba *.cmake @learn-more @ThFabba # File Patch API

5 years, 4 months

[reactos] 01/01: [DEVMGR] Add the code to uninstall a device from the property page

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7550e9efbf6786319480a… commit 7550e9efbf6786319480a7893514da5cd9b931ef Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 4 11:18:42 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 4 11:20:04 2019 +0200 [DEVMGR] Add the code to uninstall a device from the property page --- dll/win32/devmgr/lang/bg-BG.rc | 11 +++ dll/win32/devmgr/lang/cs-CZ.rc | 11 +++ dll/win32/devmgr/lang/de-DE.rc | 12 +++- dll/win32/devmgr/lang/el-GR.rc | 11 +++ dll/win32/devmgr/lang/en-US.rc | 12 ++++ dll/win32/devmgr/lang/es-ES.rc | 11 +++ dll/win32/devmgr/lang/et-EE.rc | 12 ++++ dll/win32/devmgr/lang/fr-FR.rc | 11 +++ dll/win32/devmgr/lang/he-IL.rc | 11 +++ dll/win32/devmgr/lang/hu-HU.rc | 11 +++ dll/win32/devmgr/lang/id-ID.rc | 11 +++ dll/win32/devmgr/lang/it-IT.rc | 12 +++- dll/win32/devmgr/lang/ja-JP.rc | 12 ++++ dll/win32/devmgr/lang/no-NO.rc | 12 +++- dll/win32/devmgr/lang/pl-PL.rc | 12 +++- dll/win32/devmgr/lang/pt-BR.rc | 12 +++- dll/win32/devmgr/lang/pt-PT.rc | 12 +++- dll/win32/devmgr/lang/ro-RO.rc | 12 +++- dll/win32/devmgr/lang/ru-RU.rc | 11 +++ dll/win32/devmgr/lang/sk-SK.rc | 11 +++ dll/win32/devmgr/lang/sq-AL.rc | 11 +++ dll/win32/devmgr/lang/tr-TR.rc | 11 +++ dll/win32/devmgr/lang/uk-UA.rc | 11 +++ dll/win32/devmgr/lang/zh-CN.rc | 12 ++++ dll/win32/devmgr/lang/zh-TW.rc | 12 ++++ dll/win32/devmgr/properties/advprop.cpp | 117 +++++++++++++++++++++++++++++++- dll/win32/devmgr/resource.h | 1 + 27 files changed, 396 insertions(+), 9 deletions(-) diff --git a/dll/win32/devmgr/lang/bg-BG.rc b/dll/win32/devmgr/lang/bg-BG.rc index 47ca6224d5d..b85967b01d7 100644 --- a/dll/win32/devmgr/lang/bg-BG.rc +++ b/dll/win32/devmgr/lang/bg-BG.rc @@ -241,6 +241,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/cs-CZ.rc b/dll/win32/devmgr/lang/cs-CZ.rc index e5f8a3903a0..0cc466fd7ff 100644 --- a/dll/win32/devmgr/lang/cs-CZ.rc +++ b/dll/win32/devmgr/lang/cs-CZ.rc @@ -245,6 +245,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/de-DE.rc b/dll/win32/devmgr/lang/de-DE.rc index 529044e83a5..115a3df9a8b 100644 --- a/dll/win32/devmgr/lang/de-DE.rc +++ b/dll/win32/devmgr/lang/de-DE.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Entfernen des Geräts bestätigen" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warnung: Sie sind dabei, das Gerät aus der Systemkonfiguration zu deinstalleren.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 166, 100, 50, 14 +END /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/el-GR.rc b/dll/win32/devmgr/lang/el-GR.rc index 8aabbd38839..fbdb1cea4d9 100644 --- a/dll/win32/devmgr/lang/el-GR.rc +++ b/dll/win32/devmgr/lang/el-GR.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/en-US.rc b/dll/win32/devmgr/lang/en-US.rc index faaadd6af82..f239176dbf7 100644 --- a/dll/win32/devmgr/lang/en-US.rc +++ b/dll/win32/devmgr/lang/en-US.rc @@ -240,6 +240,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/es-ES.rc b/dll/win32/devmgr/lang/es-ES.rc index 1a011c8ba7c..9a7d536b91f 100644 --- a/dll/win32/devmgr/lang/es-ES.rc +++ b/dll/win32/devmgr/lang/es-ES.rc @@ -249,6 +249,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/et-EE.rc b/dll/win32/devmgr/lang/et-EE.rc index 498e86a6611..ef09d0d5320 100644 --- a/dll/win32/devmgr/lang/et-EE.rc +++ b/dll/win32/devmgr/lang/et-EE.rc @@ -247,6 +247,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/fr-FR.rc b/dll/win32/devmgr/lang/fr-FR.rc index 79c33bba606..25424994447 100644 --- a/dll/win32/devmgr/lang/fr-FR.rc +++ b/dll/win32/devmgr/lang/fr-FR.rc @@ -241,6 +241,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/he-IL.rc b/dll/win32/devmgr/lang/he-IL.rc index c8d0401390b..ac762438d4d 100644 --- a/dll/win32/devmgr/lang/he-IL.rc +++ b/dll/win32/devmgr/lang/he-IL.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/hu-HU.rc b/dll/win32/devmgr/lang/hu-HU.rc index 3e8f7f8443b..cda88fb50ac 100644 --- a/dll/win32/devmgr/lang/hu-HU.rc +++ b/dll/win32/devmgr/lang/hu-HU.rc @@ -241,6 +241,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/id-ID.rc b/dll/win32/devmgr/lang/id-ID.rc index a7d33717db7..1a4426ce1c3 100644 --- a/dll/win32/devmgr/lang/id-ID.rc +++ b/dll/win32/devmgr/lang/id-ID.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/it-IT.rc b/dll/win32/devmgr/lang/it-IT.rc index 2920ecab544..65efa6c68b6 100644 --- a/dll/win32/devmgr/lang/it-IT.rc +++ b/dll/win32/devmgr/lang/it-IT.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/ja-JP.rc b/dll/win32/devmgr/lang/ja-JP.rc index 3ddfe6f5d50..636bde2dd78 100644 --- a/dll/win32/devmgr/lang/ja-JP.rc +++ b/dll/win32/devmgr/lang/ja-JP.rc @@ -240,6 +240,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 9, "MS UI Gothic" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/no-NO.rc b/dll/win32/devmgr/lang/no-NO.rc index f6ef8e0face..ec6f3c51665 100644 --- a/dll/win32/devmgr/lang/no-NO.rc +++ b/dll/win32/devmgr/lang/no-NO.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/pl-PL.rc b/dll/win32/devmgr/lang/pl-PL.rc index e85ee6b6371..9446c0f3310 100644 --- a/dll/win32/devmgr/lang/pl-PL.rc +++ b/dll/win32/devmgr/lang/pl-PL.rc @@ -250,7 +250,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/pt-BR.rc b/dll/win32/devmgr/lang/pt-BR.rc index 204129cee1b..03cb0496efc 100644 --- a/dll/win32/devmgr/lang/pt-BR.rc +++ b/dll/win32/devmgr/lang/pt-BR.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/pt-PT.rc b/dll/win32/devmgr/lang/pt-PT.rc index 55986eb0356..b178c102192 100644 --- a/dll/win32/devmgr/lang/pt-PT.rc +++ b/dll/win32/devmgr/lang/pt-PT.rc @@ -242,7 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/ro-RO.rc b/dll/win32/devmgr/lang/ro-RO.rc index c5fd765ac33..6c8612b840f 100644 --- a/dll/win32/devmgr/lang/ro-RO.rc +++ b/dll/win32/devmgr/lang/ro-RO.rc @@ -245,7 +245,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/ru-RU.rc b/dll/win32/devmgr/lang/ru-RU.rc index 0c0612f76d4..e3c3cf8e57b 100644 --- a/dll/win32/devmgr/lang/ru-RU.rc +++ b/dll/win32/devmgr/lang/ru-RU.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/sk-SK.rc b/dll/win32/devmgr/lang/sk-SK.rc index c41ee067209..97460c1c198 100644 --- a/dll/win32/devmgr/lang/sk-SK.rc +++ b/dll/win32/devmgr/lang/sk-SK.rc @@ -245,6 +245,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/sq-AL.rc b/dll/win32/devmgr/lang/sq-AL.rc index 84cfc841ff1..86cf64be38d 100644 --- a/dll/win32/devmgr/lang/sq-AL.rc +++ b/dll/win32/devmgr/lang/sq-AL.rc @@ -244,6 +244,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/tr-TR.rc b/dll/win32/devmgr/lang/tr-TR.rc index 9af97e2193c..a42c7f3328a 100644 --- a/dll/win32/devmgr/lang/tr-TR.rc +++ b/dll/win32/devmgr/lang/tr-TR.rc @@ -242,6 +242,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/uk-UA.rc b/dll/win32/devmgr/lang/uk-UA.rc index eb8b5ba55b3..40e7b3549a7 100644 --- a/dll/win32/devmgr/lang/uk-UA.rc +++ b/dll/win32/devmgr/lang/uk-UA.rc @@ -248,6 +248,17 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END /* diff --git a/dll/win32/devmgr/lang/zh-CN.rc b/dll/win32/devmgr/lang/zh-CN.rc index b4bd5e427b3..706d2a42f19 100644 --- a/dll/win32/devmgr/lang/zh-CN.rc +++ b/dll/win32/devmgr/lang/zh-CN.rc @@ -242,6 +242,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 9, "宋体" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/lang/zh-TW.rc b/dll/win32/devmgr/lang/zh-TW.rc index 31af160a308..7b61164998b 100644 --- a/dll/win32/devmgr/lang/zh-TW.rc +++ b/dll/win32/devmgr/lang/zh-TW.rc @@ -242,6 +242,18 @@ BEGIN LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END +IDD_UNINSTALLDRIVER DIALOGEX 0, 0, 224, 121 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Confirm Device Removal" +FONT 9, "新細明體" +BEGIN + ICON "", IDC_DEVICON, 7, 7, 20, 20 + LTEXT "", IDC_DEVNAME, 40, 9, 174, 16, SS_NOPREFIX + LTEXT "Warning: You are about to uninstall this device from your system.", -1, 7, 37, 204, 50 + DEFPUSHBUTTON "OK", IDOK, 110, 100, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 166, 100, 50, 14 +END + /* This code relates to the device manager GUI diff --git a/dll/win32/devmgr/properties/advprop.cpp b/dll/win32/devmgr/properties/advprop.cpp index 29a3579bcba..8df086fe4ba 100644 --- a/dll/win32/devmgr/properties/advprop.cpp +++ b/dll/win32/devmgr/properties/advprop.cpp @@ -429,6 +429,104 @@ DriverDetailsDlgProc(IN HWND hwndDlg, } +static +INT_PTR +CALLBACK +UninstallDriverDlgProc(IN HWND hwndDlg, + IN UINT uMsg, + IN WPARAM wParam, + IN LPARAM lParam) +{ + PDEVADVPROP_INFO dap; + INT_PTR Ret = FALSE; + + dap = (PDEVADVPROP_INFO)GetWindowLongPtr(hwndDlg, DWLP_USER); + + if (dap != NULL || uMsg == WM_INITDIALOG) + { + switch (uMsg) + { + case WM_INITDIALOG: + dap = (PDEVADVPROP_INFO)lParam; + if (dap != NULL) + { + SetWindowLongPtr(hwndDlg, DWLP_USER, (DWORD_PTR)dap); + + /* Set the device image */ + SendDlgItemMessage(hwndDlg, + IDC_DEVICON, + STM_SETICON, + (WPARAM)dap->hDevIcon, + 0); + + /* Set the device name */ + SetDlgItemText(hwndDlg, + IDC_DEVNAME, + dap->szDevName); + } + + Ret = TRUE; + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + EndDialog(hwndDlg, IDOK); + break; + + case IDCANCEL: + EndDialog(hwndDlg, IDCANCEL); + break; + } + break; + + case WM_CLOSE: + EndDialog(hwndDlg, IDCANCEL); + break; + } + } + + return Ret; +} + + +static +VOID +UninstallDriver( + _In_ HWND hwndDlg, + _In_ PDEVADVPROP_INFO dap) +{ + SP_REMOVEDEVICE_PARAMS RemoveDevParams; + + if (DialogBoxParam(hDllInstance, + MAKEINTRESOURCE(IDD_UNINSTALLDRIVER), + hwndDlg, + UninstallDriverDlgProc, + (ULONG_PTR)dap) == IDCANCEL) + return; + + RemoveDevParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER); + RemoveDevParams.ClassInstallHeader.InstallFunction = DIF_REMOVE; + RemoveDevParams.Scope = DI_REMOVEDEVICE_GLOBAL; + RemoveDevParams.HwProfile = 0; + + SetupDiSetClassInstallParamsW(dap->DeviceInfoSet, + &dap->DeviceInfoData, + &RemoveDevParams.ClassInstallHeader, + sizeof(SP_REMOVEDEVICE_PARAMS)); + + SetupDiCallClassInstaller(DIF_REMOVE, + dap->DeviceInfoSet, + &dap->DeviceInfoData); + + SetupDiSetClassInstallParamsW(dap->DeviceInfoSet, + &dap->DeviceInfoData, + NULL, + 0); +} + + static VOID UpdateDriver( @@ -500,6 +598,9 @@ UpdateDriverDlg(IN HWND hwndDlg, { HDEVINFO DeviceInfoSet; PSP_DEVINFO_DATA DeviceInfoData; + DWORD dwStatus = 0; + DWORD dwProblem = 0; + CONFIGRET cr; if (dap->CurrentDeviceInfoSet != INVALID_HANDLE_VALUE) { @@ -556,6 +657,19 @@ UpdateDriverDlg(IN HWND hwndDlg, IDC_DRVVERSION, dap->szTemp); } + + /* Disable the Uninstall button if the driver cannot be removed */ + cr = CM_Get_DevNode_Status_Ex(&dwStatus, + &dwProblem, + dap->DeviceInfoData.DevInst, + 0, + dap->hMachine); + if (cr == CR_SUCCESS) + { + if ((dwStatus & DN_ROOT_ENUMERATED) != 0 && + (dwStatus & DN_DISABLEABLE) == 0) + EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALLDRIVER), FALSE); + } } @@ -596,7 +710,7 @@ AdvProcDriverDlgProc(IN HWND hwndDlg, break; case IDC_UNINSTALLDRIVER: - // FIXME + UninstallDriver(hwndDlg, dap); break; } break; @@ -624,7 +738,6 @@ AdvProcDriverDlgProc(IN HWND hwndDlg, dap); } EnableWindow(GetDlgItem(hwndDlg, IDC_ROLLBACKDRIVER), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_UNINSTALLDRIVER), FALSE); Ret = TRUE; break; } diff --git a/dll/win32/devmgr/resource.h b/dll/win32/devmgr/resource.h index bdb4c460718..f8054f38ccb 100644 --- a/dll/win32/devmgr/resource.h +++ b/dll/win32/devmgr/resource.h @@ -217,6 +217,7 @@ #define IDD_DRIVERDETAILS 0x404 #define IDD_DEVICEDETAILS 0x405 #define IDD_DEVICEPOWER 0x406 +#define IDD_UNINSTALLDRIVER 0x407 #define IDC_DEVICON 0x57B #define IDC_DEVNAME 0x57C

5 years, 4 months

[reactos] 01/01: [SETUP][INF] Fix font substitutes (#1794)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bbc2c6308a2802ed84c2… commit 5bbc2c6308a2802ed84c281e1dde5e2384ddaee0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 4 16:10:15 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 16:10:15 2019 +0900 [SETUP][INF] Fix font substitutes (#1794) Fix font substitutes. CORE-16264 - Modify muifonts.h. - Modify font.inf. --- base/setup/lib/muifonts.h | 1 + media/inf/font.inf | 43 ++++++++++++------------------------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index dacb4b38224..31846a47170 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -401,6 +401,7 @@ MUI_SUBFONT HindiFonts[] = { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Times New Roman" }, + { L"Times New Roman", L"DejaVu Serif" }, { L"Times New Roman Baltic,186", L"Times New Roman,186" }, { L"Times New Roman CE,238", L"Times New Roman,238" }, { L"Times New Roman CYR,204", L"Times New Roman,204" }, diff --git a/media/inf/font.inf b/media/inf/font.inf index 2327a768661..2985b462645 100644 --- a/media/inf/font.inf +++ b/media/inf/font.inf @@ -24,83 +24,66 @@ HKLM,"Software\Microsoft\Windows NT\CurrentVersion\FontDPI","LogPixels",0x000100 HKLM,"System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts","LogPixels",0x00010003,120 [Font.Latin.Reg] -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" [Font.Cyrillic.Reg] -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" [Font.Greek.Reg] -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" [Font.Hebrew.Reg] HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Tahoma" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"DejaVu Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"DejaVu Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Tahoma" [Font.CJK.Reg] -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Arial",0x00000000,"Liberation Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New",0x00000000,"FreeMono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Franklin Gothic Medium",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Droid Sans Fallback" @@ -108,9 +91,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI Gothi HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS UI Gothic 2",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Liberation Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Trebuchet MS",0x00000000,"Droid Sans Fallback" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Ubuntu",0x00000000,"Droid Sans Fallback" @@ -121,15 +103,14 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier New HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"DejaVu Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tahoma",0x00000000,"DejaVu Sans" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"DejaVu Sans Mono" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"DejaVu Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times",0x00000000,"Times New Roman" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Times New Roman",0x00000000,"DejaVu Serif" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"DejaVu Serif" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x00000000,"Times New Roman" ; cp1252/cp437 US [Font.CP437.96]

5 years, 4 months

[reactos] 01/01: [FONTS][SETUP][BOOTDATA] Add Lucida Console font (#1793)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc1aa8010a1f5c92edc5f… commit dc1aa8010a1f5c92edc5fa531611950807edf370 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 4 15:38:45 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 15:38:45 2019 +0900 [FONTS][SETUP][BOOTDATA] Add Lucida Console font (#1793) Add "Lucida Console" fonts. CORE-16264 - Add "Lucida Console" font by duplicating "DejaVu Sans Mono" font and renaming it. - Delete some "Lucida Console" font substitutes. - Add LICENSE file. I used FontForge to rename it. Its family name is "Lucida Console". Its display name is "Lucida Console". Its font filename is lucon.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. --- base/setup/lib/muifonts.h | 10 -- boot/bootdata/livecd.inf | 1 - media/fonts/CMakeLists.txt | 1 + media/fonts/doc/LucidaConsole/LICENSE.txt | 188 ++++++++++++++++++++++++++++++ media/fonts/doc/LucidaConsole/README.txt | 3 + media/fonts/lucon.ttf | Bin 0 -> 272612 bytes 6 files changed, 192 insertions(+), 11 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 5799f50a27d..dacb4b38224 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -17,7 +17,6 @@ MUI_SUBFONT LatinFonts[] = { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -50,7 +49,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -83,7 +81,6 @@ MUI_SUBFONT GreekFonts[] = { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, @@ -117,7 +114,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, @@ -158,7 +154,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { 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" }, @@ -212,7 +207,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { 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" }, @@ -262,7 +256,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS Mincho", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, @@ -321,7 +314,6 @@ MUI_SUBFONT KoreanFonts[] = { L"GungsuhChe", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { 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" }, @@ -367,7 +359,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, @@ -402,7 +393,6 @@ MUI_SUBFONT HindiFonts[] = { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, - { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf index 049c6b7a692..ab19610c8b0 100644 --- a/boot/bootdata/livecd.inf +++ b/boot/bootdata/livecd.inf @@ -52,7 +52,6 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 60f8e298843..9ca0aa22509 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -87,6 +87,7 @@ list(APPEND FONT_FILES LibreFranklin-SemiBoldItalic.ttf LibreFranklin-Thin.ttf LibreFranklin-ThinItalic.ttf + lucon.ttf Marlett.ttf OpenSans-Bold.ttf OpenSans-BoldItalic.ttf diff --git a/media/fonts/doc/LucidaConsole/LICENSE.txt b/media/fonts/doc/LucidaConsole/LICENSE.txt new file mode 100644 index 00000000000..fae1d512b3c --- /dev/null +++ b/media/fonts/doc/LucidaConsole/LICENSE.txt @@ -0,0 +1,188 @@ +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. +Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below) + +Copyright (c) 2019 Katayama Hirofumi MZ. + +Bitstream Vera Fonts Copyright +------------------------------ + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is +a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute the +Font Software, including without limitation the rights to use, copy, merge, +publish, distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to the +following conditions: + +The above copyright and trademark notices and this permission notice shall +be included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional glyphs or characters may be added to the Fonts, only if the fonts +are renamed to names not containing either the words "Bitstream" or the word +"Vera". + +This License becomes null and void to the extent applicable to Fonts or Font +Software that has been modified and is distributed under the "Bitstream +Vera" names. + +The Font Software may be sold as part of a larger software package but no +copy of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING +ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE +FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font Software +without prior written authorization from the Gnome Foundation or Bitstream +Inc., respectively. For further information, contact: fonts at gnome dot +org. + +Arev Fonts Copyright +------------------------------ + +Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and +associated documentation files (the "Font Software"), to reproduce +and distribute the modifications to the Bitstream Vera Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, and/or sell copies of the Font Software, and to permit +persons to whom the Font Software is furnished to do so, subject to +the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Tavmjong Bah" or the word "Arev". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Tavmjong Bah Arev" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the name of Tavmjong Bah shall not +be used in advertising or otherwise to promote the sale, use or other +dealings in this Font Software without prior written authorization +from Tavmjong Bah. For further information, contact: tavmjong @ free +. fr. + +TeX Gyre DJV Math +----------------- +Fonts are (c) Bitstream (see below). DejaVu changes are in public domain. + +Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski +(on behalf of TeX users groups) are in public domain. + +Letters imported from Euler Fraktur from AMSfonts are (c) American +Mathematical Society (see below). +Bitstream Vera Fonts Copyright +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera +is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of the fonts accompanying this license (“Fonts”) and associated +documentation +files (the “Font Software”), to reproduce and distribute the Font Software, +including without limitation the rights to use, copy, merge, publish, +distribute, +and/or sell copies of the Font Software, and to permit persons to whom +the Font Software is furnished to do so, subject to the following +conditions: + +The above copyright and trademark notices and this permission notice +shall be +included in all copies of one or more of the Font Software typefaces. + +The Font Software may be modified, altered, or added to, and in particular +the designs of glyphs or characters in the Fonts may be modified and +additional +glyphs or characters may be added to the Fonts, only if the fonts are +renamed +to names not containing either the words “Bitstream” or the word “Vera”. + +This License becomes null and void to the extent applicable to Fonts or +Font Software +that has been modified and is distributed under the “Bitstream Vera” +names. + +The Font Software may be sold as part of a larger software package but +no copy +of one or more of the Font Software typefaces may be sold by itself. + +THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, +TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME +FOUNDATION +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, +SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN +ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR +INABILITY TO USE +THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. +Except as contained in this notice, the names of GNOME, the GNOME +Foundation, +and Bitstream Inc., shall not be used in advertising or otherwise to promote +the sale, use or other dealings in this Font Software without prior written +authorization from the GNOME Foundation or Bitstream Inc., respectively. +For further information, contact: fonts at gnome dot org. + +AMSFonts (v. 2.2) copyright + +The PostScript Type 1 implementation of the AMSFonts produced by and +previously distributed by Blue Sky Research and Y&Y, Inc. are now freely +available for general use. This has been accomplished through the +cooperation +of a consortium of scientific publishers with Blue Sky Research and Y&Y. +Members of this consortium include: + +Elsevier Science IBM Corporation Society for Industrial and Applied +Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS) + +In order to assure the authenticity of these fonts, copyright will be +held by +the American Mathematical Society. This is not meant to restrict in any way +the legitimate use of the fonts, such as (but not limited to) electronic +distribution of documents containing these fonts, inclusion of these fonts +into other public domain or commercial font collections or computer +applications, use of the outline data to create derivative fonts and/or +faces, etc. However, the AMS does require that the AMS copyright notice be +removed from any derivative versions of the fonts which have been altered in +any way. In addition, to ensure the fidelity of TeX documents using Computer +Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces, +has requested that any alterations which yield different font metrics be +given a different name. + +$Id$ diff --git a/media/fonts/doc/LucidaConsole/README.txt b/media/fonts/doc/LucidaConsole/README.txt new file mode 100644 index 00000000000..df1de0651d0 --- /dev/null +++ b/media/fonts/doc/LucidaConsole/README.txt @@ -0,0 +1,3 @@ +ReactOS "Lucida Console" font is based on "DejaVu Sans Mono". + +See also LICENSE.txt file. diff --git a/media/fonts/lucon.ttf b/media/fonts/lucon.ttf new file mode 100644 index 00000000000..d697e268595 Binary files /dev/null and b/media/fonts/lucon.ttf differ

5 years, 4 months

[reactos] 01/01: [MEDIA][FONTS] Add Arial Black font (#1792)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7307637a6f01aa7c21d7… commit f7307637a6f01aa7c21d7d2d94561db5c433514d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 4 15:37:34 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 15:37:34 2019 +0900 [MEDIA][FONTS] Add Arial Black font (#1792) Add "Arial Black" font. CORE-16264 - Add "Arial Black" font that is based on "Archivo Black" font of Omnibus-Type. - Add LICENSE file. "Archivo Black" is similar to MS "Arial Black" in its metrics. I used FontForge to rename the font. The font filename is ariblk.ttf. The family name is "Arial Black". The display name is "Arial Black". The Underline Position is hacked for workaround of FontForge's bug. --- media/fonts/CMakeLists.txt | 1 + media/fonts/ariblk.ttf | Bin 0 -> 56004 bytes media/fonts/doc/ArialBlack/OFL.txt | 94 ++++++++++++++++++++++++++++++++++ media/fonts/doc/ArialBlack/README.txt | 5 ++ 4 files changed, 100 insertions(+) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index ce5a50c8c4f..60f8e298843 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -4,6 +4,7 @@ list(APPEND FONT_FILES arialbd.ttf arialbi.ttf ariali.ttf + ariblk.ttf comic.ttf comicbd.ttf cour.ttf diff --git a/media/fonts/ariblk.ttf b/media/fonts/ariblk.ttf new file mode 100644 index 00000000000..e82f0f83171 Binary files /dev/null and b/media/fonts/ariblk.ttf differ diff --git a/media/fonts/doc/ArialBlack/OFL.txt b/media/fonts/doc/ArialBlack/OFL.txt new file mode 100644 index 00000000000..efc20253601 --- /dev/null +++ b/media/fonts/doc/ArialBlack/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2012, Omnibus-Type (www.omnibus-type.com|omnibus.type@gmail.com), with Reserved Font Name 'Archivo' +Copyright (c) 2019 Katayama Hirofumi MZ, with renamed "Arial Black". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/media/fonts/doc/ArialBlack/README.txt b/media/fonts/doc/ArialBlack/README.txt new file mode 100644 index 00000000000..65f412ebb1c --- /dev/null +++ b/media/fonts/doc/ArialBlack/README.txt @@ -0,0 +1,5 @@ +ReactOS "Arial Black" font is based on Archivo Black. + +License: SIL OPEN FONT LICENSE Version 1.1 + +See LICENSE.txt file.

5 years, 4 months

[reactos] 01/01: [WIN32SS][NTGDI] Fix condition of bold emulation (#1787)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9cd11eb1031152ea99630… commit 9cd11eb1031152ea996309e1fceb9d5c1ec6e69b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Aug 4 15:15:52 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Aug 4 15:15:52 2019 +0900 [WIN32SS][NTGDI] Fix condition of bold emulation (#1787) - Define EMUBOLD_NEEDED macro to determine the condition of bold emuration necessity. - Use this macro. - Loose the condition. --- win32ss/gdi/ntgdi/freetype.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index fb8741c8d8b..2578bc04e27 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -41,6 +41,10 @@ #define _TMPF_VARIABLE_PITCH TMPF_FIXED_PITCH #endif +/* Is bold emulation necessary? */ +#define EMUBOLD_NEEDED(original, request) \ + ((request) != FW_DONTCARE) && ((request) - (original) >= FW_BOLD - FW_MEDIUM) + extern const MATRIX gmxWorldToDeviceDefault; extern const MATRIX gmxWorldToPageDefault; static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; @@ -4100,7 +4104,7 @@ TextIntGetTextExtentPoint(PDC dc, TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL); + EmuBold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); Render = IntIsFontRenderingEnabled(); @@ -5885,7 +5889,7 @@ IntExtTextOutW( face = FontGDI->SharedFace->Face; plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL); + EmuBold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); if (Render)

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2019