November 2016 - Wine-commits

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

29 Nov '16

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 SM5 ld_uav_typed instruction.
by Alexandre Julliard 29 Nov '16

29 Nov '16

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

Nikolay Sivov : gdiplus/tests: Some tests for GdipGetPenCompoundCount().
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 919d9facea33b8d3da30bfdb62ccfecb19db0cd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919d9facea33b8d3da30bfdb6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 08:18:31 2016 +0300 gdiplus/tests: Some tests for GdipGetPenCompoundCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/pen.c | 19 +++++++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 8591a3a..2cdb44a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -344,6 +344,7 @@ static void test_compoundarray(void) GpStatus status; GpPen *pen; static const REAL testvalues[] = {0.2, 0.4, 0.6, 0.8}; + INT count; status = GdipSetPenCompoundArray(NULL, testvalues, 4); expect(InvalidParameter, status); @@ -351,6 +352,18 @@ static void test_compoundarray(void) status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen); expect(Ok, status); + status = GdipGetPenCompoundCount(NULL, NULL); + expect(InvalidParameter, status); + + status = GdipGetPenCompoundCount(pen, NULL); + expect(InvalidParameter, status); + + count = 10; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 0, "Unexpected compound count %d\n", count); +} status = GdipSetPenCompoundArray(pen, NULL, 4); expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, testvalues, 3); @@ -363,6 +376,12 @@ static void test_compoundarray(void) status = GdipSetPenCompoundArray(pen, testvalues, 4); todo_wine expect(Ok, status); + count = 0; + status = GdipGetPenCompoundCount(pen, &count); +todo_wine { + expect(Ok, status); + ok(count == 4, "Unexpected compound count %d\n", count); +} GdipDeletePen(pen); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0c40223..101d73d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -616,6 +616,7 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush*,REAL,GpUnit,GpPen**); GpStatus WINGDIPAPI GdipDeletePen(GpPen*); GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen*,GpBrush**); GpStatus WINGDIPAPI GdipGetPenColor(GpPen*,ARGB*); +GpStatus WINGDIPAPI GdipGetPenCompoundCount(GpPen*,INT*); GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen*,REAL*,INT);

1 0

Nikolay Sivov : gdiplus/tests: A couple more GdipSetPenCompoundArray() tests.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 8e8c991cd72a5a47c89fc5faa525c8fbba94cad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e8c991cd72a5a47c89fc5faa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 08:18:32 2016 +0300 gdiplus/tests: A couple more GdipSetPenCompoundArray() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/pen.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 2cdb44a..19a180b 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -364,6 +364,8 @@ todo_wine { expect(Ok, status); ok(count == 0, "Unexpected compound count %d\n", count); } + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, NULL, 4); expect(InvalidParameter, status); status = GdipSetPenCompoundArray(pen, testvalues, 3); @@ -375,6 +377,8 @@ todo_wine { status = GdipSetPenCompoundArray(pen, testvalues, 4); todo_wine expect(Ok, status); + status = GdipSetPenCompoundArray(pen, NULL, 0); + expect(InvalidParameter, status); count = 0; status = GdipGetPenCompoundCount(pen, &count);

1 0

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

29 Nov '16

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

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

29 Nov '16

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

Lauri Kenttä : shell32: Cosmetic changes to file type names.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 1c3d6ab9ccc6a572f48c63ac220c0a89dd5b450d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c3d6ab9ccc6a572f48c63ac2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Nov 29 20:23:59 2016 +0200 shell32: Cosmetic changes to file type names. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/pidl.c | 13 ++++++++----- dlls/shell32/shell32_main.c | 23 ++++++++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 1856c12..c3a753a 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2408,15 +2408,18 @@ void _ILGetFileType(LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize) { char sTemp[64]; - if(uOutSize > 0) - pOut[0] = 0; - if (_ILGetExtension (pidl, sTemp, 64)) + /* "name" or "name." or any unhandled => "File" */ + lstrcpynA (pOut, "File", uOutSize); + + /* If there's space for more, try to get a better description. */ + if (uOutSize > 6 && _ILGetExtension (pidl, sTemp, 64)) { if (!( HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE) - && HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE ))) + && HCR_MapTypeToValueA(sTemp, pOut, uOutSize, FALSE )) + && sTemp[0]) { lstrcpynA (pOut, sTemp, uOutSize - 6); - strcat (pOut, "-file"); + strcat (pOut, " file"); } } } diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index dce1896..7e1c7d5 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -537,8 +537,9 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get the type name */ if (SUCCEEDED(hr) && (flags & SHGFI_TYPENAME)) { + static const WCHAR szFolder[] = { 'F','o','l','d','e','r',0 }; static const WCHAR szFile[] = { 'F','i','l','e',0 }; - static const WCHAR szDashFile[] = { '-','f','i','l','e',0 }; + static const WCHAR szSpaceFile[] = { ' ','f','i','l','e',0 }; if (!(flags & SHGFI_USEFILEATTRIBUTES) || (flags & SHGFI_PIDL)) { @@ -550,17 +551,29 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, else { if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - strcatW (psfi->szTypeName, szFile); + strcatW (psfi->szTypeName, szFolder); else { WCHAR sTemp[64]; lstrcpyW(sTemp,PathFindExtensionW(szFullPath)); - if (!( HCR_MapTypeToValueW(sTemp, sTemp, 64, TRUE) && + if (sTemp[0] == 0 || (sTemp[0] == '.' && sTemp[1] == 0)) + { + /* "name" or "name." => "File" */ + lstrcpynW (psfi->szTypeName, szFile, 64); + } + else if (!( HCR_MapTypeToValueW(sTemp, sTemp, 64, TRUE) && HCR_MapTypeToValueW(sTemp, psfi->szTypeName, 80, FALSE ))) { - lstrcpynW (psfi->szTypeName, sTemp, 64); - strcatW (psfi->szTypeName, szDashFile); + if (sTemp[0]) + { + lstrcpynW (psfi->szTypeName, sTemp, 64); + strcatW (psfi->szTypeName, szSpaceFile); + } + else + { + lstrcpynW (psfi->szTypeName, szFile, 64); + } } } }

1 0

Nikolay Sivov : ntoskrnl: Added RtlCopyMemory() export.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 68f22743bd949db2f417a38de93de954388ac62e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f22743bd949db2f417a38de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 09:20:42 2016 +0300 ntoskrnl: Added RtlCopyMemory() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ce7c517..b379beb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -963,6 +963,7 @@ @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) ntdll.RtlConvertSidToUnicodeString @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger @ stdcall RtlCopyLuid(ptr ptr) ntdll.RtlCopyLuid +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ stub RtlCopyRangeList @ stdcall RtlCopySid(long ptr ptr) ntdll.RtlCopySid @ stdcall RtlCopyString(ptr ptr) ntdll.RtlCopyString

1 0

Hans Leidekker : msi: Fix MSIREG_OpenUserComponentsKey and MSIREG_DeleteUpgradeCodesKey for Wow64.
by Alexandre Julliard 29 Nov '16

29 Nov '16

Module: wine Branch: master Commit: 3b5b3ef185fc303b7b64dd27365b5e9992cbe730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5b3ef185fc303b7b64dd273… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 29 09:43:59 2016 +0100 msi: Fix MSIREG_OpenUserComponentsKey and MSIREG_DeleteUpgradeCodesKey for Wow64. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/registry.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 1f87cbb..cbc8d8d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -653,6 +653,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINS UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) { WCHAR squashed_cc[SQUASHED_GUID_SIZE], keypath[0x200]; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; UINT ret; if (!squash_guid( szComponent, squashed_cc)) return ERROR_FUNCTION_FAILED; @@ -667,7 +668,7 @@ UINT MSIREG_OpenUserComponentsKey(LPCWSTR szComponent, HKEY *key, BOOL create) strcpyW(keypath, szInstaller_Components); strcatW( keypath, squashed_cc ); - return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); + return RegOpenKeyExW( HKEY_LOCAL_MACHINE, keypath, 0, access, key ); } UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid, HKEY *key, BOOL create) @@ -942,14 +943,18 @@ UINT MSIREG_OpenUserUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL creat UINT MSIREG_DeleteUpgradeCodesKey( const WCHAR *code ) { - WCHAR squashed_code[SQUASHED_GUID_SIZE], keypath[0x200]; + WCHAR squashed_code[SQUASHED_GUID_SIZE]; + REGSAM access = KEY_WOW64_64KEY | KEY_ALL_ACCESS; + HKEY hkey; + LONG ret; if (!squash_guid( code, squashed_code )) return ERROR_FUNCTION_FAILED; TRACE( "%s squashed %s\n", debugstr_w(code), debugstr_w(squashed_code) ); - strcpyW( keypath, szInstaller_UpgradeCodes ); - strcatW( keypath, squashed_code ); - return RegDeleteTreeW( HKEY_LOCAL_MACHINE, keypath ); + if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, szInstaller_UpgradeCodes, 0, access, &hkey )) return ERROR_SUCCESS; + ret = RegDeleteTreeW( hkey, squashed_code ); + RegCloseKey( hkey ); + return ret; } UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode)

1 0

Nikolay Sivov : shell32: Added stub implementation of ICustomDestinationList.
by Alexandre Julliard 29 Nov '16

29 Nov '16

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