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

Alexandre Julliard : hid: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: f534ccba00998861ec733d0e0e0f279dfb0bc8ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=f534ccba00998861ec733d0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:35:57 2019 +0200 hid: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/Makefile.in | 2 ++ dlls/hid/hidd.c | 1 - dlls/hid/hidp.c | 1 - dlls/hid/main.c | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hid/Makefile.in b/dlls/hid/Makefile.in index 97ae959..c9ae5f0 100644 --- a/dlls/hid/Makefile.in +++ b/dlls/hid/Makefile.in @@ -1,6 +1,8 @@ MODULE = hid.dll IMPORTLIB = hid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hidd.c \ hidp.c \ diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 711aff2..16b3a3f 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index c780dbe..8f4a474 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> diff --git a/dlls/hid/main.c b/dlls/hid/main.c index 1e38220..6c53f11 100644 --- a/dlls/hid/main.c +++ b/dlls/hid/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : hnetcfg: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: 4572f1674a5158feaf3385830d5165cc74185d04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4572f1674a5158feaf338583… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:37:27 2019 +0200 hnetcfg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/Makefile.in | 2 ++ dlls/hnetcfg/apps.c | 2 -- dlls/hnetcfg/manager.c | 2 -- dlls/hnetcfg/policy.c | 2 -- dlls/hnetcfg/port.c | 2 -- dlls/hnetcfg/profile.c | 2 -- dlls/hnetcfg/service.c | 2 -- 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index e4960ab..2164c6a 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -1,6 +1,8 @@ MODULE = hnetcfg.dll IMPORTS = oleaut32 ole32 advapi32 mpr uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ apps.c \ hnetcfg.c \ diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 9972468..b6447cf 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -31,7 +30,6 @@ #include "wine/debug.h" #include "wine/heap.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 2d89479..2c0790a 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index 26b7cc1..1f5b0da 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 2bb589a..b0821d4 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -31,7 +30,6 @@ #include "wine/heap.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c index 835e82e..d0e9f48 100644 --- a/dlls/hnetcfg/profile.c +++ b/dlls/hnetcfg/profile.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg); diff --git a/dlls/hnetcfg/service.c b/dlls/hnetcfg/service.c index fa214b6..5bfeeda 100644 --- a/dlls/hnetcfg/service.c +++ b/dlls/hnetcfg/service.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include <stdio.h> @@ -29,7 +28,6 @@ #include "netfw.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "hnetcfg_private.h" WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);

1 0

Alexandre Julliard : hlink: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: b14dffa60cb42ef95323013d254bf1a18e032abe URL: https://source.winehq.org/git/wine.git/?a=commit;h=b14dffa60cb42ef95323013d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:37:02 2019 +0200 hlink: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/Makefile.in | 2 ++ dlls/hlink/extserv.c | 3 +-- dlls/hlink/hlink_main.c | 10 +++++----- dlls/hlink/hlink_private.h | 5 ++--- dlls/hlink/link.c | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/hlink/Makefile.in b/dlls/hlink/Makefile.in index 4aeb761..d1b4693 100644 --- a/dlls/hlink/Makefile.in +++ b/dlls/hlink/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = hlink IMPORTS = uuid shell32 ole32 advapi32 DELAYIMPORTS = urlmon +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ browse_ctx.c \ extserv.c \ diff --git a/dlls/hlink/extserv.c b/dlls/hlink/extserv.c index 3a97fa9..98af4c1 100644 --- a/dlls/hlink/extserv.c +++ b/dlls/hlink/extserv.c @@ -19,7 +19,6 @@ #include "hlink_private.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(hlink); @@ -243,7 +242,7 @@ static HRESULT ExtServ_ImplSetAdditionalHeaders(ExtensionService* This, LPCWSTR if (!pwzAdditionalHeaders) return S_OK; - len = strlenW(pwzAdditionalHeaders); + len = lstrlenW(pwzAdditionalHeaders); if(len && pwzAdditionalHeaders[len-1] != '\n' && pwzAdditionalHeaders[len-1] != '\r') { static const WCHAR endlW[] = {'\r','\n',0}; diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index 4af5961..be63936 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -119,7 +119,7 @@ HRESULT WINAPI HlinkCreateFromString( LPCWSTR pwzTarget, LPCWSTR pwzLocation, if (pwzTarget) { - hash = strchrW(pwzTarget, '#'); + hash = wcschr(pwzTarget, '#'); if (hash) { if (hash == pwzTarget) @@ -280,11 +280,11 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) if(!pwzFileName) return E_INVALIDARG; - len = strlenW(pwzFileName)-4; + len = lstrlenW(pwzFileName)-4; if(len < 0) return S_FALSE; - return strcmpiW(pwzFileName+len, url_ext) ? S_FALSE : S_OK; + return wcsicmp(pwzFileName+len, url_ext) ? S_FALSE : S_OK; } /*********************************************************************** @@ -389,7 +389,7 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo if(fNoForceAbs) FIXME("Unsupported fNoForceAbs\n"); - if(!strncmpiW(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { + if(!wcsnicmp(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { pwzDisplayName += ARRAY_SIZE(file_colonW); eaten += ARRAY_SIZE(file_colonW); @@ -409,7 +409,7 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo hres = CreateFileMoniker(pwzDisplayName, ppimk); if(SUCCEEDED(hres)) - *pcchEaten = eaten + strlenW(pwzDisplayName); + *pcchEaten = eaten + lstrlenW(pwzDisplayName); return hres; } diff --git a/dlls/hlink/hlink_private.h b/dlls/hlink/hlink_private.h index 1b7847b..565c264 100644 --- a/dlls/hlink/hlink_private.h +++ b/dlls/hlink/hlink_private.h @@ -28,7 +28,6 @@ #include "hlink.h" #include "wine/heap.h" -#include "wine/unicode.h" extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; @@ -40,7 +39,7 @@ static inline LPWSTR hlink_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); memcpy(ret, str, size); } @@ -55,7 +54,7 @@ static inline LPWSTR hlink_co_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = CoTaskMemAlloc(size); memcpy(ret, str, size); } diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index e3de764..e11db12 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -242,7 +242,7 @@ static HRESULT WINAPI IHlink_fnSetMonikerReference( IHlink* iface, CreateBindCtx( 0, &pbc); IMoniker_GetDisplayName(This->Moniker, pbc, NULL, &display_name); IBindCtx_Release(pbc); - This->absolute = display_name && strchrW(display_name, ':'); + This->absolute = display_name && wcschr(display_name, ':'); CoTaskMemFree(display_name); } } @@ -290,7 +290,7 @@ static HRESULT WINAPI IHlink_fnSetStringReference(IHlink* iface, if (FAILED(r)) { - LPCWSTR p = strchrW(pwzTarget, ':'); + LPCWSTR p = wcschr(pwzTarget, ':'); if (p && (p - pwzTarget > 1)) r = CreateURLMoniker(NULL, pwzTarget, &pMon); else @@ -739,7 +739,7 @@ static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) TRACE("(%p, %s)\n", pStm, debugstr_w(str)); - len = strlenW(str) + 1; + len = lstrlenW(str) + 1; hr = IStream_Write(pStm, &len, sizeof(len), NULL); if (FAILED(hr)) return hr; @@ -752,7 +752,7 @@ static HRESULT write_hlink_string(IStream *pStm, LPCWSTR str) static inline ULONG size_hlink_string(LPCWSTR str) { - return sizeof(DWORD) + (strlenW(str) + 1) * sizeof(WCHAR); + return sizeof(DWORD) + (lstrlenW(str) + 1) * sizeof(WCHAR); } static HRESULT read_hlink_string(IStream *pStm, LPWSTR *out_str)

1 0

Alexandre Julliard : hidclass.sys: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: af0e0d9b6212da9cb20a9a57608dd676842bd737 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af0e0d9b6212da9cb20a9a57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:36:39 2019 +0200 hidclass.sys: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/Makefile.in | 2 ++ dlls/hidclass.sys/buffer.c | 1 - dlls/hidclass.sys/descriptor.c | 2 -- dlls/hidclass.sys/device.c | 5 +---- dlls/hidclass.sys/main.c | 1 - dlls/hidclass.sys/pnp.c | 20 ++++++++++---------- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index 209c2df..be4af74 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = hidclass IMPORTS = hal ntoskrnl DELAYIMPORTS = setupapi hid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ buffer.c \ descriptor.c \ diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 731f1e0..eccc3ed 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #define NONAMELESSUNION #include "hid.h" diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 12f7ebd..5e164f3 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> #include <stdio.h> diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 4495300..86b6d1b 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -18,13 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "hid.h" -#include "wine/unicode.h" #include "winreg.h" #include "winuser.h" #include "setupapi.h" @@ -50,7 +47,7 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT NTSTATUS status; BASE_DEVICE_EXTENSION *ext; - sprintfW(dev_name, device_name_fmtW, driver->DriverObject, native_device); + swprintf(dev_name, ARRAY_SIZE(dev_name), device_name_fmtW, driver->DriverObject, native_device); RtlInitUnicodeString( &nameW, dev_name ); TRACE("Create base hid device %s\n", debugstr_w(dev_name)); diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index 8bb423b..1c7a3ca 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -23,7 +23,6 @@ #include <stdarg.h> #include "hid.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index a283d63..363d82d 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -26,7 +26,6 @@ #include "ddk/wdm.h" #include "regstr.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(hid); @@ -191,14 +190,15 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ext->information.DescriptorSize = ext->preparseData->dwSize; lstrcpyW(ext->instance_id, device_enumeratorW); - strcatW(ext->instance_id, separator_W); + lstrcatW(ext->instance_id, separator_W); /* Skip the original enumerator */ - id_ptr = strchrW(PDO_id, '\\'); + id_ptr = wcschr(PDO_id, '\\'); id_ptr++; - strcatW(ext->instance_id, id_ptr); + lstrcatW(ext->instance_id, id_ptr); HeapFree(GetProcessHeap(), 0, PDO_id); - sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID); + swprintf(ext->device_id, ARRAY_SIZE(ext->device_id), device_deviceid_fmtW, + device_enumeratorW, ext->information.VendorID, ext->information.ProductID); HID_LinkDevice(device); @@ -262,13 +262,13 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) WCHAR *ptr; ptr = id; /* Instance ID */ - strcpyW(ptr, ext->instance_id); + lstrcpyW(ptr, ext->instance_id); ptr += lstrlenW(ext->instance_id) + 1; /* Device ID */ - strcpyW(ptr, ext->device_id); + lstrcpyW(ptr, ext->device_id); ptr += lstrlenW(ext->device_id) + 1; /* Bus ID */ - strcpyW(ptr, device_enumeratorW); + lstrcpyW(ptr, device_enumeratorW); ptr += lstrlenW(device_enumeratorW) + 1; *ptr = 0; irp->IoStatus.Information = (ULONG_PTR)id; @@ -276,12 +276,12 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) break; } case BusQueryDeviceID: - strcpyW(id, ext->device_id); + lstrcpyW(id, ext->device_id); irp->IoStatus.Information = (ULONG_PTR)id; rc = STATUS_SUCCESS; break; case BusQueryInstanceID: - strcpyW(id, ext->instance_id); + lstrcpyW(id, ext->instance_id); irp->IoStatus.Information = (ULONG_PTR)id; rc = STATUS_SUCCESS; break;

1 0

Alexandre Julliard : hhctrl.ocx: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: 4150b6660e3fbcf89ce2ad7f1e1ec1fb1ea83536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4150b6660e3fbcf89ce2ad7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:35:40 2019 +0200 hhctrl.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hhctrl.ocx/Makefile.in | 2 ++ dlls/hhctrl.ocx/chm.c | 22 +++++++++++----------- dlls/hhctrl.ocx/content.c | 2 +- dlls/hhctrl.ocx/help.c | 10 +++++----- dlls/hhctrl.ocx/hhctrl.c | 12 ++++++------ dlls/hhctrl.ocx/hhctrl.h | 3 +-- dlls/hhctrl.ocx/index.c | 4 ++-- dlls/hhctrl.ocx/search.c | 10 +++++----- 8 files changed, 33 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4150b6660e3fbcf89ce2…

1 0

Alexandre Julliard : ifsmgr.vxd: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: 5a91b907ef85427ee98b5da5dbd6e01de7274584 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a91b907ef85427ee98b5da5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:20 2019 +0200 ifsmgr.vxd: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ifsmgr.vxd/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ifsmgr.vxd/Makefile.in b/dlls/ifsmgr.vxd/Makefile.in index 65c6be2..be1afa3 100644 --- a/dlls/ifsmgr.vxd/Makefile.in +++ b/dlls/ifsmgr.vxd/Makefile.in @@ -1,5 +1,7 @@ MODULE = ifsmgr.vxd IMPORTS = kernel +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ ifsmgr.c

1 0

Alexandre Julliard : ieproxy: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: 485d95c7e2f2cde2089ee396e2d86bbc235bf5dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=485d95c7e2f2cde2089ee396… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:12 2019 +0200 ieproxy: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieproxy/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in index 00c5fd1..661cf92 100644 --- a/dlls/ieproxy/Makefile.in +++ b/dlls/ieproxy/Makefile.in @@ -1,6 +1,8 @@ MODULE = ieproxy.dll IMPORTS = uuid ole32 rpcrt4 +EXTRADLLFLAGS = -mno-cygwin + IDL_SRCS = \ ieproxy_ieautomation.idl \ ieproxy_perhist.idl

1 0

Alexandre Julliard : ieframe: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: 0cc13be47c8625f2137c3bfa6b9cb5b6336e2a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cc13be47c8625f2137c3bfa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:04 2019 +0200 ieframe: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/Makefile.in | 2 ++ dlls/ieframe/dochost.c | 2 +- dlls/ieframe/ieframe.h | 5 ++--- dlls/ieframe/iexplore.c | 14 +++++++------- dlls/ieframe/intshcut.c | 12 ++++++------ dlls/ieframe/navigate.c | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 4b1005d..6103714 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -2,6 +2,8 @@ MODULE = ieframe.dll IMPORTLIB = ieframe IMPORTS = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ classinfo.c \ client.c \ diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 389c0af..46d5cc5 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -427,7 +427,7 @@ static void update_travellog(DocHost *This) static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; - if(This->url && !strncmpiW(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { + if(This->url && !wcsnicmp(This->url, about_schemeW, ARRAY_SIZE(about_schemeW))) { TRACE("Skipping about URL\n"); return; } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 8adf47e..2b4861d 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -37,7 +37,6 @@ #include "shdeprecated.h" #include "docobjectservice.h" -#include "wine/unicode.h" #include "wine/heap.h" #include "wine/list.h" @@ -342,7 +341,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) if(str) { DWORD size; - size = (strlenW(str)+1)*sizeof(WCHAR); + size = (lstrlenW(str)+1)*sizeof(WCHAR); ret = heap_alloc(size); if(ret) memcpy(ret, str, size); @@ -353,7 +352,7 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) static inline LPWSTR co_strdupW(LPCWSTR str) { - WCHAR *ret = CoTaskMemAlloc((strlenW(str) + 1)*sizeof(WCHAR)); + WCHAR *ret = CoTaskMemAlloc((lstrlenW(str) + 1)*sizeof(WCHAR)); if (ret) lstrcpyW(ret, str); return ret; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 4f3df13..00883c8 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -957,7 +957,7 @@ static BOOL create_ie_window(BOOL nohome, const WCHAR *cmdline) VARIANT var_url; int cmdlen; - cmdlen = strlenW(cmdline); + cmdlen = lstrlenW(cmdline); if(cmdlen > 2 && cmdline[0] == '"' && cmdline[cmdlen-1] == '"') { cmdline++; cmdlen -= 2; @@ -988,18 +988,18 @@ static HDDEDATA open_dde_url(WCHAR *dde_url) url = dde_url; if(*url == '"') { url++; - url_end = strchrW(url, '"'); + url_end = wcschr(url, '"'); if(!url_end) { FIXME("missing string terminator\n"); return 0; } *url_end = 0; }else { - url_end = strchrW(url, ','); + url_end = wcschr(url, ','); if(url_end) *url_end = 0; else - url_end = url + strlenW(url); + url_end = url + lstrlenW(url); } LIST_FOR_EACH_ENTRY(iter, &ie_list, InternetExplorer, entry) { @@ -1149,11 +1149,11 @@ DWORD WINAPI IEWinMain(const WCHAR *cmdline, int nShowWindow) while (cmdline[length] && cmdline[length] != ' ' && cmdline[length] != '\t') length++; - if (!strncmpiW(cmdline, embeddingW, length)) + if (!wcsnicmp(cmdline, embeddingW, length)) embedding = TRUE; - else if (!strncmpiW(cmdline, nohomeW, length)) + else if (!wcsnicmp(cmdline, nohomeW, length)) nohome = TRUE; - else if (!strncmpiW(cmdline, startmanagerW, length)) + else if (!wcsnicmp(cmdline, startmanagerW, length)) manager = TRUE; else break; diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 8bf8ae8..13a5582 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -94,15 +94,15 @@ static BOOL run_winemenubuilder( const WCHAR *args ) void *redir; GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( menubuilder )); - strcatW( app, menubuilder ); + lstrcatW( app, menubuilder ); - len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); + len = (lstrlenW( app ) + lstrlenW( args ) + 1) * sizeof(WCHAR); buffer = heap_alloc( len ); if( !buffer ) return FALSE; - strcpyW( buffer, app ); - strcatW( buffer, args ); + lstrcpyW( buffer, app ); + lstrcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); @@ -136,7 +136,7 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) if( !buffer ) return FALSE; - sprintfW( buffer, szFormat, szLink ); + swprintf( buffer, len / sizeof(WCHAR), szFormat, szLink ); ret = run_winemenubuilder( buffer ); heap_free( buffer ); return ret; @@ -521,7 +521,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam int iconindex; PROPSPEC ps; PROPVARIANT pv; - iconindex = strtolW(iconindexstring, NULL, 10); + iconindex = wcstol(iconindexstring, NULL, 10); ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 48187d9..9efdacc 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -111,7 +111,7 @@ static void set_status_text(BindStatusCallback *This, ULONG statuscode, LPCWSTR fmt[0] = 0; /* the format string must have one "%s" for the str */ LoadStringW(ieframe_instance, IDS_STATUSFMT_FIRST + statuscode, fmt, IDS_STATUSFMT_MAXLEN); - snprintfW(buffer, ARRAY_SIZE(buffer), fmt, str); + swprintf(buffer, ARRAY_SIZE(buffer), fmt, str); } V_VT(&arg) = VT_BSTR; @@ -466,7 +466,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, dwReserved, pszAdditionalHeaders); if(This->headers) { - int size = (strlenW(This->headers)+1)*sizeof(WCHAR); + int size = (lstrlenW(This->headers)+1)*sizeof(WCHAR); *pszAdditionalHeaders = CoTaskMemAlloc(size); memcpy(*pszAdditionalHeaders, This->headers, size); }

1 0

Alexandre Julliard : gdiplus: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: a22d61332181e04cc4a145e818434235fc3747b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a22d61332181e04cc4a145e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:32:33 2019 +0200 gdiplus: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/Makefile.in | 2 ++ dlls/gdiplus/font.c | 9 ++++----- dlls/gdiplus/graphics.c | 9 ++++----- dlls/gdiplus/metafile.c | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index ac12bd1..e73e7d4 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -3,6 +3,8 @@ IMPORTLIB = gdiplus IMPORTS = uuid shlwapi ole32 user32 gdi32 DELAYIMPORTS = windowscodecs +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ brush.c \ customlinecap.c \ diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 5e6aa54..eee2720 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -25,7 +25,6 @@ #include "winnls.h" #include "winreg.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); @@ -507,7 +506,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = 0; - strcpyW(lf->lfFaceName, font->family->FamilyName); + lstrcpyW(lf->lfFaceName, font->family->FamilyName); TRACE("=> %s,%d\n", debugstr_w(lf->lfFaceName), lf->lfHeight); @@ -710,7 +709,7 @@ static GpStatus find_installed_font(const WCHAR *name, struct font_metrics *fm) { HFONT hfont, old_font; - strcpyW(fm->facename, lf.lfFaceName); + lstrcpyW(fm->facename, lf.lfFaceName); hfont = CreateFontIndirectW(&lf); old_font = SelectObject(hdc, hfont); @@ -1632,7 +1631,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (lfw->lfFaceName[0] == '@') return 1; - if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) + if (fonts->count && wcsicmp(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) return 1; if (fonts->allocated == fonts->count) @@ -1664,7 +1663,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, /* skip duplicates */ for (i=0; i<fonts->count; i++) { - if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) + if (wcsicmp(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) { GdipDeleteFontFamily(family); return 1; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3216a3e..3c83278 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" -#include "wine/unicode.h" #define COBJMACROS #include "objbase.h" @@ -2225,7 +2224,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf) lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = 0; - strcpyW(lf->lfFaceName, font->family->FamilyName); + lstrcpyW(lf->lfFaceName, font->family->FamilyName); } static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, @@ -5114,7 +5113,7 @@ GpStatus gdip_format_string(HDC hdc, for(i = 0, j = 0; i < length; i++){ /* FIXME: This makes the indexes passed to callback inaccurate. */ - if(!isprintW(string[i]) && (string[i] != '\n')) + if(!iswprint(string[i]) && (string[i] != '\n')) continue; /* FIXME: tabs should be handled using tabstops from stringformat */ @@ -6941,7 +6940,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT return InvalidParameter; if (length == -1) - length = strlenW(text); + length = lstrlenW(text); if (length == 0) { @@ -7302,7 +7301,7 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, GpStatus stat = NotImplemented; if (length == -1) - length = strlenW(text); + length = lstrlenW(text); if (graphics->hdc && !graphics->alpha_hdc && ((flags & DriverStringOptionsRealizedAdvance) || length <= 1) && diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index b65e456..47d5ac5 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/unicode.h" #define COBJMACROS #include "objbase.h"

1 0

Alexandre Julliard : gameux: Build with msvcrt.
by Alexandre Julliard June 5, 2019

June 5, 2019

Module: wine Branch: master Commit: cd01ad223dac6f6f37423c071f43b11f796fd481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd01ad223dac6f6f37423c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:32:04 2019 +0200 gameux: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/Makefile.in | 2 ++ dlls/gameux/factory.c | 1 - dlls/gameux/gameexplorer.c | 1 - dlls/gameux/gamestatistics.c | 1 - dlls/gameux/main.c | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in index 7c5a2d1..b423c86 100644 --- a/dlls/gameux/Makefile.in +++ b/dlls/gameux/Makefile.in @@ -1,6 +1,8 @@ MODULE = gameux.dll IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ factory.c \ gameexplorer.c \ diff --git a/dlls/gameux/factory.c b/dlls/gameux/factory.c index 5e8d1c6..d9ac6de 100644 --- a/dlls/gameux/factory.c +++ b/dlls/gameux/factory.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 6495c78..8b62c72 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#include "config.h" #include "ole2.h" #include "sddl.h" diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 0ee449a..7189261 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#include "config.h" #include "ole2.h" #include "winreg.h" diff --git a/dlls/gameux/main.c b/dlls/gameux/main.c index 28bc11e..0d68785 100644 --- a/dlls/gameux/main.c +++ b/dlls/gameux/main.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #define COBJMACROS

1 0