October 2019 - Wine-commits

Paul Gofman : wined3d: Factor out wined3d_texture_gl_upload_bo() function.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 7474d665beaa9a1759c95744ea7d43d4673c6bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7474d665beaa9a1759c95744… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:53 2019 +0300 wined3d: Factor out wined3d_texture_gl_upload_bo() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 231 +++++++++++++++++++++++++------------------------ 1 file changed, 120 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7474d665beaa9a1759c9…

1 0

Paul Gofman : wined3d: Pass correct map size in wined3d_texture_gl_upload_data().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: b7d2ba9d8f42d62ca3e179d0a6d990961d1e0657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d2ba9d8f42d62ca3e179d0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:54 2019 +0300 wined3d: Pass correct map size in wined3d_texture_gl_upload_data(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> 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 dd61ac8ae1..d103581b8d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2077,7 +2077,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, } src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, - src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); + src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); if (decompress) compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d);

1 0

Paul Gofman : wined3d: Upload 3d GL textures per-slice when conversion is involved.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 06909230c42e5e9533a2d75ef54cb91b0efc1ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06909230c42e5e9533a2d75e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Oct 3 23:36:55 2019 +0300 wined3d: Upload 3d GL textures per-slice when conversion is involved. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 62 +++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d103581b8d..17b71c5738 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1975,8 +1975,6 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, unsigned int update_h = src_box->bottom - src_box->top; unsigned int update_d = src_box->back - src_box->front; struct wined3d_bo_address bo; - void *converted_mem = NULL; - struct wined3d_format_gl f; unsigned int level; BOOL decompress; GLenum target; @@ -2050,7 +2048,10 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, { const struct wined3d_format *compressed_format = src_format; unsigned int dst_row_pitch, dst_slice_pitch; - void *src_mem; + struct wined3d_format_gl f; + void *converted_mem; + unsigned int z; + BYTE *src_mem; if (decompress) { @@ -2068,9 +2069,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, wined3d_format_calculate_pitch(src_format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); - /* Note that uploading 3D textures may require quite some address - * space; it may make sense to upload them per-slice instead. */ - if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) + if (!(converted_mem = heap_alloc(dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); return; @@ -2078,35 +2077,40 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - if (decompress) - compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - else - src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); - wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); - bo.buffer_object = 0; - bo.addr = converted_mem; - src_row_pitch = dst_row_pitch; - src_slice_pitch = dst_slice_pitch; - } + for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) + { + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); + else + src_format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, 1); - if (bo.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); - checkGLcall("glBindBuffer"); + wined3d_texture_gl_upload_bo(src_format, target, level, dst_row_pitch, dst_x, dst_y, + dst_z + z, update_w, update_h, 1, converted_mem, srgb, dst_texture, gl_info); + } + + wined3d_context_gl_unmap_bo_address(context_gl, &bo, GL_PIXEL_UNPACK_BUFFER, 0, NULL); + heap_free(converted_mem); } + else + { + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, bo.buffer_object)); + checkGLcall("glBindBuffer"); + } - wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, - dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); + wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, dst_x, dst_y, + dst_z, update_w, update_h, update_d, bo.addr, srgb, dst_texture, gl_info); - if (bo.buffer_object) - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glBindBuffer"); + if (bo.buffer_object) + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } } - heap_free(converted_mem); if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) {

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_render_state().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: d66b8592faab40ff3272880dde60f7c8da15122c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d66b8592faab40ff3272880d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:04 2019 -0500 wined3d: Introduce wined3d_stateblock_set_render_state(). 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 | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 18 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dae95ae46e..42d1d9d4d8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1419,6 +1419,21 @@ void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock * stateblock->changed.vertexDecl = TRUE; } +void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateblock, + enum wined3d_render_state state, DWORD value) +{ + TRACE("stateblock %p, state %s (%#x), value %#x.\n", stateblock, debug_d3drenderstate(state), state, value); + + if (state > WINEHIGHEST_RENDER_STATE) + { + WARN("Unhandled render state %#x.\n", state); + return; + } + + stateblock->stateblock_state.rs[state] = value; + stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index b65681f210..488b1c4e65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ 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_render_state(ptr long long) @ 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 f79cd212a1..8d13a245ad 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,8 @@ HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *st 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_render_state(struct wined3d_stateblock *stateblock, + enum wined3d_render_state state, DWORD value); 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

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_blend_factor().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 3c24654deabc111a96e5d35680d6bfb961105777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c24654deabc111a96e5d356… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:05 2019 -0500 wined3d: Introduce wined3d_stateblock_set_blend_factor(). 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 | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 42d1d9d4d8..a96093295c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1434,6 +1434,15 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); } +void CDECL wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, + const struct wined3d_color *blend_factor) +{ + TRACE("stateblock %p, blend_factor %p.\n", stateblock, blend_factor); + + stateblock->stateblock_state.blend_factor = *blend_factor; + stateblock->changed.blend_state = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 488b1c4e65..c7b10a2b56 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_blend_factor(ptr 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) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8d13a245ad..445ecd2f55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, + const struct wined3d_color *blend_factor); 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);

1 0

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

18 Oct '19

Module: wine Branch: master Commit: c9ee1b0b88043c390634eb266126854afaec6c0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9ee1b0b88043c390634eb26… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:06 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetRenderState(). 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ee5de2f06f..3d16812d59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2273,14 +2273,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi { wined3d_color_from_d3dcolor(&factor, value); wined3d_mutex_lock(); - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); + wined3d_stateblock_set_blend_factor(device->update_state, &factor); + if (!device->recording) + wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); wined3d_mutex_unlock(); return D3D_OK; } wined3d_mutex_lock(); - wined3d_device_set_render_state(device->wined3d_device, state, value); + wined3d_stateblock_set_render_state(device->update_state, state, value); + if (!device->recording) + wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetRenderState().
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: e3a89b6e86506ef961ba19b06811b0c5949ca271 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3a89b6e86506ef961ba19b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 3 19:38:07 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetRenderState(). 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/d3d8/device.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 827ec47c60..cc1409d5c1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1827,15 +1827,11 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - switch (state) - { - case D3DRS_ZBIAS: - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS, value); - break; - - default: - wined3d_device_set_render_state(device->wined3d_device, state, value); - } + if (state == D3DRS_ZBIAS) + state = WINED3D_RS_DEPTHBIAS; + wined3d_stateblock_set_render_state(device->update_state, state, value); + if (!device->recording) + wined3d_device_set_render_state(device->wined3d_device, state, value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Ken Thomases : winemac: Fix redirection of OpenGL extension functions.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: 6c6afb2ce9517d0d10ad0feb369d34f1ee2fa369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6afb2ce9517d0d10ad0feb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 17 17:53:45 2019 -0500 winemac: Fix redirection of OpenGL extension functions. This never worked. opengl_funcs.ext.p_<func> would always be NULL at the time it was checked, so nothing would be changed. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 8625350b2c..5197e15fbb 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -4277,6 +4277,9 @@ static BOOL init_opengl(void) } } + if (!init_gl_info()) + goto failed; + /* redirect some standard OpenGL functions */ #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) @@ -4292,13 +4295,10 @@ static BOOL init_opengl(void) /* redirect some OpenGL extension functions */ #define REDIRECT(func) \ - do { if (opengl_funcs.ext.p_##func) { p##func = opengl_funcs.ext.p_##func; opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) + do { if ((p##func = wine_dlsym(opengl_handle, #func, NULL, 0))) { opengl_funcs.ext.p_##func = macdrv_##func; } } while(0) REDIRECT(glCopyColorTable); #undef REDIRECT - if (!init_gl_info()) - goto failed; - if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions)) pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0);

1 0

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

18 Oct '19

Module: wine Branch: master Commit: 679cdc4010e8ab7d500b43d19a4a1d04e392c0ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=679cdc4010e8ab7d500b43d1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Oct 18 11:58:59 2019 +0200 msvcrt: Implement %u 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 | 5 +++++ dlls/ucrtbase/tests/misc.c | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 0eecfd6796..cf79e5971e 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -653,6 +653,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, "%u", 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(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b299976d3f..588f724cf7 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1264,6 +1264,11 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break; + case 'u': + tmp = mstm->tm_wday ? mstm->tm_wday : 7; + if(!strftime_int(str, &ret, max, tmp, 0, 1, 7)) + return 0; + break; #endif case 'w': if(!strftime_int(str, &ret, max, mstm->tm_wday, 0, 0, 6)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index fe59e30062..da2e7d34ca 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -901,6 +901,7 @@ static void test_asctime(void) static void test_strftime(void) { const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; + const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; @@ -948,6 +949,10 @@ static void test_strftime(void) ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "0:0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%u", &tm1); + ok(retA == 1, "expected 1, got %d\n", (int)retA); + ok(!strcmp(bufA, "7"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%h", &epoch); ok(retA == 3, "expected 3, got %d\n", (int)retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA);

1 0

Sven Baars : kernel32/tests: Remove a test that shows inconsistent results.
by Alexandre Julliard 18 Oct '19

18 Oct '19

Module: wine Branch: master Commit: aaaaec86426c8a51fe242dad96a3457bac76d942 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaaaec86426c8a51fe242dad… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Oct 18 14:38:38 2019 +0200 kernel32/tests: Remove a test that shows inconsistent results. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index cba0a3f281..f181536e7a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2455,11 +2455,6 @@ static void test_IsProcessInJob(void) ok(ret, "IsProcessInJob error %u\n", GetLastError()); ok(!out, "IsProcessInJob returned out=%u\n", out); - out = TRUE; - ret = pIsProcessInJob(pi.hProcess, NULL, &out); - ok(ret, "IsProcessInJob error %u\n", GetLastError()); - ok(!out, "IsProcessInJob returned out=%u\n", out); - ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError());

1 0