From 7c9e70178ae7b2a0dfd7c248ca975278a9c9923c Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sun, 31 Aug 2003 12:37:43 +0000 Subject: [PATCH] Wine workaround for displaying the desktop bar svn path=/trunk/; revision=5952 --- reactos/subsys/system/explorer/desktop/desktop.cpp | 9 +++++++-- reactos/subsys/system/explorer/explorer.cpp | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/reactos/subsys/system/explorer/desktop/desktop.cpp b/reactos/subsys/system/explorer/desktop/desktop.cpp index 21c24f516cf..86f6e3e70ad 100644 --- a/reactos/subsys/system/explorer/desktop/desktop.cpp +++ b/reactos/subsys/system/explorer/desktop/desktop.cpp @@ -123,9 +123,14 @@ HWND DesktopWindow::Create() int width = GetSystemMetrics(SM_CXSCREEN); int height = GetSystemMetrics(SM_CYSCREEN); - return Window::Create(WINDOW_CREATOR(DesktopWindow), - WS_EX_TOOLWINDOW, wcDesktop, _T("Program Manager"), WS_POPUP|WS_VISIBLE|WS_CLIPCHILDREN, + HWND hwndDesktop = Window::Create(WINDOW_CREATOR(DesktopWindow), + WS_EX_TOOLWINDOW, wcDesktop, _T("Program Manager"), WS_POPUP|WS_CLIPCHILDREN|WS_VISIBLE, 0, 0, width, height, 0); + + // work around to display desktop bar in Wine + ShowWindow(GET_WINDOW(DesktopWindow, hwndDesktop)->_desktopBar, SW_SHOW); + + return hwndDesktop; } diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp index c8b2932fba2..9cf2a46d5e6 100644 --- a/reactos/subsys/system/explorer/explorer.cpp +++ b/reactos/subsys/system/explorer/explorer.cpp @@ -140,11 +140,11 @@ int explorer_main(HINSTANCE hInstance, HWND hwndDesktop, int cmdshow) g_Globals._desktop_mode = true; if (cmdshow != SW_HIDE) { -#ifndef _ROS_ // don't maximize if being called from the ROS desktop +/* // don't maximize if being called from the ROS desktop if (cmdshow == SW_SHOWNORMAL) - /*TODO: read window placement from registry */ + //TODO: read window placement from registry cmdshow = SW_MAXIMIZE; -#endif +*/ explorer_show_frame(hwndDesktop, cmdshow); }