[ros-diffs] [janderwald] 28744: - load resources from the dll handle - loop untill the real stop condition is found - this makes the console properties menu working again See issue #1827 for more details.

[janderwald at svn.reactos.org]

Author: janderwald
Date: Sat Sep  1 19:54:16 2007
New Revision: 28744

URL: http://svn.reactos.org/svn/reactos?rev=28744&view=rev
Log:
- load resources from the dll handle 
- loop untill the real stop condition is found
- this makes the console properties menu working again 
See issue #1827 for more details.

Modified:
    trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c?rev=28744&r1=28743&r2=28744&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Sat Sep  1 19:54:16 2007
@@ -121,15 +121,16 @@
 GuiConsoleAppendMenuItems(HMENU hMenu,
                           const GUICONSOLE_MENUITEM *Items)
 {
-    UINT i;
+    UINT i = 0;
     WCHAR szMenuString[255];
     HMENU hSubMenu;
-
-    for (i = 0; Items[i].uID != 0; i++)
+    HINSTANCE hInst = GetModuleHandleW(L"win32csr");
+
+    do
     {
         if (Items[i].uID != (UINT)-1)
         {
-            if (LoadStringW(Win32CsrDllHandle,
+            if (LoadStringW(hInst,
                             Items[i].uID,
                             szMenuString,
                             sizeof(szMenuString) / sizeof(szMenuString[0])) > 0)
@@ -167,20 +168,21 @@
                         0,
                         NULL);
         }
-    }
+    i++;
+    }while(!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].wCmdID == 0));
 }
 
 static VOID FASTCALL
 GuiConsoleCreateSysMenu(PCSRSS_CONSOLE Console)
 {
     HMENU hMenu;
-
     hMenu = GetSystemMenu(Console->hWindow,
                           FALSE);
     if (hMenu != NULL)
     {
         GuiConsoleAppendMenuItems(hMenu,
                                   GuiConsoleMainMenuItems);
+        DrawMenuBar(Console->hWindow);
     }
 }