February 2017 - Wine-commits

Francois Gouget : wmp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 97fa31eef22507057ce74abc904d6fb0105c44c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97fa31eef22507057ce74abc9… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:56 2017 +0100 wmp: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/wmp_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 91e8465..a44aa35 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -46,12 +46,12 @@ void unregister_wmp_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } -static inline void *heap_alloc_zero(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); }

1 0

Francois Gouget : schedsvc: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 223ea1312be779843dcca7b07cc954720240a219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223ea1312be779843dcca7b07… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:56:06 2017 +0100 schedsvc: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 4138aa0..3abce07 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -23,22 +23,19 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static void *heap_alloc_zero(SIZE_T size) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T size) { - void *ptr = MIDL_user_allocate(size); - if (ptr) memset(ptr, 0, size); - return ptr; + return MIDL_user_allocate(size); } -static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T size) { - return MIDL_user_allocate(size); + void *ptr = MIDL_user_allocate(size); + if (ptr) memset(ptr, 0, size); + return ptr; } -static void *heap_realloc(void *ptr, SIZE_T size) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc(void *ptr, SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, SIZE_T size) { return HeapReAlloc(GetProcessHeap(), 0, ptr, size); }

1 0

Francois Gouget : oleaut32: Standardize the heap_xxx() functions.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 78ee7f57fa45957eed1e7335a5f1822cb0745174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ee7f57fa45957eed1e7335a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 18:38:02 2017 +0100 oleaut32: Standardize the heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 24 ------------------------ dlls/oleaut32/typelib.h | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3df9631..1c00d71 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1600,30 +1600,6 @@ static void TLB_abort(void) DebugBreak(); } -void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(unsigned size) -{ - void *ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); - if (!ret) ERR("cannot allocate memory\n"); - return ret; -} - -void* __WINE_ALLOC_SIZE(1) heap_alloc(unsigned size) -{ - void *ret = HeapAlloc(GetProcessHeap(), 0, size); - if (!ret) ERR("cannot allocate memory\n"); - return ret; -} - -void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, unsigned size) -{ - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); -} - -void heap_free(void *ptr) -{ - HeapFree(GetProcessHeap(), 0, ptr); -} - /* returns the size required for a deep copy of a typedesc into a * flat buffer */ static SIZE_T TLB_SizeTypeDesc( const TYPEDESC *tdesc, BOOL alloc_initial_space ) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index 31c9ab9..d977dfb 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -596,11 +596,25 @@ WORD typeofarray #include "poppack.h" -/* heap allocation helpers */ -extern void* heap_alloc_zero(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); -extern void* heap_alloc(unsigned size) DECLSPEC_HIDDEN __WINE_ALLOC_SIZE(1); -extern void* heap_realloc(void *ptr, unsigned size) DECLSPEC_HIDDEN; -extern void heap_free(void *ptr) DECLSPEC_HIDDEN; +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc( LPVOID mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} HRESULT ITypeInfoImpl_GetInternalFuncDesc( ITypeInfo *iface, UINT index, const FUNCDESC **ppFuncDesc ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : uxtheme: Partial implementation of BeginBufferedPaint().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 35ae7c8f5939c0ba77b4023a14596706852f5acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ae7c8f5939c0ba77b4023a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:34 2017 +0300 uxtheme: Partial implementation of BeginBufferedPaint(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 92 +++++++++++++++++++++++++++++++++++++-------- dlls/uxtheme/tests/system.c | 40 ++++++++++++++++---- 2 files changed, 109 insertions(+), 23 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 8583f1a..972df68 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -2,6 +2,7 @@ * uxtheme Double-buffered Drawing API * * Copyright (C) 2008 Reece H. Dunn + * Copyright 2017 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,6 +35,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); +struct paintbuffer +{ + HDC targetdc; + HDC memorydc; + RECT rect; + void *bits; +}; + +static void free_paintbuffer(struct paintbuffer *buffer) +{ + DeleteDC(buffer->memorydc); + HeapFree(GetProcessHeap(), 0, buffer); +} + /*********************************************************************** * BufferedPaintInit (UXTHEME.@) */ @@ -55,24 +70,71 @@ HRESULT WINAPI BufferedPaintUnInit(VOID) /*********************************************************************** * BeginBufferedPaint (UXTHEME.@) */ -HPAINTBUFFER WINAPI BeginBufferedPaint(HDC hdcTarget, - const RECT * prcTarget, - BP_BUFFERFORMAT dwFormat, - BP_PAINTPARAMS *pPaintParams, - HDC *phdc) +HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, + BP_BUFFERFORMAT format, BP_PAINTPARAMS *params, HDC *retdc) { - static int i; - - TRACE("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat, - pPaintParams, phdc); - - if (!i++) - FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat, - pPaintParams, phdc); - return NULL; + char bmibuf[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + struct paintbuffer *buffer; + HBITMAP hbm; + + TRACE("(%p %s %d %p %p)\n", targetdc, wine_dbgstr_rect(rect), format, + params, retdc); + + if (retdc) + *retdc = NULL; + + if (!targetdc || IsRectEmpty(rect)) + return NULL; + + if (params) + FIXME("painting parameters are ignored\n"); + + buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer)); + buffer->targetdc = targetdc; + buffer->rect = *rect; + buffer->memorydc = CreateCompatibleDC(targetdc); + + switch (format) + { + case BPBF_COMPATIBLEBITMAP: + hbm = CreateCompatibleBitmap(buffer->memorydc, rect->right - rect->left, rect->bottom - rect->top); + buffer->bits = NULL; + break; + case BPBF_DIB: + case BPBF_TOPDOWNDIB: + case BPBF_TOPDOWNMONODIB: + /* create DIB section */ + memset(bmi, 0, sizeof(bmibuf)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biHeight = format == BPBF_DIB ? rect->bottom - rect->top : + -(rect->bottom - rect->top); + bmi->bmiHeader.biWidth = rect->right - rect->left; + bmi->bmiHeader.biBitCount = format == BPBF_TOPDOWNMONODIB ? 1 : 32; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbm = CreateDIBSection(buffer->memorydc, bmi, DIB_RGB_COLORS, &buffer->bits, NULL, 0); + break; + default: + WARN("Unknown buffer format %d\n", format); + free_paintbuffer(buffer); + return NULL; + } + + if (!hbm) + { + WARN("Failed to create buffer bitmap\n"); + free_paintbuffer(buffer); + return NULL; + } + + DeleteObject(SelectObject(buffer->memorydc, hbm)); + + *retdc = buffer->memorydc; + + return (HPAINTBUFFER)buffer; } - /*********************************************************************** * EndBufferedPaint (UXTHEME.@) */ diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index d7ba43c..66f696b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -552,31 +552,55 @@ static void test_buffered_paint(void) &params, NULL); ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + src = (void *)0xdeadbeef; buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, &params, &src); ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); /* target rect is mandatory */ - rect.left = rect.top = 0; - rect.right = rect.bottom = 0; + SetRectEmpty(&rect); + src = (void *)0xdeadbeef; buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, &params, &src); ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); - rect.left = rect.top = 0; - rect.right = rect.bottom = 5; + /* inverted rectangle */ + SetRect(&rect, 10, 0, 5, 5); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + SetRect(&rect, 0, 10, 5, 0); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + /* valid rectangle, no target dc */ + SetRect(&rect, 0, 0, 5, 5); + src = (void *)0xdeadbeef; + buffer = pBeginBufferedPaint(NULL, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + ok(src == NULL, "Unexpected buffered dc %p\n", src); + + SetRect(&rect, 0, 0, 5, 5); + src = NULL; buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, &params, &src); -todo_wine ok(buffer != NULL, "Unexpected buffer %p\n", buffer); + ok(src != NULL, "Expected buffered dc\n"); hr = pEndBufferedPaint(buffer, FALSE); ok(hr == S_OK, "Unexpected return code %#x\n", hr); - rect.left = rect.top = 0; - rect.right = rect.bottom = 5; + SetRect(&rect, 0, 0, 5, 5); buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, &params, &src); -todo_wine ok(buffer != NULL, "Unexpected buffer %p\n", buffer); /* clearing */

1 0

Nikolay Sivov : uxtheme: Implement EndBufferedPaint().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 9d4a00399548f50517d790c7678ebf34327c56d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4a00399548f50517d790c76… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:35 2017 +0300 uxtheme: Implement EndBufferedPaint(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 972df68..9024696 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -49,6 +49,13 @@ static void free_paintbuffer(struct paintbuffer *buffer) HeapFree(GetProcessHeap(), 0, buffer); } +static struct paintbuffer *get_buffer_obj(HPAINTBUFFER handle) +{ + if (!handle) + return NULL; + return handle; +} + /*********************************************************************** * BufferedPaintInit (UXTHEME.@) */ @@ -138,9 +145,26 @@ HPAINTBUFFER WINAPI BeginBufferedPaint(HDC targetdc, const RECT *rect, /*********************************************************************** * EndBufferedPaint (UXTHEME.@) */ -HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER hPaintBuffer, BOOL fUpdateTarget) +HRESULT WINAPI EndBufferedPaint(HPAINTBUFFER bufferhandle, BOOL update) { - FIXME("Stub (%p %d)\n", hPaintBuffer, fUpdateTarget); + struct paintbuffer *buffer = get_buffer_obj(bufferhandle); + + TRACE("(%p %d)\n", bufferhandle, update); + + if (!buffer) + return E_INVALIDARG; + + if (update) + { + if (!BitBlt(buffer->targetdc, buffer->rect.left, buffer->rect.top, + buffer->rect.right - buffer->rect.left, buffer->rect.bottom - buffer->rect.top, + buffer->memorydc, 0, 0, SRCCOPY)) + { + WARN("BitBlt() failed\n"); + } + } + + free_paintbuffer(buffer); return S_OK; }

1 0

Nikolay Sivov : uxtheme: Implement GetBufferedPaintDC().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: fac941680ee6bbccfd23749337d9302fff648a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fac941680ee6bbccfd2374933… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:36 2017 +0300 uxtheme: Implement GetBufferedPaintDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 9 ++++++--- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 9024696..f85761f 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -199,10 +199,13 @@ HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER hBufferedPaint, RGBQUAD **ppbBu /*********************************************************************** * GetBufferedPaintDC (UXTHEME.@) */ -HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER hBufferedPaint) +HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER bufferhandle) { - FIXME("Stub (%p)\n", hBufferedPaint); - return NULL; + struct paintbuffer *buffer = get_buffer_obj(bufferhandle); + + TRACE("(%p)\n", buffer); + + return buffer ? buffer->memorydc : NULL; } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 66f696b..83e8cde 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -614,7 +614,6 @@ todo_wine /* access buffer attributes */ hdc = pGetBufferedPaintDC(buffer); -todo_wine ok(hdc == src, "Unexpected hdc, %p, buffered dc %p\n", hdc, src); hdc = pGetBufferedPaintTargetDC(buffer);

1 0

Nikolay Sivov : uxtheme: Implement GetBufferedPaintTargetDC().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 9f9842ba192b2fd28d2773d3e3ac490f301be173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9842ba192b2fd28d2773d3e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:37 2017 +0300 uxtheme: Implement GetBufferedPaintTargetDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 9 ++++++--- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index f85761f..e2c5756 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -211,10 +211,13 @@ HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER bufferhandle) /*********************************************************************** * GetBufferedPaintTargetDC (UXTHEME.@) */ -HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER hBufferedPaint) +HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER bufferhandle) { - FIXME("Stub (%p)\n", hBufferedPaint); - return NULL; + struct paintbuffer *buffer = get_buffer_obj(bufferhandle); + + TRACE("(%p)\n", buffer); + + return buffer ? buffer->targetdc : NULL; } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 83e8cde..44aebb8 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -617,7 +617,6 @@ todo_wine ok(hdc == src, "Unexpected hdc, %p, buffered dc %p\n", hdc, src); hdc = pGetBufferedPaintTargetDC(buffer); -todo_wine ok(hdc == target, "Unexpected target hdc %p, original %p\n", hdc, target); hr = pGetBufferedPaintTargetRect(buffer, NULL);

1 0

Nikolay Sivov : uxtheme: Implement GetBufferedPaintTargetRect().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 89fe0a3f26d6e2ce6eb3d3d42f560c6c6c9b3e23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89fe0a3f26d6e2ce6eb3d3d42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:38 2017 +0300 uxtheme: Implement GetBufferedPaintTargetRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 16 +++++++++++++--- dlls/uxtheme/tests/system.c | 10 +++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index e2c5756..853fe82 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -223,10 +223,20 @@ HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER bufferhandle) /*********************************************************************** * GetBufferedPaintTargetRect (UXTHEME.@) */ -HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER hBufferedPaint, RECT *prc) +HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER bufferhandle, RECT *rect) { - FIXME("Stub (%p %p)\n", hBufferedPaint, prc); - return E_NOTIMPL; + struct paintbuffer *buffer = get_buffer_obj(bufferhandle); + + TRACE("(%p %p)\n", buffer, rect); + + if (!rect) + return E_POINTER; + + if (!buffer) + return E_FAIL; + + *rect = buffer->rect; + return S_OK; } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 44aebb8..6c08635 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -619,16 +619,20 @@ todo_wine hdc = pGetBufferedPaintTargetDC(buffer); ok(hdc == target, "Unexpected target hdc %p, original %p\n", hdc, target); + hr = pGetBufferedPaintTargetRect(NULL, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + hr = pGetBufferedPaintTargetRect(buffer, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + hr = pGetBufferedPaintTargetRect(NULL, &rect2); + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + SetRectEmpty(&rect2); hr = pGetBufferedPaintTargetRect(buffer, &rect2); -todo_wine { ok(hr == S_OK, "Unexpected return code %#x\n", hr); ok(EqualRect(&rect, &rect2), "Wrong target rect\n"); -} + hr = pEndBufferedPaint(buffer, FALSE); ok(hr == S_OK, "Unexpected return code %#x\n", hr);

1 0

Nikolay Sivov : uxtheme: Implement GetBufferedPaintBits().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: b557cb42eb706a7b6c880112f74a0d8af29d71d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b557cb42eb706a7b6c880112f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:39 2017 +0300 uxtheme: Implement GetBufferedPaintBits(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/buffer.c | 19 +++++++++++++++---- dlls/uxtheme/tests/system.c | 3 +-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/uxtheme/buffer.c b/dlls/uxtheme/buffer.c index 853fe82..ce1fc9f 100644 --- a/dlls/uxtheme/buffer.c +++ b/dlls/uxtheme/buffer.c @@ -189,11 +189,22 @@ HRESULT WINAPI BufferedPaintSetAlpha(HPAINTBUFFER hBufferedPaint, const RECT *pr /*********************************************************************** * GetBufferedPaintBits (UXTHEME.@) */ -HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER hBufferedPaint, RGBQUAD **ppbBuffer, - int *pcxRow) +HRESULT WINAPI GetBufferedPaintBits(HPAINTBUFFER bufferhandle, RGBQUAD **bits, int *width) { - FIXME("Stub (%p %p %p)\n", hBufferedPaint, ppbBuffer, pcxRow); - return E_NOTIMPL; + struct paintbuffer *buffer = get_buffer_obj(bufferhandle); + + TRACE("(%p %p %p)\n", buffer, bits, width); + + if (!bits || !width) + return E_POINTER; + + if (!buffer || !buffer->bits) + return E_FAIL; + + *bits = buffer->bits; + *width = buffer->rect.right - buffer->rect.left; + + return S_OK; } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 6c08635..81e47be 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -648,7 +648,6 @@ todo_wine bits = NULL; row = 0; hr = pGetBufferedPaintBits(buffer, &bits, &row); -todo_wine { if (format == BPBF_COMPATIBLEBITMAP) ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); else @@ -657,7 +656,7 @@ todo_wine { ok(bits != NULL, "Bitmap bits %p\n", bits); ok(row > 0, "Bitmap width %d\n", row); } -} + hr = pEndBufferedPaint(buffer, FALSE); ok(hr == S_OK, "Unexpected return code %#x\n", hr); }

1 0

Nikolay Sivov : uxtheme/tests: A bit more tests for buffered painting API.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 5278b342fd84e692222279a8000aec3a1f27e922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5278b342fd84e692222279a80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 01:42:40 2017 +0300 uxtheme/tests: A bit more tests for buffered painting API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 81e47be..2348a1d 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -530,7 +530,9 @@ static void test_buffered_paint(void) HDC target, src, hdc; HPAINTBUFFER buffer; RECT rect, rect2; + RGBQUAD *bits; HRESULT hr; + int row; if (!pBeginBufferedPaint) { @@ -636,12 +638,41 @@ todo_wine hr = pEndBufferedPaint(buffer, FALSE); ok(hr == S_OK, "Unexpected return code %#x\n", hr); + /* invalid buffer handle */ + hr = pEndBufferedPaint(NULL, FALSE); + ok(hr == E_INVALIDARG, "Unexpected return code %#x\n", hr); + + hdc = pGetBufferedPaintDC(NULL); + ok(hdc == NULL, "Unexpected hdc %p\n", hdc); + + hdc = pGetBufferedPaintTargetDC(NULL); + ok(hdc == NULL, "Unexpected target hdc %p\n", hdc); + + hr = pGetBufferedPaintTargetRect(NULL, &rect2); + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintTargetRect(NULL, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + bits = (void *)0xdeadbeef; + row = 10; + hr = pGetBufferedPaintBits(NULL, &bits, &row); + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + ok(row == 10, "Unexpected row count %d\n", row); + ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + + hr = pGetBufferedPaintBits(NULL, NULL, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintBits(NULL, &bits, NULL); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + hr = pGetBufferedPaintBits(NULL, NULL, &row); + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + /* access buffer bits */ for (format = BPBF_COMPATIBLEBITMAP; format <= BPBF_TOPDOWNMONODIB; format++) { - RGBQUAD *bits; - int row; - buffer = pBeginBufferedPaint(target, &rect, format, &params, &src); /* only works for DIB buffers */ @@ -654,7 +685,7 @@ todo_wine { ok(hr == S_OK, "Unexpected return code %#x\n", hr); ok(bits != NULL, "Bitmap bits %p\n", bits); - ok(row > 0, "Bitmap width %d\n", row); + ok(row >= (rect.right - rect.left), "format %d: bitmap width %d\n", format, row); } hr = pEndBufferedPaint(buffer, FALSE);

1 0