wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Francois Gouget : kernel32/tests: Fix the lcid and expected value in a codepage ok() call.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: af638bc1176b8bd34a9323204c690a5e034cdc57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af638bc1176b8bd34a932320… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 21 16:14:02 2019 +0100 kernel32/tests: Fix the lcid and expected value in a codepage ok() call. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8b6584415c..8fcc575a29 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1126,7 +1126,7 @@ static void test_threadcp(void) cp = 0xdeadbeef; GetLocaleInfoA(lcids[i].lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (LPSTR)&cp, sizeof(cp)); - ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].threadcp, cp); + ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].lcid, lcids[i].threadcp); /* GetCPInfoEx/GetCPInfo - CP_ACP */ SetLastError(0xdeadbeef);

1 0

John Chadwick : winex11.drv: Handle button events without axes.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 4506b468d472ce68fec56b668a4eea166bb334fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4506b468d472ce68fec56b66… Author: John Chadwick <john(a)jchw.io> Date: Tue Nov 19 23:23:22 2019 -0800 winex11.drv: Handle button events without axes. Not all XInput events contain axes information. In particular, libinput does not seem to provide axes information on button_event. Signed-off-by: John Chadwick <john(a)jchw.io> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index fe3d4a8ff4..12eb89ac7f 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -929,13 +929,20 @@ static BOOL button_event( HWND hwnd, XEvent *event ) gMsgPacket.pkTime = EVENT_x11_time_to_win32_time(button->time); gMsgPacket.pkSerialNumber = gSerial++; gMsgPacket.pkCursor = curnum; - gMsgPacket.pkX = button->axis_data[0]; - gMsgPacket.pkY = button->axis_data[1]; - gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); - gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]), - abs(button->axis_data[4]))) - * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); - gMsgPacket.pkNormalPressure = button->axis_data[2]; + if (button->axes_count > 0) { + gMsgPacket.pkX = button->axis_data[0]; + gMsgPacket.pkY = button->axis_data[1]; + gMsgPacket.pkOrientation.orAzimuth = figure_deg(button->axis_data[3],button->axis_data[4]); + gMsgPacket.pkOrientation.orAltitude = ((1000 - 15 * max(abs(button->axis_data[3]), + abs(button->axis_data[4]))) + * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); + gMsgPacket.pkNormalPressure = button->axis_data[2]; + } else { + gMsgPacket.pkX = last_packet.pkX; + gMsgPacket.pkY = last_packet.pkY; + gMsgPacket.pkOrientation = last_packet.pkOrientation; + gMsgPacket.pkNormalPressure = last_packet.pkNormalPressure; + } gMsgPacket.pkButtons = get_button_state(curnum); gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd);

1 0

Serge Gautherie : shell32: Properly init/use icon_idx.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 7cc2806e0e0d97c0df93e2695351a4d3a3c72254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc2806e0e0d97c0df93e269… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Nov 18 15:58:46 2019 +0100 shell32: Properly init/use icon_idx. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/classes.c | 7 ++++++- dlls/shell32/folders.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index 653b55179e..4e571259ac 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -309,7 +309,12 @@ BOOL HCR_GetDefaultIconA(LPCSTR szClass, LPSTR szDest, DWORD len, int* picon_idx ret = HCR_RegGetDefaultIconA(hkey, szDest, len, picon_idx); RegCloseKey(hkey); } - TRACE("-- %s %i\n", szDest, *picon_idx); + + if (ret) + TRACE("-- %s %i\n", szDest, *picon_idx); + else + TRACE("-- not found\n"); + return ret; } diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 5bb1a33d5d..d42907513e 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -248,7 +248,7 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN { static const WCHAR drive[] = { 'D','r','i','v','e',0 }; - int icon_idx = -1; + icon_idx = -1; if (_ILGetDrive(pSimplePidl, sTemp, MAX_PATH)) {

1 0

Louis Lenders : shell32: Add stub for SHCreateDataObject.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 36eb51b8a64a706150a39c9786d6d5f900019626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36eb51b8a64a706150a39c97… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Nov 20 10:07:11 2019 +0100 shell32: Add stub for SHCreateDataObject. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.spec | 3 ++- dlls/shell32/shell32_main.c | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 5331ffff94..96251a87ca 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -338,7 +338,7 @@ @ stdcall SHBrowseForFolderW(ptr) @ stdcall SHChangeNotify (long long ptr ptr) @ stub SHChangeNotifySuspendResume -@ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) +@ stdcall SHCreateDataObject(ptr long ptr ptr ptr ptr) @ stdcall SHCreateDefaultContextMenu(ptr ptr ptr) @ stdcall SHCreateDirectoryExA(long str ptr) @ stdcall SHCreateDirectoryExW(long wstr ptr) @@ -347,6 +347,7 @@ @ stdcall SHCreateItemInKnownFolder(ptr long wstr ptr ptr) @ stdcall SHCreateItemFromRelativeName(ptr wstr ptr ptr ptr) @ stub SHCreateProcessAsUserW +@ stdcall SHCreateQueryCancelAutoPlayMoniker(ptr) @ stdcall SHCreateShellItem(ptr ptr ptr ptr) @ stdcall SHCreateShellItemArray(ptr ptr long ptr ptr) @ stdcall SHCreateShellItemArrayFromDataObject(ptr ptr ptr) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 034805f6fb..afbf5164c9 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -1258,3 +1258,13 @@ HRESULT WINAPI SHQueryUserNotificationState(QUERY_USER_NOTIFICATION_STATE *state *state = QUNS_ACCEPTS_NOTIFICATIONS; return S_OK; } + +/*********************************************************************** + * SHCreateDataObject (SHELL32.@) + */ +HRESULT WINAPI SHCreateDataObject(PCIDLIST_ABSOLUTE pidl_folder, UINT count, PCUITEMID_CHILD_ARRAY pidl_array, + IDataObject *object, REFIID riid, void **ppv) +{ + FIXME("%p %d %p %p %s %p: stub\n", pidl_folder, count, pidl_array, object, debugstr_guid(riid), ppv); + return E_NOTIMPL; +}

1 0

Alistair Leslie-Hughes : dmstyle: Improved tracing of the DMUS_OBJECTDESC structure.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 21c3ac446d72ce161bf0377931776309c5c69b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c3ac446d72ce161bf03779… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 21 20:17:45 2019 +0100 dmstyle: Improved tracing of the DMUS_OBJECTDESC structure. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmstyle/dmutils.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/dmstyle/dmutils.h | 2 +- dlls/dmstyle/style.c | 2 +- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 0432e76f9f..fd3abe5209 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -40,6 +40,7 @@ #include "dmutils.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); +WINE_DECLARE_DEBUG_CHANNEL(dmime); HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -197,7 +198,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, TRACE("** DM Reference Begin of Load ***\n"); TRACE("With Desc:\n"); - debugstr_DMUS_OBJECTDESC(&ref_desc); + dump_DMUS_OBJECTDESC(&ref_desc); { LPDIRECTMUSICGETLOADER pGetLoader = NULL; @@ -484,26 +485,33 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) { return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags)); } -const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) { - if (pDesc) { - char buffer[1024], *ptr = buffer; - - ptr += sprintf(ptr, "DMUS_OBJECTDESC (%p):\n", pDesc); - ptr += sprintf(ptr, " - dwSize = 0x%08X\n", pDesc->dwSize); - ptr += sprintf(ptr, " - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); - if (pDesc->dwValidData & DMUS_OBJ_CLASS) ptr += sprintf(ptr, " - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); - if (pDesc->dwValidData & DMUS_OBJ_OBJECT) ptr += sprintf(ptr, " - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); - if (pDesc->dwValidData & DMUS_OBJ_DATE) ptr += sprintf(ptr, " - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); - if (pDesc->dwValidData & DMUS_OBJ_VERSION) ptr += sprintf(ptr, " - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); - if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); - if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); - if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", - wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); - if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); - - return wine_dbg_sprintf("%s", buffer); - } else { - return wine_dbg_sprintf("(NULL)"); - } +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) +{ + if (!TRACE_ON(dmime)) + return; + + if (pDesc) { + TRACE_(dmime)("DMUS_OBJECTDESC (%p):", pDesc); + TRACE_(dmime)(" - dwSize = 0x%08X\n", pDesc->dwSize); + TRACE_(dmime)(" - dwValidData = 0x%08X ( %s)\n", pDesc->dwValidData, debugstr_DMUS_OBJ_FLAGS (pDesc->dwValidData)); + if (pDesc->dwValidData & DMUS_OBJ_CLASS) + TRACE_(dmime)(" - guidClass = %s\n", debugstr_dmguid(&pDesc->guidClass)); + if (pDesc->dwValidData & DMUS_OBJ_OBJECT) + TRACE_(dmime)(" - guidObject = %s\n", debugstr_guid(&pDesc->guidObject)); + if (pDesc->dwValidData & DMUS_OBJ_DATE) + TRACE_(dmime)(" - ftDate = %s\n", debugstr_filetime (&pDesc->ftDate)); + if (pDesc->dwValidData & DMUS_OBJ_VERSION) + TRACE_(dmime)(" - vVersion = %s\n", debugstr_dmversion(&pDesc->vVersion)); + if (pDesc->dwValidData & DMUS_OBJ_NAME) + TRACE_(dmime)(" - wszName = %s\n", debugstr_w(pDesc->wszName)); + if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) + TRACE_(dmime)(" - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); + if (pDesc->dwValidData & DMUS_OBJ_FILENAME) + TRACE_(dmime)(" - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) + TRACE_(dmime)(" - llMemLength = 0x%s\n - pbMemData = %p\n", wine_dbgstr_longlong(pDesc->llMemLength), + pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_STREAM) + TRACE_(dmime)(" - pStream = %p\n", pDesc->pStream); + } } diff --git a/dlls/dmstyle/dmutils.h b/dlls/dmstyle/dmutils.h index e2902875dc..f2b469806f 100644 --- a/dlls/dmstyle/dmutils.h +++ b/dlls/dmstyle/dmutils.h @@ -58,6 +58,6 @@ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; extern const char *debugstr_dmguid (const GUID *id) DECLSPEC_HIDDEN; /* dump whole DMUS_OBJECTDESC struct */ -extern const char *debugstr_DMUS_OBJECTDESC (LPDMUS_OBJECTDESC pDesc) DECLSPEC_HIDDEN; +extern void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */ diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index b3a3b83f39..4e84a3edc3 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -234,7 +234,7 @@ static HRESULT WINAPI style_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec desc->guidClass = CLSID_DirectMusicStyle; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC(desc); return S_OK; }

1 0

Vijay Kiran Kamuju : include: Update error codes in raserror.h.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: a017223055d4ae7befa7b2359341608d08a1ce25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a017223055d4ae7befa7b235… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Nov 21 13:34:08 2019 +0100 include: Update error codes in raserror.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/raserror.h | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a017223055d4ae7befa7…

1 0

Francois Gouget : ntdll: S/4Gb/4GB/ in a comment since it refers to bytes.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: ca577af1bc737104ff6fdb2c25473fd18a2d619f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca577af1bc737104ff6fdb2c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 15:57:06 2019 +0100 ntdll: S/4Gb/4GB/ in a comment since it refers to bytes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e8ac1ffa7a..d7232b47d6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -882,7 +882,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!address) { if (!commitSize) commitSize = COMMIT_MASK + 1; - totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */ + totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4GB */ if (totalSize < commitSize) totalSize = commitSize; if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ commitSize = min( totalSize, (commitSize + COMMIT_MASK) & ~COMMIT_MASK );

1 0

Francois Gouget : kernel32/tests: Remove an unused assignment in the comm test.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: fb037132fda850465d15e76b146626237904b75a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb037132fda850465d15e76b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 21 15:56:35 2019 +0100 kernel32/tests: Remove an unused assignment in the comm test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/comm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 97da932d6c..a43a290947 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -907,7 +907,6 @@ static void test_waittxempty(void) S(U(ovl_write)).Offset = 0; S(U(ovl_write)).OffsetHigh = 0; ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); ok((!res && GetLastError() == ERROR_IO_PENDING) || (res && bytes == sizeof(tbuf)),

1 0

Jeff Smith : msvcrt: Correct behavior of time in strftime formats %X %c.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 6f13ac30b9b90d2c53d860cb5124d6d77fba41b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f13ac30b9b90d2c53d860cb… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:22 2019 -0600 msvcrt: Correct behavior of time in strftime formats %X %c. 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/tests/time.c | 25 +++++++------ dlls/msvcrt/time.c | 87 +++++++++++++++++++++++----------------------- dlls/ucrtbase/tests/misc.c | 26 +++++++------- 3 files changed, 69 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f13ac30b9b90d2c53d8…

1 0

Jeff Smith : msvcrt: Range-check fields used as array indices in _Strftime.
by Alexandre Julliard 21 Nov '19

21 Nov '19

Module: wine Branch: master Commit: 96b6e1d77cbcd4c7daa36fb010ed64fbae0694f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b6e1d77cbcd4c7daa36fb0… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:21 2019 -0600 msvcrt: Range-check fields used as array indices in _Strftime. 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 | 16 ++++++++++++++++ dlls/ucrtbase/tests/misc.c | 2 ++ 2 files changed, 18 insertions(+) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index ec728a1a30..68784db861 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1076,6 +1076,14 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR if(format[count] == '\'') count++; break; case 'd': + if(count > 2) + { + if(!MSVCRT_CHECK_PMT(mstm->tm_wday>=0 && mstm->tm_wday<=6)) + { + *str = 0; + return FALSE; + } + } switch(count) { case 1: case 2: @@ -1092,6 +1100,14 @@ static inline BOOL strftime_format(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCR } break; case 'M': + if(count > 2) + { + if(!MSVCRT_CHECK_PMT(mstm->tm_mon>=0 && mstm->tm_mon<=11)) + { + *str = 0; + return FALSE; + } + } switch(count) { case 1: case 2: diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index ca4e16c9fa..bc667382e9 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1000,6 +1000,8 @@ static void test_strftime(void) {"%x", "02/30/70", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, {"%#x", "Thursday, January 01, 1970", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#x", "Thursday, February 30, 1970", { 0, 0, 0, 30, 1, 70, 4, 0, 0 }}, + {"%#x", "", { 0, 0, 0, 30, 1, 70, 7, 0, 0 }}, + {"%#x", "", { 0, 0, 0, 30, 12, 70, 4, 0, 0 }}, {"%X", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%X", "14:00:00", { 0, 0, 14, 1, 0, 70, 4, 0, 0 }}, {"%X", "23:59:60", { 60, 59, 23, 1, 0, 70, 4, 0, 0 }, TRUE},

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
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