June 2019 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : winebus.sys: Increase buffer size to match max length available.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90a1e5d943724f8cb5e51fe8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 28 05:20:59 2019 +0000 winebus.sys: Increase buffer size to match max length available. The current buffer is 1024, however the ioctl call can handle a max length of 8191. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47013 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index a3255df..08ad876 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -880,7 +880,7 @@ static NTSTATUS hidraw_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYTE int rc; struct platform_private* ext = impl_from_DEVICE_OBJECT(device); BYTE *feature_buffer; - BYTE buffer[1024]; + BYTE buffer[8192]; if (id == 0) {

1 0

Alexandre Julliard : wmvcore: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 3e9566a3fb776304d20b442c1d293a15097e60ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9566a3fb776304d20b442c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:42:45 2019 +0200 wmvcore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wmvcore/Makefile.in b/dlls/wmvcore/Makefile.in index 19d32f6..c0b5827 100644 --- a/dlls/wmvcore/Makefile.in +++ b/dlls/wmvcore/Makefile.in @@ -2,6 +2,8 @@ MODULE = wmvcore.dll IMPORTLIB = wmvcore IMPORTS = kernel32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ reader.c \ wmvcore_main.c \

1 0

Alexandre Julliard : wow32: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: ffd6a3ebdf8487dae07bb4af38a6b3cba8ad7a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd6a3ebdf8487dae07bb4af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:42:56 2019 +0200 wow32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 5f0e13a..db153da 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -2,4 +2,6 @@ MODULE = wow32.dll IMPORTLIB = wow32 IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = wow_main.c

1 0

Alexandre Julliard : wpc: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: ff084c8b7ba6715e8489b4903dbbc2843ffda4fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff084c8b7ba6715e8489b490… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:43:03 2019 +0200 wpc: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpc/Makefile.in b/dlls/wpc/Makefile.in index 829a769..5d8ea2e 100644 --- a/dlls/wpc/Makefile.in +++ b/dlls/wpc/Makefile.in @@ -1,5 +1,7 @@ MODULE = wpc.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wpc.c

1 0

Alexandre Julliard : wsdapi: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: e005434d6e9c6f3f48f5f26db60ba46c10ba06af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e005434d6e9c6f3f48f5f26d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:43:58 2019 +0200 wsdapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index dd7b350..e63ea51 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -2,6 +2,8 @@ MODULE = wsdapi.dll IMPORTLIB = wsdapi IMPORTS = bcrypt iphlpapi rpcrt4 user32 webservices ws2_32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ address.c \ discovery.c \

1 0

Alexandre Julliard : wshom.ocx: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: df8f838928d6754365558503dcc39ab911e4adc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8f838928d6754365558503… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:17 2019 +0200 wshom.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/Makefile.in | 2 ++ dlls/wshom.ocx/shell.c | 41 ++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wshom.ocx/Makefile.in b/dlls/wshom.ocx/Makefile.in index b1949ed..6cbec44 100644 --- a/dlls/wshom.ocx/Makefile.in +++ b/dlls/wshom.ocx/Makefile.in @@ -1,6 +1,8 @@ MODULE = wshom.ocx IMPORTS = uuid oleaut32 ole32 shell32 user32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ shell.c \ wshom_main.c diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 57f1746..5d58ac7 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -25,7 +25,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -656,11 +655,11 @@ static HRESULT WINAPI WshCollection_Item(IWshCollection *iface, VARIANT *index, } folder = V_BSTR(index); - if (!strcmpiW(folder, desktopW)) + if (!wcsicmp(folder, desktopW)) kind = CSIDL_DESKTOP; - else if (!strcmpiW(folder, allusersdesktopW)) + else if (!wcsicmp(folder, allusersdesktopW)) kind = CSIDL_COMMON_DESKTOPDIRECTORY; - else if (!strcmpiW(folder, allusersprogramsW)) + else if (!wcsicmp(folder, allusersprogramsW)) kind = CSIDL_COMMON_PROGRAMS; else { @@ -923,7 +922,7 @@ static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *Ic hr = IShellLinkW_GetIconLocation(This->link, buffW, ARRAY_SIZE(buffW), &icon); if (FAILED(hr)) return hr; - sprintfW(pathW, fmtW, buffW, icon); + swprintf(pathW, ARRAY_SIZE(pathW), fmtW, buffW, icon); *IconPath = SysAllocString(pathW); if (!*IconPath) return E_OUTOFMEMORY; @@ -941,7 +940,7 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico TRACE("(%p)->(%s)\n", This, debugstr_w(IconPath)); /* scan for icon id */ - ptr = strrchrW(IconPath, ','); + ptr = wcsrchr(IconPath, ','); if (!ptr) { WARN("icon index not found\n"); @@ -951,10 +950,10 @@ static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR Ico path = SysAllocStringLen(IconPath, ptr-IconPath); /* skip spaces if any */ - while (isspaceW(*++ptr)) + while (iswspace(*++ptr)) ; - icon = atoiW(ptr); + icon = wcstol(ptr, NULL, 10); hr = IShellLinkW_SetIconLocation(This->link, path, icon); SysFreeString(path); @@ -1225,8 +1224,8 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) WCHAR *ret, *ptr; BOOL in_quotes = FALSE; - if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; - strcpyW( ret, cmd ); + if (!(ret = heap_alloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + lstrcpyW( ret, cmd ); *params = NULL; for (ptr = ret; *ptr; ptr++) @@ -1429,9 +1428,9 @@ static HKEY get_root_key(const WCHAR *path) int i; for (i = 0; i < ARRAY_SIZE(rootkeys); i++) { - if (!strncmpW(path, rootkeys[i].full, strlenW(rootkeys[i].full))) + if (!wcsncmp(path, rootkeys[i].full, lstrlenW(rootkeys[i].full))) return rootkeys[i].hkey; - if (rootkeys[i].abbrev[0] && !strncmpW(path, rootkeys[i].abbrev, strlenW(rootkeys[i].abbrev))) + if (rootkeys[i].abbrev[0] && !wcsncmp(path, rootkeys[i].abbrev, lstrlenW(rootkeys[i].abbrev))) return rootkeys[i].hkey; } @@ -1444,17 +1443,17 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) *value = NULL; /* at least one separator should be present */ - *subkey = strchrW(path, '\\'); + *subkey = wcschr(path, '\\'); if (!*subkey) return HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND); /* default value or not */ - if ((*subkey)[strlenW(*subkey)-1] == '\\') { + if ((*subkey)[lstrlenW(*subkey)-1] == '\\') { (*subkey)++; *value = NULL; } else { - *value = strrchrW(*subkey, '\\'); + *value = wcsrchr(*subkey, '\\'); if (*value - *subkey > 1) { unsigned int len = *value - *subkey - 1; WCHAR *ret; @@ -1566,7 +1565,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v bound.cElements = 0; while (*ptr) { bound.cElements++; - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; } sa = SafeArrayCreate(VT_VARIANT, 1, &bound); @@ -1583,7 +1582,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v while (*ptr) { V_VT(v) = VT_BSTR; V_BSTR(v) = SysAllocString(ptr); - ptr += strlenW(ptr)+1; + ptr += lstrlenW(ptr)+1; v++; } @@ -1641,13 +1640,13 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * if (V_VT(type) != VT_BSTR) return E_INVALIDARG; - if (!strcmpW(V_BSTR(type), regszW)) + if (!wcscmp(V_BSTR(type), regszW)) regtype = REG_SZ; - else if (!strcmpW(V_BSTR(type), regdwordW)) + else if (!wcscmp(V_BSTR(type), regdwordW)) regtype = REG_DWORD; - else if (!strcmpW(V_BSTR(type), regexpandszW)) + else if (!wcscmp(V_BSTR(type), regexpandszW)) regtype = REG_EXPAND_SZ; - else if (!strcmpW(V_BSTR(type), regbinaryW)) + else if (!wcscmp(V_BSTR(type), regbinaryW)) regtype = REG_BINARY; else { FIXME("unrecognized value type %s\n", debugstr_w(V_BSTR(type)));

1 0

Alexandre Julliard : wsnmp32: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 454c4e599c7347c191bb0e9b0808e22acb614477 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454c4e599c7347c191bb0e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:25 2019 +0200 wsnmp32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsnmp32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wsnmp32/Makefile.in b/dlls/wsnmp32/Makefile.in index 6fadba0..db01f47 100644 --- a/dlls/wsnmp32/Makefile.in +++ b/dlls/wsnmp32/Makefile.in @@ -1,4 +1,6 @@ MODULE = wsnmp32.dll IMPORTLIB = wsnmp32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = wsnmp32.c

1 0

Alexandre Julliard : wsock32: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 2490febab4dc6588968537ade50d4a1ddd74d2b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2490febab4dc6588968537ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:44:56 2019 +0200 wsock32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsock32/Makefile.in | 2 ++ dlls/wsock32/protocol.c | 25 +------------------------ dlls/wsock32/service.c | 2 -- dlls/wsock32/socket.c | 2 -- 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index b5a9c43..9a04994 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -2,6 +2,8 @@ MODULE = wsock32.dll IMPORTLIB = wsock32 IMPORTS = mswsock ws2_32 iphlpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ protocol.c \ service.c \ diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 16109e3..637d683 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -19,20 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define USE_WS_PREFIX - -#include "config.h" - #include <stdarg.h> -#include <stdio.h> -#include <string.h> - -#ifdef HAVE_ARPA_INET_H -#include <arpa/inet.h> -#endif -#ifdef HAVE_NETDB_H -#include <netdb.h> -#endif #include "windef.h" #include "winbase.h" @@ -40,7 +27,6 @@ #include "nspapi.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(winsock); @@ -49,13 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); */ UINT WINAPI WSOCK32_inet_network(const char *cp) { -#ifdef HAVE_INET_NETWORK - return inet_network(cp); -#elif defined(HAVE_INET_ADDR) return ntohl( inet_addr( cp ) ); -#else - return 0; -#endif } /***************************************************************************** @@ -63,11 +43,8 @@ UINT WINAPI WSOCK32_inet_network(const char *cp) */ struct netent * WINAPI WSOCK32_getnetbyname(const char *name) { -#ifdef HAVE_GETNETBYNAME - return getnetbyname(name); -#else + ERR( "%s: not supported\n", debugstr_a(name) ); return NULL; -#endif } static DWORD map_service(DWORD wsaflags) diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c index 17fea61..2b6e4e7 100644 --- a/dlls/wsock32/service.c +++ b/dlls/wsock32/service.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 74df2e3..88ddf5b 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : wtsapi32: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 7a750836546efd9096c6883c9a3bff6b6aac9559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a750836546efd9096c6883c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:45:06 2019 +0200 wtsapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wtsapi32/Makefile.in | 2 ++ dlls/wtsapi32/wtsapi32.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wtsapi32/Makefile.in b/dlls/wtsapi32/Makefile.in index e54c088..674db68 100644 --- a/dlls/wtsapi32/Makefile.in +++ b/dlls/wtsapi32/Makefile.in @@ -2,5 +2,7 @@ MODULE = wtsapi32.dll IMPORTLIB = wtsapi32 IMPORTS = advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ wtsapi32.c diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 3edf921..2f5e73d 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -15,7 +15,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdlib.h> #include "windef.h"

1 0

Alexandre Julliard : wuapi: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 8e23f1c7e02a4479e34ece19ab4b1333d4573e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e23f1c7e02a4479e34ece19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:45:26 2019 +0200 wuapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuapi/Makefile.in | 2 ++ dlls/wuapi/downloader.c | 1 - dlls/wuapi/installer.c | 1 - dlls/wuapi/main.c | 1 - dlls/wuapi/searcher.c | 1 - dlls/wuapi/session.c | 1 - dlls/wuapi/systeminfo.c | 1 - dlls/wuapi/updates.c | 1 - 8 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index ea11838..fbabf93 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -1,6 +1,8 @@ MODULE = wuapi.dll IMPORTS = uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ downloader.c \ installer.c \ diff --git a/dlls/wuapi/downloader.c b/dlls/wuapi/downloader.c index e17e155..ff66dd1 100644 --- a/dlls/wuapi/downloader.c +++ b/dlls/wuapi/downloader.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/installer.c b/dlls/wuapi/installer.c index 46c8699..3761482 100644 --- a/dlls/wuapi/installer.c +++ b/dlls/wuapi/installer.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/main.c b/dlls/wuapi/main.c index 0527ee5..c2ed95e 100644 --- a/dlls/wuapi/main.c +++ b/dlls/wuapi/main.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/searcher.c b/dlls/wuapi/searcher.c index 1ca8020..697536b 100644 --- a/dlls/wuapi/searcher.c +++ b/dlls/wuapi/searcher.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/session.c b/dlls/wuapi/session.c index acc7cb0..29365dd 100644 --- a/dlls/wuapi/session.c +++ b/dlls/wuapi/session.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/systeminfo.c b/dlls/wuapi/systeminfo.c index 7c62bed..6424e1b 100644 --- a/dlls/wuapi/systeminfo.c +++ b/dlls/wuapi/systeminfo.c @@ -21,7 +21,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 4f6648c..249f07a 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0