wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Alexandre Julliard : kernel32: Use RtlCompareUnicodeStrings in CompareStringOrdinal for consistent results.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 73d9e2ebffe1a29be287134ed0a15d3fea1f77ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d9e2ebffe1a29be287134ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 17:08:46 2016 +0900 kernel32: Use RtlCompareUnicodeStrings in CompareStringOrdinal for consistent results. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 16 ++-------------- dlls/kernel32/tests/locale.c | 25 ++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index f4ff6d3..66ab213 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3490,7 +3490,7 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, */ INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, INT len2, BOOL ignore_case) { - int ret, len; + int ret; if (!str1 || !str2) { @@ -3500,19 +3500,7 @@ INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2); - len = min(len1, len2); - if (ignore_case) - { - ret = memicmpW(str1, str2, len); - } - else - { - ret = 0; - for (; len > 0; len--) - if ((ret = (*str1++ - *str2++))) break; - } - if (!ret) ret = len1 - len2; - + ret = RtlCompareUnicodeStrings( str1, len1, str2, len2, ignore_case ); if (ret < 0) return CSTR_LESS_THAN; if (ret > 0) return CSTR_GREATER_THAN; return CSTR_EQUAL; diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index dc60d2b..b42b1f8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -71,7 +71,6 @@ static inline BOOL isdigitW( WCHAR wc ) } /* Some functions are only in later versions of kernel32.dll */ -static HMODULE hKernel32; static WORD enumCount; static INT (WINAPI *pGetTimeFormatEx)(LPCWSTR, DWORD, const SYSTEMTIME *, LPCWSTR, LPWSTR, INT); @@ -99,12 +98,13 @@ static INT (WINAPI *pGetGeoInfoW)(GEOID, GEOTYPE, LPWSTR, INT, LANGID); static BOOL (WINAPI *pEnumSystemGeoID)(GEOCLASS, GEOID, GEO_ENUMPROC); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); static BOOL (WINAPI *pGetThreadPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static void InitFunctionPointers(void) { - hKernel32 = GetModuleHandleA("kernel32"); + HMODULE mod = GetModuleHandleA("kernel32"); -#define X(f) p##f = (void*)GetProcAddress(hKernel32, #f) +#define X(f) p##f = (void*)GetProcAddress(mod, #f) X(GetTimeFormatEx); X(GetDateFormatEx); X(EnumSystemLanguageGroupsA); @@ -129,6 +129,9 @@ static void InitFunctionPointers(void) X(EnumSystemGeoID); X(GetSystemPreferredUILanguages); X(GetThreadPreferredUILanguages); + + mod = GetModuleHandleA("ntdll"); + X(RtlUpcaseUnicodeChar); #undef X } @@ -4209,6 +4212,7 @@ static void test_CompareStringOrdinal(void) WCHAR coop2[] = { 'c','o','o','p',0 }; WCHAR nonascii1[] = { 0x0102,0 }; WCHAR nonascii2[] = { 0x0201,0 }; + WCHAR ch1, ch2; if (!pCompareStringOrdinal) { @@ -4265,6 +4269,21 @@ static void test_CompareStringOrdinal(void) ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); ret = pCompareStringOrdinal(nonascii1, -1, nonascii2, -1, TRUE); ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + + for (ch1 = 0; ch1 < 512; ch1++) + { + for (ch2 = 0; ch2 < 1024; ch2++) + { + int diff = ch1 - ch2; + ret = pCompareStringOrdinal( &ch1, 1, &ch2, 1, FALSE ); + ok( ret == (diff > 0 ? CSTR_GREATER_THAN : diff < 0 ? CSTR_LESS_THAN : CSTR_EQUAL), + "wrong result %d %04x %04x\n", ret, ch1, ch2 ); + diff = pRtlUpcaseUnicodeChar( ch1 ) - pRtlUpcaseUnicodeChar( ch2 ); + ret = pCompareStringOrdinal( &ch1, 1, &ch2, 1, TRUE ); + ok( ret == (diff > 0 ? CSTR_GREATER_THAN : diff < 0 ? CSTR_LESS_THAN : CSTR_EQUAL), + "wrong result %d %04x %04x\n", ret, ch1, ch2 ); + } + } } static void test_GetGeoInfo(void)

1 0

Alexandre Julliard : makefiles: Don' t allow import libraries to have an extension.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: f21cb01aa4f61660d5bc9f8843e25ed957c5eaec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21cb01aa4f61660d5bc9f884… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 14:04:20 2016 +0900 makefiles: Don't allow import libraries to have an extension. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 ++-- dlls/hidclass.sys/Makefile.in | 2 +- dlls/mountmgr.sys/Makefile.in | 2 +- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/scsiport.sys/Makefile.in | 2 +- dlls/usbd.sys/Makefile.in | 4 ++-- programs/winedevice/Makefile.in | 2 +- tools/make_makefiles | 1 + 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 5901f60..6151ef8 100755 --- a/configure +++ b/configure @@ -17901,7 +17901,7 @@ wine_fn_config_dll ntdll enable_ntdll implib wine_fn_config_test dlls/ntdll/tests ntdll_test wine_fn_config_dll ntdsapi enable_ntdsapi implib wine_fn_config_test dlls/ntdsapi/tests ntdsapi_test -wine_fn_config_dll ntoskrnl.exe enable_ntoskrnl_exe implib +wine_fn_config_dll ntoskrnl.exe enable_ntoskrnl_exe implib ntoskrnl wine_fn_config_dll ntprint enable_ntprint wine_fn_config_test dlls/ntprint/tests ntprint_test wine_fn_config_dll objsel enable_objsel clean @@ -18047,7 +18047,7 @@ wine_fn_config_dll updspapi enable_updspapi wine_fn_config_dll url enable_url implib wine_fn_config_dll urlmon enable_urlmon clean,implib wine_fn_config_test dlls/urlmon/tests urlmon_test -wine_fn_config_dll usbd.sys enable_usbd_sys implib +wine_fn_config_dll usbd.sys enable_usbd_sys implib usbd wine_fn_config_dll user.exe16 enable_win16 wine_fn_config_dll user32 enable_user32 clean,implib wine_fn_config_test dlls/user32/tests user32_test diff --git a/configure.ac b/configure.ac index 6f0cd70..a2b1705 100644 --- a/configure.ac +++ b/configure.ac @@ -3147,7 +3147,7 @@ WINE_CONFIG_DLL(ntdll,,[implib]) WINE_CONFIG_TEST(dlls/ntdll/tests) WINE_CONFIG_DLL(ntdsapi,,[implib]) WINE_CONFIG_TEST(dlls/ntdsapi/tests) -WINE_CONFIG_DLL(ntoskrnl.exe,,[implib]) +WINE_CONFIG_DLL(ntoskrnl.exe,,[implib],[ntoskrnl]) WINE_CONFIG_DLL(ntprint) WINE_CONFIG_TEST(dlls/ntprint/tests) WINE_CONFIG_DLL(objsel,,[clean]) @@ -3293,7 +3293,7 @@ WINE_CONFIG_DLL(updspapi) WINE_CONFIG_DLL(url,,[implib]) WINE_CONFIG_DLL(urlmon,,[clean,implib]) WINE_CONFIG_TEST(dlls/urlmon/tests) -WINE_CONFIG_DLL(usbd.sys,,[implib]) +WINE_CONFIG_DLL(usbd.sys,,[implib],[usbd]) WINE_CONFIG_DLL(user.exe16,enable_win16) WINE_CONFIG_DLL(user32,,[clean,implib]) WINE_CONFIG_TEST(dlls/user32/tests) diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index 6e79486..e942217 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = ntoskrnl.exe +IMPORTS = ntoskrnl DELAYIMPORTS = setupapi hid C_SRCS = \ diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 1195b5e..bd1c2ee 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = mountmgr.sys -IMPORTS = uuid advapi32 ntoskrnl.exe +IMPORTS = uuid advapi32 ntoskrnl DELAYIMPORTS = user32 EXTRADLLFLAGS = -Wb,--subsystem,native EXTRAINCL = $(DBUS_CFLAGS) $(HAL_CFLAGS) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index adb1327..875be8e 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,5 +1,5 @@ MODULE = ntoskrnl.exe -IMPORTLIB = ntoskrnl.exe +IMPORTLIB = ntoskrnl C_SRCS = \ instr.c \ diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in index c5bc401..5219c3e 100644 --- a/dlls/scsiport.sys/Makefile.in +++ b/dlls/scsiport.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = scsiport.sys -IMPORTS = ntoskrnl.exe +IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ diff --git a/dlls/usbd.sys/Makefile.in b/dlls/usbd.sys/Makefile.in index 81a157b..32e7e71 100644 --- a/dlls/usbd.sys/Makefile.in +++ b/dlls/usbd.sys/Makefile.in @@ -1,6 +1,6 @@ MODULE = usbd.sys -IMPORTLIB = usbd.sys -IMPORTS = ntoskrnl.exe +IMPORTLIB = usbd +IMPORTS = ntoskrnl EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ diff --git a/programs/winedevice/Makefile.in b/programs/winedevice/Makefile.in index fc1ffff..a0a4450 100644 --- a/programs/winedevice/Makefile.in +++ b/programs/winedevice/Makefile.in @@ -1,6 +1,6 @@ MODULE = winedevice.exe APPMODE = -mwindows -municode -IMPORTS = advapi32 ntoskrnl.exe +IMPORTS = advapi32 ntoskrnl C_SRCS = \ device.c diff --git a/tools/make_makefiles b/tools/make_makefiles index a5e8a05..1a01666 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -485,6 +485,7 @@ sub update_makefiles(@) die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll"; } my $implib = $make{"IMPORTLIB"} || ""; + die "Invalid IMPORTLIB name in $file" if $implib =~ /\./; $args .= "," if $is_win16 || defined $make{"=flags"}; $args .= "enable_win16" if $is_win16; $args .= $flag_args;

1 0

Alexandre Julliard : msscript/tests: Add missing makedep pragma.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 509b1eb1623a5221ae2f6b0265db9db1d0145163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509b1eb1623a5221ae2f6b026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 13:53:25 2016 +0900 msscript/tests: Add missing makedep pragma. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/tests/msscript.idl b/dlls/msscript.ocx/tests/msscript.idl index f90219d..c8929be 100644 --- a/dlls/msscript.ocx/tests/msscript.idl +++ b/dlls/msscript.ocx/tests/msscript.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma makedep +#pragma makedep header import "oaidl.idl";

1 0

Jacek Caban : mshtml: Wine Gecko 2.47 release.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 3a16c8bbca2e32c63ef8fee9c37f7cd1e43f1206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a16c8bbca2e32c63ef8fee9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 13 17:40:51 2016 +0200 mshtml: Wine Gecko 2.47 release. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/editor.c | 24 ++--- dlls/mshtml/htmlcurstyle.c | 12 ++- dlls/mshtml/htmldoc.c | 7 +- dlls/mshtml/htmlframebase.c | 18 ++-- dlls/mshtml/htmlwindow.c | 43 +++++--- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mutation.c | 19 ++-- dlls/mshtml/npplugin.c | 10 +- dlls/mshtml/nsembed.c | 17 ++- dlls/mshtml/nsiface.idl | 249 ++++++++++++++++++++++++------------------- dlls/mshtml/nsio.c | 80 +++++++++++--- dlls/mshtml/nsservice.c | 22 ++-- dlls/mshtml/olecmd.c | 2 +- 14 files changed, 320 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a16c8bbca2e32c63ef8f…

1 0

Vincent Povirk : gdiplus: Implement GdipGetImageAttributesAdjustedPalette.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: 7fbf0deedef8f582ad5b84682aa9e5fe7a8a7add URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbf0deedef8f582ad5b84682… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 13 16:42:28 2016 -0500 gdiplus: Implement GdipGetImageAttributesAdjustedPalette. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 3 ++ dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/imageattributes.c | 15 ++++++++++ dlls/gdiplus/tests/image.c | 66 ++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 ++ 6 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9f7ce5f..c163ef9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -264,7 +264,7 @@ 264 stdcall GdipGetHatchForegroundColor(ptr ptr) 265 stdcall GdipGetHatchStyle(ptr ptr) 266 stdcall GdipGetHemfFromMetafile(ptr ptr) -267 stub GdipGetImageAttributesAdjustedPalette +267 stdcall GdipGetImageAttributesAdjustedPalette(ptr ptr long) 268 stdcall GdipGetImageBounds(ptr ptr ptr) 269 stdcall GdipGetImageDecoders(long long ptr) 270 stdcall GdipGetImageDecodersSize(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9b29d88..22478a3 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -176,6 +176,9 @@ extern GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; +extern PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, + UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) DECLSPEC_HIDDEN; + struct GpMatrix{ REAL matrix[6]; }; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8353809..c74f2eb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -661,7 +661,7 @@ static BOOL color_is_gray(ARGB color) } /* returns preferred pixel format for the applied attributes */ -static PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, +PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) { UINT x, y; diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index 2917b46..a76fe3b 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -77,6 +77,21 @@ GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) return Ok; } +GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes *imageattr, + ColorPalette *palette, ColorAdjustType type) +{ + TRACE("(%p,%p,%u)\n", imageattr, palette, type); + + if (!imageattr || !palette || !palette->Count || + type >= ColorAdjustTypeCount || type == ColorAdjustTypeDefault) + return InvalidParameter; + + apply_image_attributes(imageattr, (LPBYTE)palette->Entries, palette->Count, 1, 0, + type, PixelFormat32bppARGB); + + return Ok; +} + GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes *imageattr, ColorAdjustType type, BOOL enableFlag, ARGB colorLow, ARGB colorHigh) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 6a51714..be93a20 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4725,6 +4725,71 @@ static void test_createeffect(void) } } +static void test_getadjustedpalette(void) +{ + ColorMap colormap; + GpImageAttributes *imageattributes; + ColorPalette *palette; + GpStatus stat; + + stat = GdipCreateImageAttributes(&imageattributes); + expect(Ok, stat); + + colormap.oldColor.Argb = 0xffffff00; + colormap.newColor.Argb = 0xffff00ff; + stat = GdipSetImageAttributesRemapTable(imageattributes, ColorAdjustTypeBitmap, + TRUE, 1, &colormap); + expect(Ok, stat); + + colormap.oldColor.Argb = 0xffffff80; + colormap.newColor.Argb = 0xffff80ff; + stat = GdipSetImageAttributesRemapTable(imageattributes, ColorAdjustTypeDefault, + TRUE, 1, &colormap); + expect(Ok, stat); + + palette = GdipAlloc(sizeof(*palette) + sizeof(ARGB) * 2); + palette->Count = 0; + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeBitmap); + expect(InvalidParameter, stat); + + palette->Count = 3; + palette->Entries[0] = 0xffffff00; + palette->Entries[1] = 0xffffff80; + palette->Entries[2] = 0xffffffff; + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeBitmap); + expect(Ok, stat); + expect(0xffff00ff, palette->Entries[0]); + expect(0xffffff80, palette->Entries[1]); + expect(0xffffffff, palette->Entries[2]); + + palette->Entries[0] = 0xffffff00; + palette->Entries[1] = 0xffffff80; + palette->Entries[2] = 0xffffffff; + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeBrush); + expect(Ok, stat); + expect(0xffffff00, palette->Entries[0]); + expect(0xffff80ff, palette->Entries[1]); + expect(0xffffffff, palette->Entries[2]); + + stat = GdipGetImageAttributesAdjustedPalette(NULL, palette, ColorAdjustTypeBitmap); + expect(InvalidParameter, stat); + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, NULL, ColorAdjustTypeBitmap); + expect(InvalidParameter, stat); + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, -1); + expect(InvalidParameter, stat); + + stat = GdipGetImageAttributesAdjustedPalette(imageattributes, palette, ColorAdjustTypeDefault); + expect(InvalidParameter, stat); + + GdipFree(palette); + GdipDisposeImageAttributes(imageattributes); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4782,6 +4847,7 @@ START_TEST(image) test_colorkey(); test_dispose(); test_createeffect(); + test_getadjustedpalette(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 2e22ff4..c6f16c4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -436,6 +436,8 @@ GpStatus WINGDIPAPI GdipSetPropertyItem(GpImage*,GDIPCONST PropertyItem*); /* ImageAttributes */ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); +GpStatus WINGDIPAPI GdipGetImageAttributesAdjustedPalette(GpImageAttributes*, + ColorPalette*,ColorAdjustType); GpStatus WINGDIPAPI GdipSetImageAttributesCachedBackground(GpImageAttributes*, BOOL); GpStatus WINGDIPAPI GdipSetImageAttributesColorKeys(GpImageAttributes*,

1 0

David Lawrie : winejoystick.drv/joystick_osx.c: Adds multi-axis controller.
by Alexandre Julliard 14 Jun '16

14 Jun '16

Module: wine Branch: master Commit: e06bbf0d54fcddc952d079e1f645da65bbb22746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06bbf0d54fcddc952d079e1f… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Sun Jun 12 22:11:19 2016 -0700 winejoystick.drv/joystick_osx.c: Adds multi-axis controller. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 48c05a0..a58c9cf 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -263,7 +263,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ int usage = IOHIDElementGetUsage(element); if (usage_page == kHIDPage_GenericDesktop && - (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad)) + (usage == kHIDUsage_GD_Joystick || usage == kHIDUsage_GD_GamePad || usage == kHIDUsage_GD_MultiAxisController)) { CFArrayAppendValue(main_elements, element); total++; @@ -283,7 +283,7 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ static int find_osx_devices(void) { IOHIDManagerRef hid_manager; - int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad }; + int usages[] = { kHIDUsage_GD_Joystick, kHIDUsage_GD_GamePad, kHIDUsage_GD_MultiAxisController }; int i; CFDictionaryRef matching_dicts[sizeof(usages) / sizeof(usages[0])]; CFArrayRef matching;

1 0

Julian Rüger : German translation for release 1.9.12
by Jeremy Newman 14 Jun '16

14 Jun '16

Module: website Branch: master Commit: b8bd8b76da4d3fcf23ca03bdb9a9d53ad99f7b6d URL: http://source.winehq.org/git/website.git/?a=commit;h=b8bd8b76da4d3fcf23ca03… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Jun 11 21:59:09 2016 +0200 German translation for release 1.9.12 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016061001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016061001.xml b/news/de/2016061001.xml new file mode 100644 index 0000000..9ac8396 --- /dev/null +++ b/news/de/2016061001.xml @@ -0,0 +1,17 @@ +<news> +<date>10. Juni 2016</date> +<title>Wine 1.9.12 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Fehlerkorrektur-Update der Mono-Engine.</li> + <li>Anfängliche Version einer Taskleiste im Desktopmodus.</li> + <li>Korrekturen für Sprachen mit Schreibrichtung von rechts nach links in Uniscribe.</li> + <li>Mehr Shader-Model-4-Unterstützung in Direct3D.</li> + <li>Bessere Metafile-Unterstützung in RichEdit.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.12.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.9.12
by Jeremy Newman 14 Jun '16

14 Jun '16

Module: website Branch: master Commit: f052a7867877c8ea1ec047c031d5c31c8a476dc9 URL: http://source.winehq.org/git/website.git/?a=commit;h=f052a7867877c8ea1ec047… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Jun 11 06:27:22 2016 +0200 Polish translation for release 1.9.12 Signed-off-by: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016061001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2016061001.xml b/news/pl/2016061001.xml new file mode 100644 index 0000000..32c1d5d --- /dev/null +++ b/news/pl/2016061001.xml @@ -0,0 +1,17 @@ +<news> +<date>Czerwiec 10, 2016</date> +<title>Wydano Wine 1.9.12</title> +<body> + Wydanie rozwojowe Wine 1.9.12 jest już dostępne. + <a href="{$root}/announce/1.9.12">Co nowego</a> w tym wydaniu: +<ul> + <li>Uaktualnienie z poprawkami błędów dla silnika Mono.</li> + <li>Początkowa wersja paska zadań w trybie pulpitu.</li> + <li>Poprawki w Uniscribe dla języków od-prawej-do-lewej.</li> + <li>Szersze wsparcie Modelu Cieniującego 4 w Direct3D.</li> + <li>Lepsza obsługa plików meta w RichEdit.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.12.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Henri Verbeet : usp10: Replace zero-width glyphs with 0x20 when psa-> fNoGlyphIndex is set in ScriptShapeOpenType().
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 5098bddf90033fdbfd82e9d3c55a9dd63505eba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5098bddf90033fdbfd82e9d3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 10 00:44:39 2016 +0200 usp10: Replace zero-width glyphs with 0x20 when psa->fNoGlyphIndex is set in ScriptShapeOpenType(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 21 ++++++++++++++++----- dlls/usp10/usp10.c | 14 +++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d68b515..bb044ce 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1696,7 +1696,8 @@ static void test_ScriptShape(HDC hdc) for (i = 0; i < 2; i++) { static const WCHAR space[] = {' ', 0}; - static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, 0x200e, 0x200f, /* LRM, RLM */ + static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, + 0x200b, 0x200c, 0x200d, 0x200e, 0x200f, /* ZWSP, ZWNJ, ZWJ, LRM, RLM */ 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0}; /* LRE, RLE, PDF, LRO, RLO */ HFONT font, oldfont = NULL; LOGFONTA lf; @@ -1740,10 +1741,20 @@ static void test_ScriptShape(HDC hdc) ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); - ok(glyphs2[0] == blanks[j], - "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); - ok(!attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", - lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + if (blanks[j] == 0x200b || blanks[j] == 0x200c || blanks[j] == 0x200d) + { + ok(glyphs2[0] == 0x0020, + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); + ok(attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + } + else + { + ok(glyphs2[0] == blanks[j], + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); + ok(!attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + } } if (oldfont) DeleteObject(SelectObject(hdc, oldfont)); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7038e8c..f5eba8d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1266,6 +1266,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { #define Numeric_space 0x0020 +#define ZWSP 0x200B #define ZWNJ 0x200C #define ZWJ 0x200D @@ -3176,8 +3177,19 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (rtl) idx = cChars - 1 - i; pwOutGlyphs[i] = pwcChars[idx]; + if (!psa) + continue; + /* overwrite some basic control glyphs to blank */ - if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control) + if (psa->fNoGlyphIndex) + { + if (pwcChars[idx] == ZWSP || pwcChars[idx] == ZWNJ || pwcChars[idx] == ZWJ) + { + pwOutGlyphs[i] = 0x20; + pOutGlyphProps[i].sva.fZeroWidth = 1; + } + } + else if (psa->eScript == Script_Control) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C)

1 0

Henri Verbeet : usp10: Replace more control characters with blanks.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 9f5389de150c1be3f2d0cb1e9af567b8f9ef2eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5389de150c1be3f2d0cb1e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 10 00:44:38 2016 +0200 usp10: Replace more control characters with blanks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 3 ++- dlls/usp10/usp10.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0014b1c..d68b515 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1696,7 +1696,8 @@ static void test_ScriptShape(HDC hdc) for (i = 0; i < 2; i++) { static const WCHAR space[] = {' ', 0}; - static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001C, 0x001D, 0x001E, 0x001F,0}; + static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, 0x200e, 0x200f, /* LRM, RLM */ + 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0}; /* LRE, RLE, PDF, LRO, RLO */ HFONT font, oldfont = NULL; LOGFONTA lf; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 07c2175..7038e8c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3177,8 +3177,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, pwOutGlyphs[i] = pwcChars[idx]; /* overwrite some basic control glyphs to blank */ - if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control && - pwcChars[idx] < ((ScriptCache *)*psc)->tm.tmFirstChar) + if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C)

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016