Ros-diffs

ros-diffs@reactos.org

11 participants
81015 discussions

[reactos] 01/01: [MSGINA] Update Romanian (ro-RO) translation (#6062)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=212f3eaf00f7caf7eb6e9… commit 212f3eaf00f7caf7eb6e907eb4335bbc182edd83 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 1 16:32:38 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 15:32:38 2023 +0100 [MSGINA] Update Romanian (ro-RO) translation (#6062) --- dll/win32/msgina/lang/ro-RO.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index c5b896fa831..a46ac7cd2e8 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -223,7 +223,7 @@ BEGIN IDS_PRESSCTRLALTDELETE "Pentru autentificare, apăsați «Ctrl»+«Alt»+«Del»." IDS_ASKFORUSER "Nume utilizator: " IDS_ASKFORPASSWORD "Parola: " - IDS_FORCELOGOFF "Această acțiune va deautentifica utilizatorului curent cu posibile pierderi ale datelor nepăstrate. Continuați?" + IDS_FORCELOGOFF "Această acțiune va deautentifica utilizatorului curent cu posibile pierderi ale datelor nesalvate. Continuați?" IDS_LOCKMSG "Doar %s sau un Administrator poate debloca acest calculator." IDS_LOGONMSG "Sunteți autentificat ca %s." IDS_LOGONDATE "Data autentificării: %s %s" @@ -244,9 +244,9 @@ BEGIN IDS_INVALIDWORKSTATION "Contul dumneavoastră este configurat pentru a vă preveni în a folosi acest calculator. Încercați la alt calculator." IDS_ACCOUNTRESTRICTION "Eșec în conectarea dumneavoastră din cauza unei restricții a contului." IDS_EMERGENCYLOGOFFTITLE "Deautentificare din ReactOS" - IDS_EMERGENCYLOGOFF "Apăsați Confirmă pentru a vă deautentifica imediat. Toate datele nepăstrate vor fi pierdute. Folosiți acest lucru doar ca ultimă soluție." + IDS_EMERGENCYLOGOFF "Apăsați Confirmă pentru a vă deautentifica imediat. Toate datele nesalvate vor fi pierdute. Folosiți acest lucru doar ca ultimă soluție." IDS_EMERGENCYRESTARTTITLE "Repornire de urgență" - IDS_EMERGENCYRESTART "Apăsați Confirmă pentru a vă reporni calculatorul imediat. Toate datele nepăstrate vor fi pierdute. Folosiți acest lucru doar ca ultimă soluție." + IDS_EMERGENCYRESTART "Apăsați Confirmă pentru a vă reporni calculatorul imediat. Toate datele nesalvate vor fi pierdute. Folosiți acest lucru doar ca ultimă soluție." END /* Shutdown Dialog Strings */ @@ -262,5 +262,5 @@ BEGIN IDS_SHUTDOWN_SHUTDOWN_DESC "Închide atât sesiunea curentă cât și sistemul de operare pentru a puta opri în siguranță alimentarea electrică." IDS_SHUTDOWN_RESTART_DESC "Închide sesiunea curentă și repornește sistemul." IDS_SHUTDOWN_SLEEP_DESC "Induce sistemul în starea de veghe." - IDS_SHUTDOWN_HIBERNATE_DESC "Păstrează sesiunea curentă și oprește calculatorul." + IDS_SHUTDOWN_HIBERNATE_DESC "Salvează sesiunea curentă și oprește calculatorul." END

1 year, 1 month

[reactos] 01/01: [COMDLG32] Update Romanian (ro-RO) translation (#6076)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ed370c86e612c31762ac… commit 8ed370c86e612c31762ac26e52220d8b62c45704 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Fri Dec 1 16:27:36 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 15:27:36 2023 +0100 [COMDLG32] Update Romanian (ro-RO) translation (#6076) --- dll/win32/comdlg32/lang/cdlg_Ro.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/comdlg32/lang/cdlg_Ro.rc b/dll/win32/comdlg32/lang/cdlg_Ro.rc index ed91c9c18b5..3a2b6dbb7c1 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ro.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ro.rc @@ -62,12 +62,12 @@ Corectați marginile." PD32_NR_OF_COPIES_EMPTY "Numărul de copii nu poate fi nul." PD32_TOO_LARGE_COPIES "Imprimanta nu susține un număr atât de mare de copii.\n\ Introduceți un număr între 1 și %d." - PD32_PRINT_ERROR "A survenit o eroare la imprimare." + PD32_PRINT_ERROR "A apărut o eroare la imprimare." PD32_NO_DEFAULT_PRINTER "Imprimanta implicită nu a fost definită." PD32_CANT_FIND_PRINTER "Imprimanta nu poate fi găsită." PD32_OUT_OF_MEMORY "Memorie insuficientă." - PD32_GENERIC_ERROR "A survenit o eroare." - PD32_DRIVER_UNKNOWN "Modulul-pilot de imprimantă este necunoscut." + PD32_GENERIC_ERROR "A apărut o eroare." + PD32_DRIVER_UNKNOWN "Driverul de imprimantă este necunoscut." PD32_NO_DEVICES "Este necesară instalarea unei imprimante înainte de a putea efectua activități aferente imprimantei (cum ar fi accesarea opțiunilor de pagină sau imprimarea unui document). Instalați o imprimantă apoi reîncercați." PD32_DEFAULT_PRINTER "Imprimantă implicită; "

1 year, 1 month

[reactos] 01/01: [NETCFGX] IDD_TCPIP_BASIC_DLG Radiobuttons need 2 arrow-down-presses instead of one (#6049)

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5012c6a2b02930397856f… commit 5012c6a2b02930397856f2e7271d96fd6b790205 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Dec 1 15:19:32 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 14:19:32 2023 +0000 [NETCFGX] IDD_TCPIP_BASIC_DLG Radiobuttons need 2 arrow-down-presses instead of one (#6049) We do have to reorder the controls. We do have to add some missing WS_TABSTOP in some languages. We do have to strip some dots in some languages. --- dll/win32/netcfgx/lang/bg-BG.rc | 4 ++-- dll/win32/netcfgx/lang/cs-CZ.rc | 4 ++-- dll/win32/netcfgx/lang/da-DK.rc | 4 ++-- dll/win32/netcfgx/lang/de-DE.rc | 4 ++-- dll/win32/netcfgx/lang/el-GR.rc | 4 ++-- dll/win32/netcfgx/lang/en-US.rc | 4 ++-- dll/win32/netcfgx/lang/es-ES.rc | 4 ++-- dll/win32/netcfgx/lang/fr-FR.rc | 4 ++-- dll/win32/netcfgx/lang/he-IL.rc | 4 ++-- dll/win32/netcfgx/lang/hu-HU.rc | 4 ++-- dll/win32/netcfgx/lang/id-ID.rc | 4 ++-- dll/win32/netcfgx/lang/it-IT.rc | 4 ++-- dll/win32/netcfgx/lang/ja-JP.rc | 4 ++-- dll/win32/netcfgx/lang/nl-NL.rc | 4 ++-- dll/win32/netcfgx/lang/no-NO.rc | 4 ++-- dll/win32/netcfgx/lang/pl-PL.rc | 4 ++-- dll/win32/netcfgx/lang/pt-PT.rc | 4 ++-- dll/win32/netcfgx/lang/ro-RO.rc | 4 ++-- dll/win32/netcfgx/lang/ru-RU.rc | 4 ++-- dll/win32/netcfgx/lang/sk-SK.rc | 4 ++-- dll/win32/netcfgx/lang/sq-AL.rc | 4 ++-- dll/win32/netcfgx/lang/sv-SE.rc | 4 ++-- dll/win32/netcfgx/lang/tr-TR.rc | 4 ++-- dll/win32/netcfgx/lang/uk-UA.rc | 4 ++-- dll/win32/netcfgx/lang/zh-CN.rc | 4 ++-- dll/win32/netcfgx/lang/zh-HK.rc | 4 ++-- dll/win32/netcfgx/lang/zh-TW.rc | 4 ++-- 27 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dll/win32/netcfgx/lang/bg-BG.rc b/dll/win32/netcfgx/lang/bg-BG.rc index 65e25083d54..54b1119d2cc 100644 --- a/dll/win32/netcfgx/lang/bg-BG.rc +++ b/dll/win32/netcfgx/lang/bg-BG.rc @@ -6,8 +6,8 @@ CAPTION "Общи" FONT 8, "MS Shell Dlg" BEGIN LTEXT "IP настройките ви могат да се получат сами, ако мрежата ви го поддържа. В противен случай, трябва да попитате мрежовия си управител за правилните IP настройки.", -1, 9, 9, 235, 27 - CONTROL "Самополучаване на IP адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Самополучаване на IP адрес", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "Из&ползване на следния IP адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP адрес:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Разпределител (gateway):", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Самополучаване на адреса на DNS сървъра", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Самополучаване на адреса на DNS сървъра", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "Из&ползване на следните адреси за DNS сървър", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Предпочитан DNS сървър:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/cs-CZ.rc b/dll/win32/netcfgx/lang/cs-CZ.rc index e3de3d634ee..fb8e44a87d7 100644 --- a/dll/win32/netcfgx/lang/cs-CZ.rc +++ b/dll/win32/netcfgx/lang/cs-CZ.rc @@ -9,8 +9,8 @@ CAPTION "Obecné nastavení" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Konfigurace IP adres může proběhnout automaticky, pokud to síť dovoluje. V opačném případě kontaktujte správce sítě pro správné nastavení.", -1, 9, 9, 228, 27 - CONTROL "Získat IP adresu automaticky", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Získat IP adresu automaticky", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Použít následující IP adresu:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP adresa:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -18,8 +18,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Výchozí brána:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Získat adresy DNS serverů automaticky", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Získat adresy DNS serverů automaticky", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Použít následující adresy DNS serverů", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Upřednostňovaný DNS server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/da-DK.rc b/dll/win32/netcfgx/lang/da-DK.rc index 7f1eb05fea9..80f11ccddf2 100644 --- a/dll/win32/netcfgx/lang/da-DK.rc +++ b/dll/win32/netcfgx/lang/da-DK.rc @@ -6,8 +6,8 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Du kan få din IP opsætning indstillet automatisk, hvis dit Netværkskort understøtter denne mulighed. Ellers, er du nød til at spørge din 'Netværks Administrator' omkring din IP opsætning.", -1, 9, 9, 235, 27 - CONTROL "Tildel Automatisk en IP Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Tildel Automatisk en IP Adresse", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Brug følge IP Adresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP Adresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Standard gateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Tildel automatisk en DNS server adresse.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Tildel automatisk en DNS server adresse", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Brug følgende DNS Server Adresse:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Fortrukket DNS server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/de-DE.rc b/dll/win32/netcfgx/lang/de-DE.rc index a848d8dadba..5797c535b57 100644 --- a/dll/win32/netcfgx/lang/de-DE.rc +++ b/dll/win32/netcfgx/lang/de-DE.rc @@ -6,8 +6,8 @@ CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN LTEXT "IP-Einstellungen können automatisch zugewiesen werden, wenn das Netzwerk diese Funktion unterstützt. Wenden Sie sich andernfalls an den Netzwerkadministrator, um die geeigneten IP-Einstellungen zu beziehen.", -1, 9, 9, 235, 27 - CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "I&P-Adresse automatisch beziehen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "Folgende IP-&Adresse verwenden:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "&IP-Adresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "&Standardgateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "D&NS-Serveradresse automatisch beziehen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "Folgende DNS-Serveradressen &verwenden:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "&Bevorzugter DNS-Server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/el-GR.rc b/dll/win32/netcfgx/lang/el-GR.rc index 791bcb4f3c7..c227d76ec41 100644 --- a/dll/win32/netcfgx/lang/el-GR.rc +++ b/dll/win32/netcfgx/lang/el-GR.rc @@ -6,8 +6,8 @@ CAPTION "Γενικά" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Μπορείτε να ορίσετε τις IP παραμέτρους αυτόματα, εάν το δίκτυό σας υποστηρίζει αυτήξ τη δυνατότητα. Ειδάλλως θα πρέπει να ρωτήσετε τον διαχειριστή δικτύου σας για τις for the κατάλληλες ρυθμίσεις IP.", -1, 9, 9, 235, 27 - CONTROL "Να γίνεται εύρεση της διεύθυνσης IP αυτόματα", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Να γίνεται εύρεση της διεύθυνσης IP αυτόματα", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Διεύθυνση IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Default gateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Να γίνεται εύρεση της διεύθυνσης του DNS διακομιστή αυτόματα", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Να γίνεται εύρεση της διεύθυνσης του DNS διακομιστή αυτόματα", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Χρήση των παρακάτω διευθύσεων DNS διακομιστών", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Προτιμητέος DNS διακομιστής:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/en-US.rc b/dll/win32/netcfgx/lang/en-US.rc index b2533c81dbe..358ac48e063 100644 --- a/dll/win32/netcfgx/lang/en-US.rc +++ b/dll/win32/netcfgx/lang/en-US.rc @@ -6,8 +6,8 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27 - CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP address:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Default gateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Use the following DNS server addresses:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Preferred DNS server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/es-ES.rc b/dll/win32/netcfgx/lang/es-ES.rc index 957f0a9e246..ae490b23a13 100644 --- a/dll/win32/netcfgx/lang/es-ES.rc +++ b/dll/win32/netcfgx/lang/es-ES.rc @@ -14,8 +14,8 @@ CAPTION "General" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Se pueden asignar las propiedades de IP automáticamente si su red soporta esta capacidad. Si no, debe contactar a su administrador de red para obtener los ajustes necesarios.", -1, 9, 9, 235, 27 - CONTROL "Obtener dirección IP automáticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Obtener dirección IP automáticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Usar la siguiente dirección IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 110, 12 LTEXT "Dirección IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 140, 75 - 2, 85, 12 @@ -23,8 +23,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 140, 90 - 2, 85, 12 LTEXT "Puerta de enlace predeterminada:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 140, 105 - 2, 85, 12 - CONTROL "Obtener dirección del servidor DNS automáticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Obtener dirección del servidor DNS automáticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Usar las siguientes direcciones DNS:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 130, 12 LTEXT "Servidor DNS preferido:", -1, 14, 161, 160, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 140, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/fr-FR.rc b/dll/win32/netcfgx/lang/fr-FR.rc index 4725ee8c40d..87832eb63ed 100644 --- a/dll/win32/netcfgx/lang/fr-FR.rc +++ b/dll/win32/netcfgx/lang/fr-FR.rc @@ -6,8 +6,8 @@ CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Vous pouvez automatiquement régler les paramètres si votre réseau supporte cette possibilité. Sinon, vous devez demander les réglages IP nécessaires à votre administrateur réseau.", -1, 9, 9, 235, 27 - CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Obtenir automatiquement l'adresse IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Utiliser l'adresse IP suivante :", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Adresse IP :", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Passerelle par défaut :", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Obtenir automatiquement l'adresse du serveur DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Utiliser les adresses de serveur DNS suivantes", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Serveur DNS primaire :", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/he-IL.rc b/dll/win32/netcfgx/lang/he-IL.rc index ea4651fee7d..a39e64a6d60 100644 --- a/dll/win32/netcfgx/lang/he-IL.rc +++ b/dll/win32/netcfgx/lang/he-IL.rc @@ -6,8 +6,8 @@ CAPTION "כללי" FONT 8, "MS Shell Dlg" BEGIN LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27 - CONTROL "השג כתובת IP באופן אוטומטי", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "השג כתובת IP באופן אוטומטי", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "השתמש בכתובת הIP הבאה:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "כתובת IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "שער ברירת מחדל:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "השג כתובת שרת DNS באופן אוטומטי.", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "השג כתובת שרת DNS באופן אוטומטי", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "השתמש בכתובות שרתי הDNS הבאים:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "שרת DNS מועדף:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/hu-HU.rc b/dll/win32/netcfgx/lang/hu-HU.rc index 128ca3ea63e..e44b7653080 100644 --- a/dll/win32/netcfgx/lang/hu-HU.rc +++ b/dll/win32/netcfgx/lang/hu-HU.rc @@ -6,8 +6,8 @@ CAPTION "Általános" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Az IP-beállításokat automatikusan is megkaphatja, ha hálózata támogatja ezt a képességet. Eltérõ esetben keresse meg hálózati rendszergazdáját a helyes IP-beállításokért.", -1, 9, 9, 235, 27 - CONTROL "IP-cím automatikus lekérése", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "IP-cím automatikus lekérése", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "A &következõ IP-cím használata:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP cím:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Alapértelmezett átjáró:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "A DNS-kiszolgáló címének automatikus lekérése", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "A kö&vetkezõ DNS-kiszolgálók használata", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Elsõdleges DNS-kiszolgáló:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/id-ID.rc b/dll/win32/netcfgx/lang/id-ID.rc index 681ca31aa52..2feb756df05 100644 --- a/dll/win32/netcfgx/lang/id-ID.rc +++ b/dll/win32/netcfgx/lang/id-ID.rc @@ -6,8 +6,8 @@ CAPTION "Umum" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Anda bisa mendapatkan setelan IP terisi secara otomatis ika jaringan anda mendukung kemampuan ini. Sebaliknya, anda perlu untuk meminta administrator jaringan anda setelan IP yang benar.", -1, 9, 9, 235, 27 - CONTROL "Peroleh alamat IP secara otomatis", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Peroleh alamat IP secara otomatis", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Gunakan alamat IP berikut:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Alamat IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Gateway standar:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Peroleh alamat serverO DNS secara otomatis", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Peroleh alamat serverO DNS secara otomatis", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Gunakan alamat server DNS berikut", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Server DNS Disukai:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/it-IT.rc b/dll/win32/netcfgx/lang/it-IT.rc index 4e127e80a79..25537f7df61 100644 --- a/dll/win32/netcfgx/lang/it-IT.rc +++ b/dll/win32/netcfgx/lang/it-IT.rc @@ -6,8 +6,8 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Puoi ottenere automaticamente la configurazione IP se la vostra rete lo supporta. Altrimenti è necessario contattare l'amministratore di rete per farsi dare le impostazioni appropriate.", -1, 9, 9, 235, 27 - CONTROL "Ottieni automaticamente l'indirizzo IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Ottieni automaticamente l'indirizzo IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Usa il seguente indirizzo IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Indirizzo IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Default gateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Ottieni automaticamente l'indirizzo dei server DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Ottieni automaticamente l'indirizzo dei server DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Usa i seguenti indirizzi DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Server DNS preferito:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/ja-JP.rc b/dll/win32/netcfgx/lang/ja-JP.rc index df5a08d0e3a..eed8b46b0a1 100644 --- a/dll/win32/netcfgx/lang/ja-JP.rc +++ b/dll/win32/netcfgx/lang/ja-JP.rc @@ -6,8 +6,8 @@ CAPTION "全般" FONT 9, "MS UI Gothic" BEGIN LTEXT "ネットワークでこの機能がサポートされている場合は、IP 設定を自動的に取得することができます。サポートされていない場合は、ネットワーク管理者に適切な IP 設定を問い合わせてください。", -1, 9, 9, 235, 27 - CONTROL "IP アドレスを自動的に取得する", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "IP アドレスを自動的に取得する", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "次の IP アドレスを使う(&U):", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP アドレス:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "デフォルトゲートウェイ:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "DNS サーバーのアドレスを自動的に取得する", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "DNS サーバーのアドレスを自動的に取得する", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "次の DNS サーバーのアドレスを使う(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "優先 DNS サーバー:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/nl-NL.rc b/dll/win32/netcfgx/lang/nl-NL.rc index 28d53a940d7..8b3fd84e94e 100644 --- a/dll/win32/netcfgx/lang/nl-NL.rc +++ b/dll/win32/netcfgx/lang/nl-NL.rc @@ -6,8 +6,8 @@ CAPTION "Algemeen" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Een IP-adres kan automatisch worden toegewezen aan deze computer. Als uw netwerk dit niet automatisch doet kunt u het adres zelf invullen.", -1, 9, 9, 235, 27 - CONTROL "&Automatisch een IP-adres verkrijgen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "&Automatisch een IP-adres verkrijgen", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Een IP-adres opgeven:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP-adres:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Standaardgateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "DNS-serveradres automatisch verkrijgen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "DNS-serveradres automatisch verkrijgen", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "De volgende DNS-serveradressen gebruiken:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Voorkeurs-DNS-server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/no-NO.rc b/dll/win32/netcfgx/lang/no-NO.rc index 373e6007231..22004304587 100644 --- a/dll/win32/netcfgx/lang/no-NO.rc +++ b/dll/win32/netcfgx/lang/no-NO.rc @@ -6,8 +6,8 @@ CAPTION "Generielt" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Du kan få IP innstillinger automatisk hvis ditt nettverk støtter denne muligheten. Ellers, trenger du å spørre din nettverk administrator for å få IP innstillingene.", -1, 9, 9, 235, 27 - CONTROL "Motta IP addressen automatisk", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Motta IP addressen automatisk", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Bruk følgende IP addresse:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP addresse:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Standard gateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Motta DNS server addresse automatisk", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Motta DNS server addresse automatisk", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Bruk følgende DNS server addresser", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Forvalgt DNS server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/pl-PL.rc b/dll/win32/netcfgx/lang/pl-PL.rc index c169edebe92..4041f61ae69 100644 --- a/dll/win32/netcfgx/lang/pl-PL.rc +++ b/dll/win32/netcfgx/lang/pl-PL.rc @@ -8,8 +8,8 @@ CAPTION "Ogólne" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Możesz automatycznie pobrać ustawienia sieciowe protokołu IP, jeżeli Twoja sieć obsługuje te funkcje. W innym przypadku musisz skontaktować się z administratorem sieci w celu zdobycia odpowiednich ustawień.", -1, 9, 7, 235, 34 - CONTROL "Pobierz adres IP automatycznie", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Pobierz adres IP automatycznie", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Użyj następującego adresu IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Adres IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -17,8 +17,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Brama domyślna:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Pobierz adresy serwerów DNS automatycznie", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Pobierz adresy serwerów DNS automatycznie", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Użyj poniższych adresów serwera DNS", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Pierwszy serwer DNS:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc index f13e3315d02..039cebb4b6a 100644 --- a/dll/win32/netcfgx/lang/pt-PT.rc +++ b/dll/win32/netcfgx/lang/pt-PT.rc @@ -8,8 +8,8 @@ CAPTION "Geral" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Pode obter as configurações de IP atribuídas automaticamente se a sua rede suportar esse recurso. Caso contrário, precisará solicitar ao administrador da rede as configurações de IP apropriadas.", -1, 9, 9, 235, 27 - CONTROL "Obter o endereço IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Obter o endereço IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Usar o endereço IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Endereço IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -17,8 +17,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Gateway padrão:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Obter o endereço DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Obter o endereço DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Usar o endereço DNS :", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Servidor DNS perferido:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/ro-RO.rc b/dll/win32/netcfgx/lang/ro-RO.rc index e5215219b27..57f10cc542e 100644 --- a/dll/win32/netcfgx/lang/ro-RO.rc +++ b/dll/win32/netcfgx/lang/ro-RO.rc @@ -8,8 +8,8 @@ CAPTION "Generale" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Puteți obține automat configurarea adresei IP în rețelele cu DHCP. Altfel, este necesară configurarea manuală de către administratorul de rețea.", -1, 9, 9, 235, 27 - CONTROL "&Obține automat adresă IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "&Obține automat adresă IP", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "Folosește adresa ur&mătoare:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Adresă I&P:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -17,8 +17,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "S&erver „poartă” implicit:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Obține a&utomat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Obține a&utomat adresa serverului DNS", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "Folosește adresa &DNS următoare", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Server DNS p&referat:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/ru-RU.rc b/dll/win32/netcfgx/lang/ru-RU.rc index f2797cd8b23..d10ceabeb80 100644 --- a/dll/win32/netcfgx/lang/ru-RU.rc +++ b/dll/win32/netcfgx/lang/ru-RU.rc @@ -6,8 +6,8 @@ CAPTION "Общие" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Параметры протокола IP могут назначаться автоматически, если сеть поддерживает эту возможность. В противном случае параметры IP можно получить у сетевого администратора.", -1, 9, 9, 235, 27 - CONTROL "Получать IP-адрес автоматически", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Получать IP-адрес автоматически", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Использовать следующий IP-адрес:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 140, 12 LTEXT "IP-адрес:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Шлюз по умолчанию:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Получать адрес DNS-сервера автоматически", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Получать адрес DNS-сервера автоматически", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Использовать следующие адреса DNS-серверов:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 185, 12 LTEXT "Предпочитаемый DNS-сервер:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/sk-SK.rc b/dll/win32/netcfgx/lang/sk-SK.rc index 9b1156a7ed8..f2a2c5bb770 100644 --- a/dll/win32/netcfgx/lang/sk-SK.rc +++ b/dll/win32/netcfgx/lang/sk-SK.rc @@ -6,8 +6,8 @@ CAPTION "Všeobecné" FONT 8, "MS Shell Dlg" BEGIN LTEXT "You can get IP settings assigned automatically if your network supports this capability. Otherwise, you need to ask your network administrator for the appropriate IP settings.", -1, 9, 9, 235, 27 - CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Obtain the IP address automatically", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Use the following IP address:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Adresa IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Predvolená brána:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Obtain the DNS server address automatically", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Use the following DNS server addresses", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Preferovaný DNS server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/sq-AL.rc b/dll/win32/netcfgx/lang/sq-AL.rc index 5b673ced9c4..ca63bd7e049 100644 --- a/dll/win32/netcfgx/lang/sq-AL.rc +++ b/dll/win32/netcfgx/lang/sq-AL.rc @@ -8,8 +8,8 @@ CAPTION "Përgjithshëm" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ju mund të merrni cilësimet e IP've të caktuara automatikisht në qoftë se rrjeti juaj mbështet këtë aftësi. Përndryshe, ju duhet të pyesni administratorin e rrjetit tuaj për cilësimet e duhura të IP've.", -1, 9, 9, 235, 27 - CONTROL "Marrë adresë IP'sh automatikisht", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Marrë adresë IP'sh automatikisht", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Përdor adresën e mëposhtme IP'së:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "Adresa IP:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -17,8 +17,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Gateway parazgjedhur:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Merr adresën e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Merr adresën e serverit DNS automatikisht", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Përdorni adresen DNS të server-it të mëposhtme", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "DNS'ja serverit e preferuar:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/sv-SE.rc b/dll/win32/netcfgx/lang/sv-SE.rc index bdd89153f31..d9600dd2a6e 100644 --- a/dll/win32/netcfgx/lang/sv-SE.rc +++ b/dll/win32/netcfgx/lang/sv-SE.rc @@ -6,8 +6,8 @@ CAPTION "Allmänt" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Du kan erhålla en IP-adress automatiskt om ditt nätverk stödjer detta. Annars måste du kontakta nätverksadministratören för att få de korrekta inställningarna.", -1, 9, 9, 235, 27 - CONTROL "Erhåll en IP-adress automatiskt", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Erhåll en IP-adress automatiskt", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Använd följande IP-adress:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP-adress:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Standard-gateway:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Erhåll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Erhåll adress till DNS-server automatiskt", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "&Använd följande adress till DNS-server:", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Önskad DNS-server:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/tr-TR.rc b/dll/win32/netcfgx/lang/tr-TR.rc index 705d0fde2da..74476640ea9 100644 --- a/dll/win32/netcfgx/lang/tr-TR.rc +++ b/dll/win32/netcfgx/lang/tr-TR.rc @@ -8,8 +8,8 @@ CAPTION "Özellik" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Eğer ağınız bu özelliği destekliyorsa otomatik atanmış IP ayarları alabilirsiniz. Yoksa, uygun IP ayarları için ağ yöneticinize başvurmanız gerekir.", -1, 9, 9, 235, 27 - CONTROL "IP adresini otomatik al", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "IP adresini otomatik al", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Aşağıdaki IP adresini kullan:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP adresi:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -17,8 +17,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Varsayılan geçit:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "DNS sunucusu adresini otomatik al", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "DNS sunucusu adresini otomatik al", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "A&şağıdaki DNS sunucusu adreslerini kullan", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Tercih edilen DNS sunucusu:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/uk-UA.rc b/dll/win32/netcfgx/lang/uk-UA.rc index ae19c910e9c..eb96e16a4b0 100644 --- a/dll/win32/netcfgx/lang/uk-UA.rc +++ b/dll/win32/netcfgx/lang/uk-UA.rc @@ -6,8 +6,8 @@ CAPTION "Загальні" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Параметри протоколу IP можуть призначатися автоматично, якщо мережа підтримує таку можливість. Інакше вам потрібно отримати ці параметри у адміністратора мережі.", -1, 9, 9, 235, 27 - CONTROL "Отримувати IP-адресу автоматично", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "Отримувати IP-адресу автоматично", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "&Використовувати наступну IP-адресу:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP-адреса:", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -15,8 +15,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "Шлюз за замовчуванням:", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "Отримувати адресу DNS-сервера автоматично", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "Отримувати адресу DNS-сервера автоматично", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "В&икористовувати наступні адреси DNS-серверів", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "Основний DNS-сервер:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/zh-CN.rc b/dll/win32/netcfgx/lang/zh-CN.rc index dc8da9cb79c..e7fbc9fe6b6 100644 --- a/dll/win32/netcfgx/lang/zh-CN.rc +++ b/dll/win32/netcfgx/lang/zh-CN.rc @@ -15,8 +15,8 @@ CAPTION "常规" FONT 9, "宋体" BEGIN LTEXT "如果您的网络支持自动分配 IP 地址，则可以自动获取 IP 地址。否则，您需要询问网络管理员来获得合适的 IP 设置。", -1, 9, 9, 235, 27 - CONTROL "自动取得IP 地址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "自动取得IP 地址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "使用下列的IP 地址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP 地址：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -24,8 +24,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "网关：", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "自动获得 DNS 服务器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "自动获得 DNS 服务器地址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "使用以下的 DNS 服务器地址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "首选的 DNS 服务器：", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/zh-HK.rc b/dll/win32/netcfgx/lang/zh-HK.rc index c58dc9741b9..855fba1851d 100644 --- a/dll/win32/netcfgx/lang/zh-HK.rc +++ b/dll/win32/netcfgx/lang/zh-HK.rc @@ -14,8 +14,8 @@ CAPTION "一般" FONT 9, "新細明體" BEGIN LTEXT "如果您的網絡支援這項功能，您可以取得自動指派的 IP 設定。否則就需要詢問網絡系統管理員以獲取正確的 IP 設定。", -1, 9, 9, 235, 27 - CONTROL "自動取得 IP 位址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "自動取得 IP 位址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "使用下列的 IP 位址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP 位址：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -23,8 +23,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "預設閘道：", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "自動獲得 DNS 伺服器位址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "自動獲得 DNS 伺服器位址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "首選的 DNS 伺服器：", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12 diff --git a/dll/win32/netcfgx/lang/zh-TW.rc b/dll/win32/netcfgx/lang/zh-TW.rc index d652a4272ba..4468e1f86dc 100644 --- a/dll/win32/netcfgx/lang/zh-TW.rc +++ b/dll/win32/netcfgx/lang/zh-TW.rc @@ -14,8 +14,8 @@ CAPTION "一般" FONT 9, "新細明體" BEGIN LTEXT "如果您的網路支援這項功能，您可以取得自動指派的 IP 設定。否則就需要詢問網路系統管理員以獲取正確的 IP 設定。", -1, 9, 9, 235, 27 - CONTROL "自動取得 IP 位址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 GROUPBOX "", -1, 9, 61, 228, 60, BS_GROUPBOX + CONTROL "自動取得 IP 位址", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 CONTROL "使用下列的 IP 位址(&U)：", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 LTEXT "IP 位址：", -1, 14, 75, 135, 8 CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 @@ -23,8 +23,8 @@ BEGIN CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 LTEXT "預設閘道：", -1, 14, 105, 135, 8 CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 - CONTROL "自動獲得 DNS 伺服器位址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 GROUPBOX "", -1, 9, 147, 228, 47, BS_GROUPBOX + CONTROL "自動獲得 DNS 伺服器位址", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 129, 210, 12 CONTROL "使用以下的 DNS 伺服器位址(&U)", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 145, 152, 12 LTEXT "首選的 DNS 伺服器:", -1, 14, 161, 135, 8 CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 161 - 2, 85, 12

1 year, 1 month

[reactos] 01/01: [DXG] Don't repeat "DXG" module name in version info

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0c17c3f462e3b62bf0c4… commit e0c17c3f462e3b62bf0c4ca2479c1e5c6b8ff496 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Fri Dec 1 08:23:13 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 08:23:13 2023 +0700 [DXG] Don't repeat "DXG" module name in version info --- win32ss/reactx/dxg/dxg.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/reactx/dxg/dxg.rc b/win32ss/reactx/dxg/dxg.rc index 759823e780f..07eb8607105 100644 --- a/win32ss/reactx/dxg/dxg.rc +++ b/win32ss/reactx/dxg/dxg.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "DXG DirectX interface Device Driver" +#define REACTOS_STR_FILE_DESCRIPTION "DirectX interface Device Driver" #define REACTOS_STR_INTERNAL_NAME "dxg" #define REACTOS_STR_ORIGINAL_FILENAME "dxg.sys" #include <reactos/version.rc>

1 year, 1 month

[reactos] 01/01: [USER32] Fix IsWindow by not using WNDS2_INDESTROY (#6066)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e8ea0dd5e9c8a6be298… commit 84e8ea0dd5e9c8a6be2984db6dd38401d25a822b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Dec 1 09:08:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Dec 1 09:08:58 2023 +0900 [USER32] Fix IsWindow by not using WNDS2_INDESTROY (#6066) Based on I_Kill_Bugs' IsWinodw.patch. CORE-11722, CORE-16432 --- win32ss/user/user32/windows/window.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 93dd53358c5..a0efdfab2b2 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1549,9 +1549,8 @@ IsWindow(HWND hWnd) PWND Wnd = ValidateHwndNoErr(hWnd); if (Wnd != NULL) { - if (Wnd->state & WNDS_DESTROYED || - Wnd->state2 & WNDS2_INDESTROY) - return FALSE; + if (Wnd->state & WNDS_DESTROYED) + return FALSE; return TRUE; }

1 year, 1 month

[reactos] 01/01: [NTOS:KE] Remove KiMask32Array

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f92c44b21761ca4f23dac… commit f92c44b21761ca4f23dac20bde3b9afe40a7210f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 25 14:52:05 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 30 13:03:52 2023 +0200 [NTOS:KE] Remove KiMask32Array It's useless and also broken in the way it is used. Replace it with a simple shift and make it correct for 64 bit. --- ntoskrnl/include/internal/ke.h | 5 ++--- ntoskrnl/ke/thrdobj.c | 10 ---------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/include/internal/ke.h b/ntoskrnl/include/internal/ke.h index 10a352a0981..fbd3660553e 100644 --- a/ntoskrnl/include/internal/ke.h +++ b/ntoskrnl/include/internal/ke.h @@ -137,7 +137,6 @@ extern LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; extern LIST_ENTRY KiStackInSwapListHead; extern KEVENT KiSwapEvent; extern PKPRCB KiProcessorBlock[]; -extern ULONG KiMask32Array[MAXIMUM_PRIORITY]; extern ULONG_PTR KiIdleSummary; extern PVOID KeUserApcDispatcher; extern PVOID KeUserCallbackDispatcher; @@ -156,8 +155,8 @@ extern VOID __cdecl KiInterruptTemplate(VOID); /* MACROS *************************************************************************/ -#define AFFINITY_MASK(Id) KiMask32Array[Id] -#define PRIORITY_MASK(Id) KiMask32Array[Id] +#define AFFINITY_MASK(ProcessorIndex) ((KAFFINITY)1 << (ProcessorIndex)) +#define PRIORITY_MASK(Priority) (1UL << (Priority)) /* Tells us if the Timer or Event is a Syncronization or Notification Object */ #define TIMER_OR_EVENT_TYPE 0x7L diff --git a/ntoskrnl/ke/thrdobj.c b/ntoskrnl/ke/thrdobj.c index 627f42c7395..1fc58b99c9e 100644 --- a/ntoskrnl/ke/thrdobj.c +++ b/ntoskrnl/ke/thrdobj.c @@ -15,16 +15,6 @@ extern EX_WORK_QUEUE ExWorkerQueue[MaximumWorkQueue]; extern LIST_ENTRY PspReaperListHead; -ULONG KiMask32Array[MAXIMUM_PRIORITY] = -{ - 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, - 0x40, 0x80, 0x100, 0x200, 0x400, 0x800, - 0x1000, 0x2000, 0x4000, 0x8000, 0x10000, 0x20000, - 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, - 0x1000000, 0x2000000, 0x4000000, 0x8000000, 0x10000000, 0x20000000, - 0x40000000, 0x80000000 -}; - /* FUNCTIONS *****************************************************************/ UCHAR

1 year, 1 month

[reactos] 01/01: [KERNEL32] Fix 64-bit bug in SetProcessAffinityMask

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=642c795531c33885701ef… commit 642c795531c33885701ef56d1f6b2066384131fb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 26 11:31:43 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Nov 30 13:01:14 2023 +0200 [KERNEL32] Fix 64-bit bug in SetProcessAffinityMask --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 9f1f1c1a4a0..b88212b3c59 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -900,7 +900,7 @@ SetProcessAffinityMask(IN HANDLE hProcess, Status = NtSetInformationProcess(hProcess, ProcessAffinityMask, (PVOID)&dwProcessAffinityMask, - sizeof(DWORD)); + sizeof(dwProcessAffinityMask)); if (!NT_SUCCESS(Status)) { /* Handle failure */

1 year, 1 month

[reactos] 01/01: [IMM32][SDK][NTUSER] Implement CtfImmTIMActivate (#6041)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=931224fbe12c682bfb5c7… commit 931224fbe12c682bfb5c736528836c9793be453b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 30 17:22:50 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Nov 30 17:22:50 2023 +0900 [IMM32][SDK][NTUSER] Implement CtfImmTIMActivate (#6041) - Add Imm32InitTLS, Imm32AllocateTLS, Imm32GetTLS, Imm32GetCoInitCountSkip, Imm32IncCoInitCountSkip, and Imm32DecCoInitCountSkip helper functions to control the TLS data. - Introduce "CoInitialize Spy" (ISPY) to manage COM initialization status. - Implement CtfImmCoInitialize and CtfImmCoUninitialize. - Implement CtfImmEnterCoInitCountSkipMode and CtfImmLeaveCoInitCountSkipMode. - Implement CtfImmLastEnabledWndDestroy, ImmDisableTextFrameService, and CtfImmTIMActivate. CORE-19268 --- dll/win32/imm32/CMakeLists.txt | 2 +- dll/win32/imm32/ctf.c | 695 ++++++++++++++++++++++++++++++++++++-- dll/win32/imm32/imm.c | 9 - dll/win32/imm32/imm32.spec | 4 + dll/win32/imm32/precomp.h | 9 + sdk/include/ddk/immdev.h | 4 +- sdk/include/reactos/imm32_undoc.h | 4 + win32ss/include/ntuser.h | 2 + 8 files changed, 683 insertions(+), 46 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index b765ec172ab..60b146b10fa 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -45,6 +45,6 @@ list(APPEND imm32_rc_deps add_library(imm32 MODULE ${SOURCE} imm32.rc) set_module_type(imm32 win32dll UNICODE ENTRYPOINT ImmDllInitialize 12) set_source_files_properties(imm32.rc PROPERTIES OBJECT_DEPENDS "${imm32_rc_deps}") -target_link_libraries(imm32 wine win32ksys) +target_link_libraries(imm32 wine win32ksys uuid) add_importlibs(imm32 advapi32 user32 gdi32 kernel32 ntdll) add_cd_file(TARGET imm32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index dd325d472f7..be1853f02c3 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -6,11 +6,83 @@ */ #include "precomp.h" -#include <msctf.h> -#include <ctfutb.h> +#include <msctf.h> /* for ITfLangBarMgr */ +#include <objidl.h> /* for IInitializeSpy */ WINE_DEFAULT_DEBUG_CHANNEL(imm); +/* FIXME: Use RTL */ +static BOOL WINAPI RtlDllShutdownInProgress(VOID) +{ + return FALSE; +} + +static BOOL Imm32InsideLoaderLock(VOID) +{ + return NtCurrentTeb()->ProcessEnvironmentBlock->LoaderLock->OwningThread == + NtCurrentTeb()->ClientId.UniqueThread; +} + +static BOOL +Imm32IsInteractiveUserLogon(VOID) +{ + BOOL bOK, IsMember = FALSE; + PSID pSid; + SID_IDENTIFIER_AUTHORITY IdentAuth = { SECURITY_NT_AUTHORITY }; + + if (!AllocateAndInitializeSid(&IdentAuth, 1, SECURITY_INTERACTIVE_RID, + 0, 0, 0, 0, 0, 0, 0, &pSid)) + { + ERR("Error: %ld\n", GetLastError()); + return FALSE; + } + + bOK = CheckTokenMembership(NULL, pSid, &IsMember); + + if (pSid) + FreeSid(pSid); + + return bOK && IsMember; +} + +static BOOL +Imm32IsRunningInMsoobe(VOID) +{ + LPWSTR pchFilePart = NULL; + WCHAR Buffer[MAX_PATH], FileName[MAX_PATH]; + + if (!GetModuleFileNameW(NULL, FileName, _countof(FileName))) + return FALSE; + + GetFullPathNameW(FileName, _countof(Buffer), Buffer, &pchFilePart); + if (!pchFilePart) + return FALSE; + + return lstrcmpiW(pchFilePart, L"msoobe.exe") == 0; +} + +static BOOL +Imm32IsCUASEnabledInRegistry(VOID) +{ + HKEY hKey; + LSTATUS error; + DWORD dwType, dwData, cbData; + + error = RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\CTF\\SystemShared", &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + dwData = 0; + cbData = sizeof(dwData); + error = RegQueryValueExW(hKey, L"CUAS", NULL, &dwType, (LPBYTE)&dwData, &cbData); + RegCloseKey(hKey); + + if (error != ERROR_SUCCESS || dwType != REG_DWORD) + return FALSE; + + return !!dwData; +} + BOOL Imm32GetFn( _Inout_opt_ FARPROC *ppfn, @@ -110,6 +182,8 @@ FN_TF_InvalidAssemblyListCacheIfExist MSCTF_FN(TF_InvalidAssemblyListCacheIfExis HRESULT Imm32TF_CreateLangBarMgr(_Inout_ ITfLangBarMgr **ppBarMgr) { + TRACE("TF_CreateLangBarMgr(%p)\n", ppBarMgr); + if (!Imm32GetMsctfFn(TF_CreateLangBarMgr)) return E_FAIL; @@ -118,6 +192,8 @@ HRESULT Imm32TF_CreateLangBarMgr(_Inout_ ITfLangBarMgr **ppBarMgr) VOID Imm32TF_InvalidAssemblyListCacheIfExist(VOID) { + TRACE("TF_InvalidAssemblyListCacheIfExist()\n"); + if (!Imm32GetMsctfFn(TF_InvalidAssemblyListCacheIfExist)) return; @@ -141,6 +217,9 @@ VOID Imm32TF_InvalidAssemblyListCacheIfExist(VOID) /* "Active IMM" compatibility flags */ DWORD g_aimm_compat_flags = 0; +/* Disable CUAS? */ +BOOL g_disable_CUAS_flag = FALSE; + /* The instance of the CTF IME file */ HINSTANCE g_hCtfIme = NULL; @@ -203,6 +282,384 @@ Imm32CheckAndApplyAppCompat( return pApphelpCheckIME(pszAppName); } +/*********************************************************************** + * TLS (Thread-Local Storage) + * + * See: TlsAlloc + */ + +DWORD g_dwTLSIndex = -1; + +/* IMM Thread-Local Storage (TLS) data */ +typedef struct IMMTLSDATA +{ + IInitializeSpy *pSpy; /* CoInitialize Spy */ + DWORD dwUnknown1; + ULARGE_INTEGER uliCookie; /* Spy requires a cookie for revoking */ + BOOL bDoCount; /* Is it counting? */ + DWORD dwSkipCount; /* The skipped count */ + BOOL bUninitializing; /* Is it uninitializing? */ + DWORD dwUnknown2; +} IMMTLSDATA, *PIMMTLSDATA; + +static VOID +Imm32InitTLS(VOID) +{ + RtlEnterCriticalSection(&gcsImeDpi); + + if (g_dwTLSIndex == -1) + g_dwTLSIndex = TlsAlloc(); + + RtlLeaveCriticalSection(&gcsImeDpi); +} + +static IMMTLSDATA* +Imm32AllocateTLS(VOID) +{ + IMMTLSDATA *pData; + + if (g_dwTLSIndex == -1) + return NULL; + + pData = (IMMTLSDATA*)TlsGetValue(g_dwTLSIndex); + if (pData) + return pData; + + pData = (IMMTLSDATA*)ImmLocalAlloc(HEAP_ZERO_MEMORY, sizeof(IMMTLSDATA)); + if (IS_NULL_UNEXPECTEDLY(pData)) + return NULL; + + if (IS_FALSE_UNEXPECTEDLY(TlsSetValue(g_dwTLSIndex, pData))) + { + ImmLocalFree(pData); + return NULL; + } + + return pData; +} + +static IMMTLSDATA* +Imm32GetTLS(VOID) +{ + if (g_dwTLSIndex == -1) + return NULL; + + return (IMMTLSDATA*)TlsGetValue(g_dwTLSIndex); +} + +/* Get */ +static DWORD +Imm32GetCoInitCountSkip(VOID) +{ + IMMTLSDATA *pData = Imm32GetTLS(); + if (!pData) + return 0; + return pData->dwSkipCount; +} + +/* Increment */ +static DWORD +Imm32IncCoInitCountSkip(VOID) +{ + IMMTLSDATA *pData; + DWORD dwOldSkipCount; + + pData = Imm32GetTLS(); + if (!pData) + return 0; + + dwOldSkipCount = pData->dwSkipCount; + if (pData->bDoCount) + pData->dwSkipCount = dwOldSkipCount + 1; + + return dwOldSkipCount; +} + +/* Decrement */ +static DWORD +Imm32DecCoInitCountSkip(VOID) +{ + DWORD dwSkipCount; + IMMTLSDATA *pData; + + pData = Imm32GetTLS();; + if (!pData) + return 0; + + dwSkipCount = pData->dwSkipCount; + if (pData->bDoCount) + { + if (dwSkipCount) + pData->dwSkipCount = dwSkipCount - 1; + } + + return dwSkipCount; +} + +/*********************************************************************** + * CtfImmEnterCoInitCountSkipMode (IMM32.@) + */ +VOID WINAPI CtfImmEnterCoInitCountSkipMode(VOID) +{ + IMMTLSDATA *pData; + + TRACE("()\n"); + + pData = Imm32GetTLS(); + if (pData) + ++(pData->bDoCount); +} + +/*********************************************************************** + * CtfImmLeaveCoInitCountSkipMode (IMM32.@) + */ +BOOL WINAPI CtfImmLeaveCoInitCountSkipMode(VOID) +{ + IMMTLSDATA *pData; + + TRACE("()\n"); + + pData = Imm32GetTLS(); + if (!pData || !pData->bDoCount) + return FALSE; + + --(pData->bDoCount); + return TRUE; +} + +/*********************************************************************** + * ISPY (I am not spy!) + * + * ISPY watches CoInitialize[Ex] / CoUninitialize to manage COM initialization status. + */ + +typedef struct ISPY +{ + const IInitializeSpyVtbl *m_pSpyVtbl; + LONG m_cRefs; +} ISPY, *PISPY; + +static STDMETHODIMP +ISPY_QueryInterface( + _Inout_ IInitializeSpy *pThis, + _In_ REFIID riid, + _Inout_ LPVOID *ppvObj) +{ + ISPY *pSpy = (ISPY*)pThis; + + if (!ppvObj) + return E_INVALIDARG; + + *ppvObj = NULL; + + if (!IsEqualIID(riid, &IID_IUnknown) && !IsEqualIID(riid, &IID_IInitializeSpy)) + return E_NOINTERFACE; + + ++(pSpy->m_cRefs); + *ppvObj = pSpy; + return S_OK; +} + +static STDMETHODIMP_(ULONG) +ISPY_AddRef( + _Inout_ IInitializeSpy *pThis) +{ + ISPY *pSpy = (ISPY*)pThis; + return ++pSpy->m_cRefs; +} + +static STDMETHODIMP_(ULONG) +ISPY_Release( + _Inout_ IInitializeSpy *pThis) +{ + ISPY *pSpy = (ISPY*)pThis; + if (--pSpy->m_cRefs == 0) + { + ImmLocalFree(pSpy); + return 0; + } + return pSpy->m_cRefs; +} + +/* + * (Pre/Post)(Initialize/Uninitialize) will be automatically called from OLE32 + * as the results of watching. + */ + +static STDMETHODIMP +ISPY_PreInitialize( + _Inout_ IInitializeSpy *pThis, + _In_ DWORD dwCoInit, + _In_ DWORD dwCurThreadAptRefs) +{ + DWORD cCount; + + UNREFERENCED_PARAMETER(pThis); + + cCount = Imm32IncCoInitCountSkip(); + if (!dwCoInit && + (dwCurThreadAptRefs == cCount + 1) && + (GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT)) + { + Imm32ActivateOrDeactivateTIM(FALSE); + CtfImmCoUninitialize(); + } + + return S_OK; +} + +static STDMETHODIMP +ISPY_PostInitialize( + _Inout_ IInitializeSpy *pThis, + _In_ HRESULT hrCoInit, + _In_ DWORD dwCoInit, + _In_ DWORD dwNewThreadAptRefs) +{ + DWORD CoInitCountSkip; + + UNREFERENCED_PARAMETER(pThis); + UNREFERENCED_PARAMETER(dwCoInit); + + CoInitCountSkip = Imm32GetCoInitCountSkip(); + + if ((hrCoInit != S_FALSE) || + (dwNewThreadAptRefs != CoInitCountSkip + 2) || + !(GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT)) + { + return hrCoInit; + } + + return S_OK; +} + +static STDMETHODIMP +ISPY_PreUninitialize( + _Inout_ IInitializeSpy *pThis, + _In_ DWORD dwCurThreadAptRefs) +{ + UNREFERENCED_PARAMETER(pThis); + + if (dwCurThreadAptRefs == 1 && + !RtlDllShutdownInProgress() && + !Imm32InsideLoaderLock() && + (GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT)) + { + IMMTLSDATA *pData = Imm32GetTLS(); + if (pData && !pData->bUninitializing) + Imm32CoInitializeEx(); + } + + return S_OK; +} + +static STDMETHODIMP +ISPY_PostUninitialize( + _In_ IInitializeSpy *pThis, + _In_ DWORD dwNewThreadAptRefs) +{ + UNREFERENCED_PARAMETER(pThis); + UNREFERENCED_PARAMETER(dwNewThreadAptRefs); + Imm32DecCoInitCountSkip(); + return S_OK; +} + +static const IInitializeSpyVtbl g_vtblISPY = +{ + ISPY_QueryInterface, + ISPY_AddRef, + ISPY_Release, + ISPY_PreInitialize, + ISPY_PostInitialize, + ISPY_PreUninitialize, + ISPY_PostUninitialize, +}; + +static ISPY* +Imm32AllocIMMISPY(VOID) +{ + ISPY *pSpy = (ISPY*)ImmLocalAlloc(0, sizeof(ISPY)); + if (!pSpy) + return NULL; + + pSpy->m_pSpyVtbl = &g_vtblISPY; + pSpy->m_cRefs = 1; + return pSpy; +} + +#define Imm32DeleteIMMISPY(pSpy) ImmLocalFree(pSpy) + +/*********************************************************************** + * CtfImmCoInitialize (Not exported) + */ +HRESULT +CtfImmCoInitialize(VOID) +{ + HRESULT hr; + IMMTLSDATA *pData; + ISPY *pSpy; + + if (GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT) + return S_OK; /* Already initialized */ + + hr = Imm32CoInitializeEx(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* CoInitializeEx failed */ + + GetWin32ClientInfo()->CI_flags |= CI_CTFCOINIT; + Imm32InitTLS(); + + pData = Imm32AllocateTLS(); + if (!pData || pData->pSpy) + return S_OK; /* Cannot allocate or already it has a spy */ + + pSpy = Imm32AllocIMMISPY(); + pData->pSpy = (IInitializeSpy*)pSpy; + if (IS_NULL_UNEXPECTEDLY(pSpy)) + return S_OK; /* Cannot allocate a spy */ + + if (FAILED_UNEXPECTEDLY(Imm32CoRegisterInitializeSpy(pData->pSpy, &pData->uliCookie))) + { + /* Failed to register the spy */ + Imm32DeleteIMMISPY(pData->pSpy); + pData->pSpy = NULL; + pData->uliCookie.QuadPart = 0; + } + + return S_OK; +} + +/*********************************************************************** + * CtfImmCoUninitialize (IMM32.@) + */ +VOID WINAPI +CtfImmCoUninitialize(VOID) +{ + IMMTLSDATA *pData; + + if (!(GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT)) + return; /* Not CoInitialize'd */ + + pData = Imm32GetTLS(); + if (pData) + { + pData->bUninitializing = TRUE; + Imm32CoUninitialize(); /* Do CoUninitialize */ + pData->bUninitializing = FALSE; + + GetWin32ClientInfo()->CI_flags &= ~CI_CTFCOINIT; + } + + pData = Imm32AllocateTLS(); + if (!pData || !pData->pSpy) + return; /* There were no spy */ + + /* Our work is done. We don't need spies like you anymore. */ + Imm32CoRevokeInitializeSpy(pData->uliCookie); + ISPY_Release(pData->pSpy); + pData->pSpy = NULL; + pData->uliCookie.QuadPart = 0; +} + /*********************************************************************** * This function loads the CTF IME file if necessary and establishes * communication with the CTF IME. @@ -286,6 +743,8 @@ Imm32LoadCtfIme(VOID) HRESULT CtfImeCreateThreadMgr(VOID) { + TRACE("()\n"); + if (!Imm32LoadCtfIme()) return E_FAIL; @@ -298,6 +757,8 @@ CtfImeCreateThreadMgr(VOID) HRESULT CtfImeDestroyThreadMgr(VOID) { + TRACE("()\n"); + if (!Imm32LoadCtfIme()) return E_FAIL; @@ -362,6 +823,8 @@ HRESULT CtfImeCreateInputContext( _In_ HIMC hIMC) { + TRACE("(%p)\n", hIMC); + if (!Imm32LoadCtfIme()) return E_FAIL; @@ -374,6 +837,8 @@ CtfImeCreateInputContext( HRESULT CtfImeDestroyInputContext(_In_ HIMC hIMC) { + TRACE("(%p)\n", hIMC); + if (!Imm32LoadCtfIme()) return E_FAIL; @@ -394,8 +859,61 @@ Imm32EnumCreateCtfICProc( } /*********************************************************************** - * This function calls CtfImeDestroyInputContext if possible. + * Thread Input Manager (TIM) */ + +static BOOL +Imm32IsTIMDisabledInRegistry(VOID) +{ + DWORD dwData, cbData; + HKEY hKey; + LSTATUS error; + + error = RegOpenKeyW(HKEY_CURRENT_USER, L"SOFTWARE\\Microsoft\\CTF", &hKey); + if (error != ERROR_SUCCESS) + return FALSE; + + dwData = 0; + cbData = sizeof(dwData); + RegQueryValueExW(hKey, L"Disable Thread Input Manager", NULL, NULL, (LPBYTE)&dwData, &cbData); + RegCloseKey(hKey); + return !!dwData; +} + +HRESULT +Imm32ActivateOrDeactivateTIM( + _In_ BOOL bCreate) +{ + HRESULT hr = S_OK; + + if (!IS_CICERO_MODE() || IS_16BIT_MODE() || + !(GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT)) + { + return S_OK; /* No need to activate/de-activate TIM */ + } + + if (bCreate) + { + if (!(GetWin32ClientInfo()->CI_flags & CI_CTFTIM)) + { + hr = CtfImeCreateThreadMgr(); + if (SUCCEEDED(hr)) + GetWin32ClientInfo()->CI_flags |= CI_CTFTIM; + } + } + else /* Destroy */ + { + if (GetWin32ClientInfo()->CI_flags & CI_CTFTIM) + { + hr = CtfImeDestroyThreadMgr(); + if (SUCCEEDED(hr)) + GetWin32ClientInfo()->CI_flags &= ~CI_CTFTIM; + } + } + + return hr; +} + HRESULT CtfImmTIMDestroyInputContext( _In_ HIMC hIMC) @@ -422,34 +940,34 @@ CtfImmTIMCreateInputContext( if (GetWin32ClientInfo()->CI_flags & CI_AIMMACTIVATED) { - if (!pClientImc->bUnknown4) + if (!pClientImc->bCtfIme) { dwImeThreadId = NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); dwCurrentThreadId = GetCurrentThreadId(); if (dwImeThreadId == dwCurrentThreadId) { - pClientImc->bUnknown4 = 1; + pClientImc->bCtfIme = TRUE; hr = CtfImeCreateInputContext(hIMC); - if (FAILED(hr)) - pClientImc->bUnknown4 = 0; + if (FAILED_UNEXPECTEDLY(hr)) + pClientImc->bCtfIme = FALSE; } } } else { - if (!(GetWin32ClientInfo()->CI_flags & 0x100)) + if (!(GetWin32ClientInfo()->CI_flags & CI_CTFTIM)) return S_OK; - if (!pClientImc->bUnknown4) + if (!pClientImc->bCtfIme) { dwImeThreadId = NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); dwCurrentThreadId = GetCurrentThreadId(); if ((dwImeThreadId == dwCurrentThreadId) && IS_CICERO_MODE() && !IS_16BIT_MODE()) { - pClientImc->bUnknown4 = 1; + pClientImc->bCtfIme = TRUE; hr = CtfImeCreateInputContext(hIMC); - if (FAILED(hr)) - pClientImc->bUnknown4 = 0; + if (FAILED_UNEXPECTEDLY(hr)) + pClientImc->bCtfIme = FALSE; } } } @@ -458,6 +976,19 @@ CtfImmTIMCreateInputContext( return hr; } +/*********************************************************************** + * CtfImmLastEnabledWndDestroy (IMM32.@) + * + * Same as Imm32ActivateOrDeactivateTIM but its naming is improper. + */ +HRESULT WINAPI +CtfImmLastEnabledWndDestroy( + _In_ BOOL bCreate) +{ + TRACE("(%d)\n", bCreate); + return Imm32ActivateOrDeactivateTIM(bCreate); +} + /*********************************************************************** * CtfAImmActivate (IMM32.@) * @@ -529,7 +1060,7 @@ CtfImmIsCiceroEnabled(VOID) } /*********************************************************************** - * CtfImmIsTextFrameServiceDisabled(IMM32.@) + * CtfImmIsTextFrameServiceDisabled (IMM32.@) * * @return TRUE if TSF is disabled. */ @@ -540,17 +1071,123 @@ CtfImmIsTextFrameServiceDisabled(VOID) } /*********************************************************************** - * CtfImmTIMActivate(IMM32.@) + * ImmDisableTextFrameService (IMM32.@) + */ +BOOL WINAPI +ImmDisableTextFrameService(_In_ DWORD dwThreadId) +{ + HRESULT hr = S_OK; + + TRACE("(0x%lX)\n", dwThreadId); + + if (dwThreadId == -1) + g_disable_CUAS_flag = TRUE; + + if ((dwThreadId && !g_disable_CUAS_flag) || (GetWin32ClientInfo()->CI_flags & CI_TSFDISABLED)) + return TRUE; + + GetWin32ClientInfo()->CI_flags |= CI_TSFDISABLED; + + if (IS_CICERO_MODE() && !IS_16BIT_MODE() && + (GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT) && + (GetWin32ClientInfo()->CI_flags & CI_CTFTIM)) + { + hr = CtfImeDestroyThreadMgr(); + if (SUCCEEDED(hr)) + { + GetWin32ClientInfo()->CI_flags &= ~CI_CTFTIM; + CtfImmCoUninitialize(); + } + } + + return hr == S_OK; +} + +/*********************************************************************** + * CtfImmTIMActivate (IMM32.@) + * + * Activates Thread Input Manager (TIM) in the thread. */ HRESULT WINAPI CtfImmTIMActivate(_In_ HKL hKL) { - FIXME("(%p)\n", hKL); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)\n", hKL); + + if (g_disable_CUAS_flag) + { + TRACE("g_disable_CUAS_flag\n"); + GetWin32ClientInfo()->CI_flags |= CI_TSFDISABLED; + return FALSE; + } + + if (GetWin32ClientInfo()->CI_flags & CI_TSFDISABLED) + { + TRACE("CI_TSFDISABLED\n"); + return FALSE; + } + + if (Imm32IsTIMDisabledInRegistry()) + { + TRACE("TIM is disabled in registry\n"); + GetWin32ClientInfo()->CI_flags |= CI_TSFDISABLED; + return FALSE; + } + + if (!Imm32IsInteractiveUserLogon() || Imm32IsRunningInMsoobe()) + { + TRACE("TIM is disabled due to LOGON or MSOBE\n"); + return FALSE; + } + + if (!Imm32IsCUASEnabledInRegistry()) + { + TRACE("CUAS is disabled in registry\n"); + GetWin32ClientInfo()->CI_flags |= CI_TSFDISABLED; + return FALSE; + } + + if (NtCurrentTeb()->ProcessEnvironmentBlock->AppCompatFlags.LowPart & 0x100) + { + TRACE("CUAS is disabled by AppCompatFlags\n"); + GetWin32ClientInfo()->CI_flags |= CI_TSFDISABLED; + return FALSE; + } + + if (RtlIsThreadWithinLoaderCallout() || Imm32InsideLoaderLock()) + { + TRACE("TIM is disabled by Loader\n"); + return FALSE; + } + + if (!IS_CICERO_MODE() || IS_16BIT_MODE()) + { + TRACE("TIM is disabled because CICERO mode is unset\n"); + return FALSE; + } + + if (IS_IME_HKL(hKL)) + hKL = (HKL)UlongToHandle(MAKELONG(LOWORD(hKL), LOWORD(hKL))); + + if (!ImmLoadIME(hKL)) + Imm32TF_InvalidAssemblyListCacheIfExist(); + + CtfImmCoInitialize(); + + if ((GetWin32ClientInfo()->CI_flags & CI_CTFCOINIT) && + !(GetWin32ClientInfo()->CI_flags & CI_CTFTIM)) + { + hr = CtfImeCreateThreadMgr(); + if (SUCCEEDED(hr)) + GetWin32ClientInfo()->CI_flags |= CI_CTFTIM; + } + + return hr; } /*********************************************************************** - * CtfImmGenerateMessage(IMM32.@) + * CtfImmGenerateMessage (IMM32.@) */ BOOL WINAPI CtfImmGenerateMessage( @@ -638,7 +1275,7 @@ CtfImmGenerateMessage( } /*********************************************************************** - * CtfImmHideToolbarWnd(IMM32.@) + * CtfImmHideToolbarWnd (IMM32.@) * * Used with CtfImmRestoreToolbarWnd. */ @@ -667,7 +1304,7 @@ CtfImmHideToolbarWnd(VOID) } /*********************************************************************** - * CtfImmRestoreToolbarWnd(IMM32.@) + * CtfImmRestoreToolbarWnd (IMM32.@) * * Used with CtfImmHideToolbarWnd. */ @@ -684,7 +1321,7 @@ CtfImmRestoreToolbarWnd( TRACE("(%p, 0x%X)\n", pUnused, dwShowFlags); hr = Imm32TF_CreateLangBarMgr(&pBarMgr); - if (FAILED(hr)) + if (FAILED_UNEXPECTEDLY(hr)) return; if (dwShowFlags) @@ -693,20 +1330,8 @@ CtfImmRestoreToolbarWnd( pBarMgr->lpVtbl->Release(pBarMgr); } -BOOL Imm32InsideLoaderLock(VOID) -{ - return (NtCurrentTeb()->ProcessEnvironmentBlock->LoaderLock->OwningThread == - NtCurrentTeb()->ClientId.UniqueThread); -} - -/* FIXME: Use RTL */ -BOOL WINAPI RtlDllShutdownInProgress(VOID) -{ - return FALSE; -} - /*********************************************************************** - * CtfImmDispatchDefImeMessage(IMM32.@) + * CtfImmDispatchDefImeMessage (IMM32.@) */ LRESULT WINAPI CtfImmDispatchDefImeMessage( @@ -724,7 +1349,7 @@ CtfImmDispatchDefImeMessage( } /*********************************************************************** - * CtfImmIsGuidMapEnable(IMM32.@) + * CtfImmIsGuidMapEnable (IMM32.@) */ BOOL WINAPI CtfImmIsGuidMapEnable( @@ -757,7 +1382,7 @@ CtfImmIsGuidMapEnable( } /*********************************************************************** - * CtfImmGetGuidAtom(IMM32.@) + * CtfImmGetGuidAtom (IMM32.@) */ HRESULT WINAPI CtfImmGetGuidAtom( diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 39d4cd3b1ef..5723fde1a59 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1103,15 +1103,6 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) return TRUE; // Do nothing. This is correct. } -/*********************************************************************** -* ImmDisableTextFrameService(IMM32.@) -*/ -BOOL WINAPI ImmDisableTextFrameService(DWORD dwThreadId) -{ - FIXME("Stub\n"); - return FALSE; -} - /*********************************************************************** * ImmEnumInputContext(IMM32.@) */ diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 14044ca710b..2e84d6a143c 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,7 +1,9 @@ @ stdcall CtfAImmActivate(ptr) @ stdcall CtfAImmDeactivate(long) @ stdcall CtfAImmIsIME(ptr) +@ stdcall CtfImmCoUninitialize() @ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) +@ stdcall CtfImmEnterCoInitCountSkipMode() @ stdcall CtfImmGenerateMessage(ptr long) @ stdcall CtfImmGetGuidAtom(ptr long ptr) @ stdcall CtfImmHideToolbarWnd() @@ -9,6 +11,8 @@ @ stdcall CtfImmIsCiceroStartedInThread() @ stdcall CtfImmIsGuidMapEnable(ptr) @ stdcall CtfImmIsTextFrameServiceDisabled() +@ stdcall CtfImmLastEnabledWndDestroy(long) +@ stdcall CtfImmLeaveCoInitCountSkipMode() @ stdcall CtfImmRestoreToolbarWnd(ptr long) @ stdcall CtfImmSetAppCompatFlags(long) @ stdcall CtfImmSetCiceroStartInThread(long) diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 8fc4b27d4b7..3f667d1d6f5 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -112,12 +112,17 @@ BOOL WINAPI Imm32IsImcAnsi(HIMC hIMC); * --- Examine the condition, and then generate trace log if necessary. */ #ifdef NDEBUG /* on Release */ +#define FAILED_UNEXPECTEDLY(hr) (FAILED(hr)) #define IS_NULL_UNEXPECTEDLY(p) (!(p)) #define IS_ZERO_UNEXPECTEDLY(p) (!(p)) #define IS_TRUE_UNEXPECTEDLY(x) (x) #define IS_FALSE_UNEXPECTEDLY(x) (!(x)) #define IS_ERROR_UNEXPECTEDLY(x) (!(x)) #else /* on Debug */ +#define FAILED_UNEXPECTEDLY(hr) \ + (FAILED(hr) ? (ros_dbg_log(__WINE_DBCL_ERR, __wine_dbch___default, \ + __FILE__, __FUNCTION__, __LINE__, "FAILED(%s)\n", #hr), UNEXPECTED(), TRUE) \ + : FALSE) #define IS_NULL_UNEXPECTEDLY(p) \ (!(p) ? (ros_dbg_log(__WINE_DBCL_ERR, __wine_dbch___default, \ __FILE__, __FUNCTION__, __LINE__, "%s was NULL\n", #p), UNEXPECTED(), TRUE) \ @@ -192,3 +197,7 @@ BOOL Imm32StoreBitmapToBytes(HBITMAP hbm, LPBYTE pbData, DWORD cbDataMax); HRESULT CtfImmTIMCreateInputContext(_In_ HIMC hIMC); HRESULT CtfImmTIMDestroyInputContext(_In_ HIMC hIMC); +HRESULT CtfImmCoInitialize(VOID); +HRESULT CtfImeCreateThreadMgr(VOID); +HRESULT CtfImeDestroyThreadMgr(VOID); +HRESULT Imm32ActivateOrDeactivateTIM(_In_ BOOL bCreate); diff --git a/sdk/include/ddk/immdev.h b/sdk/include/ddk/immdev.h index b553838888f..e36ff688666 100644 --- a/sdk/include/ddk/immdev.h +++ b/sdk/include/ddk/immdev.h @@ -17,6 +17,8 @@ extern "C" { #endif +BOOL WINAPI ImmDisableTextFrameService(_In_ DWORD dwThreadId); + typedef struct tagSOFTKBDDATA { UINT uCount; @@ -317,7 +319,7 @@ typedef struct tagCLIENTIMC RTL_CRITICAL_SECTION cs; UINT uCodePage; HKL hKL; - BOOL bUnknown4; + BOOL bCtfIme; } CLIENTIMC, *PCLIENTIMC; #ifndef _WIN64 diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 28039bcb857..08be32a2dcd 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -31,6 +31,10 @@ VOID WINAPI CtfImmSetAppCompatFlags(_In_ DWORD dwFlags); DWORD WINAPI CtfImmHideToolbarWnd(VOID); VOID WINAPI CtfImmRestoreToolbarWnd(_In_ LPVOID pUnused, _In_ DWORD dwShowFlags); BOOL WINAPI CtfImmGenerateMessage(_In_ HIMC hIMC, _In_ BOOL bSend); +VOID WINAPI CtfImmCoUninitialize(VOID); +VOID WINAPI CtfImmEnterCoInitCountSkipMode(VOID); +BOOL WINAPI CtfImmLeaveCoInitCountSkipMode(VOID); +HRESULT WINAPI CtfImmLastEnabledWndDestroy(_In_ BOOL bCreate); LRESULT WINAPI CtfImmDispatchDefImeMessage( diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index f501babb00a..2763b4b24cc 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -303,6 +303,8 @@ typedef struct _CALLBACKWND #define CI_CURTHPRHOOK 0x00000010 #define CI_CLASSESREGISTERED 0x00000020 #define CI_IMMACTIVATE 0x00000040 /* IMM/IME (Asian input) */ +#define CI_CTFCOINIT 0x00000080 /* Did CTF CoInitialize? */ +#define CI_CTFTIM 0x00000100 /* CTF Thread Input Manager (TIM) */ #define CI_TSFDISABLED 0x00000400 /* TSF (Text Services Framework a.k.a. Cicero) */ #define CI_AIMMACTIVATED 0x00000800 /* Active IMM (AIMM) */

1 year, 1 month

[reactos] 01/01: [UMPNPMGR] Move the pnp event thread to a separate file

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01a8288d2819b0ed92f13… commit 01a8288d2819b0ed92f13d1aec7a962bcdcdc079 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Nov 29 23:03:00 2023 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Nov 29 23:03:00 2023 +0100 [UMPNPMGR] Move the pnp event thread to a separate file --- base/services/umpnpmgr/CMakeLists.txt | 1 + base/services/umpnpmgr/event.c | 194 ++++++++++++++++++++++++++++++++++ base/services/umpnpmgr/precomp.h | 10 ++ base/services/umpnpmgr/umpnpmgr.c | 157 --------------------------- 4 files changed, 205 insertions(+), 157 deletions(-) diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt index 7c344f9914c..bf1142ca173 100644 --- a/base/services/umpnpmgr/CMakeLists.txt +++ b/base/services/umpnpmgr/CMakeLists.txt @@ -4,6 +4,7 @@ add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/pnp.idl) spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB) add_library(umpnpmgr MODULE + event.c install.c rpcserver.c umpnpmgr.c diff --git a/base/services/umpnpmgr/event.c b/base/services/umpnpmgr/event.c new file mode 100644 index 00000000000..678022de61b --- /dev/null +++ b/base/services/umpnpmgr/event.c @@ -0,0 +1,194 @@ +/* + * ReactOS kernel + * Copyright (C) 2005 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: base/services/umpnpmgr/event.c + * PURPOSE: PNP Event thread + * PROGRAMMER: Eric Kohl (eric.kohl(a)reactos.org) + * Hervé Poussineau (hpoussin(a)reactos.org) + * Colin Finck (colin(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +DWORD WINAPI +PnpEventThread(LPVOID lpParameter) +{ + PLUGPLAY_CONTROL_USER_RESPONSE_DATA ResponseData = {0, 0, 0, 0}; + DWORD dwRet = ERROR_SUCCESS; + NTSTATUS Status; + RPC_STATUS RpcStatus; + PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; + ULONG PnpEventSize; + + UNREFERENCED_PARAMETER(lpParameter); + + PnpEventSize = 0x1000; + PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); + if (PnpEvent == NULL) + return ERROR_OUTOFMEMORY; + + for (;;) + { + DPRINT("Calling NtGetPlugPlayEvent()\n"); + + /* Wait for the next PnP event */ + Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); + + /* Resize the buffer for the PnP event if it's too small */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + PnpEventSize += 0x400; + NewPnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); + if (NewPnpEvent == NULL) + { + dwRet = ERROR_OUTOFMEMORY; + break; + } + PnpEvent = NewPnpEvent; + continue; + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtGetPlugPlayEvent() failed (Status 0x%08lx)\n", Status); + break; + } + + /* Process the PnP event */ + DPRINT("Received PnP Event\n"); + if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) + { + DeviceInstallParams* Params; + DWORD len; + DWORD DeviceIdLength; + + DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); + + DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); + if (DeviceIdLength) + { + /* Allocate a new device-install event */ + len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); + Params = HeapAlloc(GetProcessHeap(), 0, len); + if (Params) + { + wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); + + /* Queue the event (will be dequeued by DeviceInstallThread) */ + WaitForSingleObject(hDeviceInstallListMutex, INFINITE); + InsertTailList(&DeviceInstallListHead, &Params->ListEntry); + ReleaseMutex(hDeviceInstallListMutex); + + SetEvent(hDeviceInstallListNotEmpty); + } + } + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) + { +// DWORD dwRecipient; + + DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); + +// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; +// BroadcastSystemMessageW(BSF_POSTMESSAGE, +// &dwRecipient, +// WM_DEVICECHANGE, +// DBT_DEVNODES_CHANGED, +// 0); + SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) + { + DPRINT1("Eject vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus)) + { + DPRINT1("Kernel initiated eject: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus)) + { +// DWORD dwRecipient; + + DPRINT1("Safe removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + +// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; +// BroadcastSystemMessageW(BSF_POSTMESSAGE, +// &dwRecipient, +// WM_DEVICECHANGE, +// DBT_DEVNODES_CHANGED, +// 0); + SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus)) + { +// DWORD dwRecipient; + + DPRINT1("Surprise removal: %S\n", PnpEvent->TargetDevice.DeviceIds); + +// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; +// BroadcastSystemMessageW(BSF_POSTMESSAGE, +// &dwRecipient, +// WM_DEVICECHANGE, +// DBT_DEVNODES_CHANGED, +// 0); + SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus)) + { + DPRINT1("Removal vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus)) + { + DPRINT1("Removal pending: %S\n", PnpEvent->TargetDevice.DeviceIds); + } + else + { + DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", + PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2, PnpEvent->EventGuid.Data3, + PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1], PnpEvent->EventGuid.Data4[2], + PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4], PnpEvent->EventGuid.Data4[5], + PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); + } + + /* Dequeue the current PnP event and signal the next one */ + Status = NtPlugPlayControl(PlugPlayControlUserResponse, + &ResponseData, + sizeof(ResponseData)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtPlugPlayControl(PlugPlayControlUserResponse) failed (Status 0x%08lx)\n", Status); + break; + } + } + + HeapFree(GetProcessHeap(), 0, PnpEvent); + + return dwRet; +} + +/* EOF */ diff --git a/base/services/umpnpmgr/precomp.h b/base/services/umpnpmgr/precomp.h index 7977db7b568..0720b177c87 100644 --- a/base/services/umpnpmgr/precomp.h +++ b/base/services/umpnpmgr/precomp.h @@ -45,6 +45,14 @@ typedef struct PWSTR pszName; } NOTIFY_ENTRY, *PNOTIFY_ENTRY; +/* event.c */ + +DWORD +WINAPI +PnpEventThread( + LPVOID lpParameter); + + /* install.c */ extern HANDLE hUserToken; @@ -67,6 +75,8 @@ DeviceInstallThread( /* rpcserver.c */ +extern LIST_ENTRY NotificationListHead; + DWORD WINAPI RpcServerThread( diff --git a/base/services/umpnpmgr/umpnpmgr.c b/base/services/umpnpmgr/umpnpmgr.c index 67ba42fe82d..14b7c1a9e6f 100644 --- a/base/services/umpnpmgr/umpnpmgr.c +++ b/base/services/umpnpmgr/umpnpmgr.c @@ -47,163 +47,6 @@ BOOL g_IsUISuppressed = FALSE; /* FUNCTIONS *****************************************************************/ -static DWORD WINAPI -PnpEventThread(LPVOID lpParameter) -{ - PLUGPLAY_CONTROL_USER_RESPONSE_DATA ResponseData = {0, 0, 0, 0}; - DWORD dwRet = ERROR_SUCCESS; - NTSTATUS Status; - RPC_STATUS RpcStatus; - PPLUGPLAY_EVENT_BLOCK PnpEvent, NewPnpEvent; - ULONG PnpEventSize; - - UNREFERENCED_PARAMETER(lpParameter); - - PnpEventSize = 0x1000; - PnpEvent = HeapAlloc(GetProcessHeap(), 0, PnpEventSize); - if (PnpEvent == NULL) - return ERROR_OUTOFMEMORY; - - for (;;) - { - DPRINT("Calling NtGetPlugPlayEvent()\n"); - - /* Wait for the next PnP event */ - Status = NtGetPlugPlayEvent(0, 0, PnpEvent, PnpEventSize); - - /* Resize the buffer for the PnP event if it's too small */ - if (Status == STATUS_BUFFER_TOO_SMALL) - { - PnpEventSize += 0x400; - NewPnpEvent = HeapReAlloc(GetProcessHeap(), 0, PnpEvent, PnpEventSize); - if (NewPnpEvent == NULL) - { - dwRet = ERROR_OUTOFMEMORY; - break; - } - PnpEvent = NewPnpEvent; - continue; - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtGetPlugPlayEvent() failed (Status 0x%08lx)\n", Status); - break; - } - - /* Process the PnP event */ - DPRINT("Received PnP Event\n"); - if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ENUMERATED, &RpcStatus)) - { - DeviceInstallParams* Params; - DWORD len; - DWORD DeviceIdLength; - - DPRINT("Device enumerated: %S\n", PnpEvent->TargetDevice.DeviceIds); - - DeviceIdLength = lstrlenW(PnpEvent->TargetDevice.DeviceIds); - if (DeviceIdLength) - { - /* Allocate a new device-install event */ - len = FIELD_OFFSET(DeviceInstallParams, DeviceIds) + (DeviceIdLength + 1) * sizeof(WCHAR); - Params = HeapAlloc(GetProcessHeap(), 0, len); - if (Params) - { - wcscpy(Params->DeviceIds, PnpEvent->TargetDevice.DeviceIds); - - /* Queue the event (will be dequeued by DeviceInstallThread) */ - WaitForSingleObject(hDeviceInstallListMutex, INFINITE); - InsertTailList(&DeviceInstallListHead, &Params->ListEntry); - ReleaseMutex(hDeviceInstallListMutex); - - SetEvent(hDeviceInstallListNotEmpty); - } - } - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_ARRIVAL, &RpcStatus)) - { -// DWORD dwRecipient; - - DPRINT("Device arrival: %S\n", PnpEvent->TargetDevice.DeviceIds); - -// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; -// BroadcastSystemMessageW(BSF_POSTMESSAGE, -// &dwRecipient, -// WM_DEVICECHANGE, -// DBT_DEVNODES_CHANGED, -// 0); - SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_EJECT_VETOED, &RpcStatus)) - { - DPRINT1("Eject vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_KERNEL_INITIATED_EJECT, &RpcStatus)) - { - DPRINT1("Kernel initiated eject: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SAFE_REMOVAL, &RpcStatus)) - { -// DWORD dwRecipient; - - DPRINT1("Safe removal: %S\n", PnpEvent->TargetDevice.DeviceIds); - -// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; -// BroadcastSystemMessageW(BSF_POSTMESSAGE, -// &dwRecipient, -// WM_DEVICECHANGE, -// DBT_DEVNODES_CHANGED, -// 0); - SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_SURPRISE_REMOVAL, &RpcStatus)) - { -// DWORD dwRecipient; - - DPRINT1("Surprise removal: %S\n", PnpEvent->TargetDevice.DeviceIds); - -// dwRecipient = BSM_ALLDESKTOPS | BSM_APPLICATIONS; -// BroadcastSystemMessageW(BSF_POSTMESSAGE, -// &dwRecipient, -// WM_DEVICECHANGE, -// DBT_DEVNODES_CHANGED, -// 0); - SendMessageW(HWND_BROADCAST, WM_DEVICECHANGE, DBT_DEVNODES_CHANGED, 0); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVAL_VETOED, &RpcStatus)) - { - DPRINT1("Removal vetoed: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else if (UuidEqual(&PnpEvent->EventGuid, (UUID*)&GUID_DEVICE_REMOVE_PENDING, &RpcStatus)) - { - DPRINT1("Removal pending: %S\n", PnpEvent->TargetDevice.DeviceIds); - } - else - { - DPRINT1("Unknown event, GUID {%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}\n", - PnpEvent->EventGuid.Data1, PnpEvent->EventGuid.Data2, PnpEvent->EventGuid.Data3, - PnpEvent->EventGuid.Data4[0], PnpEvent->EventGuid.Data4[1], PnpEvent->EventGuid.Data4[2], - PnpEvent->EventGuid.Data4[3], PnpEvent->EventGuid.Data4[4], PnpEvent->EventGuid.Data4[5], - PnpEvent->EventGuid.Data4[6], PnpEvent->EventGuid.Data4[7]); - } - - /* Dequeue the current PnP event and signal the next one */ - Status = NtPlugPlayControl(PlugPlayControlUserResponse, - &ResponseData, - sizeof(ResponseData)); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtPlugPlayControl(PlugPlayControlUserResponse) failed (Status 0x%08lx)\n", Status); - break; - } - } - - HeapFree(GetProcessHeap(), 0, PnpEvent); - - return dwRet; -} - - static VOID UpdateServiceStatus( _In_ DWORD dwState,

1 year, 1 month

[reactos] 01/01: [BOOTDATA] Add explicit value types as we do for the others.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ed5151d337367d65a394… commit 8ed5151d337367d65a39483124d0db5d23445013 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Nov 29 19:02:28 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 29 19:02:38 2023 +0100 [BOOTDATA] Add explicit value types as we do for the others. Addendum to commit fce106ab2. --- boot/bootdata/hivesft.inf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/boot/bootdata/hivesft.inf b/boot/bootdata/hivesft.inf index 1a468d375a0..2d4854ea0cd 100644 --- a/boot/bootdata/hivesft.inf +++ b/boot/bootdata/hivesft.inf @@ -103,12 +103,12 @@ HKLM,"SOFTWARE\Classes\Applications\mplay32.exe\SupportedTypes",".avi",0x0000000 HKLM,"SOFTWARE\Classes\ftp","",0x00000000,"URL:File Transfer Protocol" HKLM,"SOFTWARE\Classes\ftp\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" -HKLM,"SOFTWARE\Classes\ftp","URL Protocol",,"" +HKLM,"SOFTWARE\Classes\ftp","URL Protocol",0x00000000,"" HKLM,"SOFTWARE\Classes\ftp\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1""" HKLM,"SOFTWARE\Classes\gopher","",0x00000000,"URL:Gopher Protocol" HKLM,"SOFTWARE\Classes\gopher\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" -HKLM,"SOFTWARE\Classes\gopher","URL Protocol",,"" +HKLM,"SOFTWARE\Classes\gopher","URL Protocol",0x00000000,"" ;see http ;HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1""" @@ -116,7 +116,7 @@ HKLM,"SOFTWARE\Classes\gopher\shell\open\command","",0x00000000,"""%programfiles HKLM,"SOFTWARE\Classes\http","",0x00000000,"URL:HyperText Transfer Protocol" HKLM,"SOFTWARE\Classes\http\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\http\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" -HKLM,"SOFTWARE\Classes\http","URL Protocol",,"" +HKLM,"SOFTWARE\Classes\http","URL Protocol",0x00000000,"" HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1""" ;TODO : iexplore should use DDE ;HKLM,"SOFTWARE\Classes\http\shell\open\ddeexec","",0x00000000,"""%1"",,-1,0,,,," @@ -127,7 +127,7 @@ HKLM,"SOFTWARE\Classes\http\shell\open\command","",0x00000000,"""%programfiles%\ HKLM,"SOFTWARE\Classes\https","",0x00000000,"URL:HyperText Transfer Protocol with Privacy" HKLM,"SOFTWARE\Classes\https\DefaultIcon","",0x00000000,"%SystemRoot%\system32\url.dll,0" HKLM,"SOFTWARE\Classes\https\Source Filter","",0x00000000,"{E436EBB6-524F-11CE-9F53-0020AF0BA770}" -HKLM,"SOFTWARE\Classes\https","URL Protocol",,"" +HKLM,"SOFTWARE\Classes\https","URL Protocol",0x00000000,"" ;see http ;HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" -nohome" HKLM,"SOFTWARE\Classes\https\shell\open\command","",0x00000000,"""%programfiles%\Internet Explorer\iexplore.exe"" ""%1"""

1 year, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs