September 2011 - Wine-commits

Alexandre Julliard : gdi32/tests: Add some SetDIBitsToDevice tests, based on the similar SetDIBits tests.
by Alexandre Julliard 01 Sep '11

01 Sep '11

Module: wine Branch: master Commit: 67b1f29d61da7c9c626747fc32e39ccba0f7c592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b1f29d61da7c9c626747fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 31 23:40:16 2011 +0200 gdi32/tests: Add some SetDIBitsToDevice tests, based on the similar SetDIBits tests. --- dlls/gdi32/tests/bitmap.c | 306 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 306 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67b1f29d61da7c9c62674…

1 0

Alexandre Julliard : winex11: Fix SetDIBitsToDevice coordinate mapping in RTL mode.
by Alexandre Julliard 01 Sep '11

01 Sep '11

Module: wine Branch: master Commit: e1ca5c38e2ecfc7fc941ce7c05f8a4077b57681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ca5c38e2ecfc7fc941ce7c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 12:41:00 2011 +0200 winex11: Fix SetDIBitsToDevice coordinate mapping in RTL mode. --- dlls/gdi32/tests/bitmap.c | 14 ++++++++++++++ dlls/winex11.drv/dib.c | 1 + 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d69e463..e7b7d2d 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4287,6 +4287,20 @@ static void test_SetDIBitsToDevice(void) memset( dib_bits, 0xaa, 64 * 4 ); SetMapMode( hdc, MM_TEXT ); + if (pSetLayout) + { + pSetLayout( hdc, LAYOUT_RTL ); + ret = SetDIBitsToDevice( hdc, 1, 2, 3, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS ); + ok( ret == 3, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if (i == 36 || i == 37 || i == 38 || i == 44 || i == 45 || i == 46) + ok( dib_bits[i] == data[i - 27], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + pSetLayout( hdc, LAYOUT_LTR ); + } + /* t-d -> b-u */ info->bmiHeader.biHeight = -8; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, data, info, DIB_RGB_COLORS ); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index 3630c3e..d5668e3 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3737,6 +3737,7 @@ INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD 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;

1 0

Alexandre Julliard : winex11: Fix SetDIBitsToDevice coordinate mapping for negative values.
by Alexandre Julliard 01 Sep '11

01 Sep '11

Module: wine Branch: master Commit: bcc21c9b79369634667ee22b2711a0834a32cf8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc21c9b79369634667ee22b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 13:00:14 2011 +0200 winex11: Fix SetDIBitsToDevice coordinate mapping for negative values. --- dlls/gdi32/tests/bitmap.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/dib.c | 9 ++++++++- 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index e7b7d2d..6a80232 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -4364,6 +4364,15 @@ 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, 5, -7, 8, 16, -2, -4, 0, 12, data, info, DIB_RGB_COLORS ); + ok( ret == 12, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if (i == 31 || i == 39 || i == 47 || i == 55 || i == 63) + ok( dib_bits[i] == inverted_data[i + 1], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + info->bmiHeader.biHeight = -5; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 1, 2, data, info, DIB_RGB_COLORS ); ok( ret == 2, "got %d\n", ret ); @@ -4420,6 +4429,15 @@ static void test_SetDIBitsToDevice(void) for (i = 56; 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, 5, -7, 8, 16, -1, -8, 0, 12, data, info, DIB_RGB_COLORS ); + ok( ret == 12, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if (i == 6 || i == 7) + ok( dib_bits[i] == data[i + 82], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + info->bmiHeader.biHeight = -5; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 1, 2, data, info, DIB_RGB_COLORS ); ok( ret == 2, "got %d\n", ret ); @@ -4464,6 +4482,29 @@ static void test_SetDIBitsToDevice(void) for (i = 56; 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, 4, 4, 8, 8, 0, -4, 1, 12, data, info, DIB_RGB_COLORS ); + ok( ret == 3, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if ((i >= 36 && i <= 39) || (i >= 44 && i <= 47) || (i >= 52 && i <= 55)) + ok( dib_bits[i] == inverted_data[i + 68], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + + ret = SetDIBitsToDevice( hdc, 4, 4, 8, 8, -30, -30, 1, 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 ); + + ret = SetDIBitsToDevice( hdc, 5, -5, 8, 16, -2, -4, 4, 12, data, info, DIB_RGB_COLORS ); + ok( ret == 8, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if (i == 7 || i == 15 || i == 23) + ok( dib_bits[i] == inverted_data[i + 97], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + info->bmiHeader.biHeight = 5; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 1, 2, data, info, DIB_RGB_COLORS ); ok( ret == 2, "got %d\n", ret ); diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index d5668e3..3f68e28 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3764,14 +3764,21 @@ INT X11DRV_SetDIBitsToDevice( PHYSDEV dev, INT xDest, INT yDest, DWORD cx, DWORD } else { - if (ySrc >= startscan + lines) return lines; + 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 */

1 0

André Hentschel : localspl: Fix printing a NULL string .
by Alexandre Julliard 01 Sep '11

01 Sep '11

Module: wine Branch: master Commit: 975d9ed97af55a26a0ddfbb0a422c783fbffedd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975d9ed97af55a26a0ddfbb0a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 31 20:07:31 2011 +0200 localspl: Fix printing a NULL string. --- dlls/localspl/provider.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 3224188..848d11e 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1678,7 +1678,7 @@ static BOOL WINAPI fpAddPortEx(LPWSTR pName, DWORD level, LPBYTE pBuffer, LPWSTR else { FIXME("not implemented for %s (monitor %p: %s)\n", - debugstr_w(pMonitorName), pm, pm ? debugstr_w(pm->dllname) : NULL); + debugstr_w(pMonitorName), pm, pm ? debugstr_w(pm->dllname) : "(null)"); SetLastError(ERROR_INVALID_PARAMETER); res = FALSE; }

1 0

Austin English : wined3d: Remove an unused variable.
by Alexandre Julliard 01 Sep '11

01 Sep '11

Module: wine Branch: master Commit: b2f7461a4d3f356fbdb6d683a2452cac617f966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f7461a4d3f356fbdb6d683a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 31 13:08:33 2011 -0500 wined3d: Remove an unused variable. --- dlls/wined3d/surface.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 48a5038..7c31a47 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4197,7 +4197,6 @@ static void read_from_framebuffer(struct wined3d_surface *surface, const RECT *r static void read_from_framebuffer_texture(struct wined3d_surface *surface, BOOL srgb) { struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info; struct wined3d_context *context; if (!surface_is_offscreen(surface)) @@ -4214,7 +4213,6 @@ static void read_from_framebuffer_texture(struct wined3d_surface *surface, BOOL * states in the stateblock, and no driver was found yet that had bugs in that regard. */ context = context_acquire(device, surface); - gl_info = context->gl_info; device_invalidate_state(device, STATE_FRAMEBUFFER); surface_prepare_texture(surface, context, srgb);

1 0

Jeremy Newman : WineHQ now runs on PHP 5.3. Update . htaccess to allow the legacy appdb code to work without PHP yarping about depreciated functions
by Jeremy Newman 01 Sep '11

01 Sep '11

Module: appdb Branch: master Commit: 7d01bffa7c88cbc28a9512ec85b1b8bd2678da50 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7d01bffa7c88cbc28a9512ec… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Sep 1 09:03:04 2011 -0500 WineHQ now runs on PHP 5.3. Update .htaccess to allow the legacy appdb code to work without PHP yarping about depreciated functions --- .htaccess | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.htaccess b/.htaccess index dc28799..1765613 100644 --- a/.htaccess +++ b/.htaccess @@ -11,6 +11,10 @@ DirectoryIndex index.php ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) +php_flag allow_call_time_pass_reference 1 +php_value error_reporting "1" +php_value html_errors "1" +php_value display_errors "1" php_value register_globals 0 php_value short_open_tag 0 php_value register_long_arrays 0

1 0