Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 01/03: [VIDEOPRT] Honour UseNewKey setting in registry

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b80d806e05380aef33e3f… commit b80d806e05380aef33e3f7626807271e661c4b94 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jan 23 21:11:59 2022 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Jan 26 19:30:32 2022 +0100 [VIDEOPRT] Honour UseNewKey setting in registry This changes: - which device key is written to DEVICEMAP\Video - which registry key is used in VideoPortSetRegistryParameters() CORE-17896 --- win32ss/drivers/videoprt/registry.c | 7 ++++++- win32ss/drivers/videoprt/videoprt.c | 27 +++++++++++++++++++++++++-- win32ss/drivers/videoprt/videoprt.h | 1 + 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/win32ss/drivers/videoprt/registry.c b/win32ss/drivers/videoprt/registry.c index 76b3ead0846..64be3601827 100644 --- a/win32ss/drivers/videoprt/registry.c +++ b/win32ss/drivers/videoprt/registry.c @@ -668,7 +668,12 @@ IntCreateRegistryPath( } } - if (Valid) + if (!VideoPortUseNewKey) + { + INFO_(VIDEOPRT, "Using old registry key as 'UseNewKey' is FALSE\n"); + Valid = FALSE; + } + else if (Valid) { DeviceRegistryPath->MaximumLength = DriverRegistryPath->Length + sizeof(Insert1) + sizeof(Insert2) + DeviceNumberString.Length; diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 4398d82e480..0348b677c7b 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -38,6 +38,7 @@ BOOLEAN VpNoVesa = FALSE; PKPROCESS CsrProcess = NULL; static ULONG VideoPortMaxObjectNumber = -1; +BOOLEAN VideoPortUseNewKey = FALSE; KMUTEX VideoPortInt10Mutex; KSPIN_LOCK HwResetAdaptersLock; RTL_STATIC_LIST_HEAD(HwResetAdaptersList); @@ -58,6 +59,7 @@ NTSTATUS IntVideoPortAddDeviceMapLink( PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension) { + PUNICODE_STRING RegistryPath; WCHAR DeviceBuffer[20]; UNICODE_STRING DeviceName; WCHAR SymlinkBuffer[20]; @@ -69,13 +71,18 @@ IntVideoPortAddDeviceMapLink( DeviceNumber = DeviceExtension->DeviceNumber; swprintf(DeviceBuffer, L"\\Device\\Video%lu", DeviceNumber); + if (VideoPortUseNewKey) + RegistryPath = &DeviceExtension->NewRegistryPath; + else + RegistryPath = &DeviceExtension->RegistryPath; + /* Add entry to DEVICEMAP\VIDEO key in registry. */ Status = RtlWriteRegistryValue(RTL_REGISTRY_DEVICEMAP, L"VIDEO", DeviceBuffer, REG_SZ, - DeviceExtension->NewRegistryPath.Buffer, - DeviceExtension->NewRegistryPath.Length + sizeof(UNICODE_NULL)); + RegistryPath->Buffer, + RegistryPath->Length + sizeof(UNICODE_NULL)); if (!NT_SUCCESS(Status)) { ERR_(VIDEOPRT, "Failed to create DEViCEMAP registry entry: 0x%X\n", Status); @@ -516,12 +523,28 @@ IntLoadRegistryParameters(VOID) { NTSTATUS Status; HANDLE KeyHandle; + UNICODE_STRING UseNewKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\GraphicsDrivers\\UseNewKey"); UNICODE_STRING Path = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Control"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SystemStartOptions"); OBJECT_ATTRIBUTES ObjectAttributes; PKEY_VALUE_PARTIAL_INFORMATION KeyInfo; ULONG Length, NewLength; + /* Check if we need to use new registry */ + InitializeObjectAttributes(&ObjectAttributes, + &UseNewKeyPath, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, + GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + VideoPortUseNewKey = TRUE; + ZwClose(KeyHandle); + } + /* Initialize object attributes with the path we want */ InitializeObjectAttributes(&ObjectAttributes, &Path, diff --git a/win32ss/drivers/videoprt/videoprt.h b/win32ss/drivers/videoprt/videoprt.h index bf4290e014d..44824dc2bdd 100644 --- a/win32ss/drivers/videoprt/videoprt.h +++ b/win32ss/drivers/videoprt/videoprt.h @@ -249,6 +249,7 @@ IntVideoPortMapPhysicalMemory( extern PKPROCESS CsrProcess; extern ULONG VideoPortDeviceNumber; +extern BOOLEAN VideoPortUseNewKey; extern KMUTEX VideoPortInt10Mutex; extern KSPIN_LOCK HwResetAdaptersLock; extern LIST_ENTRY HwResetAdaptersList;

2 years, 7 months

[reactos] 01/01: [CRYPTUI] Fix all MSVC *.rc warnings RC4206 CORE-18017

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff9301e9db3215641d69d… commit ff9301e9db3215641d69d2b462d5cd0c48b8cb3f Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Jan 26 03:23:00 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Jan 26 03:23:24 2022 +0100 [CRYPTUI] Fix all MSVC *.rc warnings RC4206 CORE-18017 warning RC4206 : title string too long; truncated at 256 by providing shorter translations. We had 24 such warnings in this module on master head. --- dll/win32/cryptui/lang/cryptui_De.rc | 6 ++---- dll/win32/cryptui/lang/cryptui_En.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Fr.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_He.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_It.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Ko.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Lt.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Nl.rc | 6 ++---- dll/win32/cryptui/lang/cryptui_No.rc | 4 ++-- dll/win32/cryptui/lang/cryptui_Pl.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Pt.rc | 4 ++-- dll/win32/cryptui/lang/cryptui_Ro.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Ru.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Sq.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Tr.rc | 8 ++------ dll/win32/cryptui/lang/cryptui_Uk.rc | 4 ++-- dll/win32/cryptui/lang/cryptui_Zh.rc | 8 ++------ 17 files changed, 34 insertions(+), 86 deletions(-) diff --git a/dll/win32/cryptui/lang/cryptui_De.rc b/dll/win32/cryptui/lang/cryptui_De.rc index f6d2178b94c..562f6f3ea89 100644 --- a/dll/win32/cryptui/lang/cryptui_De.rc +++ b/dll/win32/cryptui/lang/cryptui_De.rc @@ -286,8 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Willkommen", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten aus einer Datei zu importieren.\n\nEin Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.\n\n\ -Klicken Sie Weiter um fortzufahren.", + LTEXT "Dieser Assistent hilft ihnen Zertifikate, -Sperrlisten und -Vertrauenslisten aus einer Datei zu importieren.\n\nEin Zertifikat dient Computern zur gegenseitigen Identifikation und kann auch zum Signieren verwendet werden.", -1, 115,40,195,120 END @@ -381,8 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Willkommen", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Dieser Assistent hilft ihnen, Zertifikate, Zertifikatssperrlisten und Zertifikatsvertrauenslisten in eine Datei zu exportieren.\n\nEin Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten und Zertifikatsvertrauenslisten.\n\n\ -Klicken Sie auf Weiter, um fortzufahren.", + LTEXT "Dieser Assistent hilft ihnen Zertifikate, -Sperrlisten und -Vertrauenslisten in eine Datei zu exportieren.\n\nEin Zertifikat dient Computern zur gegenseitigen Identifikation und kann auch zum Signieren verwendet werden.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_En.rc b/dll/win32/cryptui/lang/cryptui_En.rc index a3da8ed9a1b..bdeb329cf7f 100644 --- a/dll/win32/cryptui/lang/cryptui_En.rc +++ b/dll/win32/cryptui/lang/cryptui_En.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\n\ -A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\n\ -To continue, click Next.", + LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\nComputers can use certificates for identification and signing.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\n\ -A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\n\ -To continue, click Next.", + LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\n\Computers can use certificates for identification and signing.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Fr.rc b/dll/win32/cryptui/lang/cryptui_Fr.rc index 489c6870af2..57d074348fb 100644 --- a/dll/win32/cryptui/lang/cryptui_Fr.rc +++ b/dll/win32/cryptui/lang/cryptui_Fr.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue dans l'assistant d'importation de certificats", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Cet assistant vous aide à importer des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un magasin de certificats à partir d'un fichier.\n\n\ -Un certificat peut être utilisé pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance.\n\n\ -Pour continuer, cliquez sur Suivant.", + LTEXT "Cet assistant vous aide à importer des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un magasin de certificats à partir d'un fichier.\n\nUn certificat peut être utilisé pour identifier ou signer.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bienvenue dans l'assistant d'exportation de certificats", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Cet assistant vous aide à exporter des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un fichier à partir d'un magasin de certificats.\n\n\ -Un certificat peut être utilisé pour vous identifier, ou pour identifier l'ordinateur avec lequel vous communiquez. Il peut également être utilisé à des fins d'authentification ou de signature de messages. Les magasins de certificats sont des collections de certificats, de listes de révocation de certificats et de listes de certificats de confiance.\n\n\ -Pour continuer, cliquez sur Suivant.", + LTEXT "Cet assistant vous aide à exporter des certificats, des listes de révocation de certificats et des listes de certificats de confiance dans un fichier à partir d'un magasin de certificats.\n\nUn certificat peut être utilisé pour identifier ou signer.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_He.rc b/dll/win32/cryptui/lang/cryptui_He.rc index eee5d952a65..52ffd73ac4b 100644 --- a/dll/win32/cryptui/lang/cryptui_He.rc +++ b/dll/win32/cryptui/lang/cryptui_He.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\n\ -A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\n\ -To continue, click Next.", + LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.\n\nComputers can use certificates for identification and signing.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\n\ -A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.\n\n\ -To continue, click Next.", + LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.\n\n\Computers can use certificates for identification and signing.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_It.rc b/dll/win32/cryptui/lang/cryptui_It.rc index bbbbb6026d0..5fd8333dc0c 100644 --- a/dll/win32/cryptui/lang/cryptui_It.rc +++ b/dll/win32/cryptui/lang/cryptui_It.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvenuto alla Guida all'Importazione di Certificati", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Questa guida ti aiuta a importare certificate, liste di revoca di certificati e liste di fiducia di certificati da un file in un deposito di certificati.\n\n\ -Un certificato può essere usato per identificare te o il computer da cui stai comunicando. Può essere anche usato per l'autenticazione e per firmare messaggi. I depositi di certificati sono collezioni di certificati, liste di revoca di certificati e liste di fiducia di certificati.\n\n\ -Per continuare, premere Avanti.", + LTEXT "Questa guida ti aiuta a importare certificate, liste di revoca di certificati e liste di fiducia di certificati da un file in un deposito di certificati.\n\nI computer possono utilizzare i certificati per l'identificazione e la firma.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvenuto alla Guida all'Esportazione del Certificato", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Questa guida ti aiuta a esportare certificate, liste di revoca di certificati e liste di fiducia di certificati da un deposito di certificati in un file.\n\n\ -Un certificato può essere usato per identificare te o il computer da cui stai comunicando. Può essere anche usato per l'autenticazione e per firmare messaggi. I depositi di certificati sono collezioni di certificati, liste di revoca di certificati e liste di fiducia di certificati.\n\n\ -Per continuare, premere Avanti.", + LTEXT "Questa guida ti aiuta a esportare certificate, liste di revoca di certificati e liste di fiducia di certificati da un deposito di certificati in un file.\n\nI computer possono utilizzare i certificati per l'identificazione e la firma.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Ko.rc b/dll/win32/cryptui/lang/cryptui_Ko.rc index 2064b2308af..1298663d96e 100644 --- a/dll/win32/cryptui/lang/cryptui_Ko.rc +++ b/dll/win32/cryptui/lang/cryptui_Ko.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 9, "MS Shell Dlg" BEGIN LTEXT "인증서 가져오기 마법사에 온 것을 환영합니다", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "이 마법사는 당신이 인증서,인증서 폐기 목록을 가져오는 데 도움을 주고,파일에서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n\n\ -이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n\n\ -계속하려면,다음을 클릭하십시오.", + LTEXT "이 마법사는 당신이 인증서,인증서 폐기 목록을 가져오는 데 도움을 주고,파일에서 인증서 신뢰 목록을 인증서 저장소으로 가져오는 데도 도움을 줍니다.\n\n이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 9, "MS Shell Dlg" BEGIN LTEXT "인증서 내보내기 마법사에 오신 것을 환영합니다", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "이 마법사는 당신이 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 신뢰 목록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍니다.\n\n\ -이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.\n\n\ -계속 하려면, 다음을 클릭하십시오.", + LTEXT "이 마법사는 당신이 인증서,인증서 폐기 목록을 내보오는 데 도움을 주고,인증서 신뢰 목록을 인증서 저장소의 인증서 신뢰 목록을 파일로 내보내는 데도 도움을 줍니다.\n\n이 인증서는 당신이나 당신이 통신에 사용하는 컴퓨터를 신원보증하는 데 사용됩니다. 또한 메세지에 사인하고 인증하는 데도 사용됩니다.인증서 보관소는 인증서, 인증서 파기 목록, 인증서 신뢰 목록의저장소입니다.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Lt.rc b/dll/win32/cryptui/lang/cryptui_Lt.rc index ed37db639a8..2cfb5ea4771 100644 --- a/dll/win32/cryptui/lang/cryptui_Lt.rc +++ b/dll/win32/cryptui/lang/cryptui_Lt.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Sveiki atvėrę liudijimo importo vediklį", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Šis vediklis padeda jums importuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš failo į liudijimų saugyklą.\n\n\ -Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas tapatumo nustatymui ir pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų, atšauktų liudijimų sąrašų ir patikintų liudijimų sąrašų rinkiniai.\n\n\ -Jei norite tęsti, spauskite Kitas.", + LTEXT "Šis vediklis padeda jums importuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš failo į liudijimų saugyklą.\n\nKompiuteriai gali naudoti sertifikatus identifikavimui ir pasirašymui.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Sveiki atvėrę liudijimo eksporto vediklį", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Šis vediklis padeda jums eksportuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš liudijimų saugyklos į failą.\n\n\ -Liudijimas gali būti naudojamas nustatyti jūsų ar kompiuterio su kuriuo esate užmezgę ryšį tapatumą. Jis taip pat gali būti naudojamas tapatumo nustatymui ir pranešimų pasirašymui. Liudijimų saugyklos yra liudijimų, atšauktų liudijimų sąrašų ir patikintų liudijimų sąrašų rinkiniai.\n\n\ -Jei norite tęsti, spauskite Kitas.", + LTEXT "Šis vediklis padeda jums eksportuoti liudijimus, atšauktų liudijimų sąrašus ir patikintų liudijimų sąrašus iš liudijimų saugyklos į failą.\n\nKompiuteriai gali naudoti sertifikatus identifikavimui ir pasirašymui.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Nl.rc b/dll/win32/cryptui/lang/cryptui_Nl.rc index 2068e6e3aa7..bfb7d54677f 100644 --- a/dll/win32/cryptui/lang/cryptui_Nl.rc +++ b/dll/win32/cryptui/lang/cryptui_Nl.rc @@ -286,8 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welkom bij de certificaat importeerhulp", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Deze wizard helpt u certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten uit een bestand in een certificaatkluis te importeren.\n\n\ -Een certificaat kan gebruikt worden om u of de computer waarmee u communiceert te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Een certificaatkluis bevat een verzameling van certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten.\nKlik Volgende om verder te gaan.", + LTEXT "Deze wizard helpt u certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten uit een bestand in een certificaatkluis te importeren.\n\nComputers kunnen certificaten gebruiken voor identificatie en ondertekening.", -1, 115,40,195,120 END @@ -381,8 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welkom bij de Certificaat exporteerhulp", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Deze wizard helpt u certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten van een certificaatkluis naar een bestand te exporteren.\n\n\ -Een certificaat kan gebruikt worden om u of de computer waarmee u communiceert te identificeren. Het kan ook gebruikt worden voor authenticatie en om berichten te ondertekenen. Een certificaatkluis bevat een verzameling van certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten.", + LTEXT "Deze wizard helpt u certificaten, lijsten van herroepen certificaten en lijsten van vertrouwde certificaten van een certificaatkluis naar een bestand te exporteren.\n\nComputers kunnen certificaten gebruiken voor identificatie en ondertekening.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_No.rc b/dll/win32/cryptui/lang/cryptui_No.rc index 640f3cde8a7..5ffbd880854 100644 --- a/dll/win32/cryptui/lang/cryptui_No.rc +++ b/dll/win32/cryptui/lang/cryptui_No.rc @@ -286,7 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Velkommen til veiviseren for import av sertifikater", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Et sertifikat kan brukes til å identifisere deg eller datamaskinen du kommuniserer med. Det kan også brukes til signering av meldinger eller andre former for godkjenning. Sertifikatlagre er samlinger av sertifikater og lister over tiltrodde eller tilbakekalte sertifikater.", + LTEXT "Denne veiviseren hjelper deg med å importere sertifikater, sertifikatopphevelseslister og sertifikatklareringslister fra en fil til et sertifikatlager.\n\nDatamaskiner kan bruke sertifikater for identifikasjon og signering.", -1, 115,40,195,120 END @@ -380,7 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Velkommen til veiviseren for eksport av sertifikater", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Et sertifikat kan brukes til å identifisere deg eller datamaskinen du kommuniserer med. Det kan også brukes til signering av meldinger eller andre former for godkjenning. Sertifikatlagre er samlinger av sertifikater og lister over tiltrodde eller tilbakekalte sertifikater.", + LTEXT "Denne veiviseren hjelper deg med å eksportere sertifikater, sertifikatopphevelseslister og sertifikatklareringslister fra en fil til et sertifikatlager.\n\nDatamaskiner kan bruke sertifikater for identifikasjon og signering.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Pl.rc b/dll/win32/cryptui/lang/cryptui_Pl.rc index fbe43b37840..cb0a3e19fe6 100644 --- a/dll/win32/cryptui/lang/cryptui_Pl.rc +++ b/dll/win32/cryptui/lang/cryptui_Pl.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Witamy w kreatorze importu certyfikatów", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Asystent ten pomaga tobie importować certyfikaty, listy odwołania certyfikatów, i listy zaufania certyfikatów z pliku do magazynu certyfikatów.\n\n\ -Certyfikat może zostać użyty do identyfikacji ciebie lub komputer, z którym się komunikujesz. Może on również zostać wykorzystany do uwierzytelnienia i do podpisywania wiadomości. Magazyny certyfikatów są zbiorem certyfikatów, list odwołań certyfikatów oraz list zaufań certyfikatów.\n\n\ -Aby kontynuować, naciśnij Dalej.", + LTEXT "Ten kreator pomaga importować certyfikaty, listy odwołanych certyfikatów i listy zaufanych certyfikatów z pliku do magazynu certyfikatów.\n\nKomputery mogą używać certyfikatów do identyfikacji i podpisywania.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Witamy w kreatorze eksportu certyfikatów", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Asystent ten pomaga tobie eksportować certyfikaty, listy odwołania certyfikatów, i listy zaufania certyfikatów z magazynu certyfikatów do pliku.\n\n\ -Certyfikat może zostać użyty do identyfikacji ciebie lub komputer, z którym się komunikujesz. Może on również zostać wykorzystany do uwierzytelnienia i do podpisywania wiadomości. Magazyny certyfikatów są zbiorem certyfikatów, list odwołań certyfikatów oraz list zaufań certyfikatów.\n\n\ -Aby kontynuować, naciśnij Dalej.", + LTEXT "Ten kreator pomaga eksportować certyfikaty, listy odwołanych certyfikatów i listy zaufanych certyfikatów z pliku do magazynu certyfikatów.\n\nKomputery mogą używać certyfikatów do identyfikacji i podpisywania.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Pt.rc b/dll/win32/cryptui/lang/cryptui_Pt.rc index 5fa466ae256..d00f4301657 100644 --- a/dll/win32/cryptui/lang/cryptui_Pt.rc +++ b/dll/win32/cryptui/lang/cryptui_Pt.rc @@ -286,7 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bem-vindo ao Assistente de Importação de Certificados", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador do qual está a comunicar. Também pode ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são colecções de certificados, listas de revogação de certificados e listas de certificados confiáveis.", + LTEXT "Este assistente ajuda a importar certificados, listas de revogação de certificados e listas confiáveis de certificados de um arquivo para um repositório de certificados.\n\nOs computadores podem usar certificados para identificação e assinatura.", -1, 115,40,195,120 END @@ -380,7 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Benvindo ao Assistente de Exportação de Certificados", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador do qual está a comunicar. Também pode ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são colecções de certificados, listas de revogação de certificados e listas de certificados confiáveis.", + LTEXT "Este assistente ajuda a exportar certificados, listas de revogação de certificados e listas confiáveis de certificados de um arquivo para um repositório de certificados.\n\nOs computadores podem usar certificados para identificação e assinatura.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Ro.rc b/dll/win32/cryptui/lang/cryptui_Ro.rc index 6c60422f0b4..12deea92308 100644 --- a/dll/win32/cryptui/lang/cryptui_Ro.rc +++ b/dll/win32/cryptui/lang/cryptui_Ro.rc @@ -289,9 +289,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit la Asistentul de importare a certificatelor", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Acest asistent vă ajută să importați certificate, liste de certificate revocate și liste de certificate acreditate dintr-un fișier într-un depozit de certificate.\n\n\ -Un certificat poate fi utilizat pentru identificarea proprie sau a calculatorului cu care comunicați. Poate fi utilizat și pentru autentificare sau pentru a semna mesaje. Depozitele de certificate sunt colecții de certificate, liste de certificate revocate și liste de certificate acreditate.\n\n\ -Pentru a continua, apăsați pe „Înainte”.", + LTEXT "Acest expert vă ajută să importați certificate, liste de revocare a certificatelor și liste de încredere de certificate dintr-un fișier într-un depozit de certificate.\n\nComputerele pot folosi certificate pentru identificare și semnare.", -1, 115,40,195,120 END @@ -385,9 +383,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Bun venit la Asistentul de exportare a certificatelor", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Acest asistent vă va ajuta să exportați certificate, liste de certificate revocate și liste de certificate acreditate dintr-un depozit de certificate într-un fișier.\n\n\ -Un certificat poate fi utilizat pentru identificarea proprie sau a calculatorului cu care comunicați. Poate fi utilizat și pentru autentificare sau pentru a semna mesaje. Depozitele de certificate sunt colecții de certificate, liste de certificate revocate și liste de certificate acreditate.\n\n\ -Pentru a continua, apăsați pe „Înainte”.", + LTEXT "Acest expert vă ajută să exportați certificate, liste de revocare a certificatelor și liste de încredere de certificate dintr-un fișier într-un depozit de certificate.\n\nComputerele pot folosi certificate pentru identificare și semnare.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Ru.rc b/dll/win32/cryptui/lang/cryptui_Ru.rc index a4eaff7d703..a7c71c2ab97 100644 --- a/dll/win32/cryptui/lang/cryptui_Ru.rc +++ b/dll/win32/cryptui/lang/cryptui_Ru.rc @@ -288,9 +288,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Мастер импорта сертификатов", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Этот мастер помогает копировать сертификаты, списки доверия и списки отзыва сертификатов с локального диска в хранилище сертификатов.\n\n\ -Сертификат, выданный центром сертификации, является подтверждением вашей личности и содержит информацию, необходимую для защиты данных или установления защищенных сетевых подключений. Хранилище сертификатов - это область системы, предназначенная для хранения сертификатов.\n\n\ -Для продолжения нажмите кнопку ""Далее"".", + LTEXT "Этот мастер помогает копировать сертификаты, списки доверия и списки отзыва сертификатов с локального диска в хранилище сертификатов.\n\nКомпьютеры могут использовать сертификаты для идентификации и подписания.", -1, 115,40,195,120 END @@ -384,9 +382,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Мастер экспорта сертификатов", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Этот мастер помогает копировать сертификаты, списки доверия и списки отзыва сертификатов из хранилища сертификатов на локальный диск.\n\n\ -Сертификат, выданный центром сертификации, является подтверждением вашей личности и содержит информацию, необходимую для защиты данных или установления защищенных сетевых подключений. Хранилище сертификатов - это область системы, предназначенная для хранения сертификатов.\n\n\ -Для продолжения нажмите кнопку ""Далее"".", + LTEXT "Этот мастер помогает копировать сертификаты, списки доверия и списки отзыва сертификатов из хранилища сертификатов на локальный диск.\n\nКомпьютеры могут использовать сертификаты для идентификации и подписания.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Sq.rc b/dll/win32/cryptui/lang/cryptui_Sq.rc index f261c425269..4051dee27dd 100644 --- a/dll/win32/cryptui/lang/cryptui_Sq.rc +++ b/dll/win32/cryptui/lang/cryptui_Sq.rc @@ -287,9 +287,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Mirë se vini në Magjistarin Importues te Certifikatave", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Ky magjistar ju ndihmon ne importimin e certifikatave, listen e revokimit te certifikatave, dhe listen e besuar te certifikatave nga nje dokument ne certifikate dyqani.\n\n\ -Certifikata mund të përdoret për të identifikuar ju ose kompjuterin me të cilën ju komunikoni. Ajo gjithashtu mund të përdoret për të legalizuara, dhe për të nënshkruar mesazhe. Dyqanet e Certifikatave janë koleksionet e certifikatave, listat certifikatë revokimit, dhe listat e besimit te certifikatave.\n\n\ -Për të vazhduar, klikoni Tjetër.", + LTEXT "Ky magjistar ju ndihmon ne importimin e certifikatave, listen e revokimit te certifikatave, dhe listen e besuar te certifikatave nga nje dokument ne certifikate dyqani.\n\nKompjuterët mund të përdorin certifikata për identifikim dhe nënshkrim.", -1, 115,40,195,120 END @@ -383,9 +381,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Mirë se vini në Magjistarin Eksportues te Certifikatave", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Ky magjistar ju ndihmon ne eksmportimin e certifikatave, listen e revokimit te certifikatave, dhe listen e besuar te certifikatave nga nje dokument ne certifikate dyqani.\n\n\ -Certifikata mund të përdoret për të identifikuar ju ose kompjuterin me të cilën ju komunikoni. Ajo gjithashtu mund të përdoret për të legalizuara, dhe për të nënshkruar mesazhe. Dyqanet e Certifikatave janë koleksionet e certifikatave, listat certifikatë revokimit, dhe listat e besimit te certifikatave.\n\n\ -Për të vazhduar, klikoni Tjetër.", + LTEXT "Ky magjistar ju ndihmon të eksportoni certifikatat, listat e revokimit të certifikatave dhe listat e certifikatave të besuara nga një dokument.\n\nKompjuterët mund të përdorin certifikata për identifikim dhe nënshkrim.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Tr.rc b/dll/win32/cryptui/lang/cryptui_Tr.rc index f8ddc96dfc6..7ff03ccc666 100644 --- a/dll/win32/cryptui/lang/cryptui_Tr.rc +++ b/dll/win32/cryptui/lang/cryptui_Tr.rc @@ -286,9 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Sertifika Alma Sihirbazı'na Hoşgeldiniz", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Bu sihirbaz, bir dosyadan; sertifikaları, sertifika iptal listelerini ve sertifika güven listelerini bir sertifika deposuna almanıza yardım eder.\n\n\ -Bir sertifika, sizi veya iletişim kuruyor olduğunuz bilgisayarı tanımak için kullanılabilir. Bu sertifika, kimlik doğrulaması için ve iletileri imzalamak için de kullanılabilir. Sertifika depoları; sertifikaların, sertifika iptal listelerinin ve sertifika güven listelerinin toplamasıdır.\n\n\ -Devam için İleri'ye tıklayınız.", + LTEXT "Bu sihirbaz, bir dosyadan; sertifikaları, sertifika iptal listelerini ve sertifika güven listelerini bir sertifika deposuna almanıza yardım eder.\n\nBilgisayarlar, tanımlama ve imzalama için sertifikaları kullanabilir.", -1, 115,40,195,120 END @@ -382,9 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Sertifika Verme Sihirbazı'na Hoşgeldiniz", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Bu sihirbaz, bir sertifika deposundan; sertifikaları, sertifika iptal listelerini ve sertifika güven listelerini bir dosyaya vermenize yardım eder.\n\n\ -Bir sertifika, sizi veya iletişim kuruyor olduğunuz bilgisayarı tanımak için kullanılabilir. Bu sertifika, kimlik doğrulaması için ve iletileri imzalamak için de kullanılabilir. Sertifika depoları; sertifikaların, sertifika iptal listelerinin ve sertifika güven listelerinin toplamasıdır.\n\n\ -Devam etmek için İleri'ye tıklayınız.", + LTEXT "Bu sihirbaz, bir sertifika deposundan; sertifikaları, sertifika iptal listelerini ve sertifika güven listelerini bir dosyaya vermenize yardım eder.\n\nBilgisayarlar, tanımlama ve imzalama için sertifikaları kullanabilir.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Uk.rc b/dll/win32/cryptui/lang/cryptui_Uk.rc index e91766735f5..3f95e2b8ce9 100644 --- a/dll/win32/cryptui/lang/cryptui_Uk.rc +++ b/dll/win32/cryptui/lang/cryptui_Uk.rc @@ -286,7 +286,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Вас вітає Майстер імпорту сертифікатів", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "Сертифікат може бути використаний для вашої ідентифікації або ідентифікації комп'ютера, з яким ви з'єднані. Також він може бути використаний для завірення і для підписуваня повідомлень. Сховищами сертифікатів є колекції сертифікатів, списки анульованих сертифікатів та списки довірених сертифікатів.", + LTEXT "Цей майстер допоможе вам імпортувати сертифікати, списки відкликаних сертифікатів і списки довіри сертифікатів із файлу в сховище сертифікатів.\n\nКомп’ютери можуть використовувати сертифікати для ідентифікації та підпису.", -1, 115,40,195,120 END @@ -380,7 +380,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN LTEXT "Вас вітає Майстер експорту сертифікатів", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "Сертифікат може бути використаний для вашої ідентифікації або ідентифікації комп'ютера, з яким ви з'єднані. Також він може бути використаний для завірення і для підписуваня повідомлень. Сховищами сертифікатів є колекції сертифікатів, списки анульованих сертифікатів та списки довірених сертифікатів.", + LTEXT "Цей майстер допомагає експортувати сертифікати, списки відкликаних сертифікатів і списки довіри сертифікатів із файлу до сховища сертифікатів.\n\nКомп’ютери можуть використовувати сертифікати для ідентифікації та підпису.", -1, 115,40,195,120 END diff --git a/dll/win32/cryptui/lang/cryptui_Zh.rc b/dll/win32/cryptui/lang/cryptui_Zh.rc index e4d0f7a88bb..24f1089ff42 100644 --- a/dll/win32/cryptui/lang/cryptui_Zh.rc +++ b/dll/win32/cryptui/lang/cryptui_Zh.rc @@ -292,9 +292,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 9, "宋体" BEGIN LTEXT "欢迎使用证书导入向导", IDC_IMPORT_TITLE, 115,7,195,30 - LTEXT "此向导帮助您将证书、证书吊销列表和证书信任列表从文件导入证书存储。\n\n\ -证书可以用于识别您或与您通讯的计算机。也可以使用的是用于身份验证，并对邮件进行签名。证书存储是证书、证书吊销列表和证书信任列表的集合。\n\n\ -若要继续，请单击下一步。", + LTEXT "此向导帮助您将证书、证书吊销列表和证书信任列表从文件导入证书存储。\n\n证书可以用于识别您或与您通讯的计算机。也可以使用的是用于身份验证，并对邮件进行签名。证书存储是证书、证书吊销列表和证书信任列表的集合。\n\n若要继续，请单击下一步。", -1, 115,40,195,120 END @@ -388,9 +386,7 @@ STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 9, "宋体" BEGIN LTEXT "欢迎使用证书导出向导", IDC_EXPORT_TITLE, 115,7,195,30 - LTEXT "此向导帮助您从证书存储中将证书、证书吊销列表和证书信任列表导出到一个文件。\n\n\ -证书可以用于识别您或与您通讯的计算机。也可以使用的是用于身份验证，并对邮件进行签名。证书存储是证书、证书吊销列表和证书信任列表的集合。\n\n\ -若要继续，请单击下一步。", + LTEXT "此向导帮助您从证书存储中将证书、证书吊销列表和证书信任列表导出到一个文件。\n\n证书可以用于识别您或与您通讯的计算机。也可以使用的是用于身份验证，并对邮件进行签名。证书存储是证书、证书吊销列表和证书信任列表的集合。\n\n若要继续，请单击下一步。", -1, 115,40,195,120 END

2 years, 7 months

[reactos] 01/01: [USER32] Fix uninitialized cbTotal

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cad26ad08b70dea9bc63… commit 1cad26ad08b70dea9bc63e49efe9d8509f2e08e7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 26 08:14:59 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jan 26 08:14:59 2022 +0900 [USER32] Fix uninitialized cbTotal CORE-18025 --- win32ss/user/user32/misc/exticon.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index 587a32a297f..09074c5c6a4 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -532,27 +532,26 @@ static UINT ICO_ExtractIconExW( cbColorTable = (1 << bi.biBitCount) * sizeof(RGBTRIPLE); } } + + /* biSizeImage is the size of the raw bitmap data. + * https://en.wikipedia.org/wiki/BMP_file_format */ + if (bi.biSizeImage == 0) + { + /* Calculate image size */ +#define WIDTHBYTES(width, bits) (((width) * (bits) + 31) / 32 * 4) + bi.biSizeImage = WIDTHBYTES(bi.biWidth, bi.biBitCount) * (bi.biHeight / 2); + bi.biSizeImage += WIDTHBYTES(bi.biWidth, 1) * (bi.biHeight / 2); +#undef WIDTHBYTES + } + + /* Calculate total size */ + cbTotal = bi.biSize + cbColorTable + bi.biSizeImage; #else entry = (LPICONIMAGE)(imageData); #endif if(sig == 2) { -#ifdef __REACTOS__ - /* biSizeImage is the size of the raw bitmap data. - * A dummy 0 can be given for BI_RGB bitmaps. - * https://en.wikipedia.org/wiki/BMP_file_format */ - if (bi.biSizeImage == 0 || bi.biSize == sizeof(BITMAPCOREHEADER)) - { - /* Calculate image size */ -#define WIDTHBYTES(width, bits) (((width) * (bits) + 31) / 32 * 4) - bi.biSizeImage = WIDTHBYTES(bi.biWidth, bi.biBitCount) * (bi.biHeight / 2); - bi.biSizeImage += WIDTHBYTES(bi.biWidth, 1) * (bi.biHeight / 2); -#undef WIDTHBYTES - } - /* Calculate total size */ - cbTotal = bi.biSize + cbColorTable + bi.biSizeImage; -#endif /* we need to prepend the bitmap data with hot spots for CreateIconFromResourceEx */ #ifdef __REACTOS__ cursorData = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WORD) + cbTotal);

2 years, 7 months

[reactos] 01/01: [TASKMGR] Fix a heap corruption bug (#4311)

by Valerij Zaporogeci

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8faa0b660da189ce00c6… commit f8faa0b660da189ce00c614e19aa0a47a05d2520 Author: Valerij Zaporogeci <vlrzprgts(a)gmail.com> AuthorDate: Tue Jan 25 16:49:46 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 25 15:49:46 2022 +0100 [TASKMGR] Fix a heap corruption bug (#4311) Improper adjustment of the array index in graphctl.c, introduced in PR #4141 lead to an off-by-one heap corruption. --- base/applications/taskmgr/graphctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 0d15f4d61d8..4253eeadc35 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -150,7 +150,7 @@ GraphCtrl_AddPoint(PTM_GRAPH_CONTROL inst, BYTE val0, BYTE val1) t = inst->PointBuffer; Prev0 = *(t + inst->CurrIndex); Prev1 = *(t + inst->CurrIndex + inst->NumberOfPoints); - if (inst->CurrIndex < inst->NumberOfPoints) + if (inst->CurrIndex < inst->NumberOfPoints - 1) { inst->CurrIndex++; }

2 years, 7 months

[reactos] 01/01: [USER32] Fix release build C4700 CORE-16287

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5972c0c18b965c985a7e5… commit 5972c0c18b965c985a7e5f392fb343416eb4ee89 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 25 21:57:47 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 25 21:57:47 2022 +0900 [USER32] Fix release build C4700 CORE-16287 --- win32ss/user/user32/misc/exticon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index 70e7d447a2b..587a32a297f 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -515,6 +515,7 @@ static UINT ICO_ExtractIconExW( imageData = peimage + dataOffset; #ifdef __REACTOS__ /* Calculate the size of color table */ + ZeroMemory(&bi, sizeof(bi)); CopyMemory(&bi, imageData, sizeof(BITMAPCOREHEADER)); if (bi.biBitCount <= 8) {

2 years, 7 months

[reactos] 01/01: [SHELL32] CCopyToMenu/CMoveToMenu: Check if this_ is NULL

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c4beeca8e4ae94a9cea8… commit 2c4beeca8e4ae94a9cea8bd428ff66373a83f9e2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 25 21:08:14 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 25 21:08:14 2022 +0900 [SHELL32] CCopyToMenu/CMoveToMenu: Check if this_ is NULL --- dll/win32/shell32/CCopyToMenu.cpp | 3 +++ dll/win32/shell32/CMoveToMenu.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dll/win32/shell32/CCopyToMenu.cpp b/dll/win32/shell32/CCopyToMenu.cpp index 034acb5d844..e72b217945b 100644 --- a/dll/win32/shell32/CCopyToMenu.cpp +++ b/dll/win32/shell32/CCopyToMenu.cpp @@ -101,6 +101,9 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) } case BFFM_SELCHANGED: { + if (!this_) + break; + WCHAR szPath[MAX_PATH]; LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(lParam); diff --git a/dll/win32/shell32/CMoveToMenu.cpp b/dll/win32/shell32/CMoveToMenu.cpp index ec8714ebd9b..c0e1c83a54d 100644 --- a/dll/win32/shell32/CMoveToMenu.cpp +++ b/dll/win32/shell32/CMoveToMenu.cpp @@ -100,6 +100,9 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) } case BFFM_SELCHANGED: { + if (!this_) + break; + WCHAR szPath[MAX_PATH]; LPCITEMIDLIST pidl = reinterpret_cast<LPCITEMIDLIST>(lParam);

2 years, 7 months

[reactos] 01/01: [USER32] Follow-up of #4262 (a47590c) (#4312)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0360abb796ef81e3fa03f… commit 0360abb796ef81e3fa03fa0c9dea8881bdb88a80 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 25 20:41:00 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jan 25 20:41:00 2022 +0900 [USER32] Follow-up of #4262 (a47590c) (#4312) Display icons/cursors correctly without hungup. CORE-16287 --- win32ss/user/user32/misc/exticon.c | 48 +++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c index d4143054dc7..70e7d447a2b 100644 --- a/win32ss/user/user32/misc/exticon.c +++ b/win32ss/user/user32/misc/exticon.c @@ -508,12 +508,29 @@ static UINT ICO_ExtractIconExW( HICON icon; WORD *cursorData = NULL; #ifdef __REACTOS__ - BITMAPINFOHEADER bmih; + BITMAPINFOHEADER bi; + DWORD cbColorTable = 0, cbTotal; #endif imageData = peimage + dataOffset; #ifdef __REACTOS__ - memcpy(&bmih, imageData, sizeof(BITMAPINFOHEADER)); + /* Calculate the size of color table */ + CopyMemory(&bi, imageData, sizeof(BITMAPCOREHEADER)); + if (bi.biBitCount <= 8) + { + if (bi.biSize >= sizeof(BITMAPINFOHEADER)) + { + CopyMemory(&bi, imageData, sizeof(BITMAPINFOHEADER)); + if (bi.biClrUsed) + cbColorTable = bi.biClrUsed * sizeof(RGBQUAD); + else + cbColorTable = (1 << bi.biBitCount) * sizeof(RGBQUAD); + } + else if (bi.biSize == sizeof(BITMAPCOREHEADER)) + { + cbColorTable = (1 << bi.biBitCount) * sizeof(RGBTRIPLE); + } + } #else entry = (LPICONIMAGE)(imageData); #endif @@ -521,18 +538,23 @@ static UINT ICO_ExtractIconExW( if(sig == 2) { #ifdef __REACTOS__ - /* biSizeImage is the size of the raw bitmap data. - * A dummy 0 can be given for BI_RGB bitmaps. - * https://en.wikipedia.org/wiki/BMP_file_format */ - if ((bmih.biCompression == BI_RGB) && (bmih.biSizeImage == 0)) - { - bmih.biSizeImage = ((bmih.biWidth * bmih.biBitCount + 31) / 32) * 4 * - (bmih.biHeight / 2); - } + /* biSizeImage is the size of the raw bitmap data. + * A dummy 0 can be given for BI_RGB bitmaps. + * https://en.wikipedia.org/wiki/BMP_file_format */ + if (bi.biSizeImage == 0 || bi.biSize == sizeof(BITMAPCOREHEADER)) + { + /* Calculate image size */ +#define WIDTHBYTES(width, bits) (((width) * (bits) + 31) / 32 * 4) + bi.biSizeImage = WIDTHBYTES(bi.biWidth, bi.biBitCount) * (bi.biHeight / 2); + bi.biSizeImage += WIDTHBYTES(bi.biWidth, 1) * (bi.biHeight / 2); +#undef WIDTHBYTES + } + /* Calculate total size */ + cbTotal = bi.biSize + cbColorTable + bi.biSizeImage; #endif /* we need to prepend the bitmap data with hot spots for CreateIconFromResourceEx */ #ifdef __REACTOS__ - cursorData = HeapAlloc(GetProcessHeap(), 0, bmih.biSizeImage + 2 * sizeof(WORD)); + cursorData = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WORD) + cbTotal); #else cursorData = HeapAlloc(GetProcessHeap(), 0, entry->icHeader.biSizeImage + 2 * sizeof(WORD)); #endif @@ -544,7 +566,7 @@ static UINT ICO_ExtractIconExW( cursorData[1] = hotSpot.y; #ifdef __REACTOS__ - memcpy(cursorData + 2, imageData, bmih.biSizeImage); + CopyMemory(cursorData + 2, imageData, cbTotal); #else memcpy(cursorData + 2, imageData, entry->icHeader.biSizeImage); #endif @@ -553,7 +575,7 @@ static UINT ICO_ExtractIconExW( } #ifdef __REACTOS__ - icon = CreateIconFromResourceEx(imageData, bmih.biSizeImage, sig == 1, 0x00030000, cx[index], cy[index], flags); + icon = CreateIconFromResourceEx(imageData, cbTotal, sig == 1, 0x00030000, cx[index], cy[index], flags); #else icon = CreateIconFromResourceEx(imageData, entry->icHeader.biSizeImage, sig == 1, 0x00030000, cx[index], cy[index], flags); #endif

2 years, 7 months

[reactos] 01/01: [SHELL32] Fix assertion failure in CMenuToolbars

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=974a0f03dfe3799d0a7bd… commit 974a0f03dfe3799d0a7bdf5266dc7659547ece06 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jan 25 11:49:27 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jan 25 11:49:27 2022 +0900 [SHELL32] Fix assertion failure in CMenuToolbars CORE-17505 --- dll/win32/shell32/shellmenu/CMenuToolbars.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp index 9044e134359..f38509d8cf2 100644 --- a/dll/win32/shell32/shellmenu/CMenuToolbars.cpp +++ b/dll/win32/shell32/shellmenu/CMenuToolbars.cpp @@ -403,7 +403,9 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) } // HACK & FIXME: CORE-17505 - SubclassWindow(CToolbar::Create(hwndParent, tbStyles, tbExStyles)); + HWND toolbar = CToolbar::Create(hwndParent, tbStyles, tbExStyles); + m_hWnd = NULL; + SubclassWindow(toolbar); SetWindowTheme(m_hWnd, L"", L"");

2 years, 7 months

[reactos] 03/03: [NTOS:KE] Remove all checks for x87 not being present

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99a6667bd911ad7dec92b… commit 99a6667bd911ad7dec92bfacdfa10cb702b37793 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jan 15 04:15:05 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jan 25 02:12:33 2022 +0300 [NTOS:KE] Remove all checks for x87 not being present --- ntoskrnl/ke/i386/cpu.c | 140 +++++--------------------- ntoskrnl/ke/i386/exp.c | 245 ++++++++++++++++++--------------------------- ntoskrnl/ke/i386/kiinit.c | 68 +++---------- ntoskrnl/ke/i386/thrdini.c | 33 ++---- 4 files changed, 151 insertions(+), 335 deletions(-) diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index 03bd33d465b..e627efe228a 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -24,7 +24,7 @@ UCHAR KiNMITSS[KTSS_IO_MAPS]; ULONG KeI386CpuType; ULONG KeI386CpuStep; ULONG KiFastSystemCallDisable = 0; -ULONG KeI386NpxPresent = 0; +ULONG KeI386NpxPresent = TRUE; ULONG KiMXCsrMask = 0; ULONG MxcsrFeatureMask = 0; ULONG KeI386XMMIPresent = 0; @@ -90,66 +90,30 @@ VOID NTAPI KiSetProcessorType(VOID) { - ULONG EFlags, NewEFlags; CPU_INFO CpuInfo; ULONG Stepping, Type; - /* Start by assuming no CPUID data */ - KeGetCurrentPrcb()->CpuID = 0; - - /* Save EFlags */ - EFlags = __readeflags(); - - /* XOR out the ID bit and update EFlags */ - NewEFlags = EFlags ^ EFLAGS_ID; - __writeeflags(NewEFlags); - - /* Get them back and see if they were modified */ - NewEFlags = __readeflags(); - if (NewEFlags != EFlags) - { - /* The modification worked, so CPUID exists. Set the ID Bit again. */ - EFlags |= EFLAGS_ID; - __writeeflags(EFlags); - - /* Peform CPUID 0 to see if CPUID 1 is supported */ - KiCpuId(&CpuInfo, 0); - if (CpuInfo.Eax > 0) - { - /* Do CPUID 1 now */ - KiCpuId(&CpuInfo, 1); - - /* - * Get the Stepping and Type. The stepping contains both the - * Model and the Step, while the Type contains the returned Type. - * We ignore the family. - * - * For the stepping, we convert this: zzzzzzxy into this: x0y - */ - Stepping = CpuInfo.Eax & 0xF0; - Stepping <<= 4; - Stepping += (CpuInfo.Eax & 0xFF); - Stepping &= 0xF0F; - Type = CpuInfo.Eax & 0xF00; - Type >>= 8; - - /* Save them in the PRCB */ - KeGetCurrentPrcb()->CpuID = TRUE; - KeGetCurrentPrcb()->CpuType = (UCHAR)Type; - KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; - } - else - { - DPRINT1("CPUID Support lacking\n"); - } - } - else - { - DPRINT1("CPUID Support lacking\n"); - } + /* Do CPUID 1 now */ + KiCpuId(&CpuInfo, 1); - /* Restore EFLAGS */ - __writeeflags(EFlags); + /* + * Get the Stepping and Type. The stepping contains both the + * Model and the Step, while the Type contains the returned Type. + * We ignore the family. + * + * For the stepping, we convert this: zzzzzzxy into this: x0y + */ + Stepping = CpuInfo.Eax & 0xF0; + Stepping <<= 4; + Stepping += (CpuInfo.Eax & 0xFF); + Stepping &= 0xF0F; + Type = CpuInfo.Eax & 0xF00; + Type >>= 8; + + /* Save them in the PRCB */ + KeGetCurrentPrcb()->CpuID = TRUE; + KeGetCurrentPrcb()->CpuType = (UCHAR)Type; + KeGetCurrentPrcb()->CpuStep = (USHORT)Stepping; } CODE_SEG("INIT") @@ -160,10 +124,6 @@ KiGetCpuVendor(VOID) PKPRCB Prcb = KeGetCurrentPrcb(); CPU_INFO CpuInfo; - /* Assume no Vendor ID and fail if no CPUID Support. */ - Prcb->VendorString[0] = 0; - if (!Prcb->CpuID) return 0; - /* Get the Vendor ID */ KiCpuId(&CpuInfo, 0); @@ -465,7 +425,6 @@ NTAPI KiGetCacheInformation(VOID) { PKIPCR Pcr = (PKIPCR)KeGetPcr(); - ULONG Vendor; CPU_INFO CpuInfo; ULONG CacheRequests = 0, i; ULONG CurrentRegister; @@ -476,12 +435,8 @@ KiGetCacheInformation(VOID) /* Set default L2 size */ Pcr->SecondLevelCacheSize = 0; - /* Get the Vendor ID and make sure we support CPUID */ - Vendor = KiGetCpuVendor(); - if (!Vendor) return; - /* Check the Vendor ID */ - switch (Vendor) + switch (KiGetCpuVendor()) { /* Handle Intel case */ case CPU_INTEL: @@ -1158,47 +1113,6 @@ KiSaveProcessorState(IN PKTRAP_FRAME TrapFrame, KiSaveProcessorControlState(&Prcb->ProcessorState); } -CODE_SEG("INIT") -BOOLEAN -NTAPI -KiIsNpxPresent(VOID) -{ - ULONG Cr0; - USHORT Magic; - - /* Set magic */ - Magic = 0xFFFF; - - /* Read CR0 and mask out FPU flags */ - Cr0 = __readcr0() & ~(CR0_MP | CR0_TS | CR0_EM | CR0_ET); - - /* Store on FPU stack */ -#ifdef _MSC_VER - __asm fninit; - __asm fnstsw Magic; -#else - asm volatile ("fninit;" "fnstsw %0" : "+m"(Magic)); -#endif - - /* Magic should now be cleared */ - if (Magic & 0xFF) - { - /* You don't have an FPU -- enable emulation for now */ - __writecr0(Cr0 | CR0_EM | CR0_TS); - return FALSE; - } - - /* You have an FPU, enable it */ - Cr0 |= CR0_ET; - - /* Enable INT 16 on 486 and higher */ - if (KeGetCurrentPrcb()->CpuType >= 3) Cr0 |= CR0_NE; - - /* Set FPU state */ - __writecr0(Cr0 | CR0_EM | CR0_TS); - return TRUE; -} - CODE_SEG("INIT") BOOLEAN NTAPI @@ -1208,8 +1122,8 @@ KiIsNpxErrataPresent(VOID) INT ErrataPresent; ULONG Cr0; - /* Disable interrupts */ - _disable(); + /* Interrupts have to be disabled here. */ + ASSERT(!(__readeflags() & EFLAGS_INTERRUPT_MASK)); /* Read CR0 and remove FPU flags */ Cr0 = __readcr0(); @@ -1247,9 +1161,6 @@ KiIsNpxErrataPresent(VOID) /* Restore CR0 */ __writecr0(Cr0); - /* Enable interrupts */ - _enable(); - /* Return if there's an errata */ return ErrataPresent != 0; } @@ -1370,9 +1281,6 @@ KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); UNIMPLEMENTED_ONCE; - /* check if we are doing software emulation */ - if (!KeI386NpxPresent) return STATUS_ILLEGAL_FLOAT_CONTEXT; - FpState = ExAllocatePool(NonPagedPool, sizeof (FNSAVE_FORMAT)); if (!FpState) return STATUS_INSUFFICIENT_RESOURCES; diff --git a/ntoskrnl/ke/i386/exp.c b/ntoskrnl/ke/i386/exp.c index a64faa1d60c..7ed82f72017 100644 --- a/ntoskrnl/ke/i386/exp.c +++ b/ntoskrnl/ke/i386/exp.c @@ -434,30 +434,25 @@ KeContextToTrapFrame(IN PCONTEXT Context, /* Get the FX Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); - /* Check if NPX is present */ - if (KeI386NpxPresent) - { - /* Flush the NPX State */ - KiFlushNPXState(NULL); + /* Flush the NPX State */ + KiFlushNPXState(NULL); - /* Copy the FX State */ - RtlCopyMemory(&FxSaveArea->U.FxArea, - &Context->ExtendedRegisters[0], - MAXIMUM_SUPPORTED_EXTENSION); + /* Copy the FX State */ + RtlCopyMemory(&FxSaveArea->U.FxArea, + &Context->ExtendedRegisters[0], + MAXIMUM_SUPPORTED_EXTENSION); - /* Remove reserved bits from MXCSR */ - FxSaveArea->U.FxArea.MXCsr &= KiMXCsrMask; + /* Remove reserved bits from MXCSR */ + FxSaveArea->U.FxArea.MXCsr &= KiMXCsrMask; - /* Mask out any invalid flags */ - FxSaveArea->Cr0NpxState &= ~(CR0_EM | CR0_MP | CR0_TS); + /* Mask out any invalid flags */ + FxSaveArea->Cr0NpxState &= ~(CR0_EM | CR0_MP | CR0_TS); - /* Check if this is a VDM app */ - if (PsGetCurrentProcess()->VdmObjects) - { - /* Allow the EM flag */ - FxSaveArea->Cr0NpxState |= Context->FloatSave.Cr0NpxState & - (CR0_EM | CR0_MP); - } + /* Check if this is a VDM app */ + if (PsGetCurrentProcess()->VdmObjects) + { + /* Allow the EM flag */ + FxSaveArea->Cr0NpxState |= Context->FloatSave.Cr0NpxState & (CR0_EM | CR0_MP); } } @@ -468,88 +463,63 @@ KeContextToTrapFrame(IN PCONTEXT Context, /* Get the FX Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); - /* Check if NPX is present */ - if (KeI386NpxPresent) - { - /* Flush the NPX State */ - KiFlushNPXState(NULL); + /* Flush the NPX State */ + KiFlushNPXState(NULL); - /* Check if we have Fxsr support */ - if (KeI386FxsrPresent) - { - /* Convert the Fn Floating Point state to Fx */ - FxSaveArea->U.FxArea.ControlWord = - (USHORT)Context->FloatSave.ControlWord; - FxSaveArea->U.FxArea.StatusWord = - (USHORT)Context->FloatSave.StatusWord; - FxSaveArea->U.FxArea.TagWord = - KiTagWordFnsaveToFxsave((USHORT)Context->FloatSave.TagWord); - FxSaveArea->U.FxArea.ErrorOpcode = - (USHORT)((Context->FloatSave.ErrorSelector >> 16) & 0xFFFF); - FxSaveArea->U.FxArea.ErrorOffset = - Context->FloatSave.ErrorOffset; - FxSaveArea->U.FxArea.ErrorSelector = - Context->FloatSave.ErrorSelector & 0xFFFF; - FxSaveArea->U.FxArea.DataOffset = - Context->FloatSave.DataOffset; - FxSaveArea->U.FxArea.DataSelector = - Context->FloatSave.DataSelector; - - /* Clear out the Register Area */ - RtlZeroMemory(&FxSaveArea->U.FxArea.RegisterArea[0], - SIZE_OF_FX_REGISTERS); - - /* Loop the 8 floating point registers */ - for (i = 0; i < 8; i++) - { - /* Copy from Fn to Fx */ - RtlCopyMemory(FxSaveArea->U.FxArea.RegisterArea + (i * 16), - Context->FloatSave.RegisterArea + (i * 10), - 10); - } - } - else + /* Check if we have Fxsr support */ + if (KeI386FxsrPresent) + { + /* Convert the Fn Floating Point state to Fx */ + FxSaveArea->U.FxArea.ControlWord = (USHORT)Context->FloatSave.ControlWord; + FxSaveArea->U.FxArea.StatusWord = (USHORT)Context->FloatSave.StatusWord; + FxSaveArea->U.FxArea.TagWord = + KiTagWordFnsaveToFxsave((USHORT)Context->FloatSave.TagWord); + FxSaveArea->U.FxArea.ErrorOpcode = + (USHORT)((Context->FloatSave.ErrorSelector >> 16) & 0xFFFF); + FxSaveArea->U.FxArea.ErrorOffset = Context->FloatSave.ErrorOffset; + FxSaveArea->U.FxArea.ErrorSelector = Context->FloatSave.ErrorSelector & 0xFFFF; + FxSaveArea->U.FxArea.DataOffset = Context->FloatSave.DataOffset; + FxSaveArea->U.FxArea.DataSelector = Context->FloatSave.DataSelector; + + /* Clear out the Register Area */ + RtlZeroMemory(&FxSaveArea->U.FxArea.RegisterArea[0], SIZE_OF_FX_REGISTERS); + + /* Loop the 8 floating point registers */ + for (i = 0; i < 8; i++) { - /* Copy the structure */ - FxSaveArea->U.FnArea.ControlWord = Context->FloatSave. - ControlWord; - FxSaveArea->U.FnArea.StatusWord = Context->FloatSave. - StatusWord; - FxSaveArea->U.FnArea.TagWord = Context->FloatSave.TagWord; - FxSaveArea->U.FnArea.ErrorOffset = Context->FloatSave. - ErrorOffset; - FxSaveArea->U.FnArea.ErrorSelector = Context->FloatSave. - ErrorSelector; - FxSaveArea->U.FnArea.DataOffset = Context->FloatSave. - DataOffset; - FxSaveArea->U.FnArea.DataSelector = Context->FloatSave. - DataSelector; - - /* Loop registers */ - for (i = 0; i < SIZE_OF_80387_REGISTERS; i++) - { - /* Copy registers */ - FxSaveArea->U.FnArea.RegisterArea[i] = - Context->FloatSave.RegisterArea[i]; - } + /* Copy from Fn to Fx */ + RtlCopyMemory(FxSaveArea->U.FxArea.RegisterArea + (i * 16), + Context->FloatSave.RegisterArea + (i * 10), + 10); } + } + else + { + /* Copy the structure */ + FxSaveArea->U.FnArea.ControlWord = Context->FloatSave.ControlWord; + FxSaveArea->U.FnArea.StatusWord = Context->FloatSave.StatusWord; + FxSaveArea->U.FnArea.TagWord = Context->FloatSave.TagWord; + FxSaveArea->U.FnArea.ErrorOffset = Context->FloatSave.ErrorOffset; + FxSaveArea->U.FnArea.ErrorSelector = Context->FloatSave.ErrorSelector; + FxSaveArea->U.FnArea.DataOffset = Context->FloatSave.DataOffset; + FxSaveArea->U.FnArea.DataSelector = Context->FloatSave.DataSelector; - /* Mask out any invalid flags */ - FxSaveArea->Cr0NpxState &= ~(CR0_EM | CR0_MP | CR0_TS); - - /* Check if this is a VDM app */ - if (PsGetCurrentProcess()->VdmObjects) + /* Loop registers */ + for (i = 0; i < SIZE_OF_80387_REGISTERS; i++) { - /* Allow the EM flag */ - FxSaveArea->Cr0NpxState |= Context->FloatSave.Cr0NpxState & - (CR0_EM | CR0_MP); + /* Copy registers */ + FxSaveArea->U.FnArea.RegisterArea[i] = Context->FloatSave.RegisterArea[i]; } } - else + + /* Mask out any invalid flags */ + FxSaveArea->Cr0NpxState &= ~(CR0_EM | CR0_MP | CR0_TS); + + /* Check if this is a VDM app */ + if (PsGetCurrentProcess()->VdmObjects) { - /* FIXME: Handle FPU Emulation */ - //ASSERT(FALSE); - UNIMPLEMENTED; + /* Allow the EM flag */ + FxSaveArea->Cr0NpxState |= Context->FloatSave.Cr0NpxState & (CR0_EM | CR0_MP); } } @@ -698,17 +668,13 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, /* Get the FX Save Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); - /* Make sure NPX is present */ - if (KeI386NpxPresent) - { - /* Flush the NPX State */ - KiFlushNPXState(NULL); + /* Flush the NPX State */ + KiFlushNPXState(NULL); - /* Copy the registers */ - RtlCopyMemory(&Context->ExtendedRegisters[0], - &FxSaveArea->U.FxArea, - MAXIMUM_SUPPORTED_EXTENSION); - } + /* Copy the registers */ + RtlCopyMemory(&Context->ExtendedRegisters[0], + &FxSaveArea->U.FxArea, + MAXIMUM_SUPPORTED_EXTENSION); } /* Handle Floating Point */ @@ -718,49 +684,38 @@ KeTrapFrameToContext(IN PKTRAP_FRAME TrapFrame, /* Get the FX Save Area */ FxSaveArea = (PFX_SAVE_AREA)(TrapFrame + 1); - /* Make sure we have an NPX */ - if (KeI386NpxPresent) - { - /* Check if we have Fxsr support */ - if (KeI386FxsrPresent) - { - /* Align the floating area to 16-bytes */ - FloatSaveArea = (FLOATING_SAVE_AREA*) - ((ULONG_PTR)&FloatSaveBuffer.UnalignedArea &~ 0xF); - - /* Get the State */ - KiFlushNPXState(FloatSaveArea); - } - else - { - /* We don't, use the FN area and flush the NPX State */ - FloatSaveArea = (FLOATING_SAVE_AREA*)&FxSaveArea->U.FnArea; - KiFlushNPXState(NULL); - } + /* Check if we have Fxsr support */ + if (KeI386FxsrPresent) + { + /* Align the floating area to 16-bytes */ + FloatSaveArea = (FLOATING_SAVE_AREA*)((ULONG_PTR)&FloatSaveBuffer.UnalignedArea &~ 0xF); - /* Copy structure */ - Context->FloatSave.ControlWord = FloatSaveArea->ControlWord; - Context->FloatSave.StatusWord = FloatSaveArea->StatusWord; - Context->FloatSave.TagWord = FloatSaveArea->TagWord; - Context->FloatSave.ErrorOffset = FloatSaveArea->ErrorOffset; - Context->FloatSave.ErrorSelector = FloatSaveArea->ErrorSelector; - Context->FloatSave.DataOffset = FloatSaveArea->DataOffset; - Context->FloatSave.DataSelector = FloatSaveArea->DataSelector; - Context->FloatSave.Cr0NpxState = FxSaveArea->Cr0NpxState; + /* Get the State */ + KiFlushNPXState(FloatSaveArea); + } + else + { + /* We don't, use the FN area and flush the NPX State */ + FloatSaveArea = (FLOATING_SAVE_AREA*)&FxSaveArea->U.FnArea; + KiFlushNPXState(NULL); + } - /* Loop registers */ - for (i = 0; i < SIZE_OF_80387_REGISTERS; i++) - { - /* Copy them */ - Context->FloatSave.RegisterArea[i] = - FloatSaveArea->RegisterArea[i]; - } - } - else - { - /* FIXME: Handle Emulation */ - ASSERT(FALSE); - } + /* Copy structure */ + Context->FloatSave.ControlWord = FloatSaveArea->ControlWord; + Context->FloatSave.StatusWord = FloatSaveArea->StatusWord; + Context->FloatSave.TagWord = FloatSaveArea->TagWord; + Context->FloatSave.ErrorOffset = FloatSaveArea->ErrorOffset; + Context->FloatSave.ErrorSelector = FloatSaveArea->ErrorSelector; + Context->FloatSave.DataOffset = FloatSaveArea->DataOffset; + Context->FloatSave.DataSelector = FloatSaveArea->DataSelector; + Context->FloatSave.Cr0NpxState = FxSaveArea->Cr0NpxState; + + /* Loop registers */ + for (i = 0; i < SIZE_OF_80387_REGISTERS; i++) + { + /* Copy them */ + Context->FloatSave.RegisterArea[i] = FloatSaveArea->RegisterArea[i]; + } } /* Handle debug registers */ diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 10889c0195c..7f0651e260a 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -85,58 +85,6 @@ KiInitMachineDependent(VOID) /* Check for PAT support and enable it */ if (KeFeatureBits & KF_PAT) KiInitializePAT(); - /* Assume no errata for now */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = 0; - - /* Check if we have an NPX */ - if (KeI386NpxPresent) - { - /* Loop every CPU */ - i = KeActiveProcessors; - for (Affinity = 1; i; Affinity <<= 1) - { - /* Check if this is part of the set */ - if (i & Affinity) - { - /* Run on this CPU */ - i &= ~Affinity; - KeSetSystemAffinityThread(Affinity); - - /* Detect FPU errata */ - if (KiIsNpxErrataPresent()) - { - /* Disable NPX support */ - KeI386NpxPresent = FALSE; - SharedUserData-> - ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = - TRUE; - break; - } - } - } - } - - /* If there's no NPX, then we're emulating the FPU */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = - !KeI386NpxPresent; - - /* Check if there's no NPX, so that we can disable associated features */ - if (!KeI386NpxPresent) - { - /* Remove NPX-related bits */ - KeFeatureBits &= ~(KF_XMMI64 | KF_XMMI | KF_FXSR | KF_MMX); - - /* Disable kernel flags */ - KeI386FxsrPresent = KeI386XMMIPresent = FALSE; - - /* Disable processor features that might've been set until now */ - SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = - SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = - SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = 0; - } - /* Check for CR4 support */ if (KeFeatureBits & KF_CR4) { @@ -459,6 +407,21 @@ KiVerifyCpuFeatures(PKPRCB Prcb) KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x2, 0x00000001, 0, 0); } + // Set up FPU-related CR0 flags. + ULONG Cr0 = __readcr0(); + // Disable emulation and monitoring. + Cr0 &= ~(CR0_EM | CR0_MP); + // Enable FPU exceptions. + Cr0 |= CR0_NE; + + __writecr0(Cr0); + + // Check for Pentium FPU bug. + if (KiIsNpxErrataPresent()) + { + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x2, 0x00000001, 0, 0); + } + // 5. Save feature bits. Prcb->FeatureBits = FeatureBits; } @@ -590,6 +553,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, ((PETHREAD)InitThread)->ThreadsProcess = (PEPROCESS)InitProcess; /* Set basic CPU Features that user mode can read */ + SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; SharedUserData->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = (KeFeatureBits & KF_MMX) ? TRUE: FALSE; SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index 11bf02de2fb..ae9a599a8e2 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -152,28 +152,17 @@ KiInitializeContextThread(IN PKTHREAD Thread, Context->FloatSave.DataSelector = 0; } - /* Check if the CPU has NPX */ - if (KeI386NpxPresent) - { - /* Set an intial NPX State */ - Context->FloatSave.Cr0NpxState = 0; - FxSaveArea->Cr0NpxState = 0; - FxSaveArea->NpxSavedCpu = 0; - - /* Now set the context flags depending on XMM support */ - ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : - CONTEXT_FLOATING_POINT; - - /* Set the Thread's NPX State */ - Thread->NpxState = NPX_STATE_NOT_LOADED; - Thread->Header.NpxIrql = PASSIVE_LEVEL; - } - else - { - /* We'll use emulation */ - FxSaveArea->Cr0NpxState = CR0_EM; - Thread->NpxState = NPX_STATE_NOT_LOADED &~ CR0_MP; - } + /* Set an intial NPX State */ + Context->FloatSave.Cr0NpxState = 0; + FxSaveArea->Cr0NpxState = 0; + FxSaveArea->NpxSavedCpu = 0; + + /* Now set the context flags depending on XMM support */ + ContextFlags |= (KeI386FxsrPresent) ? CONTEXT_EXTENDED_REGISTERS : CONTEXT_FLOATING_POINT; + + /* Set the Thread's NPX State */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + Thread->Header.NpxIrql = PASSIVE_LEVEL; /* Disable any debug registers */ Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS;

2 years, 7 months

[reactos] 02/03: [NTOS:KE] Add a check for unsupported CPU features on i586

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1aca6937ff8a450bcc468… commit 1aca6937ff8a450bcc4681816a84cd4b1127f294 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Jan 15 03:42:59 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Jan 25 02:12:33 2022 +0300 [NTOS:KE] Add a check for unsupported CPU features on i586 Currently, these features are vital for the kernel: - CPUID instruction - CMPXCHG8B instruction - TSC aka Time Stamp Counter All of that have to be present on i586 --- ntoskrnl/ke/i386/kiinit.c | 69 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 50 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 5c24902d2e5..10889c0195c 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -397,38 +397,69 @@ CODE_SEG("INIT") VOID KiVerifyCpuFeatures(PKPRCB Prcb) { - ULONG FeatureBits; + CPU_INFO CpuInfo; - /* Detect and set the CPU Type */ - KiSetProcessorType(); + // 1. Check CPUID support + ULONG EFlags = __readeflags(); + + /* XOR out the ID bit and update EFlags */ + ULONG NewEFlags = EFlags ^ EFLAGS_ID; + __writeeflags(NewEFlags); - /* Check if an FPU is present */ - KeI386NpxPresent = KiIsNpxPresent(); + /* Get them back and see if they were modified */ + NewEFlags = __readeflags(); + + if (NewEFlags == EFlags) + { + /* The modification did not work, so CPUID is not supported. */ + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x1, 0, 0, 0); + } + else + { + /* CPUID is supported. Set the ID Bit again. */ + EFlags |= EFLAGS_ID; + __writeeflags(EFlags); + } + + /* Peform CPUID 0 to see if CPUID 1 is supported */ + KiCpuId(&CpuInfo, 0); + if (CpuInfo.Eax == 0) + { + // 0x1 - missing CPUID instruction + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x1, 0, 0, 0); + } + + // 2. Detect and set the CPU Type + KiSetProcessorType(); - /* Bugcheck if this is a 386 CPU */ if (Prcb->CpuType == 3) KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x386, 0, 0, 0); - /* Get the processor features for the CPU */ - FeatureBits = KiGetFeatureBits(); + // 3. Finally, obtain CPU features. + ULONG FeatureBits = KiGetFeatureBits(); + + // 4. Verify it supports everything we need. + if (!(FeatureBits & KF_RDTSC)) + { + // 0x2 - missing CPUID features + // second paramenter - edx flag which is missing + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x2, 0x00000010, 0, 0); + } - /* Detect 8-byte compare exchange support */ if (!(FeatureBits & KF_CMPXCHG8B)) { - ULONG Vendor[3]; + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x2, 0x00000100, 0, 0); + } - /* Copy the vendor string */ - RtlCopyMemory(Vendor, Prcb->VendorString, sizeof(Vendor)); + // Check x87 FPU is present. FIXME: put this into FeatureBits? + KiCpuId(&CpuInfo, 1); - /* Bugcheck the system. Windows *requires* this */ - KeBugCheckEx(UNSUPPORTED_PROCESSOR, - (1 << 24 ) | (Prcb->CpuType << 16) | Prcb->CpuStep, - Vendor[0], - Vendor[1], - Vendor[2]); + if (!(CpuInfo.Edx & 0x00000001)) + { + KeBugCheckEx(UNSUPPORTED_PROCESSOR, 0x2, 0x00000001, 0, 0); } - /* Save feature bits */ + // 5. Save feature bits. Prcb->FeatureBits = FeatureBits; }

2 years, 7 months

← Newer
1
2
3
4
5
6
7
...
18
Older →

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 January 2022