October 2019 - Wine-commits

Zebediah Figura : ddraw: Reset the stateblock state before calling wined3d_device_reset().
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 6c51a93b6378ed1ab0a8bcbc044d4f87bdfdac0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c51a93b6378ed1ab0a8bcbc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:06 2019 -0500 ddraw: Reset the stateblock state before calling wined3d_device_reset(). 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/ddraw/surface.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 769b5a7576..89e5024c0e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6068,14 +6068,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; - if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, - &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) - { - ERR("Failed to reset device.\n"); - heap_free(texture); - return hr_ddraw_from_wined3d(hr); - } - if (ddraw->d3ddevice) { if (ddraw->d3ddevice->recording) @@ -6083,6 +6075,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ ddraw->d3ddevice->recording = NULL; ddraw->d3ddevice->update_state = ddraw->d3ddevice->state; } + wined3d_stateblock_reset(ddraw->state); + + if (FAILED(hr = wined3d_device_reset(ddraw->wined3d_device, + &swapchain_desc, NULL, ddraw_reset_enum_callback, TRUE))) + { + ERR("Failed to reset device.\n"); + heap_free(texture); + return hr_ddraw_from_wined3d(hr); + } wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil);

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_texture().
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: e43d91f85f3a959878e98ac76babfda87d1bdf21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e43d91f85f3a959878e98ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:07 2019 -0500 wined3d: Introduce wined3d_stateblock_set_texture(). 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 | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 24 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 870d916345..fe49fd6754 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1486,6 +1486,28 @@ void CDECL wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock stateblock->changed.textureState[stage] |= 1u << state; } +void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, + UINT stage, struct wined3d_texture *texture) +{ + TRACE("stateblock %p, stage %u, texture %p.\n", stateblock, stage, texture); + + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= ARRAY_SIZE(stateblock->stateblock_state.textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + return; + } + + if (texture) + wined3d_texture_incref(texture); + if (stateblock->stateblock_state.textures[stage]) + wined3d_texture_decref(stateblock->stateblock_state.textures[stage]); + stateblock->stateblock_state.textures[stage] = texture; + stateblock->changed.textures |= 1u << stage; +} + 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 6fba7b5661..d0ba31bf4e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -266,6 +266,7 @@ @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_render_state(ptr long long) @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) +@ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e328386d6f..a567cfd2f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2674,6 +2674,7 @@ void __cdecl wined3d_stateblock_set_render_state(struct wined3d_stateblock *stat enum wined3d_render_state state, DWORD value); void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); +void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock,

1 0

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

28 Oct '19

Module: wine Branch: master Commit: 95545a6667178f0ae8db108a06f814c3d0e58e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=95545a6667178f0ae8db108a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:08 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetTexture(). 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 d96e7b7095..cd870c90a6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2489,13 +2489,16 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st texture_impl = unsafe_impl_from_IDirect3DBaseTexture9(texture); wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, + wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); if (!device->recording) { unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; + wined3d_device_set_texture(device->wined3d_device, stage, + texture_impl ? texture_impl->wined3d_texture : NULL); + if (i < D3D9_MAX_TEXTURE_UNITS) { if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP)

1 0

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

28 Oct '19

Module: wine Branch: master Commit: 6f97c24b6e343884fb837651fe784aa181d6a505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f97c24b6e343884fb837651… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:09 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetTexture(). 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 63bf5f4fa2..6b6f5edfbc 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2135,8 +2135,11 @@ static HRESULT WINAPI d3d8_device_SetTexture(IDirect3DDevice8 *iface, DWORD stag texture_impl = unsafe_impl_from_IDirect3DBaseTexture8(texture); wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, + wined3d_stateblock_set_texture(device->update_state, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (!device->recording) + wined3d_device_set_texture(device->wined3d_device, stage, + texture_impl ? texture_impl->wined3d_texture : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTexture().
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: d4cfa070cb9428b9954de26bb704cf5d4b8e9cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4cfa070cb9428b9954de26b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 24 13:43:10 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetTexture(). 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/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3702454bde..9b7754bd8d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4811,7 +4811,9 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface, wined3d_texture = surf->wined3d_texture; wined3d_mutex_lock(); - wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); + wined3d_stateblock_set_texture(device->update_state, stage, wined3d_texture); + if (!device->recording) + wined3d_device_set_texture(device->wined3d_device, stage, wined3d_texture); wined3d_mutex_unlock(); return D3D_OK;

1 0

Roman Pišl : rstrtmgr: Add RM_FILTER_ACTION definition.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: a5d441c19fbcea0eb4ab63cd966178cf209840e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5d441c19fbcea0eb4ab63cd… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 27 11:16:46 2019 +0100 rstrtmgr: Add RM_FILTER_ACTION definition. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/restartmanager.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/restartmanager.h b/include/restartmanager.h index 9ee066d11d..ca5f9be71b 100644 --- a/include/restartmanager.h +++ b/include/restartmanager.h @@ -49,6 +49,12 @@ typedef enum _RM_REBOOT_REASON { RmRebootReasonDetectedSelf = 0x0010 } RM_REBOOT_REASON; +typedef enum _RM_FILTER_ACTION { + RmInvalidFilterAction = 0x0000, + RmNoRestart = 0x0001, + RmNoShutdown = 0x0002 +} RM_FILTER_ACTION; + typedef struct { DWORD dwProcessId; FILETIME ProcessStartTime;

1 0

Roman Pišl : rstrtmgr: Fake API implementation by returning success.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 91570a55c016678c41ea0316b5168c7ab6060235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91570a55c016678c41ea0316… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 27 11:16:47 2019 +0100 rstrtmgr: Fake API implementation by returning success. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47626 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 0aa8094eea..dfe53359d9 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -54,7 +54,11 @@ DWORD WINAPI RmGetList(DWORD dwSessionHandle, UINT *pnProcInfoNeeded, UINT *pnPr RM_PROCESS_INFO *rgAffectedApps[], LPDWORD lpdwRebootReasons) { FIXME("%d, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); - return ERROR_CALL_NOT_IMPLEMENTED; + if (pnProcInfoNeeded) + *pnProcInfoNeeded = 0; + if (pnProcInfo) + *pnProcInfo = 0; + return ERROR_SUCCESS; } /*********************************************************************** @@ -68,7 +72,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs { FIXME("%d, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, nApplications, rgApplications, nServices, rgsServiceNames); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /*********************************************************************** @@ -79,7 +83,9 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[]) { FIXME("%p, %d, %p stub!\n", sessionhandle, flags, sessionkey); - return ERROR_CALL_NOT_IMPLEMENTED; + if (sessionhandle) + *sessionhandle = 0xdeadbeef; + return ERROR_SUCCESS; } /*********************************************************************** @@ -88,7 +94,7 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK status) { FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /*********************************************************************** @@ -97,7 +103,7 @@ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK statu DWORD WINAPI RmEndSession(DWORD handle) { FIXME("%u stub!\n", handle); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; } /*********************************************************************** @@ -106,5 +112,5 @@ DWORD WINAPI RmEndSession(DWORD handle) DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) { FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); - return ERROR_CALL_NOT_IMPLEMENTED; + return ERROR_SUCCESS; }

1 0

Roman Pišl : rstrtmgr: Add stubs RmAddFilter and RmRemoveFilter.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: c18ebdfe724bd1f3a36bb9136d5e5edddcc23899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18ebdfe724bd1f3a36bb913… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sun Oct 27 11:16:48 2019 +0100 rstrtmgr: Add stubs RmAddFilter and RmRemoveFilter. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/main.c | 22 ++++++++++++++++++++++ dlls/rstrtmgr/rstrtmgr.spec | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index dfe53359d9..d78c9f590f 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -114,3 +114,25 @@ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK stat FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } + +/*********************************************************************** + * RmAddFilter (rstrtmgr.@) + */ +DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, + LPCWSTR serviceShortName, RM_FILTER_ACTION filter) +{ + FIXME("%u, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, + debugstr_w(serviceShortName), filter); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * RmRemoveFilter (rstrtmgr.@) + */ +DWORD WINAPI RmRemoveFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, + LPCWSTR serviceShortName) +{ + FIXME("%u, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, + debugstr_w(serviceShortName)); + return ERROR_SUCCESS; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index 6c6a9c9625..fed3b26a5c 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -1,11 +1,11 @@ -@ stub RmAddFilter +@ stdcall RmAddFilter(long wstr ptr wstr long) @ stub RmCancelCurrentTask @ stdcall RmEndSession(long) @ stub RmGetFilterList @ stdcall RmGetList(long ptr ptr ptr ptr) @ stub RmJoinSession @ stdcall RmRegisterResources(long long ptr long ptr long ptr) -@ stub RmRemoveFilter +@ stdcall RmRemoveFilter(long wstr ptr wstr) @ stub RmReserveHeap @ stdcall RmRestart(long long ptr) @ stdcall RmShutdown(long long ptr)

1 0

Piotr Caban : ucrtbase: Implement %G format for strftime.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: f65c426776d91765130c2ebcda2c65140d56cb8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65c426776d91765130c2ebc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:28:54 2019 +0100 ucrtbase: Implement %G format for strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 9 +++++++++ dlls/ucrtbase/tests/misc.c | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 588f724cf7..8f4d64b361 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1196,6 +1196,15 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; + case 'G': + tmp = 1900 + mstm->tm_year; + if (mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 4 < 0) + tmp--; + else if(mstm->tm_yday - (mstm->tm_wday ? mstm->tm_wday : 7) + 5 > 365 + IsLeapYear(tmp)) + tmp++; + if (!strftime_int(str, &ret, max, tmp, 4, 0, 9999)) + return 0; + break; #endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index da2e7d34ca..9cfe532560 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -138,6 +138,7 @@ static void (CDECL *p___setusermatherr)(MSVCRT_matherr_func); static int* (CDECL *p_errno)(void); static char* (CDECL *p_asctime)(const struct tm *); static size_t (__cdecl *p_strftime)(char *, size_t, const char *, const struct tm *); +static struct tm* (__cdecl *p__gmtime32)(const __time32_t*); static void (CDECL *p_exit)(int); static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); @@ -509,6 +510,7 @@ static BOOL init(void) p_errno = (void*)GetProcAddress(module, "_errno"); p_asctime = (void*)GetProcAddress(module, "asctime"); p_strftime = (void*)GetProcAddress(module, "strftime"); + p__gmtime32 = (void*)GetProcAddress(module, "_gmtime32"); p__crt_atexit = (void*)GetProcAddress(module, "_crt_atexit"); p_exit = (void*)GetProcAddress(module, "exit"); p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); @@ -904,6 +906,7 @@ static void test_strftime(void) const struct tm tm1 = { 0, 0, 0, 1, 0, 117, 0, 0, 0 }; char bufA[256]; size_t retA; + int i; retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); ok(retA == 2, "expected 2, got %d\n", (int)retA); @@ -964,6 +967,27 @@ static void test_strftime(void) retA = p_strftime(bufA, sizeof(bufA), "%t", &epoch); ok(retA == 1, "expected 1, got %d\n", (int)retA); ok(!strcmp(bufA, "\t"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%G", &epoch); + ok(retA == 4, "expected 4, got %d\n", (int)retA); + ok(!strcmp(bufA, "1970"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm1); + ok(retA == 4, "expected 4, got %d\n", (int)retA); + ok(!strcmp(bufA, "2016"), "got %s\n", bufA); + + for(i=0; i<14; i++) + { + __time32_t t = (365*2 + i - 7) * 24 * 60 * 60; + struct tm tm = *p__gmtime32(&t); + + retA = p_strftime(bufA, sizeof(bufA), "%G", &tm); + ok(retA == 4, "%d) retA = %d\n", i, (int)retA); + if (i <= 8) + ok(!strcmp(bufA, "1971"), "%d) got %s, expected 1971\n", i, bufA); + else + ok(!strcmp(bufA, "1972"), "%d) got %s, expected 1972\n", i, bufA); + } } static LONG* get_failures_counter(HANDLE *map)

1 0

Piotr Caban : msvcrt: Don't use strcspn from C-library.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 69ea905674c98d2587171182ef980656f1d272fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ea905674c98d2587171182… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 28 13:29:01 2019 +0100 msvcrt: Don't use strcspn from C-library. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 16 +++++++++++++++- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 92228a0da6..038463c319 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2047,7 +2047,21 @@ int __cdecl MSVCRT__memicmp(const char *s1, const char *s2, MSVCRT_size_t len) */ MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) { - return strcspn( str, reject ); + BOOL rejects[256]; + const char *p; + + memset(rejects, 0, sizeof(rejects)); + + p = reject; + while(*p) + { + rejects[(unsigned char)*p] = TRUE; + p++; + } + + p = str; + while(*p && !rejects[(unsigned char)*p]) p++; + return p - str; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 573289d77b..0da7c52809 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -159,6 +159,29 @@ static void test_swab( void ) { ok(memcmp(to,expected3,testsize) == 0, "Testing small size %d returned '%*.*s'\n", testsize, testsize, testsize, to); } +static void test_strcspn(void) +{ + static const struct { + const char *str; + const char *rej; + int ret; + } tests[] = { + { "test", "a", 4 }, + { "test", "e", 1 }, + { "test", "", 4 }, + { "", "a", 0 }, + { "a\xf1", "\xf1", 1 } + }; + int r, i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = strcspn(tests[i].str, tests[i].rej); + ok(r == tests[i].ret, "strcspn(\"%s\", \"%s\") = %d, expected %d\n", + tests[i].str, tests[i].rej, r, tests[i].ret); + } +} + #if 0 /* use this to generate more tests */ static void test_codepage(int cp) @@ -3935,6 +3958,7 @@ START_TEST(string) /* run tolower tests first */ test_tolower(); test_swab(); + test_strcspn(); test_mbcp(); test_mbsspn(); test_mbsspnp();

1 0