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

Piotr Caban : msvcp110: Add _Last_write_time(wchar_t) implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: efb6b3734aac964c7d83a683eb503d9da5be1cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb6b3734aac964c7d83a683… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:43:27 2018 +0200 msvcp110: Add _Last_write_time(wchar_t) implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 8 ++-- dlls/msvcp120/msvcp120.spec | 8 ++-- dlls/msvcp120_app/msvcp120_app.spec | 8 ++-- dlls/msvcp90/ios.c | 78 ++++++++++++++++++++++++++++++------- 4 files changed, 75 insertions(+), 27 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index fbffd14..58680d0 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1561,12 +1561,12 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z(str int64) tr2_sys__Last_write_time_set @ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z(str int64) tr2_sys__Last_write_time_set -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z +@ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar +@ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar @ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z(str) tr2_sys__Last_write_time @ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z(str) tr2_sys__Last_write_time -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z +@ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar +@ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar @ cdecl -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ thiscall -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 3dda358..934daf7 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1522,12 +1522,12 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) num_put_wchar__Iput @ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z(str int64) tr2_sys__Last_write_time_set @ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z(str int64) tr2_sys__Last_write_time_set -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z +@ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar +@ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z(wstr int64) tr2_sys__Last_write_time_set_wchar @ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z(str) tr2_sys__Last_write_time @ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z(str) tr2_sys__Last_write_time -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z +@ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar +@ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z(wstr) tr2_sys__Last_write_time_wchar @ cdecl -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ thiscall -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 1db54a7..b2edb0f 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1522,12 +1522,12 @@ @ cdecl -arch=win64 ?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z(ptr ptr ptr ptr long ptr long) msvcp120.?_Iput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEAD_K(a)Z @ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z(str int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z @ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z(str int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z +@ cdecl -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z(wstr int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z +@ cdecl -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z(wstr int64) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z @ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z(str) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z @ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z(str) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z -@ stub -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z -@ stub -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z +@ cdecl -ret64 -arch=win32 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z(wstr) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z +@ cdecl -ret64 -arch=win64 ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z(wstr) msvcp120.?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z @ cdecl -arch=arm ?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QAAXPAU_Thrd_imp_t@@@Z @ thiscall -arch=i386 ?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QAEXPAU_Thrd_imp_t@@@Z @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) msvcp120.?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e71d30f..64e0f2b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14845,14 +14845,26 @@ enum file_type __cdecl tr2_sys__Lstat(char const* path, int* err_code) return tr2_sys__Stat(path, err_code); } +static __int64 get_last_write_time(HANDLE h) +{ + FILETIME wt; + __int64 ret; + + if(!GetFileTime(h, 0, 0, &wt)) + return 0; + + ret = (((__int64)wt.dwHighDateTime)<< 32) + wt.dwLowDateTime; + ret -= TICKS_1601_TO_1970; + return ret; +} + /* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z */ /* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z */ __int64 __cdecl tr2_sys__Last_write_time(char const* path) { HANDLE handle; - FILETIME lwt; - int ret; - __int64 last_write_time; + __int64 ret; + TRACE("(%s)\n", debugstr_a(path)); handle = CreateFileA(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -14860,15 +14872,38 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) if(handle == INVALID_HANDLE_VALUE) return 0; - ret = GetFileTime(handle, 0, 0, &lwt); + ret = get_last_write_time(handle); CloseHandle(handle); - if(!ret) + return ret / TICKSPERSEC; +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPB_W(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YA_JPEB_W(a)Z */ +__int64 __cdecl tr2_sys__Last_write_time_wchar(const wchar_t *path) +{ + HANDLE handle; + __int64 ret; + + TRACE("(%s)\n", debugstr_w(path)); + + handle = CreateFileW(path, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + if(handle == INVALID_HANDLE_VALUE) return 0; - last_write_time = (((__int64)lwt.dwHighDateTime)<< 32) + lwt.dwLowDateTime; - last_write_time -= TICKS_1601_TO_1970; - last_write_time /= TICKSPERSEC; - return last_write_time; + ret = get_last_write_time(handle); + CloseHandle(handle); + return ret / TICKSPERSEC; +} + +static int set_last_write_time(HANDLE h, __int64 time) +{ + FILETIME wt; + + time += TICKS_1601_TO_1970; + wt.dwLowDateTime = (DWORD)time; + wt.dwHighDateTime = (DWORD)(time >> 32); + return SetFileTime(h, 0, 0, &wt); } /* ?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z */ @@ -14876,7 +14911,7 @@ __int64 __cdecl tr2_sys__Last_write_time(char const* path) void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) { HANDLE handle; - FILETIME lwt; + TRACE("(%s)\n", debugstr_a(path)); handle = CreateFileA(path, FILE_WRITE_ATTRIBUTES, @@ -14889,12 +14924,25 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) * According to the test of msvcp120, * msvcp120's implementation does nothing. Obviously, this is a bug of windows. */ + set_last_write_time(handle, newtime * TICKSPERSEC); + CloseHandle(handle); +} + +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPB_W_J(a)Z */ +/* ?_Last_write_time(a)sys@tr2(a)std@@YAXPEB_W_J(a)Z */ +void __cdecl tr2_sys__Last_write_time_set_wchar(const wchar_t *path, __int64 time) +{ + HANDLE handle; + + TRACE("(%s)\n", debugstr_w(path)); + + handle = CreateFileW(path, FILE_WRITE_ATTRIBUTES, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); + if(handle == INVALID_HANDLE_VALUE) + return; - newtime *= TICKSPERSEC; - newtime += TICKS_1601_TO_1970; - lwt.dwLowDateTime = (DWORD)(newtime); - lwt.dwHighDateTime = (DWORD)(newtime >> 32); - SetFileTime(handle, 0, 0, &lwt); + set_last_write_time(handle, time * TICKSPERSEC); CloseHandle(handle); }

1 0

Henri Verbeet : wined3d: Get rid of the "reg_name" field in struct glsl_src_param.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: c90ce7b9a3cdb6f7207d65ba1348f1f627da413c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c90ce7b9a3cdb6f7207d65ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 15 14:44:23 2018 +0430 wined3d: Get rid of the "reg_name" field in struct glsl_src_param. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8bb82c8..7bc465b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -93,7 +93,6 @@ struct glsl_dst_param struct glsl_src_param { - char reg_name[150]; char param_str[200]; }; @@ -3394,16 +3393,17 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c enum wined3d_data_type data_type) { struct shader_glsl_ctx_priv *priv = ctx->backend_data; - struct wined3d_string_buffer *reg_name = string_buffer_get(priv->string_buffers); + struct wined3d_string_buffer *param_str = string_buffer_get(priv->string_buffers); enum wined3d_data_type param_data_type; BOOL is_color = FALSE; char swizzle_str[6]; + char reg_name[150]; - glsl_src->reg_name[0] = '\0'; + reg_name[0] = '\0'; glsl_src->param_str[0] = '\0'; swizzle_str[0] = '\0'; - shader_glsl_get_register_name(&wined3d_src->reg, data_type, glsl_src->reg_name, &is_color, ctx); + shader_glsl_get_register_name(&wined3d_src->reg, data_type, reg_name, &is_color, ctx); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); switch (wined3d_src->reg.type) @@ -3427,10 +3427,10 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_context *c break; } - shader_glsl_sprintf_cast(reg_name, glsl_src->reg_name, data_type, param_data_type); - shader_glsl_gen_modifier(wined3d_src->modifiers, reg_name->buffer, swizzle_str, glsl_src->param_str); + shader_glsl_sprintf_cast(param_str, reg_name, data_type, param_data_type); + shader_glsl_gen_modifier(wined3d_src->modifiers, param_str->buffer, swizzle_str, glsl_src->param_str); - string_buffer_release(priv->string_buffers, reg_name); + string_buffer_release(priv->string_buffers, param_str); } static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, @@ -4998,12 +4998,12 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_lconst *constant; - struct glsl_src_param src1_param; const DWORD *control_values = NULL; + char reg_name[150]; if (ins->ctx->reg_maps->shader_version.major < 4) { - shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &src1_param); + shader_glsl_get_register_name(&ins->src[1].reg, ins->src[1].reg.data_type, reg_name, NULL, ins->ctx); /* Try to hardcode the loop control parameters if possible. Direct3D 9 * class hardware doesn't support real varying indexing, but Microsoft @@ -5054,9 +5054,9 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) else { shader_addline(buffer, "for (tmpInt%u = 0, aL%u = %s.y; tmpInt%u < %s.x; tmpInt%u++, aL%u += %s.z)\n{\n", - state->current_loop_depth, state->current_loop_reg, - src1_param.reg_name, state->current_loop_depth, src1_param.reg_name, - state->current_loop_depth, state->current_loop_reg, src1_param.reg_name); + state->current_loop_depth, state->current_loop_reg, reg_name, + state->current_loop_depth, reg_name, + state->current_loop_depth, state->current_loop_reg, reg_name); } ++state->current_loop_reg; @@ -6744,13 +6744,13 @@ static void shader_glsl_texreg2ar(const struct wined3d_shader_instruction *ins) { DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - struct glsl_src_param src0_param; + char reg_name[150]; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.wx", src0_param.reg_name); + "%s.wx", reg_name); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -6760,13 +6760,13 @@ static void shader_glsl_texreg2gb(const struct wined3d_shader_instruction *ins) { DWORD sampler_idx = ins->dst[0].reg.idx[0].offset; struct glsl_sample_function sample_function; - struct glsl_src_param src0_param; + char reg_name[150]; - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_ALL, &src0_param); + shader_glsl_get_register_name(&ins->src[0].reg, ins->src[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, 0, &sample_function); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, NULL, - "%s.yz", src0_param.reg_name); + "%s.yz", reg_name); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Stefan Dösinger : msvcp140/tests: Test _Last_write_time and _Set_last_write_time.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 5a4112c73a51c49bcf24ede9556b3af982d5b186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a4112c73a51c49bcf24ede9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 15 12:43:41 2018 +0200 msvcp140/tests: Test _Last_write_time and _Set_last_write_time. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/tests/msvcp110.c | 35 ++++++++++++-- dlls/msvcp120/tests/msvcp120.c | 9 ++++ dlls/msvcp140/tests/msvcp140.c | 101 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a4112c73a51c49bcf24…

1 0

Piotr Caban : msvcp90: Add time_get<char>::_Getint implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: e547d87afa05b4224be412bdeb40339c3518b5db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e547d87afa05b4224be412bd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:48:56 2018 +0200 msvcp90: Add time_get<char>::_Getint implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +- dlls/msvcp120/msvcp120.spec | 4 +- dlls/msvcp120_app/msvcp120_app.spec | 4 +- dlls/msvcp90/locale.c | 57 +++++++++++++++-- dlls/msvcp90/msvcp90.spec | 12 ++-- dlls/msvcp90/tests/ios.c | 123 ++++++++++++++++++++++++++++++++++++ 6 files changed, 188 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e547d87afa05b4224be4…

1 0

Henri Verbeet : wined3d: Make the "is_color" parameter to shader_glsl_get_register_name() optional.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: dd282d3e8c92d5b10d6e2e44e4adab468e2b111d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd282d3e8c92d5b10d6e2e44… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 15 14:44:22 2018 +0430 wined3d: Make the "is_color" parameter to shader_glsl_get_register_name() optional. Not all callers care. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8aa3f2d..8bb82c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2859,7 +2859,7 @@ static void shader_glsl_fixup_scalar_register_variable(char *register_name, /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(const struct wined3d_shader_register *reg, - enum wined3d_data_type data_type, char *register_name, BOOL *is_color, + enum wined3d_data_type data_type, char *register_name, BOOL *is_swizzled, const struct wined3d_shader_context *ctx) { /* oPos, oFog and oPts in D3D */ @@ -2879,7 +2879,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[1].offset != ~0u && reg->idx[1].rel_addr) shader_glsl_add_src_param_ext(ctx, reg->idx[1].rel_addr, WINED3DSP_WRITEMASK_0, &rel_param1, reg->idx[1].rel_addr->reg.data_type); - *is_color = FALSE; + if (is_swizzled) + *is_swizzled = FALSE; switch (reg->type) { @@ -2895,8 +2896,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); - if (priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) - *is_color = TRUE; + if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) + *is_swizzled = TRUE; if (reg->idx[0].rel_addr) { sprintf(register_name, "%s_in[%s + %u]", @@ -3444,13 +3445,11 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_dst_param *wined3d_dst, struct glsl_dst_param *glsl_dst) { - BOOL is_color = FALSE; - glsl_dst->mask_str[0] = '\0'; glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(&wined3d_dst->reg, wined3d_dst->reg.data_type, - glsl_dst->reg_name, &is_color, ins->ctx); + glsl_dst->reg_name, NULL, ins->ctx); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } @@ -3740,9 +3739,8 @@ static void shader_glsl_color_correction_ext(struct wined3d_string_buffer *buffe static void shader_glsl_color_correction(const struct wined3d_shader_instruction *ins, struct color_fixup_desc fixup) { char reg_name[256]; - BOOL is_color; - shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, &is_color, ins->ctx); + shader_glsl_get_register_name(&ins->dst[0].reg, ins->dst[0].reg.data_type, reg_name, NULL, ins->ctx); shader_glsl_color_correction_ext(ins->ctx->buffer, reg_name, ins->dst[0].write_mask, fixup); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_string_buffer to shader_glsl_get_register_name().
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: cee95b785358390e2e411a1e206650a33165a0ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee95b785358390e2e411a1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 15 14:44:24 2018 +0430 wined3d: Pass a wined3d_string_buffer to shader_glsl_get_register_name(). Instead of hoping that 150 characters is plenty. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 219 ++++++++++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee95b785358390e2e41…

1 0

Henri Verbeet : d3d11/tests: Run the tests in parallel.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 2e39f0141e8beaf16b187f5165cc07c227d130c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e39f0141e8beaf16b187f51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 15 14:44:25 2018 +0430 d3d11/tests: Run the tests in parallel. It's hard enough for a single CPU core to keep a modern GPU busy in the optimal case, but with typical batch sizes of 4 vertices and trivial shaders, our tests are extremely CPU bound. With 8+-core CPU's being generally available, there's a lot to be gained. Generally speaking, not all tests can be run in parallel; tests that touch global state, like e.g. the display mode, can't. Fortunately, none of the d3d11 tests currently do that. Unfortunately, this currently doesn't help quite as much on Wine as it does on Windows. The big wined3d lock prevents a lot of parallelism, even though the tests use separate Direct3D devices. In the specific case of these tests, simply disabling the lock is safe, and shows how much could be gained by simply pushing the lock down a layer to the device. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 369 ++++++++++++++++++++++++++++++----------------- 1 file changed, 234 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e39f0141e8beaf16b18…

1 0

Piotr Caban : msvcp90: Add time_get<char>::do_get_time implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 58123a2b6ec11ffa574904290f21103d7dda2b0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=58123a2b6ec11ffa57490429… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:49:01 2018 +0200 msvcp90: Add time_get<char>::do_get_time implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c100c9a..656aa65 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10136,8 +10136,28 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_time(const time_get_ch istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, ios_base *base, int *err, struct tm *t) { - FIXME("(%p %p %p %p %p) stub\n", this, ret, base, err, t); - return NULL; + TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); + + *err |= time_get_char__Getint(this, &s, &e, 0, 23, &t->tm_hour); + if (*err || istreambuf_iterator_char_val(&s)!=':') + *err |= IOSTATE_failbit; + + if (!*err) + { + istreambuf_iterator_char_inc(&s); + *err |= time_get_char__Getint(this, &s, &e, 0, 59, &t->tm_min); + } + if (*err || istreambuf_iterator_char_val(&s)!=':') + *err |= IOSTATE_failbit; + + if (!*err) + { + istreambuf_iterator_char_inc(&s); + *err |= time_get_char__Getint(this, &s, &e, 0, 59, &t->tm_sec); + } + + *ret = s; + return ret; } /* ?get_time@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */

1 0

Piotr Caban : msvcp90: Add time_get<char>::do_get_weekday implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 215ff448dcae833de85e60664b155b578ba781e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=215ff448dcae833de85e6066… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 12:49:09 2018 +0200 msvcp90: Add time_get<char>::do_get_weekday implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b506c9e..be5edad 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10090,6 +10090,52 @@ istreambuf_iterator_char* __thiscall time_get_char_get_date(const time_get_char return call_time_get_char_do_get_date(this, ret, s, e, base, err, t); } +static int find_longest_match(istreambuf_iterator_char *iter, const char *str) +{ + int i, len = 0, last_match = -1, match = -1; + const char *p, *end; + char buf[64]; + + for(istreambuf_iterator_char_val(iter); iter->strbuf && len<ARRAY_SIZE(buf); + istreambuf_iterator_char_inc(iter)) + { + BOOL got_prefix = FALSE; + + buf[len++] = iter->val; + last_match = match; + match = -1; + for(p=str+1, i=0; *p; p = (*end ? end+1 : end), i++) + { + end = strchr(p, ':'); + if (!end) + end = p + strlen(p); + + if (end-p >= len && !memcmp(p, buf, len)) + { + if (end-p == len) + match = i; + else + got_prefix = TRUE; + } + } + + if (!got_prefix) + { + if (match != -1) + { + istreambuf_iterator_char_inc(iter); + return match; + } + break; + } + } + if (len == ARRAY_SIZE(buf)) + FIXME("temporary buffer is too small\n"); + if (!iter->strbuf) + return match; + return last_match; +} + /* ?do_get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */ /* ?do_get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@@Z */ DEFINE_THISCALL_WRAPPER(time_get_char_do_get_monthname, 36) /* virtual */ @@ -10186,8 +10232,17 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_weekday(const time_get istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, ios_base *base, int *err, struct tm *t) { - FIXME("(%p %p %p %p %p) stub\n", this, ret, base, err, t); - return NULL; + int match; + + TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); + + if ((match = find_longest_match(&s, this->days)) != -1) + t->tm_wday = match / 2; + else + *err |= IOSTATE_failbit; + + *ret = s; + return ret; } /* ?get_weekday@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */

1 0

Piotr Caban : msvcp90: Add time_get<char>:: do_get_monthname implementation.
by Alexandre Julliard Aug. 15, 2018

Aug. 15, 2018

Module: wine Branch: master Commit: 431fca550d424e0c529267390e94acc1c2592a5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=431fca550d424e0c52926739… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 13:56:03 2018 +0200 msvcp90: Add time_get<char>::do_get_monthname implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index be5edad..5398fcf 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -10152,8 +10152,17 @@ istreambuf_iterator_char* __thiscall time_get_char_do_get_monthname(const time_g istreambuf_iterator_char *ret, istreambuf_iterator_char s, istreambuf_iterator_char e, ios_base *base, int *err, struct tm *t) { - FIXME("(%p %p %p %p %p) stub\n", this, ret, base, err, t); - return NULL; + int match; + + TRACE("(%p %p %p %p %p)\n", this, ret, base, err, t); + + if ((match = find_longest_match(&s, this->months)) != -1) + t->tm_mon = match / 2; + else + *err |= IOSTATE_failbit; + + *ret = s; + return ret; } /* ?get_monthname@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@@Z */

1 0