[SHELL32] Remove 2 redundant initializations

[reactos.git] / dll / shellext / deskadp / deskadp.c

diff --git a/dll/shellext/deskadp/deskadp.c b/dll/shellext/deskadp/deskadp.c
index ec035a5..ba55d44 100644 (file)
--- a/dll/shellext/deskadp/deskadp.c
+++ b/dll/shellext/deskadp/deskadp.c
@@ -198,17 +198,14 @@ ListAllModesDlgProc(HWND hwndDlg,
 
     if (uMsg != WM_INITDIALOG)
     {
-        This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg,
-                                                     DWL_USER);
+        This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg, DWLP_USER);
     }
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
             This = (PDESKDISPLAYADAPTER)lParam;
-            SetWindowLongPtr(hwndDlg,
-                             DWL_USER,
-                             (LONG_PTR)This);
+            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)This);
 
             InitListAllModesDialog(This,
                                    hwndDlg);
@@ -294,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,
@@ -311,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;
 }
@@ -386,8 +396,7 @@ DisplayAdapterDlgProc(HWND hwndDlg,
 
     if (uMsg != WM_INITDIALOG)
     {
-        This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg,
-                                                     DWL_USER);
+        This = (PDESKDISPLAYADAPTER)GetWindowLongPtr(hwndDlg, DWLP_USER);
     }
 
     switch (uMsg)
@@ -395,9 +404,7 @@ DisplayAdapterDlgProc(HWND hwndDlg,
         case WM_INITDIALOG:
             This = (PDESKDISPLAYADAPTER)((LPCPROPSHEETPAGE)lParam)->lParam;
             This->hwndDlg = hwndDlg;
-            SetWindowLongPtr(hwndDlg,
-                             DWL_USER,
-                             (LONG_PTR)This);
+            SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)This);
 
             InitDisplayAdapterDialog(This);
             Ret = TRUE;
@@ -426,8 +433,9 @@ DisplayAdapterDlgProc(HWND hwndDlg,
                 case PSN_APPLY:
                 {
                     SetWindowLongPtr(hwndDlg,
-                                     DWL_MSGRESULT,
+                                     DWLP_MSGRESULT,
                                      ApplyDisplayAdapterChanges(This));
+                    Ret = TRUE;
                     break;
                 }