October 2007 - Wine-Commits

Alexander Nicolaysen Sørnes : Fix appData::objectGetEntries(Count)
by Chris Morgan Oct. 12, 2007

Oct. 12, 2007

Module: appdb Branch: master Commit: e70383def8e1e5cddd77b137570c1dac185930b8 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e70383def8e1e5cddd77b137… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 11 10:07:17 2007 +0200 Fix appData::objectGetEntries(Count) --- include/appData.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/appData.php b/include/appData.php index a831acd..3f793b8 100644 --- a/include/appData.php +++ b/include/appData.php @@ -263,6 +263,8 @@ class appData AND ( appData.appId = appFamily.appId + AND + appData.versionId = '0' ) AND appVersion.queued = 'false' @@ -388,6 +390,8 @@ class appData AND ( appData.appId = appFamily.appId + AND + appData.versionId = '0' ) AND appVersion.queued = 'false'

1 0

wiki/winehq/css common.css
by Dimi Paun Oct. 11, 2007

Oct. 11, 2007

ChangeSet ID: 1192120746383563808937655 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/11 09:39:06 Modified files: winehq/css : common.css Log message: Add support for strike-out text (based on suggestion from Mikołaj Zalewski). Old revision New revision Changes Path 1.3 1.4 +5 -0 wiki/winehq/css/common.css Index: wiki/winehq/css/common.css diff -u -p wiki/winehq/css/common.css:1.3 wiki/winehq/css/common.css:1.4 --- wiki/winehq/css/common.css 11 Oct 2007 16:39: 6 -0000 +++ /dev/null 11 Oct 2007 16:39: 6 -0000 @@ -154,6 +154,11 @@ hr { color: red; } +.strike +{ + text-decoration: line-through; +} + strong.highlight { background-color: #ffcc99;

1 0

wiki/. wikiconfig.py
by Dimi Paun Oct. 11, 2007

Oct. 11, 2007

ChangeSet ID: 1192120455416564580126764 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/11 09:34:15 Modified files: . : wikiconfig.py Log message: Update to production values. Old revision New revision Changes Path 1.6 1.7 +54 -38 wiki/wikiconfig.py Index: wiki/wikiconfig.py diff -u -p wiki/wikiconfig.py:1.6 wiki/wikiconfig.py:1.7 --- wiki/wikiconfig.py 11 Oct 2007 16:34:15 -0000 +++ /dev/null 11 Oct 2007 16:34:15 -0000 @@ -21,8 +21,8 @@ Also, the URL http://moinmoin.wikiwikiweb.de/HelpOnConfiguration has a list of config options. - @copyright: 2000-2005 by Juergen Hermann <jh(a)web.de> - @license: GNU GPL, see COPYING for details. + ** Please do not use this file for a wiki farm. Use the sample file + from the wikifarm directory instead! ** """ from MoinMoin.multiconfig import DefaultConfig @@ -36,12 +36,23 @@ class Config(DefaultConfig): sitename = u'The Official Wine Wiki' # Wiki logo. You can use an image, text or both. [Unicode] - # Example: u'<img src="/wiki/mywiki.png" alt="My Wiki">My Wiki' - # For no logo or text, use '' - logo_string = '<img src="/logo.png" width="230" height="99" border="0" alt="Wine Wiki" />' + # For no logo or text, use '' - the default is to show the sitename. + # See also url_prefix setting below! + logo_string = u'<img src="logo.png" width="230" height="99" border="0" alt="Wine Wiki">' + + # name of entry page / front page [Unicode], choose one of those: + + # a) if most wiki content is in a single language + #page_front_page = u"MyStartingPage" + + # b) if wiki content is maintained in many languages + page_front_page = u"FrontPage" # The interwiki name used in interwiki links interwikiname = 'WineWiki' + # Show the interwiki name (and link it to page_front_page) in the Theme, + # nice for farm setups or when your logo does not show the wiki's name. + #show_interwiki = 1 # Critical setup --------------------------------------------------- @@ -63,25 +74,26 @@ class Config(DefaultConfig): # backup it. data_underlay_dir = '/var/www/wine/wiki/underlay/' - # This must be '/wiki' for twisted and standalone. For CGI, it should - # match your Apache Alias setting. + # Location of your STATIC files (css/png/js/...) - you must NOT use the + # same for invoking moin.cgi (or, in general, the moin code). + # url_prefix must be '/wiki' for Twisted and standalone servers. + # For CGI, it should match your Apache Alias setting. + # url_prefix = '/moin' url_prefix = '/wiki' - + # Security ---------------------------------------------------------- - # Security critical actions (disabled by default) - # Uncomment to enable options you like. - allowed_actions = ['DeletePage', 'AttachFile', 'RenamePage'] - - # Enable acl (0 to disable) - acl_enabled = 1 + # This is checked by some rather critical and potentially harmful actions, + # like despam or PackageInstaller action: + superuser = [u"DimiPaun", ] # IMPORTANT: grant yourself admin rights! replace YourName with # your user name. See HelpOnAccessControlLists for more help. - # All acl_right_xxx must use unicode [Unicode] + # All acl_rights_xxx options must use unicode [Unicode] + #acl_rights_before = u"YourName:read,write,delete,revert,admin" acl_rights_before = u"DimiPaun:read,write,delete,revert,admin" - acl_rights_default = 'Known:read,write,revert All:read' + acl_rights_default = u"Trusted:read,write,delete,revert Known:read,write,delete,revert All:read" # Link spam protection for public wikis (Uncomment to enable) # Needs a reliable internet connection. @@ -89,25 +101,22 @@ class Config(DefaultConfig): # Mail -------------------------------------------------------------- - + # Configure to enable subscribing to pages (disabled by default) # or sending forgotten passwords. - # SMTP server, e.g. "mail.provider.com" (empty or None to disable mail) + # SMTP server, e.g. "mail.provider.com" (None to disable mail) mail_smarthost = "mail.lattica.com" - # The return address, e.g "My Wiki <noreply(a)mywiki.org>" - mail_from = "Wine Wiki <wine-wiki(a)lattica.com>" + # The return address, e.g u"Jürgen Wiki <noreply(a)mywiki.org>" [Unicode] + mail_from = u"Wine Wiki <wine-wiki(a)lattica.com>" # "user pwd" if you need to use SMTP AUTH - mail_login = "" + #mail_login = "" # User interface ---------------------------------------------------- - # Name of the FrontPage - # page_front_page = u'[WineWiki Wine Wiki]' - # Add your wikis important pages at the end. It is not recommended to # remove the default links. Leave room for user links - don't use # more than 6 short items. @@ -115,16 +124,16 @@ class Config(DefaultConfig): # page names for system and help pages, those will be used automatically # according to the user selected language. [Unicode] navi_bar = [ - # Will use page_front_page, (default FrontPage) + # If you want to show your page_front_page here: u'%(page_front_page)s', - u'[RecentChanges Recent Changes]', - u'[FindPage Search Wiki]', - u'[HelpContents Help Contents]', + u'RecentChanges', + u'FindPage', + u'HelpContents', ] # The default theme anonymous or new users get theme_default = 'winehq' - + # Language options -------------------------------------------------- @@ -132,7 +141,7 @@ class Config(DefaultConfig): # YOUR language that other people contributed. # The main wiki language, set the direction of the wiki pages - default_lang = 'en' + language_default = 'en' # You must use Unicode strings here [Unicode] page_category_regex = u'^Category[A-Z]' @@ -143,17 +152,11 @@ class Config(DefaultConfig): # Content options --------------------------------------------------- - # Allow normal links to be followed (for now at least) - html_head_normal = '''<meta name="robots" content="index,follow">\n''' - # Show users hostnames in RecentChanges show_hosts = 1 - # Enumerate headlines? - show_section_numbers = 0 - - # Charts size, require gdchart (Set to None to disable). - chart_options = {'width': 600, 'height': 300} + # Enable graphical charts, requires gdchart. + chart_options = {'width': 600, 'height': 300} # True to enable !NoWikiName markup bang_meta = 1 @@ -165,3 +168,16 @@ class Config(DefaultConfig): page_credits = [ 'Sponsored by <a href="http://lattica.com/"><i>Lattica</i></a><br /><a href="http://moinmoin.wikiwikiweb.de/">MoinMoin Powered</a>' ] + +# surge_action_limits = { # allow max. <count> <action> requests per <dt> secs + # action: (count, dt) +# 'show': (200, 1), +# 'raw': (200, 1), # some people use this for css +# 'AttachFile': (60, 60), +# 'diff': (30, 60), +# 'fullsearch': (5, 60), +# 'edit': (10, 120), +# 'rss_rc': (1, 60), +# 'default': (30, 60), +# } + surge_lockout_time = 0 # secs you get locked out when you ignore warnings

1 0

Jacek Caban : mshtml: Added support for installing Gecko from the local file.
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: f4e1ff6e1fafc2a98f53ff587ebd2adb39b63fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4e1ff6e1fafc2a98f53ff587… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 10 14:44:07 2007 +0200 mshtml: Added support for installing Gecko from the local file. --- dlls/mshtml/install.c | 226 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 171 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4e1ff6e1fafc2a98f53f…

1 0

Aric Stewart : msdmo: Improve registration and reading of codecs.
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: 352d29b194473576ea3f86a697c076d3befdb00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=352d29b194473576ea3f86a69… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 10 10:13:49 2007 -0500 msdmo: Improve registration and reading of codecs. --- dlls/msdmo/dmoreg.c | 207 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 132 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=352d29b194473576ea3f8…

1 0

Andrey Turkin : wine.inf: Add Protected Storage System Provider key.
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: 4ac1375c5ab21800c7cc1360841b84cb9d7a09da URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac1375c5ab21800c7cc13608… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Oct 7 17:03:27 2007 +0400 wine.inf: Add Protected Storage System Provider key. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index c311cd9..5428750 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -334,6 +334,7 @@ HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" +HKCU,Software\Microsoft\Protected Storage System Provider,,,"" HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,"" HKLM,HARDWARE\DEVICEMAP\SERIALCOMM,,,""

1 0

John Klehm : msinkaut.idl: Declare the IInkCollector interface and its dependencies.
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: c632a7500f8ce531b75a191142857b97ec7ccac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c632a7500f8ce531b75a19114… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Wed Oct 10 04:32:33 2007 -0500 msinkaut.idl: Declare the IInkCollector interface and its dependencies. --- include/msinkaut.idl | 667 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 667 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c632a7500f8ce531b75a1…

1 0

Roy Shea : qmgr: Skeleton implementation of Background Intelligent Transfer Service (BITS).
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: 2b0255f6d8aacff0b2b68028508a5da041b78dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0255f6d8aacff0b2b680285… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Mon Oct 8 10:38:06 2007 -0700 qmgr: Skeleton implementation of Background Intelligent Transfer Service (BITS). --- Makefile.in | 2 ++ configure | 3 +++ configure.ac | 1 + dlls/Makefile.in | 1 + dlls/qmgr/Makefile.in | 14 ++++++++++++++ dlls/qmgr/bits_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/qmgr/qmgr.spec | 2 ++ 7 files changed, 72 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index a977a55..3ff8abb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -347,6 +347,7 @@ ALL_MAKEFILES = \ dlls/psapi/tests/Makefile \ dlls/pstorec/Makefile \ dlls/qcap/Makefile \ + dlls/qmgr/Makefile \ dlls/quartz/Makefile \ dlls/quartz/tests/Makefile \ dlls/query/Makefile \ @@ -717,6 +718,7 @@ dlls/psapi/Makefile: dlls/psapi/Makefile.in dlls/Makedll.rules dlls/psapi/tests/Makefile: dlls/psapi/tests/Makefile.in dlls/Maketest.rules dlls/pstorec/Makefile: dlls/pstorec/Makefile.in dlls/Makedll.rules dlls/qcap/Makefile: dlls/qcap/Makefile.in dlls/Makedll.rules +dlls/qmgr/Makefile: dlls/qmgr/Makefile.in dlls/Makedll.rules dlls/quartz/Makefile: dlls/quartz/Makefile.in dlls/Makedll.rules dlls/quartz/tests/Makefile: dlls/quartz/tests/Makefile.in dlls/Maketest.rules dlls/query/Makefile: dlls/query/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index e9a92da..566d139 100755 --- a/configure +++ b/configure @@ -20650,6 +20650,8 @@ ac_config_files="$ac_config_files dlls/pstorec/Makefile" ac_config_files="$ac_config_files dlls/qcap/Makefile" +ac_config_files="$ac_config_files dlls/qmgr/Makefile" + ac_config_files="$ac_config_files dlls/quartz/Makefile" ac_config_files="$ac_config_files dlls/quartz/tests/Makefile" @@ -21737,6 +21739,7 @@ do "dlls/psapi/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/psapi/tests/Makefile" ;; "dlls/pstorec/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/pstorec/Makefile" ;; "dlls/qcap/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qcap/Makefile" ;; + "dlls/qmgr/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/qmgr/Makefile" ;; "dlls/quartz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/Makefile" ;; "dlls/quartz/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/quartz/tests/Makefile" ;; "dlls/query/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/query/Makefile" ;; diff --git a/configure.ac b/configure.ac index 34c6fca..6bb3faa 100644 --- a/configure.ac +++ b/configure.ac @@ -1745,6 +1745,7 @@ AC_CONFIG_FILES([dlls/psapi/Makefile]) AC_CONFIG_FILES([dlls/psapi/tests/Makefile]) AC_CONFIG_FILES([dlls/pstorec/Makefile]) AC_CONFIG_FILES([dlls/qcap/Makefile]) +AC_CONFIG_FILES([dlls/qmgr/Makefile]) AC_CONFIG_FILES([dlls/quartz/Makefile]) AC_CONFIG_FILES([dlls/quartz/tests/Makefile]) AC_CONFIG_FILES([dlls/query/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 2053a1f..4871eba 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -157,6 +157,7 @@ BASEDIRS = \ psapi \ pstorec \ qcap \ + qmgr \ quartz \ query \ rasapi32 \ diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in new file mode 100644 index 0000000..24dc03b --- /dev/null +++ b/dlls/qmgr/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = qmgr.dll +IMPORTS = kernel32 +EXTRALIBS = + +C_SRCS = \ + bits_main.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/qmgr/bits_main.c b/dlls/qmgr/bits_main.c new file mode 100644 index 0000000..76321ca --- /dev/null +++ b/dlls/qmgr/bits_main.c @@ -0,0 +1,49 @@ +/* + * Implementation of qmgr.dll + * + * Background Intelligent Transfer Service (BITS) interface. Dll is named + * qmgr for backwards compatibility with early versions of BITS. + * + * Copyright 2007 Google (Roy Shea) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "objbase.h" + +WINE_DEFAULT_DEBUG_CHANNEL(bits); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/qmgr/qmgr.spec b/dlls/qmgr/qmgr.spec new file mode 100644 index 0000000..1a63b32 --- /dev/null +++ b/dlls/qmgr/qmgr.spec @@ -0,0 +1,2 @@ +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Alexandre Julliard : winex11: Don' t use a window manager border for a simple WS_BORDER-style border.
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: c881875c0748bc41b173dec9a8b3c48e50ea3534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c881875c0748bc41b173dec9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 12:25:02 2007 +0200 winex11: Don't use a window manager border for a simple WS_BORDER-style border. --- dlls/winex11.drv/window.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 65baee3..20ffe06 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -147,8 +147,6 @@ static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER; else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER; - else if (style & WS_BORDER) ret |= MWM_DECOR_BORDER; - else if (!(style & (WS_CHILD|WS_POPUP))) ret |= MWM_DECOR_BORDER; return ret; }

1 0

Alexandre Julliard : winex11: Reuse the mwm hints when computing the window X11 rectangle.
by Alexandre Julliard Oct. 11, 2007

Oct. 11, 2007

Module: wine Branch: master Commit: c4e20e7462f40887d9845caed0ae32949711b83b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e20e7462f40887d9845caed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 12:24:27 2007 +0200 winex11: Reuse the mwm hints when computing the window X11 rectangle. This allows more flexibility in deciding which elements of the decor are done by the window manager. --- dlls/winex11.drv/window.c | 88 ++++++++++++++++++++++++++++++-------------- 1 files changed, 60 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5c4eead..65baee3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -129,6 +129,58 @@ BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) /*********************************************************************** + * get_mwm_decorations + */ +static unsigned long get_mwm_decorations( DWORD style, DWORD ex_style ) +{ + unsigned long ret = 0; + + if (ex_style & WS_EX_TOOLWINDOW) return 0; + + if ((style & WS_CAPTION) == WS_CAPTION) + { + ret |= MWM_DECOR_TITLE | MWM_DECOR_BORDER; + if (style & WS_SYSMENU) ret |= MWM_DECOR_MENU; + if (style & WS_MINIMIZEBOX) ret |= MWM_DECOR_MINIMIZE; + if (style & WS_MAXIMIZEBOX) ret |= MWM_DECOR_MAXIMIZE; + } + if (ex_style & WS_EX_DLGMODALFRAME) ret |= MWM_DECOR_BORDER; + else if (style & WS_THICKFRAME) ret |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; + else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) ret |= MWM_DECOR_BORDER; + else if (style & WS_BORDER) ret |= MWM_DECOR_BORDER; + else if (!(style & (WS_CHILD|WS_POPUP))) ret |= MWM_DECOR_BORDER; + return ret; +} + + +/*********************************************************************** + * get_x11_rect_offset + * + * Helper for X11DRV_window_to_X_rect and X11DRV_X_to_window_rect. + */ +static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) +{ + DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; + unsigned long decor; + + rect->top = rect->bottom = rect->left = rect->right = 0; + + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + decor = get_mwm_decorations( style, ex_style ); + + if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; + if (decor & MWM_DECOR_BORDER) + { + style_mask |= WS_DLGFRAME | WS_THICKFRAME; + ex_style_mask |= WS_EX_DLGMODALFRAME; + } + + AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); +} + + +/*********************************************************************** * get_window_attributes * * Fill the window attributes structure for an X window. @@ -768,27 +820,12 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1); mwm_hints.flags = MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; + mwm_hints.decorations = get_mwm_decorations( style, ex_style ); mwm_hints.functions = MWM_FUNC_MOVE; if (style & WS_THICKFRAME) mwm_hints.functions |= MWM_FUNC_RESIZE; if (style & WS_MINIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MINIMIZE; if (style & WS_MAXIMIZEBOX) mwm_hints.functions |= MWM_FUNC_MAXIMIZE; if (style & WS_SYSMENU) mwm_hints.functions |= MWM_FUNC_CLOSE; - mwm_hints.decorations = 0; - if (!(ex_style & WS_EX_TOOLWINDOW)) - { - if ((style & WS_CAPTION) == WS_CAPTION) - { - mwm_hints.decorations |= MWM_DECOR_TITLE; - if (style & WS_SYSMENU) mwm_hints.decorations |= MWM_DECOR_MENU; - if (style & WS_MINIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MINIMIZE; - if (style & WS_MAXIMIZEBOX) mwm_hints.decorations |= MWM_DECOR_MAXIMIZE; - } - if (ex_style & WS_EX_DLGMODALFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (style & WS_THICKFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER | MWM_DECOR_RESIZEH; - else if ((style & (WS_DLGFRAME|WS_BORDER)) == WS_DLGFRAME) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (style & WS_BORDER) mwm_hints.decorations |= MWM_DECOR_BORDER; - else if (!(style & (WS_CHILD|WS_POPUP))) mwm_hints.decorations |= MWM_DECOR_BORDER; - } XChangeProperty( display, data->whole_window, x11drv_atom(_MOTIF_WM_HINTS), x11drv_atom(_MOTIF_WM_HINTS), 32, PropModeReplace, @@ -862,17 +899,11 @@ void X11DRV_set_iconic_state( HWND hwnd ) void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { RECT rc; - DWORD ex_style; if (!data->managed) return; if (IsRectEmpty( rect )) return; - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TOOLWINDOW) return; - - rc.top = rc.bottom = rc.left = rc.right = 0; - AdjustWindowRectEx( &rc, GetWindowLongW( data->hwnd, GWL_STYLE ) & ~(WS_HSCROLL|WS_VSCROLL), - FALSE, ex_style ); + get_x11_rect_offset( data, &rc ); rect->left -= rc.left; rect->right -= rc.right; @@ -890,16 +921,17 @@ void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) */ void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) { - DWORD ex_style; + RECT rc; if (!data->managed) return; if (IsRectEmpty( rect )) return; - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - if (ex_style & WS_EX_TOOLWINDOW) return; - AdjustWindowRectEx( rect, GetWindowLongW( data->hwnd, GWL_STYLE ) & ~(WS_HSCROLL|WS_VSCROLL), - FALSE, ex_style ); + get_x11_rect_offset( data, &rc ); + rect->left += rc.left; + rect->right += rc.right; + rect->top += rc.top; + rect->bottom += rc.bottom; if (rect->top >= rect->bottom) rect->bottom = rect->top + 1; if (rect->left >= rect->right) rect->right = rect->left + 1; }

1 0