August 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Unify resource preloads.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 53165034ba148e3c0bcef6efa08993d1a81b4a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53165034ba148e3c0bcef6efa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 10 18:44:48 2016 +0200 wined3d: Unify resource preloads. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/texture.c | 6 +++--- dlls/d3d9/buffer.c | 4 ++-- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 6 +++--- dlls/ddraw/device.c | 2 +- dlls/wined3d/buffer.c | 20 +++++++++++--------- dlls/wined3d/resource.c | 5 +++++ dlls/wined3d/texture.c | 19 +++++++++++-------- dlls/wined3d/wined3d.spec | 3 +-- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 3 +-- 12 files changed, 42 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53165034ba148e3c0bcef…

1 0

Henri Verbeet : wined3d: Use wined3d_cs_emit_unload_resource() in wined3d_texture_update_desc().
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 565cd2b84c0b5b483b6f1dfad7bb97b76d555e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=565cd2b84c0b5b483b6f1dfad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 10 18:44:45 2016 +0200 wined3d: Use wined3d_cs_emit_unload_resource() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2dbb7f3..4e75064 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1135,7 +1135,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } if (device->d3d_initialized) - texture->resource.resource_ops->resource_unload(&texture->resource); + wined3d_cs_emit_unload_resource(device->cs, &texture->resource); sub_resource = &texture->sub_resources[0]; surface = sub_resource->u.surface;

1 0

Henri Verbeet : wined3d: Use wined3d_cs_emit_unload_resource() in delete_opengl_contexts().
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 0bdb6ffe60e27d3497212073a05e8bf9245e8ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bdb6ffe60e27d3497212073a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 10 18:44:44 2016 +0200 wined3d: Use wined3d_cs_emit_unload_resource() in delete_opengl_contexts(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2215af8..406dca9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4556,13 +4556,10 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d struct wined3d_context *context; struct wined3d_shader *shader; - context = context_acquire(device, NULL); - gl_info = context->gl_info; - LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { TRACE("Unloading resource %p.\n", resource); - resource->resource_ops->resource_unload(resource); + wined3d_cs_emit_unload_resource(device->cs, resource); } LIST_FOR_EACH_ENTRY(shader, &device->shaders, struct wined3d_shader, shader_list_entry) @@ -4570,6 +4567,9 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d device->shader_backend->shader_destroy(shader); } + context = context_acquire(device, NULL); + gl_info = context->gl_info; + if (device->depth_blt_texture) { gl_info->gl_ops.gl.p_glDeleteTextures(1, &device->depth_blt_texture);

1 0

Nikolay Sivov : t2embed: Fix embedding type resolution order.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 8be1357bd50cd230786df16df75ea0888d57ced7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8be1357bd50cd230786df16df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 00:19:21 2016 +0300 t2embed: Fix embedding type resolution order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 15 ++++++++---- dlls/t2embed/tests/Makefile.in | 2 +- dlls/t2embed/tests/t2embed.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 9fae0a8..48e20f5 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -33,7 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(t2embed); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - switch (fdwReason) { case DLL_WINE_PREATTACH: @@ -89,14 +88,20 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (!status) return E_PERMISSIONSINVALID; + otm.otmfsType &= 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; - else if (otm.otmfsType & LICENSE_NOEMBEDDING) - *status = EMBED_NOEMBEDDING; - else if (otm.otmfsType & LICENSE_PREVIEWPRINT) - *status = EMBED_PREVIEWPRINT; else if (otm.otmfsType & LICENSE_EDITABLE) *status = EMBED_EDITABLE; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else + { + WARN("unrecognized flags, %#x\n", otm.otmfsType); + *status = EMBED_INSTALLABLE; + } return E_NONE; } diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in index f7a5809..c4f49a3 100644 --- a/dlls/t2embed/tests/Makefile.in +++ b/dlls/t2embed/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = t2embed.dll -IMPORTS = gdi32 t2embed +IMPORTS = user32 gdi32 t2embed C_SRCS = \ t2embed.c diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c index 79102a6..9f278a5 100644 --- a/dlls/t2embed/tests/t2embed.c +++ b/dlls/t2embed/tests/t2embed.c @@ -19,10 +19,59 @@ #include <stdarg.h> #include "windef.h" +#include "winbase.h" #include "wingdi.h" +#include "winuser.h" #include "t2embapi.h" #include "wine/test.h" +static int CALLBACK enum_font_proc(ENUMLOGFONTEXA *enumlf, NEWTEXTMETRICEXA *ntm, DWORD type, LPARAM lParam) +{ + OUTLINETEXTMETRICA otm; + HDC hdc = GetDC(NULL); + HFONT hfont, old_font; + ULONG status; + LONG ret; + + hfont = CreateFontIndirectA(&enumlf->elfLogFont); + old_font = SelectObject(hdc, hfont); + + otm.otmSize = sizeof(otm); + if (GetOutlineTextMetricsA(hdc, otm.otmSize, &otm)) + { + ULONG expected = 0xffff; + UINT fsType = otm.otmfsType & 0xf; + + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NONE, "got %d\n", ret); + + if (fsType == LICENSE_INSTALLABLE) + expected = EMBED_INSTALLABLE; + else if (fsType & LICENSE_EDITABLE) + expected = EMBED_EDITABLE; + else if (fsType & LICENSE_PREVIEWPRINT) + expected = EMBED_PREVIEWPRINT; + else if (fsType & LICENSE_NOEMBEDDING) + expected = EMBED_NOEMBEDDING; + + ok(expected == status, "%s: status %d, expected %d, fsType %#x\n", enumlf->elfLogFont.lfFaceName, status, + expected, otm.otmfsType); + } + else + { + status = 0xdeadbeef; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NOTATRUETYPEFONT, "%s: got %d\n", enumlf->elfLogFont.lfFaceName, ret); + ok(status == 0xdeadbeef, "%s: got status %d\n", enumlf->elfLogFont.lfFaceName, status); + } + + SelectObject(hdc, old_font); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); + + return 1; +} + static void test_TTGetEmbeddingType(void) { HFONT hfont, old_font; @@ -73,6 +122,12 @@ static void test_TTGetEmbeddingType(void) SelectObject(hdc, old_font); DeleteObject(hfont); + + /* repeat for all system fonts */ + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfFaceName[0] = 0; + EnumFontFamiliesExA(hdc, &logfont, (FONTENUMPROCA)enum_font_proc, 0, 0); + DeleteDC(hdc); }

1 0

Henri Verbeet : wined3d: Synchronise texture LOD updates with the command stream.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 850d38efb4e4dfb15db42b553539ff3d1d361460 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850d38efb4e4dfb15db42b553… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 10 18:44:47 2016 +0200 wined3d: Synchronise texture LOD updates with the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4e75064..c3ecb66 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1015,6 +1015,7 @@ DWORD CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, DWORD lod) if (texture->lod != lod) { + wined3d_resource_wait_idle(&texture->resource); texture->lod = lod; texture->texture_rgb.base_level = ~0u;

1 0

Piotr Caban : msvcrt: Add wcsftime_l.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: e38cbd82bdbba0d25f542138c9d1d62c1fde15cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38cbd82bdbba0d25f542138c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 17:18:16 2016 +0200 msvcrt: Add wcsftime_l. Based on Daniel Lehman's patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/time.c | 25 +++++++++++++++------- dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index fc39007..5da3851 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -54,7 +54,7 @@ @ cdecl _utime64(str ptr) ucrtbase._utime64 @ cdecl _wasctime(ptr) ucrtbase._wasctime @ cdecl _wasctime_s(ptr long ptr) ucrtbase._wasctime_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) ucrtbase._wcsftime_l @ cdecl _wctime32(ptr) ucrtbase._wctime32 @ cdecl _wctime32_s(ptr long ptr) ucrtbase._wctime32_s @ cdecl _wctime64(ptr) ucrtbase._wctime64 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3cfac96..7e80adc 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1491,7 +1491,7 @@ @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2eb5064..5f33acf 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1849,7 +1849,7 @@ @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5ba624a..0ac1de8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1867,7 +1867,7 @@ @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index ffcfcbd..99e1fa9 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1560,7 +1560,7 @@ @ cdecl _wcsdup(wstr) msvcr120._wcsdup @ cdecl _wcserror(long) msvcr120._wcserror @ cdecl _wcserror_s(ptr long long) msvcr120._wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) msvcr120._wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcr120._wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) msvcr120._wcsicmp_l @ cdecl _wcsicoll(wstr wstr) msvcr120._wcsicoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 069bc9f..aae7fc1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1170,7 +1170,7 @@ @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b30cd4d..d9fe6bb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1146,7 +1146,7 @@ @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e744ef0..c96d0dc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1051,7 +1051,9 @@ int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); int __cdecl MSVCRT_mbtowc(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t); +MSVCRT_size_t __cdecl MSVCRT__mbstowcs_l(MSVCRT_wchar_t*, const char*, MSVCRT_size_t, MSVCRT__locale_t); MSVCRT_size_t __cdecl MSVCRT_wcstombs(char*,const MSVCRT_wchar_t*,MSVCRT_size_t); +MSVCRT_size_t __cdecl MSVCRT__wcstombs_l(char*, const MSVCRT_wchar_t*, MSVCRT_size_t, MSVCRT__locale_t); MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t __cdecl MSVCRT__wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 274d2e7..2998376 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1101,7 +1101,7 @@ # stub _wcsdup_dbg(wstr long str long) @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -# stub _wcsftime_l(ptr long wstr ptr ptr) +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 004dffb..b0f5285 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1264,24 +1264,24 @@ MSVCRT_size_t CDECL MSVCRT_strftime( char *str, MSVCRT_size_t max, const char *f } /********************************************************************* - * wcsftime (MSVCRT.@) + * _wcsftime_l (MSVCRT.@) */ -MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, - const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) +MSVCRT_size_t CDECL MSVCRT__wcsftime_l( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) { char *s, *fmt; MSVCRT_size_t len; - TRACE("%p %ld %s %p\n", str, max, debugstr_w(format), mstm ); + TRACE("%p %ld %s %p %p\n", str, max, debugstr_w(format), mstm, loc); - len = MSVCRT_wcstombs( NULL, format, 0 ) + 1; + len = MSVCRT__wcstombs_l( NULL, format, 0, loc ) + 1; if (!(fmt = MSVCRT_malloc( len ))) return 0; - MSVCRT_wcstombs(fmt, format, len); + MSVCRT__wcstombs_l(fmt, format, len, loc); if ((s = MSVCRT_malloc( max*4 ))) { - if (!MSVCRT_strftime( s, max*4, fmt, mstm )) s[0] = 0; - len = MSVCRT_mbstowcs( str, s, max ); + if (!MSVCRT__strftime_l( s, max*4, fmt, mstm, loc )) s[0] = 0; + len = MSVCRT__mbstowcs_l( str, s, max, loc ); MSVCRT_free( s ); } else len = 0; @@ -1290,6 +1290,15 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, return len; } +/********************************************************************* + * wcsftime (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, + const MSVCRT_wchar_t *format, const struct MSVCRT_tm *mstm ) +{ + return MSVCRT__wcsftime_l(str, max, format, mstm, NULL); +} + static char* asctime_buf(char *buf, const struct MSVCRT_tm *mstm) { static const char wday[7][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index a0260d3..7582ba9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2016,7 +2016,7 @@ @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -@ stub _wcsftime_l +@ cdecl _wcsftime_l(ptr long wstr ptr ptr) MSVCRT__wcsftime_l @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll

1 0

Piotr Caban : msvcrt: Add _strftime_l.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 1505684a85b3f4819d9e7711e526fd8fb2431beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1505684a85b3f4819d9e7711e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 17:18:09 2016 +0200 msvcrt: Add _strftime_l. Based on Daniel Lehman's patch. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-time-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/time.c | 31 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 9 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec index 2939b95..fc39007 100644 --- a/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec +++ b/dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec @@ -42,7 +42,7 @@ @ cdecl _setsystime(ptr long) ucrtbase._setsystime @ cdecl _strdate(ptr) ucrtbase._strdate @ cdecl _strdate_s(ptr long) ucrtbase._strdate_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) ucrtbase._strftime_l @ cdecl _strtime(ptr) ucrtbase._strtime @ cdecl _strtime_s(ptr long) ucrtbase._strtime_s @ cdecl _time32(ptr) ucrtbase._time32 diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index fa09827..3cfac96 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1340,7 +1340,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index e0ab69a..2eb5064 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1697,7 +1697,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a2e7832..5ba624a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1708,7 +1708,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 94c0e08..ffcfcbd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1419,7 +1419,7 @@ @ cdecl _strdup(str) msvcr120._strdup @ cdecl _strerror(long) msvcr120._strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) msvcr120._strftime_l @ cdecl _stricmp(str str) msvcr120._stricmp @ cdecl _stricmp_l(str str ptr) msvcr120._stricmp_l @ cdecl _stricoll(str str) msvcr120._stricoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c0edc8f..069bc9f 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1020,7 +1020,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf5ab57..b30cd4d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -995,7 +995,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index ed88e3c..004dffb 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1055,11 +1055,8 @@ static inline BOOL strftime_int(char *str, MSVCRT_size_t *pos, MSVCRT_size_t max return TRUE; } -/********************************************************************* - * _Strftime (MSVCRT.@) - */ -MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, - const struct MSVCRT_tm *mstm, MSVCRT___lc_time_data *time_data) +static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *format, + const struct MSVCRT_tm *mstm, MSVCRT___lc_time_data *time_data, MSVCRT__locale_t loc) { MSVCRT_size_t ret, tmp; BOOL alternate; @@ -1074,11 +1071,11 @@ MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, } if(!time_data) - time_data = get_locinfo()->lc_time_curr; + time_data = loc ? loc->locinfo->lc_time_curr : get_locinfo()->lc_time_curr; for(ret=0; *format && ret<max; format++) { if(*format != '%') { - if(MSVCRT_isleadbyte((unsigned char)*format)) { + if(MSVCRT__isleadbyte_l((unsigned char)*format, loc)) { str[ret++] = *(format++); if(ret == max) continue; if(!str[ret]) goto einval_error; @@ -1239,13 +1236,31 @@ einval_error: return 0; } +/******************************************************************** + * _strftime_l (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__strftime_l( char *str, MSVCRT_size_t max, const char *format, + const struct MSVCRT_tm *mstm, MSVCRT__locale_t loc ) +{ + return strftime_helper(str, max, format, mstm, NULL, loc); +} + +/********************************************************************* + * _Strftime (MSVCRT.@) + */ +MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, + const struct MSVCRT_tm *mstm, MSVCRT___lc_time_data *time_data) +{ + return strftime_helper(str, max, format, mstm, time_data, NULL); +} + /********************************************************************* * strftime (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strftime( char *str, MSVCRT_size_t max, const char *format, const struct MSVCRT_tm *mstm ) { - return _Strftime(str, max, format, mstm, NULL); + return strftime_helper(str, max, format, mstm, NULL, NULL); } /********************************************************************* diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bb549d1..a0260d3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1926,7 +1926,7 @@ @ cdecl _strdup(str) MSVCRT__strdup @ cdecl _strerror(long) MSVCRT__strerror @ stub _strerror_s -@ stub _strftime_l +@ cdecl _strftime_l(str long str ptr ptr) MSVCRT__strftime_l @ cdecl _stricmp(str str) MSVCRT__stricmp @ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l @ cdecl _stricoll(str str) MSVCRT__stricoll

1 0

Piotr Caban : msvcrt: Add support for multibyte characters in _Strftime.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: d6948bf356a99f96305298d19d76c98010b380f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6948bf356a99f96305298d19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 17:18:05 2016 +0200 msvcrt: Add support for multibyte characters in _Strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 10 ++++++++++ dlls/msvcrt/time.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index e26648d..6865e3d 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -746,6 +746,16 @@ static void test_strftime(void) ok(retA == 17, "expected 17, got %ld\n", retA); ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); } + + if(!setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("Japanese_Japan.932 locale not available\n"); + return; + } + + /* test with multibyte character */ + retA = strftime(bufA, 256, "\x82%c", gmt_tm); + ok(retA == 3, "expected 3, got %ld\n", retA); + ok(!strcmp(bufA, "\x82%c"), "got %s\n", bufA); } static void test_asctime(void) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index e6e3eee..ed88e3c 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1078,6 +1078,11 @@ MSVCRT_size_t CDECL _Strftime(char *str, MSVCRT_size_t max, const char *format, for(ret=0; *format && ret<max; format++) { if(*format != '%') { + if(MSVCRT_isleadbyte((unsigned char)*format)) { + str[ret++] = *(format++); + if(ret == max) continue; + if(!str[ret]) goto einval_error; + } str[ret++] = *format; continue; }

1 0

Piotr Caban : msvcrt: Fix parameters conversion in wcsftime function.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 7dfb21a9db18555666b24e5b1ad9324581c75af6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfb21a9db18555666b24e5b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 10 17:18:02 2016 +0200 msvcrt: Fix parameters conversion in wcsftime function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 50a27ec..e6e3eee 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1254,15 +1254,14 @@ MSVCRT_size_t CDECL MSVCRT_wcsftime( MSVCRT_wchar_t *str, MSVCRT_size_t max, TRACE("%p %ld %s %p\n", str, max, debugstr_w(format), mstm ); - len = WideCharToMultiByte( CP_UNIXCP, 0, format, -1, NULL, 0, NULL, NULL ); + len = MSVCRT_wcstombs( NULL, format, 0 ) + 1; if (!(fmt = MSVCRT_malloc( len ))) return 0; - WideCharToMultiByte( CP_UNIXCP, 0, format, -1, fmt, len, NULL, NULL ); + MSVCRT_wcstombs(fmt, format, len); if ((s = MSVCRT_malloc( max*4 ))) { if (!MSVCRT_strftime( s, max*4, fmt, mstm )) s[0] = 0; - len = MultiByteToWideChar( CP_UNIXCP, 0, s, -1, str, max ); - if (len) len--; + len = MSVCRT_mbstowcs( str, s, max ); MSVCRT_free( s ); } else len = 0;

1 0

Iván Matellanes : include/msvcrt: Ensure integer limits are given the correct type.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 4f71f42910e705ba4d5a59d58bb33f8bdc8ffce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f71f42910e705ba4d5a59d58… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 10 15:56:06 2016 +0100 include/msvcrt: Ensure integer limits are given the correct type. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/limits.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index ece8c68..1eb1561 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -22,11 +22,11 @@ #define SHRT_MAX 0x7fff #define USHRT_MAX 0xffff -#define INT_MIN (-0x80000000) +#define INT_MIN (-0x7fffffff - 1) #define INT_MAX 0x7fffffff -#define UINT_MAX 0xffffffff +#define UINT_MAX 0xffffffffU -#define LONG_MIN (-0x80000000L) +#define LONG_MIN (-0x7fffffffL - 1L) #define LONG_MAX 0x7fffffffL #define ULONG_MAX 0xffffffffUL

1 0