September 2019 - Wine-Commits

Piotr Caban : msvcrt: Add wcrtomb_s tests.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 127d9932d9b21a8d63cc1df5d4f1142a846eb697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=127d9932d9b21a8d63cc1df5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 30 19:09:14 2019 +0200 msvcrt: Add wcrtomb_s tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3ecafbd52c..573289d77b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -88,6 +88,7 @@ static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); +static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); static int (__cdecl *p_towlower)(wint_t); static int (__cdecl *p__towlower_l)(wint_t, _locale_t); @@ -2784,6 +2785,7 @@ static void test_wctomb(void) mbstate_t state; unsigned char dst[10]; size_t ret; + int err; if(!p_wcrtomb || !setlocale(LC_ALL, "Japanese_Japan.932")) { win_skip("wcrtomb tests\n"); @@ -2815,6 +2817,43 @@ static void test_wctomb(void) ok(ret == -1, "wcrtomb did not return -1\n"); ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x3f\n", dst[0]); + if(!p_wcrtomb_s) { + win_skip("wcrtomb_s tests\n"); + setlocale(LC_ALL, "C"); + return; + } + + state = 1; + dst[2] = 'a'; + err = p_wcrtomb_s(&ret, (char*)dst, sizeof(dst), 0x3042, &state); + ok(!err, "err = %d\n", err); + ok(ret == 2, "ret != 2\n"); + ok(!state, "state != 0\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa0, "dst[1] = %x, expected 0xa0\n", dst[1]); + ok(dst[2] == 'a', "dst[2] != 'a'\n"); + + err = p_wcrtomb_s(&ret, (char*)dst, sizeof(dst), 0x3042, NULL); + ok(!err, "err = %d\n", err); + ok(ret == 2, "ret != 2\n"); + ok(!state, "state != 0\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa0, "dst[1] = %x, expected 0xa0\n", dst[1]); + + err = p_wcrtomb_s(&ret, (char*)dst, sizeof(dst), 0x20, NULL); + ok(!err, "err = %d\n", err); + ok(ret == 1, "ret != 1\n"); + ok(dst[0] == 0x20, "dst[0] = %x, expected 0x20\n", dst[0]); + + err = p_wcrtomb_s(&ret, NULL, 0, 0x20, NULL); + ok(!err, "err = %d\n", err); + ok(ret == 1, "ret != 1\n"); + + err = p_wcrtomb_s(&ret, (char*)dst, sizeof(dst), 0xffff, NULL); + ok(err == EILSEQ, "err = %d\n", err); + ok(ret == -1, "wcrtomb did not return -1\n"); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x3f\n", dst[0]); + setlocale(LC_ALL, "C"); } @@ -3861,6 +3900,7 @@ START_TEST(string) p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); + p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_towlower = (void*)GetProcAddress(hMsvcrt, "towlower"); p__towlower_l = (void*)GetProcAddress(hMsvcrt, "_towlower_l");

1 0

Gijs Vermeulen : kernel32/tests: Fix some console tests on newer Win10.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: b03a4b89022b31fc7903f189e4264a02398793be URL: https://source.winehq.org/git/wine.git/?a=commit;h=b03a4b89022b31fc7903f189… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Mon Sep 30 19:31:42 2019 +0200 kernel32/tests: Fix some console tests on newer Win10. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index acd61d078b..f85cd44ca7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -819,9 +819,8 @@ static void testScreenBuffer(HANDLE hConOut) /* Trying to set SB handles with various access modes */ SetLastError(0); ok(!SetConsoleActiveScreenBuffer(hConOutRO), "Shouldn't succeed\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "GetLastError: expecting %u got %u\n", - ERROR_INVALID_HANDLE, GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_ACCESS_DENIED) /* win10 1809 */, + "unexpected last error %u\n", GetLastError()); ok(SetConsoleActiveScreenBuffer(hConOutWT), "Couldn't set new WriteOnly SB\n"); @@ -2744,9 +2743,13 @@ static void test_GetConsoleFontSize(HANDLE std_output) memset(&c, 10, sizeof(COORD)); SetLastError(0xdeadbeef); c = GetConsoleFontSize(std_output, index); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); - ok(!c.X, "got %d, expected 0\n", c.X); - ok(!c.Y, "got %d, expected 0\n", c.Y); + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef) /* win10 1809 */, + "unexpected last error %u\n", GetLastError()); + if (GetLastError() == ERROR_INVALID_PARAMETER) + { + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + } } static void test_GetLargestConsoleWindowSize(HANDLE std_output) @@ -2884,12 +2887,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - - todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", - cfi[index].dwFontSize.X, win_width); - todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, win_height); + todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); + if (ret) + { + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); + } for (i = 0; i < num_fonts; i++) { @@ -2918,12 +2923,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - - todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", - cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); - todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); + todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); + if (ret) + { + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); + } for (i = 0; i < num_fonts; i++) {

1 0

Jacek Caban : vbscript: Add Month function implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: d87dc355eb60d4820e09d37b8bf046a481bc3154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d87dc355eb60d4820e09d37b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 20:19:38 2019 +0200 vbscript: Add Month function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5287e27f67..ecb9147941 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1620,8 +1620,13 @@ static HRESULT Global_Day(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Month(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wMonth); } static HRESULT Global_Weekday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 9378df752a..41f7ce2132 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1443,7 +1443,9 @@ Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) Call ok(getVT(Day(now)) = "VT_I2", "getVT(Day(now)) = " & getVT(Day(now))) -Call ok(Day(2) = 1, "Day(time) = " & Day(2)) +Call ok(Day(2) = 1, "Day(2) = " & Day(2)) +Call ok(getVT(Month(now)) = "VT_I2", "getVT(Month(now)) = " & getVT(Month(now))) +Call ok(Month(2) = 1, "Month(2) = " & Month(2)) Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next

1 0

Alistair Leslie-Hughes : dmime: Improved tracing of the DMUS_OBJECTDESC structure.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: ceabad19b8f51308afb999c394584d212ef8b469 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceabad19b8f51308afb999c3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 30 20:35:59 2019 +0200 dmime: 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/dmime/audiopath.c | 2 +- dlls/dmime/dmutils.c | 54 +++++++++++++++++++++++++++++--------------------- dlls/dmime/dmutils.h | 2 +- dlls/dmime/graph.c | 2 +- dlls/dmime/segment.c | 2 +- 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 21aaa4d412..ac3121c0e0 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -285,7 +285,7 @@ static HRESULT WINAPI path_IDirectMusicObject_ParseDescriptor(IDirectMusicObject desc->guidClass = CLSID_DirectMusicAudioPathConfig; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC(desc); return S_OK; } diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 121e6dc5a4..7b3bcec079 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -41,6 +41,7 @@ #include "dmutils.h" WINE_DEFAULT_DEBUG_CHANNEL(dmfile); +WINE_DECLARE_DEBUG_CHANNEL(dmime); static HRESULT IDirectMusicUtils_IPersistStream_ParseDescGeneric (DMUS_PRIVATE_CHUNK* pChunk, IStream* pStm, LPDMUS_OBJECTDESC pDesc) { @@ -143,7 +144,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; @@ -430,26 +431,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/dmime/dmutils.h b/dlls/dmime/dmutils.h index 187c9ed3d4..7242746031 100644 --- a/dlls/dmime/dmutils.h +++ b/dlls/dmime/dmutils.h @@ -56,6 +56,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; +void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *pDesc) DECLSPEC_HIDDEN; #endif /* __WINE_DMUTILS_H */ diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index fafd4ecfff..eebebef4d1 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -216,7 +216,7 @@ static HRESULT WINAPI graph_IDirectMusicObject_ParseDescriptor(IDirectMusicObjec desc->guidClass = CLSID_DirectMusicGraph; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC(desc); return S_OK; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 9a9872bd4c..a0e6191864 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -607,7 +607,7 @@ static HRESULT WINAPI seg_IDirectMusicObject_ParseDescriptor(IDirectMusicObject desc->guidClass = CLSID_DirectMusicSegment; desc->dwValidData |= DMUS_OBJ_CLASS; - TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + dump_DMUS_OBJECTDESC(desc); return S_OK; }

1 0

Jacek Caban : vbscript: Add Second function implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 96c4a1b9f3897a455ff25c9a5da974e2dad0451d URL: https://source.winehq.org/git/wine.git/?a=commit;h=96c4a1b9f3897a455ff25c9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 20:20:07 2019 +0200 vbscript: Add Second function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index c23a9cf990..e09099ecaf 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1670,8 +1670,13 @@ static HRESULT Global_Minute(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_Second(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wSecond); } static HRESULT Global_DateValue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 640fe63cae..480e9d9110 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1454,6 +1454,8 @@ Call ok(Hour(2.75) = 18, "Hour(2) = " & Hour(2.75)) Call ok(getVT(Minute(now)) = "VT_I2", "getVT(Minute(now)) = " & getVT(Minute(now))) Call ok(Minute(2) = 0, "Minute(2) = " & Minute(2)) Call ok(Minute(2.02083) = 30, "Minute(2.02083) = " & Minute(2.02083)) +Call ok(getVT(Second(now)) = "VT_I2", "getVT(Second(now)) = " & getVT(Second(now))) +Call ok(Second(2) = 0, "Second(2) = " & Second(2)) Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next

1 0

Jacek Caban : vbscript: Add Hour function implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: cb16190ec15e7d5c9a61088cfa0f1126fc5da1e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb16190ec15e7d5c9a61088c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 20:19:51 2019 +0200 vbscript: Add Hour function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4201ac1a15..bd6596a928 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1648,8 +1648,13 @@ static HRESULT Global_Year(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Hour(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wHour); } static HRESULT Global_Minute(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 9e73e668c8..38dbe68bcb 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1448,6 +1448,9 @@ Call ok(getVT(Month(now)) = "VT_I2", "getVT(Month(now)) = " & getVT(Month(now))) Call ok(Month(2) = 1, "Month(2) = " & Month(2)) Call ok(getVT(Year(now)) = "VT_I2", "getVT(Year(now)) = " & getVT(Year(now))) Call ok(Year(2) = 1900, "Year(2) = " & Year(2)) +Call ok(getVT(Hour(now)) = "VT_I2", "getVT(Hour(now)) = " & getVT(Hour(now))) +Call ok(Hour(2) = 0, "Hour(2) = " & Hour(2)) +Call ok(Hour(2.75) = 18, "Hour(2) = " & Hour(2.75)) Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next

1 0

Jacek Caban : vbscript: Add Minute function implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: d359793173b006ba1fb99f6d64c07f4991006227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d359793173b006ba1fb99f6d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 20:20:01 2019 +0200 vbscript: Add Minute function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bd6596a928..c23a9cf990 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1659,8 +1659,13 @@ static HRESULT Global_Hour(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Minute(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wMinute); } static HRESULT Global_Second(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 38dbe68bcb..640fe63cae 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1451,6 +1451,9 @@ Call ok(Year(2) = 1900, "Year(2) = " & Year(2)) Call ok(getVT(Hour(now)) = "VT_I2", "getVT(Hour(now)) = " & getVT(Hour(now))) Call ok(Hour(2) = 0, "Hour(2) = " & Hour(2)) Call ok(Hour(2.75) = 18, "Hour(2) = " & Hour(2.75)) +Call ok(getVT(Minute(now)) = "VT_I2", "getVT(Minute(now)) = " & getVT(Minute(now))) +Call ok(Minute(2) = 0, "Minute(2) = " & Minute(2)) +Call ok(Minute(2.02083) = 30, "Minute(2.02083) = " & Minute(2.02083)) Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next

1 0

Jacek Caban : vbscript: Add Day function implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: fcc9b7171a81b3257d0803ab7258be3ff98cd182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc9b7171a81b3257d0803ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 20:19:31 2019 +0200 vbscript: Add Day function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9b2ce3d4a7..5287e27f67 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -198,6 +198,19 @@ static HRESULT to_string(VARIANT *v, BSTR *ret) return S_OK; } +static HRESULT to_system_time(VARIANT *v, SYSTEMTIME *st) +{ + VARIANT date; + HRESULT hres; + + V_VT(&date) = VT_EMPTY; + hres = VariantChangeType(&date, v, 0, VT_DATE); + if(FAILED(hres)) + return hres; + + return VariantTimeToSystemTime(V_DATE(&date), st); +} + static HRESULT set_object_site(script_ctx_t *ctx, IUnknown *obj) { IObjectWithSite *obj_site; @@ -1596,8 +1609,13 @@ static HRESULT Global_Time(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Day(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wDay); } static HRESULT Global_Month(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 6cc4984bfd..9378df752a 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1442,6 +1442,9 @@ Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CB Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) +Call ok(getVT(Day(now)) = "VT_I2", "getVT(Day(now)) = " & getVT(Day(now))) +Call ok(Day(2) = 1, "Day(time) = " & Day(2)) + Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next Dim x

1 0

Jacek Caban : vbscript: Add Year function implementation.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: 296ff41d9a7ff27d2ce27e65d885164e43fbbb3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=296ff41d9a7ff27d2ce27e65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 20:19:44 2019 +0200 vbscript: Add Year function implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index ecb9147941..4201ac1a15 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1637,8 +1637,13 @@ static HRESULT Global_Weekday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Year(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wYear); } static HRESULT Global_Hour(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 41f7ce2132..9e73e668c8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1446,6 +1446,8 @@ Call ok(getVT(Day(now)) = "VT_I2", "getVT(Day(now)) = " & getVT(Day(now))) Call ok(Day(2) = 1, "Day(2) = " & Day(2)) Call ok(getVT(Month(now)) = "VT_I2", "getVT(Month(now)) = " & getVT(Month(now))) Call ok(Month(2) = 1, "Month(2) = " & Month(2)) +Call ok(getVT(Year(now)) = "VT_I2", "getVT(Year(now)) = " & getVT(Year(now))) +Call ok(Year(2) = 1900, "Year(2) = " & Year(2)) Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next

1 0

Andrew Eikum : xinput: Check for NULL argument in XInputGetState.
by Alexandre Julliard Sept. 30, 2019

Sept. 30, 2019

Module: wine Branch: master Commit: b84a4aa53b29c52be82d95c1fc867cb16dd64276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b84a4aa53b29c52be82d95c1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 30 13:04:26 2019 -0500 xinput: Check for NULL argument in XInputGetState. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/xinput.c | 3 +++ dlls/xinput1_3/xinput_main.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index e5eb504d52..a6e2107446 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -126,6 +126,9 @@ static void test_get_state(void) } } + result = pXInputGetState(0, NULL); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + result = pXInputGetState(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 57337e09ad..a417fec7ad 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -88,6 +88,9 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vib * XInputGetState() in the hook, so we need a wrapper. */ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) { + if (!state) + return ERROR_BAD_ARGUMENTS; + HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT)

1 0