April 2016 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_load_sysmem().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: bf8feb8b51f07b546e92615e619943acd50c7f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8feb8b51f07b546e92615e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 26 17:56:02 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 28da2eb..a1c125a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2782,12 +2782,14 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD static void surface_load_sysmem(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { + unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_texture *texture = surface->container; struct wined3d_texture_sub_resource *sub_resource; - wined3d_surface_prepare(surface, context, dst_location); + wined3d_texture_prepare_location(texture, sub_resource_idx, context, dst_location); - sub_resource = surface_get_sub_resource(surface); + sub_resource = &texture->sub_resources[sub_resource_idx]; if (sub_resource->locations & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); @@ -2800,8 +2802,6 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* Download the surface to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - struct wined3d_texture *texture = surface->container; - wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); surface_download_data(surface, gl_info, dst_location);

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in surface_load_location().
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: fdd9a4cb929f084187bbea64eca8968a9bfd838f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd9a4cb929f084187bbea64e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 26 17:56:03 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a1c125a..c3c028c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3068,7 +3068,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co if (sub_resource->locations & WINED3D_LOCATION_DISCARDED) { TRACE("Surface previously discarded, nothing to do.\n"); - wined3d_surface_prepare(surface, context, location); + wined3d_texture_prepare_location(texture, sub_resource_idx, context, location); wined3d_texture_validate_location(texture, sub_resource_idx, location); wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); goto done;

1 0

Piotr Caban : msvcp71: Add basic_istream<char>::operator>> export.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 62d4e5e6fa0a220a037e0a1764a7a1deb4e939da URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d4e5e6fa0a220a037e0a176… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 19:57:15 2016 +0200 msvcp71: Add basic_istream<char>::operator>> export. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp71/msvcp71.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 7bf7b59..d9e42bd 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index d708825..35119fa 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -1,5 +1,5 @@ -@ stub -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z -@ stub -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z +@ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAC(a)Z(ptr ptr) basic_istream_char_read_ch +@ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAC(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win64 ??$?5DU?$char_traits(a)D@std@@@std@@YAAEAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AEAV10@AEAD(a)Z(ptr ptr) basic_istream_char_read_ch @ cdecl -arch=win32 ??$?5DU?$char_traits(a)D@std@@@std@@YAAAV?$basic_istream(a)DU?$char_traits(a)D@std@@@0(a)AAV10@AAE(a)Z(ptr ptr) basic_istream_char_read_ch

1 0

Piotr Caban : msvcr120: Add __ExceptionPtrToBool implementation.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 4f8aafbe2891d16aeb1aa7916405b5efb862d7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8aafbe2891d16aeb1aa7916… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 26 20:39:41 2016 +0200 msvcr120: Add __ExceptionPtrToBool implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 76cafd9..ddab904 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -704,8 +704,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ad9749a..7efcb20 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -686,8 +686,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) __ExceptionPtrRethrow @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) __ExceptionPtrToBool +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) __ExceptionPtrToBool @ cdecl __uncaught_exception() MSVCRT___uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) MSVCRT__invalid_parameter diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index fb3e4a3..6bfc0b7 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -682,8 +682,8 @@ @ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX(a)Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0(a)Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0(a)Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX(a)Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX(a)Z @ cdecl __uncaught_exception() msvcr120.__uncaught_exception @ stub ?_inconsistency@@YAXXZ @ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II(a)Z(wstr wstr wstr long long) msvcr120.?_invalid_parameter@@YAXPBG00II(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 17292d5..b470478 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1500,6 +1500,15 @@ void __cdecl __ExceptionPtrCurrentException(exception_ptr *ep) } #endif +/********************************************************************* + * ?__ExceptionPtrToBool@@YA_NPBX(a)Z + * ?__ExceptionPtrToBool@@YA_NPEBX(a)Z + */ +MSVCRT_bool __cdecl __ExceptionPtrToBool(exception_ptr *ep) +{ + return !!ep->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0

Nikolay Sivov : uxtheme/tests: Only link dynamically for functions that could be missing.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 1e54d38058e2c46f9caaaee83840a1dc35ed4b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e54d38058e2c46f9caaaee83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 26 21:57:23 2016 +0300 uxtheme/tests: Only link dynamically for functions that could be missing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/Makefile.in | 2 +- dlls/uxtheme/tests/system.c | 120 ++++++++++++++--------------------------- 2 files changed, 40 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e54d38058e2c46f9caaa…

1 0

Michael Stefaniuc : user32: Use wine_dbgstr_rect() to print a RECT.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 959b9d1cbb4a24daa47a3a5735030075443a0f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959b9d1cbb4a24daa47a3a573… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 26 20:58:55 2016 +0200 user32: Use wine_dbgstr_rect() to print a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 4faea6b..7b283cc 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -642,7 +642,7 @@ BOOL WINAPI AlignRects(LPRECT rect, DWORD b, DWORD c, DWORD d) { FIXME("(%p, %d, %d, %d): stub\n", rect, b, c, d); if (rect) - FIXME("rect: [[%d, %d], [%d, %d]]\n", rect->left, rect->top, rect->right, rect->bottom); + FIXME("rect: %s\n", wine_dbgstr_rect(rect)); /* Calls OffsetRect */ return FALSE; }

1 0

Hugh McMaster : reg: Support recursion when querying a registry value.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: dd5da0ae640966be2ccc2ea84a6fb1b638da0f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5da0ae640966be2ccc2ea84… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 26 12:28:24 2016 +0000 reg: Support recursion when querying a registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 57 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 26a1288..c9903ac 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -655,16 +655,19 @@ static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, return subkey_path; } -static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) +static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { LONG rc; + DWORD num_subkeys, max_subkey_len, subkey_len; DWORD max_data_bytes, data_size; - DWORD type; + DWORD type, path_len, i; BYTE *data; WCHAR fmt[] = {'%','1','\n',0}; WCHAR newlineW[] = {'\n',0}; + WCHAR *subkey_name, *subkey_path; + HKEY subkey; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, + rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, &num_subkeys, &max_subkey_len, NULL, NULL, NULL, &max_data_bytes, NULL, NULL); if (rc) { @@ -690,11 +693,43 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path) HeapFree(GetProcessHeap(), 0, data); - if (rc == ERROR_FILE_NOT_FOUND) + if (!recurse) { - output_message(STRING_CANNOT_FIND); + if (rc == ERROR_FILE_NOT_FOUND) + { + output_message(STRING_CANNOT_FIND); + return 1; + } + return 0; + } + + max_subkey_len++; + subkey_name = HeapAlloc(GetProcessHeap(), 0, max_subkey_len * sizeof(WCHAR)); + if (!subkey_name) + { + ERR("Failed to allocate memory for subkey_name\n"); return 1; } + + path_len = strlenW(path); + + for (i = 0; i < num_subkeys; i++) + { + subkey_len = max_subkey_len; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + query_value(subkey, value_name, subkey_path, recurse); + RegCloseKey(subkey); + } + HeapFree(GetProcessHeap(), 0, subkey_path); + } + } + + HeapFree(GetProcessHeap(), 0, subkey_name); return 0; } @@ -795,8 +830,6 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL { WCHAR *p; HKEY root, key; - static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', - '-',' ','%','1',' ','%','2',' ','%','3','!','d','!',' ','%','4','!','d','!','\n',0}; int ret; if (!sane_path(key_name)) @@ -825,15 +858,7 @@ static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL } if (value_name || value_empty) - { - if (recurse) - { - RegCloseKey(key); - output_string(stubW, key_name, value_name, value_empty, recurse); - return 1; - } - ret = query_value(key, value_name, key_name); - } + ret = query_value(key, value_name, key_name, recurse); else ret = query_all(key, key_name, recurse);

1 0

Nikolay Sivov : kernel32/nls: Convert most of the locale data files to UTF-8.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: d488f6b8561d01f80362ae4cd29f893b70ecd5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d488f6b8561d01f80362ae4cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 25 18:33:03 2016 +0300 kernel32/nls: Convert most of the locale data files to UTF-8. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/afk.nls | 4 +- dlls/kernel32/nls/ara.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/are.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arg.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arh.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ari.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arj.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ark.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arl.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arm.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aro.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/arq.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ars.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/art.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aru.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ary.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/aze.nls | 74 +++++++++++++------------- dlls/kernel32/nls/azl.nls | 22 ++++---- dlls/kernel32/nls/bel.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/bgr.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/brf.nls | 10 ++-- dlls/kernel32/nls/cat.nls | 14 ++--- dlls/kernel32/nls/chs.nls | 100 +++++++++++++++++------------------ dlls/kernel32/nls/cht.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/cor.nls | 8 +-- dlls/kernel32/nls/csy.nls | 80 ++++++++++++++-------------- dlls/kernel32/nls/cym.nls | 6 +-- dlls/kernel32/nls/dan.nls | 12 ++--- dlls/kernel32/nls/dea.nls | 20 +++---- dlls/kernel32/nls/dec.nls | 8 +-- dlls/kernel32/nls/del.nls | 10 ++-- dlls/kernel32/nls/des.nls | 8 +-- dlls/kernel32/nls/deu.nls | 12 ++--- dlls/kernel32/nls/ell.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/ena.nls | 4 +- dlls/kernel32/nls/enb.nls | 4 +- dlls/kernel32/nls/enc.nls | 4 +- dlls/kernel32/nls/eng.nls | 6 +-- dlls/kernel32/nls/eni.nls | 6 +-- dlls/kernel32/nls/enj.nls | 4 +- dlls/kernel32/nls/enl.nls | 4 +- dlls/kernel32/nls/enp.nls | 4 +- dlls/kernel32/nls/ens.nls | 4 +- dlls/kernel32/nls/ent.nls | 6 +-- dlls/kernel32/nls/enu.nls | 4 +- dlls/kernel32/nls/enw.nls | 4 +- dlls/kernel32/nls/enz.nls | 4 +- dlls/kernel32/nls/esa.nls | 18 +++---- dlls/kernel32/nls/esb.nls | 16 +++--- dlls/kernel32/nls/esc.nls | 18 +++---- dlls/kernel32/nls/esd.nls | 18 +++---- dlls/kernel32/nls/ese.nls | 16 +++--- dlls/kernel32/nls/esf.nls | 16 +++--- dlls/kernel32/nls/esg.nls | 16 +++--- dlls/kernel32/nls/esh.nls | 14 ++--- dlls/kernel32/nls/esi.nls | 16 +++--- dlls/kernel32/nls/esl.nls | 16 +++--- dlls/kernel32/nls/esm.nls | 20 +++---- dlls/kernel32/nls/esn.nls | 20 +++---- dlls/kernel32/nls/eso.nls | 16 +++--- dlls/kernel32/nls/esp.nls | 18 +++---- dlls/kernel32/nls/esr.nls | 18 +++---- dlls/kernel32/nls/ess.nls | 16 +++--- dlls/kernel32/nls/esu.nls | 16 +++--- dlls/kernel32/nls/esv.nls | 20 +++---- dlls/kernel32/nls/esy.nls | 16 +++--- dlls/kernel32/nls/esz.nls | 18 +++---- dlls/kernel32/nls/eti.nls | 24 ++++----- dlls/kernel32/nls/euq.nls | 6 +-- dlls/kernel32/nls/far.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/fin.nls | 18 +++---- dlls/kernel32/nls/fos.nls | 26 +++++----- dlls/kernel32/nls/fra.nls | 40 +++++++------- dlls/kernel32/nls/frb.nls | 36 ++++++------- dlls/kernel32/nls/frc.nls | 38 +++++++------- dlls/kernel32/nls/frl.nls | 40 +++++++------- dlls/kernel32/nls/frm.nls | 42 +++++++-------- dlls/kernel32/nls/frs.nls | 34 ++++++------ dlls/kernel32/nls/gae.nls | 78 ++++++++++++++-------------- dlls/kernel32/nls/gdh.nls | 40 +++++++------- dlls/kernel32/nls/gdv.nls | 6 +-- dlls/kernel32/nls/glc.nls | 20 +++---- dlls/kernel32/nls/heb.nls | 124 +++++++++++++++++++++---------------------- dlls/kernel32/nls/hrv.nls | 16 +++--- dlls/kernel32/nls/hun.nls | 46 ++++++++-------- dlls/kernel32/nls/ind.nls | 4 +- dlls/kernel32/nls/isl.nls | 56 ++++++++++---------- dlls/kernel32/nls/ita.nls | 14 ++--- dlls/kernel32/nls/its.nls | 14 ++--- dlls/kernel32/nls/ivl.nls | 2 +- dlls/kernel32/nls/jpn.nls | 72 ++++++++++++------------- dlls/kernel32/nls/kkz.nls | 58 ++++++++++----------- dlls/kernel32/nls/kor.nls | 70 ++++++++++++------------- dlls/kernel32/nls/kyr.nls | 96 +++++++++++++++++----------------- dlls/kernel32/nls/lvi.nls | 30 +++++------ dlls/kernel32/nls/mki.nls | 90 ++++++++++++++++---------------- dlls/kernel32/nls/mon.nls | 60 ++++++++++----------- dlls/kernel32/nls/msb.nls | 4 +- dlls/kernel32/nls/msl.nls | 4 +- dlls/kernel32/nls/nlb.nls | 8 +-- dlls/kernel32/nls/nld.nls | 6 +-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/non.nls | 12 ++--- dlls/kernel32/nls/nor.nls | 26 +++++----- dlls/kernel32/nls/plk.nls | 46 ++++++++-------- dlls/kernel32/nls/ptb.nls | 30 +++++------ dlls/kernel32/nls/ptg.nls | 32 ++++++------ dlls/kernel32/nls/rmc.nls | 2 +- dlls/kernel32/nls/rus.nls | 2 +- dlls/kernel32/nls/sky.nls | 66 +++++++++++------------ dlls/kernel32/nls/slv.nls | 8 +-- dlls/kernel32/nls/sqi.nls | 26 +++++----- dlls/kernel32/nls/srb.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/srl.nls | 8 +-- dlls/kernel32/nls/sve.nls | 18 +++---- dlls/kernel32/nls/svf.nls | 22 ++++---- dlls/kernel32/nls/swk.nls | 4 +- dlls/kernel32/nls/trk.nls | 38 +++++++------- dlls/kernel32/nls/ttt.nls | 72 ++++++++++++------------- dlls/kernel32/nls/ukr.nls | 130 +++++++++++++++++++++++----------------------- dlls/kernel32/nls/urd.nls | 84 +++++++++++++++--------------- dlls/kernel32/nls/uzb.nls | 94 ++++++++++++++++----------------- dlls/kernel32/nls/uzl.nls | 8 +-- dlls/kernel32/nls/wal.nls | 28 +++++----- dlls/kernel32/nls/zhh.nls | 10 ++-- dlls/kernel32/nls/zhi.nls | 88 +++++++++++++++---------------- dlls/kernel32/nls/zhm.nls | 80 ++++++++++++++-------------- 128 files changed, 2506 insertions(+), 2506 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d488f6b8561d01f80362a…

1 0

Michael Müller : wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER.
by Alexandre Julliard 27 Apr '16

27 Apr '16

Module: wine Branch: master Commit: 05a10d5fc80c36f7d2ed5ab3ef733f9539e08984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05a10d5fc80c36f7d2ed5ab3e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Apr 26 23:38:52 2016 +0200 wininet/tests: Add more tests for INTERNET_INVALID_PORT_NUMBER. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 82fd10b..66ba526 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5733,7 +5733,8 @@ static void test_connection_failure(void) static void test_default_service_port(void) { HINTERNET session, connect, request; - DWORD error; + DWORD size, error; + char buffer[128]; BOOL ret; session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -5753,6 +5754,50 @@ static void test_default_service_port(void) ok(error == ERROR_INTERNET_SECURITY_CHANNEL_ERROR || error == ERROR_INTERNET_CANNOT_CONNECT, "got %u\n", error); + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + ok(!strcmp(buffer, "test.winehq.org:80"), "Expected test.winehg.org:80, got '%s'\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + todo_wine ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "test.winehq.org"), "Expected test.winehg.org, got '%s'\n", buffer); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + + connect = InternetConnectA(session, "test.winehq.org", INTERNET_INVALID_PORT_NUMBER, NULL, NULL, + INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequestA(connect, NULL, "/", NULL, NULL, NULL, 0, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequestA(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + + size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + ret = HttpQueryInfoA(request, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); + ok(ret, "HttpQueryInfo failed with error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "test.winehq.org:443"), "Expected test.winehg.org:443, got '%s'\n", buffer); + InternetCloseHandle(request); InternetCloseHandle(connect); InternetCloseHandle(session);

1 0

Louis Lenders : dwrite: Print a FIXME only once in dwritetextanalyzer_AnalyzeNumberSubstitution.
by Alexandre Julliard 26 Apr '16

26 Apr '16

Module: wine Branch: master Commit: 938cd952ad2fbef13dce8181cdbceb897d79464c URL: http://source.winehq.org/git/wine.git/?a=commit;h=938cd952ad2fbef13dce8181c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Apr 25 16:51:36 2016 +0200 dwrite: Print a FIXME only once in dwritetextanalyzer_AnalyzeNumberSubstitution. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c7ef039..90b53ad 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -867,7 +867,10 @@ done: static HRESULT WINAPI dwritetextanalyzer_AnalyzeNumberSubstitution(IDWriteTextAnalyzer2 *iface, IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) { - FIXME("(%p %u %u %p): stub\n", source, position, length, sink); + static int once; + + if (!once++) + FIXME("(%p %u %u %p): stub\n", source, position, length, sink); return S_OK; }

1 0