October 2012 - Wine-Commits

Marcus Meissner : dsound: Skip unknown sizes in tests (Coverity).
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: b78744ce315cdcbf5684f342713ed1a6c814cd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78744ce315cdcbf5684f3427… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:01:25 2012 +0200 dsound: Skip unknown sizes in tests (Coverity). --- dlls/dsound/tests/ds3d.c | 4 +++- dlls/dsound/tests/ds3d8.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 36e59c9..0caa33d 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -381,7 +381,9 @@ void test_buffer(LPDIRECTSOUND dso, LPDIRECTSOUNDBUFFER *dsbo, rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; ieee = IsEqualGUID(&wfxe.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - } + } else + return; + ok(rc==DS_OK, "IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); if (rc==DS_OK && winetest_debug > 1) { diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index c432d35..295a406 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -223,7 +223,9 @@ void test_buffer8(LPDIRECTSOUND8 dso, LPDIRECTSOUNDBUFFER * dsbo, rc=IDirectSoundBuffer_GetFormat(*dsbo,(WAVEFORMATEX*)&wfxe,size,NULL); wfx = wfxe.Format; ieee = IsEqualGUID(&wfxe.SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT); - } + } else + return; + ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %08x\n", rc); if (rc==DS_OK && winetest_debug > 1) { trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",

1 0

Jacek Caban : mshtml: Added ActiveX event binding test.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 5c15ca13d2c960b02ea8b8f8bce6bee9a55c1e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c15ca13d2c960b02ea8b8f8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:26:46 2012 +0200 mshtml: Added ActiveX event binding test. --- .gitignore | 2 + dlls/mshtml/tests/Makefile.in | 3 + dlls/mshtml/tests/activex.c | 341 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/rsrc.rc | 3 + dlls/mshtml/tests/test_tlb.idl | 55 +++++++ 5 files changed, 401 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c15ca13d2c960b02ea8b…

1 0

Jacek Caban : mshtml: Added support for binding ActiveX events with script event attribute.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: eda756dbb54d44b09441b1d53549a062c54d8822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda756dbb54d44b09441b1d53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:26:28 2012 +0200 mshtml: Added support for binding ActiveX events with script event attribute. --- dlls/mshtml/pluginhost.c | 370 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 3 + dlls/mshtml/script.c | 7 +- 3 files changed, 378 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eda756dbb54d44b09441b…

1 0

Marcus Meissner : mshtml: Removed duplicate condition (Coverity).
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 0f4c2f9a8c68fd955f355a9ec860ff03e1ed88cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4c2f9a8c68fd955f355a9ec… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 15:49:00 2012 +0200 mshtml: Removed duplicate condition (Coverity). --- dlls/mshtml/dispex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 7ce53b2..58fcd9a 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -755,7 +755,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, return E_INVALIDARG; /* fall through */ case DISPATCH_METHOD: - if(This->dynamic_data && This->dynamic_data && This->dynamic_data->func_disps + if(This->dynamic_data && This->dynamic_data->func_disps && This->dynamic_data->func_disps[func->func_disp_idx].func_obj) { func_obj_entry_t *entry = This->dynamic_data->func_disps + func->func_disp_idx;

1 0

Alexandre Julliard : Revert "winex11: Remove some leftover X Shm code."
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 85b34be52ffb9c964ba5ff79c93ca286ad47fbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b34be52ffb9c964ba5ff79c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 15:30:37 2012 +0200 Revert "winex11: Remove some leftover X Shm code." This reverts commit 515329d58cbe692b17108f8b2ea74e91edd06481. We'll want to use XShm again for window surfaces. --- configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 13 ++++++++++ include/config.h.in | 6 +++++ 3 files changed, 82 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d18cc0e..57f1e58 100755 --- a/configure +++ b/configure @@ -838,6 +838,7 @@ with_xml with_xrandr with_xrender with_xshape +with_xshm with_xslt with_xxf86vm with_zlib @@ -1527,6 +1528,7 @@ Optional Packages: --without-xrandr do not use Xrandr (resolution changes) --without-xrender do not use the Xrender extension --without-xshape do not use the Xshape extension + --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension --without-zlib do not use Zlib (data compression) @@ -2777,6 +2779,12 @@ if test "${with_xshape+set}" = set; then : fi +# Check whether --with-xshm was given. +if test "${with_xshm+set}" = set; then : + withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi +fi + + # Check whether --with-xslt was given. if test "${with_xslt+set}" = set; then : withval=$with_xslt; @@ -8085,6 +8093,7 @@ fi X11/extensions/shape.h \ X11/extensions/XInput.h \ X11/extensions/XInput2.h \ + X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ @@ -8292,6 +8301,60 @@ esac fi fi + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5 +$as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; } +if ${ac_cv_lib_Xext_XShmQueryExtension+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XShmQueryExtension (); +int +main () +{ +return XShmQueryExtension (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xext_XShmQueryExtension=yes +else + ac_cv_lib_Xext_XShmQueryExtension=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xext_XShmQueryExtension" >&6; } +if test "x$ac_cv_lib_Xext_XShmQueryExtension" = xyes; then : + +$as_echo "#define HAVE_LIBXXSHM 1" >>confdefs.h + +fi + + fi + if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then : + case "x$with_xshm" in + x) as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;; + xno) ;; + *) as_fn_error $? "XShm ${notice_platform}development files not found, X Shared Memory won't be supported. +This is an error since --with-xshm was requested." "$LINENO" 5 ;; +esac +fi + if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 diff --git a/configure.ac b/configure.ac index 5c7e9a2..0479899 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,8 @@ AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrende [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi]) AC_ARG_WITH(xshape, AS_HELP_STRING([--without-xshape],[do not use the Xshape extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi]) +AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)]), + [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi]) AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) @@ -972,6 +974,7 @@ then X11/extensions/shape.h \ X11/extensions/XInput.h \ X11/extensions/XInput2.h \ + X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ @@ -1016,6 +1019,16 @@ then [XInput2 headers not found, the XInput 2 extension won't be supported.]) fi + dnl *** Check for X Shm extension + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" + then + AC_CHECK_LIB(Xext, XShmQueryExtension, + AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, + $X_LIBS $XLIB $X_EXTRA_LIBS) + fi + WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"], + [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.]) + dnl *** Check for X shape extension if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 67f4fe4..39f1ec2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -377,6 +377,9 @@ /* Define to 1 if you have the <libxslt/transform.h> header file. */ #undef HAVE_LIBXSLT_TRANSFORM_H +/* Define if you have the X Shm extension */ +#undef HAVE_LIBXXSHM + /* Define to 1 if you have the <link.h> header file. */ #undef HAVE_LINK_H @@ -1106,6 +1109,9 @@ /* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */ #undef HAVE_X11_EXTENSIONS_XRENDER_H +/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XSHM_H + /* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */ #undef HAVE_X11_XCURSOR_XCURSOR_H

1 0

Alexandre Julliard : winex11: Use the XShm extension to copy window surfaces.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 5a9de7a4989dcf08914b5efd3152248a70be4548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9de7a4989dcf08914b5efd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 15:26:08 2012 +0200 winex11: Use the XShm extension to copy window surfaces. --- dlls/winex11.drv/bitblt.c | 100 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 92 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b37007e..e1812cd 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -29,9 +29,18 @@ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> -#ifdef HAVE_LIBXSHAPE +#ifdef HAVE_X11_EXTENSIONS_SHAPE_H #include <X11/extensions/shape.h> #endif +#ifdef HAVE_X11_EXTENSIONS_XSHM_H +# include <X11/extensions/XShm.h> +# ifdef HAVE_SYS_SHM_H +# include <sys/shm.h> +# endif +# ifdef HAVE_SYS_IPC_H +# include <sys/ipc.h> +# endif +#endif #include "windef.h" #include "winbase.h" @@ -1557,6 +1566,9 @@ struct x11drv_window_surface BOOL is_argb; COLORREF color_key; void *bits; +#ifdef HAVE_LIBXXSHM + XShmSegmentInfo shminfo; +#endif CRITICAL_SECTION crit; BITMAPINFO info; /* variable size, must be last */ }; @@ -1750,6 +1762,50 @@ static void set_color_key( struct x11drv_window_surface *surface, COLORREF key ) get_color_component( GetBValue(key), masks[2] ); } +#ifdef HAVE_LIBXXSHM +static int xshm_error_handler( Display *display, XErrorEvent *event, void *arg ) +{ + return 1; /* FIXME: should check event contents */ +} + +static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, XShmSegmentInfo *shminfo ) +{ + XImage *image; + + shminfo->shmid = -1; + image = XShmCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, NULL, shminfo, width, height ); + if (!image) return NULL; + if (image->bytes_per_line & 3) goto failed; /* we need 32-bit alignment */ + + shminfo->shmid = shmget( IPC_PRIVATE, image->bytes_per_line * height, IPC_CREAT | 0700 ); + if (shminfo->shmid == -1) goto failed; + + shminfo->shmaddr = shmat( shminfo->shmid, 0, 0 ); + if (shminfo->shmaddr != (char *)-1) + { + BOOL ok; + + shminfo->readOnly = True; + X11DRV_expect_error( gdi_display, xshm_error_handler, NULL ); + ok = (XShmAttach( gdi_display, shminfo ) != 0); + XSync( gdi_display, False ); + if (!X11DRV_check_error() && ok) + { + image->data = shminfo->shmaddr; + shmctl( shminfo->shmid, IPC_RMID, 0 ); + return image; + } + shmdt( shminfo->shmaddr ); + } + shmctl( shminfo->shmid, IPC_RMID, 0 ); + shminfo->shmid = -1; + +failed: + XDestroyImage( image ); + return NULL; +} +#endif /* HAVE_LIBXXSHM */ + /*********************************************************************** * x11drv_surface_lock */ @@ -1830,6 +1886,19 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) surface->byteswap, mapping, ~0u ); } +#ifdef HAVE_LIBXXSHM + if (surface->shminfo.shmid != -1) + { + XShmPutImage( gdi_display, surface->window, surface->gc, surface->image, + coords.visrect.left, coords.visrect.top, + surface->header.rect.left + coords.visrect.left, + surface->header.rect.top + coords.visrect.top, + coords.visrect.right - coords.visrect.left, + coords.visrect.bottom - coords.visrect.top, False ); + XSync( gdi_display, False ); + } + else +#endif XPutImage( gdi_display, surface->window, surface->gc, surface->image, coords.visrect.left, coords.visrect.top, surface->header.rect.left + coords.visrect.left, @@ -1853,6 +1922,14 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) if (surface->image) { if (surface->image->data != surface->bits) HeapFree( GetProcessHeap(), 0, surface->bits ); +#ifdef HAVE_LIBXXSHM + if (surface->shminfo.shmid != -1) + { + XShmDetach( gdi_display, &surface->shminfo ); + shmdt( surface->shminfo.shmaddr ); + } + else +#endif HeapFree( GetProcessHeap(), 0, surface->image->data ); surface->image->data = NULL; XDestroyImage( surface->image ); @@ -1905,11 +1982,17 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co set_color_key( surface, color_key ); reset_bounds( &surface->bounds ); - surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, - width, height, 32, 0 ); - if (!surface->image) goto failed; - surface->image->data = HeapAlloc( GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage ); - if (!surface->image->data) goto failed; +#ifdef HAVE_LIBXXSHM + surface->image = create_shm_image( vis, width, height, &surface->shminfo ); + if (!surface->image) +#endif + { + surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, + width, height, 32, 0 ); + if (!surface->image) goto failed; + surface->image->data = HeapAlloc( GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage ); + if (!surface->image->data) goto failed; + } surface->gc = XCreateGC( gdi_display, window, 0, NULL ); surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); @@ -1923,8 +2006,9 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co } else surface->bits = surface->image->data; - TRACE( "created %p for %lx %s bits %p-%p\n", surface, window, wine_dbgstr_rect(rect), - surface->bits, (char *)surface->bits + surface->info.bmiHeader.biSizeImage ); + TRACE( "created %p for %lx %s bits %p-%p image %p\n", surface, window, wine_dbgstr_rect(rect), + surface->bits, (char *)surface->bits + surface->info.bmiHeader.biSizeImage, + surface->image->data ); return &surface->header;

1 0

Marcus Meissner : advapi32: Avoid memory leak on pipe read failure ( Coverity).
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: aaabec2b3376c3012eceb7f9ae247e2b67949e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabec2b3376c3012eceb7f9a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Oct 3 16:52:05 2012 +0200 advapi32: Avoid memory leak on pipe read failure (Coverity). --- dlls/advapi32/service.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index f69e78f..49d56d1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -402,11 +402,13 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { if (GetLastError() != ERROR_BROKEN_PIPE) ERR( "pipe read failed error %u\n", GetLastError() ); + HeapFree( GetProcessHeap(), 0, data ); break; } if (count != data_size) { ERR( "partial pipe read %u/%u\n", count, data_size ); + HeapFree( GetProcessHeap(), 0, data ); break; } }

1 0

Aric Stewart : imm32: Explicitly handle all WM_IME_XXX messages in the IME class.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: fb5dbd608fbe09f1e3b09745b47233c8ed051446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5dbd608fbe09f1e3b09745b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 3 07:12:44 2012 -0500 imm32: Explicitly handle all WM_IME_XXX messages in the IME class. --- dlls/imm32/imm.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 015b8ab..6f262f5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2888,12 +2888,18 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_CREATE: case WM_NCCREATE: return TRUE; - case WM_IME_COMPOSITION: case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: - case WM_IME_SELECT: - case WM_IME_CONTROL: + case WM_IME_COMPOSITION: + case WM_IME_SETCONTEXT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: + case WM_IME_COMPOSITIONFULL: + case WM_IME_SELECT: + case WM_IME_CHAR: + case WM_IME_REQUEST: + case WM_IME_KEYDOWN: + case WM_IME_KEYUP: { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) @@ -2902,7 +2908,7 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, } default: if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || - (uMsg ==WM_MSIME_SERVICE) || + (uMsg == WM_MSIME_SERVICE) || (uMsg == WM_MSIME_MOUSE) || (uMsg == WM_MSIME_RECONVERTREQUEST) || (uMsg == WM_MSIME_RECONVERT) ||

1 0

Jacek Caban : jscript: Removed useless return statement in jsval_number.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 730479e6a4b00d9143bd4a6f7accccb726559257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730479e6a4b00d9143bd4a6f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 3 17:54:14 2012 +0200 jscript: Removed useless return statement in jsval_number. --- dlls/jscript/jsval.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index d355b5e..c75204f 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -154,7 +154,6 @@ static inline jsval_t jsval_number(double n) ret.u.s.tag = 0x7ff00000; } } - return ret; #else ret.type = JSV_NUMBER; ret.u.n = n;

1 0

Alexandre Julliard : winex11: Split copy_image_bits into a couple of helper functions.
by Alexandre Julliard Oct. 3, 2012

Oct. 3, 2012

Module: wine Branch: master Commit: 219e2a35452e4405e666316943658823d6a63482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=219e2a35452e4405e66631694… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 12:43:44 2012 +0200 winex11: Split copy_image_bits into a couple of helper functions. --- dlls/winex11.drv/bitblt.c | 189 +++++++++++++++++++++++--------------------- 1 files changed, 99 insertions(+), 90 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 36e3ac9..2195fe5 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1036,41 +1036,122 @@ static inline BOOL is_r8g8b8( const XVisualInfo *vis ) return vis->depth == 24 && vis->red_mask == 0xff0000 && vis->blue_mask == 0x0000ff; } -/* copy the image bits, fixing up alignment and byte swapping as necessary */ -DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, - const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, - struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) +static inline BOOL image_needs_byteswap( XImage *image, BOOL is_r8g8b8, int bit_count ) { #ifdef WORDS_BIGENDIAN static const int client_byte_order = MSBFirst; #else static const int client_byte_order = LSBFirst; #endif - BOOL need_byteswap; - int x, y, height = coords->visrect.bottom - coords->visrect.top; - int width_bytes = image->bytes_per_line; - int padding_pos; - unsigned char *src, *dst; + + switch (bit_count) + { + case 1: return image->bitmap_bit_order != MSBFirst; + case 4: return image->byte_order != MSBFirst; + case 16: + case 32: return image->byte_order != client_byte_order; + case 24: return (image->byte_order == MSBFirst) ^ !is_r8g8b8; + default: return FALSE; + } +} + +/* copy image bits with byte swapping and/or pixel mapping */ +static void copy_image_byteswap( BITMAPINFO *info, const unsigned char *src, unsigned char *dst, + int src_stride, int dst_stride, int height, + BOOL byteswap, const int *mapping, unsigned int zeropad_mask ) +{ + int x, y, padding_pos = abs(dst_stride) / sizeof(unsigned int) - 1; + + if (!byteswap && !mapping) /* simply copy */ + { + if (src != dst) + { + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + memcpy( dst, src, src_stride ); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + } + else if (zeropad_mask != ~0u) /* only need to clear the padding */ + { + for (y = 0; y < height; y++, dst += dst_stride) + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + return; + } switch (info->bmiHeader.biBitCount) { case 1: - need_byteswap = (image->bitmap_bit_order != MSBFirst); + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < src_stride; x++) dst[x] = bit_swap[src[x]]; + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 4: - need_byteswap = (image->byte_order != MSBFirst); + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + if (mapping) + { + if (byteswap) + for (x = 0; x < src_stride; x++) + dst[x] = (mapping[src[x] & 0x0f] << 4) | mapping[src[x] >> 4]; + else + for (x = 0; x < src_stride; x++) + dst[x] = mapping[src[x] & 0x0f] | (mapping[src[x] >> 4] << 4); + } + else + for (x = 0; x < src_stride; x++) + dst[x] = (src[x] << 4) | (src[x] >> 4); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } + break; + case 8: + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < src_stride; x++) dst[x] = mapping[src[x]]; + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 16: - case 32: - need_byteswap = (image->byte_order != client_byte_order); + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < info->bmiHeader.biWidth; x++) + ((USHORT *)dst)[x] = RtlUshortByteSwap( ((const USHORT *)src)[x] ); + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; case 24: - need_byteswap = (image->byte_order == MSBFirst) ^ !is_r8g8b8; + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + { + for (x = 0; x < info->bmiHeader.biWidth; x++) + { + unsigned char tmp = src[3 * x]; + dst[3 * x] = src[3 * x + 2]; + dst[3 * x + 1] = src[3 * x + 1]; + dst[3 * x + 2] = tmp; + } + ((unsigned int *)dst)[padding_pos] &= zeropad_mask; + } break; - default: - need_byteswap = FALSE; + case 32: + for (y = 0; y < height; y++, src += src_stride, dst += dst_stride) + for (x = 0; x < info->bmiHeader.biWidth; x++) + ((ULONG *)dst)[x] = RtlUlongByteSwap( ((const ULONG *)src)[x] ); break; } +} + +/* copy the image bits, fixing up alignment and byte swapping as necessary */ +DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, + const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits, + struct bitblt_coords *coords, const int *mapping, unsigned int zeropad_mask ) +{ + BOOL need_byteswap = image_needs_byteswap( image, is_r8g8b8, info->bmiHeader.biBitCount ); + int height = coords->visrect.bottom - coords->visrect.top; + int width_bytes = image->bytes_per_line; + unsigned char *src, *dst; src = src_bits->ptr; if (info->bmiHeader.biHeight > 0) @@ -1101,7 +1182,6 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, } dst = dst_bits->ptr; - padding_pos = width_bytes/sizeof(unsigned int) - 1; if (info->bmiHeader.biHeight > 0) { @@ -1109,79 +1189,8 @@ DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image, width_bytes = -width_bytes; } - if (need_byteswap || mapping) - { - switch (info->bmiHeader.biBitCount) - { - case 1: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = bit_swap[src[x]]; - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 4: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - if (mapping) - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = (mapping[src[x] & 0x0f] << 4) | mapping[src[x] >> 4]; - else - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = (src[x] << 4) | (src[x] >> 4); - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 8: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < image->bytes_per_line; x++) - dst[x] = mapping[src[x]]; - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 16: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < info->bmiHeader.biWidth; x++) - ((USHORT *)dst)[x] = RtlUshortByteSwap( ((const USHORT *)src)[x] ); - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 24: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - for (x = 0; x < info->bmiHeader.biWidth; x++) - { - unsigned char tmp = src[3 * x]; - dst[3 * x] = src[3 * x + 2]; - dst[3 * x + 1] = src[3 * x + 1]; - dst[3 * x + 2] = tmp; - } - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - break; - case 32: - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - for (x = 0; x < info->bmiHeader.biWidth; x++) - ((ULONG *)dst)[x] = RtlUlongByteSwap( ((const ULONG *)src)[x] ); - break; - } - } - else if (src != dst) - { - for (y = 0; y < height; y++, src += image->bytes_per_line, dst += width_bytes) - { - memcpy( dst, src, image->bytes_per_line ); - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } - } - else /* only need to clear the padding */ - { - for (y = 0; y < height; y++, dst += width_bytes) - ((unsigned int *)dst)[padding_pos] &= zeropad_mask; - } + copy_image_byteswap( info, src, dst, image->bytes_per_line, width_bytes, height, + need_byteswap, mapping, zeropad_mask ); return ERROR_SUCCESS; }

1 0