wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Jacek Caban : vbscript: Add err.description implementation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 0d9f024d6a6813647b6b2fa42562ef1546c745b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d9f024d6a6813647b6b2fa4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:18:51 2019 +0200 vbscript: Add err.description implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 21 +++++++++++++++++++-- dlls/vbscript/interp.c | 9 ++++++++- dlls/vbscript/tests/api.vbs | 4 ++++ dlls/vbscript/vbscript.h | 35 ++++------------------------------- dlls/vbscript/vbscript.rc | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript_defs.h | 36 ++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript_main.c | 15 +++++++++++++++ 7 files changed, 127 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d9f024d6a6813647b6b…

1 0

Jacek Caban : vbscript: Store entire EXCEPINFO in script context.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 8277c24806cfd174617bc35d06a7cb7a7284e44c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8277c24806cfd174617bc35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 3 18:18:37 2019 +0200 vbscript: Store entire EXCEPINFO in script context. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 4 ++-- dlls/vbscript/interp.c | 12 ++++++++++-- dlls/vbscript/vbscript.c | 1 + dlls/vbscript/vbscript.h | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e09099ecaf..98bcc516d7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2477,7 +2477,7 @@ static HRESULT Err_Number(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARI return E_NOTIMPL; } - hres = This->desc->ctx->err_number; + hres = This->desc->ctx->ei.scode; return return_int(res, HRESULT_FACILITY(hres) == FACILITY_VBS ? HRESULT_CODE(hres) : hres); } @@ -2494,7 +2494,7 @@ static HRESULT Err_Clear(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIA if(!This->desc) return E_UNEXPECTED; - This->desc->ctx->err_number = S_OK; + clear_ei(&This->desc->ctx->ei); return S_OK; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 6b9fd60a75..9c561826fa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -247,6 +247,14 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, return S_OK; } +void clear_ei(EXCEPINFO *ei) +{ + SysFreeString(ei->bstrSource); + SysFreeString(ei->bstrDescription); + SysFreeString(ei->bstrHelpFile); + memset(ei, 0, sizeof(*ei)); +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -1321,7 +1329,7 @@ static HRESULT interp_errmode(exec_ctx_t *ctx) TRACE("%d\n", err_mode); ctx->resume_next = err_mode; - ctx->script->err_number = S_OK; + clear_ei(&ctx->script->ei); return S_OK; } @@ -2158,7 +2166,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, vbdisp_t *vbthis, DISPP op = exec.instr->op; hres = op_funcs[op](&exec); if(FAILED(hres)) { - ctx->err_number = hres = map_hres(hres); + ctx->ei.scode = hres = map_hres(hres); if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index aa768a57e7..69dc1a151b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -153,6 +153,7 @@ static void release_script(script_ctx_t *ctx) class_desc_t *class_desc; collect_objects(ctx); + clear_ei(&ctx->ei); release_dynamic_vars(ctx->global_vars); ctx->global_vars = NULL; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index c9018c4648..003d759046 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -192,7 +192,7 @@ struct _script_ctx_t { class_desc_t err_desc; vbdisp_t *err_obj; - HRESULT err_number; + EXCEPINFO ei; dynamic_var_t *global_vars; function_t *global_funcs; @@ -358,6 +358,7 @@ HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t** HRESULT exec_script(script_ctx_t*,function_t*,vbdisp_t*,DISPPARAMS*,VARIANT*) DECLSPEC_HIDDEN; void release_dynamic_vars(dynamic_var_t*) DECLSPEC_HIDDEN; IDispatch *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; +void clear_ei(EXCEPINFO*) DECLSPEC_HIDDEN; typedef struct { UINT16 len;

1 0

Kevin Puetz : msvcp: Use fput[w]c in basic_filebuf_char_overflow.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 925e56acff4e714364cbf3507f669aff570132b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=925e56acff4e714364cbf350… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Thu Oct 3 18:06:42 2019 +0200 msvcp: Use fput[w]c in basic_filebuf_char_overflow. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8e6884c8f9..84174e4f95 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -3374,7 +3374,7 @@ int __thiscall basic_filebuf_char_overflow(basic_filebuf_char *this, int c) return !c; if(!this->cvt) - return fwrite(&ch, sizeof(char), 1, this->file) ? c : EOF; + return fputc(ch, this->file); from_next = &ch; do { @@ -4009,7 +4009,7 @@ unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this return !c; if(!this->cvt) - return fwrite(&ch, sizeof(wchar_t), 1, this->file) ? c : WEOF; + return fputwc(ch, this->file); from_next = &ch; do {

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantB().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 22969d43f85c84f47bac3c644e0cd2db876b9e1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=22969d43f85c84f47bac3c64… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:59 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantB(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index daa0b1b502..ee5de2f06f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3885,7 +3885,9 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); + hr = wined3d_stateblock_set_ps_consts_b(device->update_state, reg_idx, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_b().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: e374d4c72a3f29d66f44ecfa21c5a17563aa7feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e374d4c72a3f29d66f44ecfa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:58 2019 -0500 wined3d: Introduce wined3d_stateblock_set_ps_consts_b(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0ff3199525..dae95ae46e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1386,6 +1386,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_b[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsB |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9772874c8b..b65681f210 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 215e50116c..f79cd212a1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2661,6 +2661,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock,

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantI().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: c19b82ad1aba11b145b11c68fd625f68864af48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19b82ad1aba11b145b11c68… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:57 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetPixelShaderConstantI(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 539af97fbb..daa0b1b502 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3850,8 +3850,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + hr = wined3d_stateblock_set_ps_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_ps_consts_i().
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 638459bd5b42f41919d9c864196495b816b50df2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=638459bd5b42f41919d9c864… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 19:39:56 2019 -0500 wined3d: Introduce wined3d_stateblock_set_ps_consts_i(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 64a900fbde..0ff3199525 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1366,6 +1366,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat return WINED3D_OK; } +HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_i[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsI |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 016cf55c03..9772874c8b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) +@ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c4c469d4fe..215e50116c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Alistair Leslie-Hughes : dsound/tests: Allow more time for an event to be signalled.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 594cc41e94d7a20d383d9e1e3a0e42926ce89283 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594cc41e94d7a20d383d9e1e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 3 04:55:07 2019 +0000 dsound/tests: Allow more time for an event to be signalled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47868 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index d242bf6b24..7fdac9144e 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1089,7 +1089,7 @@ static HRESULT test_notify(LPDIRECTSOUNDBUFFER dsb, ok(rc == DS_OK,"Failed %08x\n",rc); ok(status == 0 /* Stopped */,"got %08x\n", status); - ret=WaitForMultipleObjects(count,event,FALSE,0); + ret = WaitForMultipleObjects(count, event, FALSE, 3000); ok(ret==expected,"expected %d. got %d\n",expected,ret); return rc;

1 0

Vijay Kiran Kamuju : msvcrt: Implement %e format for strftime.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 0bdaecd2d7cf1f786e7f57d2d1ee37db2fcb0e3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bdaecd2d7cf1f786e7f57d2… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Oct 3 16:27:33 2019 +0200 msvcrt: Implement %e format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 6 ++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 19 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 86799c900f..9795c92baf 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -618,6 +618,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%e", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%F", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b9fcde7978..cbffd77f32 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1177,6 +1177,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) return 0; break; + case 'e': + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + if(!alternate && str[ret-2] == '0') + str[ret-2] = ' '; + break; case 'F': tmp = 1900+mstm->tm_year; if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 1ba4280a54..aecbc9dca5 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -907,6 +907,14 @@ static void test_strftime(void) ok(retA == 6, "expected 6, got %d\n", (int)retA); ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%e", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, " 1"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#e", &epoch); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "1"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch); ok(retA == 10, "expected 10, got %d\n", (int)retA); ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA);

1 0

Alexandre Julliard : kernel32: Move LoadLibrary functions to kernelbase.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: c5dc41e980b311a9d49122c6e3e33a1c4483c660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5dc41e980b311a9d49122c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 3 19:41:40 2019 +0200 kernel32: Move LoadLibrary functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 10 +- dlls/kernel32/module.c | 265 ----------------------------------- dlls/kernelbase/kernelbase.spec | 12 +- dlls/kernelbase/loader.c | 296 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 307 insertions(+), 276 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5dc41e980b311a9d491…

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
62
Older →

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 October 2019