August 2011 - Wine-commits - list.winehq.org

Jacek Caban : vbscript: Added more IActiveScript tests.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 389eb971c63c49b307012de61a140f2a2c68694a URL: http://source.winehq.org/git/wine.git/?a=commit;h=389eb971c63c49b307012de61… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 11:22:33 2011 +0200 vbscript: Added more IActiveScript tests. --- dlls/vbscript/tests/vbscript.c | 191 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 186 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 7de424f..71b56a5 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -25,25 +25,207 @@ #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define SET_CALLED(func) \ + called_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(GetLCID); +DEFINE_EXPECT(OnStateChange_UNINITIALIZED); +DEFINE_EXPECT(OnStateChange_STARTED); +DEFINE_EXPECT(OnStateChange_CONNECTED); +DEFINE_EXPECT(OnStateChange_DISCONNECTED); +DEFINE_EXPECT(OnStateChange_CLOSED); +DEFINE_EXPECT(OnStateChange_INITIALIZED); +DEFINE_EXPECT(OnEnterScript); +DEFINE_EXPECT(OnLeaveScript); + DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); +static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) + *ppv = iface; + else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) + *ppv = iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) +{ + return 2; +} + +static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) +{ + return 1; +} + +static HRESULT WINAPI ActiveScriptSite_GetLCID(IActiveScriptSite *iface, LCID *plcid) +{ + CHECK_EXPECT(GetLCID); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPCOLESTR pstrName, + DWORD dwReturnMask, IUnknown **ppiunkItem, ITypeInfo **ppti) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, BSTR *pbstrVersion) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptTerminate(IActiveScriptSite *iface, + const VARIANT *pvarResult, const EXCEPINFO *pexcepinfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnStateChange(IActiveScriptSite *iface, SCRIPTSTATE ssScriptState) +{ + switch(ssScriptState) { + case SCRIPTSTATE_UNINITIALIZED: + CHECK_EXPECT(OnStateChange_UNINITIALIZED); + return S_OK; + case SCRIPTSTATE_STARTED: + CHECK_EXPECT(OnStateChange_STARTED); + return S_OK; + case SCRIPTSTATE_CONNECTED: + CHECK_EXPECT(OnStateChange_CONNECTED); + return S_OK; + case SCRIPTSTATE_DISCONNECTED: + CHECK_EXPECT(OnStateChange_DISCONNECTED); + return S_OK; + case SCRIPTSTATE_CLOSED: + CHECK_EXPECT(OnStateChange_CLOSED); + return S_OK; + case SCRIPTSTATE_INITIALIZED: + CHECK_EXPECT(OnStateChange_INITIALIZED); + return S_OK; + default: + ok(0, "unexpected call %d\n", ssScriptState); + } + + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, IActiveScriptError *pscripterror) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) +{ + CHECK_EXPECT(OnEnterScript); + return S_OK; +} + +static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) +{ + CHECK_EXPECT(OnLeaveScript); + return S_OK; +} + +static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { + ActiveScriptSite_QueryInterface, + ActiveScriptSite_AddRef, + ActiveScriptSite_Release, + ActiveScriptSite_GetLCID, + ActiveScriptSite_GetItemInfo, + ActiveScriptSite_GetDocVersionString, + ActiveScriptSite_OnScriptTerminate, + ActiveScriptSite_OnStateChange, + ActiveScriptSite_OnScriptError, + ActiveScriptSite_OnEnterScript, + ActiveScriptSite_OnLeaveScript +}; + +static IActiveScriptSite ActiveScriptSite = { &ActiveScriptSiteVtbl }; + +static IActiveScript *create_vbscript(void) +{ + IActiveScript *ret; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void**)&ret); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + return ret; +} + static void test_vbscript(void) { IActiveScriptParse *parser; IActiveScript *vbscript; + ULONG ref; HRESULT hres; - hres = CoCreateInstance(&CLSID_VBScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IActiveScript, (void**)&vbscript); - ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + vbscript = create_vbscript(); hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hres); + SET_EXPECT(GetLCID); + hres = IActiveScript_SetScriptSite(vbscript, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + CHECK_CALLED(GetLCID); + + SET_EXPECT(OnStateChange_INITIALIZED); + hres = IActiveScriptParse64_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_INITIALIZED); + + hres = IActiveScriptParse64_InitNew(parser); + ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); + + SET_EXPECT(OnStateChange_CLOSED); + hres = IActiveScript_Close(vbscript); + ok(hres == S_OK, "Close failed: %08x\n", hres); + CHECK_CALLED(OnStateChange_CLOSED); + IActiveScriptParse64_Release(parser); - IActiveScript_Release(vbscript); + + ref = IActiveScript_Release(vbscript); + ok(!ref, "ref = %d\n", ref); } + static BOOL check_vbscript(void) { IActiveScript *vbscript; @@ -57,7 +239,6 @@ static BOOL check_vbscript(void) return hres == S_OK; } - START_TEST(vbscript) { CoInitialize(NULL);

1 0

Jacek Caban : vbscipt: Added IActiveScript::GetScriptState implementation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 97556eb061d8c6ea6184883e5a5cd00187a76fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=97556eb061d8c6ea6184883e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 11:22:44 2011 +0200 vbscipt: Added IActiveScript::GetScriptState implementation. --- dlls/vbscript/tests/vbscript.c | 19 +++++++++++++++++++ dlls/vbscript/vbscript.c | 13 +++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 71b56a5..9d0dbdf 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -64,6 +64,17 @@ DEFINE_EXPECT(OnLeaveScript); DEFINE_GUID(CLSID_VBScript, 0xb54f3741, 0x5b07, 0x11cf, 0xa4,0xb0, 0x00,0xaa,0x00,0x4a,0x55,0xe8); +#define test_state(s,ss) _test_state(__LINE__,s,ss) +static void _test_state(unsigned line, IActiveScript *script, SCRIPTSTATE exstate) +{ + SCRIPTSTATE state = -1; + HRESULT hres; + + hres = IActiveScript_GetScriptState(script, &state); + ok_(__FILE__,line) (hres == S_OK, "GetScriptState failed: %08x\n", hres); + ok_(__FILE__,line) (state == exstate, "state=%d, expected %d\n", state, exstate); +} + static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -201,16 +212,22 @@ static void test_vbscript(void) hres = IActiveScript_QueryInterface(vbscript, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse iface: %08x\n", hres); + test_state(vbscript, SCRIPTSTATE_UNINITIALIZED); + SET_EXPECT(GetLCID); hres = IActiveScript_SetScriptSite(vbscript, &ActiveScriptSite); ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); CHECK_CALLED(GetLCID); + test_state(vbscript, SCRIPTSTATE_UNINITIALIZED); + SET_EXPECT(OnStateChange_INITIALIZED); hres = IActiveScriptParse64_InitNew(parser); ok(hres == S_OK, "InitNew failed: %08x\n", hres); CHECK_CALLED(OnStateChange_INITIALIZED); + test_state(vbscript, SCRIPTSTATE_INITIALIZED); + hres = IActiveScriptParse64_InitNew(parser); ok(hres == E_UNEXPECTED, "InitNew failed: %08x, expected E_UNEXPECTED\n", hres); @@ -219,6 +236,8 @@ static void test_vbscript(void) ok(hres == S_OK, "Close failed: %08x\n", hres); CHECK_CALLED(OnStateChange_CLOSED); + test_state(vbscript, SCRIPTSTATE_CLOSED); + IActiveScriptParse64_Release(parser); ref = IActiveScript_Release(vbscript); diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 6160f3b..084337f 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -216,8 +216,17 @@ static HRESULT WINAPI VBScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE static HRESULT WINAPI VBScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE *pssState) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->(%p)\n", This, pssState); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pssState); + + if(!pssState) + return E_POINTER; + + if(This->thread_id && This->thread_id != GetCurrentThreadId()) + return E_UNEXPECTED; + + *pssState = This->state; + return S_OK; } static HRESULT WINAPI VBScript_Close(IActiveScript *iface)

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in OptimizeInPlace.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 342faea03591e2d13851be798b5b61f9a68f9be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342faea03591e2d13851be798… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 16:48:18 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in OptimizeInPlace. It does not make sense to use D3DLOCK_DISCARD for locking a newly created vertex buffer because it will be allocated, freed, and then allocated again. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 9a0fd03..ed42883 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1293,7 +1293,7 @@ static HRESULT WINAPI ID3DXMeshImpl_OptimizeInplace(ID3DXMesh *iface, DWORD flag hr = IDirect3DVertexBuffer9_Lock(This->vertex_buffer, 0, 0, (void**)&orig_vertices, D3DLOCK_READONLY); if (FAILED(hr)) goto cleanup; - hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, D3DLOCK_DISCARD); + hr = IDirect3DVertexBuffer9_Lock(vertex_buffer, 0, 0, (void**)&new_vertices, 0); if (FAILED(hr)) { IDirect3DVertexBuffer9_Unlock(This->vertex_buffer); goto cleanup;

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in load_skin_mesh_from_xof.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 41b6f4aec16a81896a0c5394071fcda86b9e91e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b6f4aec16a81896a0c53940… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 17:21:30 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in load_skin_mesh_from_xof. --- dlls/d3dx9_36/mesh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index ed42883..2462422 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2966,7 +2966,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, hr = D3DXCreateMeshFVF(mesh_data.num_tri_faces, total_vertices, options, mesh_data.fvf, device, &d3dxmesh); if (FAILED(hr)) goto cleanup; - hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, D3DLOCK_DISCARD, &vertices); + hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, 0, &vertices); if (FAILED(hr)) goto cleanup; out_ptr = vertices; @@ -3008,7 +3008,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, } d3dxmesh->lpVtbl->UnlockVertexBuffer(d3dxmesh); - hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, D3DLOCK_DISCARD, (void**)&indices); + hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, (void**)&indices); if (FAILED(hr)) goto cleanup; index_in_ptr = mesh_data.indices; @@ -3037,7 +3037,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, if (mesh_data.material_indices) { DWORD *attrib_buffer = NULL; - hr = d3dxmesh->lpVtbl->LockAttributeBuffer(d3dxmesh, D3DLOCK_DISCARD, &attrib_buffer); + hr = d3dxmesh->lpVtbl->LockAttributeBuffer(d3dxmesh, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup; for (i = 0; i < mesh_data.num_poly_faces; i++) {

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXLoadMeshFromXInMemory.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 1150c1558ea43f4240844e331e404a0ed55b539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1150c1558ea43f4240844e331… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 18:55:45 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXLoadMeshFromXInMemory. --- dlls/d3dx9_36/mesh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 2462422..c5ad7b9 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3722,7 +3722,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, concat_vertex_size = D3DXGetDeclVertexSize(concat_decl, 0); - hr = concat_mesh->lpVtbl->LockVertexBuffer(concat_mesh, D3DLOCK_DISCARD, (void**)&concat_vertices); + hr = concat_mesh->lpVtbl->LockVertexBuffer(concat_mesh, 0, (void**)&concat_vertices); if (FAILED(hr)) goto cleanup; LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) @@ -3775,7 +3775,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, concat_mesh->lpVtbl->UnlockVertexBuffer(concat_mesh); concat_vertices = NULL; - hr = concat_mesh->lpVtbl->LockIndexBuffer(concat_mesh, D3DLOCK_DISCARD, &concat_indices); + hr = concat_mesh->lpVtbl->LockIndexBuffer(concat_mesh, 0, &concat_indices); if (FAILED(hr)) goto cleanup; index_offset = 0; @@ -3814,7 +3814,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, DWORD *concat_attrib_buffer = NULL; DWORD offset = 0; - hr = concat_mesh->lpVtbl->LockAttributeBuffer(concat_mesh, D3DLOCK_DISCARD, &concat_attrib_buffer); + hr = concat_mesh->lpVtbl->LockAttributeBuffer(concat_mesh, 0, &concat_attrib_buffer); if (FAILED(hr)) goto cleanup; LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry)

1 0

Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateSphere.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: d6a7c2cce0a009e788539c5dfa50a072a370ce0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a7c2cce0a009e788539c5df… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:03:52 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateSphere. --- dlls/d3dx9_36/mesh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c5ad7b9..6fc3ef5 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4060,14 +4060,14 @@ HRESULT WINAPI D3DXCreateSphere(LPDIRECT3DDEVICE9 device, FLOAT radius, UINT sli return hr; } - hr = sphere->lpVtbl->LockVertexBuffer(sphere, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = sphere->lpVtbl->LockVertexBuffer(sphere, 0, (LPVOID *)&vertices); if (FAILED(hr)) { sphere->lpVtbl->Release(sphere); return hr; } - hr = sphere->lpVtbl->LockIndexBuffer(sphere, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = sphere->lpVtbl->LockIndexBuffer(sphere, 0, (LPVOID *)&faces); if (FAILED(hr)) { sphere->lpVtbl->UnlockVertexBuffer(sphere);

1 0

Henri Verbeet : ddraw: Make the OpenGL renderer the default one.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 94ae743ea668e49d40ae4e2dc5fe1f5d9be018cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ae743ea668e49d40ae4e2dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:31 2011 +0200 ddraw: Make the OpenGL renderer the default one. --- dlls/ddraw/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 37a125d..38f4814 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* The configured default surface */ -WINED3DSURFTYPE DefaultSurfaceType = SURFACE_UNKNOWN; +WINED3DSURFTYPE DefaultSurfaceType = SURFACE_OPENGL; /* DDraw list and critical section */ static struct list global_ddraw_list = LIST_INIT(global_ddraw_list);

1 0

Henri Verbeet : ddraw: Get rid of the surface implementation switching code .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: c89a3ffe806278fa99cff7e3e27c3845c581315e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c89a3ffe806278fa99cff7e3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:32 2011 +0200 ddraw: Get rid of the surface implementation switching code. --- dlls/ddraw/ddraw.c | 179 +-------------------------------------------- dlls/ddraw/surface.c | 25 ------- dlls/wined3d/swapchain.c | 4 +- include/wine/wined3d.h | 1 - 4 files changed, 6 insertions(+), 203 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c89a3ffe806278fa99cff…

1 0

Henri Verbeet : ddraw: Get rid of the ImplType fields in IDirectDrawImpl and IDirectDrawSurfaceImpl .
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: 43ad90ce3167ba6345698b67eb04afef87c63d64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43ad90ce3167ba6345698b67e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:33 2011 +0200 ddraw: Get rid of the ImplType fields in IDirectDrawImpl and IDirectDrawSurfaceImpl. --- dlls/ddraw/ddraw.c | 25 +++++++++---------------- dlls/ddraw/ddraw_private.h | 6 +----- dlls/ddraw/surface.c | 5 ++--- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 14e245b..973ec29 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -206,7 +206,7 @@ static HRESULT WINAPI ddraw7_QueryInterface(IDirectDraw7 *iface, REFIID refiid, IsEqualGUID( &IID_IDirect3D7 , refiid ) ) { /* Check the surface implementation */ - if (This->ImplType != SURFACE_OPENGL) + if (DefaultSurfaceType != SURFACE_OPENGL) { WARN("The app requests a Direct3D interface, but non-opengl surfaces where set in winecfg\n"); /* Do not abort here, only reject 3D Device creation */ @@ -1378,7 +1378,6 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes DWORD count = 0, i, outsize; HRESULT hr; WINED3DDISPLAYMODE d3ddm; - WINED3DSURFTYPE type = This->ImplType; TRACE("iface %p, codes_count %p, codes %p.\n", iface, NumCodes, Codes); @@ -1389,7 +1388,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) { hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, - d3ddm.Format, 0, WINED3DRTYPE_SURFACE, formats[i], type); + d3ddm.Format, 0, WINED3DRTYPE_SURFACE, formats[i], DefaultSurfaceType); if (SUCCEEDED(hr)) { if (count < outsize) @@ -2600,7 +2599,6 @@ static HRESULT WINAPI ddraw7_StartModeTest(IDirectDraw7 *iface, SIZE *Modes, DWO static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD, IDirectDrawSurfaceImpl **ppSurf, UINT level, UINT version) { - WINED3DSURFTYPE ImplType = This->ImplType; HRESULT hr; TRACE("ddraw %p, surface_desc %p, surface %p, level %u.\n", @@ -2612,7 +2610,7 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD DDRAW_dump_surface_desc(pDDSD); } - if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && This->ImplType != SURFACE_OPENGL) + if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) && DefaultSurfaceType != SURFACE_OPENGL) { WARN("The application requests a 3D capable surface, but a non-OpenGL surface type was set in the registry.\n"); /* Do not fail surface creation, only fail 3D device creation. */ @@ -2626,7 +2624,7 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD return DDERR_OUTOFVIDEOMEMORY; } - hr = ddraw_surface_init(*ppSurf, This, pDDSD, level, ImplType, version); + hr = ddraw_surface_init(*ppSurf, This, pDDSD, level, version); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); @@ -3248,10 +3246,9 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, * The only case I can think of where this doesn't apply is when a * 2D app was configured by the user to run with OpenGL and it didn't create * the render target as first surface. In this case the render target creation - * will cause the 3D init. - */ - if( (ddraw->ImplType == SURFACE_OPENGL) && !(ddraw->d3d_initialized) && - desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE) ) + * will cause the 3D init. */ + if (DefaultSurfaceType == SURFACE_OPENGL && !ddraw->d3d_initialized + && desc2.ddsCaps.dwCaps & (DDSCAPS_PRIMARYSURFACE | DDSCAPS_3DDEVICE)) { IDirectDrawSurfaceImpl *target = object, *surface; struct list *entry; @@ -4695,7 +4692,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, *device = NULL; /* Fail device creation if non-opengl surfaces are used. */ - if (This->ImplType != SURFACE_OPENGL) + if (DefaultSurfaceType != SURFACE_OPENGL) { ERR("The application wants to create a Direct3D device, but non-opengl surfaces are set in the registry.\n"); ERR("Please set the surface implementation to opengl or autodetection to allow 3D rendering.\n"); @@ -5799,7 +5796,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, present_parameters %p, swapchain %p.\n", device_parent, present_parameters, swapchain); hr = wined3d_swapchain_create(ddraw->wined3d_device, present_parameters, - ddraw->ImplType, NULL, &ddraw_null_wined3d_parent_ops, swapchain); + DefaultSurfaceType, NULL, &ddraw_null_wined3d_parent_ops, swapchain); if (FAILED(hr)) { WARN("Failed to create swapchain, hr %#x.\n", hr); @@ -5846,10 +5843,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - /* See comments in IDirectDrawImpl_CreateNewSurface for a description of - * this field. */ - ddraw->ImplType = DefaultSurfaceType; - /* Get the current screen settings. */ hDC = GetDC(0); ddraw->orig_bpp = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d8a8eb8..e03ab19 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -111,9 +111,6 @@ struct IDirectDrawImpl HWND devicewindow; HWND dest_window; - /* The surface type to request */ - WINED3DSURFTYPE ImplType; - /* Helpers for surface creation */ IDirectDrawSurfaceImpl *tex_root; BOOL depthstencil; @@ -194,7 +191,6 @@ struct IDirectDrawSurfaceImpl /* Misc things */ DWORD uniqueness_value; UINT mipmap_level; - WINED3DSURFTYPE ImplType; /* For D3DDevice creation */ BOOL isRenderTarget; @@ -211,7 +207,7 @@ struct IDirectDrawSurfaceImpl HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; void ddraw_surface_destroy(IDirectDrawSurfaceImpl *surface) DECLSPEC_HIDDEN; HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, - DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) DECLSPEC_HIDDEN; + DDSURFACEDESC2 *desc, UINT mip_level, UINT version) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(IDirectDrawSurfaceImpl *This) DECLSPEC_HIDDEN; static inline IDirectDrawSurfaceImpl *impl_from_IDirect3DTexture(IDirect3DTexture *iface) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7fb9323..6a2ecad 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5085,7 +5085,7 @@ HRESULT ddraw_surface_create_texture(IDirectDrawSurfaceImpl *surface) } HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddraw, - DDSURFACEDESC2 *desc, UINT mip_level, WINED3DSURFTYPE surface_type, UINT version) + DDSURFACEDESC2 *desc, UINT mip_level, UINT version) { WINED3DPOOL pool = WINED3DPOOL_DEFAULT; enum wined3d_format_id format; @@ -5176,11 +5176,10 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr copy_to_surfacedesc2(&surface->surface_desc, desc); surface->first_attached = surface; - surface->ImplType = surface_type; hr = wined3d_surface_create(ddraw->wined3d_device, desc->dwWidth, desc->dwHeight, format, TRUE /* Lockable */, FALSE /* Discard */, mip_level, usage, pool, - WINED3DMULTISAMPLE_NONE, 0 /* MultiSampleQuality */, surface_type, surface, + WINED3DMULTISAMPLE_NONE, 0 /* MultiSampleQuality */, DefaultSurfaceType, surface, &ddraw_surface_wined3d_parent_ops, &surface->wined3d_surface); if (FAILED(hr)) {

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_stream_source() const.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: cfbecf938016f04a8d32ad2769a38a418a8b127d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbecf938016f04a8d32ad276… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:34 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_stream_source() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 82dcd65..792521a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1775,7 +1775,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_stream_source(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride) { struct wined3d_stream_state *stream; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c609637..a523785 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2246,7 +2246,7 @@ HRESULT __cdecl wined3d_device_get_sampler_state(struct wined3d_device *device, UINT sampler_idx, WINED3DSAMPLERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, RECT *rect); BOOL __cdecl wined3d_device_get_software_vertex_processing(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_get_stream_source(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_stream_source(const struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer **buffer, UINT *offset, UINT *stride); HRESULT __cdecl wined3d_device_get_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT *divider); HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device,

1 0