November 2016 - Wine-Commits

Józef Kucia : wined3d: Recognize SM5 sync opcode.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: df7512c5e95a98edf145df1e22879800adaa5405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df7512c5e95a98edf145df1e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:30 2016 +0100 wined3d: Recognize SM5 sync opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 22 ++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 5 files changed, 44 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bbafe69..fe5b5c8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5364,6 +5364,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ NULL, + /* WINED3DSIH_SYNC */ NULL, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, /* WINED3DSIH_TEXBEML */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c95dc00..ee5b6c3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9027,6 +9027,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch, + /* WINED3DSIH_SYNC */ NULL, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, /* WINED3DSIH_TEXBEML */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index eadf331..e6eb351 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -205,6 +205,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SWAPC */ "swapc", /* WINED3DSIH_SWITCH */ "switch", + /* WINED3DSIH_SYNC */ "sync", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", /* WINED3DSIH_TEXBEML */ "texbeml", @@ -1439,6 +1440,23 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD shader_addline(buffer, "unknown_flags(%#x)", global_flags); } +static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) +{ + if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) + { + shader_addline(buffer, "_g"); + sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; + } + if (sync_flags & WINED3DSSF_THREAD_GROUP) + { + shader_addline(buffer, "_t"); + sync_flags &= ~WINED3DSSF_THREAD_GROUP; + } + + if (sync_flags) + shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); +} + static void shader_dump_tessellator_domain(struct wined3d_string_buffer *buffer, enum wined3d_tessellator_domain domain) { @@ -2483,6 +2501,10 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe default: shader_addline(&buffer, "_unrecognized(%#x)", ins.flags); } } + else if (ins.handler_idx == WINED3DSIH_SYNC) + { + shader_dump_sync_flags(&buffer, ins.flags); + } if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 84b22c3..2775a6e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -64,6 +64,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) +#define WINED3D_SM5_SYNC_FLAGS_SHIFT 11 +#define WINED3D_SM5_SYNC_FLAGS_MASK (0xffu << WINED3D_SM5_SYNC_FLAGS_SHIFT) + #define WINED3D_SM5_TESSELLATOR_SHIFT 11 #define WINED3D_SM5_TESSELLATOR_MASK (0xfu << WINED3D_SM5_TESSELLATOR_SHIFT) @@ -246,6 +249,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_SYNC = 0xbe, }; enum wined3d_sm4_register_type @@ -681,6 +685,13 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru ins->declaration.structured_resource.byte_stride = *tokens; } +static void shader_sm5_read_sync(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->flags = (opcode_token & WINED3D_SM5_SYNC_FLAGS_MASK) >> WINED3D_SM5_SYNC_FLAGS_SHIFT; +} + /* * f -> WINED3D_DATA_FLOAT * i -> WINED3D_DATA_INT @@ -862,6 +873,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", + shader_sm5_read_sync}, }; static const enum wined3d_shader_register_type register_type_table[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae48020..c6acdd1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -463,6 +463,12 @@ enum wined3d_shader_global_flags WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, }; +enum wined3d_shader_sync_flags +{ + WINED3DSSF_THREAD_GROUP = 0x1, + WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, +}; + enum wined3d_tessellator_domain { WINED3D_TESSELLATOR_DOMAIN_LINE = 1, @@ -719,6 +725,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SUB, WINED3DSIH_SWAPC, WINED3DSIH_SWITCH, + WINED3DSIH_SYNC, WINED3DSIH_TEX, WINED3DSIH_TEXBEM, WINED3DSIH_TEXBEML,

1 0

Józef Kucia : d3d11/tests: Add test for typed UAV loads.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 20fdcbf2a08f1637d1ee160a2049830d490b6081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20fdcbf2a08f1637d1ee160a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:29 2016 +0100 d3d11/tests: Add test for typed UAV loads. 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 | 308 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 308 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20fdcbf2a08f1637d1ee1…

1 0

Józef Kucia : wined3d: Use signed integers for addressing in ld_structured opcode.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 1036c7e7a211dce05589e905f1e1df2274094ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1036c7e7a211dce05589e905f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 30 12:47:33 2016 +0100 wined3d: Use signed integers for addressing in ld_structured opcode. 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/shader_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 30dec14..02e121c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -894,7 +894,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, - {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, + {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "iiR"}, {WINED3D_SM5_OP_STORE_STRUCTURED, WINED3DSIH_STORE_STRUCTURED, "U", "iiu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"},

1 0

Huw Davies : user32/tests: FlashWindow(Ex) sets ERROR_INVALID_WINDOW_HANDLE on updated Windows 7.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: fab7a584c144155fa76dacd042202a5fd61cad76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab7a584c144155fa76dacd04… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 30 12:46:59 2016 +0000 user32/tests: FlashWindow(Ex) sets ERROR_INVALID_WINDOW_HANDLE on updated Windows 7. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2ba5f76..428a88f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7825,14 +7825,16 @@ static void test_FlashWindow(void) SetLastError( 0xdeadbeef ); ret = pFlashWindow( NULL, TRUE ); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_WINDOW_HANDLE), "FlashWindow returned with %d\n", GetLastError() ); DestroyWindow( hwnd ); SetLastError( 0xdeadbeef ); ret = pFlashWindow( hwnd, TRUE ); - ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_WINDOW_HANDLE), "FlashWindow returned with %d\n", GetLastError() ); } @@ -7859,7 +7861,8 @@ static void test_FlashWindowEx(void) finfo.hwnd = NULL; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_WINDOW_HANDLE), "FlashWindowEx returned with %d\n", GetLastError()); finfo.hwnd = hwnd; @@ -7889,7 +7892,8 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || + GetLastError() == ERROR_INVALID_WINDOW_HANDLE), "FlashWindowEx returned with %d\n", GetLastError()); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize);

1 0

Bruno Jesus : ws2_32: Cache the memory used for poll() calls.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 2251aeb6d23b9ba56c46bc120a637098d70bf195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2251aeb6d23b9ba56c46bc120… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 04:48:28 2016 -0200 ws2_32: Cache the memory used for poll() calls. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8ad30b4..d863b3e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -586,6 +586,8 @@ struct per_thread_data struct WS_hostent *he_buffer; struct WS_servent *se_buffer; struct WS_protoent *pe_buffer; + struct pollfd *fd_cache; + unsigned int fd_count; int he_len; int se_len; int pe_len; @@ -1170,9 +1172,7 @@ static void free_per_thread_data(void) HeapFree( GetProcessHeap(), 0, ptb->he_buffer ); HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); HeapFree( GetProcessHeap(), 0, ptb->pe_buffer ); - ptb->he_buffer = NULL; - ptb->se_buffer = NULL; - ptb->pe_buffer = NULL; + HeapFree( GetProcessHeap(), 0, ptb->fd_cache ); HeapFree( GetProcessHeap(), 0, ptb ); NtCurrentTeb()->WinSockData = NULL; @@ -5109,6 +5109,7 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set { unsigned int i, j = 0, count = 0; struct pollfd *fds; + struct per_thread_data *ptb = get_per_thread_data(); if (readfds) count += readfds->fd_count; if (writefds) count += writefds->fd_count; @@ -5119,11 +5120,22 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set SetLastError(WSAEINVAL); return NULL; } - if (!(fds = HeapAlloc( GetProcessHeap(), 0, count * sizeof(fds[0])))) + + /* check if the cache can hold all descriptors, if not do the resizing */ + if (ptb->fd_count < count) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); - return NULL; + if (!(fds = HeapAlloc(GetProcessHeap(), 0, count * sizeof(fds[0])))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return NULL; + } + HeapFree(GetProcessHeap(), 0, ptb->fd_cache); + ptb->fd_cache = fds; + ptb->fd_count = count; } + else + fds = ptb->fd_cache; + if (readfds) for (i = 0; i < readfds->fd_count; i++, j++) { @@ -5198,7 +5210,6 @@ failed: if (exceptfds) for (i = 0; i < exceptfds->fd_count && j < count; i++, j++) if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); - HeapFree( GetProcessHeap(), 0, fds ); return NULL; } @@ -5331,7 +5342,6 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, if (ret == -1) SetLastError(wsaErrno()); else ret = get_poll_results( ws_readfds, ws_writefds, ws_exceptfds, pollfds ); - HeapFree( GetProcessHeap(), 0, pollfds ); return ret; }

1 0

Hans Leidekker : winhttp/tests: Properly restore proxy settings on 64-bit.
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: wine Branch: master Commit: 2b09cfe9288cbd23fe78952e605fdca924a4d19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b09cfe9288cbd23fe78952e6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 30 10:58:57 2016 +0100 winhttp/tests: Properly restore proxy settings on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 61c4acf..1b9ccc4 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1217,21 +1217,28 @@ static DWORD get_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD *type ) return ret; } -static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +static void set_proxy( REGSAM access, BYTE *buf, DWORD len, DWORD type ) { - LONG l; - HKEY key; + HKEY hkey; + if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, access, NULL, &hkey, NULL )) + { + if (len) RegSetValueExW( hkey, WinHttpSettings, 0, type, buf, len ); + else RegDeleteValueW( hkey, WinHttpSettings ); + RegCloseKey( hkey ); + } +} - l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, - KEY_WRITE, NULL, &key, NULL ); - if (!l) +static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +{ + BOOL wow64; + IsWow64Process( GetCurrentProcess(), &wow64 ); + if (sizeof(void *) > sizeof(int) || wow64) { - if (len) - RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); - else - RegDeleteValueW( key, WinHttpSettings ); - RegCloseKey( key ); + set_proxy( KEY_WRITE|KEY_WOW64_64KEY, buf, len, type ); + set_proxy( KEY_WRITE|KEY_WOW64_32KEY, buf, len, type ); } + else + set_proxy( KEY_WRITE, buf, len, type ); } static void test_set_default_proxy_config(void)

1 0

Francois Gouget : testbot/TestAgent: Fix SIGALRM handling in _SetError().
by Alexandre Julliard Nov. 30, 2016

Nov. 30, 2016

Module: tools Branch: master Commit: 908ce0ec07f18791d7568d062a6394baeea0368b URL: http://source.winehq.org/git/tools.git/?a=commit;h=908ce0ec07f18791d7568d06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 30 09:01:03 2016 +0100 testbot/TestAgent: Fix SIGALRM handling in _SetError(). SIGALRM must always be caught otherwise the script dies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index da10672..b0e59d1 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -214,6 +214,7 @@ sub _SetError($$$) my $ncerr; eval { + local $SIG{ALRM} = sub { die "timeout" }; alarm(2); $self->{fd}->read($ncerr, 1024, 1); alarm(0);

1 0

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

Nov. 29, 2016

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 : gdiplus/tests: A couple more GdipSetPenCompoundArray() tests.
by Alexandre Julliard Nov. 29, 2016

Nov. 29, 2016

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

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

Nov. 29, 2016

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