February 2017 - Wine-Commits

Henri Verbeet : d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateTexture().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 5ec48e76ad0a285b046b1af41b552ab697bc8344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec48e76ad0a285b046b1af41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 9 12:52:38 2017 +0100 d3d8: Do not modify the "texture" pointer for D3DFMT_UNKNOWN in d3d8_device_CreateTexture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 805694b..989c1b0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -791,6 +791,9 @@ static HRESULT WINAPI d3d8_device_CreateTexture(IDirect3DDevice8 *iface, TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", iface, width, height, levels, usage, format, pool, texture); + if (!format) + return D3DERR_INVALIDCALL; + *texture = NULL; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index da67fb3..c05c9f2 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8230,7 +8230,7 @@ static void test_format_unknown(void) hr = IDirect3DDevice8_CreateTexture(device, 64, 64, 1, 0, D3DFMT_UNKNOWN, D3DPOOL_DEFAULT, (IDirect3DTexture8 **)&iface); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); + ok(iface == (void *)0xdeadbeef, "Got unexpected iface %p.\n", iface); iface = (void *)0xdeadbeef; hr = IDirect3DDevice8_CreateCubeTexture(device, 64, 1, 0,

1 0

Nikolay Sivov : uxtheme/tests: A bit more tests for buffered painting API.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

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

Nikolay Sivov : uxtheme: Implement GetBufferedPaintBits().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

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

Francois Gouget : oleaut32: Standardize the heap_xxx() functions.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

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

Francois Gouget : scrrun: Add a __WINE_ALLOC_SIZE attribute to heap_alloc( ).
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 0d8d0b9f183392290e3c82aa47f53af963a4b318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8d0b9f183392290e3c82aa4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:10 2017 +0100 scrrun: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/scrrun_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/scrrun/scrrun_private.h b/dlls/scrrun/scrrun_private.h index e2023f9..3312876 100644 --- a/dlls/scrrun/scrrun_private.h +++ b/dlls/scrrun/scrrun_private.h @@ -46,7 +46,7 @@ struct provideclassinfo { extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) 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); }

1 0

Nikolay Sivov : uxtheme: Implement GetBufferedPaintDC().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

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

Henri Verbeet : wined3d: Disallow upload conversion from compressed formats in surface_convert_format ().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 5a6efe632918fd18758897c39910d52791d46053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6efe632918fd18758897c39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:36 2017 +0100 wined3d: Disallow upload conversion from compressed formats in surface_convert_format(). The underlying issue is that glCompressedTexSubImage2D() needs the upload format to match the texture's internal format. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 222159b..628c83a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1521,7 +1521,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr if (!(conv = find_converter(src_format->id, dst_format->id)) && (!device->d3d_initialized || !is_identity_fixup(src_format->color_fixup) || src_format->convert - || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert)) + || !is_identity_fixup(dst_format->color_fixup) || dst_format->convert + || (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED))) { FIXME("Cannot find a conversion function from format %s to %s.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id));

1 0

Bruno Jesus : wlanapi: Semi-stub WlanEnumInterfaces.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 6bb8ca1e25a9cfc66f396b2ae6bc423a8057929c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb8ca1e25a9cfc66f396b2ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 7 16:05:40 2017 -0200 wlanapi: Semi-stub WlanEnumInterfaces. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 24 ++++++++++++++++++++++-- dlls/wlanapi/tests/wlanapi.c | 5 ----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 3fae765..6955245 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -63,8 +63,28 @@ static HANDLE handle_new(struct wine_wlan **entry) DWORD WINAPI WlanEnumInterfaces(HANDLE handle, void *reserved, WLAN_INTERFACE_INFO_LIST **interface_list) { - FIXME("(%p, %p, %p) stub\n", handle, reserved, interface_list); - return ERROR_CALL_NOT_IMPLEMENTED; + struct wine_wlan *wlan; + WLAN_INTERFACE_INFO_LIST *ret_list; + + FIXME("(%p, %p, %p) semi-stub\n", handle, reserved, interface_list); + + if (!handle || reserved || !interface_list) + return ERROR_INVALID_PARAMETER; + + wlan = handle_index(handle); + if (!wlan) + return ERROR_INVALID_HANDLE; + + ret_list = WlanAllocateMemory(sizeof(WLAN_INTERFACE_INFO_LIST)); + if (!ret_list) + return ERROR_NOT_ENOUGH_MEMORY; + + memset(&ret_list->InterfaceInfo[0], 0, sizeof(WLAN_INTERFACE_INFO)); + ret_list->dwNumberOfItems = 0; + ret_list->dwIndex = 0; /* unused in this function */ + *interface_list = ret_list; + + return ERROR_SUCCESS; } DWORD WINAPI WlanCloseHandle(HANDLE handle, void *reserved) diff --git a/dlls/wlanapi/tests/wlanapi.c b/dlls/wlanapi/tests/wlanapi.c index e0c55f6..882aa82 100644 --- a/dlls/wlanapi/tests/wlanapi.c +++ b/dlls/wlanapi/tests/wlanapi.c @@ -134,24 +134,19 @@ static void test_WlanEnumInterfaces(void) /* invalid parameters */ ret = WlanEnumInterfaces(NULL, NULL, &list); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, &reserved, &list); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); ret = WlanEnumInterfaces(handle, NULL, NULL); -todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Expected 87, got %d\n", ret); ok(list == bad_list, "list changed\n"); /* good tests */ list = NULL; ret = WlanEnumInterfaces(handle, NULL, &list); -todo_wine ok(ret == ERROR_SUCCESS, "Expected 0, got %d\n", ret); -todo_wine ok(list != NULL, "bad interface list\n"); if (!list || !list->dwNumberOfItems) {

1 0

Ken Thomases : winemac: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 02c6e4530246f510f5683b44d9d50bea445dfdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=02c6e4530246f510f5683b44d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 8 09:30:13 2017 -0600 winemac: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index f25b06d..67e0dce 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -206,7 +206,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) DWORD size, ret; value[0] = 0; - size = sizeof(value) / sizeof(WCHAR); + size = sizeof(value); ret = RegQueryValueExW(key, name, NULL, NULL, (BYTE *)value, &size); RegCloseKey(key); if (!ret)

1 0

Matteo Bruni : d3dx10: Make use of data_size when tracing data string.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 5bcdee38c0392c09140a05f3834399571d6b802e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bcdee38c0392c09140a05f38… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 7 22:08:43 2017 +0100 d3dx10: Make use of data_size when tracing data string. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index fb988a4..c638904 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -226,8 +226,9 @@ HRESULT WINAPI D3DX10CompileFromMemory(const char *data, SIZE_T data_size, const { TRACE("data %s, data_size %lu, filename %s, defines %p, include %p, entry_point %s, target %s, " "sflags %#x, eflags %#x, pump %p, shader %p, error_messages %p, hresult %p.\n", - debugstr_a(data), data_size, debugstr_a(filename), defines, include, debugstr_a(entry_point), - debugstr_a(target), sflags, eflags, pump, shader, error_messages, hresult); + debugstr_an(data, data_size), data_size, debugstr_a(filename), defines, include, + debugstr_a(entry_point), debugstr_a(target), sflags, eflags, pump, shader, + error_messages, hresult); if (pump) FIXME("Unimplemented ID3DX10ThreadPump handling.\n");

1 0