[DESKADP] Improve default display of advanced adapter properties (#4665)

+ fix caption width in french resources.
2024-06-25 23:41:35 +00:00 · 2022-09-05 15:01:41 +02:00 · 2022-09-05 15:01:41 +02:00 · cb6b07eec8
parent 3b0417d48e
commit cb6b07eec8
25 changed files with 54 additions and 17 deletions
--- a/dll/shellext/deskadp/deskadp.c
+++ b/dll/shellext/deskadp/deskadp.c
@ -291,7 +291,8 @@ static VOID
 InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This)
 {
    LPTSTR lpAdapterName;
-
+    TCHAR lpNA[64];
+    
    This->lpDeviceId = QueryDeskCplString(This->pdtobj,
                                          RegisterClipboardFormat(DESK_EXT_DISPLAYID));
    EnableWindow(GetDlgItem(This->hwndDlg,
@ -308,28 +309,40 @@ InitDisplayAdapterDialog(PDESKDISPLAYADAPTER This)
        LocalFree((HLOCAL)lpAdapterName);
    }

+    LoadString(hInstance,
+               IDS_NOTAVAIL,
+               lpNA,
+               _countof(lpNA));
+
    if (This->DeskExtInterface != NULL)
    {
        SetDlgItemTextW(This->hwndDlg,
                        IDC_CHIPTYPE,
-                        This->DeskExtInterface->ChipType);
+                        *(This->DeskExtInterface->ChipType) ? This->DeskExtInterface->ChipType : lpNA);
        SetDlgItemTextW(This->hwndDlg,
                        IDC_DACTYPE,
-                        This->DeskExtInterface->DacType);
+                        *(This->DeskExtInterface->DacType) ? This->DeskExtInterface->DacType : lpNA);
        SetDlgItemTextW(This->hwndDlg,
                        IDC_MEMORYSIZE,
-                        This->DeskExtInterface->MemorySize);
+                        *(This->DeskExtInterface->MemorySize) ? This->DeskExtInterface->MemorySize : lpNA);
        SetDlgItemTextW(This->hwndDlg,
                        IDC_ADAPTERSTRING,
-                        This->DeskExtInterface->AdapterString);
+                        *(This->DeskExtInterface->AdapterString) ? This->DeskExtInterface->AdapterString : lpNA);
        SetDlgItemTextW(This->hwndDlg,
                        IDC_BIOSINFORMATION,
-                        This->DeskExtInterface->BiosString);
+                        *(This->DeskExtInterface->BiosString) ? This->DeskExtInterface->BiosString : lpNA);

        This->lpDevModeOnInit = This->DeskExtInterface->GetCurrentMode(This->DeskExtInterface->Context);
    }
    else
+    {
        This->lpDevModeOnInit = NULL;
+        SetDlgItemTextW(This->hwndDlg, IDC_CHIPTYPE, lpNA);
+        SetDlgItemTextW(This->hwndDlg, IDC_DACTYPE, lpNA);
+        SetDlgItemTextW(This->hwndDlg, IDC_MEMORYSIZE, lpNA);
+        SetDlgItemTextW(This->hwndDlg, IDC_ADAPTERSTRING, lpNA);
+        SetDlgItemTextW(This->hwndDlg, IDC_BIOSINFORMATION, lpNA);
+    }

    This->lpSelDevMode = This->lpDevModeOnInit;
 }
--- a/dll/shellext/deskadp/lang/bg-BG.rc
+++ b/dll/shellext/deskadp/lang/bg-BG.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "Висока цветност (16 разряда)"
    IDS_24BPP "Истинска цветност (24 разряда)"
    IDS_32BPP "Истинска цветност (32 разряда)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/cs-CZ.rc
+++ b/dll/shellext/deskadp/lang/cs-CZ.rc
@ -50,4 +50,5 @@ BEGIN
    IDS_16BPP "High Color (16 bitů)"
    IDS_24BPP "True Color (24 bitů)"
    IDS_32BPP "True Color (32 bitů)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/de-DE.rc
+++ b/dll/shellext/deskadp/lang/de-DE.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "High Color (16 Bit)"
    IDS_24BPP "True Color (24 Bit)"
    IDS_32BPP "True Color (32 Bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/el-GR.rc
+++ b/dll/shellext/deskadp/lang/el-GR.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "Πολλά χρώματα (16 bit)"
    IDS_24BPP "Φυσικά χρώματα (24 bit)"
    IDS_32BPP "Φυσικά χρώματα (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/en-US.rc
+++ b/dll/shellext/deskadp/lang/en-US.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "High Color (16 bit)"
    IDS_24BPP "True Color (24 bit)"
    IDS_32BPP "True Color (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/es-ES.rc
+++ b/dll/shellext/deskadp/lang/es-ES.rc
@ -47,4 +47,5 @@ BEGIN
    IDS_16BPP "Color de alto contraste (16 bit)"
    IDS_24BPP "Color verdadero (24 bit)"
    IDS_32BPP "Color verdadero (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/eu-ES.rc
+++ b/dll/shellext/deskadp/lang/eu-ES.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "Kontraste handiko kolorea (16 bit)"
    IDS_24BPP "Benetako kolorea (24 bit)"
    IDS_32BPP "Benetako kolorea (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/fr-FR.rc
+++ b/dll/shellext/deskadp/lang/fr-FR.rc
@ -10,17 +10,17 @@ BEGIN
    LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX
    PUSHBUTTON "&Propriétés", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14
    GROUPBOX "Informations sur l'adaptateur", -1, 7, 56, 237, 75
-    LTEXT "Type de puce:", -1, 13, 68, 58, 8
-    LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX
-    LTEXT "Type de CNA:", -1, 13, 80, 58, 8
-    LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX
-    LTEXT "Taille de la mémoire:", -1, 13, 92, 58, 8
-    LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX
-    LTEXT "Texte de l'adaptateur:", -1, 13, 104, 58, 8
-    LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX
-    LTEXT "Informations du BIOS:", -1, 13, 116, 58, 8
-    LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX
-    PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 75, 14
+    LTEXT "Type de puce :", -1, 13, 68, 85, 8
+    LTEXT "", IDC_CHIPTYPE, 87, 68, 148, 8, SS_NOPREFIX
+    LTEXT "Type de CNA :", -1, 13, 80, 85, 8
+    LTEXT "", IDC_DACTYPE, 87, 80, 148, 8, SS_NOPREFIX
+    LTEXT "Taille de la mémoire :", -1, 13, 92, 85, 8
+    LTEXT "", IDC_MEMORYSIZE, 87, 92, 148, 8, SS_NOPREFIX
+    LTEXT "Adaptateur :", -1, 13, 104, 85, 8
+    LTEXT "", IDC_ADAPTERSTRING, 87, 104, 148, 8, SS_NOPREFIX
+    LTEXT "Informations du BIOS :", -1, 13, 116, 85, 8
+    LTEXT "", IDC_BIOSINFORMATION, 87, 116, 148, 8, SS_NOPREFIX
+    PUSHBUTTON "&Lister tous les modes...", IDC_LISTALLMODES, 7, 139, 80, 14
 END

 IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "Couleurs élevées (16 bit)"
    IDS_24BPP "Vraies couleurs (24 bit)"
    IDS_32BPP "Vraies couleurs (32 bit)"
+    IDS_NOTAVAIL "Non disponible"
 END
--- a/dll/shellext/deskadp/lang/he-IL.rc
+++ b/dll/shellext/deskadp/lang/he-IL.rc
@ -47,4 +47,5 @@ BEGIN
    IDS_16BPP "צבעים גבוהים (16 סיביות)"
    IDS_24BPP "צבעים מלאים (24 סיביות)"
    IDS_32BPP "צבעים מלאים (32 סיביות)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/hi-IN.rc
+++ b/dll/shellext/deskadp/lang/hi-IN.rc
@ -52,4 +52,5 @@ BEGIN
    IDS_16BPP "उच्च कलर (16 बिट)"
    IDS_24BPP "ट्रू कलर (24 बिट)"
    IDS_32BPP "ट्रू कलर (32 बिट)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/it-IT.rc
+++ b/dll/shellext/deskadp/lang/it-IT.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "High Color (16 bit)"
    IDS_24BPP "True Color (24 bit)"
    IDS_32BPP "True Color (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/no-NO.rc
+++ b/dll/shellext/deskadp/lang/no-NO.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "Middels farger (16 bit)"
    IDS_24BPP "Høyest farger (24 bit)"
    IDS_32BPP "Høyest farger (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/pl-PL.rc
+++ b/dll/shellext/deskadp/lang/pl-PL.rc
@ -54,4 +54,5 @@ BEGIN
    IDS_16BPP "64k kolorów (16 bitów)"
    IDS_24BPP "16m kolorów (24 bity)"
    IDS_32BPP "16m +kanał alfa (32 bity)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/pt-PT.rc
+++ b/dll/shellext/deskadp/lang/pt-PT.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "High Color (16 bit)"
    IDS_24BPP "True Color (24 bit)"
    IDS_32BPP "True Color (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/ro-RO.rc
+++ b/dll/shellext/deskadp/lang/ro-RO.rc
@ -53,4 +53,5 @@ BEGIN
    IDS_16BPP "Culoare de înaltă calitate (16 biți)"
    IDS_24BPP "Calitate fotografică (24 biți)"
    IDS_32BPP "Calitate fotografică (32 biți)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/ru-RU.rc
+++ b/dll/shellext/deskadp/lang/ru-RU.rc
@ -45,4 +45,5 @@ BEGIN
    IDS_16BPP "Высокое (16 бит)"
    IDS_24BPP "Самое высокое (24 бита)"
    IDS_32BPP "Самое высокое (32 бита)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/sk-SK.rc
+++ b/dll/shellext/deskadp/lang/sk-SK.rc
@ -52,4 +52,5 @@ BEGIN
    IDS_16BPP "Veľa farieb (16 bit)"
    IDS_24BPP "Pravé farby (24 bit)"
    IDS_32BPP "Pravé farby (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/sq-AL.rc
+++ b/dll/shellext/deskadp/lang/sq-AL.rc
@ -49,4 +49,5 @@ BEGIN
    IDS_16BPP "High Color (16 bit)"
    IDS_24BPP "True Color (24 bit)"
    IDS_32BPP "True Color (32 bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/tr-TR.rc
+++ b/dll/shellext/deskadp/lang/tr-TR.rc
@ -47,4 +47,5 @@ BEGIN
    IDS_16BPP "Yüksek Renk (16 Bit)"
    IDS_24BPP "Gerçek Renk (24 Bit)"
    IDS_32BPP "Gerçek Renk (32 Bit)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/uk-UA.rc
+++ b/dll/shellext/deskadp/lang/uk-UA.rc
@ -53,4 +53,5 @@ BEGIN
    IDS_16BPP "High Color (16 біт)"
    IDS_24BPP "True Color (24 біти)"
    IDS_32BPP "True Color (32 біти)"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/zh-CN.rc
+++ b/dll/shellext/deskadp/lang/zh-CN.rc
@ -47,4 +47,5 @@ BEGIN
    IDS_16BPP "增强色（16 位）"
    IDS_24BPP "真彩色（24 位）"
    IDS_32BPP "真彩色（32 位）"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/zh-HK.rc
+++ b/dll/shellext/deskadp/lang/zh-HK.rc
@ -53,4 +53,5 @@ BEGIN
    IDS_16BPP "增強色（16 位）"
    IDS_24BPP "真彩色（24 位）"
    IDS_32BPP "真彩色（32 位）"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/lang/zh-TW.rc
+++ b/dll/shellext/deskadp/lang/zh-TW.rc
@ -53,4 +53,5 @@ BEGIN
    IDS_16BPP "增強色（16 位）"
    IDS_24BPP "真彩色（24 位）"
    IDS_32BPP "真彩色（32 位）"
+    IDS_NOTAVAIL "Not Available"
 END
--- a/dll/shellext/deskadp/resource.h
+++ b/dll/shellext/deskadp/resource.h
@ -24,3 +24,4 @@
 #define IDS_16BPP           107
 #define IDS_24BPP           108
 #define IDS_32BPP           109
+#define IDS_NOTAVAIL        110