wine-commits November 2016

wine-commits@winehq.org

2 participants
465 discussions

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

30 Nov '16

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 30 Nov '16

30 Nov '16

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

Carlos Rodriguez : wined3d: Recognize Geforce GTX 1050.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 7f80fc6bba75e40c39887a6d868363289ab56b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f80fc6bba75e40c39887a6d8… Author: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Date: Tue Nov 29 15:34:54 2016 -0200 wined3d: Recognize Geforce GTX 1050. Signed-off-by: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.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/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f3bb385..773d185 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1325,6 +1325,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1803,6 +1804,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cad5bb8..ae48020 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1970,6 +1970,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, + CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80,

1 0

Huw Davies : include: Add the lineInitializeEx() option constants.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 8b0c69c81fe2c4703d6db83d71b32bd2a81bbef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b0c69c81fe2c4703d6db83d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 30 12:56:35 2016 +0000 include: Add the lineInitializeEx() option constants. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tapi.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/tapi.h b/include/tapi.h index 45ab122..52ec619 100644 --- a/include/tapi.h +++ b/include/tapi.h @@ -305,6 +305,11 @@ typedef HANDLE HPHONEAPP, *LPHPHONEAPP; #define LINECALLFEATURE_UNHOLD 0x08000000 #define LINECALLFEATURE_RELEASEUSERUSERINFO 0x10000000 +#define LINEINITIALIZEEXOPTION_USEHIDDENWINDOW 0x00000001 +#define LINEINITIALIZEEXOPTION_USEEVENT 0x00000002 +#define LINEINITIALIZEEXOPTION_USECOMPLETIONPORT 0x00000003 +#define LINEINITIALIZEEXOPTION_CALLHUBTRACKING 0x80000000 + typedef struct lineaddresscaps_tag { DWORD dwTotalSize; DWORD dwNeededSize;

1 0

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

30 Nov '16

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

Daniel Lehman : gdi32: Trace more in CreateEnhMetaFileW.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 0d9f044dcd62efdddb0c6c0af806e50b6e116e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d9f044dcd62efdddb0c6c0af… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Nov 29 11:13:37 2016 -0800 gdi32: Trace more in CreateEnhMetaFileW. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index fac100d..d241f21 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -319,7 +319,7 @@ HDC WINAPI CreateEnhMetaFileW( DWORD size = 0, length = 0; DWORD bytes_written; - TRACE("%s\n", debugstr_w(filename) ); + TRACE("(%p %s %s %s)\n", hdc, debugstr_w(filename), wine_dbgstr_rect(rect), debugstr_w(description) ); if (!(dc = alloc_dc_ptr( OBJ_ENHMETADC ))) return 0;

1 0

Nikolay Sivov : shell32: Respect SFGAO_NONENUMERATED attribute for registered shell extensions.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: 252051cb1b3f0fc4aade128370fb3e38d90244d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252051cb1b3f0fc4aade12837… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 30 02:39:38 2016 +0300 shell32: Respect SFGAO_NONENUMERATED attribute for registered shell extensions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_desktop.c | 75 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 8721a9a..e4cdeb1 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -278,15 +278,44 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, return hr; } +static void add_shell_namespace_extensions(IEnumIDListImpl *list, HKEY root) +{ + static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', + 'N','a','m','e','s','p','a','c','e','\0' }; + static const WCHAR clsidfmtW[] = {'C','L','S','I','D','\\','%','s','\\', + 'S','h','e','l','l','F','o','l','d','e','r',0}; + static const WCHAR attributesW[] = {'A','t','t','r','i','b','u','t','e','s',0}; + WCHAR guid[39], clsidkeyW[sizeof(clsidfmtW)/sizeof(*clsidfmtW) + 39]; + DWORD size, i = 0; + HKEY hkey; + + if (RegOpenKeyExW(root, Desktop_NameSpaceW, 0, KEY_READ, &hkey)) + return; + + size = sizeof(guid)/sizeof(guid[0]); + while (!RegEnumKeyExW(hkey, i++, guid, &size, 0, NULL, NULL, NULL)) + { + DWORD attributes, value_size = sizeof(attributes); + + /* Check if extension is configured as nonenumerable */ + sprintfW(clsidkeyW, clsidfmtW, guid); + RegGetValueW(HKEY_CLASSES_ROOT, clsidkeyW, attributesW, RRF_RT_REG_DWORD | RRF_ZEROONFAILURE, + NULL, &attributes, &value_size); + + if (!(attributes & SFGAO_NONENUMERATED)) + AddToEnumList(list, _ILCreateGuidFromStrW(guid)); + size = sizeof(guid)/sizeof(guid[0]); + } + + RegCloseKey(hkey); +} + /************************************************************************** * CreateDesktopEnumList() */ -static const WCHAR Desktop_NameSpaceW[] = { 'S','O','F','T','W','A','R','E', - '\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l', - 'o','r','e','r','\\','D','e','s','k','t','o','p','\\','N','a','m','e','s','p', - 'a','c','e','\0' }; - static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) { BOOL ret = TRUE; @@ -297,39 +326,9 @@ static BOOL CreateDesktopEnumList(IEnumIDListImpl *list, DWORD dwFlags) /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) { - HKEY hkey; - UINT i; - - /* create the pidl for This item */ ret = AddToEnumList(list, _ILCreateMyComputer()); - - for (i=0; i<2; i++) { - if (ret && !RegOpenKeyExW(i == 0 ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, - Desktop_NameSpaceW, 0, KEY_READ, &hkey)) - { - WCHAR iid[50]; - int i=0; - - while (ret) - { - DWORD size; - LONG r; - - size = sizeof (iid) / sizeof (iid[0]); - r = RegEnumKeyExW(hkey, i, iid, &size, 0, NULL, NULL, NULL); - if (ERROR_SUCCESS == r) - { - ret = AddToEnumList(list, _ILCreateGuidFromStrW(iid)); - i++; - } - else if (ERROR_NO_MORE_ITEMS == r) - break; - else - ret = FALSE; - } - RegCloseKey(hkey); - } - } + add_shell_namespace_extensions(list, HKEY_LOCAL_MACHINE); + add_shell_namespace_extensions(list, HKEY_CURRENT_USER); } /* enumerate the elements in %windir%\desktop */

1 0

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

30 Nov '16

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

Bruno Jesus : ws2_32: Simplify IPv4 sprintf.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: e33527b2a76ac49ed8aacd04fabc6475630124ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=e33527b2a76ac49ed8aacd04f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 04:48:27 2016 -0200 ws2_32: Simplify IPv4 sprintf. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 898c1eb..8ad30b4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4368,13 +4368,14 @@ WS_u_short WINAPI WS_ntohs(WS_u_short netshort) */ char* WINAPI WS_inet_ntoa(struct WS_in_addr in) { + unsigned int long_ip = ntohl(in.WS_s_addr); struct per_thread_data *data = get_per_thread_data(); sprintf( data->ntoa_buffer, "%u.%u.%u.%u", - (unsigned int)(ntohl( in.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( in.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( in.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( in.WS_s_addr ) & 0xff) ); + (long_ip >> 24) & 0xff, + (long_ip >> 16) & 0xff, + (long_ip >> 8) & 0xff, + long_ip & 0xff); return data->ntoa_buffer; } @@ -8289,18 +8290,20 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, switch(sockaddr->sa_family) { case WS_AF_INET: + { + unsigned int long_ip = ntohl(((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr); if (len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; sprintf( buffer, "%u.%u.%u.%u:%u", - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) & 0xff), + (long_ip >> 24) & 0xff, + (long_ip >> 16) & 0xff, + (long_ip >> 8) & 0xff, + long_ip & 0xff, ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); p = strchr( buffer, ':' ); if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; break; - + } case WS_AF_INET6: { struct WS_sockaddr_in6 *sockaddr6 = (LPSOCKADDR_IN6) sockaddr;

1 0

Bruno Jesus : ws2_32: Add IDN resolution support to GetAddrInfoW.
by Alexandre Julliard 30 Nov '16

30 Nov '16

Module: wine Branch: master Commit: fa172e1ca6d91d0ad2eb9ba442ff369bd4a7646a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa172e1ca6d91d0ad2eb9ba44… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 30 04:48:26 2016 -0200 ws2_32: Add IDN resolution support to GetAddrInfoW. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 52 +++++++++++++++++++++++++++++++++++++++--------- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8510034..898c1eb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6743,25 +6743,56 @@ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namesp */ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hints, PADDRINFOW *res) { - int ret, len; + int ret = EAI_MEMORY, len, i; char *nodenameA = NULL, *servnameA = NULL; struct WS_addrinfo *resA, *hintsA = NULL; + WCHAR *local_nodenameW = (WCHAR *)nodename; + + TRACE("nodename %s, servname %s, hints %p, result %p\n", + debugstr_w(nodename), debugstr_w(servname), hints, res); *res = NULL; if (nodename) { - len = WideCharToMultiByte(CP_ACP, 0, nodename, -1, NULL, 0, NULL, NULL); - if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) return EAI_MEMORY; - WideCharToMultiByte(CP_ACP, 0, nodename, -1, nodenameA, len, NULL, NULL); + /* Is this an IDN? Most likely if any char is above the Ascii table, this + * is the simplest validation possible, further validation will be done by + * the native getaddrinfo() */ + for (i = 0; nodename[i]; i++) + { + if (nodename[i] > 'z') + break; + } + if (nodename[i]) + { + if (hints && (hints->ai_flags & WS_AI_DISABLE_IDN_ENCODING)) + { + /* Name requires conversion but it was disabled */ + ret = WSAHOST_NOT_FOUND; + WSASetLastError(ret); + goto end; + } + + len = IdnToAscii(0, nodename, -1, NULL, 0); + if (!len) + { + ERR("Failed to convert %s to punycode\n", debugstr_w(nodename)); + ret = EAI_FAIL; + goto end; + } + if (!(local_nodenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)))) goto end; + IdnToAscii(0, nodename, -1, local_nodenameW, len); + } + } + if (local_nodenameW) + { + len = WideCharToMultiByte(CP_ACP, 0, local_nodenameW, -1, NULL, 0, NULL, NULL); + if (!(nodenameA = HeapAlloc(GetProcessHeap(), 0, len))) goto end; + WideCharToMultiByte(CP_ACP, 0, local_nodenameW, -1, nodenameA, len, NULL, NULL); } if (servname) { len = WideCharToMultiByte(CP_ACP, 0, servname, -1, NULL, 0, NULL, NULL); - if (!(servnameA = HeapAlloc(GetProcessHeap(), 0, len))) - { - HeapFree(GetProcessHeap(), 0, nodenameA); - return EAI_MEMORY; - } + if (!(servnameA = HeapAlloc(GetProcessHeap(), 0, len))) goto end; WideCharToMultiByte(CP_ACP, 0, servname, -1, servnameA, len, NULL, NULL); } @@ -6775,6 +6806,9 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename, LPCWSTR servname, const ADDRINFOW *hin WS_freeaddrinfo(resA); } +end: + if (local_nodenameW != nodename) + HeapFree(GetProcessHeap(), 0, local_nodenameW); HeapFree(GetProcessHeap(), 0, nodenameA); HeapFree(GetProcessHeap(), 0, servnameA); return ret; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 049213a..83a931e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7026,7 +7026,7 @@ static void test_GetAddrInfoW(void) 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); @@ -7057,7 +7057,7 @@ todo_wine { 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;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2016