July 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw/tests: Get rid of struct nvertex.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 7447b37ff565d39755d626c9f31ef396114f1cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7447b37ff565d39755d626c9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:33 2014 +0200 ddraw/tests: Get rid of struct nvertex. --- dlls/ddraw/tests/visual.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7be1f34..e517d64 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -274,13 +274,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -struct nvertex -{ - float x, y, z; - float nx, ny, nz; - DWORD diffuse; -}; - static void lighting_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -314,19 +307,25 @@ static void lighting_test(IDirect3DDevice7 *device) {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; - struct nvertex unlitnquad[] = + struct { - { 0.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - { 1.0f, -1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xff0000ff}, - }; - struct nvertex litnquad[] = + struct vec3 position; + struct vec3 normal; + DWORD diffuse; + } + unlitnquad[] = + { + {{0.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + {{1.0f, -1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xff0000ff}, + }, + litnquad[] = { - { 0.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 0.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, - { 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 1.0f, 0xffffff00}, + {{0.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{0.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 1.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, + {{1.0f, 0.0f, 0.1f}, {1.0f, 1.0f, 1.0f}, 0xffffff00}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0};

1 0

Jactry Zeng : riched20: Don' t create too many IRichEditOle interface for a RichEdit.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 6ea4da40381bd6a8634457a4291878920f1ad9f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea4da40381bd6a8634457a42… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Jul 1 00:08:28 2014 +0800 riched20: Don't create too many IRichEditOle interface for a RichEdit. --- dlls/riched20/editor.c | 13 +++++++++++-- dlls/riched20/editstr.h | 1 + dlls/riched20/tests/richole.c | 19 ++++++++++++++++++- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2af2582..06d8690 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2886,6 +2886,11 @@ static void ME_DestroyEditor(ME_TextEditor *editor) if(editor->lpOleCallback) IRichEditOleCallback_Release(editor->lpOleCallback); ITextHost_Release(editor->texthost); + if (editor->reOle) + { + IRichEditOle_Release(editor->reOle); + editor->reOle = NULL; + } OleUninitialize(); FREE_OBJ(editor->pBuffer); @@ -4467,8 +4472,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_GETOLEINTERFACE: { - LPVOID *ppvObj = (LPVOID*) lParam; - return CreateIRichEditOle(editor, ppvObj); + if (!editor->reOle) + if (!CreateIRichEditOle(editor, (LPVOID *)&editor->reOle)) + return 0; + *(LPVOID *)lParam = editor->reOle; + IRichEditOle_AddRef(editor->reOle); + return 1; } case EM_GETPASSWORDCHAR: { diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index f139c29..4fd965c 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -388,6 +388,7 @@ typedef struct tagME_TextEditor { HWND hWnd, hwndParent; ITextHost *texthost; + IRichEditOle *reOle; BOOL bEmulateVersion10; ME_TextBuffer *pBuffer; ME_Cursor *pCursors; diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5a3ffbe..d10c063 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -92,15 +92,22 @@ static void release_interfaces(HWND *w, IRichEditOle **reOle, ITextDocument **tx ITextSelection_Release(*txtSel); } +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static void test_Interfaces(void) { - IRichEditOle *reOle = NULL; + IRichEditOle *reOle = NULL, *reOle1 = NULL; ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; IUnknown *punk; HRESULT hres; LRESULT res; HWND w; + ULONG refcount; w = new_richedit(NULL); if (!w) { @@ -111,6 +118,14 @@ static void test_Interfaces(void) res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle); ok(res, "SendMessage\n"); ok(reOle != NULL, "EM_GETOLEINTERFACE\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 2, "got wrong ref count: %d\n", refcount); + + res = SendMessageA(w, EM_GETOLEINTERFACE, 0, (LPARAM)&reOle1); + ok(res == 1, "SendMessage\n"); + ok(reOle1 == reOle, "Should not return a new IRichEditOle interface\n"); + refcount = get_refcount((IUnknown *)reOle); + ok(refcount == 3, "got wrong ref count: %d\n", refcount); hres = IRichEditOle_QueryInterface(reOle, &IID_ITextDocument, (void **) &txtDoc); @@ -142,6 +157,8 @@ static void test_Interfaces(void) ITextDocument_Release(txtDoc); IRichEditOle_Release(reOle); + refcount = IRichEditOle_Release(reOle); + ok(refcount == 1, "got wrong ref count: %d\n", refcount); DestroyWindow(w); /* Methods should return CO_E_RELEASED if the backing document has

1 0

Henri Verbeet : ddraw: Check for a lost surface in ddraw_surface7_Flip().
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 8ebc82cd8dbf306256318047d5b9c009f654eac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ebc82cd8dbf306256318047d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:29 2014 +0200 ddraw: Check for a lost surface in ddraw_surface7_Flip(). --- dlls/ddraw/surface.c | 3 +++ dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6452a9b..e0fdf81 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1227,6 +1227,9 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra if (src == iface || !(dst_impl->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) return DDERR_NOTFLIPPABLE; + if (IDirectDrawSurface7_IsLost(iface) == DDERR_SURFACELOST) + return DDERR_SURFACELOST; + wined3d_mutex_lock(); tmp = dst_impl->wined3d_surface; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 1a5d9de..7e0e925 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6610,7 +6610,7 @@ static void test_lost_device(void) hr = IDirectDrawSurface_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8bd9317..b96330c 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7675,7 +7675,7 @@ static void test_lost_device(void) hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 92e6e99..393cea3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7397,7 +7397,7 @@ static void test_lost_device(void) hr = IDirectDrawSurface7_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); /* Trying to restore the primary will crash, probably because flippable * surfaces can't exist in DDSCL_NORMAL. */

1 0

Joris van der Wel : advapi32/tests: Refactor the retrieval of a security descriptor into a separate function so that it can be used in other tests.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 6930012f86531e78eac7da55e04b3f9454a5ba84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6930012f86531e78eac7da55e… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:53:23 2014 +0200 advapi32/tests: Refactor the retrieval of a security descriptor into a separate function so that it can be used in other tests. --- dlls/advapi32/tests/security.c | 47 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a394620..f3ccc8e 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -208,6 +208,32 @@ static void init(void) myARGC = winetest_get_mainargs( &myARGV ); } +static SECURITY_DESCRIPTOR* test_get_security_descriptor(HANDLE handle, int line) +{ + /* use HeapFree(GetProcessHeap(), 0, sd); when done */ + DWORD ret, length, needed; + SECURITY_DESCRIPTOR *sd; + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + NULL, 0, &needed); + ok_(__FILE__, line)(!ret, "GetKernelObjectSecurity should fail\n"); + ok_(__FILE__, line)(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); + ok_(__FILE__, line)(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); + + length = needed; + sd = HeapAlloc(GetProcessHeap(), 0, length); + + needed = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + sd, length, &needed); + ok_(__FILE__, line)(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); + ok_(__FILE__, line)(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); + return sd; +} + static void test_sid(void) { struct sidRef refs[] = { @@ -4432,29 +4458,12 @@ todo_wine static void test_default_handle_security(HANDLE token, HANDLE handle, GENERIC_MAPPING *mapping) { - DWORD ret, length, needed, granted, priv_set_len; + DWORD ret, granted, priv_set_len; BOOL status; PRIVILEGE_SET priv_set; SECURITY_DESCRIPTOR *sd; - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - NULL, 0, &needed); - ok(!ret, "GetKernelObjectSecurity should fail\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); - ok(needed != 0xdeadbeef, "GetKernelObjectSecurity should return required buffer length\n"); - - length = needed; - sd = HeapAlloc(GetProcessHeap(), 0, length); - - needed = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetKernelObjectSecurity(handle, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, - sd, length, &needed); - ok(ret, "GetKernelObjectSecurity error %d\n", GetLastError()); - ok(needed == length || needed == 0 /* file, pipe */, "GetKernelObjectSecurity should return %u instead of %u\n", length, needed); - + sd = test_get_security_descriptor(handle, __LINE__); validate_default_security_descriptor(sd); priv_set_len = sizeof(priv_set);

1 0

Joris van der Wel : server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 11674b2f61554ce8b573e345a5c2a716fe484028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11674b2f61554ce8b573e345a… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Jun 25 23:08:47 2014 +0200 server: Any of the 4 SE_*_DEFAULTED controls should not be stored on objects, their usage is transient. --- dlls/advapi32/tests/security.c | 4 ++-- server/object.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 05da0ae..d75354f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5341,7 +5341,7 @@ static void test_default_dacl_owner_sid(void) ret = GetSecurityDescriptorOwner( sd, &owner, &defaulted ); ok( ret, "error %u\n", GetLastError() ); ok( owner != (void *)0xdeadbeef, "owner not set\n" ); - todo_wine ok( !defaulted, "owner defaulted\n" ); + ok( !defaulted, "owner defaulted\n" ); dacl = (void *)0xdeadbeef; present = FALSE; @@ -5350,7 +5350,7 @@ static void test_default_dacl_owner_sid(void) ok( ret, "error %u\n", GetLastError() ); ok( present, "dacl not present\n" ); ok( dacl != (void *)0xdeadbeef, "dacl not set\n" ); - todo_wine ok( !defaulted, "dacl defaulted\n" ); + ok( !defaulted, "dacl defaulted\n" ); index = 0; found = FALSE; diff --git a/server/object.c b/server/object.c index c206747..021c741 100644 --- a/server/object.c +++ b/server/object.c @@ -443,7 +443,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { owner = token_get_user( current->process->token ); new_sd.owner_len = security_sid_len( owner ); - new_sd.control |= SE_OWNER_DEFAULTED; } group = sd_get_group( sd ); @@ -453,7 +452,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { group = token_get_primary_group( current->process->token ); new_sd.group_len = security_sid_len( group ); - new_sd.control |= SE_GROUP_DEFAULTED; } new_sd.control |= SE_SACL_PRESENT; @@ -469,7 +467,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, else { new_sd.sacl_len = 0; - new_sd.control |= SE_SACL_DEFAULTED; } } @@ -487,7 +484,6 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, { dacl = token_get_default_dacl( current->process->token ); new_sd.dacl_len = dacl->AclSize; - new_sd.control |= SE_DACL_DEFAULTED; } }

1 0

Henri Verbeet : ddraw/tests: Get rid of struct vertex.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 3cf189af6412853179e34324ef888df1640567c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cf189af6412853179e34324e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:31 2014 +0200 ddraw/tests: Get rid of struct vertex. --- dlls/ddraw/tests/visual.c | 107 +++++++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 44 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7aaf7cd..f24c6cc 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -23,6 +23,11 @@ #include "ddraw.h" #include "d3d.h" +struct vec3 +{ + float x, y, z; +}; + static HWND window; static IDirectDraw7 *DirectDraw; static IDirectDrawSurface7 *Surface; @@ -264,12 +269,6 @@ static void set_viewport_size(IDirect3DDevice7 *device) return; } -struct vertex -{ - float x, y, z; - DWORD diffuse; -}; - struct tvertex { float x, y, z, w; @@ -297,19 +296,24 @@ static void lighting_test(IDirect3DDevice7 *device) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - struct vertex unlitquad[] = + struct { - {-1.0f, -1.0f, 0.1f, 0xffff0000}, - {-1.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, 0.0f, 0.1f, 0xffff0000}, - { 0.0f, -1.0f, 0.1f, 0xffff0000}, - }; - struct vertex litquad[] = + struct vec3 position; + DWORD diffuse; + } + unlitquad[] = { - {-1.0f, 0.0f, 0.1f, 0xff00ff00}, - {-1.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 1.0f, 0.1f, 0xff00ff00}, - { 0.0f, 0.0f, 0.1f, 0xff00ff00}, + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, 0.0f, 0.1f}, 0xffff0000}, + {{ 0.0f, -1.0f, 0.1f}, 0xffff0000}, + }, + litquad[] = + { + {{-1.0f, 0.0f, 0.1f}, 0xff00ff00}, + {{-1.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 1.0f, 0.1f}, 0xff00ff00}, + {{ 0.0f, 0.0f, 0.1f}, 0xff00ff00}, }; struct nvertex unlitnquad[] = { @@ -930,19 +934,24 @@ static void alpha_test(IDirect3DDevice7 *device) DWORD color, red, green, blue; DDSURFACEDESC2 ddsd; - struct vertex quad1[] = + struct { - {-1.0f, -1.0f, 0.1f, 0x4000ff00}, - {-1.0f, 0.0f, 0.1f, 0x4000ff00}, - { 1.0f, -1.0f, 0.1f, 0x4000ff00}, - { 1.0f, 0.0f, 0.1f, 0x4000ff00}, - }; - struct vertex quad2[] = + struct vec3 position; + DWORD diffuse; + } + quad1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{-1.0f, 0.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, -1.0f, 0.1f}, 0x4000ff00}, + {{ 1.0f, 0.0f, 0.1f}, 0x4000ff00}, + }, + quad2[] = { - {-1.0f, 0.0f, 0.1f, 0xc00000ff}, - {-1.0f, 1.0f, 0.1f, 0xc00000ff}, - { 1.0f, 0.0f, 0.1f, 0xc00000ff}, - { 1.0f, 1.0f, 0.1f, 0xc00000ff}, + {{-1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 0.0f, 0.1f}, 0xc00000ff}, + {{ 1.0f, 1.0f, 0.1f}, 0xc00000ff}, }; static float composite_quad[][5] = { { 0.0f, -1.0f, 0.1f, 0.0f, 1.0f}, @@ -2237,12 +2246,17 @@ static void D3D3_ViewportClearTest(void) 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; - struct vertex quad[] = + struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = { - {-1.0f, -1.0f, 0.1f, 0xffffffff}, - {-1.0f, 1.0f, 0.1f, 0xffffffff}, - { 1.0f, 1.0f, 0.1f, 0xffffffff}, - { 1.0f, -1.0f, 0.1f, 0xffffffff}, + {{-1.0f, -1.0f, 0.1f}, 0xffffffff}, + {{-1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, 1.0f, 0.1f}, 0xffffffff}, + {{ 1.0f, -1.0f, 0.1f}, 0xffffffff}, }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; @@ -2995,19 +3009,24 @@ static void depth_clamp_test(IDirect3DDevice7 *device) { 42.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, {112.0f, 108.0f, 10.0f, 1.0f, 0xffffffff}, }; - struct vertex quad5[] = + struct { - { -0.5f, 0.5f, 10.0f, 0xff14f914}, - { 0.5f, 0.5f, 10.0f, 0xff14f914}, - { -0.5f, -0.5f, 10.0f, 0xff14f914}, - { 0.5f, -0.5f, 10.0f, 0xff14f914}, - }; - struct vertex quad6[] = + struct vec3 position; + DWORD diffuse; + } + quad5[] = + { + {{-0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, 0.5f, 10.0f}, 0xff14f914}, + {{-0.5f, -0.5f, 10.0f}, 0xff14f914}, + {{ 0.5f, -0.5f, 10.0f}, 0xff14f914}, + }, + quad6[] = { - { -1.0f, 0.5f, 10.0f, 0xfff91414}, - { 1.0f, 0.5f, 10.0f, 0xfff91414}, - { -1.0f, 0.25f, 10.0f, 0xfff91414}, - { 1.0f, 0.25f, 10.0f, 0xfff91414}, + {{-1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.5f, 10.0f}, 0xfff91414}, + {{-1.0f, 0.25f, 10.0f}, 0xfff91414}, + {{ 1.0f, 0.25f, 10.0f}, 0xfff91414}, }; D3DVIEWPORT7 vp;

1 0

Henri Verbeet : wined3d: Print a winediag message if we failed to create a DXTn texture because of lack of driver support.
by Alexandre Julliard July 1, 2014

July 1, 2014

Module: wine Branch: master Commit: 91fbd2232d65200509c9c29a5c8275e451492f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fbd2232d65200509c9c29a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 1 07:52:30 2014 +0200 wined3d: Print a winediag message if we failed to create a DXTn texture because of lack of driver support. --- dlls/wined3d/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4291fd0..e0e12bc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -25,6 +25,7 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, @@ -53,6 +54,13 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) { + static unsigned int once; + + if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 + || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) + && !(format->flags & WINED3DFMT_FLAG_TEXTURE) && !once++) + ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); + WARN("Failed to initialize resource, returning %#x\n", hr); return hr; }

1 0