April 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Handle NULL child in appendChild().
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: db8ff72f003f1919cae1d3adb674400066790558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8ff72f003f1919cae1d3adb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 3 10:04:34 2014 +0400 msxml3: Handle NULL child in appendChild(). --- dlls/msxml3/node.c | 3 +++ dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index e3016a5..1319d77 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -625,6 +625,9 @@ HRESULT node_append_child(xmlnode *This, IXMLDOMNode *child, IXMLDOMNode **outCh VARIANT var; HRESULT hr; + if (!child) + return E_INVALIDARG; + hr = IXMLDOMNode_get_nodeType(child, &type); if(FAILED(hr) || type == NODE_ATTRIBUTE) { if (outChild) *outChild = NULL; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index aaa895a..0c700c3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8878,6 +8878,12 @@ static void test_appendChild(void) EXPECT_NO_CHILDREN(doc); EXPECT_NO_CHILDREN(doc2); + hr = IXMLDOMDocument_appendChild(doc2, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMElement_appendChild(elem, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* append from another document */ hr = IXMLDOMDocument_appendChild(doc2, (IXMLDOMNode*)elem, NULL); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Gerald Pfeifer : readme: Raise the minimum version of FreeBSD to 8.0.
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: 13013ba9d958c90a5c38bdfa92b1bd83447a42ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=13013ba9d958c90a5c38bdfa9… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Apr 2 22:05:46 2014 -0700 readme: Raise the minimum version of FreeBSD to 8.0. --- documentation/README.de | 4 ++-- documentation/README.es | 4 ++-- documentation/README.fi | 4 ++-- documentation/README.fr | 4 ++-- documentation/README.it | 4 ++-- documentation/README.ja | 4 ++-- documentation/README.no | 4 ++-- documentation/README.pt_br | 4 ++-- documentation/README.ru | 4 ++-- documentation/README.sv | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index f42b30d..ff1ee9c 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -32,7 +32,7 @@ Um Wine kompilieren und ausführen zu können, brauchen Sie eines der folgenden Betriebssysteme: Linux version 2.0.36 oder neuer - FreeBSD 7.0 oder neuer + FreeBSD 8.0 oder neuer Solaris x86 9 oder neuer NetBSD-current Mac OS X 10.5 oder neuer @@ -43,7 +43,7 @@ Andere Betriebssysteme, die Kernel-Threads unterstützen, werden unter Umständen in der Zukunft unterstützt. FreeBSD-Info: - Wine läuft prinzipiell erst ab FreeBSD 7.0 richtig. Siehe dazu auch + Wine läuft prinzipiell erst ab FreeBSD 8.0 richtig. Siehe dazu auch http://wiki.freebsd.org/Wine für weitere Informationen. Solaris-Info: diff --git a/documentation/README.es b/documentation/README.es index 9497855..c0a318d 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -30,7 +30,7 @@ http://www.winehq.org. Para compilar y ejecutar Wine, deberá tener uno de los siguientes: Linux versión 2.0.36 o superior - FreeBSD 7.0 o superior + FreeBSD 8.0 o superior Solaris x86 9 o superior NetBSD-current Mac OS X 10.5 o superior @@ -42,7 +42,7 @@ podrían obtener soporte en el futuro. Información sobre FreeBSD: Por lo general Wine no funcionará correctamente en versiones anteriores a - FreeBSD 7.0. Visite http://wiki.freebsd.org/Wine para más información. + FreeBSD 8.0. Visite http://wiki.freebsd.org/Wine para más información. Información sobre Solaris: Lo más probable es que necesite compilar con el conjunto de herramientas GNU diff --git a/documentation/README.fi b/documentation/README.fi index 15b8302..5e03199 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -28,7 +28,7 @@ ennen kaikkea Internetissä osoitteessa http://www.winehq.org/. Winen kääntämiseen tarvitaan jokin seuraavista: Linuxin versio 2.0.36 tai uudempi - FreeBSD 7.0 tai uudempi + FreeBSD 8.0 tai uudempi Solaris x86 9 tai uudempi NetBSD-current Mac OS X 10.5 tai uudempi @@ -38,7 +38,7 @@ mainittuja käyttöjärjestelmiä tuetaan; tulevaisuudessa saatetaan lisätä tu muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. Tietoa FreeBSD:lle: - Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 7.0. + Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 8.0. Osoitteessa http://wiki.freebsd.org/Wine kerrotaan tästä lisää. Tietoa Solarikselle: diff --git a/documentation/README.fr b/documentation/README.fr index 0d0c2ef..ee71546 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -30,7 +30,7 @@ Pour compiler et exécuter Wine, vous devez disposer d'un des systèmes d'exploitation suivants : Linux version 2.0.36 ou ultérieur - FreeBSD 7.0 ou ultérieur + FreeBSD 8.0 ou ultérieur Solaris x86 9 ou ultérieur NetBSD-current Mac OS X 10.5 ou ultérieur @@ -42,7 +42,7 @@ threads noyau peuvent être pris en charge dans le futur. Informations FreeBSD : Wine ne fonctionnera généralement pas bien avec les versions FreeBSD - antérieures à 7.0. Voyez http://wiki.freebsd.org/Wine pour plus + antérieures à 8.0. Voyez http://wiki.freebsd.org/Wine pour plus d'informations. Informations Solaris : diff --git a/documentation/README.it b/documentation/README.it index ad6b692..46ccf7c 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -31,7 +31,7 @@ si trova all'indirizzo http://www.winehq.org. Per compilare ed eseguire Wine, è necessario avere uno dei seguenti sistemi: Linux versione 2.0.36 o successiva - FreeBSD 7.0 o successiva + FreeBSD 8.0 o successiva Solaris x86 9 o successiva NetBSD-current Mac OS X 10.5 o successiva @@ -42,7 +42,7 @@ che forniscono kernel threads potrebbero essere supportati in futuro. Informazioni per FreeBSD: In generale Wine non funzionerà correttamente con versioni precedenti - a FreeBSD 7.0. + a FreeBSD 8.0. Leggere http://wiki.freebsd.org/Wine per maggiori informazioni. Informazioni per Solaris: diff --git a/documentation/README.ja b/documentation/README.ja index bd9d48a..f44d371 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -30,7 +30,7 @@ READMEというファイル]を含む）Wineソースのトップレベルディ Wineをコンパイルし実行するには、以下のうち一つを持っていなければなりません: Linux バージョン2.0.36以上 - FreeBSD 7.0以降 + FreeBSD 8.0以降 Solaris x86 9以降 NetBSD-current Mac OS X 10.5以降 @@ -41,7 +41,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って将来サポートされるかもしれません。 FreeBSD情報: - Wineは一般的にFreeBSD 7.0より前のバージョン上で正しく動作しないでしょう。 + Wineは一般的にFreeBSD 8.0より前のバージョン上で正しく動作しないでしょう。詳細については http://wiki.freebsd.org/Wine を参照してください。 Solaris情報: diff --git a/documentation/README.no b/documentation/README.no index 313e197..65d8bbb 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -29,7 +29,7 @@ problemløsing. Følgende kreves for å bygge og kjøre Wine: Linux versjon 2.0.36 eller nyere - FreeBSD 7.0 eller nyere + FreeBSD 8.0 eller nyere Solaris x86 9 eller nyere NetBSD-current Mac OS X 10.5 eller nyere @@ -39,7 +39,7 @@ operativsystemene ovenfor som støttes. Andre operativsystemer som støtter kjernetråder støttes kanskje i framtiden. Informasjon for FreeBSD: - Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 7.0. + Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 8.0. Se <http://wiki.freebsd.org/Wine> for mer informasjon. Informsjon for Solaris: diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 296425b..691f312 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -31,7 +31,7 @@ encontrada em http://www.winehq.org. Para compilar e executar o Wine, voc� deve ter o seguinte: Linux vers�o 2.0.36 ou posterior - FreeBSD 7.0 ou posterior + FreeBSD 8.0 ou posterior Solaris x86 9 ou posterior NetBSD-atual Mac OS X 10.5 ou posterior @@ -42,7 +42,7 @@ Outros sistemas operacionais que suportarem tarefas do kernel poder ter suporte no futuro. Informa��es para o FreeBSD: - O Wine em geral n�o deve funcionar corretamente em vers�es antes da 7.0. + O Wine em geral n�o deve funcionar corretamente em vers�es antes da 8.0. Veja http://wiki.freebsd.org/Wine para mais informa��es. Informa��es para o Solaris: diff --git a/documentation/README.ru b/documentation/README.ru index 70fc5db..c228fc6 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -29,7 +29,7 @@ Wine Installer для компоновки и установки Wine. В кат Компиляция и запуск Wine поддерживается в следующих операционных системах: Linux версии 2.0.36 или более новой - FreeBSD 7.0 или более новой + FreeBSD 8.0 или более новой Solaris x86 9 или более новой NetBSD-текущей версии Mac OS X 10.5 или более новой @@ -40,7 +40,7 @@ Wine Installer для компоновки и установки Wine. В кат возможно будут поддерживаться Wine в будущем. FreeBSD: - Wine не будет работать как следует на версиях ниже, чем FreeBSD 7.0. + Wine не будет работать как следует на версиях ниже, чем FreeBSD 8.0. Посетите <http://wiki.freebsd.org/Wine> для дополнительной информации. Solaris: diff --git a/documentation/README.sv b/documentation/README.sv index 7c2ea4c..20d23e2 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -28,7 +28,7 @@ information och tips om hur problem kan l F�r att kompilera och k�ra Wine kr�vs ett av f�ljande: Linux version 2.0.36 eller senare - FreeBSD 7.0 eller senare + FreeBSD 8.0 eller senare Solaris x86 9 eller senare NetBSD-current Mac OS X 10.5 eller senare @@ -38,7 +38,7 @@ operativsystemen ovan som st st�der kerneltr�dar kommer eventuellt att st�djas i framtiden. Information f�r FreeBSD: - Wine kommer i regel inte att fungera p� FreeBSD-versioner �ldre �n 7.0. + Wine kommer i regel inte att fungera p� FreeBSD-versioner �ldre �n 8.0. Se http://wiki.freebsd.org/Wine f�r mer information. Information f�r Solaris:

1 0

Alexandre Julliard : make_xftmpl: Always output data in little-endian format.
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: b8ad360bbdb69593beace414199d5e37bf83f843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ad360bbdb69593beace4141… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 3 11:31:59 2014 +0200 make_xftmpl: Always output data in little-endian format. --- tools/make_xftmpl.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/make_xftmpl.c b/tools/make_xftmpl.c index 75b47cc..88a2e84 100644 --- a/tools/make_xftmpl.c +++ b/tools/make_xftmpl.c @@ -188,12 +188,29 @@ static inline BOOL write_byte(struct parser *parser, BYTE value) static inline BOOL write_word(struct parser *parser, WORD value) { - return write_bytes(parser, &value, sizeof(value)); + return write_byte( parser, value ) && + write_byte( parser, value >> 8 ); } static inline BOOL write_dword(struct parser *parser, DWORD value) { - return write_bytes(parser, &value, sizeof(value)); + return write_word( parser, value ) && + write_word( parser, value >> 16 ); +} + +static inline BOOL write_float(struct parser *parser, float value) +{ + DWORD val; + memcpy( &val, &value, sizeof(value) ); + return write_dword( parser, val ); +} + +static inline BOOL write_guid(struct parser *parser, const GUID *guid) +{ + return write_dword( parser, guid->Data1 ) && + write_word( parser, guid->Data2 ) && + write_word( parser, guid->Data3 ) && + write_bytes( parser, guid->Data4, sizeof(guid->Data4) ); } static int compare_names(const void *a, const void *b) @@ -240,7 +257,7 @@ static BOOL parse_guid(struct parser *parser) guid.Data4[7] = tab[9]; return write_word(parser, TOKEN_GUID) && - write_bytes(parser, &guid, sizeof(guid)); + write_guid(parser, &guid); } static BOOL parse_name(struct parser *parser) @@ -291,7 +308,7 @@ static BOOL parse_number(struct parser *parser) ret = sscanf(buffer, "%f", &value); if (!ret) fatal_error( parser, "invalid float token\n" ); ret = write_word(parser, TOKEN_FLOAT) && - write_bytes(parser, &value, sizeof(value)); + write_float(parser, value); } else { int value; ret = sscanf(buffer, "%d", &value);

1 0

Alexandre Julliard : make_xftmpl: Get rid of the parser structure.
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: 3b2859a6172be603f01095a43e502e23f9a34ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b2859a6172be603f01095a43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 3 11:39:16 2014 +0200 make_xftmpl: Get rid of the parser structure. --- tools/make_xftmpl.c | 225 +++++++++++++++++++++++++-------------------------- 1 file changed, 110 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b2859a6172be603f0109…

1 0

Henri Verbeet : d3d9/tests: Use a separate device for test_mova().
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: 9c705180b6d8d8c450ea9cd70f7735c6de1c1022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c705180b6d8d8c450ea9cd70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 3 12:15:03 2014 +0200 d3d9/tests: Use a separate device for test_mova(). --- dlls/d3d9/tests/visual.c | 85 +++++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 31 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6c257a3..1b6a7a3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -787,11 +787,6 @@ static void color_fill_test(IDirect3DDevice9 *device) } } -typedef struct { - float in[4]; - DWORD out; -} test_data_t; - /* * c7 mova ARGB mov ARGB * -2.4 -2 0x00ffff00 -3 0x00ff0000 @@ -801,9 +796,21 @@ typedef struct { * 1.6 2 0x00ff00ff 1 0x000000ff * 2.4 2 0x00ff00ff 2 0x00ff00ff */ -static void test_mova(IDirect3DDevice9 *device) +static void test_mova(void) { - static const DWORD mova_test[] = { + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DVertexShader9 *mova_shader; + IDirect3DVertexShader9 *mov_shader; + IDirect3DDevice9 *device; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const DWORD mova_test[] = + { 0xfffe0200, /* vs_2_0 */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x05000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ @@ -818,7 +825,8 @@ static void test_mova(IDirect3DDevice9 *device) 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* END */ }; - static const DWORD mov_test[] = { + static const DWORD mov_test[] = + { 0xfffe0101, /* vs_1_1 */ 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x00000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 1.0, 0.0, 0.0, 1.0 */ @@ -833,8 +841,13 @@ static void test_mova(IDirect3DDevice9 *device) 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* END */ }; - - static const test_data_t test_data[2][6] = { + static const struct + { + float in[4]; + DWORD out; + } + test_data[2][6] = + { { {{-2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff0000}, {{-1.6f, 0.0f, 0.0f, 0.0f}, 0x00ffff00}, @@ -852,24 +865,37 @@ static void test_mova(IDirect3DDevice9 *device) {{ 2.4f, 0.0f, 0.0f, 0.0f}, 0x00ff00ff} } }; - - static const float quad[][3] = { + static const struct vec3 quad[] = + { {-1.0f, -1.0f, 0.0f}, {-1.0f, 1.0f, 0.0f}, { 1.0f, -1.0f, 0.0f}, { 1.0f, 1.0f, 0.0f}, }; - - static const D3DVERTEXELEMENT9 decl_elements[] = { + static const D3DVERTEXELEMENT9 decl_elements[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, D3DDECL_END() }; - IDirect3DVertexDeclaration9 *vertex_declaration = NULL; - IDirect3DVertexShader9 *mova_shader = NULL; - IDirect3DVertexShader9 *mov_shader = NULL; - HRESULT hr; - UINT i, j; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No vs_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3DDevice9_CreateVertexShader(device, mova_test, &mova_shader); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr); @@ -882,9 +908,9 @@ static void test_mova(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetVertexShader(device, mov_shader); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - for(j = 0; j < 2; ++j) + for (j = 0; j < sizeof(test_data) / sizeof(*test_data); ++j) { - for (i = 0; i < (sizeof(test_data[0]) / sizeof(test_data_t)); ++i) + for (i = 0; i < sizeof(*test_data) / sizeof(**test_data); ++i) { DWORD color; @@ -894,7 +920,7 @@ static void test_mova(IDirect3DDevice9 *device) hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "BeginScene failed (%08x)\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad[0], 3 * sizeof(float)); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); ok(SUCCEEDED(hr), "DrawPrimitiveUP failed (%08x)\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -914,12 +940,14 @@ static void test_mova(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); } - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DVertexShader9_Release(mova_shader); IDirect3DVertexShader9_Release(mov_shader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } struct sVertex { @@ -16321,15 +16349,10 @@ START_TEST(visual) } else skip("No vs_1_1 support\n"); - if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) - { - test_mova(device_ptr); - } - else skip("No vs_2_0 support\n"); - cleanup_device(device_ptr); device_ptr = NULL; + test_mova(); loop_index_test(); sincos_test(); sgn_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for test_compare_instructions().
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: 1e772e5d8930792c3b54af971bbd4416a1e7ef34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e772e5d8930792c3b54af971… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 3 12:15:04 2014 +0200 d3d9/tests: Use a separate device for test_compare_instructions(). --- dlls/d3d9/tests/visual.c | 98 ++++++++++++++++++++++++++++++---------------- 1 file changed, 65 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1b6a7a3..e695846 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6828,8 +6828,20 @@ done: DestroyWindow(window); } -static void test_compare_instructions(IDirect3DDevice9 *device) +static void test_compare_instructions(void) { + IDirect3DVertexShader9 *shader_slt_scalar; + IDirect3DVertexShader9 *shader_sge_scalar; + IDirect3DVertexShader9 *shader_slt_vec; + IDirect3DVertexShader9 *shader_sge_vec; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + static const DWORD shader_sge_vec_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -6870,39 +6882,57 @@ static void test_compare_instructions(IDirect3DDevice9 *device) 0x0000000c, 0xd0040000, 0x80aa0000, 0xa0550001, /* slt oD0.b, r0.b, c1.g */ 0x0000ffff /* end */ }; - IDirect3DVertexShader9 *shader_sge_vec; - IDirect3DVertexShader9 *shader_slt_vec; - IDirect3DVertexShader9 *shader_sge_scalar; - IDirect3DVertexShader9 *shader_slt_scalar; - HRESULT hr, color; - float quad1[] = { - -1.0, -1.0, 0.1, - 0.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1 + static const float quad1[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 0.0f, 0.1f, + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, }; - float quad2[] = { - 0.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1 + static const float quad2[] = + { + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, }; - float quad3[] = { - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 1.0, 0.1 + static const float quad3[] = + { + -1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, }; - float quad4[] = { - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 1.0, 0.1 + static const float quad4[] = + { + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; - const float const0[4] = {0.8, 0.2, 0.2, 0.2}; - const float const1[4] = {0.2, 0.8, 0.2, 0.2}; + static const float const0[4] = {0.8f, 0.2f, 0.2f, 0.2f}; + static const float const1[4] = {0.2f, 0.8f, 0.2f, 0.2f}; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1)) + { + skip("No vs_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear returned %#x.\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, shader_sge_vec_code, &shader_sge_vec); @@ -6951,9 +6981,6 @@ static void test_compare_instructions(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); - color = getPixelColor(device, 160, 360); ok(color == 0x00ff00ff, "Compare test: Quad 1(sge vec) returned color 0x%08x, expected 0x00ff00ff\n", color); color = getPixelColor(device, 480, 360); @@ -6970,6 +6997,11 @@ static void test_compare_instructions(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(shader_slt_vec); IDirect3DVertexShader9_Release(shader_sge_scalar); IDirect3DVertexShader9_Release(shader_slt_scalar); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void test_vshader_input(void) @@ -16345,13 +16377,13 @@ START_TEST(visual) if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { test_constant_clamp_vs(device_ptr); - test_compare_instructions(device_ptr); } else skip("No vs_1_1 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + test_compare_instructions(); test_mova(); loop_index_test(); sincos_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for test_constant_clamp_vs().
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: 9d9f580b8c16c66e0ed499eb545c9eb088dbb4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9f580b8c16c66e0ed499eb5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 3 12:15:05 2014 +0200 d3d9/tests: Use a separate device for test_constant_clamp_vs(). --- dlls/d3d9/tests/visual.c | 99 +++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e695846..5972d0d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5444,12 +5444,18 @@ static void autogen_mipmap_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); } -static void test_constant_clamp_vs(IDirect3DDevice9 *device) +static void test_constant_clamp_vs(void) { IDirect3DVertexShader9 *shader_11, *shader_11_2, *shader_20, *shader_20_2; IDirect3DVertexDeclaration9 *decl; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; HRESULT hr; - DWORD color; + static const DWORD shader_code_11[] = { 0xfffe0101, /* vs_1_1 */ @@ -5490,38 +5496,62 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ 0x0000ffff /* end */ }; - static const D3DVERTEXELEMENT9 decl_elements[] = { + static const D3DVERTEXELEMENT9 decl_elements[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, D3DDECL_END() }; - float quad1[] = { - -1.0, -1.0, 0.1, - 0.0, -1.0, 0.1, - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1 + static const float quad1[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 0.0f, 0.1f, + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, }; - float quad2[] = { - 0.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1 + static const float quad2[] = + { + 0.0f, -1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, }; - float quad3[] = { - 0.0, 0.0, 0.1, - 1.0, 0.0, 0.1, - 0.0, 1.0, 0.1, - 1.0, 1.0, 0.1 + static const float quad3[] = + { + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, + 1.0f, 0.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; - float quad4[] = { - -1.0, 0.0, 0.1, - 0.0, 0.0, 0.1, - -1.0, 1.0, 0.1, - 0.0, 1.0, 0.1 + static const float quad4[] = + { + -1.0f, 0.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 0.0f, 0.0f, 0.1f, + 0.0f, 1.0f, 0.1f, }; - float test_data_c1[4] = { 1.25, -0.50, -1.50, 1.0}; - float test_data_c2[4] = { -0.50, 1.25, 2.00, 1.0}; + static const float test_data_c1[4] = { 1.25f, -0.50f, -1.50f, 1.0f}; + static const float test_data_c2[4] = {-0.50f, 1.25f, 2.00f, 1.0f}; - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1)) + { + skip("No vs_1_1 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ffff, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_CreateVertexShader(device, shader_code_11, &shader_11); @@ -5574,11 +5604,6 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %08x\n", hr); } - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - color = getPixelColor(device, 160, 360); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 1 has color %08x, expected 0x00bfbf80\n", color); @@ -5603,6 +5628,11 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) if(shader_20) IDirect3DVertexShader9_Release(shader_20); IDirect3DVertexShader9_Release(shader_11_2); IDirect3DVertexShader9_Release(shader_11); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void constant_clamp_ps_test(void) @@ -16374,15 +16404,10 @@ START_TEST(visual) alphatest_test(device_ptr); viewport_test(device_ptr); - if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) - { - test_constant_clamp_vs(device_ptr); - } - else skip("No vs_1_1 support\n"); - cleanup_device(device_ptr); device_ptr = NULL; + test_constant_clamp_vs(); test_compare_instructions(); test_mova(); loop_index_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for viewport_test().
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: 15a2817d8d4690bd7beb308e322d74e99266ab1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15a2817d8d4690bd7beb308e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 3 12:15:06 2014 +0200 d3d9/tests: Use a separate device for viewport_test(). --- dlls/d3d9/tests/visual.c | 50 +++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5972d0d..324a8f9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12056,24 +12056,36 @@ done: DestroyWindow(window); } -static void viewport_test(IDirect3DDevice9 *device) { - HRESULT hr; - DWORD color; - D3DVIEWPORT9 vp, old_vp; +static void viewport_test(void) +{ + IDirect3DDevice9 *device; BOOL draw_failed = TRUE; - const float quad[] = + D3DVIEWPORT9 vp; + IDirect3D9 *d3d; + ULONG refcount; + DWORD color; + HWND window; + HRESULT hr; + + static const float quad[] = { - -0.5, -0.5, 0.1, - 0.5, -0.5, 0.1, - -0.5, 0.5, 0.1, - 0.5, 0.5, 0.1 + -0.5f, -0.5f, 0.1f, + -0.5f, 0.5f, 0.1f, + 0.5f, -0.5f, 0.1f, + 0.5f, 0.5f, 0.1f, }; - memset(&old_vp, 0, sizeof(old_vp)); - hr = IDirect3DDevice9_GetViewport(device, &old_vp); - ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff0000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); /* Test a viewport with Width and Height bigger than the surface dimensions @@ -12101,6 +12113,9 @@ static void viewport_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_SetViewport(device, &vp); ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -12138,8 +12153,11 @@ static void viewport_test(IDirect3DDevice9 *device) { hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetViewport(device, &old_vp); - ok(hr == D3D_OK, "IDirect3DDevice9_SetViewport failed with %08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* This test tests depth clamping / clipping behaviour: @@ -16402,11 +16420,11 @@ START_TEST(visual) yuv_layout_test(device_ptr); zwriteenable_test(device_ptr); alphatest_test(device_ptr); - viewport_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + viewport_test(); test_constant_clamp_vs(); test_compare_instructions(); test_mova();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for alphatest_test().
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: dbb738620826da30c70119fbfb1e4ef8d65bfba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb738620826da30c70119fbf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 3 12:15:07 2014 +0200 d3d9/tests: Use a separate device for alphatest_test(). --- dlls/d3d9/tests/visual.c | 82 ++++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 324a8f9..76e3a3a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11608,35 +11608,60 @@ static void zwriteenable_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); } -static void alphatest_test(IDirect3DDevice9 *device) { +static void alphatest_test(void) +{ #define ALPHATEST_PASSED 0x0000ff00 #define ALPHATEST_FAILED 0x00ff0000 - struct { - D3DCMPFUNC func; - DWORD color_less; - DWORD color_equal; - DWORD color_greater; - } testdata[] = { - { D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED }, - { D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED }, - { D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED }, - { D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED }, - { D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED }, - { D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED }, - { D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED }, - { D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED }, - }; + IDirect3DDevice9 *device; unsigned int i, j; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; HRESULT hr; - DWORD color; - struct vertex quad[] = { - { -1.0, -1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, - { 1.0, -1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, - { -1.0, 1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, - { 1.0, 1.0, 0.1, ALPHATEST_PASSED | 0x80000000 }, + + static const struct + { + D3DCMPFUNC func; + D3DCOLOR color_less; + D3DCOLOR color_equal; + D3DCOLOR color_greater; + } + testdata[] = + { + {D3DCMP_NEVER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_LESS, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_FAILED}, + {D3DCMP_EQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_LESSEQUAL, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_FAILED}, + {D3DCMP_GREATER, ALPHATEST_FAILED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_NOTEQUAL, ALPHATEST_PASSED, ALPHATEST_FAILED, ALPHATEST_PASSED}, + {D3DCMP_GREATEREQUAL, ALPHATEST_FAILED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + {D3DCMP_ALWAYS, ALPHATEST_PASSED, ALPHATEST_PASSED, ALPHATEST_PASSED}, + }; + static const struct vertex quad[] = + { + {-1.0f, -1.0f, 0.1f, ALPHATEST_PASSED | 0x80000000}, + {-1.0f, 1.0f, 0.1f, ALPHATEST_PASSED | 0x80000000}, + { 1.0f, -1.0f, 0.1f, ALPHATEST_PASSED | 0x80000000}, + { 1.0f, 1.0f, 0.1f, ALPHATEST_PASSED | 0x80000000}, }; - D3DCAPS9 caps; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHATESTENABLE, TRUE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); @@ -11732,10 +11757,11 @@ static void alphatest_test(IDirect3DDevice9 *device) { } } - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHATESTENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with 0x%08x\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void sincos_test(void) @@ -16419,11 +16445,11 @@ START_TEST(visual) yuv_color_test(device_ptr); yuv_layout_test(device_ptr); zwriteenable_test(device_ptr); - alphatest_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + alphatest_test(); viewport_test(); test_constant_clamp_vs(); test_compare_instructions();

1 0

Hans Leidekker : wbemprox: Add a stub implementation of Win32_PhysicalMemory.
by Alexandre Julliard 03 Apr '14

03 Apr '14

Module: wine Branch: master Commit: bdf6abdb68e47e264f392bf65410866173813b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf6abdb68e47e264f392bf65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 3 12:34:18 2014 +0200 wbemprox: Add a stub implementation of Win32_PhysicalMemory. --- dlls/wbemprox/builtin.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9fda507..7138154 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -75,6 +75,8 @@ static const WCHAR class_paramsW[] = {'_','_','P','A','R','A','M','E','T','E','R','S',0}; static const WCHAR class_physicalmediaW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; +static const WCHAR class_physicalmemoryW[] = + {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR class_qualifiersW[] = {'_','_','Q','U','A','L','I','F','I','E','R','S',0}; static const WCHAR class_process_getowner_outW[] = @@ -105,6 +107,8 @@ static const WCHAR prop_bootableW[] = {'B','o','o','t','a','b','l','e',0}; static const WCHAR prop_bootpartitionW[] = {'B','o','o','t','P','a','r','t','i','t','i','o','n',0}; +static const WCHAR prop_capacityW[] = + {'C','a','p','a','c','i','t','y',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_classW[] = @@ -401,6 +405,10 @@ static const struct column col_physicalmedia[] = { prop_serialnumberW, CIM_STRING }, { prop_tagW, CIM_STRING } }; +static const struct column col_physicalmemory[] = +{ + { prop_capacityW, CIM_UINT64 } +}; static const struct column col_process[] = { { prop_captionW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -686,6 +694,10 @@ struct record_physicalmedia const WCHAR *serialnumber; const WCHAR *tag; }; +struct record_physicalmemory +{ + UINT64 capacity; +}; struct record_process { const WCHAR *caption; @@ -1738,6 +1750,24 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st return status; } +static enum fill_status fill_physicalmemory( struct table *table, const struct expr *cond ) +{ + struct record_physicalmemory *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0; + + if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_physicalmemory *)table->data; + rec->capacity = get_total_physical_memory(); + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else row++; + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_cmdline( DWORD process_id ) { if (process_id == GetCurrentProcessId()) return heap_strdupW( GetCommandLineW() ); @@ -2272,6 +2302,7 @@ static struct table builtin_classes[] = { class_osW, SIZEOF(col_os), col_os, 0, 0, NULL, fill_os }, { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, + { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, { class_qualifiersW, SIZEOF(col_qualifier), col_qualifier, SIZEOF(data_qualifier), 0, (BYTE *)data_qualifier },

1 0