August 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite: Handle zero specified weight as normal.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 52bbc64a67d778fefe9ec9c6db3240625ae9b472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bbc64a67d778fefe9ec9c6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 13 22:21:15 2016 +0300 dwrite: Handle zero specified weight as normal. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7f4a208..b38b5a2 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1301,7 +1301,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d if (usWeightClass > DWRITE_FONT_WEIGHT_ULTRA_BLACK) props->weight = DWRITE_FONT_WEIGHT_ULTRA_BLACK; - else + else if (usWeightClass > 0) props->weight = usWeightClass; if (version >= 4 && (fsSelection & OS2_FSSELECTION_OBLIQUE))

1 0

Bruno Jesus : dinput: Fix some debug output.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 63284bf9b56f766fcf764099a69e9a92acc5ca31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63284bf9b56f766fcf764099a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Aug 13 17:17:28 2016 -0300 dinput: Fix some debug output. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 83d50dc..3993592 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -344,12 +344,12 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) { - WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].name, strerror(errno)); + WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; } fill_joystick_dideviceinstanceA( lpddi, version, id ); close(fd); - TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, lpddi->tszProductName); + TRACE("Enumerating the linux Joystick device: %s (%s)\n", joystick_devices[id].device, joystick_devices[id].name); return S_OK; } @@ -373,7 +373,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS /* check whether we have a joystick */ if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) { - WARN("open(%s,O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); + WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; } fill_joystick_dideviceinstanceW( lpddi, version, id );

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: e2039d8e1d2d3d217e6c604d0961e8cbd2f07118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2039d8e1d2d3d217e6c604d0… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Sun Aug 14 21:52:13 2016 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 927 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 477 insertions(+), 450 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2039d8e1d2d3d217e6c6…

1 0

Bruno Jesus : dinput: Add DirectInput8 device type names to debug.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: e3b783174d144036cb97fbb5c902898185ee78aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b783174d144036cb97fbb5c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 13:30:53 2016 -0300 dinput: Add DirectInput8 device type names to debug. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 2ff6fd9..98ab273 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -181,15 +181,26 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVer return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } -static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) -{ - switch (dwDevType) { - case 0: return "All devices"; - case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; - case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; - case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; - case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; - default: return "Unknown"; +static const char *_dump_DIDEVTYPE_value(DWORD dwDevType, DWORD dwVersion) +{ + if (dwVersion < 0x0800) { + switch (dwDevType) { + case 0: return "All devices"; + case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; + case DIDEVTYPE_KEYBOARD: return "DIDEVTYPE_KEYBOARD"; + case DIDEVTYPE_JOYSTICK: return "DIDEVTYPE_JOYSTICK"; + case DIDEVTYPE_DEVICE: return "DIDEVTYPE_DEVICE"; + default: return "Unknown"; + } + } else { + switch (dwDevType) { + case DI8DEVCLASS_ALL: return "All devices"; + case DI8DEVCLASS_POINTER : return "DI8DEVCLASS_POINTER "; + case DI8DEVCLASS_KEYBOARD: return "DI8DEVCLASS_KEYBOARD"; + case DI8DEVCLASS_DEVICE: return "DI8DEVCLASS_DEVICE"; + case DI8DEVCLASS_GAMECTRL: return "DI8DEVCLASS_GAMECTRL"; + default: return "Unknown"; + } } } @@ -384,8 +395,8 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( unsigned int i; int j, r; - TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), + TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", + This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), lpCallback, pvRef, dwFlags); _dump_EnumDevices_dwFlags(dwFlags); @@ -424,8 +435,8 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( int j; HRESULT r; - TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", - This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), + TRACE("(this=%p,0x%04x '%s',%p,%p,0x%04x)\n", + This, dwDevType, _dump_DIDEVTYPE_value(dwDevType, This->dwVersion), lpCallback, pvRef, dwFlags); _dump_EnumDevices_dwFlags(dwFlags);

1 0

Bruno Jesus : dinput/tests: Improve controller debug information.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: f1b782bfc8413a2fa1cbbc8955f9975b113d18ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1b782bfc8413a2fa1cbbc895… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:12:54 2016 -0300 dinput/tests: Improve controller debug information. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/joystick.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index b196ea7..4882744 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -203,7 +203,21 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) if (hr!=DI_OK) goto DONE; - trace("---- %s ----\n", lpddi->tszProductName); + trace("---- Controller Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + lpddi->tszProductName, + lpddi->tszInstanceName, + lpddi->dwDevType, + wine_dbgstr_guid(&lpddi->guidProduct), + wine_dbgstr_guid(&lpddi->guidInstance), + lpddi->wUsagePage, + lpddi->wUsage); /* Test for joystick ID property */ ZeroMemory(&dipw, sizeof(dipw));

1 0

Bruno Jesus : dinput: Add support for DIPROP_VIDPID property in Linux js implementation.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 58937117fbd4d9e075d2b5be63cb56038623e49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=58937117fbd4d9e075d2b5be6… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:26:23 2016 -0300 dinput: Add support for DIPROP_VIDPID property in Linux js implementation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3993592..20e2573 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -645,6 +645,16 @@ static HRESULT WINAPI JoystickLinuxWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface switch (LOWORD(rguid)) { + case (DWORD_PTR) DIPROP_VIDPID: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + + if (!This->joydev->product_id || !This->joydev->vendor_id) + return DIERR_UNSUPPORTED; + pd->dwData = MAKELONG(This->joydev->vendor_id, This->joydev->product_id); + TRACE("DIPROP_VIDPID(%08x)\n", pd->dwData); + break; + } case (DWORD_PTR) DIPROP_JOYSTICKID: { LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph;

1 0

Bruno Jesus : dinput8/tests: Debug device information during enumeration callback.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: d19ff2d8286fc5f24b716c56c160a19f57142fe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d19ff2d8286fc5f24b716c56c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 14 15:57:36 2016 -0300 dinput8/tests: Debug device information during enumeration callback. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/dinput.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 0984767..a6cbd34 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -361,6 +361,22 @@ static BOOL CALLBACK enum_devices_callback(const DIDEVICEINSTANCEA *instance, vo { struct enum_devices_test *enum_test = context; + trace("---- Device Information ----\n" + "Product Name : %s\n" + "Instance Name : %s\n" + "devType : 0x%08x\n" + "GUID Product : %s\n" + "GUID Instance : %s\n" + "HID Page : 0x%04x\n" + "HID Usage : 0x%04x\n", + instance->tszProductName, + instance->tszInstanceName, + instance->dwDevType, + wine_dbgstr_guid(&instance->guidProduct), + wine_dbgstr_guid(&instance->guidInstance), + instance->wUsagePage, + instance->wUsage); + enum_test->device_count++; return enum_test->return_value; }

1 0

Nikolay Sivov : gdi32: Simplify font table name tracing.
by Alexandre Julliard 15 Aug '16

15 Aug '16

Module: wine Branch: master Commit: 492b10ef6c6ce9558517c8540296ebd62523947c URL: http://source.winehq.org/git/wine.git/?a=commit;h=492b10ef6c6ce9558517c8540… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 23:52:15 2016 +0300 gdi32: Simplify font table name tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2e3b29a..d989b67 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4709,10 +4709,8 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len); if (err) { - TRACE("Can't find table %c%c%c%c\n", - /* bytes were reversed */ - HIBYTE(HIWORD(table)), LOBYTE(HIWORD(table)), - HIBYTE(LOWORD(table)), LOBYTE(LOWORD(table))); + table = RtlUlongByteSwap( table ); + TRACE("Can't find table %s\n", debugstr_an((char*)&table, 4)); return GDI_ERROR; } return len; @@ -8281,9 +8279,8 @@ static DWORD freetype_GetFontData( PHYSDEV dev, DWORD table, DWORD offset, LPVOI return dev->funcs->pGetFontData( dev, table, offset, buf, cbData ); } - TRACE("font=%p, table=%c%c%c%c, offset=0x%x, buf=%p, cbData=0x%x\n", - physdev->font, LOBYTE(LOWORD(table)), HIBYTE(LOWORD(table)), - LOBYTE(HIWORD(table)), HIBYTE(HIWORD(table)), offset, buf, cbData); + TRACE("font=%p, table=%s, offset=0x%x, buf=%p, cbData=0x%x\n", + physdev->font, debugstr_an((char*)&table, 4), offset, buf, cbData); return get_font_data( physdev->font, table, offset, buf, cbData ); }

1 0

Józef Kucia : d3d11/tests: Add basic test for drawing on feature level 9.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: c61d8c2af1bca703131f19fab028ed8e53c17530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61d8c2af1bca703131f19fab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:29 2016 +0200 d3d11/tests: Add basic test for drawing on feature level 9. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 99 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 87 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 07a3066..330a960 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1125,13 +1125,21 @@ static void draw_quad_(unsigned int line, struct d3d11_test_context *context) return position; } #endif - 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, - 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x43425844, 0x4fb19b86, 0x955fa240, 0x1a630688, 0x24eb9db4, 0x00000001, 0x000001e0, 0x00000006, + 0x00000038, 0x00000084, 0x000000d0, 0x00000134, 0x00000178, 0x000001ac, 0x53414e58, 0x00000044, + 0x00000044, 0xfffe0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, + 0x00240000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x02000001, 0xc00f0000, 0x80e40000, + 0x0000ffff, 0x50414e58, 0x00000044, 0x00000044, 0xfffe0200, 0x00000020, 0x00000024, 0x00240000, + 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, + 0x02000001, 0xc00f0000, 0x80e40000, 0x0000ffff, 0x396e6f41, 0x0000005c, 0x0000005c, 0xfffe0200, + 0x00000034, 0x00000028, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240001, 0x00000000, + 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x04000004, 0xc0030000, 0x90ff0000, 0xa0e40000, + 0x90e40000, 0x02000001, 0xc00c0000, 0x90e40000, 0x0000ffff, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, - 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, + 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, }; static const struct vec2 quad[] = { @@ -1181,12 +1189,17 @@ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *conte return color; } #endif - 0x43425844, 0x80f1c810, 0xdacbbc8b, 0xe07b133e, 0x3059cbfa, 0x00000001, 0x000000b8, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000040, 0x00000040, 0x00000010, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + 0x43425844, 0xe7ffb369, 0x72bb84ee, 0x6f684dcd, 0xd367d788, 0x00000001, 0x00000158, 0x00000005, + 0x00000034, 0x00000080, 0x000000cc, 0x00000114, 0x00000124, 0x53414e58, 0x00000044, 0x00000044, + 0xffff0200, 0x00000014, 0x00000030, 0x00240001, 0x00300000, 0x00300000, 0x00240000, 0x00300000, + 0x00000000, 0x00000001, 0x00000000, 0xffff0200, 0x02000001, 0x800f0800, 0xa0e40000, 0x0000ffff, + 0x396e6f41, 0x00000044, 0x00000044, 0xffff0200, 0x00000014, 0x00000030, 0x00240001, 0x00300000, + 0x00300000, 0x00240000, 0x00300000, 0x00000000, 0x00000001, 0x00000000, 0xffff0200, 0x02000001, + 0x800f0800, 0xa0e40000, 0x0000ffff, 0x52444853, 0x00000040, 0x00000040, 0x00000010, 0x04000059, + 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, + 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, + 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, }; ID3D11Device *device = context->device; @@ -10386,6 +10399,67 @@ static void test_required_format_support(void) } } +static void test_fl9_draw(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_levels[] = + { + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; + static const struct vec4 color = {0.2f, 0.3f, 0.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + return float4(1.0f, 0.0f, 0.0f, 0.5f); + } +#endif + 0x43425844, 0xb70eda74, 0xc9a7f982, 0xebc31bbf, 0x952a1360, 0x00000001, 0x00000168, 0x00000005, + 0x00000034, 0x0000008c, 0x000000e4, 0x00000124, 0x00000134, 0x53414e58, 0x00000050, 0x00000050, + 0xffff0200, 0x0000002c, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, + 0xffff0200, 0x05000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f000000, 0x02000001, + 0x800f0800, 0xa0e40000, 0x0000ffff, 0x396e6f41, 0x00000050, 0x00000050, 0xffff0200, 0x0000002c, + 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xffff0200, 0x05000051, + 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f000000, 0x02000001, 0x800f0800, 0xa0e40000, + 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f000000, + 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x45475241, 0xabab0054, + }; + + for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); ++i) + { + if (!init_test_context(&test_context, &feature_levels[i])) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x, feature level %#x.\n", + hr, feature_levels[i]); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x7f0000ff, 1); + ID3D11PixelShader_Release(ps); + + draw_color_quad(&test_context, &color); + todo_wine check_texture_color(test_context.backbuffer, 0xff004c33, 1); + + release_test_context(&test_context); + } +} + START_TEST(d3d11) { test_create_device(); @@ -10444,4 +10518,5 @@ START_TEST(d3d11) test_face_culling(); test_line_antialiasing_blending(); test_required_format_support(); + test_fl9_draw(); }

1 0

Nikolay Sivov : t2embed: Fix TTIsEmbeddingEnabled() to properly use otmpFaceName metrics field.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: d01ab5ee4b56c8284d0bd9ae9af9f257e041b54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01ab5ee4b56c8284d0bd9ae9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 01:45:19 2016 +0300 t2embed: Fix TTIsEmbeddingEnabled() to properly use otmpFaceName metrics field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 48e20f5..de78b25 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -171,7 +171,7 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) return E_NOFREEMEMORY; GetOutlineTextMetricsA(hDC, len, otm); - ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + ret = TTIsEmbeddingEnabledForFacename((LPCSTR)otm + (ULONG_PTR)otm->otmpFaceName, enabled); HeapFree(GetProcessHeap(), 0, otm); return ret; }

1 0