November 2019 - Wine-Commits

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

Nov. 21, 2019

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

Michael Stefaniuc : dmscript/tests: Add some Script track tests.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 8d32805dbc209c208d4cd6b99349512471aac161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d32805dbc209c208d4cd6b9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 21 22:16:02 2019 +0100 dmscript/tests: Add some Script track tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmscript/tests/dmscript.c | 77 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index d372f39d9e..365b006025 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -203,18 +203,87 @@ static void test_dmscript(void) static void test_scripttrack(void) { - IDirectMusicTrack *dmt; + IDirectMusicTrack8 *dmt; IPersistStream *ps; CLSID class; ULARGE_INTEGER size; HRESULT hr; +#define X(guid) &guid, #guid + const struct { + REFGUID type; + const char *name; + } unsupported[] = { + { X(GUID_BandParam) }, + { X(GUID_ChordParam) }, + { X(GUID_Clear_All_Bands) }, + { X(GUID_CommandParam) }, + { X(GUID_CommandParam2) }, + { X(GUID_CommandParamNext) }, + { X(GUID_ConnectToDLSCollection) }, + { X(GUID_Disable_Auto_Download) }, + { X(GUID_DisableTempo) }, + { X(GUID_DisableTimeSig) }, + { X(GUID_Download) }, + { X(GUID_DownloadToAudioPath) }, + { X(GUID_Enable_Auto_Download) }, + { X(GUID_EnableTempo) }, + { X(GUID_EnableTimeSig) }, + { X(GUID_IDirectMusicBand) }, + { X(GUID_IDirectMusicChordMap) }, + { X(GUID_IDirectMusicStyle) }, + { X(GUID_MuteParam) }, + { X(GUID_Play_Marker) }, + { X(GUID_RhythmParam) }, + { X(GUID_SeedVariations) }, + { X(GUID_StandardMIDIFile) }, + { X(GUID_TempoParam) }, + { X(GUID_TimeSignature) }, + { X(GUID_Unload) }, + { X(GUID_UnloadFromAudioPath) }, + { X(GUID_Valid_Start_Time) }, + { X(GUID_Variations) }, + }; +#undef X + unsigned int i; hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, - &IID_IDirectMusicTrack, (void**)&dmt); + &IID_IDirectMusicTrack8, (void**)&dmt); ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + /* IDirectMusicTrack8 */ + todo_wine { + hr = IDirectMusicTrack8_Init(dmt, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_Init failed: %08x\n", hr); + hr = IDirectMusicTrack8_InitPlay(dmt, NULL, NULL, NULL, 0, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_InitPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_EndPlay(dmt, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_EndPlay failed: %08x\n", hr); + hr = IDirectMusicTrack8_Play(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); + ok(hr == E_POINTER, "IDirectMusicTrack8_Play failed: %08x\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt, NULL, 0, NULL, NULL); + ok(hr == DMUS_E_GET_UNSUPPORTED, "IDirectMusicTrack8_GetParam failed: %08x\n", hr); + } + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { + hr = IDirectMusicTrack8_IsParamSupported(dmt, unsupported[i].type); + ok(hr == DMUS_E_TYPE_UNSUPPORTED, + "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", + unsupported[i].name, hr); + } + hr = IDirectMusicTrack8_AddNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_RemoveNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_RemoveNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack8_Clone(dmt, 0, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Clone failed: %08x\n", hr); + hr = IDirectMusicTrack8_PlayEx(dmt, NULL, 0, 0, 0, 0, NULL, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_Compose(dmt, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt, NULL, 0, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + /* IPersistStream */ - hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack8_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, NULL); @@ -233,7 +302,7 @@ static void test_scripttrack(void) hr = IPersistStream_Save(ps, NULL, TRUE); ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); - while (IDirectMusicTrack_Release(dmt)); + while (IDirectMusicTrack8_Release(dmt)); } struct chunk {

1 0

Serge Gautherie : shell32: Properly init/use icon_idx.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

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

Sven Baars : gdi32/tests: Remove the D3DKMTCreateDCFromMemory test with Width = 0.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: c9f15c20f943a140bed1605f0701a63815ba46b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f15c20f943a140bed1605f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Wed Nov 20 10:43:31 2019 +0100 gdi32/tests: Remove the D3DKMTCreateDCFromMemory test with Width = 0. This test fails with STATUS_INVALID_PARAMETER on Windows 7+. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index c1651b5a2b..8fe160546c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5780,20 +5780,6 @@ static void test_D3DKMTCreateDCFromMemory( void ) test_data[i].name, create_desc.hBitmap); create_desc.Height = 7; - create_desc.Width = 0; - status = pD3DKMTCreateDCFromMemory( &create_desc ); - ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n", - test_data[i].name, status, test_data[i].status); - if (status == STATUS_SUCCESS) - { - destroy_desc.hDc = create_desc.hDc; - destroy_desc.hBitmap = create_desc.hBitmap; - status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); - ok(status == STATUS_SUCCESS, "%s: Got unexpected status %#x.\n", test_data[i].name, status); - create_desc.hDc = (void *)0x010baade; - create_desc.hBitmap = (void *)0x020baade; - } - create_desc.Pitch = 0; status = pD3DKMTCreateDCFromMemory( &create_desc ); ok(status == STATUS_INVALID_PARAMETER, "%s: Got unexpected status %#x.\n",

1 0

Alexandre Julliard : kernel32: Move string normalization functions to ntdll.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: fd588a22b74b092e3f629b90a09685024d64322d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd588a22b74b092e3f629b90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 10:43:46 2019 +0100 kernel32: Move string normalization functions to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +-- dlls/kernel32/locale.c | 66 -------------------------------------- dlls/kernel32/tests/locale.c | 29 +++++++++++++++-- dlls/kernelbase/kernelbase.spec | 4 +-- dlls/kernelbase/locale.c | 22 +++++++++++++ dlls/ntdll/locale.c | 70 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ include/winternl.h | 2 ++ 8 files changed, 126 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd588a22b74b092e3f62…

1 0

Alexandre Julliard : kernel32: Move some locale functions to kernelbase.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 2cbb6f8d34dc5481f757f32ad77d5facbef83f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cbb6f8d34dc5481f757f32a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 21 10:55:35 2019 +0100 kernel32: Move some locale functions to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 16 +-- dlls/kernel32/locale.c | 251 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 16 +-- dlls/kernelbase/locale.c | 239 +++++++++++++++++++++++++++++++++----- 4 files changed, 226 insertions(+), 296 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cbb6f8d34dc5481f757…

1 0

Jeff Smith : ucrtbase: Add strftime format range tests.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 23ee25435e00a7755dcaa8ff45c140decf4bbc29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23ee25435e00a7755dcaa8ff… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:20 2019 -0600 ucrtbase: Add strftime format range tests. 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/ucrtbase/tests/misc.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cdf3820dcc..ca4e16c9fa 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -928,11 +928,30 @@ static void test_strftime(void) const char *ret; struct tm tm; BOOL todo; + BOOL todo_handler; } tests[] = { + {"%C", "", { 0, 0, 0, 1, 0, -2000, 4, 0, 0 }, FALSE, TRUE}, + {"%C", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, TRUE}, + {"%C", "00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, + {"%C", "18", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }}, {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, + {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, FALSE, TRUE}, + {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, + {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, + {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }, FALSE, TRUE}, + {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }}, + {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }, TRUE}, {"%D", "01/01/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }}, + {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }, TRUE}, {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, TRUE}, {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }}, + {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE}, {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, @@ -940,8 +959,20 @@ static void test_strftime(void) {"%#R", "0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%T", "00:00:00", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%#T", "0:0:0", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%u", "", { 0, 0, 0, 1, 0, 117, -1, 0, 0 }, FALSE, TRUE}, {"%u", "7", { 0, 0, 0, 1, 0, 117, 0, 0, 0 }}, + {"%u", "1", { 0, 0, 0, 1, 0, 117, 1, 0, 0 }}, + {"%u", "6", { 0, 0, 0, 1, 0, 117, 6, 0, 0 }}, + {"%u", "", { 0, 0, 0, 1, 0, 117, 7, 0, 0 }, TRUE}, {"%h", "Jan", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%I", "", { 0, 0, -1, 1, 0, 70, 4, 0, 0 }, FALSE, TRUE}, + {"%I", "12", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, + {"%I", "01", { 0, 0, 1, 1, 0, 70, 4, 0, 0 }}, + {"%I", "11", { 0, 0, 11, 1, 0, 70, 4, 0, 0 }}, + {"%I", "12", { 0, 0, 12, 1, 0, 70, 4, 0, 0 }}, + {"%I", "01", { 0, 0, 13, 1, 0, 70, 4, 0, 0 }}, + {"%I", "11", { 0, 0, 23, 1, 0, 70, 4, 0, 0 }}, + {"%I", "", { 0, 0, 24, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%n", "\n", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }}, {"%r", "12:00:00 AM", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }, TRUE}, {"%r", "02:00:00 PM", { 0, 0, 14, 1, 0, 121, 6, 0, 0 }, TRUE}, @@ -1054,17 +1085,19 @@ static void test_strftime(void) const struct tm epoch = { 0, 0, 0, 1, 0, 70, 4, 0, 0 }; char buf[256]; - int i, ret; + int i, ret=0; for (i=0; i<ARRAY_SIZE(tests); i++) { - todo_wine_if(tests[i].todo) { + todo_wine_if(tests[i].todo || tests[i].todo_handler) { if (!tests[i].ret[0]) SET_EXPECT(global_invalid_parameter_handler); ret = p_strftime(buf, sizeof(buf), tests[i].format, &tests[i].tm); if (!tests[i].ret[0]) CHECK_CALLED(global_invalid_parameter_handler); + } + todo_wine_if(tests[i].todo) { ok(ret == strlen(tests[i].ret), "%d) ret = %d\n", i, ret); ok(!strcmp(buf, tests[i].ret), "%d) buf = \"%s\", expected \"%s\"\n", i, buf, tests[i].ret);

1 0

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

Nov. 21, 2019

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

Jeff Smith : msvcrt: Add _Strftime tests for seconds.
by Alexandre Julliard Nov. 21, 2019

Nov. 21, 2019

Module: wine Branch: master Commit: 84879eb377e0dc5d175122a21dce4073a3668317 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84879eb377e0dc5d175122a2… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Thu Nov 21 07:04:18 2019 -0600 msvcrt: Add _Strftime tests for seconds. 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 5df8951c15..e53083c561 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -678,6 +678,9 @@ static void test_strftime(void) { "%X", "0", 0, 0, "m", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "00", 0, 0, "mm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, { "%X", "m00", 0, 0, "mmm", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, + { "%X", "0", 0, 0, "s", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "00", 0, 0, "ss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }}, + { "%X", "s00", 0, 0, "sss", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "t", 0, 0, "t", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "tam", 0, 0, "tt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE}, { "%X", "tam", 0, 0, "ttttttttt", { 0, 0, 0, 1, 0, 70, 0, 0, 0 }, TRUE},

1 0

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

Nov. 21, 2019

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