November 2017 - Wine-commits

Andrey Gusev : mf: Add MFGetSupportedMimeTypes stub.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 1d7e48a522d668789574f1da5a1859acd9fe2f13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d7e48a522d668789574f1da5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Nov 6 11:47:11 2017 +0200 mf: Add MFGetSupportedMimeTypes stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 16 ++++++++++++++++ dlls/mf/mf.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 1b223ad..2ad2e5d 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -15,12 +15,18 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #include "config.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "mfidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -35,3 +41,13 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * MFGetSupportedMimeTypes (mf.@) + */ +HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array) +{ + FIXME("(%p) stub\n", array); + + return E_NOTIMPL; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 3b02bd2..54fa1f3 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -73,7 +73,7 @@ @ stub MFEnumDeviceSources @ stub MFGetMultipleServiceProviders @ stub MFGetService -@ stub MFGetSupportedMimeTypes +@ stdcall MFGetSupportedMimeTypes(ptr) @ stub MFGetSupportedSchemes @ stub MFGetTopoNodeCurrentType @ stub MFReadSequencerSegmentOffset diff --git a/include/mfidl.idl b/include/mfidl.idl index 80fa5ec..2792d38 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -255,3 +255,4 @@ cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);" cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") +cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);")

1 0

Gerald Pfeifer : fusion: Remove unused to_multibyte function.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 9b187da8b88e4cb930c08e1fb0b5741c9e8a171e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b187da8b88e4cb930c08e1fb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Nov 5 10:48:22 2017 +0100 fusion: Remove unused to_multibyte function. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/tests/asmname.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 01ebd0a..b93f289 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -339,11 +339,6 @@ static inline void to_widechar(LPWSTR dest, LPCSTR src) MultiByteToWideChar(CP_ACP, 0, src, -1, dest, MAX_PATH); } -static inline void to_multibyte(LPSTR dest, LPWSTR src) -{ - WideCharToMultiByte(CP_ACP, 0, src, -1, dest, MAX_PATH, NULL, NULL); -} - static void test_assembly_name_props_line(IAssemblyName *name, const ASMPROP_RES *vals, int line) {

1 0

Dmitry Timoshkov : ws2_32/tests: Add some tests for sockets bound to a completion port.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: b32e8c678b09ec719d98a2f5a84f8162344f02ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32e8c678b09ec719d98a2f5a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 6 13:13:43 2017 +0800 ws2_32/tests: Add some tests for sockets bound to a completion port. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 702 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 700 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b32e8c678b09ec719d98a…

1 0

Marcus Meissner : user32/tests: Check GetClipboardFormatName length.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 77f4c20af31edb1e1786417912d915e12aebbe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f4c20af31edb1e178641791… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 5 22:58:51 2017 +0100 user32/tests: Check GetClipboardFormatName length. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 8391ea0..aa3bd04 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -385,6 +385,9 @@ static void test_RegisterClipboardFormatA(void) ok(len == lstrlenA("my_cool_clipboard_format"), "wrong format name length %d\n", len); ok(!lstrcmpA(buf, "my_cool_clipboard_format"), "wrong format name \"%s\"\n", buf); + len = GetClipboardFormatNameA(format_id, NULL, 0); + ok(len == 0, "wrong format name length %d\n", len); + lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, 256);

1 0

Zebediah Figura : user32/tests: Simplify test_SendMessage_other_thread().
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: d385de71e346f1caa19c28af7ef4b20f4a822592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d385de71e346f1caa19c28af7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 01:01:20 2017 -0500 user32/tests: Simplify test_SendMessage_other_thread(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 10f4fbd..64c7967 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16365,9 +16365,6 @@ static const struct message send_message_2[] = { }; static const struct message send_message_3[] = { { WM_USER+3, sent|wparam|lparam, 0, 0 }, - { 0 } -}; -static const struct message send_message_4[] = { { WM_USER+1, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -16474,15 +16471,10 @@ static void test_SendMessage_other_thread(int thread_n) ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); trace("main: call PeekMessage\n"); - ok(PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE), "PeekMessage should not fail\n"); - ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); - ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); - - trace("main: call PeekMessage\n"); ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); DispatchMessageA(&msg); - ok_sequence(send_message_4, "SendMessage from other thread 4", FALSE); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input);

1 0

Marcus Meissner : ole32: Clipboard format in the datacache is with trailing \0.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: d382b8e91a4516811b9c6b0d85b3d132bec6ea2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d382b8e91a4516811b9c6b0d8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Nov 5 23:07:05 2017 +0100 ole32: Clipboard format in the datacache is with trailing \0. GetClipboardFormatName returns length without terminating 0, but we need to store it with \0. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 2907426..48453b4 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -470,6 +470,10 @@ static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) hr = IStream_Read(stream, &length, sizeof(length), &read); if (hr != S_OK || read != sizeof(length)) return DV_E_CLIPFORMAT; + if (!length) { + /* No clipboard format present */ + return S_OK; + } if (length == -1) { DWORD cf; @@ -499,11 +503,16 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) { DWORD length; HRESULT hr; + char format_name[256]; if (clipformat < 0xc000) length = -1; else - length = GetClipboardFormatNameA(clipformat, NULL, 0); + { + length = GetClipboardFormatNameA(clipformat, format_name, sizeof(format_name)); + /* If there is a clipboard format name, we need to include its terminating \0 */ + if (length) length++; + } hr = IStream_Write(stream, &length, sizeof(length), NULL); if (FAILED(hr)) return hr; @@ -514,12 +523,7 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) } else { - char *format_name = HeapAlloc(GetProcessHeap(), 0, length); - if (!format_name) - return E_OUTOFMEMORY; - GetClipboardFormatNameA(clipformat, format_name, length); hr = IStream_Write(stream, format_name, length, NULL); - HeapFree(GetProcessHeap(), 0, format_name); } return hr; }

1 0

Józef Kucia : d3d10core/tests: Add test for SV_InstanceID.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: fcd549345d96109179b125d31baf9e9073ecf643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd549345d96109179b125d31… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:20 2017 +0100 d3d10core/tests: Add test for SV_InstanceID. 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/d3d10core/tests/device.c | 236 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 227 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcd549345d96109179b12…

1 0

Józef Kucia : wined3d: Create textures views for depth views.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 14da948b74a4844f4a363d847872bcf60b7ebb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14da948b74a4844f4a363d847… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:21 2017 +0100 wined3d: Create textures views for depth views. In Direct3D a different format is used for sampling depth textures, but this is not the case in OpenGL. We still need to create a texture view when a texture type is different than a view type, or when a shader resource view is being created for a subset of sub-resources. 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/utils.c | 25 ++++++++++++++++++++----- dlls/wined3d/view.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2a12a91..0e00203 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -285,16 +285,17 @@ struct wined3d_typeless_format_depth_stencil_info enum wined3d_format_id depth_stencil_id; enum wined3d_format_id depth_view_id; enum wined3d_format_id stencil_view_id; + BOOL separate_depth_view_format; }; static const struct wined3d_typeless_format_depth_stencil_info typeless_depth_stencil_formats[] = { {WINED3DFMT_R32G8X24_TYPELESS, WINED3DFMT_D32_FLOAT_S8X24_UINT, - WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT}, + WINED3DFMT_R32_FLOAT_X8X24_TYPELESS, WINED3DFMT_X32_TYPELESS_G8X24_UINT, TRUE}, {WINED3DFMT_R24G8_TYPELESS, WINED3DFMT_D24_UNORM_S8_UINT, - WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT}, - {WINED3DFMT_R32_TYPELESS, WINED3DFMT_D32_FLOAT}, - {WINED3DFMT_R16_TYPELESS, WINED3DFMT_D16_UNORM}, + WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_X24_TYPELESS_G8_UINT, TRUE}, + {WINED3DFMT_R32_TYPELESS, WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_FLOAT}, + {WINED3DFMT_R16_TYPELESS, WINED3DFMT_D16_UNORM, WINED3DFMT_R16_UNORM}, }; struct wined3d_format_ddi_info @@ -3536,7 +3537,8 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) typeless_format->flags[j] &= ~(WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); } - if ((format_id = typeless_depth_stencil_formats[i].depth_view_id)) + if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) + && typeless_depth_stencil_formats[i].separate_depth_view_format) { if (!(depth_view_format = get_format_internal(gl_info, format_id))) return FALSE; @@ -3753,6 +3755,19 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl return format; } +BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, + enum wined3d_format_id view_format_id) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) + { + if (typeless_depth_stencil_formats[i].typeless_id == resource_format_id) + return typeless_depth_stencil_formats[i].depth_view_id == view_format_id; + } + return FALSE; +} + void wined3d_format_calculate_pitch(const struct wined3d_format *format, unsigned int alignment, unsigned int width, unsigned int height, unsigned int *row_pitch, unsigned int *slice_pitch) { diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 2ffb718..62f087b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -712,6 +712,10 @@ static void wined3d_shader_resource_view_cs_init(void *object) { create_texture_view(&view->gl_view, view_target, desc, texture, view_format); } + else if (wined3d_format_is_depth_view(resource->format->id, view_format->id)) + { + create_texture_view(&view->gl_view, view_target, desc, texture, resource->format); + } else { FIXME("Shader resource view not supported, resource format %s, view format %s.\n", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6dce970..31d83c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4244,6 +4244,8 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, const struct wined3d_color *color) DECLSPEC_HIDDEN; void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key *key, struct wined3d_color *float_colors) DECLSPEC_HIDDEN; +BOOL wined3d_format_is_depth_view(enum wined3d_format_id resource_format_id, + enum wined3d_format_id view_format_id) DECLSPEC_HIDDEN; const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Use textureGrad*() to implement sample_c_lz for array and cube textures.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: ce8610cea58ed1ba9d8f17857e507d9d6c30132d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8610cea58ed1ba9d8f17857… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 6 10:55:22 2017 +0100 wined3d: Use textureGrad*() to implement sample_c_lz for array and cube textures. Based on a patch by Michael Müller. 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/glsl_shader.c | 50 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f75a7a..91a6c6e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6014,9 +6014,41 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_release_sample_function(ins->ctx, &sample_function); } +/* GLSL doesn't provide a function to sample from level zero with depth + * comparison for array textures and cube textures. We use textureGrad*() + * to implement sample_c_lz. + */ +static void shader_glsl_gen_sample_c_lz(const struct wined3d_shader_instruction *ins, + unsigned int sampler_bind_idx, const struct glsl_sample_function *sample_function, + unsigned int coord_size, const char *coord_param, const char *ref_param) +{ + const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; + unsigned int deriv_size = wined3d_popcount(sample_function->deriv_mask); + const struct wined3d_shader_texel_offset *offset = &ins->texel_offset; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + char dst_swizzle[6]; + + WARN("Emitting textureGrad() for sample_c_lz.\n"); + + shader_glsl_swizzle_to_str(WINED3DSP_NOSWIZZLE, FALSE, ins->dst[0].write_mask, dst_swizzle); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], sample_function->data_type); + shader_addline(buffer, "vec4(textureGrad%s(%s_sampler%u, vec%u(%s, %s), vec%u(0.0), vec%u(0.0)", + sample_function->offset_size ? "Offset" : "", + shader_glsl_get_prefix(version->type), sampler_bind_idx, + coord_size, coord_param, ref_param, deriv_size, deriv_size); + if (sample_function->offset_size) + { + int offset_immdata[4] = {offset->u, offset->v, offset->w}; + shader_addline(buffer, ", "); + shader_glsl_append_imm_ivec(buffer, offset_immdata, sample_function->offset_size); + } + shader_addline(buffer, "))%s);\n", dst_swizzle); +} + static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { unsigned int resource_idx, sampler_idx, sampler_bind_idx; + const struct wined3d_shader_resource_info *resource_info; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; @@ -6032,6 +6064,8 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) if (wined3d_shader_instruction_has_texel_offset(ins)) flags |= WINED3D_GLSL_SAMPLE_OFFSET; + if (!(resource_info = shader_glsl_get_resource_info(ins, &ins->src[1].reg))) + return; resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; @@ -6040,9 +6074,19 @@ static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask >> 1, &coord_param); shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); - shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, - NULL, NULL, lod_param, &ins->texel_offset, "vec%u(%s, %s)", - coord_size, coord_param.param_str, compare_param.param_str); + if (ins->handler_idx == WINED3DSIH_SAMPLE_C_LZ + && (resource_info->type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY + || resource_info->type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE)) + { + shader_glsl_gen_sample_c_lz(ins, sampler_bind_idx, &sample_function, + coord_size, coord_param.param_str, compare_param.param_str); + } + else + { + shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, lod_param, &ins->texel_offset, "vec%u(%s, %s)", + coord_size, coord_param.param_str, compare_param.param_str); + } shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Zebediah Figura : user32: Use the given string length when converting strings in WM_GETTEXT.
by Alexandre Julliard 06 Nov '17

06 Nov '17

Module: wine Branch: master Commit: 9b7f9f2d08f39aa41b8a4b10331b9d0ba20beb6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7f9f2d08f39aa41b8a4b103… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Nov 4 17:48:11 2017 -0500 user32: Use the given string length when converting strings in WM_GETTEXT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 4 ---- dlls/user32/winproc.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5806f81..feca2be 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6932,10 +6932,8 @@ static void test_gettext(void) memset( bufW, 0x1c, sizeof(bufW) ); g_wm_gettext_override.dont_terminate = TRUE; buf_len = GetWindowTextW( hwnd, bufW, sizeof(bufW)/sizeof(bufW[0]) ); -todo_wine ok( buf_len == 4, "Unexpected text length, %d\n", buf_len ); ok( !memcmp(bufW, textW, 4 * sizeof(WCHAR)), "Unexpected window text, %s\n", wine_dbgstr_w(bufW) ); -todo_wine ok( bufW[4] == 0, "Unexpected buffer contents, %#x\n", bufW[4] ); g_wm_gettext_override.dont_terminate = FALSE; @@ -6945,10 +6943,8 @@ todo_wine memset( buf, 0x1c, sizeof(buf) ); g_wm_gettext_override.dont_terminate = TRUE; buf_len = GetWindowTextA( hwnd2, buf, sizeof(buf) ); -todo_wine ok( buf_len == 4, "Unexpected text length, %d\n", buf_len ); ok( !memcmp(buf, "text", 4), "Unexpected window text, '%s'\n", buf ); -todo_wine ok( buf[4] == 0, "Unexpected buffer contents, %#x\n", buf[4] ); g_wm_gettext_override.dont_terminate = FALSE; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index aa71c8e..904a350 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -460,7 +460,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, { len = 0; if (*result) - RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, strlenW(ptr) * sizeof(WCHAR) ); + RtlUnicodeToMultiByteN( str, wParam - 1, &len, ptr, ret * sizeof(WCHAR) ); str[len] = 0; *result = len; } @@ -682,7 +682,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { if (*result) { - RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, strlen(ptr)+1 ); + RtlMultiByteToUnicodeN( (LPWSTR)lParam, wParam*sizeof(WCHAR), &len, ptr, ret + 1 ); *result = len/sizeof(WCHAR) - 1; /* do not count terminating null */ } ((LPWSTR)lParam)[*result] = 0;

1 0