[RSHELL]

[reactos.git] / base / shell / rshell / CDesktopBrowser.cpp

diff --git a/base/shell/rshell/CDesktopBrowser.cpp b/base/shell/rshell/CDesktopBrowser.cpp
index 85b9a69..01985dc 100644 (file)
--- a/base/shell/rshell/CDesktopBrowser.cpp
+++ b/base/shell/rshell/CDesktopBrowser.cpp
@@ -26,10 +26,8 @@ BOOL WINAPI SetShellWindowEx(HWND, HWND);
 
 #define SHDESK_TAG 0x4b534544
 
-static const WCHAR szProgmanClassName [] = { 'P', 'r', 'o', 'g', 'm', 'a', 'n' };
-static const WCHAR szProgmanWindowName [] = {
-    'P', 'r', 'o', 'g', 'r', 'a', 'm', ' ', 'M', 'a', 'n', 'a', 'g', 'e', 'r'
-};
+static const WCHAR szProgmanClassName [] = L"Progman";
+static const WCHAR szProgmanWindowName [] = L"Program Manager";
 
 class CDesktopBrowser :
     public CComObjectRootEx<CComMultiThreadModelNoCS>,
@@ -402,7 +400,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
         switch (uMsg)
         {
         case WM_ERASEBKGND:
-            return (LRESULT) PaintDesktop((HDC) wParam);
+            return (LRESULT) PaintDesktop(reinterpret_cast<HDC>(wParam));
 
         case WM_GETISHELLBROWSER:
             Ret = reinterpret_cast<LRESULT>(static_cast<IShellBrowser *>(pThis));
@@ -417,14 +415,16 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
             }
             else
             {
+
+                /* FIXME: Update work area */
+#if 0
                 RECT rcDesktop;
 
                 rcDesktop.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
                 rcDesktop.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
                 rcDesktop.right = GetSystemMetrics(SM_CXVIRTUALSCREEN);
                 rcDesktop.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN);
-
-                /* FIXME: Update work area */
+#endif
             }
             break;
 
@@ -456,7 +456,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
 
         case WM_NCCREATE:
         {
-            LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT) lParam;
+            LPCREATESTRUCT CreateStruct = reinterpret_cast<LPCREATESTRUCT>(lParam);
             pThis = SHDESK_Create(hwnd, CreateStruct);
             if (pThis == NULL)
             {
@@ -466,7 +466,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
 
             SetWindowLongPtrW(hwnd,
                 0,
-                (LONG_PTR) pThis);
+                reinterpret_cast<LONG_PTR>(pThis));
             Ret = TRUE;
             break;
         }
@@ -540,10 +540,10 @@ HANDLE WINAPI SHCreateDesktop(IShellDesktopTray *ShellDesk)
         rcDesk.bottom = GetSystemMetrics(SM_CYSCREEN);
     }
 
-    hWndDesk = CreateWindowExW(0, szProgmanClassName, szProgmanWindowName,
+    hWndDesk = CreateWindowExW(WS_EX_TOOLWINDOW, szProgmanClassName, szProgmanWindowName,
         WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN,
         rcDesk.left, rcDesk.top, rcDesk.right, rcDesk.bottom,
-        NULL, NULL, shell32_hInstance, (LPVOID) ShellDesk);
+        NULL, NULL, shell32_hInstance, reinterpret_cast<LPVOID>(ShellDesk));
     if (hWndDesk != NULL)
         return (HANDLE) GetWindowLongPtrW(hWndDesk, 0);