July 2016 - Wine-Commits - list.winehq.org

Corentin Rossignon : dinput: Fix product GUID generation in Linux joystick and event API.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 081930e70b666fd5ee56518b5f6884714c1fd729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=081930e70b666fd5ee56518b5… Author: Corentin Rossignon <corossig(a)gmail.com> Date: Sun Jul 24 16:46:42 2016 +0100 dinput: Fix product GUID generation in Linux joystick and event API. Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 29 +++++++++++++++++++++++++++-- dlls/dinput/joystick_linuxinput.c | 25 +++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 1b041c6..83d50dc 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -77,6 +77,7 @@ struct JoyDev { char device[MAX_PATH]; char name[MAX_PATH]; + GUID guid_product; BYTE axis_count; BYTE button_count; @@ -122,6 +123,19 @@ static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903 {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; +/* + * Construct the GUID in the same way of Windows doing this. + * Data1 is concatenation of productid and vendorid. + * Data2 and Data3 are NULL. + * Data4 seems to be a constant. + */ +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { + 0x000000000, + 0x0000, + 0x0000, + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} +}; + #define MAX_JOYSTICKS 64 static INT joystick_devices_count = -1; static struct JoyDev *joystick_devices; @@ -237,6 +251,17 @@ static INT find_joystick_devices(void) close(sys_fd); } + if (joydev.vendor_id == 0 || joydev.product_id == 0) + { + joydev.guid_product = DInput_Wine_Joystick_GUID; + } + else + { + /* Concatenate product_id with vendor_id to mimic Windows behaviour */ + joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); + } + close(fd); if (!joystick_devices_count) @@ -267,7 +292,7 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->dwSize = dwSize; lpddi->guidInstance = DInput_Wine_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -290,7 +315,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->dwSize = dwSize; lpddi->guidInstance = DInput_Wine_Joystick_GUID; lpddi->guidInstance.Data3 = id; - lpddi->guidProduct = DInput_Wine_Joystick_GUID; + lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 86f12d0..ff02849 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -96,6 +96,7 @@ struct JoyDev { char *device; char *name; GUID guid; + GUID guid_product; BOOL has_ff; int num_effects; @@ -161,6 +162,19 @@ static const GUID DInput_Wine_Joystick_Base_GUID = { /* 9e573eda-7734-11d2-8d4a- {0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7} }; +/* + * Construct the GUID in the same way of Windows doing this. + * Data1 is concatenation of productid and vendorid. + * Data2 and Data3 are NULL. + * Data4 seems to be a constant. + */ +static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { + 0x000000000, + 0x0000, + 0x0000, + {0x00, 0x00, 0x50, 0x49, 0x44, 0x56, 0x49, 0x44} +}; + #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) #define MAX_JOYDEV 64 @@ -293,11 +307,18 @@ static void find_joydevs(void) } if (ioctl(fd, EVIOCGID, &device_id) == -1) + { WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); + joydev.guid_product = DInput_Wine_Joystick_Base_GUID; + } else { joydev.vendor_id = device_id.vendor; joydev.product_id = device_id.product; + + /* Concatenate product_id with vendor_id to mimic Windows behaviour */ + joydev.guid_product = DInput_Wine_Joystick_Constant_Part_GUID; + joydev.guid_product.Data1 = MAKELONG(joydev.vendor_id, joydev.product_id); } if (!have_joydevs) @@ -327,7 +348,7 @@ static void fill_joystick_dideviceinstanceA(LPDIDEVICEINSTANCEA lpddi, DWORD ver lpddi->dwSize = dwSize; lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) @@ -348,7 +369,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->dwSize = dwSize; lpddi->guidInstance = joydevs[id].guid; - lpddi->guidProduct = DInput_Wine_Joystick_Base_GUID; + lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800)

1 0

David Lawrie : winejoystick.drv: Sort virtual joysticks by name on the Mac.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 416567474260c9ab2ea127ba0d24414cf11f0212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416567474260c9ab2ea127ba0… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Sun Jul 24 21:38:32 2016 -0500 winejoystick.drv: Sort virtual joysticks by name on the Mac. 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 | 55 ++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 7e2e97f..bf82f67 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -139,6 +139,38 @@ static long get_device_property_long(IOHIDDeviceRef device, CFStringRef key) return result; } +static CFStringRef copy_device_name(IOHIDDeviceRef device) +{ + CFStringRef name; + + if (device) + { + CFTypeRef ref_name; + + assert(IOHIDDeviceGetTypeID() == CFGetTypeID(device)); + + ref_name = IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductKey)); + + if (ref_name && CFStringGetTypeID() == CFGetTypeID(ref_name)) + name = CFStringCreateCopy(kCFAllocatorDefault, ref_name); + else + { + long vendID, prodID; + + vendID = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + name = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("0x%04lx 0x%04lx"), vendID, prodID); + } + } + else + { + ERR("NULL device\n"); + name = CFStringCreateCopy(kCFAllocatorDefault, CFSTR("")); + } + + return name; +} + static long get_device_location_ID(IOHIDDeviceRef device) { return get_device_property_long(device, CFSTR(kIOHIDLocationIDKey)); @@ -312,13 +344,26 @@ static CFIndex find_top_level(IOHIDDeviceRef hid_device, CFMutableArrayRef main_ TRACE("-> total %d\n", (int)total); return total; } +/************************************************************************** + * device_name_comparator + * + * Virtual joysticks may not have a kIOHIDLocationIDKey and will default to location ID of 0, this orders virtual joysticks by their name + */ +static CFComparisonResult device_name_comparator(IOHIDDeviceRef device1, IOHIDDeviceRef device2) +{ + CFStringRef name1 = copy_device_name(device1), name2 = copy_device_name(device2); + CFComparisonResult result = CFStringCompare(name1, name2, (kCFCompareForcedOrdering | kCFCompareNumerically)); + CFRelease(name1); + CFRelease(name2); + return result; +} /************************************************************************** - * device_location_comparator + * device_location_name_comparator * - * Helper to sort device array by location ID since location IDs are consistent across boots & launches + * Helper to sort device array first by location ID, since location IDs are consistent across boots & launches, then by product name */ -static CFComparisonResult device_location_comparator(const void *val1, const void *val2, void *context) +static CFComparisonResult device_location_name_comparator(const void *val1, const void *val2, void *context) { IOHIDDeviceRef device1 = (IOHIDDeviceRef)val1, device2 = (IOHIDDeviceRef)val2; long loc1 = get_device_location_ID(device1), loc2 = get_device_location_ID(device2); @@ -327,7 +372,7 @@ static CFComparisonResult device_location_comparator(const void *val1, const voi return kCFCompareLessThan; else if (loc1 > loc2) return kCFCompareGreaterThan; - return kCFCompareEqualTo; + return device_name_comparator(device1, device2); } /************************************************************************** @@ -390,7 +435,7 @@ static int find_osx_devices(void) num_devices = CFSetGetCount(devset); devices = CFArrayCreateMutable(kCFAllocatorDefault, num_devices, &kCFTypeArrayCallBacks); CFSetApplyFunction(devset, copy_set_to_array, (void *)devices); - CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_comparator, NULL); + CFArraySortValues(devices, CFRangeMake(0, num_devices), device_location_name_comparator, NULL); CFRelease(devset); if (!devices)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 25cf71b1db404bfa5b57f9fa500669f9897b8c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cf71b1db404bfa5b57f9fa5… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jul 22 19:17:43 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 59 +++++++++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/po/fi.po b/po/fi.po index ebf71f7..4a36a80 100644 --- a/po/fi.po +++ b/po/fi.po @@ -992,7 +992,7 @@ msgstr "Tulostinta ei löydy." #: comdlg32.rc:70 progman.rc:76 msgid "Out of memory." -msgstr "Muisti loppu." +msgstr "Muisti ei riitä." #: comdlg32.rc:71 msgid "An error occurred." @@ -1128,7 +1128,7 @@ msgstr "Käyttäjän keskeyttämä; " #: comdlg32.rc:105 msgid "Out of memory; " -msgstr "Muisti loppu; " +msgstr "Muisti ei riitä; " #: comdlg32.rc:106 msgid "The printer door is open; " @@ -3714,7 +3714,7 @@ msgstr "Muisti sotkeutunut.\n" #: winerror.mc:66 msgid "Not enough memory.\n" -msgstr "Muisti loppu.\n" +msgstr "Muisti ei riitä.\n" #: winerror.mc:71 msgid "Invalid block.\n" @@ -3738,7 +3738,7 @@ msgstr "Data ei kelpaa.\n" #: winerror.mc:96 msgid "Out of memory.\n" -msgstr "Muisti loppu.\n" +msgstr "Muisti ei riitä.\n" #: winerror.mc:101 msgid "Invalid drive.\n" @@ -11956,85 +11956,64 @@ msgstr "regedit: Käsittelemätön toiminto.\n" #: regedit.rc:367 msgid "regedit: Out of memory! (%1!S!, line %2!u!)\n" -msgstr "" +msgstr "regedit: Muisti ei riitä! (%1!S!, rivi %2!u!)\n" #: regedit.rc:368 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid hexadecimal value.\n" -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "regedit: Viallinen heksadesimaaliarvo.\n" #: regedit.rc:369 msgid "" "regedit: Unable to convert hexadecimal data. An invalid value was " "encountered at '%1'.\n" msgstr "" +"regedit: Ei voida muuntaa heksadesimaalidataa. Viallinen arvo on kohteessa " +"'%1'.\n" #: regedit.rc:370 -#, fuzzy -#| msgid "regedit: Invalid or unrecognized switch [%1]\n" msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Virheellinen tai tuntematon valitsin [%1]\n" +msgstr "regedit: Tuntematon merkintä [\\%1!c!]\n" #: regedit.rc:371 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1]\n" -msgstr "reg: Rekisterin tietotyypille [%1] ei ole tukea\n" +msgstr "regedit: Rekisterin tietotyypille [%1] ei ole tukea\n" #: regedit.rc:372 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unexpected end of line in '%1'.\n" -msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" +msgstr "regedit: Tiedosto '%1' päättyi odottamattomasti.\n" #: regedit.rc:373 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "regedit: The line '%1' was not recognized.\n" -msgstr "regedit: Tiedostoa '%1' ei löydy.\n" +msgstr "regedit: Riviä '%1' ei tunnisteta.\n" #: regedit.rc:374 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to add the registry value '%1' to '%2'.\n" -msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" +msgstr "regedit: Rekisteriarvoa '%1' ei voida lisätä kohteeseen '%2'.\n" #: regedit.rc:375 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to open the registry key '%1'.\n" -msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" +msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" #: regedit.rc:376 -#, fuzzy -#| msgid "reg: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" -msgstr "reg: Rekisterin tietotyypille [%1] ei ole tukea\n" +msgstr "regedit: Rekisterin tietotyypille [%1] kohteessa '%2' ei ole tukea.\n" #: regedit.rc:377 msgid "regedit: The registry value '%1' will be exported as binary data.\n" -msgstr "" +msgstr "regedit: Rekisteriarvo '%1' viedään binääridatana.\n" #: regedit.rc:378 -#, fuzzy -#| msgid "regedit: No registry key was specified for removal.\n" msgid "regedit: Incorrect registry class specification in '%1'.\n" -msgstr "regedit: Poistettavaa rekisteriavainta ei määritelty.\n" +msgstr "regedit: Viallinen rekisteriluokan määrite kohteessa '%1'.\n" #: regedit.rc:379 -#, fuzzy -#| msgid "" -#| "reg: The system was unable to find the specified registry key or value\n" msgid "" "regedit: Unable to export '%1'. The specified registry key was not found.\n" -msgstr "reg: Järjestelmä ei löytänyt annettua rekisteriavainta tai -arvoa\n" +msgstr "regedit: Ei voida viedä kohdetta '%1'. Rekisteriavainta ei löydy.\n" #: regedit.rc:380 -#, fuzzy -#| msgid "regedit: Unable to open the file '%1'.\n" msgid "regedit: Unable to delete the registry class '%1'.\n" -msgstr "regedit: Tiedostoa '%1' ei voida avata.\n" +msgstr "regedit: Rekisteriluokkaa '%1' ei voida poistaa.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Andrey Gusev : mmdevapi: Use debugstr_guid() in TRACE() message.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 424e2addfaa57a88902b452ebf13eabb919f184a URL: http://source.winehq.org/git/wine.git/?a=commit;h=424e2addfaa57a88902b452eb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 12:58:45 2016 +0300 mmdevapi: Use debugstr_guid() in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9e8d8a5..b8b714c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -588,7 +588,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls HRESULT hr = E_NOINTERFACE; MMDevice *This = impl_from_IMMDevice(iface); - TRACE("(%p)->(%p,%x,%p,%p)\n", iface, riid, clsctx, params, ppv); + TRACE("(%p)->(%s, %x, %p, %p)\n", iface, debugstr_guid(riid), clsctx, params, ppv); if (!ppv) return E_POINTER;

1 0

Józef Kucia : wined3d: Implement SM5 deriv_rty_fine instruction.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: f0d05f36f8c63eba76b957c47a4ae056c8e6e8c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0d05f36f8c63eba76b957c47… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 22 12:28:21 2016 +0200 wined3d: Implement SM5 deriv_rty_fine instruction. 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/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd5ae10..72c6f8b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3581,6 +3581,7 @@ static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; + case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } @@ -8710,7 +8711,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX_FINE */ shader_glsl_derivative, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSY_FINE */ NULL, + /* WINED3DSIH_DSY_FINE */ shader_glsl_derivative, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit,

1 0

Józef Kucia : wined3d: Implement SM5 deriv_rtx_fine instruction.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: ab4232c4d125b65b0a080f573ba2ee530fe4f711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4232c4d125b65b0a080f573… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 22 12:28:20 2016 +0200 wined3d: Implement SM5 deriv_rtx_fine instruction. 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/wined3d/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ba3bf35..dd5ae10 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3579,6 +3579,7 @@ static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; + case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } @@ -8706,7 +8707,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSX_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSX_FINE */ NULL, + /* WINED3DSIH_DSX_FINE */ shader_glsl_derivative, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ shader_glsl_derivative, /* WINED3DSIH_DSY_FINE */ NULL,

1 0

Nikolay Sivov : dwrite: Update to DWRITE_LINE_METRICS1.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 43c61820fb3f9c75bf0a1c3ae07641e24faf47f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c61820fb3f9c75bf0a1c3ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 11:42:56 2016 +0300 dwrite: Update to DWRITE_LINE_METRICS1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 09fe360..b95dffa 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -262,7 +262,7 @@ struct dwrite_textlayout { UINT32 cluster_count; FLOAT minwidth; - DWRITE_LINE_METRICS *lines; + DWRITE_LINE_METRICS1 *lines; UINT32 line_alloc; DWRITE_TEXT_METRICS1 metrics; @@ -1303,7 +1303,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const return S_OK; } -static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_LINE_METRICS *metrics, UINT32 *line) +static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_LINE_METRICS1 *metrics, UINT32 *line) { if (!layout->line_alloc) { layout->line_alloc = 5; @@ -1313,7 +1313,7 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ } if (layout->metrics.lineCount == layout->line_alloc) { - DWRITE_LINE_METRICS *l = heap_realloc(layout->lines, layout->line_alloc*2*sizeof(*layout->lines)); + DWRITE_LINE_METRICS1 *l = heap_realloc(layout->lines, layout->line_alloc*2*sizeof(*layout->lines)); if (!l) return E_OUTOFMEMORY; layout->lines = l; @@ -1692,7 +1692,7 @@ static HRESULT layout_add_underline(struct dwrite_textlayout *layout, struct lay static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, UINT32 pos, UINT32 *line) { DWRITE_FONT_METRICS fontmetrics; - DWRITE_LINE_METRICS metrics; + DWRITE_LINE_METRICS1 metrics; struct layout_range *range; IDWriteFontFace *fontface; IDWriteFont *font; @@ -1720,6 +1720,8 @@ static HRESULT layout_set_dummy_line_metrics(struct dwrite_textlayout *layout, U metrics.trailingWhitespaceLength = 0; metrics.newlineLength = 0; metrics.isTrimmed = FALSE; + metrics.leadingBefore = 0.0f; + metrics.leadingAfter = 0.0f; return layout_set_line_metrics(layout, &metrics, line); } @@ -1730,7 +1732,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) struct layout_effective_run *erun, *first_underlined; struct layout_effective_inline *inrun; const struct layout_run *run; - DWRITE_LINE_METRICS metrics; + DWRITE_LINE_METRICS1 metrics; FLOAT width, origin_x, origin_y; UINT32 i, start, line, textpos; HRESULT hr; @@ -3368,8 +3370,11 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout3 *iface, if (FAILED(hr)) return hr; - if (metrics) - memcpy(metrics, This->lines, sizeof(*metrics)*min(max_count, This->metrics.lineCount)); + if (metrics) { + UINT32 i, c = min(max_count, This->metrics.lineCount); + for (i = 0; i < c; i++) + memcpy(metrics + i, This->lines + i, sizeof(*metrics)); + } *count = This->metrics.lineCount; return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; @@ -3680,8 +3685,19 @@ static HRESULT WINAPI dwritetextlayout3_GetLineMetrics(IDWriteTextLayout3 *iface UINT32 max_count, UINT32 *count) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - FIXME("(%p)->(%p %u %p): stub\n", This, metrics, max_count, count); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%p %u %p)\n", This, metrics, max_count, count); + + hr = layout_compute_effective_runs(This); + if (FAILED(hr)) + return hr; + + if (metrics) + memcpy(metrics, This->lines, sizeof(*metrics)*min(max_count, This->metrics.lineCount)); + + *count = This->metrics.lineCount; + return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static const IDWriteTextLayout3Vtbl dwritetextlayoutvtbl = {

1 0

Nikolay Sivov : dwrite: Only invalidate lines if line spacing changed.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 32c1ef019ad8d03b46a2e9374730d9bb77b6bb96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c1ef019ad8d03b46a2e9374… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 11:42:55 2016 +0300 dwrite: Only invalidate lines if line spacing changed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 67f6fe2..09fe360 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3661,7 +3661,7 @@ static HRESULT WINAPI dwritetextlayout3_SetLineSpacing(IDWriteTextLayout3 *iface return hr; if (changed) - This->recompute = RECOMPUTE_EVERYTHING; + This->recompute = RECOMPUTE_LINES; return S_OK; }

1 0

Alistair Leslie-Hughes : comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 430108c92af50b25e399fc41b15600b13719c26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=430108c92af50b25e399fc41b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 24 14:31:52 2016 +0300 comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 43131ab..26f5cdc 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -952,8 +952,11 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) if (GetWindowTheme (infoPtr->hwndSelf)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } - else - FillRect (hdc, &rcClient, GetSysColorBrush(COLOR_BTNFACE)); + else { + HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); }

1 0

Bruno Jesus : joy.cpl: Display the correct number of button boxes during test.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 4189095d8706a5e6b0b85a900bea037b86f23845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4189095d8706a5e6b0b85a900… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jul 22 21:50:33 2016 -0300 joy.cpl: Display the correct number of button boxes during test. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index d6ba5d5..b5a55fa 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -457,7 +457,7 @@ static void test_handle_joychange(HWND hwnd, struct JoystickData *data) /* Enable only buttons present in the device */ for (i = 0; i < TEST_MAX_BUTTONS; i++) - ShowWindow(data->graphics.buttons[i], i <= data->joysticks[data->chosen_joystick].num_buttons); + ShowWindow(data->graphics.buttons[i], i < data->joysticks[data->chosen_joystick].num_buttons); } /*********************************************************************

1 0