wine-commits April 2015

wine-commits@winehq.org

2 participants
451 discussions

Mark Harmstone : uxtheme: Resize source image if destination smaller than margins.
by Alexandre Julliard 15 Apr '15

15 Apr '15

Module: wine Branch: master Commit: 2b650fa6db522ae5deb0d09310c0a595a6e3e910 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b650fa6db522ae5deb0d0931… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Apr 14 22:12:01 2015 +0100 uxtheme: Resize source image if destination smaller than margins. --- dlls/uxtheme/draw.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 8a9397d..a7f80fd 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -663,9 +663,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, const DTBGOPTS *pOptions) { HRESULT hr = S_OK; - HBITMAP bmpSrc; + HBITMAP bmpSrc, bmpSrcResized = NULL; HGDIOBJ oldSrc; - HDC hdcSrc; + HDC hdcSrc, hdcOrigSrc = NULL; RECT rcSrc; RECT rcDst; POINT dstSize; @@ -729,6 +729,34 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); + /* Resize source image if destination smaller than margins */ + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { + sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); + sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; + srcSize.y = dstSize.y; + } + + if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); + sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; + srcSize.x = dstSize.x; + } + + hdcOrigSrc = hdcSrc; + hdcSrc = CreateCompatibleDC(NULL); + bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); + SelectObject(hdcSrc, bmpSrcResized); + + UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + + rcSrc.left = 0; + rcSrc.top = 0; + rcSrc.right = srcSize.x; + rcSrc.bottom = srcSize.y; + } + hdcDst = hdc; OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); @@ -833,6 +861,8 @@ draw_error: } SelectObject(hdcSrc, oldSrc); DeleteDC(hdcSrc); + if (bmpSrcResized) DeleteObject(bmpSrcResized); + if (hdcOrigSrc) DeleteDC(hdcOrigSrc); CopyRect(pRect, &rcDst); return hr; }

1 0

Andrew Eikum : dsound/tests: Don't perform ALAW test on secondary buffers.
by Alexandre Julliard 15 Apr '15

15 Apr '15

Module: wine Branch: master Commit: 582b54329db0b3854d8d490c4543a2cf493910d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582b54329db0b3854d8d490c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 14 14:10:49 2015 -0500 dsound/tests: Don't perform ALAW test on secondary buffers. win2k supports it, winxp gives one error, vista+ gives another. This isn't interesting behavior to test. --- dlls/dsound/tests/dsound.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 59763aa..78364ed 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -1391,25 +1391,27 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I ok(wfx.nAvgBytesPerSec == 44100 * 4 + 1, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); IDirectSoundBuffer_Release(got_buf); - wfx.wFormatTag = WAVE_FORMAT_ALAW; - wfx.nChannels = 2; - wfx.nSamplesPerSec = 44100; - wfx.wBitsPerSample = 16; - wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; - wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; - rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); - ok(buf ? rc == S_OK : (rc == E_NOTIMPL || rc == DSERR_INVALIDCALL /* winxp */), "%s: SetFormat: %08x\n", testname, rc); - - if(got_buf){ - rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); - ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); - ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "%s: format: 0x%x\n", testname, wfx.wFormatTag); - ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); - ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); - ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); - ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); - ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); - IDirectSoundBuffer_Release(got_buf); + if(buf){ + wfx.wFormatTag = WAVE_FORMAT_ALAW; + wfx.nChannels = 2; + wfx.nSamplesPerSec = 44100; + wfx.wBitsPerSample = 16; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + rc = do_invalid_fmt_test(dso, buf, &wfx, &got_buf); + ok(rc == S_OK, "%s: SetFormat: %08x\n", testname, rc); + + if(got_buf){ + rc = IDirectSoundBuffer_GetFormat(got_buf, &wfx, sizeof(wfx), NULL); + ok(rc == S_OK, "%s: GetFormat: %08x\n", testname, rc); + ok(wfx.wFormatTag == WAVE_FORMAT_ALAW, "%s: format: 0x%x\n", testname, wfx.wFormatTag); + ok(wfx.nChannels == 2, "%s: channels: %u\n", testname, wfx.nChannels); + ok(wfx.nSamplesPerSec == 44100, "%s: rate: %u\n", testname, wfx.nSamplesPerSec); + ok(wfx.wBitsPerSample == 16, "%s: bps: %u\n", testname, wfx.wBitsPerSample); + ok(wfx.nBlockAlign == 4, "%s: blockalign: %u\n", testname, wfx.nBlockAlign); + ok(wfx.nAvgBytesPerSec == 44100 * 4, "%s: avgbytes: %u\n", testname, wfx.nAvgBytesPerSec); + IDirectSoundBuffer_Release(got_buf); + } } if(!gotdx8){

1 0

Andrew Eikum : winecfg: Use a listview for speaker configuration.
by Alexandre Julliard 15 Apr '15

15 Apr '15

Module: wine Branch: master Commit: e17f4fd2f814a2a651c229ead4f86ab25130fe06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e17f4fd2f814a2a651c229ead… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 14 14:01:46 2015 -0500 winecfg: Use a listview for speaker configuration. --- po/ar.po | 220 +++++++++++++++++++++----------------------- po/bg.po | 219 +++++++++++++++++++++---------------------- po/ca.po | 220 +++++++++++++++++++++----------------------- po/cs.po | 220 +++++++++++++++++++++----------------------- po/da.po | 220 +++++++++++++++++++++----------------------- po/de.po | 218 +++++++++++++++++++++---------------------- po/el.po | 218 +++++++++++++++++++++---------------------- po/en.po | 218 +++++++++++++++++++++---------------------- po/en_US.po | 218 +++++++++++++++++++++---------------------- po/eo.po | 220 +++++++++++++++++++++----------------------- po/es.po | 220 +++++++++++++++++++++----------------------- po/fa.po | 218 +++++++++++++++++++++---------------------- po/fi.po | 218 +++++++++++++++++++++---------------------- po/fr.po | 218 +++++++++++++++++++++---------------------- po/he.po | 218 +++++++++++++++++++++---------------------- po/hi.po | 218 +++++++++++++++++++++---------------------- po/hr.po | 220 +++++++++++++++++++++----------------------- po/hu.po | 220 +++++++++++++++++++++----------------------- po/it.po | 220 +++++++++++++++++++++----------------------- po/ja.po | 218 +++++++++++++++++++++---------------------- po/ko.po | 220 +++++++++++++++++++++----------------------- po/lt.po | 218 +++++++++++++++++++++---------------------- po/ml.po | 218 +++++++++++++++++++++---------------------- po/nb_NO.po | 220 +++++++++++++++++++++----------------------- po/nl.po | 220 +++++++++++++++++++++----------------------- po/or.po | 218 +++++++++++++++++++++---------------------- po/pa.po | 218 +++++++++++++++++++++---------------------- po/pl.po | 220 +++++++++++++++++++++----------------------- po/pt_BR.po | 220 +++++++++++++++++++++----------------------- po/pt_PT.po | 220 +++++++++++++++++++++----------------------- po/rm.po | 218 +++++++++++++++++++++---------------------- po/ro.po | 220 +++++++++++++++++++++----------------------- po/ru.po | 218 +++++++++++++++++++++---------------------- po/sk.po | 220 +++++++++++++++++++++----------------------- po/sl.po | 220 +++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 218 +++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 220 +++++++++++++++++++++----------------------- po/sv.po | 220 +++++++++++++++++++++----------------------- po/te.po | 218 +++++++++++++++++++++---------------------- po/th.po | 218 +++++++++++++++++++++---------------------- po/tr.po | 220 +++++++++++++++++++++----------------------- po/uk.po | 218 +++++++++++++++++++++---------------------- po/wa.po | 218 +++++++++++++++++++++---------------------- po/wine.pot | 218 +++++++++++++++++++++---------------------- po/zh_CN.po | 220 +++++++++++++++++++++----------------------- po/zh_TW.po | 220 +++++++++++++++++++++----------------------- programs/winecfg/audio.c | 105 +++++++++++++++------ programs/winecfg/resource.h | 4 +- programs/winecfg/winecfg.rc | 12 ++- 49 files changed, 5010 insertions(+), 5186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e17f4fd2f814a2a651c22…

1 0

Alistair Leslie-Hughes : dpnet: Convert Address components to use an array.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: f2aa42de09679a6b6c016cfc88e8b329fb796dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2aa42de09679a6b6c016cfc8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 11 16:38:59 2015 +1100 dpnet: Convert Address components to use an array. --- dlls/dpnet/address.c | 85 ++++++++++++++++++++++++++++++++++++++-------- dlls/dpnet/dpnet_private.h | 4 ++- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index defd894..7e10136 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -44,6 +44,11 @@ static inline void *heap_alloc(size_t len) return HeapAlloc(GetProcessHeap(), 0, len); } +static inline void *heap_realloc(void *mem, size_t len) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, len); +} + static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); @@ -74,6 +79,28 @@ static char *heap_strdupA( const char *str ) return ret; } +static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) +{ + if(This->comp_count == This->comp_array_size) + { + struct component **temp; + + temp = heap_realloc(This->components, sizeof(*temp) * This->comp_array_size * 2 ); + if(!temp) + { + return FALSE; + } + + This->comp_array_size *= 2; + This->components = temp; + } + + This->components[This->comp_count] = item; + This->comp_count++; + + return TRUE; +} + static inline IDirectPlay8AddressImpl *impl_from_IDirectPlay8Address(IDirectPlay8Address *iface) { return CONTAINING_RECORD(iface, IDirectPlay8AddressImpl, IDirectPlay8Address_iface); @@ -112,10 +139,13 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) if (!ref) { - struct component *entry, *entry2; + struct component *entry; + DWORD i; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + entry = This->components[i]; + switch(entry->type) { case DPNA_DATATYPE_STRING: @@ -129,10 +159,11 @@ static ULONG WINAPI IDirectPlay8AddressImpl_Release(IDirectPlay8Address *iface) break; } - HeapFree(GetProcessHeap(), 0, entry); + heap_free(entry); } - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->components); + heap_free(This); } return ref; } @@ -192,13 +223,15 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa if(hr == S_OK) { IDirectPlay8AddressImpl *DupThis = impl_from_IDirectPlay8Address(dup); - struct component *entry; + DWORD i; DupThis->SP_guid = This->SP_guid; DupThis->init = This->init; - LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + struct component *entry = This->components[i]; + hr = IDirectPlay8Address_AddComponent(dup, entry->name, &entry->data, entry->size, entry->type); if(hr != S_OK) ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); @@ -308,7 +341,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetNumComponents(IDirectPlay8Addre if(!pdwNumComponents) return DPNERR_INVALIDPOINTER; - *pdwNumComponents = list_count(&This->components); + *pdwNumComponents = This->comp_count; return DPN_OK; } @@ -318,14 +351,17 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add { IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); struct component *entry; + DWORD i; TRACE("(%p)->(%p %p %p %p)\n", This, pwszName, pvBuffer, pdwBufferSize, pdwDataType); if(!pwszName || !pdwBufferSize || !pdwDataType || (!pvBuffer && pdwBufferSize)) return E_POINTER; - LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + entry = This->components[i]; + if (lstrcmpW(pwszName, entry->name) == 0) { TRACE("Found %s\n", debugstr_w(pwszName)); @@ -381,6 +417,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); struct component *entry; BOOL found = FALSE; + DWORD i; TRACE("(%p, %s, %p, %u, %x)\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); @@ -419,15 +456,17 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } - LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) + for(i=0; i < This->comp_count; i++) { + entry = This->components[i]; + if (lstrcmpW(pwszName, entry->name) == 0) { TRACE("Found %s\n", debugstr_w(pwszName)); found = TRUE; if(entry->type == DPNA_DATATYPE_STRING_ANSI) - heap_free(entry->data.ansi); + heap_free(entry->data.ansi); else if(entry->type == DPNA_DATATYPE_STRING) heap_free(entry->data.string); else if(entry->type == DPNA_DATATYPE_BINARY) @@ -441,9 +480,22 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * { /* Create a new one */ entry = heap_alloc(sizeof(struct component)); + if(!entry) + return E_OUTOFMEMORY; + entry->name = heap_strdupW(pwszName); + if(!entry->name) + { + heap_free(entry); + return E_OUTOFMEMORY; + } - list_add_tail(&This->components, &entry->entry); + if(!add_component(This, entry)) + { + heap_free(entry->name); + heap_free(entry); + return E_OUTOFMEMORY; + } } switch (dwDataType) @@ -532,7 +584,7 @@ HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter TRACE("(%p, %s, %p)\n", pUnkOuter, debugstr_guid(riid), ppobj); - *ppobj = NULL; + *ppobj = NULL; client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8AddressImpl)); if (!client) @@ -540,8 +592,13 @@ HRESULT DPNET_CreateDirectPlay8Address(IClassFactory *iface, IUnknown *pUnkOuter client->IDirectPlay8Address_iface.lpVtbl = &DirectPlay8Address_Vtbl; client->ref = 1; - - list_init(&client->components); + client->comp_array_size = 4; + client->components = heap_alloc( sizeof(*client->components) * client->comp_array_size ); + if(!client->components) + { + heap_free(client); + return E_OUTOFMEMORY; + } ret = IDirectPlay8AddressImpl_QueryInterface(&client->IDirectPlay8Address_iface, riid, ppobj); IDirectPlay8AddressImpl_Release(&client->IDirectPlay8Address_iface); diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 1ed4f25..f9c4400 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -91,7 +91,9 @@ struct IDirectPlay8AddressImpl GUID SP_guid; BOOL init; - struct list components; + struct component **components; + DWORD comp_count; + DWORD comp_array_size; }; /*****************************************************************************

1 0

Hugh McMaster : wineconsole: Do not truncate argument strings larger than 256 bytes.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 0516d969ebffa93f1317a9dbf6e4c1a1af457a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0516d969ebffa93f1317a9dbf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 8 16:08:08 2015 +1000 wineconsole: Do not truncate argument strings larger than 256 bytes. --- programs/wineconsole/wineconsole.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 3c2faf5..ed5f816 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -830,13 +830,24 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh break; case from_process_name: { - WCHAR buffer[256]; + int len; + WCHAR *buffer; - MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, sizeof(buffer) / sizeof(buffer[0])); + len = MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, NULL, 0); + + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!buffer) + return 0; + + MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) + { + HeapFree(GetProcessHeap(), 0, buffer); return 0; + } ret = WINECON_Spawn(data, buffer); + HeapFree(GetProcessHeap(), 0, buffer); if (!ret) { WINECON_Delete(data);

1 0

Henri Verbeet : d3d8: Update the BackBufferCount after a successful reset.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 69047ed4f7e2b0799f639691b30ac4ad5059b06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69047ed4f7e2b0799f639691b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:03 2015 +0200 d3d8: Update the BackBufferCount after a successful reset. --- dlls/d3d8/device.c | 1 + dlls/d3d8/tests/device.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 464aced..10c2103 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -670,6 +670,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { + present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->device_state = D3D8_DEVICE_STATE_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 92ec3d0..64c2911 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1359,7 +1359,7 @@ static void test_reset(void) ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow);

1 0

Henri Verbeet : d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 3ccac1a71f1650456b389408486f212c4635d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccac1a71f1650456b3894084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:02 2015 +0200 d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d9/device.c | 13 +++++++++++++ dlls/d3d9/tests/d3d9ex.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 97c71bb..0b1a77a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -667,9 +667,22 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); + wined3d_swapchain_get_desc(wined3d_swapchain, &swapchain_desc); + present_parameters->BackBufferWidth = swapchain_desc.backbuffer_width; + present_parameters->BackBufferHeight = swapchain_desc.backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format); + present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; + device->device_state = D3D9_DEVICE_STATE_OK; + } else if (!device->d3d_parent->extended) + { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; + } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index bd956b6..6118ce9 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1062,11 +1062,11 @@ static void test_reset(void) hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected cooperative level %#x.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(!d3dpp.MultiSampleQuality, "Got unexpected MultiSampleQuality %u.\n", d3dpp.MultiSampleQuality); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9ecbae0..174fc13 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1867,11 +1867,11 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(!d3dpp.MultiSampleQuality, "Got unexpected MultiSampleQuality %u.\n", d3dpp.MultiSampleQuality); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect);

1 0

Henri Verbeet : d3d9: Merge most of d3d9_device_Reset() and d3d9_device_ResetEx().
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: c78312ad0804e6cf82ef6bd4da2c8ba765e89054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78312ad0804e6cf82ef6bd4d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:01 2015 +0200 d3d9: Merge most of d3d9_device_Reset() and d3d9_device_ResetEx(). --- dlls/d3d9/device.c | 72 ++++++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 43 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index da462b1..97c71bb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -626,21 +626,28 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) return D3D_OK; } -static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface, - D3DPRESENT_PARAMETERS *present_parameters) +static HRESULT d3d9_device_reset(struct d3d9_device *device, + D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { - struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain_desc swapchain_desc; + struct wined3d_display_mode wined3d_mode; HRESULT hr; - TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); - if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST) { WARN("App not active, returning D3DERR_DEVICELOST.\n"); return D3DERR_DEVICELOST; } + if (mode) + { + wined3d_mode.width = mode->Width; + wined3d_mode.height = mode->Height; + wined3d_mode.refresh_rate = mode->RefreshRate; + wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); + wined3d_mode.scanline_ordering = mode->ScanLineOrdering; + } + wined3d_mutex_lock(); if (device->vertex_buffer) @@ -649,6 +656,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if device->vertex_buffer = NULL; device->vertex_buffer_size = 0; } + if (device->index_buffer) { wined3d_buffer_decref(device->index_buffer); @@ -657,17 +665,27 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if } wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - NULL, reset_enum_callback, !device->d3d_parent->extended); - if (FAILED(hr) && !device->d3d_parent->extended) - device->device_state = D3D9_DEVICE_STATE_NOT_RESET; - else + if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, + mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) device->device_state = D3D9_DEVICE_STATE_OK; + else if (!device->d3d_parent->extended) + device->device_state = D3D9_DEVICE_STATE_NOT_RESET; + wined3d_mutex_unlock(); return hr; } +static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface, + D3DPRESENT_PARAMETERS *present_parameters) +{ + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + + TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); + + return d3d9_device_reset(device, present_parameters, NULL); +} + static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex *iface, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { @@ -3253,42 +3271,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex * D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_display_mode wined3d_mode; - HRESULT hr; TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode); - if (mode) - { - wined3d_mode.width = mode->Width; - wined3d_mode.height = mode->Height; - wined3d_mode.refresh_rate = mode->RefreshRate; - wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format); - wined3d_mode.scanline_ordering = mode->ScanLineOrdering; - } - - wined3d_mutex_lock(); - - if (device->vertex_buffer) - { - wined3d_buffer_decref(device->vertex_buffer); - device->vertex_buffer = NULL; - device->vertex_buffer_size = 0; - } - if (device->index_buffer) - { - wined3d_buffer_decref(device->index_buffer); - device->index_buffer = NULL; - device->index_buffer_size = 0; - } - - wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); - hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, - mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE); - wined3d_mutex_unlock(); - - return hr; + return d3d9_device_reset(device, present_parameters, mode); } static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface,

1 0

Henri Verbeet : d3d8/tests: Test D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: 549f7b8a9c321a919bee240ea1e013ed06a2d569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=549f7b8a9c321a919bee240ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:00 2015 +0200 d3d8/tests: Test D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d8/tests/device.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 411f61a..92ec3d0 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1119,6 +1119,7 @@ static void test_reset(void) UINT height, orig_height = GetSystemMetrics(SM_CYSCREEN); IDirect3DDevice8 *device1 = NULL; IDirect3DDevice8 *device2 = NULL; + struct device_desc device_desc; D3DDISPLAYMODE d3ddm, d3ddm2; D3DSURFACE_DESC surface_desc; D3DPRESENT_PARAMETERS d3dpp; @@ -1202,20 +1203,13 @@ static void test_reset(void) i = 0; if (modes[i].w == orig_width && modes[i].h == orig_height) ++i; - memset(&d3dpp, 0, sizeof(d3dpp)); - d3dpp.Windowed = FALSE; - d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; - d3dpp.BackBufferWidth = modes[i].w; - d3dpp.BackBufferHeight = modes[i].h; - d3dpp.BackBufferFormat = d3ddm.Format; - d3dpp.EnableAutoDepthStencil = TRUE; - d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; - - hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - window, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device1); - if (FAILED(hr)) + device_desc.width = modes[i].w; + device_desc.height = modes[i].h; + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN | CREATE_DEVICE_SWVP_ONLY; + if (!(device1 = create_device(d3d8, window, &device_desc))) { - skip("Failed to create device, hr %#x.\n", hr); + skip("Failed to create a D3D device, skipping tests.\n"); goto cleanup; } hr = IDirect3DDevice8_TestCooperativeLevel(device1); @@ -1305,7 +1299,7 @@ static void test_reset(void) d3dpp.Windowed = TRUE; d3dpp.BackBufferWidth = 400; d3dpp.BackBufferHeight = 300; - d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.BackBufferFormat = D3DFMT_A8R8G8B8; hr = IDirect3DDevice8_Reset(device1, &d3dpp); ok(SUCCEEDED(hr), "Reset failed, hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device1); @@ -1361,6 +1355,23 @@ static void test_reset(void) hr = IDirect3DDevice8_TestCooperativeLevel(device1); ok(SUCCEEDED(hr), "TestCooperativeLevel failed, hr %#x.\n", hr); + ok(!d3dpp.BackBufferWidth, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + d3dpp.BackBufferFormat, d3ddm.Format); + todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); + ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); + ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow); + ok(d3dpp.Windowed, "Got unexpected Windowed %#x.\n", d3dpp.Windowed); + ok(!d3dpp.EnableAutoDepthStencil, "Got unexpected EnableAutoDepthStencil %#x.\n", d3dpp.EnableAutoDepthStencil); + ok(!d3dpp.AutoDepthStencilFormat, "Got unexpected AutoDepthStencilFormat %#x.\n", d3dpp.AutoDepthStencilFormat); + ok(!d3dpp.Flags, "Got unexpected Flags %#x.\n", d3dpp.Flags); + ok(!d3dpp.FullScreen_RefreshRateInHz, "Got unexpected FullScreen_RefreshRateInHz %u.\n", + d3dpp.FullScreen_RefreshRateInHz); + ok(!d3dpp.FullScreen_PresentationInterval, "Got unexpected FullScreen_PresentationInterval %#x.\n", + d3dpp.FullScreen_PresentationInterval); + memset(&vp, 0, sizeof(vp)); hr = IDirect3DDevice8_GetViewport(device1, &vp); ok(SUCCEEDED(hr), "GetViewport failed, hr %#x.\n", hr); @@ -1378,6 +1389,9 @@ static void test_reset(void) ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); + ok(surface_desc.Format == d3ddm.Format, "Got unexpected Format %#x, expected %#x.\n", + surface_desc.Format, d3ddm.Format); + ok(!surface_desc.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(surface_desc.Width == 200, "Back buffer width is %u, expected 200.\n", surface_desc.Width); ok(surface_desc.Height == 150, "Back buffer height is %u, expected 150.\n", surface_desc.Height); IDirect3DSurface8_Release(surface);

1 0

Henri Verbeet : d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard 14 Apr '15

14 Apr '15

Module: wine Branch: master Commit: af438d451c1f529779acbce22107e6db40d93600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af438d451c1f529779acbce22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:15:59 2015 +0200 d3d9/tests: Test D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d9/tests/d3d9ex.c | 33 +++++++++++++ dlls/d3d9/tests/device.c | 125 +++++++++++++++++++++++++---------------------- 2 files changed, 100 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af438d451c1f529779acb…

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
46
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 April 2015