January 2014 - Wine-Commits

Bruno Jesus : wininet: InternetGetConnectedStateExW must return TRUE for success.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 2ef27a232239bcd614e53ff48054ac5fecadd354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef27a232239bcd614e53ff48… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 29 20:01:09 2014 -0200 wininet: InternetGetConnectedStateExW must return TRUE for success. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a49026c..3cf3ea6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1219,7 +1219,7 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti WARN("always returning LAN connection.\n"); *lpdwStatus = INTERNET_CONNECTION_LAN; } - return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); + return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen) > 0; }

1 0

Michael Stefaniuc : dmband: None of the COM classes support aggregation.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 05d1872575765be02a3304f10cad103c9ce5e84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d1872575765be02a3304f10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:46:19 2014 +0100 dmband: None of the COM classes support aggregation. --- dlls/dmband/band.c | 3 ++- dlls/dmband/bandtrack.c | 3 ++- dlls/dmband/dmband_main.c | 13 +++++++++---- dlls/dmband/dmband_private.h | 5 ++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index e67bc8e..e72a042 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -687,7 +687,8 @@ static const IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) +{ IDirectMusicBandImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl)); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 878ccc0..8be6b29 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -606,7 +606,8 @@ static const IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmbandtrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicBandTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandTrack)); diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 414f5e4..f72b415 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -27,7 +27,7 @@ LONG DMBAND_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; /****************************************************************** @@ -79,7 +79,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -102,8 +107,8 @@ static const IClassFactoryVtbl classfactory_vtbl = { ClassFactory_LockServer }; -static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicBandImpl}; -static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicBandTrack}; +static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, create_dmband}; +static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, create_dmbandtrack}; /****************************************************************** * DllMain diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index aa775df..0f5f939 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -52,9 +52,8 @@ typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; - -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

André Hentschel : kernel32: Fix out of bounds access in DnsHostnameToComputerName[AW].
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: bbd71d6b72497f6ab24e43548ad924747549d090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd71d6b72497f6ab24e43548… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 23:41:28 2014 +0100 kernel32: Fix out of bounds access in DnsHostnameToComputerName[AW]. --- dlls/kernel32/computername.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 8650440..0c81ac0 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -688,7 +688,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, if (len > MAX_COMPUTERNAME_LENGTH) len = MAX_COMPUTERNAME_LENGTH; - if (*size < len) + if (*size < len + 1) { *size = len; return FALSE; @@ -696,7 +696,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, if (!computername) return FALSE; memcpy( computername, hostname, len ); - computername[len + 1] = 0; + computername[len] = 0; return TRUE; } @@ -716,7 +716,7 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname, if (len > MAX_COMPUTERNAME_LENGTH) len = MAX_COMPUTERNAME_LENGTH; - if (*size < len) + if (*size < len + 1) { *size = len; return FALSE; @@ -724,6 +724,6 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname, if (!computername) return FALSE; memcpy( computername, hostname, len * sizeof(WCHAR) ); - computername[len + 1] = 0; + computername[len] = 0; return TRUE; }

1 0

Michael Stefaniuc : dmband/tests: Move the dll availability check to a separate function.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 7012235479de36862f55962915a5600b2f8af6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7012235479de36862f5596291… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:49:42 2014 +0100 dmband/tests: Move the dll availability check to a separate function. --- dlls/dmband/tests/dmband.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index ecc767a..5195066 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -31,22 +31,28 @@ DEFINE_GUID(IID_IDirectMusicBandTrackPrivate, 0x53466056, 0x6dc4, 0x11d1, 0xbf, 0x7b, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef); +static BOOL missing_dmband(void) +{ + IDirectMusicBand *dmb; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void**)&dmb); + + if (hr == S_OK && dmb) + { + IDirectMusicBand_Release(dmb); + return FALSE; + } + return TRUE; +} + static void test_dmband(void) { - IDirectMusicBand *band; IUnknown *unknown = NULL; IDirectMusicTrack *track = NULL; IPersistStream *stream = NULL; IPersistStream *private = NULL; HRESULT hr; - hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (LPVOID*)&band); - if (hr != S_OK) - { - skip("Cannot create DirectMusicBand object (%x)\n", hr); - return; - } - hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unknown); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicTrack, (LPVOID*)&track); @@ -68,13 +74,19 @@ static void test_dmband(void) IDirectMusicTrack_Release(track); if (unknown) IUnknown_Release(unknown); - IDirectMusicBand_Release(band); } START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (missing_dmband()) + { + skip("dmband not available\n"); + CoUninitialize(); + return; + } + test_dmband(); CoUninitialize();

1 0

Alexandre Julliard : winetest: Add an XML test file.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: tools Branch: master Commit: 8897feeefe53e84d4419e8ec92d14d4b51146b50 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8897feeefe53e84d4419e8ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 21:45:36 2014 +0100 winetest: Add an XML test file. --- winetest/tests/xmltest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/tests/xmltest.xml b/winetest/tests/xmltest.xml new file mode 100644 index 0000000..792f884 --- /dev/null +++ b/winetest/tests/xmltest.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<a>TEST</a>

1 0

Henri Verbeet : d3d9/tests: Direct3DCreate9() is always available if we have d3d9.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: a1b963490a80f92aa3359f5ee97215c0b3064c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b963490a80f92aa3359f5ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:39 2014 +0100 d3d9/tests: Direct3DCreate9() is always available if we have d3d9. --- dlls/d3d9/tests/Makefile.in | 2 +- dlls/d3d9/tests/d3d9ex.c | 8 +- dlls/d3d9/tests/device.c | 299 +++++++++++++++++------------------ dlls/d3d9/tests/stateblock.c | 63 +++----- dlls/d3d9/tests/vertexdeclaration.c | 48 ++---- dlls/d3d9/tests/visual.c | 28 +--- 6 files changed, 188 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1b963490a80f92aa3359…

1 0

Henri Verbeet : d3d8/tests: Direct3DCreate8() is always available if we have d3d8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 56d1225ec208c46d4899e3f7f0f02f6b24fca230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d1225ec208c46d4899e3f7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:38 2014 +0100 d3d8/tests: Direct3DCreate8() is always available if we have d3d8. --- dlls/d3d8/tests/Makefile.in | 2 +- dlls/d3d8/tests/device.c | 224 +++++++++++++++++++++--------------------- dlls/d3d8/tests/stateblock.c | 47 +++------ dlls/d3d8/tests/visual.c | 33 ++----- 4 files changed, 135 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56d1225ec208c46d4899e…

1 0

Henri Verbeet : d3d9/tests: Cleanup test_display_formats() a bit.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 71d018b25b8ee8a4454b047188775e527a33a79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d018b25b8ee8a4454b04718… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:37 2014 +0100 d3d9/tests: Cleanup test_display_formats() a bit. --- dlls/d3d9/tests/device.c | 115 ++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 60 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index eeb2b07..71b0a51 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2271,59 +2271,57 @@ cleanup: if(d3d9) IDirect3D9_Release(d3d9); } -struct format { - D3DFORMAT format; - D3DFORMAT alpha_format; - const char* name; - BOOL display; - BOOL windowed; -}; - -static const struct format formats[] = -{ -#define FORMAT(f, a, d, w) { f, a, #f, d, w } - FORMAT(D3DFMT_R5G6B5, 0, TRUE, TRUE), - FORMAT(D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE), - FORMAT(D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE), - FORMAT(D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE), - FORMAT(D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE), - FORMAT(D3DFMT_A2R10G10B10, 0, TRUE, FALSE), - FORMAT(D3DFMT_UNKNOWN, 0, FALSE, FALSE), -#undef FORMAT -}; - +/* Direct3D9 offers 4 display formats: R5G6B5, X1R5G5B5, X8R8G8B8 and + * A2R10G10B10. Next to these there are 6 different back buffer formats. Only + * a fixed number of combinations are possible in fullscreen mode. In windowed + * mode more combinations are allowed due to format conversion and this is + * likely driver dependent. */ static void test_display_formats(void) { - /* Direct3D9 offers 4 display formats R5G6B5, X1R5G5B5, X8R8G8B8 and A2R10G10B10. - * Next to these there are 6 different backbuffer formats. Only a fixed number of - * combinations are possible in FULLSCREEN mode. In windowed mode more combinations are - * allowed due to depth conversion and this is likely driver dependent. */ - - UINT Adapter = D3DADAPTER_DEFAULT; - D3DDEVTYPE DeviceType = D3DDEVTYPE_HAL; - int display; + D3DDEVTYPE device_type = D3DDEVTYPE_HAL; + unsigned int backbuffer, display; + unsigned int windowed; + IDirect3D9 *d3d9; + BOOL should_pass; + BOOL has_modes; + HRESULT hr; - IDirect3D9 *d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); - ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - if(!d3d9) return; + static const struct + { + const char *name; + D3DFORMAT format; + D3DFORMAT alpha_format; + BOOL display; + BOOL windowed; + } + formats[] = + { + {"D3DFMT_R5G6B5", D3DFMT_R5G6B5, 0, TRUE, TRUE}, + {"D3DFMT_X1R5G5B5", D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE}, + {"D3DFMT_A1R5G5B5", D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE}, + {"D3DFMT_X8R8G8B8", D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE}, + {"D3DFMT_A8R8G8B8", D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE}, + {"D3DFMT_A2R10G10B10", D3DFMT_A2R10G10B10, 0, TRUE, FALSE}, + {"D3DFMT_UNKNOWN", D3DFMT_UNKNOWN, 0, FALSE, FALSE}, + }; - for (display = 0; display < sizeof(formats) / sizeof(formats[0]); display++) + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { - int nmodes, windowed; + skip("Failed to create an IDirect3D9 object, skipping test.\n"); + return; + } - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, formats[display].format); + for (display = 0; display < sizeof(formats) / sizeof(*formats); ++display) + { + has_modes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, formats[display].format); - for (windowed = 0; windowed <= 1; windowed++) + for (windowed = 0; windowed <= 1; ++windowed) { - int backbuffer; - for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(formats[0]); backbuffer++) + for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(*formats); ++backbuffer) { - BOOL shouldPass; - HRESULT hr; + should_pass = FALSE; - if (!formats[display].display || (windowed && !formats[display].windowed) || (!windowed && !nmodes)) - shouldPass = FALSE; - else + if (formats[display].display && (formats[display].windowed || !windowed) && (has_modes || windowed)) { D3DFORMAT backbuffer_format; @@ -2332,36 +2330,33 @@ static void test_display_formats(void) else backbuffer_format = formats[backbuffer].format; - hr = IDirect3D9_CheckDeviceFormat(d3d9, Adapter, DeviceType, formats[display].format, D3DUSAGE_RENDERTARGET, - D3DRTYPE_SURFACE, backbuffer_format); + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, device_type, formats[display].format, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, backbuffer_format); if (hr == D3D_OK) { if (windowed) { - hr = IDirect3D9_CheckDeviceFormatConversion(d3d9, Adapter, DeviceType, backbuffer_format, formats[display].format); - shouldPass = (hr == D3D_OK); + hr = IDirect3D9_CheckDeviceFormatConversion(d3d9, D3DADAPTER_DEFAULT, device_type, + backbuffer_format, formats[display].format); + should_pass = (hr == D3D_OK); } else - shouldPass = (formats[display].format == formats[backbuffer].format || - (formats[display].alpha_format && formats[display].alpha_format == formats[backbuffer].alpha_format)); + should_pass = (formats[display].format == formats[backbuffer].format + || (formats[display].alpha_format + && formats[display].alpha_format == formats[backbuffer].alpha_format)); } - else - shouldPass = FALSE; } - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, formats[display].format, formats[backbuffer].format, windowed); - - if (shouldPass) - ok(hr == D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) failed with hr=%#08x\n", formats[display].name, - formats[backbuffer].name, windowed, hr); - else - ok(hr != D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) succeeded when it was expected to fail\n", formats[display].name, - formats[backbuffer].name, windowed); + hr = IDirect3D9_CheckDeviceType(d3d9, D3DADAPTER_DEFAULT, device_type, + formats[display].format, formats[backbuffer].format, windowed); + ok(SUCCEEDED(hr) == should_pass, + "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", + hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); } } } - if(d3d9) IDirect3D9_Release(d3d9); + IDirect3D9_Release(d3d9); } static void test_scissor_size(void)

1 0

Henri Verbeet : wined3d: Don't allow format conversion on Present() for d3d8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 175c63773dac411d3cfa80034ff7024a895740c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175c63773dac411d3cfa80034… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:35 2014 +0100 wined3d: Don't allow format conversion on Present() for d3d8. Note that this isn't currently enforced by wined3d_swapchain_create() or wined3d_device_reset() though. --- dlls/d3d9/directx.c | 5 ++- dlls/wined3d/directx.c | 90 +++++++++++++++++++++--------------------------- include/wine/wined3d.h | 1 + 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index e73051d..79e9eb5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -636,7 +636,10 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { - DWORD flags = extended ? 0 : WINED3D_VIDMEM_ACCOUNTING; + DWORD flags = WINED3D_PRESENT_CONVERSION; + + if (!extended) + flags |= WINED3D_VIDMEM_ACCOUNTING; d3d9->IDirect3D9Ex_iface.lpVtbl = &d3d9_vtbl; d3d9->refcount = 1; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6617c3a..3ebf43a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4000,7 +4000,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap enum wined3d_device_type device_type, enum wined3d_format_id display_format, enum wined3d_format_id backbuffer_format, BOOL windowed) { - HRESULT hr; + BOOL present_conversion = wined3d->flags & WINED3D_PRESENT_CONVERSION; TRACE("wined3d %p, adapter_idx %u, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(display_format), @@ -4025,100 +4025,88 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap return WINED3DERR_NOTAVAILABLE; } - if (windowed) + if (!windowed) { - /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode. */ - if (display_format == WINED3DFMT_B10G10R10A2_UNORM) + /* If the requested display format is not available, don't continue. */ + if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, + display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) { - TRACE("Unsupported display/backbuffer format combination %s / %s for windowed mode.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); return WINED3DERR_NOTAVAILABLE; } - /* Windowed mode allows you to specify WINED3DFMT_UNKNOWN for the backbuffer format, - * it means 'reuse' the display format for the backbuffer. */ + present_conversion = FALSE; + } + else if (display_format == WINED3DFMT_B10G10R10A2_UNORM) + { + /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode. */ + TRACE("Unsupported format combination %s / %s in windowed mode.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } + + if (present_conversion) + { + /* Use the display format as back buffer format if the latter is + * WINED3DFMT_UNKNOWN. */ if (backbuffer_format == WINED3DFMT_UNKNOWN) backbuffer_format = display_format; - /* In windowed mode, if color conversion from the backbuffer format to the - * display format is supported, then the format combination is supported. */ - hr = wined3d_check_device_format_conversion(wined3d, adapter_idx, device_type, backbuffer_format, display_format); - if (FAILED(hr)) + if (FAILED(wined3d_check_device_format_conversion(wined3d, adapter_idx, + device_type, backbuffer_format, display_format))) { - TRACE("Unsupported display/backbuffer format combination %s / %s; no color conversion.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + TRACE("Format conversion from %s to %s not supported.\n", + debug_d3dformat(backbuffer_format), debug_d3dformat(display_format)); return WINED3DERR_NOTAVAILABLE; } } else { - UINT mode_count; + /* When format conversion from the back buffer format to the display + * format is not allowed, only a limited number of combinations are + * valid. */ - /* If the requested display format is not available, don't continue. */ - mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, - display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); - if (!mode_count) - { - TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (backbuffer_format == WINED3DFMT_UNKNOWN) - { - TRACE("backbuffer_format WINED3FMT_UNKNOWN only available in windowed mode.\n"); - return WINED3DERR_NOTAVAILABLE; - } - - /* In FULLSCREEN mode WINED3DFMT_B5G6R5_UNORM can only be mixed with - * backbuffer format WINED3DFMT_B5G6R5_UNORM. */ if (display_format == WINED3DFMT_B5G6R5_UNORM && backbuffer_format != WINED3DFMT_B5G6R5_UNORM) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } - /* In FULLSCREEN mode WINED3DFMT_B5G5R5X1_UNORM can only be mixed with - * backbuffer formats WINED3DFMT_B5G5R5X1_UNORM and - * WINED3DFMT_B5G5R5A1_UNORM. */ if (display_format == WINED3DFMT_B5G5R5X1_UNORM && !(backbuffer_format == WINED3DFMT_B5G5R5X1_UNORM || backbuffer_format == WINED3DFMT_B5G5R5A1_UNORM)) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } - /* In FULLSCREEN mode WINED3DFMT_B8G8R8X8_UNORM can only be mixed with - * backbuffer formats WINED3DFMT_B8G8R8X8_UNORM and - * WINED3DFMT_B8G8R8A8_UNORM. */ if (display_format == WINED3DFMT_B8G8R8X8_UNORM && !(backbuffer_format == WINED3DFMT_B8G8R8X8_UNORM || backbuffer_format == WINED3DFMT_B8G8R8A8_UNORM)) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } - /* WINED3DFMT_B10G10R10A2_UNORM can only be mixed with backbuffer format - * WINED3DFMT_B10G10R10A2_UNORM. */ if (display_format == WINED3DFMT_B10G10R10A2_UNORM && backbuffer_format != WINED3DFMT_B10G10R10A2_UNORM) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } } - /* Use CheckDeviceFormat to see if the backbuffer_format is usable with the given display_format */ - hr = wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, - WINED3DUSAGE_RENDERTARGET, WINED3D_RTYPE_SURFACE, backbuffer_format); - if (FAILED(hr)) - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + /* Validate that the back buffer format is usable for render targets. */ + if (FAILED(wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, + WINED3DUSAGE_RENDERTARGET, WINED3D_RTYPE_SURFACE, backbuffer_format))) + { + TRACE("Format %s not allowed for render targets.\n", debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } - return hr; + return WINED3D_OK; } HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7ddd466..de1884f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1217,6 +1217,7 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 #define WINED3D_VIDMEM_ACCOUNTING 0x00000004 +#define WINED3D_PRESENT_CONVERSION 0x00000008 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Henri Verbeet : d3d8/tests: Port test_display_formats() to d3d8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 1438c74b744d1e06b2efde04e050971d51ed11f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1438c74b744d1e06b2efde04e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:36 2014 +0100 d3d8/tests: Port test_display_formats() to d3d8. --- dlls/d3d8/tests/device.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f5afbc4..6bcd05e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -984,6 +984,85 @@ static void test_shader_versions(void) } } +static void test_display_formats(void) +{ + D3DDEVTYPE device_type = D3DDEVTYPE_HAL; + unsigned int backbuffer, display; + unsigned int windowed, i; + D3DDISPLAYMODE mode; + IDirect3D8 *d3d8; + BOOL should_pass; + BOOL has_modes; + HRESULT hr; + + static const struct + { + const char *name; + D3DFORMAT format; + D3DFORMAT alpha_format; + BOOL display; + BOOL windowed; + } + formats[] = + { + {"D3DFMT_R5G6B5", D3DFMT_R5G6B5, 0, TRUE, TRUE}, + {"D3DFMT_X1R5G5B5", D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE}, + {"D3DFMT_A1R5G5B5", D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE}, + {"D3DFMT_X8R8G8B8", D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE}, + {"D3DFMT_A8R8G8B8", D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE}, + {"D3DFMT_UNKNOWN", D3DFMT_UNKNOWN, 0, FALSE, FALSE}, + }; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create an IDirect3D8 object, skipping test.\n"); + return; + } + + for (display = 0; display < sizeof(formats) / sizeof(*formats); ++display) + { + for (i = 0, has_modes = FALSE; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d8, D3DADAPTER_DEFAULT, i, &mode)); ++i) + { + if (mode.Format == formats[display].format) + { + has_modes = TRUE; + break; + } + } + + for (windowed = 0; windowed <= 1; ++windowed) + { + for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(*formats); ++backbuffer) + { + should_pass = FALSE; + + if (formats[display].display && (formats[display].windowed || !windowed) && (has_modes || windowed)) + { + D3DFORMAT backbuffer_format; + + if (windowed && formats[backbuffer].format == D3DFMT_UNKNOWN) + backbuffer_format = formats[display].format; + else + backbuffer_format = formats[backbuffer].format; + + hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, device_type, formats[display].format, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, backbuffer_format); + should_pass = (hr == D3D_OK) && (formats[display].format == formats[backbuffer].format + || (formats[display].alpha_format + && formats[display].alpha_format == formats[backbuffer].alpha_format)); + } + + hr = IDirect3D8_CheckDeviceType(d3d8, D3DADAPTER_DEFAULT, device_type, + formats[display].format, formats[backbuffer].format, windowed); + ok(SUCCEEDED(hr) == should_pass, + "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", + hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); + } + } + } + + IDirect3D8_Release(d3d8); +} /* Test adapter display modes */ static void test_display_modes(void) @@ -5793,6 +5872,7 @@ START_TEST(device) screen_height = GetSystemMetrics(SM_CYSCREEN); test_fpu_setup(); + test_display_formats(); test_display_modes(); test_shader_versions(); test_swapchain();

1 0