Matthew D'Asaro : winex11: Add registry option to let wine decorate windows .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4217fcb187efe67612942784d56f331ebbf71236
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4217fcb187efe67612942784d56f331ebbf71236

Author: Matthew D'Asaro <matthew at thinkpad.home>
Date:   Thu Apr 10 12:53:45 2008 -0700

winex11: Add registry option to let wine decorate windows.

---

 dlls/winex11.drv/window.c      |    2 ++
 dlls/winex11.drv/x11drv.h      |    1 +
 dlls/winex11.drv/x11drv_main.c |    4 ++++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index ac70c85..7cbd102 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -148,6 +148,8 @@ static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style )
 {
     unsigned long ret = 0;
 
+    if (!decorated_mode) return ret;
+
     if (ex_style & WS_EX_TOOLWINDOW) return 0;
 
     if ((style & WS_CAPTION) == WS_CAPTION)
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 939872f..e682f07 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -548,6 +548,7 @@ extern int use_xkb;
 extern int use_take_focus;
 extern int use_primary_selection;
 extern int managed_mode;
+extern int decorated_mode;
 extern int private_color_map;
 extern int primary_monitor;
 extern int copy_default_colors;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index b9378c8..9d64a85 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -82,6 +82,7 @@ int use_xkb = 1;
 int use_take_focus = 1;
 int use_primary_selection = 0;
 int managed_mode = 1;
+int decorated_mode = 1;
 int private_color_map = 0;
 int primary_monitor = 0;
 int client_side_with_core = 1;
@@ -360,6 +361,9 @@ static void setup_options(void)
     if (!get_config_key( hkey, appkey, "Managed", buffer, sizeof(buffer) ))
         managed_mode = IS_OPTION_TRUE( buffer[0] );
 
+    if (!get_config_key( hkey, appkey, "Decorated", buffer, sizeof(buffer) ))
+        decorated_mode = IS_OPTION_TRUE( buffer[0] );
+
     if (!get_config_key( hkey, appkey, "DXGrab", buffer, sizeof(buffer) ))
         dxgrab = IS_OPTION_TRUE( buffer[0] );