[hbelusca] 70919: [PROGMAN] - Fix the Shell-About box. - Whitespace/indentation fixes in string.c - Add missing size for the ICON resource item of the dialog "Program attributes". MSVC resource com...

Author: hbelusca
Date: Sat Mar  5 01:27:27 2016
New Revision: 70919

URL: http://svn.reactos.org/svn/reactos?rev=70919&view=rev
Log:
[PROGMAN]
- Fix the Shell-About box.
- Whitespace/indentation fixes in string.c
- Add missing size for the ICON resource item of the dialog "Program attributes". MSVC resource compiler considered that as an error, while GCC's windres compiled that without warning (who knows what they took as the default value...).

Modified:
    trunk/reactos/base/shell/progman/main.c
    trunk/reactos/base/shell/progman/progman.rc
    trunk/reactos/base/shell/progman/string.c

Modified: trunk/reactos/base/shell/progman/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/main.c?r...
==============================================================================
--- trunk/reactos/base/shell/progman/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/progman/main.c	[iso-8859-1] Sat Mar  5 01:27:27 2016
@@ -310,8 +310,12 @@
       break;

case PM_ABOUT_WINE:
-      ShellAboutA(hWnd, "WINE", "Program Manager", 0);
-      break;
+    {
+        WCHAR szTitle[MAX_STRING_LEN];
+        LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, szTitle, ARRAYSIZE(szTitle));
+        ShellAboutW(hWnd, szTitle, NULL, NULL);
+        break;
+    }

default:
    MAIN_MessageBoxIDS(IDS_NOT_IMPLEMENTED, IDS_ERROR, MB_OK);

Modified: trunk/reactos/base/shell/progman/progman.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/progman....
==============================================================================
--- trunk/reactos/base/shell/progman/progman.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/progman/progman.rc	[iso-8859-1] Sat Mar  5 01:27:27 2016
@@ -188,7 +188,7 @@
 EDITTEXT                                   PM_DIRECTORY,         95, 40,  90, 15, WS_TABSTOP
 LTEXT         "&Key combination:",      PM_HOT_KEY_TXT,       5, 55,  75, 10
 EDITTEXT                                   PM_HOT_KEY,           95, 55,  90, 15, WS_TABSTOP
-ICON          "",                          PM_ICON,              20, 70
+ICON          "",                          PM_ICON,              20, 70, 20, 20
 CHECKBOX      "&Minimize at launch",       PM_SYMBOL,            95, 75,  90, 10, WS_TABSTOP
 DEFPUSHBUTTON "OK",                   IDOK,                200,  5,  70, 15, WS_TABSTOP
 PUSHBUTTON    "Cancel",               IDCANCEL,            200, 25,  70, 15, WS_TABSTOP

Modified: trunk/reactos/base/shell/progman/string.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/progman/string.c...
==============================================================================
--- trunk/reactos/base/shell/progman/string.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/progman/string.c	[iso-8859-1] Sat Mar  5 01:27:27 2016
@@ -30,27 +30,31 @@

VOID STRING_LoadMenus(VOID)
 {
-  CHAR   caption[MAX_STRING_LEN];
-  HMENU  hMainMenu;
+    WCHAR caption[MAX_STRING_LEN];
+    HMENU hMainMenu;

-  /* Set frame caption */
-  LoadStringA(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption));
-  SetWindowTextA(Globals.hMainWnd, caption);
+    /* Set frame caption */
+    LoadStringW(Globals.hInstance, IDS_PROGRAM_MANAGER, caption, sizeof(caption));
+    SetWindowTextW(Globals.hMainWnd, caption);

-  /* Create menu */
-  hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU));
-  Globals.hFileMenu     = GetSubMenu(hMainMenu, 0);
-  Globals.hOptionMenu   = GetSubMenu(hMainMenu, 1);
-  Globals.hWindowsMenu  = GetSubMenu(hMainMenu, 2);
-  Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3);
+    /* Create menu */
+    hMainMenu = LoadMenuW(Globals.hInstance, MAKEINTRESOURCEW(MAIN_MENU));
+    Globals.hFileMenu     = GetSubMenu(hMainMenu, 0);
+    Globals.hOptionMenu   = GetSubMenu(hMainMenu, 1);
+    Globals.hWindowsMenu  = GetSubMenu(hMainMenu, 2);
+    Globals.hLanguageMenu = GetSubMenu(hMainMenu, 3);

-  if (Globals.hMDIWnd)
-    SendMessageW(Globals.hMDIWnd, WM_MDISETMENU,
-		(WPARAM) hMainMenu,
-		(LPARAM) Globals.hWindowsMenu);
-  else SetMenu(Globals.hMainWnd, hMainMenu);
+    if (Globals.hMDIWnd)
+    {
+        SendMessageW(Globals.hMDIWnd, WM_MDISETMENU,
+                     (WPARAM)hMainMenu, (LPARAM)Globals.hWindowsMenu);
+    }
+    else
+    {
+        SetMenu(Globals.hMainWnd, hMainMenu);
+    }

-  /* Destroy old menu */
-  if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu);
-  Globals.hMainMenu = hMainMenu;
+    /* Destroy old menu */
+    if (Globals.hMainMenu) DestroyMenu(Globals.hMainMenu);
+    Globals.hMainMenu = hMainMenu;
 }