winecfg: Use WCHARs for window title

Frank Richter frank.richter at gmail.com
Tue Aug 15 23:23:15 CDT 2006



-------------- next part --------------
From 8aaa9ca3552c7e3662c58671c9bc789b1492aa32 Mon Sep 17 00:00:00 2001
From: Frank Richter frank.richter at gmail.com <frank.richter at gmail.com>
Date: Wed, 16 Aug 2006 05:44:29 +0200
Subject: [PATCH] winecfg: Use WCHARs for window title
---
 programs/winecfg/Bg.rc     |    2 +-
 programs/winecfg/De.rc     |    4 ++--
 programs/winecfg/En.rc     |    2 +-
 programs/winecfg/Es.rc     |    2 +-
 programs/winecfg/Fi.rc     |    2 +-
 programs/winecfg/Fr.rc     |    2 +-
 programs/winecfg/Hu.rc     |    2 +-
 programs/winecfg/Ja.rc     |    2 +-
 programs/winecfg/Ko.rc     |    2 +-
 programs/winecfg/Nl.rc     |    2 +-
 programs/winecfg/No.rc     |    2 +-
 programs/winecfg/Ru.rc     |    2 +-
 programs/winecfg/Tr.rc     |    2 +-
 programs/winecfg/winecfg.c |   16 +++++++++-------
 14 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index 8125694..ca4872c 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -210,7 +210,7 @@ BEGIN
     IDS_TAB_AUDIO           "Çâóê"
     IDS_TAB_ABOUT           "Îòíîñíî"
     IDS_WINECFG_TITLE       "Íàñòðîéêè íà Wine"
-    IDS_WINECFG_TITLE_APP   "Íàñòðîéêè íà Wine çà %s"
+    IDS_WINECFG_TITLE_APP   "Íàñòðîéêè íà Wine çà %hs"
     IDS_THEMEFILE           "Ôàéëîâå ñ òåìè"
     IDS_THEMEFILE_SELECT    "Èçáåðåòå ôàéë ñ òåìà"
     IDS_AUDIO_MISSING       "Íÿìà íàñòðîåí çâóêîâ äðàéâåð.\n\nÇà âàñ áåøå èçáðàí äðàéâåð ïî ïîäðàçáèðàíå.\nÌîæå äà ãî èçïîëçâàòå èëè äà èçáåðåòå äðóã.\n\nÒðÿáâà äà ùðàêíåòå íà Ïîòâúðäè, çà äà âëåçå â ñèëà èçáîðà."
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 5f0845e..75b5b6c 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -54,7 +54,7 @@ BEGIN
                     15,58,230,152
     PUSHBUTTON	    "Anw. &hinzufügen",IDC_APP_ADDAPP, 90,214,75,14
     PUSHBUTTON	    "Anw. &entfernen",IDC_APP_REMOVEAPP, 170,214,75,14
-    LTEXT           "&Windows Version:",IDC_STATIC,17,236,58,8
+    LTEXT           "&Windows-Version:",IDC_STATIC,17,236,60,8
     COMBOBOX        IDC_WINVER,83,234,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP    
 END
 
@@ -208,7 +208,7 @@ BEGIN
     IDS_TAB_AUDIO           "Audio"
     IDS_TAB_ABOUT           "Über"
     IDS_WINECFG_TITLE       "Wine-Konfiguration"
-    IDS_WINECFG_TITLE_APP   "Wine-Konfiguration für %s"
+    IDS_WINECFG_TITLE_APP   "Wine-Konfiguration für %hs"
     IDS_THEMEFILE           "Motiv-Dateien"
     IDS_THEMEFILE_SELECT    "Motiv-Datei auswählen"
     IDS_AUDIO_MISSING       "Zur Zeit ist kein Audio Treiber in der Registry eingetragen.\n\nEin bevorzugter Treiber wurde für Sie ausgewählt.\nSie können diesen Treiber nutzen oder einen anderen verfügbaren Treiber auswählen.\n\nSie müssen auf Anwenden klicken, damit die Änderung übernommen wird."
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 3884d7b..9fd4bf2 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -209,7 +209,7 @@ BEGIN
     IDS_TAB_AUDIO           "Audio"
     IDS_TAB_ABOUT           "About"
     IDS_WINECFG_TITLE       "Wine configuration"
-    IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
+    IDS_WINECFG_TITLE_APP   "Wine configuration for %hs"
     IDS_THEMEFILE           "Theme files"
     IDS_THEMEFILE_SELECT    "Select a theme file"
     IDS_AUDIO_MISSING       "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect."
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 4b67f26..be60f6a 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -204,7 +204,7 @@ BEGIN
     IDS_TAB_AUDIO           "Audio"
     IDS_TAB_ABOUT           "Acerca de"
     IDS_WINECFG_TITLE       "Configuración de Wine"
-    IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
+    IDS_WINECFG_TITLE_APP   "Wine configuration for %hs"
     IDS_THEMEFILE           "Ficheros de tema"
     IDS_THEMEFILE_SELECT    "Seleccione un fichero de tema"
     IDS_AUDIO_MISSING       "Actualmente no hay ningún manejador de audio especificado en el registro.\n\nSe ha seleccionado un manejador recomendado para usted. Puede usar este manejador o seleccionar otro manejador disponible.\n\nDebe pulsar Aplicar para que la selección surja efecto."
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index f91de71..d137067 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -208,7 +208,7 @@ BEGIN
     IDS_TAB_AUDIO           "Ääni"
     IDS_TAB_ABOUT           "Tietoja"
     IDS_WINECFG_TITLE       "Winen asetukset"
-    IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
+    IDS_WINECFG_TITLE_APP   "Wine configuration for %hs"
     IDS_THEMEFILE           "Teematiedostot"
     IDS_THEMEFILE_SELECT    "Valitse teematiedosto"
     IDS_SHELL_FOLDER        "Shell Folder"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 3bba05b..5cdb656 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -208,7 +208,7 @@ BEGIN
     IDS_TAB_AUDIO           "Audio"
     IDS_TAB_ABOUT           "A propos"
     IDS_WINECFG_TITLE       "Configuration de Wine"
-    IDS_WINECFG_TITLE_APP   "Configuration de Wine pour %s"
+    IDS_WINECFG_TITLE_APP   "Configuration de Wine pour %hs"
     IDS_THEMEFILE           "Fichiers de thèmes"
     IDS_THEMEFILE_SELECT    "Sélectionnez un fichier de thème"
     IDS_AUDIO_MISSING       "Aucun pilote audio n'est actuellement défini.\n\nLe pilote recommandé a été sélectionné pour vous.\nVous pouvez utiliser ce pilote ou en sélectionner un autre si disponible.\n\nVous devez cliquer sur Appliquer pour que la sélection prenne effet."
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index 57132c8..19e9dc2 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -204,7 +204,7 @@ BEGIN
     IDS_TAB_AUDIO           "Hang"
     IDS_TAB_ABOUT           "Névjegy"
     IDS_WINECFG_TITLE       "Wine konfiguráció"
-    IDS_WINECFG_TITLE_APP   "Wine konfiguráció %s számára"
+    IDS_WINECFG_TITLE_APP   "Wine konfiguráció %hs számára"
     IDS_THEMEFILE           "Témafájlok"
     IDS_THEMEFILE_SELECT    "Témafájl választása"
     IDS_AUDIO_MISSING       "Jelenleg nincs hangmeghajtó kiválasztva a regisztrációs adatbázisban.\n\nEgy ajánlott meghajtóprogram ki lett választva Önnek.\nÖn használhatja ezt a meghajtót, vagy választhat másikat ha elérhetõ.\n\nÖnnek az alkalmazásra kell kattintani a kiválasztás érvénybe léptetéséhez."
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 995cab1..3d4cd7f 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -203,7 +203,7 @@ BEGIN
     IDS_TAB_AUDIO           "ƒI[ƒfƒBƒI"
     IDS_TAB_ABOUT           "Wine‚ɂ‚¢‚Ä"
     IDS_WINECFG_TITLE       "WineÝ’è"
-    IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
+    IDS_WINECFG_TITLE_APP   "Wine configuration for %hs"
     IDS_THEMEFILE           "ƒe[ƒ}ƒtƒ@ƒCƒ‹"
     IDS_THEMEFILE_SELECT    "ƒe[ƒ}ƒtƒ@ƒCƒ‹‚ð‘I‚ñ‚Å‚­‚¾‚³‚¢"
     IDS_SHELL_FOLDER        "Shell Folder"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 278adcd..d9ccb66 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -212,7 +212,7 @@ BEGIN
     IDS_TAB_AUDIO           "¿Àµð¿À"
     IDS_TAB_ABOUT           "Á¤º¸"
     IDS_WINECFG_TITLE       "Wine ¼³Á¤"
-    IDS_WINECFG_TITLE_APP   "%s¸¦ À§ÇÑ Wine ¼³Á¤"
+    IDS_WINECFG_TITLE_APP   "%hs¸¦ À§ÇÑ Wine ¼³Á¤"
     IDS_THEMEFILE           "Å׸¶ ÆÄÀÏ"
     IDS_THEMEFILE_SELECT    "Å׸¶ ÆÄÀÏ ¼±ÅÃ"
     IDS_AUDIO_MISSING       "ÇöÀç ·¹Áö½ºÆ®¸®¿¡ ¿Àµð¿À µå¶óÀ̹ö°¡ ÁöÁ¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù.\n\nÃßõ µå¶óÀ̹ö°¡ ¼±Åþú½À´Ï´Ù.\nÀÌ µå¶óÀ̹ö¸¦ »ç¿ëÇϰųª °¡´ÉÇÑ ´Ù¸¥ µå¶óÀ̹ö¸¦ ¼±ÅÃÇÒ ¼ö ÀÖ½À´Ï´Ù.\n\n¼±Åà »çÇ×ÀÌ È¿°ú¸¦ ³ªÅ¸³»±â À§Çؼ­´Â Àû¿ë ¹öÆ°À» ´­·¯¾ß ÇÕ´Ï´Ù."
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index 0ede049..e15afd7 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -209,7 +209,7 @@ BEGIN
     IDS_TAB_AUDIO           "Audio"
     IDS_TAB_ABOUT           "Info"
     IDS_WINECFG_TITLE       "Wine configuratie"
-    IDS_WINECFG_TITLE_APP   "Wine configuratie voor %s"
+    IDS_WINECFG_TITLE_APP   "Wine configuratie voor %hs"
     IDS_THEMEFILE           "Thema-bestanden"
     IDS_THEMEFILE_SELECT    "Thema-bestanden kiezen"
     IDS_AUDIO_MISSING       "Op dit moment is er geen audio stuurbestand gespecificeerd in de registry.\n\nEen aanbevolen stuurbestand is voor u geselecteerd.\nU kunt dit stuurbestand gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op 'Toepassen' om deze selectie te activeren."
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index c1cd449..f004c92 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -207,7 +207,7 @@ BEGIN
     IDS_TAB_AUDIO           "Lyd"
     IDS_TAB_ABOUT           "Om"
     IDS_WINECFG_TITLE       "Oppsett av Wine"
-    IDS_WINECFG_TITLE_APP   "Wine configuration for %s"
+    IDS_WINECFG_TITLE_APP   "Wine configuration for %hs"
     IDS_THEMEFILE           "Temafiler"
     IDS_THEMEFILE_SELECT    "Velg en temafil"
     IDS_AUDIO_MISSING       "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk «Bruk» for at endringene skal tre i kraft."
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 5a54d40..39f2cb5 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -205,7 +205,7 @@ BEGIN
     IDS_TAB_AUDIO           "Àóäèî"
     IDS_TAB_ABOUT           "Î ïðîãðàììå"
     IDS_WINECFG_TITLE       "Íàñòðîéêà Wine"
-    IDS_WINECFG_TITLE_APP   "Íàñòðîéêà Wine äëÿ %s"
+    IDS_WINECFG_TITLE_APP   "Íàñòðîéêà Wine äëÿ %hs"
     IDS_THEMEFILE           "Ôàéëû òåì"
     IDS_THEMEFILE_SELECT    "Âûáåðèòå ôàéë ñ òåìîé"
     IDS_SHELL_FOLDER        "Ñòàíäàðòíûå ïàïêè"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index fd51ddc..cb7f45a 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -207,7 +207,7 @@ BEGIN
     IDS_TAB_AUDIO           "Ses"
     IDS_TAB_ABOUT           "Hakkýnda"
     IDS_WINECFG_TITLE       "Wine yapýlandýrmasý"
-    IDS_WINECFG_TITLE_APP   "%s için Wine yapýlandýrmasý"
+    IDS_WINECFG_TITLE_APP   "%hs için Wine yapýlandýrmasý"
     IDS_THEMEFILE           "Tema dosyalarý"
     IDS_THEMEFILE_SELECT    "Tema dosyasý seçin"
     IDS_AUDIO_MISSING       "Sistem kaydýnda belirlenmiþ bir ses sürücüsü yok.\n\nÖnerilen bir sürücü sizin için seçildi.\nBu sürücüyü kullanabilir veya varsa baþka bir sürücüyü seçebilirsiniz.\n\nSeçimin etkili olabilmesi için Uygula'yý týklamalýsýnýz."
diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c
index dfa5aeb..76a04b2 100644
--- a/programs/winecfg/winecfg.c
+++ b/programs/winecfg/winecfg.c
@@ -53,22 +53,24 @@ HMENU hPopupMenus = 0;
  */
 void set_window_title(HWND dialog)
 {
-    char newtitle[256];
+    WCHAR newtitle[256];
 
     /* update the window title  */
     if (current_app)
     {
-        char apptitle[256];
-        LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE_APP, apptitle, 256);
-        sprintf(newtitle, apptitle, current_app);
+        WCHAR apptitle[256];
+        LoadStringW (GetModuleHandle(NULL), IDS_WINECFG_TITLE_APP, apptitle, 
+          sizeof (apptitle)/sizeof (apptitle[0]));
+        wsprintfW (newtitle, apptitle, current_app);
     }
     else
     {
-        LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE, newtitle, 256);
+        LoadStringW (GetModuleHandle(NULL), IDS_WINECFG_TITLE, newtitle, 
+          sizeof (newtitle)/sizeof (newtitle[0]));
     }
 
-    WINE_TRACE("setting title to %s\n", newtitle);
-    SendMessage(GetParent(dialog), PSM_SETTITLE, 0, (LPARAM) newtitle);
+    WINE_TRACE("setting title to %s\n", wine_dbgstr_w(newtitle));
+    SendMessageW (GetParent(dialog), PSM_SETTITLEW, 0, (LPARAM) newtitle);
 }
 
 
-- 
1.4.1.1



More information about the wine-patches mailing list