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

Jacek Caban : vbscipt: Added IActiveScript::Close implementation.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 01ce1873a344bdf464a78ef83480dd1787a039d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ce1873a344bdf464a78ef83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 11:22:15 2011 +0200 vbscipt: Added IActiveScript::Close implementation. --- dlls/vbscript/vbscript.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b5cc9bf..6160f3b 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -85,6 +86,37 @@ static void destroy_script(script_ctx_t *ctx) heap_free(ctx); } +static void decrease_state(VBScript *This, SCRIPTSTATE state) +{ + switch(This->state) { + case SCRIPTSTATE_CONNECTED: + case SCRIPTSTATE_STARTED: + case SCRIPTSTATE_DISCONNECTED: + FIXME("unimplemented state %d\n", This->state); + if(state == SCRIPTSTATE_INITIALIZED) + break; + /* FALLTHROUGH */ + case SCRIPTSTATE_INITIALIZED: + destroy_script(This->ctx); + This->ctx = NULL; + This->thread_id = 0; + + change_state(This, state); + if(state == SCRIPTSTATE_UNINITIALIZED) + break; + /* FALLTHROUGH */ + case SCRIPTSTATE_UNINITIALIZED: + if(This->site) { + IActiveScriptSite_Release(This->site); + This->site = NULL; + } + + break; + default: + assert(0); + } +} + static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); @@ -191,8 +223,14 @@ static HRESULT WINAPI VBScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE static HRESULT WINAPI VBScript_Close(IActiveScript *iface) { VBScript *This = impl_from_IActiveScript(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + if(This->thread_id && This->thread_id != GetCurrentThreadId()) + return E_UNEXPECTED; + + decrease_state(This, SCRIPTSTATE_CLOSED); + return S_OK; } static HRESULT WINAPI VBScript_AddNamedItem(IActiveScript *iface, LPCOLESTR pstrName, DWORD dwFlags)

1 0

Michael Stefaniuc : dsound: Handle primary buffers in two more IDirectSoundBuffer methods.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: c35745d45adccc37a510dda920887affb7730ce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35745d45adccc37a510dda92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:19:09 2011 +0200 dsound: Handle primary buffers in two more IDirectSoundBuffer methods. --- dlls/dsound/buffer.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 7f1d005..6ba6c24 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -284,6 +284,11 @@ static HRESULT WINAPI IDirectSoundBufferImpl_SetFrequency(IDirectSoundBuffer8 *i TRACE("(%p,%d)\n",This,freq); + if (is_primary_buffer(This)) { + WARN("not available for primary buffers.\n"); + return DSERR_CONTROLUNAVAIL; + } + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; @@ -397,9 +402,12 @@ static ULONG WINAPI IDirectSoundBufferImpl_Release(IDirectSoundBuffer8 *iface) TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref && !InterlockedDecrement(&This->numIfaces)) - secondarybuffer_destroy(This); - + if (!ref && !InterlockedDecrement(&This->numIfaces)) { + if (is_primary_buffer(This)) + primarybuffer_destroy(This); + else + secondarybuffer_destroy(This); + } return ref; }

1 0

Jacek Caban : vbscript: Added more IActiveScript tests.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

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

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

Aug. 31, 2011

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 OptimizeInPlace.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

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

Jacek Caban : vbscript: Added IActiveScript::InitNew implementation.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 7edaff43e4d70b22a7170d0fcf29b619ed3d4673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7edaff43e4d70b22a7170d0fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 11:22:05 2011 +0200 vbscript: Added IActiveScript::InitNew implementation. --- dlls/vbscript/vbscript.c | 53 +++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 5 ++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index b04fe0c..b5cc9bf 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -50,11 +50,41 @@ struct VBScript { LONG ref; + SCRIPTSTATE state; IActiveScriptSite *site; + script_ctx_t *ctx; LONG thread_id; LCID lcid; }; +static void change_state(VBScript *This, SCRIPTSTATE state) +{ + if(This->state == state) + return; + + This->state = state; + if(This->site) + IActiveScriptSite_OnStateChange(This->site, state); +} + +static HRESULT set_ctx_site(VBScript *This) +{ + This->ctx->lcid = This->lcid; + + IActiveScriptSite_AddRef(This->site); + This->ctx->site = This->site; + + change_state(This, SCRIPTSTATE_INITIALIZED); + return S_OK; +} + +static void destroy_script(script_ctx_t *ctx) +{ + if(ctx->site) + IActiveScriptSite_Release(ctx->site); + heap_free(ctx); +} + static inline VBScript *impl_from_IActiveScript(IActiveScript *iface) { return CONTAINING_RECORD(iface, VBScript, IActiveScript_iface); @@ -133,7 +163,7 @@ static HRESULT WINAPI VBScript_SetScriptSite(IActiveScript *iface, IActiveScript if(hres == S_OK) This->lcid = lcid; - return S_OK; + return This->ctx ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScript_GetScriptSite(IActiveScript *iface, REFIID riid, @@ -271,8 +301,24 @@ static ULONG WINAPI VBScriptParse_Release(IActiveScriptParse *iface) static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) { VBScript *This = impl_from_IActiveScriptParse(iface); - FIXME("(%p)\n", This); - return S_OK; + script_ctx_t *ctx; + + TRACE("(%p)\n", This); + + if(This->ctx) + return E_UNEXPECTED; + + ctx = heap_alloc_zero(sizeof(script_ctx_t)); + if(!ctx) + return E_OUTOFMEMORY; + + ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); + if(ctx) { + destroy_script(ctx); + return E_UNEXPECTED; + } + + return This->site ? set_ctx_site(This) : S_OK; } static HRESULT WINAPI VBScriptParse_AddScriptlet(IActiveScriptParse *iface, @@ -325,6 +371,7 @@ HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory *iface, IUnknown *pU ret->IActiveScriptParse_iface.lpVtbl = &VBScriptParseVtbl; ret->ref = 1; + ret->state = SCRIPTSTATE_UNINITIALIZED; hres = IActiveScript_QueryInterface(&ret->IActiveScript_iface, riid, ppv); IActiveScript_Release(&ret->IActiveScript_iface); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 30aaf1e..98a4486 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -19,6 +19,11 @@ #include "activscp.h" #include "vbscript_classes.h" +typedef struct { + IActiveScriptSite *site; + LCID lcid; +} script_ctx_t; + HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**); static inline void *heap_alloc(size_t len)

1 0

Michael Stefaniuc : dsound: Move the primary buffer description into the buffer object.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 3747fb74a17fb077a1bb82c9655b8e02b770417e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3747fb74a17fb077a1bb82c96… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:15:36 2011 +0200 dsound: Move the primary buffer description into the buffer object. --- dlls/dsound/dsound.c | 20 ++++++++++---------- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 15 +++++++-------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 1c7b13f..cc27699 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1552,16 +1552,16 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); } else { - device->dsbd = *dsbd; - device->dsbd.dwFlags &= ~(DSBCAPS_LOCHARDWARE | DSBCAPS_LOCSOFTWARE); - if (device->hwbuf) - device->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; - else device->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; - hres = primarybuffer_create(device, &(device->primary), &(device->dsbd)); - if (device->primary) - *ppdsb = (IDirectSoundBuffer*)&device->primary->IDirectSoundBuffer8_iface; - else - WARN("primarybuffer_create() failed\n"); + hres = primarybuffer_create(device, &device->primary, dsbd); + if (device->primary) { + *ppdsb = (IDirectSoundBuffer*)&device->primary->IDirectSoundBuffer8_iface; + device->primary->dsbd.dwFlags &= ~(DSBCAPS_LOCHARDWARE | DSBCAPS_LOCSOFTWARE); + if (device->hwbuf) + device->primary->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; + else + device->primary->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; + } else + WARN("primarybuffer_create() failed\n"); } } else { IDirectSoundBufferImpl * dsb; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 43a800f..ed13b71 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -93,7 +93,6 @@ struct DirectSoundDevice RTL_RWLOCK buffer_list_lock; CRITICAL_SECTION mixlock; IDirectSoundBufferImpl *primary; - DSBUFFERDESC dsbd; DWORD speaker_config; LPBYTE tmp_buffer, mix_buffer; DWORD tmp_buffer_len, mix_buffer_len; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 2e0a6a4..b3d1517 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -642,7 +642,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetVolume( HRESULT hres = DS_OK; TRACE("(%p,%d)\n", iface, vol); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -686,7 +686,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetVolume( DWORD ampfactors; TRACE("(%p,%p)\n", iface, vol); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLVOLUME)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -985,7 +985,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetPan( HRESULT hres = DS_OK; TRACE("(%p,%d)\n", iface, pan); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -1032,7 +1032,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetPan( DWORD ampfactors; TRACE("(%p,%p)\n", iface, pan); - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLPAN)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -1102,7 +1102,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetFrequency( return DSERR_INVALIDPARAM; } - if (!(device->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { + if (!(This->dsbd.dwFlags & DSBCAPS_CTRLFREQUENCY)) { WARN("control unavailable\n"); return DSERR_CONTROLUNAVAIL; } @@ -1138,7 +1138,7 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCaps( return DSERR_INVALIDPARAM; } - caps->dwFlags = device->dsbd.dwFlags; + caps->dwFlags = This->dsbd.dwFlags; caps->dwBufferBytes = device->buflen; /* Windows reports these as zero */ @@ -1258,8 +1258,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; - - device->dsbd = *dsbd; + dsb->dsbd = *dsbd; TRACE("Created primary buffer at %p\n", dsb); TRACE("(formattag=0x%04x,chans=%d,samplerate=%d,"

1 0

Henri Verbeet : wined3d: Use the resource size for copying between a surface's DIB and PBO.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: dd462052c62c3bca78dc51f6bcaa91dec0dfa59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd462052c62c3bca78dc51f6b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 21:20:40 2011 +0200 wined3d: Use the resource size for copying between a surface's DIB and PBO. --- dlls/wined3d/surface.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ed047f2..48a5038 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1052,7 +1052,7 @@ static HRESULT surface_getdc(struct wined3d_surface *surface) /* Sync the DIB with the PBO. This can't be done earlier because Map() * activates the allocatedMemory. */ if (surface->flags & SFLAG_PBO) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->dib.bitmap_size); + memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); return hr; } @@ -3813,11 +3813,9 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } + /* Copy the contents of the DIB over to the PBO. */ if ((surface->flags & SFLAG_PBO) && surface->resource.allocatedMemory) - { - /* Copy the contents of the DIB over to the PBO. */ - memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->dib.bitmap_size); - } + memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */ wined3d_surface_unmap(surface);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_stream_source_freq() const .
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 124cdf913a538dc65477cfd99fd4800ca8c6a66a URL: http://source.winehq.org/git/wine.git/?a=commit;h=124cdf913a538dc65477cfd99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 30 20:12:35 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_stream_source_freq() const. --- dlls/wined3d/device.c | 3 ++- include/wine/wined3d.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 792521a..ba68866 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1839,7 +1839,8 @@ HRESULT CDECL wined3d_device_set_stream_source_freq(struct wined3d_device *devic return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT *divider) +HRESULT CDECL wined3d_device_get_stream_source_freq(const struct wined3d_device *device, + UINT stream_idx, UINT *divider) { struct wined3d_stream_state *stream; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a523785..a038260 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2248,7 +2248,8 @@ HRESULT __cdecl wined3d_device_get_scissor_rect(struct wined3d_device *device, R BOOL __cdecl wined3d_device_get_software_vertex_processing(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_stream_source_freq(const struct wined3d_device *device, + UINT stream_idx, UINT *divider); HRESULT __cdecl wined3d_device_get_surface_from_dc(struct wined3d_device *device, HDC dc, struct wined3d_surface **surface); HRESULT __cdecl wined3d_device_get_swapchain(const struct wined3d_device *device,

1 0

Michael Stefaniuc : dsound: Use the same struct for the primary buffer object as for the secondary.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: ffb51208e92041f905447407ac52f1ec2bbabf68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb51208e92041f905447407a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:11:29 2011 +0200 dsound: Use the same struct for the primary buffer object as for the secondary. --- dlls/dsound/dsound.c | 6 ++-- dlls/dsound/dsound_private.h | 20 ++---------- dlls/dsound/primary.c | 72 ++++++++++++++++++++++++++---------------- dlls/dsound/sound3d.c | 2 +- 4 files changed, 52 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ffb51208e92041f905447…

1 0