wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

André Hentschel : Replace UTF8 string in WWN 397
by Jeremy Newman 31 Aug '15

31 Aug '15

Module: website Branch: master Commit: c4f55803ebb73b67ebaa25f8c47fc18e003a8e85 URL: http://source.winehq.org/git/website.git/?a=commit;h=c4f55803ebb73b67ebaa25… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 31 20:54:42 2015 +0200 Replace UTF8 string in WWN 397 --- wwn/en/wn20150828_397.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wwn/en/wn20150828_397.xml b/wwn/en/wn20150828_397.xml index 679efc2..6675239 100644 --- a/wwn/en/wn20150828_397.xml +++ b/wwn/en/wn20150828_397.xml @@ -9,7 +9,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s <stats posts="198" size="210" contrib="31" multiples="17" lastweek="16"> <person posts="8" size="12" who="hverbeet at gmail.com (Henri Verbeet)" /> -<person posts="7" size="21" who="stefandoesinger at gmail.com (=?UTF-8?Q?Stefan_D=c3=b6singer?=)" /> +<person posts="7" size="21" who="stefandoesinger at gmail.com (Stefan Dösinger)" /> <person posts="6" size="27" who="mattdurgavich at gmail.com (Matt Durgavich)" /> <person posts="6" size="17" who="ken at codeweavers.com (Ken Thomases)" /> <person posts="5" size="5" who="julliard at winehq.org (Alexandre Julliard)" />

1 0

Julian Rüger : German translation for release 1.7.50
by Jeremy Newman 31 Aug '15

31 Aug '15

Module: website Branch: master Commit: 5177eaa23bb168897ca5b8ee3a57e71da4752e6d URL: http://source.winehq.org/git/website.git/?a=commit;h=5177eaa23bb168897ca5b8… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 28 14:42:16 2015 +0200 German translation for release 1.7.50 --- news/de/2015082101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2015082101.xml b/news/de/2015082101.xml new file mode 100644 index 0000000..5b6b8ab --- /dev/null +++ b/news/de/2015082101.xml @@ -0,0 +1,16 @@ +<news> +<date>21. August 2015</date> +<title>Wine 1.7.50 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.50 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.50">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Gecko-Engine, basierend auf Firefox 40.</li> + <li>Erste Schritte einer Implementierung von Direct3D 11.</li> + <li>Besseres Font-matching in DirectWrite.</li> + <li>Unterstützung von OpenMP auf ARM-Plattformen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.50.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.50
by Jeremy Newman 31 Aug '15

31 Aug '15

Module: website Branch: master Commit: 2d4260dd6161f786651fec954858a1dc1dbed5a5 URL: http://source.winehq.org/git/website.git/?a=commit;h=2d4260dd6161f786651fec… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 29 06:53:42 2015 +0200 Polish translation for release 1.7.50 --- news/pl/2015082101.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015082101.xml b/news/pl/2015082101.xml new file mode 100644 index 0000000..93589bc --- /dev/null +++ b/news/pl/2015082101.xml @@ -0,0 +1,16 @@ +<news> +<date>Sierpień 21, 2015</date> +<title>Wydano Wine 1.7.50</title> +<body> + Wydanie rozwojowe Wine 1.7.50 jest już dostępne. + <a href="{$root}/announce/1.7.50">Co nowego</a> w tym wydaniu: +<ul> + <li>Nowa wersja silnika Gecko oparta na Firefoksie 40.</li> + <li>Pierwsze kroki w kierunku implementacji Direct3D 11.</li> + <li>Lepsze dopasowywanie czcionek w DirectWrite.</li> + <li>Obsługa OpenMP na platformach ARM.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.50.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.49
by Jeremy Newman 31 Aug '15

31 Aug '15

Module: website Branch: master Commit: 7a347f7dc4377177d85e20f619bf59e31461cd50 URL: http://source.winehq.org/git/website.git/?a=commit;h=7a347f7dc4377177d85e20… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 29 06:53:41 2015 +0200 Polish translation for release 1.7.49 --- news/pl/2015080801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015080801.xml b/news/pl/2015080801.xml new file mode 100644 index 0000000..66ab477 --- /dev/null +++ b/news/pl/2015080801.xml @@ -0,0 +1,16 @@ +<news> +<date>Sierpień 8, 2015</date> +<title>Wydano Wine 1.7.49</title> +<body> + Wydanie rozwojowe Wine 1.7.49 jest już dostępne. + <a href="{$root}/announce/1.7.49">Co nowego</a> w tym wydaniu: +<ul> + <li>DirectWrite jest teraz dostatecznie dobre do wyświetlania tekstu w Steam.</li> + <li>Kilka ulepszeń w Direct2D.</li> + <li>Kilka więcej funkcji OpenMP.</li> + <li>Obsługa przestrzeni nazw w kompilatorze IDL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.49.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Add WWN 397
by Jeremy Newman 31 Aug '15

31 Aug '15

Module: website Branch: master Commit: b740630a4ae7167fdbe5290a63c70f0b1ff6aae1 URL: http://source.winehq.org/git/website.git/?a=commit;h=b740630a4ae7167fdbe529… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 28 20:41:12 2015 +0200 Add WWN 397 --- news/de/2015082801.xml | 10 + news/en/2015082801.xml | 10 + wwn/en/wn20150828_397.xml | 986 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1006 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=b740630a4ae7167fdb…

1 0

Andrey Gusev : Assorted spelling and typos fixes.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: d3177504b1cbf5029b505588928911be980eebec URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3177504b1cbf5029b5055889… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Aug 31 13:24:53 2015 +0300 Assorted spelling and typos fixes. --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/tests/core.c | 2 +- dlls/dplayx/dplay.c | 2 +- dlls/gdi.exe16/printdrv.c | 4 ++-- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/msvcrt/tests/data.c | 6 +++--- dlls/msvcrt/tests/locale.c | 4 ++-- dlls/version/version.c | 4 ++-- dlls/wininet/tests/http.c | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 8e2f850..f0bbd0b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5064,7 +5064,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * HRESULT hr = E_FAIL; read_dword(ptr, &technique_index); - TRACE("techn: %u\n", technique_index); + TRACE("technique_index: %u\n", technique_index); read_dword(ptr, &index); TRACE("index: %u\n", index); diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 6c1bab3..1c379fb 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -1184,7 +1184,7 @@ static void test_ID3DXRenderToEnvMap(IDirect3DDevice9 *device) todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginParabolic returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); hr = ID3DXRenderToEnvMap_BeginSphere(render, NULL); - todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, exected %#x\n", hr, D3DERR_INVALIDCALL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "ID3DXRenderToEnvMap::BeginSphere returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); check_release((IUnknown *)render, 0); } else skip("Failed to create ID3DXRenderToEnvMap\n"); diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4b8d546..861c090 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -5821,7 +5821,7 @@ static HRESULT DirectPlayEnumerateAW(LPDPENUMDPCALLBACKA lpEnumCallbackA, guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex); if (!guid_cache) { - ERR(": failed to alloc required memory.\n"); + ERR(": failed to allocate required memory.\n"); return DPERR_EXCEPTION; } cache_count = dwIndex; diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index cab30c7..fa891b7 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -160,7 +160,7 @@ INT16 WINAPI InsertPQ16(HPQ16 hPQ, INT16 tag, INT16 key) { struct hpq *queueItem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct hpq)); if(queueItem == NULL) { - ERR("Memory exausted!\n"); + ERR("Memory exhausted!\n"); return FALSE; } queueItem->next = hpqueue; @@ -366,7 +366,7 @@ HPJOB16 WINAPI OpenJob16(LPCSTR lpOutput, LPCSTR lpTitle, HDC16 hDC) { pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB)); if(pPrintJob == NULL) { - WARN("Memory exausted!\n"); + WARN("Memory exhausted!\n"); return hHandle; } diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f131563..635302c 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2639,7 +2639,7 @@ static HRESULT WINAPI DocHostUIHandler_GetOverrideKeyPath(IDocHostUIHandler2 *if ok(pchKey != NULL, "pchKey = NULL\n"); if(pchKey) ok(!*pchKey, "*pchKey=%p, expected NULL\n", *pchKey); - ok(!dw, "dw=%d, xepected 0\n", dw); + ok(!dw, "dw=%d, expected 0\n", dw); return S_OK; } diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index efd7d1a..9aacac7 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -111,7 +111,7 @@ static void test_initvar( HMODULE hmsvcrt ) "Wrong value for _osver %04x expected %04x\n", osver, osvi.dwBuildNumber); ok(osplatform == osvi.dwPlatformId, - "Wrong value for _osplatform %x exprected %x\n", + "Wrong value for _osplatform %x expected %x\n", osplatform, osvi.dwPlatformId); } @@ -152,7 +152,7 @@ static void test___getmainargs(void) new_argc = *p___p___argc(); new_argv = *p___p___argv(); ok(new_argc == 4, "*__p___argc() = %d\n", new_argc); - ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv); }else { win_skip("__p___argc or __p___argv is not available\n"); } @@ -179,7 +179,7 @@ static void test___getmainargs(void) new_argc = *p___p___argc(); new_argv = *p___p___argv(); ok(new_argc == argc, "*__p___argc() = %d, expected %d\n", new_argc, argc); - ok(new_argv == argv, "*__p___argv() = %p, epxected %p\n", new_argv, argv); + ok(new_argv == argv, "*__p___argv() = %p, expected %p\n", new_argv, argv); } sprintf(filepath, "%swine_test/b", tmppath); diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index dfb2146..65bb74b 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -676,9 +676,9 @@ static void test__Gettnames(void) * Unicode strings are only initialized on Windows 7 */ if(sizeof(void*) == 8) - ok(size==0x2c0 || broken(size==0x170), "strucure size: %x\n", size); + ok(size==0x2c0 || broken(size==0x170), "structure size: %x\n", size); else - ok(size==0x164 || broken(size==0xb8), "strucure size: %x\n", size); + ok(size==0x164 || broken(size==0xb8), "structure size: %x\n", size); ok(!strcmp(ret->str[0], "Sun"), "ret->str[0] = %s\n", ret->str[0]); ok(!strcmp(ret->str[1], "Mon"), "ret->str[1] = %s\n", ret->str[1]); diff --git a/dlls/version/version.c b/dlls/version/version.c index e1295a0..b2b0b08 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1372,7 +1372,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) { alloclen = 1000; buf=HeapAlloc(GetProcessHeap(), 0, alloclen); if(buf == NULL) { - WARN("Memory exausted while fetching version info!\n"); + WARN("Memory exhausted while fetching version info!\n"); return NULL; } while (1) { @@ -1386,7 +1386,7 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) { HeapFree(GetProcessHeap(), 0, buf); buf = HeapAlloc(GetProcessHeap(), 0, alloclen); if(buf == NULL) { - WARN("Memory exausted while fetching version info!\n"); + WARN("Memory exhausted while fetching version info!\n"); return NULL; } } else { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 14998f2..10cba19 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4548,7 +4548,7 @@ static void _test_security_info(unsigned line, const char *urlc, DWORD error, DW CertFreeCertificateChain(chain); }else { ok_(__FILE__,line)(!res && GetLastError() == error, - "InternetGetSecurityInfoByURLA returned: %x(%u), exected %u\n", res, GetLastError(), error); + "InternetGetSecurityInfoByURLA returned: %x(%u), expected %u\n", res, GetLastError(), error); } }

1 0

Stefan Dösinger : dxgi/tests: Remove debug comments.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: d344ebc98cb3a6bab218dedb1c9c36934c963395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d344ebc98cb3a6bab218dedb1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 31 00:24:59 2015 +0200 dxgi/tests: Remove debug comments. --- dlls/dxgi/tests/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 597e5c9..d6db790 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1064,18 +1064,18 @@ static void test_swapchain_parameters(void) {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, /*20 */ + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, /*24 */ + {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, - {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, //30 + {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, @@ -1085,7 +1085,7 @@ static void test_swapchain_parameters(void) {FALSE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, /*40 */ + {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0},

1 0

Józef Kucia : d3d10core/tests: Use win_skip() instead of skip().
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: adaf08d17865c4b3678bfeade2d1029307e4b899 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adaf08d17865c4b3678bfeade… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:46 2015 +0200 d3d10core/tests: Use win_skip() instead of skip(). --- dlls/d3d10core/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b35801c..5e12f14 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -189,7 +189,7 @@ static void test_feature_level(void) "Failed to query ID3D11Device interface, hr %#x.\n", hr); if (FAILED(hr)) { - skip("D3D11 is not available.\n"); + win_skip("D3D11 is not available.\n"); ID3D10Device_Release(device10); return; }

1 0

Józef Kucia : d3d11: Rename d3d10_texture2d to d3d_texture2d.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: a346d1b7053235924630d45f4050fb3339d59528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a346d1b7053235924630d45f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:45 2015 +0200 d3d11: Rename d3d10_texture2d to d3d_texture2d. --- dlls/d3d11/d3d11_private.h | 10 +++---- dlls/d3d11/device.c | 6 ++--- dlls/d3d11/texture.c | 66 +++++++++++++++++++++++----------------------- 3 files changed, 41 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a346d1b7053235924630d…

1 0

Józef Kucia : d3d11/tests: Add test for 2D texture interfaces.
by Alexandre Julliard 31 Aug '15

31 Aug '15

Module: wine Branch: master Commit: f83181fce0f64080df5d183842e689bc42ff248c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83181fce0f64080df5d18384… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Aug 30 22:44:44 2015 +0200 d3d11/tests: Add test for 2D texture interfaces. --- dlls/d3d11/tests/d3d11.c | 169 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5bec3d6..6cb1516 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -241,9 +241,178 @@ static void test_create_texture2d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_texture2d_interfaces(void) +{ + ID3D10Texture2D *d3d10_texture; + D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; + IDXGISurface *surface; + ID3D11Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + BOOL implements_d3d10_interfaces; + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + TRUE, + D3D11_BIND_SHADER_RESOURCE, 0, + D3D10_BIND_SHADER_RESOURCE, 0 + }, + { + TRUE, + D3D11_BIND_UNORDERED_ACCESS, 0, + D3D11_BIND_UNORDERED_ACCESS, 0 + }, + { + FALSE, + 0, D3D11_RESOURCE_MISC_RESOURCE_CLAMP, + 0, 0 + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + 0, D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX | D3D11_RESOURCE_MISC_SHARED_NTHANDLE, + 0, D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX + }, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create ID3D11Device, skipping tests.\n"); + return; + } + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 0; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == E_NOINTERFACE, "Texture should not implement IDXGISurface.\n"); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Texture2D, (void **)&d3d10_texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Texture should implement ID3D10Texture2D.\n"); + if (SUCCEEDED(hr)) ID3D10Texture2D_Release(d3d10_texture); + ID3D11Texture2D_Release(texture); + + if (FAILED(hr)) + { + win_skip("2D textures do not implement ID3D10Texture2D, skipping tests.\n"); + ID3D11Device_Release(device); + return; + } + + for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D10_TEXTURE2D_DESC d3d10_desc; + ID3D10Device *d3d10_device; + + desc.Width = 512; + desc.Height = 512; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), + "Test %u: Failed to create a 2d texture, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create ID3D11Texture2D, skipping test %u.\n", i); + continue; + } + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Test %u: Texture should implement IDXGISurface.\n", i); + IDXGISurface_Release(surface); + + hr = ID3D11Texture2D_QueryInterface(texture, &IID_ID3D10Texture2D, (void **)&d3d10_texture); + ID3D11Texture2D_Release(texture); + + if (current->implements_d3d10_interfaces) + { + ok(SUCCEEDED(hr), "Test %u: Texture should implement ID3D10Texture2D.\n", i); + } + else + { + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Texture should not implement ID3D10Texture2D.\n", i); + if (SUCCEEDED(hr)) ID3D10Texture2D_Release(d3d10_texture); + continue; + } + + ID3D10Texture2D_GetDesc(d3d10_texture, &d3d10_desc); + + ok(d3d10_desc.Width == desc.Width, + "Test %u: Got unexpected Width %u.\n", i, d3d10_desc.Width); + ok(d3d10_desc.Height == desc.Height, + "Test %u: Got unexpected Height %u.\n", i, d3d10_desc.Height); + ok(d3d10_desc.MipLevels == desc.MipLevels, + "Test %u: Got unexpected MipLevels %u.\n", i, d3d10_desc.MipLevels); + ok(d3d10_desc.ArraySize == desc.ArraySize, + "Test %u: Got unexpected ArraySize %u.\n", i, d3d10_desc.ArraySize); + ok(d3d10_desc.Format == desc.Format, + "Test %u: Got unexpected Format %u.\n", i, d3d10_desc.Format); + ok(d3d10_desc.SampleDesc.Count == desc.SampleDesc.Count, + "Test %u: Got unexpected SampleDesc.Count %u.\n", i, d3d10_desc.SampleDesc.Count); + ok(d3d10_desc.SampleDesc.Quality == desc.SampleDesc.Quality, + "Test %u: Got unexpected SampleDesc.Quality %u.\n", i, d3d10_desc.SampleDesc.Quality); + ok(d3d10_desc.Usage == (D3D10_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d10_desc.Usage); + ok(d3d10_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d10_desc.BindFlags); + ok(d3d10_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d10_desc.CPUAccessFlags); + ok(d3d10_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d10_desc.MiscFlags); + + d3d10_device = (ID3D10Device *)0xdeadbeef; + ID3D10Texture2D_GetDevice(d3d10_texture, &d3d10_device); + todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + if (d3d10_device) ID3D10Device_Release(d3d10_device); + + ID3D10Texture2D_Release(d3d10_texture); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); test_device_interfaces(); test_create_texture2d(); + test_texture2d_interfaces(); }

1 0

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 August 2015