January 2017 - Wine-commits

Alex Henrie : gdiplus: Fix memory leak in format_string_callback error path.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 046fc19cd1ce053ad3f1b08312aa97a447b158f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046fc19cd1ce053ad3f1b0831… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 23 01:18:42 2016 -0700 gdiplus: Fix memory leak in format_string_callback error path. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index b6ec88d..5a3356a 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -881,6 +881,7 @@ static GpStatus format_string_callback(HDC dc, start = (char *)ph; if (!ph || !lengthen_path(path, len / sizeof(POINTFX))) { + heap_free(ph); status = OutOfMemory; break; }

1 0

Andrew Eikum : dsound: Don' t write more than three periods to IAudioClient.
by Alexandre Julliard 03 Jan '17

03 Jan '17

Module: wine Branch: master Commit: 0190c50a8ca14e21355befc212b60f6409594aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=0190c50a8ca14e21355befc21… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 3 11:08:10 2017 -0600 dsound: Don't write more than three periods to IAudioClient. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f9720f8..f5a1020 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -296,12 +296,12 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { HRESULT hres; REFERENCE_TIME period; - UINT32 frames; + UINT32 acbuf_frames, aclen_frames; DWORD period_ms; IAudioClient *client = NULL; IAudioRenderClient *render = NULL; IAudioStreamVolume *volume = NULL; - DWORD fraglen; + DWORD frag_frames; WAVEFORMATEX *wfx = NULL; DWORD oldspeakerconfig = device->speaker_config; @@ -350,17 +350,20 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) WARN("GetStreamLatency failed with %08x\n", hres); goto err; } - hres = IAudioClient_GetBufferSize(client, &frames); + hres = IAudioClient_GetBufferSize(client, &acbuf_frames); if (FAILED(hres)) { WARN("GetBufferSize failed with %08x\n", hres); goto err; } period_ms = (period + 9999) / 10000; - fraglen = MulDiv(wfx->nSamplesPerSec, period, 10000000) * wfx->nBlockAlign; - TRACE("period %u ms fraglen %u buflen %u\n", period_ms, fraglen, frames * wfx->nBlockAlign); + frag_frames = MulDiv(wfx->nSamplesPerSec, period, 10000000); - hres = DSOUND_PrimaryOpen(device, wfx, frames, forcewave); + aclen_frames = min(acbuf_frames, 3 * frag_frames); + + TRACE("period %u ms fraglen %u buflen %u\n", period_ms, frag_frames * wfx->nBlockAlign, aclen_frames * wfx->nBlockAlign); + + hres = DSOUND_PrimaryOpen(device, wfx, aclen_frames, forcewave); if(FAILED(hres)) goto err; @@ -368,8 +371,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->client = client; device->render = render; device->volume = volume; - device->fraglen = fraglen; - device->aclen = frames * wfx->nBlockAlign; + device->fraglen = frag_frames * wfx->nBlockAlign; + device->aclen = aclen_frames * wfx->nBlockAlign; if (period_ms < 3) device->sleeptime = 5;

1 0

Andrew Eikum : dsound: Fix rolloff factor calculation.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: 1671a83f55bee46ee57cc0c8869e943d67f14ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1671a83f55bee46ee57cc0c88… 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> --- 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 b416cdc..4f07125 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -205,9 +205,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

Andrew Eikum : dsound: Use the value from SetVolume when 3D processing is disabled.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: d961f5ac7e75ccb1a5aac4f20596bf954f2d8500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d961f5ac7e75ccb1a5aac4f20… 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> --- dlls/dsound/sound3d.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 4f07125..a3a5b41 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; }

1 0

Pierre Schweitzer : mpr: Enumerate connections capability before looking for functions entry points.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: 96a93ee608b2919d1a8f583002e8262ef54a6743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96a93ee608b2919d1a8f58300… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Fri Dec 30 21:17:27 2016 +0100 mpr: Enumerate connections capability before looking for functions entry points. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 50f71d2..cbbc1bd 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -178,6 +178,7 @@ static void _tryLoadProvider(PCWSTR provider) TRACE("loaded lib %p\n", hLib); if (getCaps) { + DWORD connectCap; PWNetProvider provider = &providerTable->table[providerTable->numProviders]; @@ -211,9 +212,13 @@ static void _tryLoadProvider(PCWSTR provider) WARN("Couldn't load enumeration functions\n"); } } - provider->addConnection = MPR_GETPROC(NPAddConnection); - provider->addConnection3 = MPR_GETPROC(NPAddConnection3); - provider->cancelConnection = MPR_GETPROC(NPCancelConnection); + connectCap = getCaps(WNNC_CONNECTION); + if (connectCap & WNNC_CON_ADDCONNECTION) + provider->addConnection = MPR_GETPROC(NPAddConnection); + if (connectCap & WNNC_CON_ADDCONNECTION3) + provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + if (connectCap & WNNC_CON_CANCELCONNECTION) + provider->cancelConnection = MPR_GETPROC(NPCancelConnection); TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection3 %p\n", provider->addConnection3); TRACE("NPCancelConnection %p\n", provider->cancelConnection);

1 0

Louis Lenders : wine.inf: Add Drivers32 registry key.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: a5d9d29721c2f1165863e20457c4fa0675338ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d9d29721c2f1165863e2045… 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> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 1ffd037..b79a6c3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -506,6 +506,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

1 0

Nikolay Sivov : user32/tests: Added some tests for FindWindow().
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: d437d61c57e8181c35034b46b4a9a233f87652e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d437d61c57e8181c35034b46b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 11:59:44 2017 +0300 user32/tests: Added some tests for FindWindow(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ca99de4..4640109 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7978,6 +7978,16 @@ static void test_FindWindowEx(void) ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "ClassThatDoesntExist", "" ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowExA( 0, 0, "ClassThatDoesntExist", NULL ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; found = FindWindowExA( 0, 0, "MainWindowClass", "" ); ok( found == NULL, "expected a NULL hwnd\n" ); ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); @@ -8016,6 +8026,62 @@ static void test_FindWindowEx(void) ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); } +static void test_FindWindow(void) +{ + HWND hwnd, found; + + hwnd = CreateWindowExA( 0, "MainWindowClass", "caption", WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + num_gettext_msgs = 0; + found = FindWindowA( "ClassThatDoesntExist", "" ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "ClassThatDoesntExist", NULL ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", "" ); + ok( found == NULL, "expected a NULL hwnd\n" ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", NULL ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", "caption" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + DestroyWindow( hwnd ); + + hwnd = CreateWindowExA( 0, "MainWindowClass", NULL, WS_POPUP, 0,0,0,0, 0, 0, 0, NULL ); + ok( hwnd != 0, "CreateWindowExA error %d\n", GetLastError() ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", "" ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + num_gettext_msgs = 0; + found = FindWindowA( "MainWindowClass", NULL ); + ok( found == hwnd, "found is %p, expected a valid hwnd\n", found ); + ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + + DestroyWindow( hwnd ); + + /* test behaviour with a window title that is an empty character */ + found = FindWindowA( "Shell_TrayWnd", "" ); + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); + found = FindWindowA( "Shell_TrayWnd", NULL ); + ok( found != NULL, "found is NULL, expected a valid hwnd\n" ); +} + static void test_GetLastActivePopup(void) { HWND hwndOwner, hwndPopup1, hwndPopup2; @@ -9500,6 +9566,7 @@ START_TEST(win) /* make sure that these tests are executed first */ test_FindWindowEx(); + test_FindWindow(); test_SetParent(); hwndMain2 = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window 2",

1 0

Alexandre Julliard : ole32/tests: Add a test for WM_DRAWCLIPBOARD during OleSetClipboard.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: 526b19551b89d21b3a536d3ee205c734b24a889d URL: http://source.winehq.org/git/wine.git/?a=commit;h=526b19551b89d21b3a536d3ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 2 12:13:28 2017 +0100 ole32/tests: Add a test for WM_DRAWCLIPBOARD during OleSetClipboard. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 99 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index bf93628..a30796c 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -945,6 +945,104 @@ static void test_set_clipboard(void) OleUninitialize(); } +static LPDATAOBJECT clip_data; +static HWND next_wnd; +static UINT wm_drawclipboard; + +static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + LRESULT ret; + + switch (msg) + { + case WM_DRAWCLIPBOARD: + wm_drawclipboard++; + if (clip_data) + { + /* if this is the WM_DRAWCLIPBOARD of a previous change, the data isn't current yet */ + /* this demonstrates an issue in Qt where it will free the data while it's being set */ + HRESULT hr = OleIsCurrentClipboard( clip_data ); + ok( hr == (wm_drawclipboard > 1) ? S_OK : S_FALSE, + "OleIsCurrentClipboard returned %x\n", hr ); + } + break; + case WM_CHANGECBCHAIN: + if (next_wnd == (HWND)wp) next_wnd = (HWND)lp; + else if (next_wnd) SendMessageA( next_wnd, msg, wp, lp ); + break; + case WM_USER: + ret = wm_drawclipboard; + wm_drawclipboard = 0; + return ret; + } + + return DefWindowProcA(hwnd, msg, wp, lp); +} + +static DWORD CALLBACK set_clipboard_thread(void *arg) +{ + OpenClipboard( GetDesktopWindow() ); + EmptyClipboard(); + SetClipboardData( CF_WAVE, 0 ); + CloseClipboard(); + return 0; +} + +/* test that WM_DRAWCLIPBOARD can be delivered for a previous change during OleSetClipboard */ +static void test_set_clipboard_DRAWCLIPBOARD(void) +{ + LPDATAOBJECT data; + HRESULT hr; + WNDCLASSA cls; + HWND viewer; + int ret; + HANDLE thread; + + hr = DataObjectImpl_CreateText("data", &data); + ok(hr == S_OK, "Failed to create data object: 0x%08x\n", hr); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = clipboard_wnd_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "clipboard_test"; + RegisterClassA(&cls); + + viewer = CreateWindowA("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + ok(viewer != NULL, "CreateWindow failed: %d\n", GetLastError()); + next_wnd = SetClipboardViewer( viewer ); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( ret == 1, "%u WM_DRAWCLIPBOARD received\n", ret ); + + hr = OleInitialize(NULL); + ok(hr == S_OK, "OleInitialize failed with error 0x%08x\n", hr); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( !ret, "%u WM_DRAWCLIPBOARD received\n", ret ); + + thread = CreateThread(NULL, 0, set_clipboard_thread, NULL, 0, NULL); + ok(thread != NULL, "CreateThread failed (%d)\n", GetLastError()); + ret = WaitForSingleObject(thread, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + clip_data = data; + hr = OleSetClipboard(data); + ok(hr == S_OK, "failed to set clipboard to data, hr = 0x%08x\n", hr); + + ret = SendMessageA( viewer, WM_USER, 0, 0 ); + ok( ret == 2, "%u WM_DRAWCLIPBOARD received\n", ret ); + + clip_data = NULL; + hr = OleFlushClipboard(); + ok(hr == S_OK, "failed to flush clipboard, hr = 0x%08x\n", hr); + ret = IDataObject_Release(data); + ok(ret == 0, "got %d\n", ret); + + OleUninitialize(); + ChangeClipboardChain( viewer, next_wnd ); + DestroyWindow( viewer ); +} + static inline ULONG count_refs(IDataObject *d) { IDataObject_AddRef(d); @@ -1594,6 +1692,7 @@ START_TEST(clipboard) { test_get_clipboard_uninitialized(); test_set_clipboard(); + test_set_clipboard_DRAWCLIPBOARD(); test_consumer_refs(); test_flushed_getdata(); test_nonole_clipboard();

1 0

Alexandre Julliard : Update copyright info for 2017.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: 1f8974e6e8720b887d2221bcfbb157d003c0eb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f8974e6e8720b887d2221bcf… 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> --- 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

1 0

Józef Kucia : ddraw: Subtract framebuffer size from reported available video memory.
by Alexandre Julliard 02 Jan '17

02 Jan '17

Module: wine Branch: master Commit: 90909951154e1d663bebc134263b4025eacbdabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=90909951154e1d663bebc1342… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 2 10:44:38 2017 +0100 ddraw: Subtract framebuffer size from reported available video memory. 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/ddraw/ddraw.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c9efba6..6afa6dd 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1895,7 +1895,9 @@ static HRESULT WINAPI ddraw1_GetVerticalBlankStatus(IDirectDraw *iface, BOOL *st static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *Caps, DWORD *total, DWORD *free) { + unsigned int framebuffer_size, total_vidmem, free_vidmem; struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_display_mode mode; HRESULT hr = DD_OK; TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); @@ -1918,14 +1920,34 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C return DDERR_INVALIDPARAMS; } + /* Some applications (e.g. 3DMark 2000) assume that the reported amount of + * video memory doesn't include the memory used by the default framebuffer. + */ + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) + { + WARN("Failed to get display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + framebuffer_size = wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + mode.format_id, mode.width); + framebuffer_size *= mode.height; + if (free) - *free = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); + { + free_vidmem = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); + *free = framebuffer_size > free_vidmem ? 0 : free_vidmem - framebuffer_size; + TRACE("Free video memory %#x.\n", *free); + } + if (total) { struct wined3d_adapter_identifier desc = {0}; hr = wined3d_get_adapter_identifier(ddraw->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); - *total = min(UINT_MAX, desc.video_memory); + total_vidmem = min(UINT_MAX, desc.video_memory); + *total = framebuffer_size > total_vidmem ? 0 : total_vidmem - framebuffer_size; + TRACE("Total video memory %#x.\n", *total); } wined3d_mutex_unlock();

1 0