January 2017 - Wine-Commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 2a37605ef66455a78d30b728433ba00e06001724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a37605ef66455a78d30b7284… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jan 27 22:03:59 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index cd73cb9..bc1054e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,11 +1,11 @@ # Lithuanian translations for Wine -# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016. +# Aurimas Fišeras <aurimas(a)members.fsf.org>, 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-11-09 23:09+0300\n" +"PO-Revision-Date: 2017-01-27 22:03+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8364,10 +8364,8 @@ msgid "Wine Control Panel" msgstr "„Wine“ valdymo skydelis" #: shell32.rc:195 -#, fuzzy -#| msgid "Unable to display Run File dialog box (internal error)" msgid "Unable to display Run dialog box (internal error)" -msgstr "Nepavyko parodyti failo paleidimo dialogo lango (vidinė klaida)" +msgstr "Nepavyko parodyti paleidimo dialogo lango (vidinė klaida)" #: shell32.rc:196 msgid "Unable to display Browse dialog box (internal error)"

1 0

Matteo Bruni : d3dx9: Don't forbid supported format conversions.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 84a290c12b9994ddfa6bf61b6b0877f88eefa629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a290c12b9994ddfa6bf61b6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:56 2017 +0100 d3dx9: Don't forbid supported format conversions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 16 ++++++++++++++++ dlls/d3dx9_36/surface.c | 11 ++++++----- dlls/d3dx9_36/volume.c | 4 ++-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index add73bf..9d926c7 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -65,6 +65,22 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; +static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) +{ + if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 + || format->type == FORMAT_ARGBF) + return TRUE; + return !!format->to_rgba; +} + +static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *format) +{ + if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 + || format->type == FORMAT_ARGBF) + return TRUE; + return !!format->from_rgba; +} + HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1bfe75a..fc74779 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1837,10 +1837,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (((srcformatdesc->type != FORMAT_ARGB) && (srcformatdesc->type != FORMAT_INDEX)) || - (destformatdesc->type != FORMAT_ARGB)) + if (!is_conversion_from_supported(srcformatdesc) + || !is_conversion_to_supported(destformatdesc)) { - FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); + FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); return E_NOTIMPL; } @@ -2112,9 +2112,10 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE src_format_desc = get_format_info(src_surface_desc.Format); dst_format_desc = get_format_info(d3d_pixel_format); - if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) + if (!is_conversion_from_supported(src_format_desc) + || !is_conversion_to_supported(dst_format_desc)) { - FIXME("Unsupported pixel format conversion %#x -> %#x\n", + FIXME("Unsupported format conversion %#x -> %#x.\n", src_surface_desc.Format, d3d_pixel_format); hr = E_NOTIMPL; goto cleanup; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 7dc61cf..f07e552 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -188,8 +188,8 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, const BYTE *src_addr; - if (((src_format_desc->type != FORMAT_ARGB) && (src_format_desc->type != FORMAT_INDEX)) || - (dst_format_desc->type != FORMAT_ARGB)) + if (!is_conversion_from_supported(src_format_desc) + || !is_conversion_to_supported(dst_format_desc)) { FIXME("Pixel format conversion is not implemented %#x -> %#x\n", src_format_desc->format, dst_format_desc->format);

1 0

Józef Kucia : wined3d: Add ARB_gpu_shader5 extension.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 8ef73e88c13f076f86a5c375b08b5d626185111b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef73e88c13f076f86a5c375b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:04 2017 +0100 wined3d: Add ARB_gpu_shader5 extension. For SM5 bitwise instructions. 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/wined3d/directx.c | 3 +++ dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8ec894d..83d68b5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -130,6 +130,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, {"GL_ARB_framebuffer_sRGB", ARB_FRAMEBUFFER_SRGB }, {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, + {"GL_ARB_gpu_shader5", ARB_GPU_SHADER5 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS }, @@ -3651,6 +3652,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, + {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, + {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 93af07a..56935ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6150,6 +6150,8 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { + if (gl_info->supported[ARB_GPU_SHADER5]) + shader_addline(buffer, "#extension GL_ARB_gpu_shader5 : enable\n"); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) @@ -8755,6 +8757,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] && gl_info->supported[ARB_DERIVATIVE_CONTROL] + && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f600d0a..88da05a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -63,6 +63,7 @@ enum wined3d_gl_extension ARB_FRAMEBUFFER_OBJECT, ARB_FRAMEBUFFER_SRGB, ARB_GEOMETRY_SHADER4, + ARB_GPU_SHADER5, ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, ARB_INSTANCED_ARRAYS,

1 0

Józef Kucia : d3d11/tests: Improve test for SM5 bfi instruction.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 729ada0b3fa03c2576cc36efdb8d3d76c4005f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=729ada0b3fa03c2576cc36efd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:06 2017 +0100 d3d11/tests: Improve test for SM5 bfi instruction. 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/d3d11/tests/d3d11.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a3c20f3..ccecaf3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10606,22 +10606,21 @@ static void test_uint_shader_instructions(void) static const DWORD ps_bfi_code[] = { #if 0 - uint4 v; + uint bits, offset, insert, base; uint4 main() : SV_Target { - return uint4(4 * v.x + 1, 4 * v.y + 2, 4 * v.z + 3, 4 * v.w); + uint mask = ((1 << bits) - 1) << offset; + return ((insert << offset) & mask) | (base & ~mask); } #endif - 0x43425844, 0xb1a78f7c, 0xaf9d6725, 0x251fdbfc, 0x23c60c00, 0x00000001, 0x00000118, 0x00000003, + 0x43425844, 0xbe9af688, 0xf5caec6f, 0x63ed2522, 0x5f91f209, 0x00000001, 0x000000e0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a0, 0x00000050, 0x00000028, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000068, 0x00000050, 0x0000001a, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, - 0x1500008c, 0x00102072, 0x00000000, 0x00004002, 0x0000001e, 0x0000001e, 0x0000001e, 0x00000000, - 0x00004002, 0x00000002, 0x00000002, 0x00000002, 0x00000000, 0x00208246, 0x00000000, 0x00000000, - 0x00004002, 0x00000001, 0x00000002, 0x00000003, 0x00000000, 0x08000029, 0x00102082, 0x00000000, - 0x0020803a, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0f00008c, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, + 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00208ff6, 0x00000000, 0x00000000, 0x0100003e, }; static const DWORD ps_bfrev_code[] = { @@ -10736,10 +10735,25 @@ static void test_uint_shader_instructions(void) } tests[] = { - {&ps_bfi, { 0, 0, 0, 0}, {1, 2, 3, 0}, TRUE}, - {&ps_bfi, { 1, 1, 1, 1}, {5, 6, 7, 4}, TRUE}, - {&ps_bfi, { 2, 3, 4, 5}, {9, 14, 19, 20}, TRUE}, - {&ps_bfi, {~0u, ~0u, ~0u, ~0u}, {0xfffffffd, 0xfffffffe, 0xffffffff, 0xfffffffc}, TRUE}, + {&ps_bfi, { 0, 0, 0, 0}, { 0, 0, 0, 0}, TRUE}, + {&ps_bfi, { 0, 0, 0, 1}, { 1, 1, 1, 1}, TRUE}, + {&ps_bfi, { ~0u, 0, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}, TRUE}, + {&ps_bfi, { ~0u, ~0u, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}, TRUE}, + {&ps_bfi, { ~0u, 0x1fu, ~0u, 0}, {0x80000000, 0x80000000, 0x80000000, 0x80000000}, TRUE}, + {&ps_bfi, { ~0u, ~0x1fu, ~0u, 0}, {0x7fffffff, 0x7fffffff, 0x7fffffff, 0x7fffffff}, TRUE}, + {&ps_bfi, { 0, 0, 0xff, 1}, { 1, 1, 1, 1}, TRUE}, + {&ps_bfi, { 0, 0, 0xff, 2}, { 2, 2, 2, 2}, TRUE}, + {&ps_bfi, { 16, 16, 0xff, 0xff}, {0x00ff00ff, 0x00ff00ff, 0x00ff00ff, 0x00ff00ff}, TRUE}, + {&ps_bfi, { 0, 0, ~0u, ~0u}, { ~0u, ~0u, ~0u, ~0u}, TRUE}, + {&ps_bfi, {~0x1fu, 0, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, + {&ps_bfi, {~0x1fu, 0, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, + {&ps_bfi, {~0x1fu, 0, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, + {&ps_bfi, { 0, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 0}, { 0, 0, 0, 0}, TRUE}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}, TRUE}, + {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}, TRUE}, {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}, {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}},

1 0

Bruno Jesus : winmm: Fix the ordinal number for function PlaySound.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 00046b816ca0cacbbebe1957326ed45abe24c097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00046b816ca0cacbbebe19573… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 27 19:14:40 2017 -0200 winmm: Fix the ordinal number for function PlaySound. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 6 ++++++ dlls/winmm/winmm.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index d6019f9..a8a5e8d 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1656,6 +1656,12 @@ static void test_PlaySound(void) { BOOL br; char test_file[MAX_PATH], temp[MAX_PATH], *exts; + void *psound_ordinal, *psound_name; + HMODULE dll = GetModuleHandleA("winmm.dll"); + + psound_name = GetProcAddress(dll, "PlaySound"); + psound_ordinal = GetProcAddress(dll, (LPCSTR) 2); + ok(psound_name == psound_ordinal, "Expected ordinal 2 to be PlaySound function\n"); if(waveOutGetNumDevs() == 0) { skip("No output devices available\n"); diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 3d5272c..9c6ed2d 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -1,5 +1,5 @@ # ordinal exports -1 stdcall @(ptr long long) PlaySoundA +2 stdcall @(ptr long long) PlaySoundA 3 stub @ 4 stub @

1 0

Józef Kucia : wined3d: Implement SM5 bfrev instruction.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 832b7ee727ca8270dcf31a01caad600993fcfc33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=832b7ee727ca8270dcf31a01c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:05 2017 +0100 wined3d: Implement SM5 bfrev instruction. 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/d3d11/tests/d3d11.c | 6 +++--- dlls/wined3d/glsl_shader.c | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8580e6..a3c20f3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10741,9 +10741,9 @@ static void test_uint_shader_instructions(void) {&ps_bfi, { 2, 3, 4, 5}, {9, 14, 19, 20}, TRUE}, {&ps_bfi, {~0u, ~0u, ~0u, ~0u}, {0xfffffffd, 0xfffffffe, 0xffffffff, 0xfffffffc}, TRUE}, - {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}, TRUE}, - {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}, TRUE}, - {&ps_bfrev, {0xffffffff}, {0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000}, TRUE}, + {&ps_bfrev, {0x12345678}, {0x1e6a2c48, 0x12345678, 0x1e6a0000, 0x2c480000}}, + {&ps_bfrev, {0xffff0000}, {0x0000ffff, 0xffff0000, 0x00000000, 0xffff0000}}, + {&ps_bfrev, {0xffffffff}, {0xffffffff, 0xffffffff, 0xffff0000, 0xffff0000}}, {&ps_ftou, {BITS_NNAN}, { 0, 0}}, {&ps_ftou, {BITS_NAN}, { 0, 0}}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 56935ae..6f83563 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3723,6 +3723,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_ABS: instruction = "abs"; break; + case WINED3DSIH_BFREV: instruction = "bitfieldReverse"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; @@ -8844,7 +8845,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_XOR */ NULL, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ NULL, - /* WINED3DSIH_BFREV */ NULL, + /* WINED3DSIH_BFREV */ shader_glsl_map2gl, /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp,

1 0

Józef Kucia : wined3d: Add ARB_shading_language_packing extension.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 1ea53005e77be9e764ff6f14887da2c9af5d6ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ea53005e77be9e764ff6f148… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:00 2017 +0100 wined3d: Add ARB_shading_language_packing extension. For f32tof16 and f16tof32 instructions. 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/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d456772..8ec894d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, + {"GL_ARB_shading_language_packing", ARB_SHADING_LANGUAGE_PACKING }, {"GL_ARB_shadow", ARB_SHADOW }, {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, @@ -3656,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADER_IMAGE_LOAD_STORE, MAKEDWORD_VERSION(4, 2)}, + {ARB_SHADING_LANGUAGE_PACKING, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 968c2a2..c955ec4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6130,6 +6130,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); + if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) + shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -8728,7 +8730,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] - && gl_info->supported[ARB_SHADER_IMAGE_SIZE]) + && gl_info->supported[ARB_SHADER_IMAGE_SIZE] + && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 84c49c3..f600d0a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_IMAGE_SIZE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, + ARB_SHADING_LANGUAGE_PACKING, ARB_SHADOW, ARB_STENCIL_TEXTURING, ARB_SYNC,

1 0

Matteo Bruni : d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 7e30dc8b4eadb2b7baedb9bf8ab6fb6f6d21fd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e30dc8b4eadb2b7baedb9bf8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:53 2017 +0100 d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4bea1e1..601461f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -900,7 +900,7 @@ static void clear_test(void) D3DVIEWPORT9 old_vp, vp; RECT scissor; DWORD oldColorWrite; - BOOL invalid_clear_failed = FALSE; + BOOL invalid_clear_failed = FALSE, srgb_supported; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -1149,6 +1149,9 @@ static void clear_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); /* Test D3DRS_SRGBWRITEENABLE interactions with clears. */ + srgb_supported = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBWRITE, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8)); + trace("sRGB writing to D3DFMT_A8R8G8B8 is %ssupported.\n", srgb_supported ? "" : "not "); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw4 surface segfaults.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: 1850ac577038b8a16c4f153b9f3177e959f27c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1850ac577038b8a16c4f153b9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:05 2017 -0700 ddraw: Don't crash if writing out a new ddraw4 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw4.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1e69df4..ebb2706 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2868,15 +2868,23 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1ace50a..3aec876 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2267,6 +2267,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface4 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0

Alex Henrie : ddraw: Don' t crash if writing out a new ddraw1 surface segfaults.
by Alexandre Julliard Jan. 30, 2017

Jan. 30, 2017

Module: wine Branch: master Commit: d9f2b4627af575ebcd28395d9ba3744cab6c5f36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f2b4627af575ebcd28395d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:03 2017 -0700 ddraw: Don't crash if writing out a new ddraw1 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 ++++++++++++++++------ dlls/ddraw/tests/ddraw1.c | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e313a75..b8e2f57 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -26,6 +26,8 @@ #include "ddraw_private.h" +#include "wine/exception.h" + WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static const struct ddraw *exclusive_ddraw; @@ -2974,14 +2976,22 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ed4c5ec..ff88b74 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1967,6 +1967,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);

1 0