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

Alexandre Julliard : ieproxy: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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 : ifsmgr.vxd: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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 : gpkcsp: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: 38bddcbebcf4915e3d789a70e64544089f0cb697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38bddcbebcf4915e3d789a70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:32:41 2019 +0200 gpkcsp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gpkcsp/Makefile.in | 2 ++ dlls/gpkcsp/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gpkcsp/Makefile.in b/dlls/gpkcsp/Makefile.in index f7727a2..fbd4008 100644 --- a/dlls/gpkcsp/Makefile.in +++ b/dlls/gpkcsp/Makefile.in @@ -1,4 +1,6 @@ MODULE = gpkcsp.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/gpkcsp/main.c b/dlls/gpkcsp/main.c index 5a2185c..52d9112 100644 --- a/dlls/gpkcsp/main.c +++ b/dlls/gpkcsp/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

Alexandre Julliard : hal: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: c06ca29d4f0d3cfd1c150811fab7ce8de704d1ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06ca29d4f0d3cfd1c150811… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:34:45 2019 +0200 hal: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/Makefile.in | 2 ++ dlls/hal/hal.c | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/hal/Makefile.in b/dlls/hal/Makefile.in index 63211a1..8b28959 100644 --- a/dlls/hal/Makefile.in +++ b/dlls/hal/Makefile.in @@ -2,6 +2,8 @@ MODULE = hal.dll IMPORTLIB = hal IMPORTS = ntoskrnl +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hal.c diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 6fe3e29..21ce6e1 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include "ntstatus.h"

1 0

Alexandre Julliard : hhctrl.ocx: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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 : hid: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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 : hidclass.sys: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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 : imaadp32.acm: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

Module: wine Branch: master Commit: d78e2d0c8d0293a38e1fcab6208cd59ab01f02e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d78e2d0c8d0293a38e1fcab6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:39:33 2019 +0200 imaadp32.acm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/imaadp32.acm/Makefile.in b/dlls/imaadp32.acm/Makefile.in index ff982fd..967a690 100644 --- a/dlls/imaadp32.acm/Makefile.in +++ b/dlls/imaadp32.acm/Makefile.in @@ -1,4 +1,6 @@ MODULE = imaadp32.acm IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = imaadp32.c

1 0

Alexandre Julliard : gameux: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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

Alexandre Julliard : gdiplus: Build with msvcrt.
by Alexandre Julliard 05 Jun '19

05 Jun '19

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