November 2016 - Wine-Commits

Józef Kucia : wined3d: Implement SM5 ld_uav_typed instruction.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: fae0f7309ef362a4c557656b54cf5ff2b7f99b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae0f7309ef362a4c557656b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:31 2016 +0100 wined3d: Implement SM5 ld_uav_typed 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/wined3d/glsl_shader.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 9 +++++++-- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ca91908..c95dc00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4773,6 +4773,40 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) image_coord_param.param_str, image_data_param.param_str); } +static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct wined3d_shader_version *version = &reg_maps->shader_version; + enum wined3d_shader_resource_type resource_type; + struct glsl_src_param image_coord_param; + enum wined3d_data_type data_type; + DWORD coord_mask, write_mask; + unsigned int uav_idx; + char dst_swizzle[6]; + + uav_idx = ins->src[1].reg.idx[0].offset; + if (uav_idx >= ARRAY_SIZE(reg_maps->uav_resource_info)) + { + ERR("Invalid UAV index %u.\n", uav_idx); + return; + } + resource_type = reg_maps->uav_resource_info[uav_idx].type; + if (resource_type >= ARRAY_SIZE(resource_type_info)) + { + ERR("Unexpected resource type %#x.\n", resource_type); + resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; + } + data_type = reg_maps->uav_resource_info[uav_idx].data_type; + coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + + write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], data_type); + shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); + shader_addline(ins->ctx->buffer, "imageLoad(%s_image%u, %s)%s);\n", + shader_glsl_get_prefix(version->type), uav_idx, image_coord_param.param_str, dst_swizzle); +} + static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; @@ -8937,7 +8971,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, - /* WINED3DSIH_LD_UAV_TYPED */ NULL, + /* WINED3DSIH_LD_UAV_TYPED */ shader_glsl_ld_uav, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOD */ NULL, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e1c097a..eadf331 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1228,9 +1228,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) + if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD + || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) { - unsigned int reg_idx = ins.dst[0].reg.idx[0].offset; + unsigned int reg_idx; + if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) + reg_idx = ins.dst[0].reg.idx[0].offset; + else + reg_idx = ins.src[1].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) { ERR("Invalid UAV index %u.\n", reg_idx);

1 0

Józef Kucia : wined3d: Add ARB_shader_image_size extension.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 8fa59b8d10e3cf98e7cce8948caee80efddb7f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa59b8d10e3cf98e7cce8948… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:29 2016 +0100 wined3d: Add ARB_shader_image_size extension. 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 5b56ae4..f3bb385 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -146,6 +146,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_shader_bit_encoding", ARB_SHADER_BIT_ENCODING }, {"GL_ARB_shader_image_load_store", ARB_SHADER_IMAGE_LOAD_STORE }, + {"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_shadow", ARB_SHADOW }, @@ -3632,6 +3633,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, + {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 74a6060..0d9eb67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5995,6 +5995,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE]) 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_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -8731,7 +8733,8 @@ 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_SHADER_IMAGE_LOAD_STORE]) + && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] + && gl_info->supported[ARB_SHADER_IMAGE_SIZE]) 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 d0b3102..2bafa89 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -79,6 +79,7 @@ enum wined3d_gl_extension ARB_SAMPLER_OBJECTS, ARB_SHADER_BIT_ENCODING, ARB_SHADER_IMAGE_LOAD_STORE, + ARB_SHADER_IMAGE_SIZE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, ARB_SHADOW,

1 0

Józef Kucia : wined3d: Unbind image textures in context_bind_unordered_access_views().
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 66aa910bd0395de5a0bed604e08861000ad287b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66aa910bd0395de5a0bed604e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:27 2016 +0100 wined3d: Unbind image textures in context_bind_unordered_access_views(). 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/context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 989daf2..727f074 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3409,6 +3409,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, if (!(view = state->unordered_access_view[i])) { WARN("No unordered access view bound at index %u.\n", i); + GL_EXTCALL(glBindImageTexture(i, 0, 0, GL_FALSE, 0, GL_READ_WRITE, GL_R8)); continue; }

1 0

Bruno Jesus : ws2_32/tests: Add IDN resolution tests for GetAddrInfoW.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 590c908088a408febac3ca8ff420762fbcd0fe29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=590c908088a408febac3ca8ff… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Nov 29 15:23:14 2016 -0200 ws2_32/tests: Add IDN resolution tests for GetAddrInfoW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ include/ws2tcpip.h | 2 ++ 2 files changed, 79 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 80425c9..049213a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6811,6 +6811,11 @@ static void test_GetAddrInfoW(void) ADDRINFOW *result, *result2, *p, hint; WCHAR name[256]; DWORD size = sizeof(name)/sizeof(WCHAR); + /* te su to.winehq.org written in katakana */ + static const WCHAR idn_domain[] = + {0x30C6,0x30B9,0x30C8,'.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR idn_punycode[] = + {'x','n','-','-','z','c','k','z','a','h','.','w','i','n','e','h','q','.','o','r','g',0}; if (!pGetAddrInfoW || !pFreeAddrInfoW) { @@ -6993,6 +6998,78 @@ static void test_GetAddrInfoW(void) ok(0, "test %d: GetAddrInfoW failed with %d (err %d)\n", i, ret, err); } } + + /* Test IDN resolution (Internationalized Domain Names) present since Windows 8 */ + trace("Testing punycode IDN %s\n", wine_dbgstr_w(idn_punycode)); + result = NULL; + ret = pGetAddrInfoW(idn_punycode, NULL, NULL, &result); + ok(!ret, "got %d expected success\n", ret); + ok(result != NULL, "got %p\n", result); + pFreeAddrInfoW(result); + + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = 0; + + result = NULL; + ret = pGetAddrInfoW(idn_punycode, NULL, &hint, &result); + ok(!ret, "got %d expected success\n", ret); + ok(result != NULL, "got %p\n", result); + + trace("Testing unicode IDN %s\n", wine_dbgstr_w(idn_domain)); + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, NULL, &result2); + if (ret == WSAHOST_NOT_FOUND && broken(1)) + { + pFreeAddrInfoW(result); + win_skip("IDN resolution not supported in Win <= 7\n"); + return; + } +todo_wine { + ok(!ret, "got %d expected success\n", ret); + ok(result2 != NULL, "got %p\n", result2); + pFreeAddrInfoW(result2); + + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = 0; + + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, &hint, &result2); + ok(!ret, "got %d expected success\n", ret); + ok(result2 != NULL, "got %p\n", result2); + + /* ensure manually resolved punycode and unicode hosts result in same data */ + compare_addrinfow(result, result2); + + pFreeAddrInfoW(result); + pFreeAddrInfoW(result2); + + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = 0; + + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, &hint, &result2); + ok(!ret, "got %d expected success\n", ret); + ok(result2 != NULL, "got %p\n", result2); + pFreeAddrInfoW(result2); +} + /* Disable IDN resolution and test again*/ + hint.ai_family = AF_INET; + hint.ai_socktype = 0; + hint.ai_protocol = 0; + hint.ai_flags = AI_DISABLE_IDN_ENCODING; + + SetLastError(0xdeadbeef); + result2 = NULL; + ret = pGetAddrInfoW(idn_domain, NULL, &hint, &result2); + ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); + ok(result2 == NULL, "got %p\n", result2); } static void test_getaddrinfo(void) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index ef460a8..e14a660 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -69,6 +69,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define AI_NON_AUTHORITATIVE 0x00004000 # define AI_SECURE 0x00008000 # define AI_RETURN_PREFERRED_NAMES 0x00010000 +# define AI_DISABLE_IDN_ENCODING 0x00080000 /* getaddrinfo error codes */ # define EAI_AGAIN WSATRY_AGAIN # define EAI_BADFLAGS WSAEINVAL @@ -89,6 +90,7 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_AI_NON_AUTHORITATIVE 0x00004000 # define WS_AI_SECURE 0x00008000 # define WS_AI_RETURN_PREFERRED_NAMES 0x00010000 +# define WS_AI_DISABLE_IDN_ENCODING 0x00080000 /* getaddrinfo error codes */ # define WS_EAI_AGAIN WSATRY_AGAIN # define WS_EAI_BADFLAGS WSAEINVAL

1 0

Ken Thomases : gdi32: Get the font URL directly from the descriptor on macOS 10.6 and later.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: d684831f4a6c420e76f4ba9dc5a2e6d033e555c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d684831f4a6c420e76f4ba9dc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Nov 29 11:22:32 2016 -0600 gdi32: Get the font URL directly from the descriptor on macOS 10.6 and later. It's significantly faster than the roundabout way that's necessary for 10.5, which is especially important for users with many fonts installed. Issue identified by Andrew Eikum. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 0e82e5e..a5147b5 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2933,33 +2933,40 @@ static void load_mac_fonts(void) for (i = 0; i < CFArrayGetCount(descs); i++) { CTFontDescriptorRef desc; - CTFontRef font; - ATSFontRef atsFont; - OSStatus status; - FSRef fsref; CFURLRef url; CFStringRef ext; CFStringRef path; desc = CFArrayGetValueAtIndex(descs, i); - /* CTFontDescriptor doesn't support kCTFontURLAttribute until 10.6, so +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + url = CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute); +#else + /* CTFontDescriptor doesn't support kCTFontURLAttribute prior to 10.6, so we have to go CFFontDescriptor -> CTFont -> ATSFont -> FSRef -> CFURL. */ - font = CTFontCreateWithFontDescriptor(desc, 0, NULL); - if (!font) continue; - - atsFont = CTFontGetPlatformFont(font, NULL); - if (!atsFont) { - CFRelease(font); - continue; - } + CTFontRef font; + ATSFontRef atsFont; + OSStatus status; + FSRef fsref; - status = ATSFontGetFileReference(atsFont, &fsref); - CFRelease(font); - if (status != noErr) continue; + font = CTFontCreateWithFontDescriptor(desc, 0, NULL); + if (!font) continue; - url = CFURLCreateFromFSRef(NULL, &fsref); + atsFont = CTFontGetPlatformFont(font, NULL); + if (!atsFont) + { + CFRelease(font); + continue; + } + + status = ATSFontGetFileReference(atsFont, &fsref); + CFRelease(font); + if (status != noErr) continue; + + url = CFURLCreateFromFSRef(NULL, &fsref); + } +#endif if (!url) continue; ext = CFURLCopyPathExtension(url);

1 0

Józef Kucia : wined3d: Extend resinfo instruction to support UAVs.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 752c14462e5b86d51d6f36be87f51888abdd1dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752c14462e5b86d51d6f36be8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:30 2016 +0100 wined3d: Extend resinfo instruction to support UAVs. 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, 37 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0d9eb67..ca91908 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4778,7 +4778,8 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; enum wined3d_shader_resource_type resource_type; - unsigned int resource_idx, sampler_bind_idx, i; + enum wined3d_shader_register_type reg_type; + unsigned int resource_idx, bind_idx, i; enum wined3d_data_type dst_data_type; struct glsl_src_param lod_param; char dst_swizzle[6]; @@ -4793,11 +4794,20 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], dst_data_type); shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); + reg_type = ins->src[1].reg.type; resource_idx = ins->src[1].reg.idx[0].offset; - resource_type = ins->ctx->reg_maps->resource_info[resource_idx].type; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &lod_param); - sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, - resource_idx, WINED3D_SAMPLER_DEFAULT); + if (reg_type == WINED3DSPR_RESOURCE) + { + resource_type = ins->ctx->reg_maps->resource_info[resource_idx].type; + bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, + resource_idx, WINED3D_SAMPLER_DEFAULT); + } + else + { + resource_type = ins->ctx->reg_maps->uav_resource_info[resource_idx].type; + bind_idx = resource_idx; + } if (resource_type >= ARRAY_SIZE(resource_type_info)) { @@ -4810,20 +4820,34 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) else shader_addline(ins->ctx->buffer, "vec4("); - shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", - shader_glsl_get_prefix(version->type), sampler_bind_idx, lod_param.param_str); + if (reg_type == WINED3DSPR_RESOURCE) + { + shader_addline(ins->ctx->buffer, "textureSize(%s_sampler%u, %s), ", + shader_glsl_get_prefix(version->type), bind_idx, lod_param.param_str); - for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) - shader_addline(ins->ctx->buffer, "0, "); + for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) + shader_addline(ins->ctx->buffer, "0, "); - if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) - { - shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", - shader_glsl_get_prefix(version->type), sampler_bind_idx); + if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) + { + shader_addline(ins->ctx->buffer, "textureQueryLevels(%s_sampler%u)", + shader_glsl_get_prefix(version->type), bind_idx); + } + else + { + FIXME("textureQueryLevels is not supported, returning 1 mipmap level.\n"); + shader_addline(ins->ctx->buffer, "1"); + } } else { - FIXME("textureQueryLevels is not supported, returning 1 mipmap level.\n"); + shader_addline(ins->ctx->buffer, "imageSize(%s_image%u), ", + shader_glsl_get_prefix(version->type), bind_idx); + + for (i = 0; i < 3 - resource_type_info[resource_type].resinfo_size; ++i) + shader_addline(ins->ctx->buffer, "0, "); + + /* For UAVs the returned miplevel count is always 1. */ shader_addline(ins->ctx->buffer, "1"); }

1 0

Józef Kucia : wined3d: Implement wined3d_unordered_access_view_invalidate_location() for 3D textures.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 03ceb5fa84ecbc9f76339c542271c9fbc58a3d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03ceb5fa84ecbc9f76339c542… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:28 2016 +0100 wined3d: Implement wined3d_unordered_access_view_invalidate_location() for 3D textures. 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/view.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e2b52ef..86d3ebb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -508,11 +508,10 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ DWORD location) { struct wined3d_resource *resource = view->resource; + unsigned int i, sub_resource_idx, layer_count; struct wined3d_texture *texture; - unsigned int sub_resource_idx; - unsigned int i; - if (resource->type == WINED3D_RTYPE_BUFFER || resource->type == WINED3D_RTYPE_TEXTURE_3D) + if (resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(resource->type)); return; @@ -521,7 +520,8 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ texture = texture_from_resource(resource); sub_resource_idx = view->layer_idx * texture->level_count + view->level_idx; - for (i = 0; i < view->layer_count; ++i, sub_resource_idx += texture->level_count) + layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_invalidate_location(texture, sub_resource_idx, location); }

1 0

Józef Kucia : d3d11: Fix d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews().
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 3f9fb98ab33a82cd66209dcc116aa8d4dddf8b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f9fb98ab33a82cd66209dcc1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 29 12:06:26 2016 +0100 d3d11: Fix d3d11_immediate_context_OMSetRenderTargetsAndUnorderedAccessViews(). 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/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 1765591..16230c5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -671,7 +671,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord } for (; unordered_access_view_start_slot + i < D3D11_PS_CS_UAV_REGISTER_COUNT; ++i) { - wined3d_device_set_unordered_access_view(device->wined3d_device, i, NULL); + wined3d_device_set_unordered_access_view(device->wined3d_device, + unordered_access_view_start_slot + i, NULL); } wined3d_mutex_unlock(); }

1 0

Nikolay Sivov : wbemdisp: Return interface pointers from QI, not object pointers.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: b47462d777c65d711ee00f325861bd6785522d34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47462d777c65d711ee00f325… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 14:10:51 2016 +0300 wbemdisp: Return interface pointers from QI, not object pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index a8b1568..fece94f 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -155,7 +155,7 @@ static HRESULT WINAPI object_QueryInterface( IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = object; + *ppvObject = iface; } else { @@ -399,7 +399,7 @@ static HRESULT WINAPI objectset_QueryInterface( IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = objectset; + *ppvObject = iface; } else { @@ -630,7 +630,7 @@ static HRESULT WINAPI enumvar_QueryInterface( if (IsEqualGUID( riid, &IID_IEnumVARIANT ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = enumvar; + *ppvObject = iface; } else { @@ -763,7 +763,7 @@ static HRESULT WINAPI services_QueryInterface( IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { - *ppvObject = services; + *ppvObject = iface; } else {

1 0

Nikolay Sivov : shell32: Added stub implementation of ICustomDestinationList.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

Module: wine Branch: master Commit: 6d89f58ec2935b5e8bebef34e7fbe89291ccc6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d89f58ec2935b5e8bebef34e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 09:22:54 2016 +0300 shell32: Added stub implementation of ICustomDestinationList. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellitem.c | 171 ++++++++++++++++++++++++++++++++++++++- dlls/shell32/shellole.c | 1 + 4 files changed, 179 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index f0131e7..68ce2b5 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -148,3 +148,9 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(53bd6b4e-3780-4693-afc3-7161c2f3ee9c) ] coclass MruLongList { } + +[ + helpstring("Custom Destination List"), + threading(apartment), + uuid(77f10cf0-3db5-4966-b520-b7c54fd35ed6) +] coclass DestinationList { interface ICustomDestinationList; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 8cd1318..47be9c9 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -110,6 +110,8 @@ HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMI LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; LPEXTRACTICONW IExtractIconW_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; +HRESULT WINAPI CustomDestinationList_Constructor(IUnknown *outer, REFIID riid, void **obj) DECLSPEC_HIDDEN; + /* initialisation for FORMATETC */ #define InitFormatEtc(fe, cf, med) \ {\ diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index b0af6d6..57f5fa6 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -44,17 +44,25 @@ typedef struct _ShellItem { IPersistIDList IPersistIDList_iface; } ShellItem; +typedef struct _CustomDestinationList { + ICustomDestinationList ICustomDestinationList_iface; + LONG ref; +} CustomDestinationList; + static inline ShellItem *impl_from_IShellItem2(IShellItem2 *iface) { return CONTAINING_RECORD(iface, ShellItem, IShellItem2_iface); } - static inline ShellItem *impl_from_IPersistIDList( IPersistIDList *iface ) { return CONTAINING_RECORD(iface, ShellItem, IPersistIDList_iface); } +static inline CustomDestinationList *impl_from_ICustomDestinationList( ICustomDestinationList *iface ) +{ + return CONTAINING_RECORD(iface, CustomDestinationList, ICustomDestinationList_iface); +} static HRESULT WINAPI ShellItem_QueryInterface(IShellItem2 *iface, REFIID riid, void **ppv) @@ -1322,3 +1330,164 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, *psia = NULL; return ret; } + +static HRESULT WINAPI CustomDestinationList_QueryInterface(ICustomDestinationList *iface, REFIID riid, void **obj) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(&IID_ICustomDestinationList, riid) || IsEqualIID(&IID_IUnknown, riid)) + { + *obj = &This->ICustomDestinationList_iface; + } + else { + FIXME("not implemented for %s\n", shdebugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI CustomDestinationList_AddRef(ICustomDestinationList *iface) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI CustomDestinationList_Release(ICustomDestinationList *iface) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI CustomDestinationList_SetAppID(ICustomDestinationList *iface, const WCHAR *appid) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%s): stub\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_BeginList(ICustomDestinationList *iface, UINT *min_slots, REFIID riid, void **obj) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%p %s %p): stub\n", This, min_slots, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_AppendCategory(ICustomDestinationList *iface, const WCHAR *category, IObjectArray *array) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%s %p): stub\n", This, debugstr_w(category), array); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_AppendKnownCategory(ICustomDestinationList *iface, KNOWNDESTCATEGORY category) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%d): stub\n", This, category); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_AddUserTasks(ICustomDestinationList *iface, IObjectArray *tasks) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%p): stub\n", This, tasks); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_CommitList(ICustomDestinationList *iface) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p: stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_GetRemovedDestinations(ICustomDestinationList *iface, REFIID riid, void **obj) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%s %p): stub\n", This, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_DeleteList(ICustomDestinationList *iface, const WCHAR *appid) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p (%s): stub\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI CustomDestinationList_AbortList(ICustomDestinationList *iface) +{ + CustomDestinationList *This = impl_from_ICustomDestinationList(iface); + + FIXME("%p: stub\n", This); + + return E_NOTIMPL; +} + +static const ICustomDestinationListVtbl CustomDestinationListVtbl = +{ + CustomDestinationList_QueryInterface, + CustomDestinationList_AddRef, + CustomDestinationList_Release, + CustomDestinationList_SetAppID, + CustomDestinationList_BeginList, + CustomDestinationList_AppendCategory, + CustomDestinationList_AppendKnownCategory, + CustomDestinationList_AddUserTasks, + CustomDestinationList_CommitList, + CustomDestinationList_GetRemovedDestinations, + CustomDestinationList_DeleteList, + CustomDestinationList_AbortList +}; + +HRESULT WINAPI CustomDestinationList_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + CustomDestinationList *list; + HRESULT hr; + + TRACE("%p %s %p\n", outer, debugstr_guid(riid), obj); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if(!(list = HeapAlloc(GetProcessHeap(), 0, sizeof(*list)))) + return E_OUTOFMEMORY; + + list->ICustomDestinationList_iface.lpVtbl = &CustomDestinationListVtbl; + list->ref = 1; + + hr = ICustomDestinationList_QueryInterface(&list->ICustomDestinationList_iface, riid, obj); + ICustomDestinationList_Release(&list->ICustomDestinationList_iface); + return hr; +} diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index f034951..dd54900 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -83,6 +83,7 @@ static const struct { {&CLSID_ExplorerBrowser,ExplorerBrowser_Constructor}, {&CLSID_KnownFolderManager, KnownFolderManager_Constructor}, {&CLSID_Shell, IShellDispatch_Constructor}, + {&CLSID_DestinationList, CustomDestinationList_Constructor}, {NULL, NULL} };

1 0