November 2018 - Wine-commits

Andre Heider : Revert "include: Use the ARRAY_SIZE() macro in debug.h.".
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 6d4d8f2ea0a53dd3d9259bde95a73422963a2dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d4d8f2ea0a53dd3d9259bde… Author: Andre Heider <a.heider(a)gmail.com> Date: Sun Nov 18 18:26:21 2018 +0100 Revert "include: Use the ARRAY_SIZE() macro in debug.h.". This reverts commit af3992374e530a037e650b45194f933c5406038f. wine/debug.h is a public header, and ARRAY_SIZE() is not defined for external projects. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 066873a..fb0d6bb 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -254,7 +254,7 @@ static inline const char *wine_dbgstr_vt( VARTYPE vt ) if (vt & ~VT_TYPEMASK) return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); - if (vt < ARRAY_SIZE(variant_types)) + if (vt < sizeof(variant_types)/sizeof(*variant_types)) return variant_types[vt]; if (vt == VT_BSTR_BLOB)

1 0

Andre Heider : winegcc: Add -I for the prefix's include dir.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 0e279d26b8386fc878f17bd6768e46e1cf9c5128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e279d26b8386fc878f17bd6… Author: Andre Heider <a.heider(a)gmail.com> Date: Sun Nov 18 18:26:57 2018 +0100 winegcc: Add -I for the prefix's include dir. This allows external projects to e.g. "#include <wine/debug.h>" for non-standard prefixes, like winehq's distro packages residing in /opt. Signed-off-by: Andre Heider <a.heider(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/Makefile.in | 2 +- tools/winegcc/winegcc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 6de23b0..daeb91b 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ winegcc.c winegcc_EXTRADEFS = \ - -DINCLUDEDIR="\"${includedir}/wine\"" \ + -DINCLUDEDIR="\"${includedir}\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 76442d8..6b3b4b6a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -672,10 +672,11 @@ no_compat_defines: { if (opts->use_msvcrt) { - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/msvcrt" : "-I" INCLUDEDIR "/msvcrt" ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/msvcrt" : "-I" INCLUDEDIR "/wine/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } - strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR : "-I" INCLUDEDIR ); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/wine/windows" : "-I" INCLUDEDIR "/wine/windows" ); } else if (opts->wine_objdir) strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) );

1 0

Zebediah Figura : xinput: Avoid calling XInputGetStateEx() in XInputGetState().
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: b72da1fdef65ced62c8d7bf6813cc11ca364528c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72da1fdef65ced62c8d7bf6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 18 13:15:40 2018 -0600 xinput: Avoid calling XInputGetStateEx() in XInputGetState(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46142 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput_main.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 56bb36a..f6e3e15 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -85,13 +85,31 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) return HID_set_state(&controllers[index], vibration); } +/* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call + * XInputGetState() in the hook, so we need a wrapper. */ +static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) +{ + HID_find_gamepads(controllers); + + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) + return ERROR_DEVICE_NOT_CONNECTED; + + HID_update_state(&controllers[index]); + memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + + return ERROR_SUCCESS; +} + + DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { DWORD ret; TRACE("(index %u, state %p)!\n", index, state); - ret = XInputGetStateEx(index, state); + ret = xinput_get_state(index, state); if (ret != ERROR_SUCCESS) return ret; @@ -105,17 +123,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state { TRACE("(index %u, state %p)!\n", index, state); - HID_find_gamepads(controllers); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) - return ERROR_DEVICE_NOT_CONNECTED; - - HID_update_state(&controllers[index]); - memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); - - return ERROR_SUCCESS; + return xinput_get_state(index, state); } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke)

1 0

Alistair Leslie-Hughes : ws2_32: Ignore a SO_SNDBUF value of 0 on macOS.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: e7fd1ac3b265f2f86ec832268dbbc5425b78ecfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7fd1ac3b265f2f86ec83226… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 19 09:33:31 2018 +0100 ws2_32: Ignore a SO_SNDBUF value of 0 on macOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40264 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe..2ac6b9f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5808,6 +5808,17 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, optlen = sizeof(struct linger); break; + case WS_SO_SNDBUF: + if (!*(const int *)optval) + { + FIXME("SO_SNDBUF ignoring request to disable send buffering\n"); +#ifdef __APPLE__ + return 0; +#endif + } + convert_sockopt(&level, &optname); + break; + case WS_SO_RCVBUF: if (*(const int*)optval < 2048) { @@ -5828,7 +5839,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * however, using it the BSD way fixes bug 8513 and seems to be what * most programmers assume, anyway */ case WS_SO_REUSEADDR: - case WS_SO_SNDBUF: case WS_SO_TYPE: convert_sockopt(&level, &optname); break;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Retrieve the count in show_listbox.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 7ac4c0ea8c7079988eb162ba447d81896848fd65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac4c0ea8c7079988eb162ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 16 17:38:03 2018 +0200 shell32/autocomplete: Retrieve the count in show_listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6d8988b..c9bf9ff 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -193,15 +193,16 @@ static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) if (reset) free_enum_strs(ac); } -static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +static void show_listbox(IAutoCompleteImpl *ac) { RECT r; - UINT width, height; + UINT cnt, width, height; GetWindowRect(ac->hwndEdit, &r); SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + cnt = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); width = r.right - r.left; @@ -404,7 +405,7 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, { /* Return FALSE if we need to hide the listbox */ WCHAR **str = ac->enum_strs; - UINT cnt, start, end; + UINT start, end; if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ @@ -432,15 +433,14 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, if (end == 0) return FALSE; } - cnt = end - start; SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); - SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, end - start, 0); for (; start < end; start++) SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); - show_listbox(ac, cnt); + show_listbox(ac); SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); return TRUE; }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Move the auto-suggest listbox along with the edit control.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 2c03e0c67d371f9e2d2e771a09b9e8d4620bcaf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c03e0c67d371f9e2d2e771a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 16 17:38:04 2018 +0200 shell32/autocomplete: Move the auto-suggest listbox along with the edit control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index c9bf9ff..236ba15 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -611,6 +611,15 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* Reset the enumerator if it's not visible anymore */ if (!IsWindowVisible(hwnd)) free_enum_strs(This); break; + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *pos = (WINDOWPOS*)lParam; + + if ((pos->flags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE) && + This->hwndListBox && IsWindowVisible(This->hwndListBox)) + show_listbox(This); + break; + } case WM_KEYDOWN: return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR:

1 0

Michael Stefaniuc : services: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 82c8c88b95e420b1e4b406786b63c7ad769bbe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c8c88b95e420b1e4b40678… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:39 2018 +0100 services: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1973d27..3de46bd 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -664,7 +664,7 @@ static LPWSTR service_get_pipe_name(void) { static const WCHAR format[] = { '\\','\\','.','\\','p','i','p','e','\\', 'n','e','t','\\','N','t','C','o','n','t','r','o','l','P','i','p','e','%','u',0}; - static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static WCHAR name[ARRAY_SIZE(format) + 10]; /* strlenW("4294967295") */ static DWORD service_current = 0; DWORD len, value = -1; LONG ret; @@ -776,7 +776,7 @@ static DWORD add_winedevice_service(const struct service_entry *service, WCHAR * struct service_entry **entry) { static const WCHAR format[] = {'W','i','n','e','d','e','v','i','c','e','%','u',0}; - static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static WCHAR name[ARRAY_SIZE(format) + 10]; /* strlenW("4294967295") */ static DWORD current = 0; struct scmdatabase *db = service->db; DWORD err;

1 0

Michael Stefaniuc : wintab32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 000c708e3b13cfe733ad092b17753ea747d39e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000c708e3b13cfe733ad092b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:37 2018 +0100 wintab32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/wintab32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 3037963..fe535fa 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -89,7 +89,7 @@ static HMODULE load_graphics_driver(void) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0;

1 0

Piotr Caban : msvcrt: Add _vscprintf_l implementation.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 381e549b8138126635d65652d58c6c0801b4c25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=381e549b8138126635d65652… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 22:55:30 2018 +0100 msvcrt: Add _vscprintf_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 151d6ae..d9f9271 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1446,7 +1446,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index abb6ada..e0508bb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1803,7 +1803,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8b7b154..c9547bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1821,7 +1821,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d293900..c1f6e0b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1515,7 +1515,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) msvcr120._vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) msvcr120._vscprintf_l @ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aa89792..1f78197 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1125,7 +1125,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cf604b7..2181a8f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1101,7 +1101,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e4d0aad..d71d37a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1058,7 +1058,7 @@ # stub _vprintf_s_l(str ptr ptr) @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -# stub _vscprintf_l(str ptr ptr) +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 27c9eb8..a6d7c1f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1017,6 +1017,15 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) } /********************************************************************* + * _vscprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscprintf_l(const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + return MSVCRT_vsnprintf_l(NULL, INT_MAX, format, locale, valist); +} + +/********************************************************************* * _vscprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT__vscprintf_p_l(const char *format,

1 0

Francois Gouget : testbot: Build VMs expect their missions to be a list of builds.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: tools Branch: master Commit: 6cab1726931dac09c043a5bd86e90209c15fc294 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6cab1726931dac09c043a5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 19 16:36:55 2018 +0100 testbot: Build VMs expect their missions to be a list of builds. So replace 'build' with the actual builds that should be run. A consequence is that build VMs too may have more than one mission since they can build both exe32 and exe64 binaries in one go. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e7cd277..6a08bc1 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -315,7 +315,7 @@ sub PutColValue($$$) } my $_SupportedMissions = { - "build" => { "build" => 1 }, + "build" => { "exe32" => 1, "exe64" => 1 }, "win32" => { "exe32" => 1 }, "win64" => { "exe32" => 1, "exe64" => 1 }, "wine" => { "win32" => 1, "wow32" => 1, "wow64" => 1 }, @@ -336,9 +336,10 @@ sub Validate($) return ("Missions", $ErrMessage) if (defined $ErrMessage); foreach my $TaskMissions (@$Missions) { - if ($self->Type ne "wine" and @{$TaskMissions->{Missions}} > 1) + if ($self->Type !~ /^(?:build|wine)$/ and + @{$TaskMissions->{Missions}} > 1) { - return ("Missions", "Only wine VMs can handle more than one mission per task"); + return ("Missions", "Only the build and wine VMs can handle more than one mission per task"); } foreach my $Mission (@{$TaskMissions->{Missions}}) {

1 0