wine-commits February 2017

2 participants
838 discussions

Andrew Eikum : dsound: Fix rolloff factor calculation.

by Alexandre Julliard

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

7 years, 2 months

Andrew Eikum : msacm32: Support conversion from 24-bit PCM.

by Alexandre Julliard

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…

7 years, 2 months

Louis Lenders : wine.inf: Add Drivers32 registry key.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: f054e5b0615c0af8d4b625c228a3b71669c88c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f054e5b0615c0af8d4b625c22… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jan 2 00:15:15 2017 +0100 wine.inf: Add Drivers32 registry key. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a5d9d29721c2f1165863e20457c4fa0675338ad8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index dc55f52..0512d7b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -490,6 +490,7 @@ HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,"" HKLM,%CurrentVersionNT%,"RegisteredOwner",2,"" HKLM,%CurrentVersionNT%,"SystemRoot",,"%10%" HKLM,%CurrentVersionNT%\Console,,16 +HKLM,%CurrentVersionNT%\Drivers32,,16 HKLM,%CurrentVersionNT%\FontDpi,,16 HKLM,%CurrentVersionNT%\FontLink,,16 HKLM,%CurrentVersionNT%\FontMapper,,16

7 years, 2 months

Andrew Eikum : dsound: Use the value from SetVolume when 3D processing is disabled.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: c4049574ec772b0cc67357abd1a29daebf07179b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4049574ec772b0cc67357abd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 28 14:03:25 2016 -0600 dsound: Use the value from SetVolume when 3D processing is disabled. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d961f5ac7e75ccb1a5aac4f20596bf954f2d8500) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/sound3d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 840ab93..eb01881 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -185,6 +185,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) default: TRACE("3D processing disabled\n"); /* this one is here only to eliminate annoying warning message */ + dsb->volpan.lVolume = dsb->ds3db_lVolume; DSOUND_RecalcVolPan (&dsb->volpan); return; }

7 years, 2 months

Andrew Eikum : dsound: Handle default case in dsound3d mode switch ( Coverity).

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 8e00e636ec34455c4836ef3dd4c347594cdd1c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e00e636ec34455c4836ef3dd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Feb 10 12:54:15 2016 -0600 dsound: Handle default case in dsound3d mode switch (Coverity). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f461610e6c93f74e7eb07567f0740c8f357eb951) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/sound3d.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index e428053..840ab93 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -170,11 +170,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) switch (dsb->ds3db_ds3db.dwMode) { - case DS3DMODE_DISABLE: - TRACE("3D processing disabled\n"); - /* this one is here only to eliminate annoying warning message */ - DSOUND_RecalcVolPan (&dsb->volpan); - return; case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/ @@ -187,6 +182,11 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) vDistance = dsb->ds3db_ds3db.vPosition; flDistance = VectorMagnitude (&vDistance); break; + default: + TRACE("3D processing disabled\n"); + /* this one is here only to eliminate annoying warning message */ + DSOUND_RecalcVolPan (&dsb->volpan); + return; } if (flDistance > dsb->ds3db_ds3db.flMaxDistance)

7 years, 2 months

Andrew Eikum : user32: Support IDC_PEN.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 8ab3e0ba6422719fb31f8799de4862f71cf398e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ab3e0ba6422719fb31f8799d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 30 13:13:47 2016 -0600 user32: Support IDC_PEN. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d1064669f416ad2e354218852535250717bc34dc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/resources/ocr_pen.cur | Bin 0 -> 326 bytes dlls/user32/user32.rc | 3 +++ include/winuser.h | 1 + include/winuser.rh | 1 + 4 files changed, 5 insertions(+) diff --git a/dlls/user32/resources/ocr_pen.cur b/dlls/user32/resources/ocr_pen.cur new file mode 100644 index 0000000..51be164 Binary files /dev/null and b/dlls/user32/resources/ocr_pen.cur differ diff --git a/dlls/user32/user32.rc b/dlls/user32/user32.rc index 4826e04..28a6c74 100644 --- a/dlls/user32/user32.rc +++ b/dlls/user32/user32.rc @@ -263,6 +263,9 @@ OCR_HELP CURSOR resources/ocr_help.cur /* @makedep: resources/ocr_dragobject.cur */ OCR_DRAGOBJECT CURSOR resources/ocr_dragobject.cur +/* @makedep: resources/ocr_pen.cur */ +OCR_PEN CURSOR resources/ocr_pen.cur + /****************************************************************/ /* Icons */ diff --git a/include/winuser.h b/include/winuser.h index cbd592c..8b1302c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2200,6 +2200,7 @@ typedef struct tagCBTACTIVATESTRUCT #define IDC_WAIT MAKEINTRESOURCE(32514) #define IDC_CROSS MAKEINTRESOURCE(32515) #define IDC_UPARROW MAKEINTRESOURCE(32516) +#define IDC_PEN MAKEINTRESOURCE(32631) #define IDC_SIZE MAKEINTRESOURCE(32640) #define IDC_ICON MAKEINTRESOURCE(32641) #define IDC_SIZENWSE MAKEINTRESOURCE(32642) diff --git a/include/winuser.rh b/include/winuser.rh index 1d2a0bb..e48a935 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -999,6 +999,7 @@ #define OCR_WAIT 32514 #define OCR_CROSS 32515 #define OCR_UP 32516 +#define OCR_PEN 32631 #define OCR_SIZE 32640 #define OCR_ICON 32641 #define OCR_SIZENWSE 32642

7 years, 2 months

Alexandre Julliard : Update copyright info for 2017.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: ce6cbd48cc3736358ac8144ae4ecdb7e57e3e95a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6cbd48cc3736358ac8144ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 16:05:08 2017 +0100 Update copyright info for 2017. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1f8974e6e8720b887d2221bcfbb157d003c0eb02) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- LICENSE | 2 +- dlls/opengl32/version.rc | 2 +- include/wine/wine_common_ver.rc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index c35515e..1065ca6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS +Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list) Wine is free software; you can redistribute it and/or modify it under diff --git a/dlls/opengl32/version.rc b/dlls/opengl32/version.rc index 8dbb85b..eb36403 100644 --- a/dlls/opengl32/version.rc +++ b/dlls/opengl32/version.rc @@ -20,7 +20,7 @@ #define WINE_FILENAME_STR "opengl32.dll" #define WINE_FILEVERSION 5,1,2600,2082 #define WINE_FILEVERSION_STR "5.1.2600.2082" -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project. Not Microsoft" /* CATIA needs 'Microsoft' in both CompanyName _and_ LegalCopyright */ #define WINE_PRODUCTVERSION 5,1,2600,2082 #define WINE_PRODUCTVERSION_STR "5.1" diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index fcf1385..76ddabf 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -74,7 +74,7 @@ never complain. #endif #ifndef WINE_LEGALCOPYRIGHT -#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2016 the Wine project authors (see the file AUTHORS for a complete list)" +#define WINE_LEGALCOPYRIGHT "Copyright (c) 1993-2017 the Wine project authors (see the file AUTHORS for a complete list)" #endif #ifndef WINE_PRODUCTVERSION

7 years, 2 months

Nikolay Sivov : comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 581a1f03497e30b6f4dccf84e351e4e6c54ec73a URL: http://source.winehq.org/git/wine.git/?a=commit;h=581a1f03497e30b6f4dccf84e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:21 2016 +0300 comctl32/trackbar: Update thumb unconditionally on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6aabe0159b6c38664380718b57418618e305704) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 1 - dlls/comctl32/trackbar.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index da24595..80d5906 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -992,7 +992,6 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); - todo_wine ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 880acc7..0e52212 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1433,6 +1433,7 @@ TRACKBAR_SetTicFreq (TRACKBAR_INFO *infoPtr, WORD wFreq) TRACKBAR_InvalidateAll(infoPtr); } + TRACKBAR_UpdateThumb (infoPtr); return 0; }

7 years, 2 months

Nikolay Sivov : comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 0bc743ace967e7c08f166d0a9b76271530bf8274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc743ace967e7c08f166d0a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:20 2016 +0300 comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 458ddd59b247a52fc4463a1a8b90d4744f154142) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 918cf1a..da24595 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -890,7 +890,7 @@ static void test_thumb_length(void) static void test_tic_settings(void) { HWND hWndTrackbar; - int r; + int r, i; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -955,6 +955,51 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); r = SendMessageA(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(3, r); + + DestroyWindow(hWndTrackbar); + + /* Test to show that TBM_SETTICFREQ updates thumb */ + for (i = 0; i < 2; i++) + { + DWORD style = i ? defaultstyle : defaultstyle & ~TBS_AUTOTICKS; + RECT rect, rect1; + WNDPROC oldproc; + + hWndTrackbar = create_trackbar2(style, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-100, 100)); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Old position is also 0, but thumb position will be different after range change */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Previous frequency is also 1, yet thumb is updated */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + todo_wine + ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)oldproc); + + DestroyWindow(hWndTrackbar); + } } static void test_tic_placement(void)

7 years, 2 months

Michael Stefaniuc : include: Make wine_dbgstr_rect() available for tests too.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 46ac41ba7b5de8aba2ab7fef637f825fc7083d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ac41ba7b5de8aba2ab7fef6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 7 09:45:40 2016 +0200 include: Make wine_dbgstr_rect() available for tests too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 636340ce34e1ef7996eb48c8717b3bdb39dcdc8d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index 862d553..8f6db18 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -66,6 +66,7 @@ extern void winetest_wait_child_process( HANDLE process ); extern const char *wine_dbgstr_wn( const WCHAR *str, int n ); extern const char *wine_dbgstr_guid( const GUID *guid ); +extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } /* strcmpW is available for tests compiled under Wine, but not in standalone @@ -534,6 +535,17 @@ const char *wine_dbgstr_guid( const GUID *guid ) return res; } +const char *wine_dbgstr_rect( const RECT *rect ) +{ + char *res; + + if (!rect) return "(null)"; + res = get_temp_buffer( 60 ); + sprintf( res, "(%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); + release_temp_buffer( res, strlen(res) + 1 ); + return res; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) {

7 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
84
Older →

Jump to page:

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