September 2007 - Wine-Commits

Peter Oberndorfer : user32/tests: Fix dialog proc prototypes.
by Alexandre Julliard Sept. 21, 2007

Sept. 21, 2007

Module: wine Branch: master Commit: 1fce55410efafd758a98798ae8d8e55515fd12c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fce55410efafd758a98798ae… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Sep 20 19:31:56 2007 +0200 user32/tests: Fix dialog proc prototypes. --- dlls/user32/tests/dialog.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index fe8a0fd..afde292 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -676,7 +676,7 @@ static void IsDialogMessageWTest (void) } -static LRESULT CALLBACK delayFocusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, +static INT_PTR CALLBACK delayFocusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { switch (uiMsg) @@ -716,7 +716,7 @@ static LRESULT CALLBACK delayFocusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wPar return FALSE; } -static LRESULT CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, +static INT_PTR CALLBACK focusDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { switch (uiMsg) @@ -781,7 +781,7 @@ static void InitialFocusTest (void) g_styleInitialFocusT1 = -1; g_styleInitialFocusT2 = -1; - DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, (DLGPROC)delayFocusDlgWinProc); + DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, delayFocusDlgWinProc); ok (((g_styleInitialFocusT1 & WS_TABSTOP) == 0), "Error in wrc - Detected WS_TABSTOP as default style for GROUPBOX\n"); @@ -812,7 +812,7 @@ static void InitialFocusTest (void) g_styleInitialFocusT1 = -1; g_styleInitialFocusT2 = -1; - DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, (DLGPROC)delayFocusDlgWinProc); + DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, delayFocusDlgWinProc); ok ((g_hwndInitialFocusT1 == g_hwndButton2), "Error in initial focus when WM_INITDIALOG returned TRUE: " @@ -839,7 +839,7 @@ static void InitialFocusTest (void) pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); g_hwndInitialFocusT1 = 0; - hDlg = CreateDialogIndirectParamW(g_hinst, pTemplate, NULL, (DLGPROC)focusDlgWinProc,0); + hDlg = CreateDialogIndirectParamW(g_hinst, pTemplate, NULL, focusDlgWinProc, 0); ok (hDlg != 0, "Failed to create test dialog.\n"); ok ((g_hwndInitialFocusT1 == 0),

1 0

Francois Gouget : infosoft: indexsrv.idl must import objidl. idl and not unknwn.idl.
by Alexandre Julliard Sept. 21, 2007

Sept. 21, 2007

Module: wine Branch: master Commit: deb355be8171fdeed759903f31afa3c7c5e7f72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb355be8171fdeed759903f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 20 21:36:29 2007 +0200 infosoft: indexsrv.idl must import objidl.idl and not unknwn.idl. Add a commented out import directive as a reminder. --- include/indexsrv.idl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/indexsrv.idl b/include/indexsrv.idl index e7b9919..85e4e66 100644 --- a/include/indexsrv.idl +++ b/include/indexsrv.idl @@ -16,7 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "unknwn.idl"; +import "objidl.idl"; +/* FIXME: import "filter.idl"; */ /* * widl doesn't like the declaration of PFNFILLTEXTBUFFER, so work around it...

1 0

Alexandre Julliard : winex11.drv: Don' t call GDI functions while holding the xrender lock.
by Alexandre Julliard Sept. 21, 2007

Sept. 21, 2007

Module: wine Branch: master Commit: d08fbfc3b0151368f01ccc7feacd605622500425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08fbfc3b0151368f01ccc7fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 10:47:45 2007 +0200 winex11.drv: Don't call GDI functions while holding the xrender lock. --- dlls/winex11.drv/xrender.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b659e21..cbf83bc 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1130,7 +1130,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag { RGNDATA *data; XGCValues xgcval; - int render_op = PictOpOver; gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; BOOL retv = FALSE; @@ -1215,8 +1214,6 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag DeleteObject( clip_region ); } - EnterCriticalSection(&xrender_cs); - if(X11DRV_XRender_Installed) { if(!physDev->xrender->pict) { XRenderPictureAttributes pa; @@ -1245,15 +1242,10 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, data ); } - - tile_pict = get_tile_pict(depth_type, physDev->textPixel); - - /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. - */ - if((depth_type == mono_drawable) && (textPixel == 0)) - render_op = PictOpOutReverse; /* This gives us 'black' text */ } + EnterCriticalSection(&xrender_cs); + entry = glyphsetCache + physDev->xrender->cache_index; if( disable_antialias == FALSE ) aa_type = entry->aa_default; @@ -1285,6 +1277,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag XGlyphElt16 *elts = HeapAlloc(GetProcessHeap(), 0, sizeof(XGlyphElt16) * count); INT offset = 0; POINT desired, current; + int render_op = PictOpOver; /* There's a bug in XRenderCompositeText that ignores the xDst and yDst parameters. So we pass zeros to the function and move to our starting position using the first @@ -1294,6 +1287,13 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag desired.y = physDev->dc_rect.top + y; current.x = current.y = 0; + tile_pict = get_tile_pict(depth_type, physDev->textPixel); + + /* FIXME the mapping of Text/BkColor onto 1 or 0 needs investigation. + */ + if((depth_type == mono_drawable) && (textPixel == 0)) + render_op = PictOpOutReverse; /* This gives us 'black' text */ + for(idx = 0; idx < count; idx++) { elts[idx].glyphset = formatEntry->glyphset;

1 0

Alexandre Julliard : server: Clip the visible region of a window to the desktop window.
by Alexandre Julliard Sept. 21, 2007

Sept. 21, 2007

Module: wine Branch: master Commit: 5874b854ee83455211c07af5f1c651c10335ca49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5874b854ee83455211c07af5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 20 19:38:50 2007 +0200 server: Clip the visible region of a window to the desktop window. --- server/window.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/server/window.c b/server/window.c index 14d6468..7c246dc 100644 --- a/server/window.c +++ b/server/window.c @@ -840,7 +840,7 @@ static inline struct window *get_top_clipping_window( struct window *win ) /* compute the visible region of a window, in window coordinates */ -static struct region *get_visible_region( struct window *win, struct window *top, unsigned int flags ) +static struct region *get_visible_region( struct window *win, unsigned int flags ) { struct region *tmp = NULL, *region; int offset_x, offset_y; @@ -853,7 +853,7 @@ static struct region *get_visible_region( struct window *win, struct window *top /* create a region relative to the window itself */ - if ((flags & DCX_PARENTCLIP) && win != top && win->parent) + if ((flags & DCX_PARENTCLIP) && win->parent && !is_desktop_window(win->parent)) { set_region_client_rect( region, win->parent ); offset_region( region, -win->parent->client_rect.left, -win->parent->client_rect.top ); @@ -891,11 +891,12 @@ static struct region *get_visible_region( struct window *win, struct window *top offset_y = win->window_rect.top; } - if (top && top != win && (tmp = create_empty_region()) != NULL) + if ((tmp = create_empty_region()) != NULL) { - while (win != top && win->parent) + while (win->parent) { - if (win->style & WS_CLIPSIBLINGS) + /* we don't clip out top-level siblings as that's up to the native windowing system */ + if ((win->style & WS_CLIPSIBLINGS) && !is_desktop_window( win->parent )) { if (!clip_children( win->parent, win, region, 0, 0 )) goto error; if (is_region_empty( region )) break; @@ -1332,12 +1333,11 @@ static void set_window_pos( struct window *win, struct window *previous, const rectangle_t old_window_rect = win->window_rect; const rectangle_t old_visible_rect = win->visible_rect; const rectangle_t old_client_rect = win->client_rect; - struct window *top = get_top_clipping_window( win ); int visible = (win->style & WS_VISIBLE) || (swp_flags & SWP_SHOWWINDOW); if (win->parent && !is_visible( win->parent )) visible = 0; - if (visible && !(old_vis_rgn = get_visible_region( win, top, DCX_WINDOW ))) return; + if (visible && !(old_vis_rgn = get_visible_region( win, DCX_WINDOW ))) return; /* set the new window info before invalidating anything */ @@ -1356,7 +1356,7 @@ static void set_window_pos( struct window *win, struct window *previous, /* if the window is not visible, everything is easy */ if (!visible) return; - if (!(new_vis_rgn = get_visible_region( win, top, DCX_WINDOW ))) + if (!(new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) { free_region( old_vis_rgn ); clear_error(); /* ignore error since the window info has been modified already */ @@ -1441,17 +1441,16 @@ done: static void set_window_region( struct window *win, struct region *region, int redraw ) { struct region *old_vis_rgn = NULL, *new_vis_rgn; - struct window *top = get_top_clipping_window( win ); /* no need to redraw if window is not visible */ if (redraw && !is_visible( win )) redraw = 0; - if (redraw) old_vis_rgn = get_visible_region( win, top, DCX_WINDOW ); + if (redraw) old_vis_rgn = get_visible_region( win, DCX_WINDOW ); if (win->win_region) free_region( win->win_region ); win->win_region = region; - if (old_vis_rgn && (new_vis_rgn = get_visible_region( win, top, DCX_WINDOW ))) + if (old_vis_rgn && (new_vis_rgn = get_visible_region( win, DCX_WINDOW ))) { /* expose anything revealed by the change */ if (xor_region( new_vis_rgn, old_vis_rgn, new_vis_rgn )) @@ -1867,7 +1866,7 @@ DECL_HANDLER(get_visible_region) if (!win) return; top = get_top_clipping_window( win ); - if ((region = get_visible_region( win, top, req->flags ))) + if ((region = get_visible_region( win, req->flags ))) { rectangle_t *data; map_win_region_to_screen( win, region );

1 0

Peter Oberndorfer : include: Add new processor feature constants.
by Alexandre Julliard Sept. 21, 2007

Sept. 21, 2007

Module: wine Branch: master Commit: 70238568c6e48062d17c9906e9a173c7ea8f767a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70238568c6e48062d17c9906e… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu Sep 20 19:16:37 2007 +0200 include: Add new processor feature constants. --- include/winnt.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 71dbf6d..63b1936 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -692,7 +692,12 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 #define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 /* Execution state flags */

1 0

Alexandre Julliard : loader: Set the address space limit before starting the preloader.
by Alexandre Julliard Sept. 21, 2007

Sept. 21, 2007

Module: wine Branch: master Commit: 1b8d9e03a9efe9744456e64d6381a2762a22103c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b8d9e03a9efe9744456e64d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 21 10:43:45 2007 +0200 loader: Set the address space limit before starting the preloader. --- loader/glibc.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/loader/glibc.c b/loader/glibc.c index f4d2f9c..28a8d19 100644 --- a/loader/glibc.c +++ b/loader/glibc.c @@ -27,6 +27,9 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#ifdef HAVE_SYS_RESOURCE_H +# include <sys/resource.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -97,6 +100,18 @@ static void check_vmsplit( void *stack ) } } +static void set_max_limit( int limit ) +{ + struct rlimit rlimit; + + if (!getrlimit( limit, &rlimit )) + { + rlimit.rlim_cur = rlimit.rlim_max; + setrlimit( limit, &rlimit ); + } +} + + /********************************************************************** * main */ @@ -108,6 +123,9 @@ int main( int argc, char *argv[] ) wine_init_argv0_path( new_argv0 ); + /* set the address space limit before starting the preloader */ + set_max_limit( RLIMIT_AS ); + if (loader) { /* update WINELOADER with the new name */

1 0

Alexander Nicolaysen Sørnes : version: Improve the submit test button for not-logged-in users
by Chris Morgan Sept. 20, 2007

Sept. 20, 2007

Module: appdb Branch: master Commit: 4b453e1e5a932fcdf2c2a069129787f9eaeb703d URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4b453e1e5a932fcdf2c2a069… Author: Alexander Nicolaysen Sørnes <alexander(a)kurt.alexstyrt> Date: Thu Sep 20 20:03:35 2007 +0200 version: Improve the submit test button for not-logged-in users --- include/version.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/version.php b/include/version.php index 7b9c436..163a9a0 100644 --- a/include/version.php +++ b/include/version.php @@ -1009,9 +1009,9 @@ class version { echo '</form>'."\n"; } else { - echo '<form method="post" name="sMessage" action="account.php">'."\n"; + echo '<form method="post" name="sMessage" action="'.login_url().'">'."\n"; echo "\t".'<input type="hidden" name="sCmd" value="login">'."\n"; - echo "\t".'<input type=submit value="Log in add Test Data" class="button">'."\n"; + echo "\t".'<input type=submit value="Log in to add test data" class="button">'."\n"; echo '</form>'."\n"; }

1 0

Alexander Nicolaysen Sørnes : Use objectManager to submit super maintainer requests
by Chris Morgan Sept. 20, 2007

Sept. 20, 2007

Module: appdb Branch: master Commit: e5d1bc1bf07b3cb5a526440fa2b84d4fee326713 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e5d1bc1bf07b3cb5a526440f… Author: Alexander Nicolaysen Sørnes <alexander(a)kurt.alexstyrt> Date: Thu Sep 20 21:25:07 2007 +0200 Use objectManager to submit super maintainer requests --- include/application.php | 2 +- include/maintainer.php | 18 ++++- include/objectManager.php | 9 ++- maintainersubmit.php | 173 --------------------------------------------- 4 files changed, 24 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e5d1bc1bf07b3cb5a526…

1 0

Alexander Nicolaysen Sørnes : Use objectManager to submit maintainer requests
by Chris Morgan Sept. 20, 2007

Sept. 20, 2007

Module: appdb Branch: master Commit: 3ab41b6fca5277f0b428f529effdf63ff0a7e688 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3ab41b6fca5277f0b428f529… Author: Alexander Nicolaysen Sørnes <alexander(a)kurt.alexstyrt> Date: Thu Sep 20 21:03:09 2007 +0200 Use objectManager to submit maintainer requests --- include/maintainer.php | 235 +++++++++++++++++++++++++++++---------------- include/objectManager.php | 3 - include/version.php | 2 +- 3 files changed, 153 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=3ab41b6fca5277f0b428…

1 0

Alexander Nicolaysen Sørnes : Fix objectGetCustomVars
by Chris Morgan Sept. 20, 2007

Sept. 20, 2007

Module: appdb Branch: master Commit: fdfe3eb2d3c24a319a7a809807c8410b72294a91 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fdfe3eb2d3c24a319a7a8098… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Sep 20 08:33:00 2007 +0200 Fix objectGetCustomVars --- include/objectManager.php | 11 ++++++----- include/version.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index c52d36a..b75c879 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -736,14 +736,15 @@ class ObjectManager return null; /* No vars */ $aVars = array(); + $aVarNames = $oObject->objectGetCustomVars($sAction); - foreach($oObject->objectGetCustomVars($aClean, $sAction) as $sVar) + if(!$aVarNames) /* No vars */ + return null; + + foreach($aVarNames as $sVar) $aVars[$sVar] = $aClean[$sVar]; - if(!sizeof($aVars)) - return null; /* No vars */ - else - return $aVars; + return $aVars; } /* View an entry */ diff --git a/include/version.php b/include/version.php index 6d74736..7ba53d4 100644 --- a/include/version.php +++ b/include/version.php @@ -731,7 +731,7 @@ class version { } } - function objectGetCustomVars($aClean, $sAction) + function objectGetCustomVars($sAction) { switch($sAction) {

1 0