February 2008 - Wine-commits

Mikołaj Zalewski : net: Add Polish translation to rsrc .rc.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: b84986b01caba590ebd522f676cd32941b0b6bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84986b01caba590ebd522f67… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Feb 28 14:15:49 2008 +0100 net: Add Polish translation to rsrc.rc. --- programs/net/rsrc.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc index 6f20a94..3511882 100644 --- a/programs/net/rsrc.rc +++ b/programs/net/rsrc.rc @@ -26,4 +26,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Fr.rc" #include "Ko.rc" #include "Nl.rc" +#include "Pl.rc" #include "Ru.rc"

1 0

Mikołaj Zalewski : winefile: Add FOF_ALLOWUNDO to winefile to allow files go to trash.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 7b4f4996843589ff02c04954a81a527095e16cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b4f4996843589ff02c04954a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Thu Feb 28 08:51:40 2008 +0100 winefile: Add FOF_ALLOWUNDO to winefile to allow files go to trash. --- programs/winefile/winefile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 4805a6b..571b543 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -4491,7 +4491,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM case ID_FILE_DELETE: { TCHAR path[BUFFER_LEN]; - SHFILEOPSTRUCT shfo = {hwnd, FO_DELETE, path}; + SHFILEOPSTRUCT shfo = {hwnd, FO_DELETE, path, NULL, FOF_ALLOWUNDO}; get_path(pane->cur, path);

1 0

Alexandre Julliard : user32: Hide the icon title when hiding a window.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: c0e10d2b9704387e1fafb4195ff8158211ae499b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e10d2b9704387e1fafb4195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 16:17:08 2008 +0100 user32: Hide the icon title when hiding a window. --- dlls/user32/winpos.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index cc6309a..c60e75d 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -721,10 +721,9 @@ BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) TRACE("%p %i\n", hwnd, (bShow != 0) ); - if( !title ) - lpPos->hwndIconTitle = title = ICONTITLE_Create( hwnd ); if( bShow ) { + if (!title) lpPos->hwndIconTitle = title = ICONTITLE_Create( hwnd ); if (!IsWindowVisible(title)) { SendMessageW( title, WM_SHOWWINDOW, TRUE, 0 ); @@ -732,7 +731,7 @@ BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); } } - else ShowWindow( title, SW_HIDE ); + else if (title) ShowWindow( title, SW_HIDE ); } return FALSE; } @@ -1130,6 +1129,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) { HWND hFocus; + WINPOS_ShowIconTitle( hwnd, FALSE ); + /* FIXME: This will cause the window to be activated irrespective * of whether it is owned by the same thread. Has to be done * asynchronously.

1 0

Alexandre Julliard : user32/tests: Flush events after showing/ hiding a window to avoid z-order race conditions.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: d2b608799975150ec6e9873903eb559e758864a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2b608799975150ec6e987390… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 19:56:38 2008 +0100 user32/tests: Flush events after showing/hiding a window to avoid z-order race conditions. --- dlls/user32/tests/win.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fefa2b2..bf8e4fe 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2672,10 +2672,12 @@ static void test_mouse_input(HWND hwnd) ShowWindow(hwnd, SW_HIDE); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); ok( !ret, "message %04x available\n", msg.message); + flush_events(); /* test mouse clicks */ ShowWindow(hwnd, SW_SHOW); + flush_events(); ShowWindow(popup, SW_SHOW); flush_events(); @@ -2685,24 +2687,32 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDBLCLK, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDBLCLK, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDBLCLK, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, 0), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); ok(!ret, "message %04x available\n", msg.message); @@ -2716,18 +2726,22 @@ static void test_mouse_input(HWND hwnd) mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == hwnd && msg.message == WM_LBUTTONDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == hwnd && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", + msg.hwnd, hwnd, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == hwnd && msg.message == WM_LBUTTONUP, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == hwnd && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, hwnd, msg.message); test_lbuttondown_flag = TRUE; SendMessageA(hwnd, WM_COMMAND, (WPARAM)popup, 0); test_lbuttondown_flag = FALSE; ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p message %04x\n", msg.hwnd, msg.message); + ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", + msg.hwnd, popup, msg.message); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); /* Test WM_MOUSEACTIVATE */ @@ -3240,6 +3254,7 @@ static void test_scrolldc( HWND parent) 25, 50, 100, 100, parent, 0, 0, NULL); ShowWindow( parent, SW_SHOW); UpdateWindow( parent); + flush_events(); GetClientRect( hwnd1, &rc); hdc = GetDC( hwnd1); /* paint the upper half of the window black */

1 0

Alexandre Julliard : winmm/tests: Make sure the callback thread has a message queue.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: edb91ce51971c9c138b8754da631bc399f8b5729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb91ce51971c9c138b8754da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 19:56:48 2008 +0100 winmm/tests: Make sure the callback thread has a message queue. --- dlls/winmm/tests/wave.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 93e406e..60f0622 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -535,6 +535,7 @@ static DWORD WINAPI callback_thread(LPVOID lpParameter) { MSG msg; + PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); /* make sure the thread has a message queue */ SetEvent((HANDLE)lpParameter); while (GetMessage(&msg, 0, 0, 0)) {

1 0

Alexandre Julliard : winex11: Merge the iconification support into the SetWindowPos driver backend.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 63dd1a02ca401a7f5045c58317984fe2ee3bb5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=63dd1a02ca401a7f5045c5831… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 17:01:10 2008 +0100 winex11: Merge the iconification support into the SetWindowPos driver backend. --- dlls/winex11.drv/window.c | 42 ------------------------------------------ dlls/winex11.drv/winpos.c | 39 +++++++++++++++++++++++++-------------- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 26 insertions(+), 57 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 59602fc..2b04ec0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -981,48 +981,6 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) /*********************************************************************** - * X11DRV_set_iconic_state - * - * Set the X11 iconic state according to the window style. - */ -void X11DRV_set_iconic_state( HWND hwnd ) -{ - Display *display = thread_display(); - struct x11drv_win_data *data; - RECT rect; - DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - BOOL iconic = (style & WS_MINIMIZE) != 0; - - if (!(data = X11DRV_get_win_data( hwnd ))) return; - if (!data->whole_window) return; - - GetWindowRect( hwnd, &rect ); - - wine_tsx11_lock(); - - if (data->wm_hints) - { - data->wm_hints->flags |= StateHint | IconPositionHint; - data->wm_hints->initial_state = iconic ? IconicState : NormalState; - data->wm_hints->icon_x = rect.left - virtual_screen_rect.left; - data->wm_hints->icon_y = rect.top - virtual_screen_rect.top; - XSetWMHints( display, data->whole_window, data->wm_hints ); - } - - if (data->mapped) - { - if (iconic) - XIconifyWindow( display, data->whole_window, DefaultScreen(display) ); - else - if (X11DRV_is_window_rect_mapped( &rect )) - XMapWindow( display, data->whole_window ); - } - - wine_tsx11_unlock(); -} - - -/*********************************************************************** * X11DRV_window_to_X_rect * * Convert a rect from client to X window coordinates diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 3e04810..7c28a8d 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -159,6 +159,7 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) XMapWindow( display, data->whole_window ); wine_tsx11_unlock(); data->mapped = TRUE; + data->iconic = (new_style & WS_MINIMIZE) != 0; } } } @@ -354,8 +355,8 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, SERVER_END_REQ; } - TRACE( "win %p window %s client %s style %08x\n", - hwnd, wine_dbgstr_rect(rectWindow), wine_dbgstr_rect(rectClient), new_style ); + TRACE( "win %p window %s client %s style %08x flags %08x\n", + hwnd, wine_dbgstr_rect(rectWindow), wine_dbgstr_rect(rectClient), new_style, swp_flags ); if (!IsRectEmpty( &valid_rects[0] )) { @@ -395,12 +396,14 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, data->net_wm_state = 0; } - X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); + /* don't change position if we are about to minimize a managed window */ + if (!(data->managed && (swp_flags & SWP_STATECHANGED) && (new_style & WS_MINIMIZE))) + X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); - if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && - X11DRV_is_window_rect_mapped( rectWindow )) + if ((new_style & WS_VISIBLE) && + ((new_style & WS_MINIMIZE) || X11DRV_is_window_rect_mapped( rectWindow ))) { - if (!data->mapped || (swp_flags & SWP_FRAMECHANGED)) + if (!data->mapped || (swp_flags & (SWP_FRAMECHANGED|SWP_STATECHANGED))) X11DRV_set_wm_hints( display, data ); if (!data->mapped) @@ -413,6 +416,18 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, XFlush( display ); wine_tsx11_unlock(); data->mapped = TRUE; + data->iconic = (new_style & WS_MINIMIZE) != 0; + } + else if ((swp_flags & SWP_STATECHANGED) && (!data->iconic != !(new_style & WS_MINIMIZE))) + { + data->iconic = (new_style & WS_MINIMIZE) != 0; + TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); + wine_tsx11_lock(); + if (data->iconic) + XIconifyWindow( display, data->whole_window, DefaultScreen(display) ); + else if (X11DRV_is_window_rect_mapped( rectWindow )) + XMapWindow( display, data->whole_window ); + wine_tsx11_unlock(); } update_net_wm_states( display, data ); } @@ -528,8 +543,6 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); - X11DRV_set_iconic_state( hwnd ); - wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); if (!(old_style & WS_MINIMIZE)) swpFlags |= SWP_STATECHANGED; @@ -545,11 +558,8 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) WINPOS_GetMinMaxInfo( hwnd, &size, &wpl.ptMaxPosition, NULL, NULL ); old_style = WIN_SetStyle( hwnd, WS_MAXIMIZE, WS_MINIMIZE ); - if (old_style & WS_MINIMIZE) - { - WINPOS_ShowIconTitle( hwnd, FALSE ); - X11DRV_set_iconic_state( hwnd ); - } + if (old_style & WS_MINIMIZE) WINPOS_ShowIconTitle( hwnd, FALSE ); + if (!(old_style & WS_MAXIMIZE)) swpFlags |= SWP_STATECHANGED; SetRect( rect, wpl.ptMaxPosition.x, wpl.ptMaxPosition.y, size.x, size.y ); break; @@ -563,7 +573,6 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) BOOL restore_max; WINPOS_ShowIconTitle( hwnd, FALSE ); - X11DRV_set_iconic_state( hwnd ); if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return 0; restore_max = (wndPtr->flags & WIN_RESTORE_MAX) != 0; @@ -764,6 +773,7 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); return; } + data->iconic = FALSE; if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) == (WS_VISIBLE|WS_MINIMIZE)) { @@ -818,6 +828,7 @@ void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); return; } + data->iconic = TRUE; if (!(win = WIN_GetPtr( hwnd ))) return; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 20590b3..6ab9f38 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -670,6 +670,7 @@ struct x11drv_win_data XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ + BOOL iconic : 1; /* is window in iconic state? */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ unsigned int lock_changes; /* lock count for X11 change requests */ @@ -717,7 +718,6 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ); extern int X11DRV_check_error(void); extern BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rect ); -extern void X11DRV_set_iconic_state( HWND hwnd ); extern void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ); extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ); extern void X11DRV_sync_window_style( Display *display, struct x11drv_win_data *data );

1 0

Alexandre Julliard : user32: Moved the ShowWindow implementation from winex11 back to user32.
by Alexandre Julliard 29 Feb '08

29 Feb '08

Module: wine Branch: master Commit: 936ab3a64441656daa1320825d0eb4e89c4f59e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936ab3a64441656daa1320825… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 28 16:09:39 2008 +0100 user32: Moved the ShowWindow implementation from winex11 back to user32. --- dlls/user32/driver.c | 13 -- dlls/user32/user32.spec | 1 - dlls/user32/user_private.h | 1 - dlls/user32/win.c | 20 ++- dlls/user32/winpos.c | 321 ++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/window.c | 21 --- dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/winpos.c | 314 ------------------------------------ include/win.h | 4 +- 9 files changed, 339 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=936ab3a64441656daa132…

1 0

Dmitry Timoshkov : winex11: Add a workaround for Metacity being too strict and disabling fullscreen support for not resizable windows .
by Alexandre Julliard 28 Feb '08

28 Feb '08

Module: wine Branch: master Commit: cfcacdf554b90da7e28583d4f05c2de533242de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfcacdf554b90da7e28583d4f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 28 20:04:49 2008 +0800 winex11: Add a workaround for Metacity being too strict and disabling fullscreen support for not resizable windows. --- dlls/winex11.drv/window.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 71edc60..59602fc 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -799,11 +799,18 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR if ( !(style & WS_THICKFRAME) ) { - size_hints->max_width = data->whole_rect.right - data->whole_rect.left; - size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; - size_hints->min_width = size_hints->max_width; - size_hints->min_height = size_hints->max_height; - size_hints->flags |= PMinSize | PMaxSize; + /* If we restrict window resizing Metacity decides that it should + * disable fullscreen support for this window as well. + */ + if (!(data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && + data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height)) + { + size_hints->max_width = data->whole_rect.right - data->whole_rect.left; + size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + size_hints->min_width = size_hints->max_width; + size_hints->min_height = size_hints->max_height; + size_hints->flags |= PMinSize | PMaxSize; + } } XSetWMNormalHints( display, data->whole_window, size_hints ); XFree( size_hints );

1 0

Hans Leidekker : mscms: Avoid closing a random file when destroying a memory based profile.
by Alexandre Julliard 28 Feb '08

28 Feb '08

Module: wine Branch: master Commit: d284fd972f825f704a8bed77d7013e0a0e6bdcca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d284fd972f825f704a8bed77d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Thu Feb 28 11:21:52 2008 +0100 mscms: Avoid closing a random file when destroying a memory based profile. --- dlls/mscms/handle.c | 6 +++--- dlls/mscms/profile.c | 32 ++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index fe474f3..09c2cc6 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -44,9 +44,9 @@ static CRITICAL_SECTION MSCMS_handle_cs = { &MSCMS_handle_cs_debug, -1, 0, 0, 0, /* A simple structure to tie together a pointer to an icc profile, an lcms * color profile handle and a Windows file handle. Windows color profile * handles are built from indexes into an array of these structures. If - * the profile is memory based the file handle field is NULL. The 'access' - * field records the access parameter supplied to an OpenColorProfile() - * call, i.e. PROFILE_READ or PROFILE_READWRITE. + * the profile is memory based the file handle field is set to + * INVALID_HANDLE_VALUE. The 'access' field records the access parameter + * supplied to an OpenColorProfile() call, i.e. PROFILE_READ or PROFILE_READWRITE. */ struct profile diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index 8f4931a..9122ecc 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -1370,14 +1370,14 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing #ifdef HAVE_LCMS cmsHPROFILE cmsprofile = NULL; icProfile *iccprofile = NULL; - HANDLE handle = NULL; + HANDLE handle = INVALID_HANDLE_VALUE; DWORD size; TRACE( "( %p, 0x%08x, 0x%08x, 0x%08x )\n", profile, access, sharing, creation ); if (!profile || !profile->pProfileData) return NULL; - if (profile->dwType & PROFILE_MEMBUFFER) + if (profile->dwType == PROFILE_MEMBUFFER) { /* FIXME: access flags not implemented for memory based profiles */ @@ -1386,8 +1386,7 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing cmsprofile = cmsOpenProfileFromMem( iccprofile, size ); } - - if (profile->dwType & PROFILE_FILENAME) + else if (profile->dwType == PROFILE_FILENAME) { DWORD read, flags = 0; @@ -1432,6 +1431,11 @@ HPROFILE WINAPI OpenColorProfileW( PPROFILE profile, DWORD access, DWORD sharing cmsprofile = cmsOpenProfileFromMem( iccprofile, size ); } + else + { + ERR( "Invalid profile type %u\n", profile->dwType ); + return NULL; + } if (cmsprofile) return MSCMS_create_hprofile_handle( handle, iccprofile, cmsprofile, access ); @@ -1462,19 +1466,23 @@ BOOL WINAPI CloseColorProfile( HPROFILE profile ) TRACE( "( %p )\n", profile ); - if (file && (access & PROFILE_READWRITE)) + if (file != INVALID_HANDLE_VALUE) { - DWORD written, size = MSCMS_get_profile_size( iccprofile ); + if (access & PROFILE_READWRITE) + { + DWORD written, size = MSCMS_get_profile_size( iccprofile ); - if (SetFilePointer( file, 0, NULL, FILE_BEGIN ) || - !WriteFile( file, iccprofile, size, &written, NULL ) || written != size) - ERR( "Unable to write color profile\n" ); + if (SetFilePointer( file, 0, NULL, FILE_BEGIN ) || + !WriteFile( file, iccprofile, size, &written, NULL ) || written != size) + { + ERR( "Unable to write color profile\n" ); + } + } + CloseHandle( file ); } - ret = cmsCloseProfile( MSCMS_hprofile2cmsprofile( profile ) ); - HeapFree( GetProcessHeap(), 0, MSCMS_hprofile2iccprofile( profile ) ); + HeapFree( GetProcessHeap(), 0, iccprofile ); - CloseHandle( MSCMS_hprofile2handle( profile ) ); MSCMS_destroy_hprofile_handle( profile ); #endif /* HAVE_LCMS */

1 0

Jacek Caban : mshtml: Added nsIURI:: Equals implementation on URIs without necko interface associated.
by Alexandre Julliard 28 Feb '08

28 Feb '08

Module: wine Branch: master Commit: 54e6aa91af3ae5288857a80203a7fb6ca5e4972d URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e6aa91af3ae5288857a8020… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 28 12:41:40 2008 +0100 mshtml: Added nsIURI::Equals implementation on URIs without necko interface associated. --- dlls/mshtml/nsio.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ca269fc..f684f2a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1497,14 +1497,27 @@ static nsresult NSAPI nsURI_SetPath(nsIWineURI *iface, const nsACString *aPath) static nsresult NSAPI nsURI_Equals(nsIWineURI *iface, nsIURI *other, PRBool *_retval) { nsURI *This = NSURI_THIS(iface); + nsIWineURI *wine_uri; + LPCWSTR other_url = NULL; + nsresult nsres; TRACE("(%p)->(%p %p)\n", This, other, _retval); if(This->uri) return nsIURI_Equals(This->uri, other, _retval); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + nsres = nsIURI_QueryInterface(other, &IID_nsIWineURI, (void**)&wine_uri); + if(NS_FAILED(nsres)) { + TRACE("Could not get nsIWineURI interface\n"); + *_retval = FALSE; + return NS_OK; + } + + nsIWineURI_GetWineURL(wine_uri, &other_url); + *_retval = !UrlCompareW(This->wine_url, other_url, TRUE); + nsIWineURI_Release(wine_uri); + + return NS_OK; } static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBool *_retval)

1 0