March 2017 - Wine-Commits - list.winehq.org

Sebastian Lackner : webservices: Unlock critical section before returning.
by Alexandre Julliard March 9, 2017

March 9, 2017

Module: wine Branch: master Commit: 3c6c6a3cae7621294276f95fd035a7d4f699d399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6c6a3cae7621294276f95fd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 01:06:38 2017 +0100 webservices: Unlock critical section before returning. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0951af7..26a5fe9 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1182,6 +1182,8 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR } } + LeaveCriticalSection( &reader->cs ); + if (!found) { if (required) return WS_E_INVALID_FORMAT; @@ -1189,7 +1191,6 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR return S_FALSE; } - LeaveCriticalSection( &reader->cs ); return S_OK; }

1 0

Owen Rudge : gdiplus: Check for null in GdipGetFontHeight.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 36c9ac3968bf99f9e2fc7804d393568a82f6bdaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c9ac3968bf99f9e2fc7804d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 6 22:06:15 2017 +0000 gdiplus: Check for null in GdipGetFontHeight. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 1068a47..ccf93ed 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -558,6 +558,8 @@ GpStatus WINGDIPAPI GdipGetFontHeight(GDIPCONST GpFont *font, TRACE("%p %p %p\n", font, graphics, height); + if (!font || !height) return InvalidParameter; + stat = GdipGetFontHeightGivenDPI(font, font->family->dpi, &font_height); if (stat != Ok) return stat;

1 0

Nikolay Sivov : xmllite/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 20920457d709515b5915e5495bd92ffa082d096a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20920457d709515b5915e5495… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 22:46:54 2017 +0300 xmllite/tests: Fix a memory leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 2a97a75..0508466 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -31,6 +31,15 @@ #include "initguid.h" DEFINE_GUID(IID_IXmlWriterOutput, 0xc1131708, 0x0f59, 0x477f, 0x93, 0x59, 0x7d, 0x33, 0x24, 0x51, 0xbc, 0x1a); +#define EXPECT_REF(obj, ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG refcount; + IUnknown_AddRef(obj); + refcount = IUnknown_Release(obj); + ok_(__FILE__, line)(refcount == ref, "expected refcount %d, got %d\n", ref, refcount); +} + static void check_output(IStream *stream, const char *expected, BOOL todo, int line) { int len = strlen(expected), size; @@ -273,6 +282,7 @@ static void test_writeroutput(void) output = NULL; hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, NULL, &output); ok(hr == S_OK, "got %08x\n", hr); + EXPECT_REF(output, 1); IUnknown_Release(output); hr = CreateXmlWriterOutputWithEncodingName(&testoutput, NULL, utf16W, &output); @@ -280,9 +290,13 @@ static void test_writeroutput(void) unk = NULL; hr = IUnknown_QueryInterface(output, &IID_IXmlWriterOutput, (void**)&unk); ok(hr == S_OK, "got %08x\n", hr); - ok(unk != NULL, "got %p\n", unk); +todo_wine + ok(unk != NULL && unk != output, "got %p, output %p\n", unk, output); + EXPECT_REF(output, 2); /* releasing 'unk' crashes on native */ IUnknown_Release(output); + EXPECT_REF(output, 1); + IUnknown_Release(output); output = NULL; hr = CreateXmlWriterOutputWithEncodingCodePage(&testoutput, NULL, ~0u, &output); @@ -297,6 +311,7 @@ static void test_writeroutput(void) ok(unk != NULL, "got %p\n", unk); /* releasing 'unk' crashes on native */ IUnknown_Release(output); + IUnknown_Release(output); } static void test_writestartdocument(void)

1 0

Owen Rudge : gdiplus/tests: Add tests for invalid parameter handling for GdipGetFontHeight.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 1ddf2b4db8c42da36bdccd43dc336eee6ba03cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ddf2b4db8c42da36bdccd43d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Mar 6 22:06:19 2017 +0000 gdiplus/tests: Add tests for invalid parameter handling for GdipGetFontHeight. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 827ef2a..dd624a4 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -546,6 +546,12 @@ static void gdip_get_font_metrics(GpFont *font, struct font_metrics *fm) stat = GdipGetFontStyle(font, &style); expect(Ok, stat); + stat = GdipGetFontHeight(NULL, NULL, &fm->font_height); + expect(InvalidParameter, stat); + + stat = GdipGetFontHeight(font, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetFontHeight(font, NULL, &fm->font_height); expect(Ok, stat); stat = GdipGetFontSize(font, &fm->font_size);

1 0

Bruno Jesus : kernel32/tests: Add 64bit number tests for FormatMessage[A|W ].
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: c7fb64dbc7905f565aa9eb2ddc6a5fd8d1866c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fb64dbc7905f565aa9eb2dd… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Wed Mar 8 11:42:31 2017 -0300 kernel32/tests: Add 64bit number tests for FormatMessage[A|W]. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 77 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 4a1ae7d..b384135 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -24,6 +24,8 @@ #include "winbase.h" #include "winnls.h" +#define ULL(a,b) (((ULONG64)(a) << 32) | (b)) + static DWORD __cdecl doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { @@ -1781,6 +1783,80 @@ static void test_message_invalid_flags_wide(void) "Expected the output buffer to be untouched\n"); } +static void test_message_from_64bit_number(void) +{ + static const WCHAR I64d[] = {'%', '1', '!', 'I', '6', '4', 'd', '!', 0}; + static const WCHAR I64u[] = {'%', '1', '!', 'I', '6', '4', 'u', '!', 0}; + WCHAR outW[0x100], expW[0x100]; + char outA[0x100]; + DWORD r; + static const struct + { + UINT64 number; + const char expected[32]; + int len; + } unsigned_tests[] = + { + { 0, "0", 1 }, + { 1234567890, "1234567890", 10}, + { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20 }, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, + }; + static const struct + { + INT64 number; + const char expected[32]; + int len; + } signed_tests[] = + { + { 0, "0" , 1}, + { 1234567890, "1234567890", 10 }, + { -1, "-1", 2}, + { ULL(0xFFFFFFFF,0xFFFFFFFF), "-1", 2}, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, + { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20}, + }; + int i; + + for (i = 0; i < sizeof(unsigned_tests) / sizeof(unsigned_tests[0]); i++) + { + r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, + 0, 0, outW, sizeof(outW) / sizeof(WCHAR), unsigned_tests[i].number); + MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, sizeof(expW)); +todo_wine { + ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, + unsigned_tests[i].expected, wine_dbgstr_w(outW)); + ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); +} + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64u!", + 0, 0, outA, sizeof(outA), unsigned_tests[i].number); +todo_wine { + ok(!strcmp(outA, unsigned_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, + unsigned_tests[i].expected, outA); + ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); +} + } + + for (i = 0; i < sizeof(signed_tests) / sizeof(signed_tests[0]); i++) + { + r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, + 0, 0, outW, sizeof(outW) / sizeof(WCHAR), signed_tests[i].number); + MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, sizeof(expW)); +todo_wine { + ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, + signed_tests[i].expected, wine_dbgstr_w(outW)); + ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); +} + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64d!", + 0, 0, outA, sizeof(outA), signed_tests[i].number); +todo_wine { + ok(!strcmp(outA, signed_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, + signed_tests[i].expected, outA); + ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); +} + } +} + START_TEST(format_msg) { DWORD ret; @@ -1808,4 +1884,5 @@ START_TEST(format_msg) test_message_null_buffer_wide(); test_message_allocate_buffer_wide(); test_message_invalid_flags_wide(); + test_message_from_64bit_number(); }

1 0

Alexandre Julliard : gdi32: Add support for DIBINDEX colors in 1-bpp blits.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: c54b667e25a8cff0919de9b22fa3265068ab4eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c54b667e25a8cff0919de9b22… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 21:29:51 2017 +0100 gdi32: Add support for DIBINDEX colors in 1-bpp blits. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 19 +++++++++++-------- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 27 +++++++++++++++------------ dlls/gdi32/gdi_private.h | 2 +- dlls/gdi32/tests/dib.c | 6 ++---- 5 files changed, 30 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c54b667e25a8cff0919de…

1 0

Józef Kucia : wined3d: Add support for seamless cube map filtering.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: c7f3308db7a6c5ff92a43095fdc260460f3b4d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7f3308db7a6c5ff92a43095f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 8 12:07:23 2017 +0100 wined3d: Add support for seamless cube map filtering. Seamless cube map filtering should always be enabled in D3D10+. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw_private.h | 3 ++- dlls/wined3d/context.c | 8 +++++++- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + include/wine/wined3d.h | 1 + 7 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index f91e4af..107e32d 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -411,7 +411,8 @@ BOOL d3d8_init(struct d3d8 *d3d8) { DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART; + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART + | WINED3D_LEGACY_CUBEMAP_FILTERING; d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index cdbe2fc..fe7163f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -580,7 +580,7 @@ BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { DWORD flags = WINED3D_PRESENT_CONVERSION | WINED3D_HANDLE_RESTORE | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_SRGB_READ_WRITE_CONTROL | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR - | WINED3D_NO_PRIMITIVE_RESTART; + | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING; if (!extended) flags |= WINED3D_VIDMEM_ACCOUNTING; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1737ce6..48b6c70 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -61,7 +61,8 @@ struct FvfToDecl #define DDRAW_WINED3D_FLAGS (WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING \ | WINED3D_RESTORE_MODE_ON_ACTIVATE | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER \ - | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART) + | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR | WINED3D_NO_PRIMITIVE_RESTART \ + | WINED3D_LEGACY_CUBEMAP_FILTERING) enum ddraw_device_state { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fac19e..a423fac 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1969,13 +1969,19 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (gl_info->supported[ARB_ES3_COMPATIBILITY]) { gl_info->gl_ops.gl.p_glEnable(GL_PRIMITIVE_RESTART_FIXED_INDEX); - checkGLcall("Enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); + checkGLcall("enable GL_PRIMITIVE_RESTART_FIXED_INDEX"); } else { FIXME("OpenGL implementation does not support GL_PRIMITIVE_RESTART_FIXED_INDEX.\n"); } } + if (!(d3d_info->wined3d_creation_flags & WINED3D_LEGACY_CUBEMAP_FILTERING) + && gl_info->supported[ARB_SEAMLESS_CUBE_MAP]) + { + gl_info->gl_ops.gl.p_glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); + checkGLcall("enable seamless cube map filtering"); + } if (gl_info->supported[ARB_CLIP_CONTROL]) GL_EXTCALL(glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN, GL_LOWER_LEFT)); device->shader_backend->shader_init_context_state(ret); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 425d1fd..51c6ad2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -147,6 +147,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, + {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, {"GL_ARB_shader_atomic_counters", ARB_SHADER_ATOMIC_COUNTERS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, @@ -3765,6 +3766,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, * extension for core-only support. */ {ARB_FRAGMENT_COORD_CONVENTIONS, MAKEDWORD_VERSION(3, 2)}, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, + {ARB_SEAMLESS_CUBE_MAP, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 00fb7cb..99930c4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -80,6 +80,7 @@ enum wined3d_gl_extension ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, ARB_SAMPLER_OBJECTS, + ARB_SEAMLESS_CUBE_MAP, ARB_SHADER_ATOMIC_COUNTERS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0fcf07c..acdb4f3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1279,6 +1279,7 @@ enum wined3d_shader_byte_code_format #define WINED3D_SRGB_READ_WRITE_CONTROL 0x00000200 #define WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR 0x00000400 #define WINED3D_NO_PRIMITIVE_RESTART 0x00000800 +#define WINED3D_LEGACY_CUBEMAP_FILTERING 0x00001000 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Sebastian Lackner : include: Avoid typedef for tls_data.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: fc84f2462a212194af86bd8fcc2056c990a9c7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc84f2462a212194af86bd8fc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 7 18:29:32 2017 +0100 include: Avoid typedef for tls_data. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bf353a5..af602c0 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -218,7 +218,7 @@ static LONG todo_successes; /* number of successful tests inside todo block */ static LONG todo_failures; /* number of failures inside todo block */ /* The following data must be kept track of on a per-thread basis */ -typedef struct +struct tls_data { const char* current_file; /* file of current check */ int current_line; /* line of current check */ @@ -226,19 +226,19 @@ typedef struct int todo_do_loop; char *str_pos; /* position in debug buffer */ char strings[2000]; /* buffer for debug strings */ -} tls_data; +}; static DWORD tls_index; -static tls_data* get_tls_data(void) +static struct tls_data *get_tls_data(void) { - tls_data* data; + struct tls_data *data; DWORD last_error; last_error=GetLastError(); data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data)); + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); data->str_pos = data->strings; TlsSetValue(tls_index,data); } @@ -249,7 +249,7 @@ static tls_data* get_tls_data(void) /* allocate some tmp space for a string */ static char *get_temp_buffer( size_t n ) { - tls_data *data = get_tls_data(); + struct tls_data *data = get_tls_data(); char *res = data->str_pos; if (res + n >= &data->strings[sizeof(data->strings)]) res = data->strings; @@ -260,7 +260,7 @@ static char *get_temp_buffer( size_t n ) /* release extra space that we requested in get_temp_buffer() */ static void release_temp_buffer( char *ptr, size_t size ) { - tls_data *data = get_tls_data(); + struct tls_data *data = get_tls_data(); data->str_pos = ptr + size; } @@ -273,7 +273,7 @@ static void exit_process( int code ) void winetest_set_location( const char* file, int line ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); data->current_file=strrchr(file,'/'); if (data->current_file==NULL) data->current_file=strrchr(file,'\\'); @@ -301,7 +301,7 @@ int broken( int condition ) */ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); if (data->todo_level) { @@ -358,7 +358,7 @@ void __winetest_cdecl winetest_ok( int condition, const char *msg, ... ) void __winetest_cdecl winetest_trace( const char *msg, ... ) { __winetest_va_list valist; - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); if (winetest_debug > 0) { @@ -371,7 +371,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) void winetest_vskip( const char *msg, __winetest_va_list args ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); @@ -399,14 +399,14 @@ void __winetest_cdecl winetest_win_skip( const char *msg, ... ) void winetest_start_todo( int is_todo ) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); data->todo_level = (data->todo_level << 1) | (is_todo != 0); data->todo_do_loop=1; } int winetest_loop_todo(void) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); int do_loop=data->todo_do_loop; data->todo_do_loop=0; return do_loop; @@ -414,7 +414,7 @@ int winetest_loop_todo(void) void winetest_end_todo(void) { - tls_data* data=get_tls_data(); + struct tls_data *data = get_tls_data(); data->todo_level >>= 1; } @@ -613,7 +613,7 @@ static void usage( const char *argv0 ) /* trap unhandled exceptions */ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) { - tls_data *data = get_tls_data(); + struct tls_data *data = get_tls_data(); if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n",

1 0

Paul Gofman : d3dx9/tests: Add test for out of bounds array selector in effect.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 8f86d5545b5ee1d7c0e4a379cc550142386365ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f86d5545b5ee1d7c0e4a379c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 8 00:48:40 2017 +0300 d3dx9/tests: Add test for out of bounds array selector in effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 166 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b3845c5..56d9fe6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3813,6 +3813,40 @@ static const DWORD test_effect_preshader_effect_blob[] = #define TEST_EFFECT_PRESHADER_VSHADER_POS 2458 #define TEST_EFFECT_PRESHADER_VSHADER_LEN 13 +#define test_effect_preshader_compare_shader(a, b, c) \ + test_effect_preshader_compare_shader_(__LINE__, a, b, c) +static void test_effect_preshader_compare_shader_(unsigned int line, IDirect3DDevice9 *device, + int expected_shader_index, BOOL todo) +{ + IDirect3DVertexShader9 *vshader; + void *byte_code; + unsigned int byte_code_size; + HRESULT hr; + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok_(__FILE__, line)(hr == D3D_OK, "IDirect3DDevice9_GetVertexShader result %#x.\n", hr); + + todo_wine_if(todo) + ok_(__FILE__, line)(!!vshader, "Got NULL vshader.\n"); + if (!vshader) + return; + + hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); + ok_(__FILE__, line)(hr == D3D_OK, "IDirect3DVertexShader9_GetFunction %#x.\n", hr); + ok_(__FILE__, line)(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); + + byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); + hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); + ok_(__FILE__, line)(hr == D3D_OK, "Got result %#x.\n", hr); + + todo_wine_if(todo) + ok_(__FILE__, line)(!memcmp(byte_code, &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + + expected_shader_index * TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), + "Incorrect shader selected.\n"); + HeapFree(GetProcessHeap(), 0, byte_code); + IDirect3DVertexShader9_Release(vshader); + } + static void test_effect_preshader(IDirect3DDevice9 *device) { static const D3DXVECTOR4 test_effect_preshader_fconstsv[] = @@ -3933,8 +3967,6 @@ static void test_effect_preshader(IDirect3DDevice9 *device) int idata[TEST_EFFECT_PRES_NINT][4]; BOOL bdata[TEST_EFFECT_PRES_NBOOL]; IDirect3DVertexShader9 *vshader; - void *byte_code; - unsigned int byte_code_size; unsigned int i, j; D3DCAPS9 caps; @@ -4071,22 +4103,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = effect->lpVtbl->BeginPass(effect, 1); ok(hr == D3D_OK, "Got result %#x.\n", hr); - hr = IDirect3DDevice9_GetVertexShader(device, &vshader); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(!!vshader, "Got NULL vshader.\n"); - - hr = IDirect3DVertexShader9_GetFunction(vshader, NULL, &byte_code_size); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - byte_code = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, byte_code_size); - hr = IDirect3DVertexShader9_GetFunction(vshader, byte_code, &byte_code_size); - ok(hr == D3D_OK, "Got result %#x.\n", hr); - ok(byte_code_size > 1, "Got unexpected byte code size %u.\n", byte_code_size); - ok(!memcmp(byte_code, - &test_effect_preshader_effect_blob[TEST_EFFECT_PRESHADER_VSHADER_POS + - TEST_EFFECT_PRESHADER_VSHADER_LEN], byte_code_size), - "Incorrect shader selected.\n"); - HeapFree(GetProcessHeap(), 0, byte_code); - IDirect3DVertexShader9_Release(vshader); + test_effect_preshader_compare_shader(device, 1, FALSE); hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -4284,6 +4301,118 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) effect->lpVtbl->Release(effect); } +static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) +{ + ID3DXEffect *effect; + HRESULT hr; + D3DXHANDLE param; + int ivect[4]; + unsigned int passes_count; + IDirect3DVertexShader9 *vshader; + + hr = D3DXCreateEffect(device, test_effect_preshader_effect_blob, sizeof(test_effect_preshader_effect_blob), + NULL, NULL, 0, NULL, &effect, NULL); + + hr = effect->lpVtbl->Begin(effect, &passes_count, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[0] = ivect[1] = ivect[3] = 1; + + param = effect->lpVtbl->GetParameterByName(effect, NULL, "g_iVect"); + ok(!!param, "GetParameterByName failed.\n"); + ivect[2] = 3; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + effect->lpVtbl->EndPass(effect); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 2, TRUE); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[2] = -2; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + todo_wine ok(hr == E_FAIL, "Got result %#x.\n", hr); + if (SUCCEEDED(hr)) + hr = effect->lpVtbl->EndPass(effect); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 2, TRUE); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[2] = -1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 1); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 0, TRUE); + + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + ivect[2] = 3; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + ivect[2] = -1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = IDirect3DDevice9_GetVertexShader(device, &vshader); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(!vshader, "Got non NULL vshader.\n"); + + ivect[2] = 1; + hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect)); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->CommitChanges(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + test_effect_preshader_compare_shader(device, 1, FALSE); + + hr = effect->lpVtbl->EndPass(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + effect->lpVtbl->Release(effect); +} + START_TEST(effect) { HWND wnd; @@ -4327,6 +4456,7 @@ START_TEST(effect) test_effect_preshader(device); test_effect_preshader_ops(device); test_effect_isparameterused(device); + test_effect_out_of_bounds_selector(device); count = IDirect3DDevice9_Release(device); ok(count == 0, "The device was not properly freed: refcount %u\n", count);

1 0

Alexandre Julliard : gdi32: Add more helper functions for RGB to pixel conversions.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 71d2d4ee966afb8732affb595c774c31c24ee53a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d2d4ee966afb8732affb595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 8 20:57:41 2017 +0100 gdi32: Add more helper functions for RGB to pixel conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 301 ++++++++++++++++------------------------- 1 file changed, 115 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71d2d4ee966afb8732aff…

1 0