wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Adam Bolte : wined3d: Add GPU information for AMD FIJI.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: a05b9512e83be885f1b1529fa814f16eefcbd388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05b9512e83be885f1b1529fa… Author: Adam Bolte <abolte(a)systemsaviour.com> Date: Sat Jan 21 21:14:32 2017 +1100 wined3d: Add GPU information for AMD FIJI. Signed-off-by: Adam Bolte <abolte(a)systemsaviour.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3312b4b51cf8b54c498a62918834cc73d713e534) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2c13d54..97b2a4f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1358,6 +1358,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_FURY, "AMD Radeon (TM) R9 Fury Series", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, @@ -1950,6 +1951,7 @@ cards_nvidia_binary[] = cards_amd_binary[] = { {"RX 480", CARD_AMD_RADEON_RX_480}, + {"R9 Fury Series", CARD_AMD_RADEON_R9_FURY}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900}, {"HD 7800", CARD_AMD_RADEON_HD7800}, @@ -2107,6 +2109,7 @@ cards_amd_mesa[] = {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, /* Volcanic Islands */ + {"FIJI", CARD_AMD_RADEON_R9_FURY}, {"TONGA", CARD_AMD_RADEON_R9_285}, /* Sea Islands */ {"HAWAII", CARD_AMD_RADEON_R9_290}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4c320d..5967a60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1537,6 +1537,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_R7 = 0x130f, CARD_AMD_RADEON_R9_285 = 0x6939, CARD_AMD_RADEON_R9_290 = 0x67b1, + CARD_AMD_RADEON_R9_FURY = 0x7300, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df,

1 0

Jarkko Korpi : wined3d: Add Amd Rx 480 binary driver.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 9245f1db5982a0a93e0a81f9543beb883296588b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9245f1db5982a0a93e0a81f95… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Mon Dec 26 07:31:44 2016 +0200 wined3d: Add Amd Rx 480 binary driver. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com>= Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7912563f7f3f3bb0d13f225bd570aa289eb67d65) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ed8fead..2c13d54 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1949,6 +1949,7 @@ cards_nvidia_binary[] = * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ cards_amd_binary[] = { + {"RX 480", CARD_AMD_RADEON_RX_480}, /* Southern Islands */ {"HD 7900", CARD_AMD_RADEON_HD7900}, {"HD 7800", CARD_AMD_RADEON_HD7800},

1 0

Henri Verbeet : wined3d: Add GPU information for AMD TONGA.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 3719a543cb95a75ba3ae7e75b5511f832990e7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3719a543cb95a75ba3ae7e75b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 13:48:35 2017 +0100 wined3d: Add GPU information for AMD TONGA. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 332a6ff9169a852a1b5cc432dabba4bd98783a4c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 97db8a0..ed8fead 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1356,7 +1356,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, @@ -2104,8 +2105,10 @@ cards_amd_mesa[] = /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, + /* Volcanic Islands */ + {"TONGA", CARD_AMD_RADEON_R9_285}, /* Sea Islands */ - {"HAWAII", CARD_AMD_RADEON_R9 }, + {"HAWAII", CARD_AMD_RADEON_R9_290}, {"KAVERI", CARD_AMD_RADEON_R7 }, {"KABINI", CARD_AMD_RADEON_R3 }, {"BONAIRE", CARD_AMD_RADEON_HD8770}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e7f9823..d4c320d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1535,7 +1535,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD8770 = 0x665c, CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, - CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_R9_285 = 0x6939, + CARD_AMD_RADEON_R9_290 = 0x67b1, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df,

1 0

Carlos Rodriguez : wined3d: Recognize Geforce GTX 1050.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 8ef749d25989601f9d3f3448c163443c0e63f144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef749d25989601f9d3f3448c… Author: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Date: Tue Nov 29 15:34:54 2016 -0200 wined3d: Recognize Geforce GTX 1050. Signed-off-by: Carlos Rodriguez <mrdeathjr28(a)yahoo.es> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7f80fc6bba75e40c39887a6d868363289ab56b73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e4b1028..97db8a0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1309,6 +1309,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980TI, "NVIDIA GeForce GTX 980 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1050, "NVIDIA GeForce GTX 1050", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, @@ -1787,6 +1788,7 @@ cards_nvidia_binary[] = {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ + {"GTX 1050", CARD_NVIDIA_GEFORCE_GTX1050}, /* GeForce 1000 - midend */ {"GTX 980 Ti", CARD_NVIDIA_GEFORCE_GTX980TI}, /* GeForce 900 - highend */ {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 316b6ea..e7f9823 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1654,6 +1654,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_NVIDIA_GEFORCE_GTX980TI = 0x17c8, + CARD_NVIDIA_GEFORCE_GTX1050 = 0x1c81, CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80,

1 0

Sebastian Lackner : include: Avoid duplicate definition of REFERENCE_TIME.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: a211bb0423e43007ed2d733f364755c8f2745d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a211bb0423e43007ed2d733f3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jan 16 15:00:12 2017 +0100 include: Avoid duplicate definition of REFERENCE_TIME. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d7951abc72254eacaa8cbbeb8ff43c7b011f25e3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/dmdls.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dmdls.h b/include/dmdls.h index b40ef88..ea7dcf0 100644 --- a/include/dmdls.h +++ b/include/dmdls.h @@ -30,7 +30,10 @@ typedef LONG PCENT; typedef LONG PERCENT; typedef LONG TCENT; +#ifndef REFERENCE_TIME_DEFINED +#define REFERENCE_TIME_DEFINED typedef LONGLONG REFERENCE_TIME, *LPREFERENCE_TIME; +#endif /***************************************************************************** * FOURCC definition

1 0

Olivier F. R. Dierick : xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: ac340f82bc73209a38d1d9c9f3c4e12bbf87bdfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac340f82bc73209a38d1d9c9f… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Fri Jan 6 18:17:55 2017 +0100 xinput1_3: Add DECLSPEC_HOTPATCH to XInputEnable() definition. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1640c9ce623ba00e52c197a31650d4dfa9d7bde7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xinput1_3/xinput1_3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xinput1_3/xinput1_3_main.c b/dlls/xinput1_3/xinput1_3_main.c index d5d6147..358116a 100644 --- a/dlls/xinput1_3/xinput1_3_main.c +++ b/dlls/xinput1_3/xinput1_3_main.c @@ -42,7 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) return TRUE; } -void WINAPI XInputEnable(BOOL enable) +void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) { /* Setting to false will stop messages from XInputSetState being sent to the controllers. Setting to true will send the last vibration

1 0

Nikolay Sivov : comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: fa792eb157262dea71e8bc674f12946b701fedba URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa792eb157262dea71e8bc674… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 11 15:31:42 2017 +0300 comctl32/toolbar: Protect from NULL pointer access in TB_GETBUTTONINFOW handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 26067cc0b9e39ac80bd13f8c90d9c9948eb60fbb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 11 ++++++++++- dlls/comctl32/toolbar.c | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index bab746b..43cdcc9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1713,12 +1713,13 @@ static void test_recalc(void) static void test_getbuttoninfo(void) { HWND hToolbar = NULL; + TBBUTTONINFOW tbiW; + TBBUTTONINFOA tbi; int i; rebuild_toolbar_with_buttons(&hToolbar); for (i = 0; i < 128; i++) { - TBBUTTONINFOA tbi; int ret; tbi.cbSize = i; @@ -1730,6 +1731,14 @@ static void test_getbuttoninfo(void) compare(ret, -1, "%d"); } } + + /* TBIF_TEXT with NULL pszText */ + memset(&tbiW, 0, sizeof(tbiW)); + tbiW.cbSize = sizeof(tbiW); + tbiW.dwMask = TBIF_BYINDEX | TBIF_STYLE | TBIF_COMMAND | TBIF_TEXT; + i = SendMessageA(hToolbar, TB_GETBUTTONINFOW, 1, (LPARAM)&tbiW); + ok(i == 1, "Got index %d\n", i); + DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ae6f21e..4e4c940 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3400,7 +3400,7 @@ TOOLBAR_GetButtonInfoT(const TOOLBAR_INFO *infoPtr, INT Id, LPTBBUTTONINFOW lpTb Str_GetPtrW(lpText, lpTbInfo->pszText, lpTbInfo->cchText); else Str_GetPtrWtoA(lpText, (LPSTR)lpTbInfo->pszText, lpTbInfo->cchText); - } else + } else if (!bUnicode || lpTbInfo->pszText) lpTbInfo->pszText[0] = '\0'; } return nIndex;

1 0

Józef Kucia : wined3d: Update "screen_format" when ChangeDisplaySettingsEx() call is redundant.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 9b79b59657186b6be109f180ca1506fa654b2fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b79b59657186b6be109f180c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 12 11:36:26 2017 +0100 wined3d: Update "screen_format" when ChangeDisplaySettingsEx() call is redundant. This fixes a regression introduced by commit f6dde7062413a1dfdd71acc92c5178ac66f3ade0. 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> (cherry picked from commit 06cf77b343a36729754e9df34045a1b039b31c44) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index dd2164d..e4b1028 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4288,6 +4288,7 @@ HRESULT CDECL wined3d_set_adapter_display_mode(struct wined3d *wined3d, || !(new_mode.dmFields & DM_DISPLAYFLAGS))) { TRACE("Skipping redundant mode setting call.\n"); + adapter->screen_format = new_format_id; return WINED3D_OK; }

1 0

Nikolay Sivov : comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 29f4ac427f75a8513795dce719f79623f136511e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f4ac427f75a8513795dce71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 12 17:22:25 2017 +0300 comctl32/trackbar: Fix TBM_SETRANGEMAX handling when new limit is less than current min boundary. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bb1d68ede06c8b517ea16246e376a4a4e52bf1c5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 26 ++++++++++++++++++++++++++ dlls/comctl32/trackbar.c | 5 +++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 80d5906..381bfb8 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -775,6 +775,32 @@ static void test_range(void) SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + /* test position update on range change */ + + /* set to [20, 50], position at 30, reduce range to [20,25] */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 25); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 25, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip max to 10 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 10); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 20, "Unexpected position %d\n", r); + + /* set to [20, 50], position at 30, flip min to 70 */ + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 20); + SendMessageA(hWndTrackbar, TBM_SETRANGEMAX, FALSE, 50); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 30); + SendMessageA(hWndTrackbar, TBM_SETRANGEMIN, FALSE, 70); + r = SendMessageA(hWndTrackbar, TBM_GETPOS, 0, 0); + ok(r == 70, "Unexpected position %d\n", r); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 0e52212..b26d743 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1279,10 +1279,11 @@ static inline LRESULT TRACKBAR_SetRangeMax (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG lMax) { BOOL changed = infoPtr->lRangeMax != lMax; + LONG rightmost = max(lMax, infoPtr->lRangeMin); infoPtr->lRangeMax = lMax; - if (infoPtr->lPos > infoPtr->lRangeMax) { - infoPtr->lPos = infoPtr->lRangeMax; + if (infoPtr->lPos > rightmost) { + infoPtr->lPos = rightmost; infoPtr->flags |= TB_THUMBPOSCHANGED; }

1 0

Lauri Kenttä : winefile: Fix horizontal scrolling.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: e61575e9736d4726d99d616a885bcad7b06dd68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61575e9736d4726d99d616a8… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon May 30 20:42:53 2016 +0300 winefile: Fix horizontal scrolling. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c1ab903f22d267abd6186ae4f5e1c856027bae31) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winefile/winefile.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 7046ad0..0d54a53 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -118,6 +118,7 @@ typedef struct { #define COLUMNS 10 int widths[COLUMNS]; + int widths_shown[COLUMNS]; int positions[COLUMNS+1]; BOOL treePane; @@ -2354,6 +2355,7 @@ static HWND create_header(HWND parent, Pane* pane, UINT id) hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = pane->widths[idx]; + pane->widths_shown[idx] = hdi.cxy; SendMessageW(hwnd, HDM_INSERTITEMW, idx, (LPARAM)&hdi); } @@ -3173,17 +3175,20 @@ static void set_header(Pane* pane) for(; (i < COLUMNS) && (x+pane->widths[i] < scroll_pos); i++) { x += pane->widths[i]; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } if (i < COLUMNS) { x += pane->widths[i]; item.cxy = x - scroll_pos; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i++, (LPARAM)&item); for(; i < COLUMNS; i++) { item.cxy = pane->widths[i]; x += pane->widths[i]; + pane->widths_shown[i] = item.cxy; SendMessageW(pane->hwndHeader, HDM_SETITEMW, i, (LPARAM)&item); } } @@ -3195,13 +3200,14 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) case HDN_ITEMCHANGEDW: { LPNMHEADERW phdn = (LPNMHEADERW)pnmh; int idx = phdn->iItem; - int dx = phdn->pitem->cxy - pane->widths[idx]; + int dx = phdn->pitem->cxy - pane->widths_shown[idx]; int i; RECT clnt; GetClientRect(pane->hwnd, &clnt); pane->widths[idx] += dx; + pane->widths_shown[idx] += dx; for(i=idx; ++i<=COLUMNS; ) pane->positions[i] += dx;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
84
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 February 2017