February 2017 - Wine-commits

Andrew Eikum : msacm32: Support conversion from 24-bit PCM.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 1b45a1e804f6e1061b11c7c86fab0a8c2c994c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b45a1e804f6e1061b11c7c86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 5 11:28:25 2016 -0600 msacm32: Support conversion from 24-bit PCM. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6cc673477dd4a0749a292a6d6f604749d548fb6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/pcmconverter.c | 320 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 299 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b45a1e804f6e1061b11c…

1 0

Andrew Eikum : dsound: Fix rolloff factor calculation.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: a2802c8ffb2880e3f06fe460f84b2f60979855b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2802c8ffb2880e3f06fe460f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 28 14:02:54 2016 -0600 dsound: Fix rolloff factor calculation. We should treat the rolloff factor as a factor of the distance of the buffer. For example, a rolloff factor of 2 should treat the buffer as if it were twice as far away from the listener as it is. The previous calculation would instead double the decibels of attenuation. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1671a83f55bee46ee57cc0c8869e943d67f14ea5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/sound3d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index eb01881..1afcb8c 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -206,9 +206,11 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flDistance < dsb->ds3db_ds3db.flMinDistance) flDistance = dsb->ds3db_ds3db.flMinDistance; + + flDistance = dsb->ds3db_ds3db.flMinDistance + (flDistance - dsb->ds3db_ds3db.flMinDistance) * dsb->device->ds3dl.flRolloffFactor; /* attenuation proportional to the distance squared, converted to millibels as in lVolume*/ - lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000 * dsb->device->ds3dl.flRolloffFactor; + lVolume -= log10(flDistance/dsb->ds3db_ds3db.flMinDistance * flDistance/dsb->ds3db_ds3db.flMinDistance)*1000; TRACE("dist. att: Distance = %f, MinDistance = %f => adjusting volume %d to %f\n", flDistance, dsb->ds3db_ds3db.flMinDistance, dsb->ds3db_lVolume, lVolume); /* conning */

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

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

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/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

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

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

Henri Verbeet : wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: c78724e6d4ae1442fc1917ccd4353c9d9a3dfe12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78724e6d4ae1442fc1917ccd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 23 14:30:29 2016 +0100 wined3d: Properly check for the required extensions before selecting the GLSL FFP implementations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6690c7090c35aff776418ef2441e1b065c81f5b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 63d54fa..dd2164d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2465,7 +2465,7 @@ static enum wined3d_pci_device wined3d_guess_card(const struct shader_caps *shad static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { - if (shader_backend_ops == &glsl_shader_backend) + if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_VERTEX_SHADER]) return &glsl_vertex_pipe; return &ffp_vertex_pipe; } @@ -2473,7 +2473,7 @@ static const struct wined3d_vertex_pipe_ops *select_vertex_implementation(const static const struct fragment_pipeline *select_fragment_implementation(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_backend_ops *shader_backend_ops) { - if (shader_backend_ops == &glsl_shader_backend) + if (shader_backend_ops == &glsl_shader_backend && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_fragment_pipe; if (shader_backend_ops == &arb_program_shader_backend && gl_info->supported[ARB_FRAGMENT_PROGRAM]) return &arbfp_fragment_pipeline;

1 0

Nikolay Sivov : ntoskrnl: Added RtlCopyMemory() export.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: oldstable Commit: 31d9b582ec8acbf3016fabcd4e8752dfb281a972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d9b582ec8acbf3016fabcd4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 29 09:20:42 2016 +0300 ntoskrnl: Added RtlCopyMemory() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 68f22743bd949db2f417a38de93de954388ac62e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a02c8d0..4bbac51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -963,6 +963,7 @@ @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) ntdll.RtlConvertSidToUnicodeString @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger @ stdcall RtlCopyLuid(ptr ptr) ntdll.RtlCopyLuid +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ stub RtlCopyRangeList @ stdcall RtlCopySid(long ptr ptr) ntdll.RtlCopySid @ stdcall RtlCopyString(ptr ptr) ntdll.RtlCopyString

1 0