August 2008 - Wine-Commits - list.winehq.org

Andrew Talbot : dmstyle: Sign-compare warning fix.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 61aac4a0fda661ad04e50c69140b91cc23d79376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61aac4a0fda661ad04e50c691… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Jul 31 22:26:18 2008 +0100 dmstyle: Sign-compare warning fix. --- dlls/dmstyle/dmutils.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index ce3de46..7f6d37f 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -628,8 +628,9 @@ const char *debugstr_dmreturn (DWORD code) { /* generic flag-dumping function */ const char* debugstr_flags (DWORD flags, const flag_info* names, size_t num_names){ static char buffer[128] = "", *ptr = &buffer[0]; - unsigned int i, size = sizeof(buffer); - + unsigned int i; + int size = sizeof(buffer); + for (i=0; i < num_names; i++) { if ((flags & names[i].val)) { int cnt = snprintf(ptr, size, "%s ", names[i].name);

1 0

Paul Vriens : mshtml/tests: Don't fail on unimplemented function.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 5e0384ab6a1e5302591d0ddac866853ef2b0612e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0384ab6a1e5302591d0ddac… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 31 19:18:35 2008 +0200 mshtml/tests: Don't fail on unimplemented function. --- dlls/mshtml/tests/protocol.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 4e8b3d0..b17028f 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -266,9 +266,13 @@ static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) return; } + SetLastError(0xdeadbeef); len = SearchPathW(NULL, file, NULL, sizeof(buf)/sizeof(WCHAR), buf, NULL); if(!len) { - ok(0, "SearchPath failed: %u\n", GetLastError()); + if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + win_skip("SearchPathW is not implemented\n"); + else + ok(0, "SearchPath failed: %u\n", GetLastError()); return; }

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_offsetHeight implementation.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: e273bf1f43d69b64d1b0f5e44ee21787a06c07df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e273bf1f43d69b64d1b0f5e44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 1 01:25:11 2008 +0200 mshtml: Added IHTMLElement::get_offsetHeight implementation. --- dlls/mshtml/htmlelem.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 3 +++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 670c615..244661f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -745,8 +745,27 @@ static HRESULT WINAPI HTMLElement_get_offsetWidth(IHTMLElement *iface, long *p) static HRESULT WINAPI HTMLElement_get_offsetHeight(IHTMLElement *iface, long *p) { HTMLElement *This = HTMLELEM_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSHTMLElement *nselem; + PRInt32 offset = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLElement_QueryInterface(This->nselem, &IID_nsIDOMNSHTMLElement, (void**)&nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSHTMLElement: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSHTMLElement_GetOffsetHeight(nselem, &offset); + nsIDOMNSHTMLElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("GetOffsetHeight failed: %08x\n", nsres); + return E_FAIL; + } + + *p = offset; + return S_OK; } static HRESULT WINAPI HTMLElement_get_offsetParent(IHTMLElement *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ecdc0c6..e7a2907 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -496,6 +496,9 @@ static void _test_elem_offset(unsigned line, IUnknown *unk) hres = IHTMLElement_get_offsetTop(elem, &l); ok_(__FILE__,line) (hres == S_OK, "get_offsetTop failed: %08x\n", hres); + hres = IHTMLElement_get_offsetHeight(elem, &l); + ok_(__FILE__,line) (hres == S_OK, "get_offsetHeight failed: %08x\n", hres); + IHTMLElement_Release(elem); }

1 0

Paul Vriens : gdi32/tests: Don't test unimplemented functions.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: d1bcc32bf2630687032e46b8dc7503e3061e1c78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1bcc32bf2630687032e46b8d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Thu Jul 31 19:13:07 2008 +0200 gdi32/tests: Don't test unimplemented functions. --- dlls/gdi32/tests/font.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index f305b3a..7065cd5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2363,7 +2363,13 @@ static void test_GetTextFace(void) /* 'W' case. */ memcpy(fW.lfFaceName, faceW, sizeof faceW); + SetLastError(0xdeadbeef); f = CreateFontIndirectW(&fW); + if (!f && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("CreateFontIndirectW is not implemented\n"); + return; + } ok(f != NULL, "CreateFontIndirectW failed\n"); dc = GetDC(NULL);

1 0

Alexandre Julliard : user32/tests: Fix some message test failures on various Windows versions.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 96f352b86fcb051109944a6fb8f2a95dc169bfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=96f352b86fcb051109944a6fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 31 17:16:22 2008 +0200 user32/tests: Fix some message test failures on various Windows versions. --- dlls/user32/tests/msg.c | 75 ++++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96f352b86fcb051109944…

1 0

Alexandre Julliard : gdi32/tests: Allow some more rounding errors in glyph sizes.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 680233f23568dcc372812ad9af020009a68565e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=680233f23568dcc372812ad9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 31 17:16:50 2008 +0200 gdi32/tests: Allow some more rounding errors in glyph sizes. --- dlls/gdi32/tests/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 9e8f408..f305b3a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -533,7 +533,7 @@ static void test_outline_font(void) trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); - ok(gm.gmCellIncX == pt.x, "incX %d != %d\n", gm.gmCellIncX, pt.x); + ok(near_match(gm.gmCellIncX, pt.x), "incX %d != %d\n", gm.gmCellIncX, pt.x); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); /* with a custom matrix */ memset(&gm, 0, sizeof(gm)); @@ -543,7 +543,7 @@ static void test_outline_font(void) trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); pt.x = width_orig; pt.y = 0; LPtoDP(hdc, &pt, 1); - ok(gm.gmCellIncX == (pt.x + 1)/2, "incX %d != %d\n", gm.gmCellIncX, (pt.x + 1)/2); + ok(near_match(gm.gmCellIncX, (pt.x + 1)/2), "incX %d != %d\n", gm.gmCellIncX, (pt.x + 1)/2); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); SelectObject(hdc, old_hfont);

1 0

Francois Gouget : configure: Fix the 'no sound card' warning.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 3089a9f27f1be708427a7279c84233a984007d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3089a9f27f1be708427a7279c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 31 18:59:50 2008 +0200 configure: Fix the 'no sound card' warning. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 840367f..a1b6fac 100755 --- a/configure +++ b/configure @@ -16108,7 +16108,7 @@ _ACEOF fi -if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ +if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \ diff --git a/configure.ac b/configure.ac index 3ac2c96..62fcd0b 100644 --- a/configure.ac +++ b/configure.ac @@ -1192,7 +1192,7 @@ dnl **** Check for libodbc **** WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])]) dnl **** Check for any sound system **** -if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESD_LIBS$ac_cv_lib_soname_jack" = "x" -a \ +if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \ "$ac_cv_header_sys_soundcard_h" != "yes" -a \ "$ac_cv_header_machine_soundcard_h" != "yes" -a \ "$ac_cv_header_soundcard_h" != "yes" -a \

1 0

Alexandre Julliard : winex11: Also check the maximized when restoring a minimized window.
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: 4a69797c43166699e7fbe70e6a7de4abd9521af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a69797c43166699e7fbe70e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 31 17:12:16 2008 +0200 winex11: Also check the maximized when restoring a minimized window. --- dlls/winex11.drv/event.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 94ea163..e431786 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -932,9 +932,17 @@ static void handle_wm_state_notify( struct x11drv_win_data *data, XPropertyEvent if (data->iconic && data->wm_state == NormalState) /* restore window */ { - TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); data->iconic = FALSE; - SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + if (is_net_wm_state_maximized( event->display, data )) + { + TRACE( "restoring to max %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + } + else + { + TRACE( "restoring win %p/%lx\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + } } else if (!data->iconic && data->wm_state == IconicState) {

1 0

Alexandre Julliard : winex11: Check for wm maximized state in ConfigureNotify and update the window state accordingly .
by Alexandre Julliard Aug. 1, 2008

Aug. 1, 2008

Module: wine Branch: master Commit: aca0296879dbf634013ea4e08319daf26e45d8db URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca0296879dbf634013ea4e08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 31 17:11:28 2008 +0200 winex11: Check for wm maximized state in ConfigureNotify and update the window state accordingly. --- dlls/winex11.drv/event.c | 53 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 6250486..94ea163 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -763,6 +763,36 @@ static void X11DRV_MapNotify( HWND hwnd, XEvent *event ) /*********************************************************************** + * is_net_wm_state_maximized + */ +static BOOL is_net_wm_state_maximized( Display *display, struct x11drv_win_data *data ) +{ + Atom type, *state; + int format, ret = 0; + unsigned long i, count, remaining; + + wine_tsx11_lock(); + if (!XGetWindowProperty( display, data->whole_window, x11drv_atom(_NET_WM_STATE), 0, + 65536/sizeof(CARD32), False, XA_ATOM, &type, &format, &count, + &remaining, (unsigned char **)&state )) + { + if (type == XA_ATOM && format == 32) + { + for (i = 0; i < count; i++) + { + if (state[i] == x11drv_atom(_NET_WM_STATE_MAXIMIZED_VERT) || + state[i] == x11drv_atom(_NET_WM_STATE_MAXIMIZED_HORZ)) + ret++; + } + } + XFree( state ); + } + wine_tsx11_unlock(); + return (ret == 2); +} + + +/*********************************************************************** * X11DRV_ConfigureNotify */ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) @@ -792,8 +822,8 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) rect.right = x + event->width; rect.bottom = y + event->height; OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); - TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", - hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, + TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", + hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, event->x, event->y, event->width, event->height ); X11DRV_X_to_window_rect( data, &rect ); @@ -803,6 +833,25 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) cy = rect.bottom - rect.top; flags = SWP_NOACTIVATE | SWP_NOZORDER; + if (is_net_wm_state_maximized( event->display, data )) + { + if (!IsZoomed( data->hwnd )) + { + TRACE( "win %p/%lx is maximized\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_MAXIMIZE, 0 ); + return; + } + } + else + { + if (IsZoomed( data->hwnd )) + { + TRACE( "window %p/%lx is no longer maximized\n", data->hwnd, data->whole_window ); + SendMessageW( data->hwnd, WM_SYSCOMMAND, SC_RESTORE, 0 ); + return; + } + } + /* Compare what has changed */ GetWindowRect( hwnd, &rect );

1 0