September 2011 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Correct MSXML object safety tests.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 33736bb871f503f0163699e657987681384942e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33736bb871f503f0163699e65… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 22:27:02 2011 +1000 msxml3: Correct MSXML object safety tests. --- dlls/msxml3/domdoc.c | 3 ++- dlls/msxml3/httprequest.c | 3 ++- dlls/msxml3/tests/domdoc.c | 21 +++++++++++---------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 2b2416d..d4fcc1c 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -3430,7 +3430,8 @@ static HRESULT WINAPI domdoc_Safety_SetInterfaceSafetyOptions(IObjectSafety *ifa if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) return E_FAIL; - This->safeopt = enabled & mask & SAFETY_SUPPORTED_OPTIONS; + This->safeopt = (This->safeopt & ~mask) | (mask & enabled); + return S_OK; } diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 436380c..8203129 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1131,7 +1131,8 @@ static HRESULT WINAPI httprequest_Safety_SetInterfaceSafetyOptions(IObjectSafety if ((mask & ~SAFETY_SUPPORTED_OPTIONS) != 0) return E_FAIL; - This->safeopt = enabled & mask & SAFETY_SUPPORTED_OPTIONS; + This->safeopt = (This->safeopt & ~mask) | (mask & enabled); + return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2c3de42..42b3b05 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4457,11 +4457,11 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); - todo_wine - ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || - enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACE_USES_SECURITY_MANAGER), " - "got %08x\n", enabled); + ok_(__FILE__,line)(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER got %08x\n", enabled); + ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || + supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", supported); hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, INTERFACESAFE_FOR_UNTRUSTED_DATA, @@ -4469,11 +4469,12 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); - todo_wine - ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) || - enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) /* msxml3 SP8+ */, - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), " - "got %08x\n", enabled); + ok_(__FILE__,line)(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), + "expected INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA got %08x\n", enabled); + ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", supported); } static void test_XMLHTTP(void)

1 0

Alistair Leslie-Hughes : rasapi32: Return error on invalid parameters.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 7025db431b8086a1ca5156fe0bb2e290f824a999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7025db431b8086a1ca5156fe0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Sep 6 22:51:44 2011 +1000 rasapi32: Return error on invalid parameters. --- dlls/rasapi32/rasapi.c | 4 ++++ dlls/rasapi32/tests/rasapi.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 704a8bc..2184a22 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -250,6 +250,10 @@ DWORD WINAPI RasEnumDevicesA(LPRASDEVINFOA lpRasDevinfo, LPDWORD lpcb, LPDWORD l return ERROR_INVALID_PARAMETER; FIXME("(%p,%p,%p),stub!\n",lpRasDevinfo,lpcb,lpcDevices); + + if(lpRasDevinfo && lpRasDevinfo->dwSize != sizeof(RASDEVINFOA)) + return ERROR_INVALID_SIZE; + if (!lpRasDevinfo || (*lpcb < sizeof(RASDEVINFOA))) { *lpcb = sizeof(RASDEVINFOA); return ERROR_BUFFER_TOO_SMALL; diff --git a/dlls/rasapi32/tests/rasapi.c b/dlls/rasapi32/tests/rasapi.c index d25c741..e0ff25f 100644 --- a/dlls/rasapi32/tests/rasapi.c +++ b/dlls/rasapi32/tests/rasapi.c @@ -85,7 +85,6 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = 0; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -93,7 +92,6 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) -1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -101,7 +99,6 @@ static void test_rasenum(void) rasDevInfo[0].dwSize = sizeof(RASDEVINFOA) +1; cb = bufsize; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || result == ERROR_INVALID_USER_BUFFER, /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result); @@ -151,7 +148,6 @@ static void test_rasenum(void) cb = 0; rasDevInfo[0].dwSize = 0; result = pRasEnumDevicesA(rasDevInfo, &cb, &cDevices); - todo_wine ok(result == ERROR_INVALID_SIZE || broken(result == ERROR_BUFFER_TOO_SMALL), /* win98 */ "Expected ERROR_INVALID_SIZE, got %08d\n", result);

1 0

Frédéric Delanoy : cmd: Get rid of obsolete autoexec.bat handling code.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 54c2f6491dbe1493bebc2bb00053998d413a7cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c2f6491dbe1493bebc2bb00… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 01:13:07 2011 +0200 cmd: Get rid of obsolete autoexec.bat handling code. --- programs/cmd/wcmdmain.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ce07111..ed1b46c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2252,11 +2252,8 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR *cmd = NULL; WCHAR string[1024]; WCHAR envvar[4]; - HANDLE h; int opt_q; int opt_t = 0; - static const WCHAR autoexec[] = {'\\','a','u','t','o','e','x','e','c','.', - 'b','a','t','\0'}; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; char ansiVersion[100]; @@ -2575,19 +2572,6 @@ int wmain (int argc, WCHAR *argvW[]) } /* - * If there is an AUTOEXEC.BAT file, try to execute it. - */ - - GetFullPathNameW (autoexec, sizeof(string)/sizeof(WCHAR), string, NULL); - h = CreateFileW(string, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h != INVALID_HANDLE_VALUE) { - CloseHandle (h); -#if 0 - WCMD_batch (autoexec, autoexec, 0, NULL, INVALID_HANDLE_VALUE); -#endif - } - -/* * Loop forever getting commands and executing them. */

1 0

Alexandre Julliard : qcap: Include system headers before Windows headers.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: b870cd1a162e84accbce1255be2394915214c0bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b870cd1a162e84accbce1255b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:12:05 2011 +0200 qcap: Include system headers before Windows headers. --- dlls/qcap/v4l.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fadcd49..a7995e2 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -24,29 +24,14 @@ #include "config.h" #include "wine/port.h" -#include "wine/library.h" #define NONAMELESSSTRUCT #define NONAMELESSUNION #define COBJMACROS #include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "wingdi.h" -#include "winuser.h" -#include "dshow.h" -#include "vfwmsgs.h" -#include "amvideo.h" -#include "wine/debug.h" - -#include "capture.h" -#include "qcap_main.h" - #include <stdio.h> #include <fcntl.h> - #ifdef HAVE_SYS_IOCTL_H #include <sys/ioctl.h> #endif @@ -69,6 +54,20 @@ #include <unistd.h> #endif +#include "windef.h" +#include "winbase.h" +#include "wtypes.h" +#include "wingdi.h" +#include "winuser.h" +#include "dshow.h" +#include "vfwmsgs.h" +#include "amvideo.h" +#include "wine/debug.h" +#include "wine/library.h" + +#include "capture.h" +#include "qcap_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(qcap_v4l); #ifdef HAVE_LINUX_VIDEODEV_H

1 0

Alexandre Julliard : openal32: Include system headers before Windows headers.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 34a7180caf14fe7006b66e5da94b076e1713182d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a7180caf14fe7006b66e5da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:11:55 2011 +0200 openal32: Include system headers before Windows headers. --- dlls/openal32/openal.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 9e0a8f2..6a8e8f1 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -25,10 +25,6 @@ #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wine/debug.h" - #ifdef HAVE_AL_AL_H #include <AL/al.h> #include <AL/alc.h> @@ -37,6 +33,10 @@ #include <OpenAL/alc.h> #endif +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(openal32); static ALCboolean (ALC_APIENTRY*alcSetThreadContext)(ALCcontext *context);

1 0

Alexandre Julliard : mountmgr.sys: Include system headers before Windows headers.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 2fff57a5e7f501dbb736b4edb7903324dabccfcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fff57a5e7f501dbb736b4edb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 12:11:41 2011 +0200 mountmgr.sys: Include system headers before Windows headers. --- dlls/mountmgr.sys/diskarb.c | 5 +++-- dlls/mountmgr.sys/hal.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index d3912ca..9a7616e 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -26,6 +26,9 @@ #include <stdarg.h> #include <stdio.h> #include <sys/time.h> +#ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H +#include <DiskArbitration/DiskArbitration.h> +#endif #include "mountmgr.h" #include "wine/debug.h" @@ -34,8 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef HAVE_DISKARBITRATION_DISKARBITRATION_H -#include <DiskArbitration/DiskArbitration.h> - static void appeared_callback( DADiskRef disk, void *context ) { CFDictionaryRef dict = DADiskCopyDescription( disk ); diff --git a/dlls/mountmgr.sys/hal.c b/dlls/mountmgr.sys/hal.c index 82a70e9..d369879 100644 --- a/dlls/mountmgr.sys/hal.c +++ b/dlls/mountmgr.sys/hal.c @@ -26,6 +26,10 @@ #include <stdarg.h> #include <stdio.h> #include <sys/time.h> +#ifdef SONAME_LIBHAL +# include <dbus/dbus.h> +# include <hal/libhal.h> +#endif #include "mountmgr.h" #include "winnls.h" @@ -39,9 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mountmgr); #ifdef SONAME_LIBHAL -#include <dbus/dbus.h> -#include <hal/libhal.h> - #define DBUS_FUNCS \ DO_FUNC(dbus_bus_get); \ DO_FUNC(dbus_connection_close); \

1 0

André Hentschel : dbghelp: Add some new dwarf enumerations.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 650e000bc99ee8928ed4bd83e8df78a15a618e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=650e000bc99ee8928ed4bd83e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 5 20:55:30 2011 +0200 dbghelp: Add some new dwarf enumerations. --- dlls/dbghelp/dwarf.h | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 0605da3..683d4e1 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -282,7 +282,13 @@ typedef enum dwarf_type_e DW_ATE_unsigned = 0x7, DW_ATE_unsigned_char = 0x8, /* Dwarf3 new values */ - DW_ATE_imaginary_float = 0x9 + DW_ATE_imaginary_float = 0x9, + DW_ATE_packed_decimal = 0xa, + DW_ATE_numeric_string = 0xb, + DW_ATE_edited = 0xc, + DW_ATE_signed_fixed = 0xd, + DW_ATE_unsigned_fixed = 0xe, + DW_ATE_decimal_float = 0xf, } dwarf_type_t; typedef enum dwarf_operation_e @@ -454,6 +460,11 @@ typedef enum dwarf_operation_e DW_OP_GNU_encoded_addr = 0xf1, DW_OP_GNU_implicit_pointer = 0xf2, DW_OP_GNU_entry_value = 0xf3, + DW_OP_GNU_const_type = 0xf4, + DW_OP_GNU_regval_type = 0xf5, + DW_OP_GNU_deref_type = 0xf6, + DW_OP_GNU_convert = 0xf7, + DW_OP_GNU_reinterpret = 0xf9, } dwarf_operation_t; enum dwarf_calling_convention

1 0

Alexandre Julliard : winex11: Get rid of the SetDIBitsToDevice implementation.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 3a260497be246f93c8b2891dba9c6fcee4ad5d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a260497be246f93c8b2891db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 14:44:11 2011 +0200 winex11: Get rid of the SetDIBitsToDevice implementation. --- dlls/gdi32/tests/bitmap.c | 16 ++++- dlls/winex11.drv/dib.c | 135 --------------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 2 - 4 files changed, 14 insertions(+), 141 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index a2dbfd9..a66113c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -929,7 +929,12 @@ static void test_dib_formats(void) "SetDIBits succeeded for %u/%u/%u\n", bpp, planes, compr ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); if (expect_ok) - ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + { + if (todo) + todo_wine ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + else + ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + } else ok( !ret || broken((bpp == 4 && compr == BI_RLE4) || (bpp == 8 && compr == BI_RLE8)), /* nt4 */ @@ -978,7 +983,12 @@ static void test_dib_formats(void) ok( !ret, "SetDIBits succeeded for %u/%u/%u\n", bpp, planes, compr ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); if (expect_ok) - ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + { + if (todo) + todo_wine ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + else + ok( ret, "SetDIBitsToDevice failed for %u/%u/%u\n", bpp, planes, compr ); + } else ok( !ret, "SetDIBitsToDevice succeeded for %u/%u/%u\n", bpp, planes, compr ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); @@ -1023,7 +1033,7 @@ static void test_dib_formats(void) ok( hdib != NULL, "CreateDIBitmap failed with null bitfields\n" ); DeleteObject( hdib ); ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); - ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); + todo_wine ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" ); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index ba58f57..df68c2e 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3713,141 +3713,6 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) return lines; } -/************************************************************************* - * X11DRV_SetDIBitsToDevice - * - */ -INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, - INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, - BITMAPINFO *info, UINT coloruse ) -{ - X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - X11DRV_DIB_IMAGEBITS_DESCR descr; - INT result; - LONG height; - BOOL top_down; - POINT pt; - int rop = X11DRV_XROPfunction[GetROP2(dev->hdc) - 1]; - - top_down = (info->bmiHeader.biHeight < 0); - height = abs( info->bmiHeader.biHeight ); - descr.infoBpp = info->bmiHeader.biBitCount; - descr.compression = info->bmiHeader.biCompression; - - pt.x = xDest; - pt.y = yDest; - LPtoDP(dev->hdc, &pt, 1); - if (GetLayout( dev->hdc ) & LAYOUT_RTL) pt.x -= cx - 1; - - if (!lines || (startscan >= height)) return 0; - if (!top_down && startscan + lines > height) lines = height - startscan; - - /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, - * and clamp all values to fit inside [startscan,startscan+lines] - */ - if (ySrc + cy <= startscan + lines) - { - UINT y = startscan + lines - (ySrc + cy); - if (ySrc < startscan) cy -= (startscan - ySrc); - if (!top_down) - { - /* avoid getting unnecessary lines */ - ySrc = 0; - if (y >= lines) return 0; - lines -= y; - } - else - { - if (y >= lines) return lines; - ySrc = y; /* need to get all lines in top down mode */ - } - } - else - { - if (ySrc >= startscan + lines) return 0; - pt.y += ySrc + cy - (startscan + lines); - cy = startscan + lines - ySrc; - ySrc = 0; - if (cy > lines) cy = lines; - } - if (xSrc >= info->bmiHeader.biWidth) return lines; - if (xSrc + cx <= 0) return lines; - if (xSrc + cx >= info->bmiHeader.biWidth) cx = info->bmiHeader.biWidth - xSrc; - if (xSrc < 0) - { - pt.x -= xSrc; - cx += xSrc; - xSrc = 0; - } - if (!cx || !cy) return lines; - - /* Update the pixmap from the DIB section */ - X11DRV_LockDIBSection(physDev, DIB_Status_GdiMod); - - X11DRV_SetupGCForText( physDev ); /* To have the correct colors */ - wine_tsx11_lock(); - XSetFunction(gdi_display, physDev->gc, rop); - wine_tsx11_unlock(); - - switch (descr.infoBpp) - { - case 1: - case 4: - case 8: - descr.colorMap = (RGBQUAD *)X11DRV_DIB_BuildColorMap( - physDev, coloruse, - physDev->depth, info, &descr.nColorMap ); - if (!descr.colorMap) return 0; - descr.rMask = descr.gMask = descr.bMask = 0; - break; - case 15: - case 16: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0x7c00; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x03e0; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x001f; - descr.colorMap = 0; - break; - - case 24: - case 32: - descr.rMask = (descr.compression == BI_BITFIELDS) ? *(const DWORD *)info->bmiColors : 0xff0000; - descr.gMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 1) : 0x00ff00; - descr.bMask = (descr.compression == BI_BITFIELDS) ? *((const DWORD *)info->bmiColors + 2) : 0x0000ff; - descr.colorMap = 0; - break; - } - - descr.physDev = physDev; - descr.bits = bits; - descr.image = NULL; - descr.palentry = NULL; - descr.lines = top_down ? -lines : lines; - descr.infoWidth = info->bmiHeader.biWidth; - descr.depth = physDev->depth; - descr.shifts = physDev->color_shifts; - descr.drawable = physDev->drawable; - descr.gc = physDev->gc; - descr.xSrc = xSrc; - descr.ySrc = ySrc; - descr.xDest = physDev->dc_rect.left + pt.x; - descr.yDest = physDev->dc_rect.top + pt.y; - descr.width = cx; - descr.height = cy; - descr.shm_mode = X11DRV_SHM_NONE; - descr.dibpitch = X11DRV_DIB_GetDIBWidthBytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); - descr.physBitmap = NULL; - - result = X11DRV_DIB_SetImageBits( &descr ); - - if (descr.infoBpp <= 8) - HeapFree(GetProcessHeap(), 0, descr.colorMap); - - /* Update the DIBSection of the pixmap */ - X11DRV_UnlockDIBSection(physDev, TRUE); - - return result; -} - /*********************************************************************** * X11DRV_DIB_DoCopyDIBSection */ diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 111676c..95e0a0b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -532,7 +532,7 @@ static const struct gdi_dc_funcs x11drv_funcs = X11DRV_SetDCBrushColor, /* pSetDCBrushColor */ X11DRV_SetDCPenColor, /* pSetDCPenColor */ X11DRV_SetDIBColorTable, /* pSetDIBColorTable */ - X11DRV_SetDIBitsToDevice, /* pSetDIBitsToDevice */ + NULL, /* pSetDIBitsToDevice */ X11DRV_SetDeviceClipping, /* pSetDeviceClipping */ X11DRV_SetDeviceGammaRamp, /* pSetDeviceGammaRamp */ NULL, /* pSetLayout */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 69845d3..545182c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -236,8 +236,6 @@ extern COLORREF X11DRV_SetDCPenColor( PHYSDEV dev, COLORREF crColor ) DECLSPEC_H extern void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetDeviceGammaRamp( PHYSDEV dev, LPVOID ramp ) DECLSPEC_HIDDEN; extern UINT X11DRV_SetDIBColorTable( PHYSDEV dev, UINT start, UINT count, const RGBQUAD *colors ) DECLSPEC_HIDDEN; -extern INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern BOOL X11DRV_SetPixelFormat(PHYSDEV dev, int iPixelFormat, const PIXELFORMATDESCRIPTOR *ppfd) DECLSPEC_HIDDEN; extern COLORREF X11DRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Add a SetDIBitsToDevice implementation in the null driver using PutImage.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 6f275874f359dce37c38936ed78800c611121697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f275874f359dce37c38936ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 13:27:03 2011 +0200 gdi32: Add a SetDIBitsToDevice implementation in the null driver using PutImage. --- dlls/gdi32/dib.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/driver.c | 7 --- dlls/gdi32/gdi_private.h | 3 + dlls/gdi32/tests/bitmap.c | 5 ++ 4 files changed, 109 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 927a74f..c1de074 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -610,6 +610,107 @@ done: } +INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD cx, DWORD cy, + INT x_src, INT y_src, UINT startscan, UINT lines, + const void *bits, BITMAPINFO *src_info, UINT coloruse ) +{ + DC *dc = get_nulldrv_dc( dev ); + char dst_buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info = (BITMAPINFO *)dst_buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits src_bits; + DWORD err; + UINT height; + BOOL top_down; + POINT pt; + RECT rect; + + top_down = (src_info->bmiHeader.biHeight < 0); + height = abs( src_info->bmiHeader.biHeight ); + + src_bits.ptr = (void *)bits; + src_bits.is_copy = FALSE; + src_bits.free = NULL; + + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, dev->hdc )) return 0; + + if (!lines || (startscan >= height)) return 0; + if (!top_down && lines > height - startscan) lines = height - startscan; + + /* map src to top-down coordinates with startscan as origin */ + src.x = x_src; + src.y = startscan + lines - (y_src + cy); + src.width = cx; + src.height = cy; + if (src.y > 0) + { + if (!top_down) + { + /* get rid of unnecessary lines */ + if (src.y >= lines) return 0; + lines -= src.y; + src.y = 0; + } + else if (src.y >= lines) return lines; + } + src_info->bmiHeader.biHeight = top_down ? -lines : lines; + + src.visrect.left = src.x; + src.visrect.top = src.y; + src.visrect.right = src.x + cx; + src.visrect.bottom = src.y + cy; + rect.left = 0; + rect.top = 0; + rect.right = src_info->bmiHeader.biWidth; + rect.bottom = abs( src_info->bmiHeader.biHeight ); + if (!intersect_rect( &src.visrect, &src.visrect, &rect )) return 0; + + pt.x = x_dst; + pt.y = y_dst; + LPtoDP( dev->hdc, &pt, 1 ); + dst.x = pt.x; + dst.y = pt.y; + dst.width = cx; + dst.height = cy; + if (GetLayout( dev->hdc ) & LAYOUT_RTL) dst.x -= cx - 1; + + dst.visrect.left = dst.x; + dst.visrect.top = dst.y; + dst.visrect.right = dst.x + cx; + dst.visrect.bottom = dst.y + cy; + if (get_clip_box( dc, &rect )) intersect_rect( &dst.visrect, &dst.visrect, &rect ); + + offset_rect( &src.visrect, dst.x - src.x, dst.y - src.y ); + intersect_rect( &rect, &src.visrect, &dst.visrect ); + src.visrect = dst.visrect = rect; + offset_rect( &src.visrect, src.x - dst.x, src.y - dst.y ); + if (is_rect_empty( &dst.visrect )) return lines; + + dev = GET_DC_PHYSDEV( dc, pPutImage ); + memcpy( dst_info, src_info, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); + err = dev->funcs->pPutImage( dev, 0, 0, dst_info, &src_bits, &src, &dst, SRCCOPY ); + if (err == ERROR_BAD_FORMAT) + { + void *ptr; + + dst_info->bmiHeader.biWidth = src.visrect.right - src.visrect.left; + ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); + if (ptr) + { + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); + if (src_bits.free) src_bits.free( &src_bits ); + src_bits.ptr = ptr; + src_bits.is_copy = TRUE; + src_bits.free = free_heap_bits; + if (!err) err = dev->funcs->pPutImage( dev, 0, 0, dst_info, &src_bits, &src, &dst, SRCCOPY ); + } + else err = ERROR_OUTOFMEMORY; + } + if (err) lines = 0; + if (src_bits.free) src_bits.free( &src_bits ); + return lines; +} + /*********************************************************************** * SetDIBitsToDevice (GDI32.@) */ diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6233525..5beb04d 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -502,13 +502,6 @@ static UINT nulldrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const R return 0; } -static INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, - INT x_src, INT y_src, UINT start, UINT lines, - const void *bits, BITMAPINFO *info, UINT coloruse ) -{ - return 0; -} - static void nulldrv_SetDeviceClipping( PHYSDEV dev, HRGN vis_rgn, HRGN clip_rgn ) { } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 82dbc36..c4ed75a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -499,6 +499,9 @@ extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleWindowExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; +extern INT nulldrv_SetDIBitsToDevice( PHYSDEV dev, INT x_dst, INT y_dst, DWORD width, DWORD height, + INT x_src, INT y_src, UINT start, UINT lines, + const void *bits, BITMAPINFO *info, UINT coloruse ) DECLSPEC_HIDDEN; extern INT nulldrv_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SetViewportExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL nulldrv_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 6a80232..a2dbfd9 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4265,6 +4265,11 @@ static void test_SetDIBitsToDevice(void) for (i = 0; i < 64; i++) ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); memset( dib_bits, 0xaa, 64 * 4 ); + ret = SetDIBitsToDevice( hdc, 0, 2, 8, 4, 0, -1, 3, 12, data, info, DIB_RGB_COLORS ); + ok( ret == 0, "got %d\n", ret ); + for (i = 0; i < 64; i++) ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + SetMapMode( hdc, MM_ANISOTROPIC ); SetWindowExtEx( hdc, 3, 3, NULL ); ret = SetDIBitsToDevice( hdc, 2, 2, 2, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS );

1 0

Christian Costa : attrib: Move implementation from cmd. exe to the standalone command.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

1 0