wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Rémi Bernon : winmm: Fix int-to-pointer and pointer-to-int casts warnings.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 0ef9ebde9f5ccd8eb9905c8a71a2184b61aa2610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ef9ebde9f5ccd8eb9905c8a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:23 2019 +0100 winmm: Fix int-to-pointer and pointer-to-int casts warnings. The stream pointer was used as the DWORD id, which is only going to work on 32bit. It may very well be that winmm is only used in 32bit, but then we still build a 64bit version of it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0f0cd946d1..9075a78f34 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -54,6 +54,7 @@ #include "winemm.h" #include "wine/debug.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(winmm); @@ -72,12 +73,16 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; +static struct wine_rb_tree wine_midi_streams; +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry); + /************************************************************************** * WINMM_CreateIData [internal] */ static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; + wine_rb_init(&wine_midi_streams, wine_midi_stream_compare); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return psLastEvent != NULL; } @@ -924,6 +929,8 @@ typedef struct WINE_MIDIStream { WORD status; HANDLE hEvent; LPMIDIHDR lpMidiHdr; + DWORD dwStreamID; + struct wine_rb_entry entry; } WINE_MIDIStream; #define WINE_MSM_HEADER (WM_USER+0) @@ -935,12 +942,50 @@ typedef struct WINE_MIDIStream { #define MSM_STATUS_PAUSED WINE_MSM_PAUSE #define MSM_STATUS_PLAYING WINE_MSM_RESUME +static int wine_midi_stream_compare(const void *key, const struct wine_rb_entry *entry) +{ + WINE_MIDIStream *stream = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + return memcmp(key, &stream->dwStreamID, sizeof(stream->dwStreamID)); +} + +static WINE_MIDIStream *wine_midi_stream_allocate(void) +{ + DWORD stream_id = 1; + WINE_MIDIStream *stream = NULL; + + EnterCriticalSection(&WINMM_cs); + + while (stream_id < 0xFFFFFFFF && wine_rb_get(&wine_midi_streams, &stream_id)) + stream_id++; + + if (stream_id < 0xFFFFFFFF && + (stream = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)))) + { + stream->dwStreamID = stream_id; + wine_rb_put(&wine_midi_streams, &stream_id, &stream->entry); + } + + LeaveCriticalSection(&WINMM_cs); + return stream; +} + +static void wine_midi_stream_free(WINE_MIDIStream *stream) +{ + EnterCriticalSection(&WINMM_cs); + + wine_rb_remove(&wine_midi_streams, &stream->entry); + HeapFree(GetProcessHeap(), 0, stream); + + LeaveCriticalSection(&WINMM_cs); +} + /************************************************************************** * MMSYSTEM_GetMidiStream [internal] */ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidiStrm, WINE_MIDI** lplpwm) { WINE_MIDI* lpwm = (LPWINE_MIDI)MMDRV_Get(hMidiStrm, MMDRV_MIDIOUT, FALSE); + struct wine_rb_entry *entry; if (lplpwm) *lplpwm = lpwm; @@ -949,7 +994,10 @@ static BOOL MMSYSTEM_GetMidiStream(HMIDISTRM hMidiStrm, WINE_MIDIStream** lpMidi return FALSE; } - *lpMidiStrm = (WINE_MIDIStream*)lpwm->mod.rgIds.dwStreamID; + EnterCriticalSection(&WINMM_cs); + if ((entry = wine_rb_get(&wine_midi_streams, &lpwm->mod.rgIds.dwStreamID))) + *lpMidiStrm = WINE_RB_ENTRY_VALUE(entry, struct WINE_MIDIStream, entry); + LeaveCriticalSection(&WINMM_cs); return *lpMidiStrm != NULL; } @@ -1106,7 +1154,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI #endif if (((LPMIDIEVENT)lpData)->dwStreamID != 0 && ((LPMIDIEVENT)lpData)->dwStreamID != 0xFFFFFFFF && - ((LPMIDIEVENT)lpData)->dwStreamID != (DWORD)lpMidiStrm) { + ((LPMIDIEVENT)lpData)->dwStreamID != lpMidiStrm->dwStreamID) { FIXME("Dropping bad %s lpMidiHdr (streamID=%08x)\n", (lpMidiHdr->dwFlags & MHDR_ISSTRM) ? "stream" : "regular", ((LPMIDIEVENT)lpData)->dwStreamID); @@ -1301,7 +1349,7 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) if(!ret) { lpMidiStrm->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&lpMidiStrm->lock); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); + wine_midi_stream_free(lpMidiStrm); } return midiOutClose((HMIDIOUT)hMidiStrm); @@ -1330,7 +1378,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (ret != MMSYSERR_NOERROR) return ret; - lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); + lpMidiStrm = wine_midi_stream_allocate(); if (!lpMidiStrm) return MMSYSERR_NOMEM; @@ -1341,7 +1389,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0; - mosm.dwStreamID = (DWORD)lpMidiStrm; + mosm.dwStreamID = lpMidiStrm->dwStreamID; /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm);

1 0

Rémi Bernon : winealsa.drv: Increase buffer size to fix format-overflow warning.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: a8e7523ff164b111aedce5d8a2f0b5c07b6fb749 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8e7523ff164b111aedce5d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:19 2019 +0100 winealsa.drv: Increase buffer size to fix format-overflow warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c2fe59ea79..09f98dc7b8 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -631,7 +631,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids, static snd_config_t *make_handle_underrun_config(const char *name) { snd_config_t *lconf, *dev_node, *hu_node, *type_node; - char dev_node_name[64]; + char dev_node_name[260]; const char *type_str; int err;

1 0

Hans Leidekker : shell32: Fix definitions for FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 on 64-bit.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 3ca6b296dac2856e0280503d0cdd40b9b4e4e7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ca6b296dac2856e0280503d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 14 13:24:09 2019 +0100 shell32: Fix definitions for FOLDERID_ProgramFilesX64 and FOLDERID_ProgramFilesCommonX64 on 64-bit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 12 ++++++++++++ dlls/shell32/tests/shellpath.c | 22 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8c6e8a89b2..d9d65cbaed 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2697,9 +2697,15 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x54 */ &FOLDERID_ProgramFilesX64, +#ifdef _WIN64 + CSIDL_Type_CurrVer, + ProgramFilesDirW, + Program_FilesW, +#else CSIDL_Type_NonExistent, NULL, NULL, +#endif KF_CATEGORY_FIXED, /* category */ ProgramFilesX64W, /* name */ @@ -2717,9 +2723,15 @@ static const CSIDL_DATA CSIDL_Data[] = }, { /* 0x55 */ &FOLDERID_ProgramFilesCommonX64, +#ifdef _WIN64 + CSIDL_Type_CurrVer, + ProgramFilesCommonX64W, + Program_Files_Common_FilesW, +#else CSIDL_Type_NonExistent, NULL, NULL, +#endif KF_CATEGORY_FIXED, /* category */ ProgramFilesCommonX64W, /* name */ diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f768f44c8b..262714a9f3 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1932,6 +1932,28 @@ if (0) { /* crashes */ hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesX64, 0, NULL, &path); +#ifdef _WIN64 + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(path != NULL, "path not set\n"); + CoTaskMemFree(path); +#else + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "path set\n"); +#endif + + path = NULL; + hr = pSHGetKnownFolderPath(&FOLDERID_ProgramFilesCommonX64, 0, NULL, &path); +#ifdef _WIN64 + ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr); + ok(path != NULL, "path not set\n"); + CoTaskMemFree(path); +#else + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); + ok(path == NULL, "path set\n"); +#endif } static BOOL is_in_strarray(const WCHAR *needle, const char *hay)

1 0

Erich E. Hoover : msvcrt: Fix scanf file locking when returning EOF.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 925a88d1f701da76974eb967fd799152b25d6613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=925a88d1f701da76974eb967… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Nov 13 14:52:51 2019 -0700 msvcrt: Fix scanf file locking when returning EOF. Fixes regression introduced in 0a89a699135802b083d142130d3b0ef618485478. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48087 Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index e2f216110d..de2a2af975 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -489,6 +489,7 @@ _FUNCTION_ { } /* if we have reached the EOF and output nothing then report EOF */ if (nch==_EOF_ && rd==0 && st==0) { + _UNLOCK_FILE_(file); return _EOF_RET; } /* terminate */ @@ -524,6 +525,7 @@ _FUNCTION_ { #if _MSVCR_VER >= 80 /* if we have reached the EOF and output nothing then report EOF */ if (nch==_EOF_ && rd==0 && st==0) { + _UNLOCK_FILE_(file); return _EOF_RET; } #endif

1 0

Francois Gouget : kernel32: Match the Windows 10 1709+ SetConsoleFont() implementation.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: da238dc1d11cb57333de40d5ec76985c75f39130 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da238dc1d11cb57333de40d5… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 00:29:58 2019 +0100 kernel32: Match the Windows 10 1709+ SetConsoleFont() implementation. That is return the same 'E_NOTIMPL' error code. Remove the todo_wine-s but keep the tests in case we want to implement the API for compatibility with old Windows versions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- dlls/kernel32/tests/console.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4c0bee2caf..a698e53efe 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1627,7 +1627,7 @@ DWORD WINAPI GetNumberOfConsoleFonts(void) BOOL WINAPI SetConsoleFont(HANDLE hConsole, DWORD index) { FIXME("(%p, %u): stub!\n", hConsole, index); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(LOWORD(E_NOTIMPL) /* win10 1709+ */); return FALSE; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 171b2dad4d..1ecb350673 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2973,12 +2973,12 @@ static void test_SetConsoleFont(HANDLE std_output) skip("SetConsoleFont is not implemented\n"); return; } - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleFont(GetStdHandle(STD_INPUT_HANDLE), 0); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); if (!pGetNumberOfConsoleFonts)

1 0

Francois Gouget : kernel32/tests: Windows 10 dropped support for SetConsoleFont().
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: ba4cfbd4489a45dc685b06fd72fdfbd3db13f11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4cfbd4489a45dc685b06fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 00:29:46 2019 +0100 kernel32/tests: Windows 10 dropped support for SetConsoleFont(). Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a22051deaf..171b2dad4d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2967,6 +2967,12 @@ static void test_SetConsoleFont(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleFont(NULL, 0); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("SetConsoleFont is not implemented\n"); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Dmitry Timoshkov : wineconsole: Fix "Select all" functionality in USER backend.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: bbdd1be4f8019778158767f3aa8db8868b4cabd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdd1be4f8019778158767f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 11:46:25 2019 +0800 wineconsole: Fix "Select all" functionality in USER backend. Selection is stored in character cell coords, not in pixels. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 28e81261e9..5cc405d5b7 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1310,8 +1310,8 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM break; case IDS_SELECTALL: PRIVATE(data)->selectPt1.X = PRIVATE(data)->selectPt1.Y = 0; - PRIVATE(data)->selectPt2.X = (data->curcfg.sb_width - 1) * data->curcfg.cell_width; - PRIVATE(data)->selectPt2.Y = (data->curcfg.sb_height - 1) * data->curcfg.cell_height; + PRIVATE(data)->selectPt2.X = data->curcfg.sb_width - 1; + PRIVATE(data)->selectPt2.Y = data->curcfg.sb_height - 1; WCUSER_SetSelection(data, 0); PRIVATE(data)->has_selection = TRUE; break;

1 0

Zebediah Figura : advapi32/tests: Remove a todo_wine.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 8313551d26120d9b4de251aab2a116181c9dfed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8313551d26120d9b4de251aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 13 23:34:55 2019 -0600 advapi32/tests: Remove a todo_wine. This seems to have been fixed by recent changes to CreateProcess() implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index aa9a69fed2..bd70ecaddf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1793,7 +1793,7 @@ static void test_wow64(void) ok(!!service, "Failed to create service, error %u.\n", GetLastError()); ret = StartServiceA(service, 0, NULL); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); ret = DeleteService(service); ok(ret, "Failed to delete service, error %u.\n", GetLastError());

1 0

Francois Gouget : testbot: Fix the 'no software synthesizer midi port' winediag check.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: tools Branch: master Commit: 7447ab0dcf6da7b14739788618d50cd047a6f970 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7447ab0dcf6da7b14739788… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 13 06:20:12 2019 +0100 testbot: Fix the 'no software synthesizer midi port' winediag check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ea1ad89..99b1568 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -171,7 +171,7 @@ sub GetLogLineCategory($) # calls it as a test. $Line =~ /CorIsLatestSvc If this function is called,/ or # VMs and most test machines don't have a midi port. - $Line =~ /No software synthesizer midi port found / or + $Line =~ /No software synthesizer midi port found,/ or # Most VMs have limited OpenGL support. $Line =~ /None of the requested D3D feature levels is supported / or # The tests are not run as root.

1 0

Jeff Smith : ucrtbase: Strftime %y works for years 0 to 9999.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 5725ed3b46309b62469e4f305cb0b5a9b292dd43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5725ed3b46309b62469e4f30… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Nov 13 22:08:03 2019 +0100 ucrtbase: Strftime %y works for years 0 to 9999. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> 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 | 6 +++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 142a96aca1..ae6fcc8b7a 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1316,7 +1316,14 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f return 0; break; case 'y': - if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) +#if _MSVCR_VER>=140 + if(!MSVCRT_CHECK_PMT(mstm->tm_year>=-1900 && mstm->tm_year<=8099)) + goto einval_error; + tmp = (mstm->tm_year+1900)%100; +#else + tmp = mstm->tm_year%100; +#endif + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) return 0; break; case 'Y': diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 3095d9ed01..fb138a0fa4 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -379,7 +379,7 @@ static void __cdecl global_invalid_parameter_handler( const wchar_t *expression, const wchar_t *function, const wchar_t *file, unsigned line, uintptr_t arg) { - CHECK_EXPECT(global_invalid_parameter_handler); + CHECK_EXPECT2(global_invalid_parameter_handler); } static void __cdecl thread_invalid_parameter_handler( @@ -928,6 +928,10 @@ static void test_strftime(void) {"%V", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%V", "52", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }, TRUE}, {"%V", "53", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, + {"%y", "", { 0, 0, 0, 0, 0, -1901, 0, 0, 0 }}, + {"%y", "00", { 0, 0, 0, 0, 0, -1900, 0, 0, 0 }}, + {"%y", "99", { 0, 0, 0, 0, 0, 8099, 0, 0, 0 }}, + {"%y", "", { 0, 0, 0, 0, 0, 8100, 0, 0, 0 }}, {"%g", "71", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }}, {"%g", "72", { 0, 0, 0, 3, 0, 72, 1, 2, 0 }}, {"%G", "1971", { 0, 0, 0, 2, 0, 72, 0, 1, 0 }},

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
90
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 November 2019