wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

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

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::Close implementation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

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

Jacek Caban : vbscript: Added IActiveScript::InitNew implementation.
by Alexandre Julliard 31 Aug '11

31 Aug '11

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: Handle primary buffers in two more IDirectSoundBuffer methods.
by Alexandre Julliard 31 Aug '11

31 Aug '11

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

Michael Stefaniuc : dsound: Handle primary buffers in IDirectSoundBufferImpl_SetFormat.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: a2bc634eaaf43a9e199f20d621b7b1a3fcf63752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2bc634eaaf43a9e199f20d62… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:17:04 2011 +0200 dsound: Handle primary buffers in IDirectSoundBufferImpl_SetFormat. --- dlls/dsound/buffer.c | 19 ++++++++++++++----- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 7 ++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5c8fbba..7f1d005 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -187,15 +187,24 @@ static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer8(IDirectSound return CONTAINING_RECORD(iface, IDirectSoundBufferImpl, IDirectSoundBuffer8_iface); } +static inline BOOL is_primary_buffer(IDirectSoundBufferImpl *This) +{ + return This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER ? TRUE : FALSE; +} + static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat(IDirectSoundBuffer8 *iface, LPCWAVEFORMATEX wfex) { - IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer8(iface); + + TRACE("(%p,%p)\n", iface, wfex); - TRACE("(%p,%p)\n",This,wfex); - /* This method is not available on secondary buffers */ - WARN("invalid call\n"); - return DSERR_INVALIDCALL; + if (is_primary_buffer(This)) + return primarybuffer_SetFormat(This->device, wfex); + else { + WARN("not available for secondary buffers.\n"); + return DSERR_INVALIDCALL; + } } static HRESULT WINAPI IDirectSoundBufferImpl_SetVolume(IDirectSoundBuffer8 *iface, LONG vol) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index ed13b71..61c8b0d 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -336,6 +336,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; +HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; /* duplex.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index b3d1517..c726edf 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -472,12 +472,14 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) return pwfx; } -static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced) +HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex) { HRESULT err = DSERR_BUFFERLOST; int i; DWORD nSamplesPerSec, bpp, chans; LPWAVEFORMATEX oldpwfx; + BOOL forced = device->priolevel == DSSCL_WRITEPRIMARY; + TRACE("(%p,%p)\n", device, wfex); if (device->priolevel == DSSCL_NORMAL) { @@ -628,9 +630,8 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat( LPCWAVEFORMATEX wfex) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); - DirectSoundDevice *device = This->device; TRACE("(%p,%p)\n", iface, wfex); - return DSOUND_PrimarySetFormat(device, wfex, device->priolevel == DSSCL_WRITEPRIMARY); + return primarybuffer_SetFormat(This->device, wfex); } static HRESULT WINAPI PrimaryBufferImpl_SetVolume(

1 0

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

31 Aug '11

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

Michael Stefaniuc : dsound: Don' t delete the primary buffer if a sub iface is still in use.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: c0565143f923f856bb30db06ddef33ac6dd2e9e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0565143f923f856bb30db06d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 31 01:13:33 2011 +0200 dsound: Don't delete the primary buffer if a sub iface is still in use. --- dlls/dsound/dsound.c | 7 +++---- dlls/dsound/dsound_private.h | 1 + dlls/dsound/primary.c | 19 +++++++++++++------ dlls/dsound/sound3d.c | 17 ++++++++++------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index d830c39..1c7b13f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1558,10 +1558,9 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( device->dsbd.dwFlags |= DSBCAPS_LOCHARDWARE; else device->dsbd.dwFlags |= DSBCAPS_LOCSOFTWARE; hres = primarybuffer_create(device, &(device->primary), &(device->dsbd)); - if (device->primary) { - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER8)(device->primary)); - *ppdsb = (LPDIRECTSOUNDBUFFER)(device->primary); - } else + if (device->primary) + *ppdsb = (IDirectSoundBuffer*)&device->primary->IDirectSoundBuffer8_iface; + else WARN("primarybuffer_create() failed\n"); } } else { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index e91fc35..43a800f 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -336,6 +336,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; +void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; /* duplex.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index eaca2de..2e0a6a4 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -769,20 +769,26 @@ static ULONG WINAPI PrimaryBufferImpl_AddRef(LPDIRECTSOUNDBUFFER iface) IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); ULONG ref = InterlockedIncrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref - 1); + if(ref == 1) + InterlockedIncrement(&This->numIfaces); return ref; } +void primarybuffer_destroy(IDirectSoundBufferImpl *This) +{ + This->device->primary = NULL; + HeapFree(GetProcessHeap(), 0, This); + TRACE("(%p) released\n", This); +} + static ULONG WINAPI PrimaryBufferImpl_Release(LPDIRECTSOUNDBUFFER iface) { IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); DWORD ref = InterlockedDecrement(&(This->ref)); TRACE("(%p) ref was %d\n", This, ref + 1); - if (!ref) { - This->device->primary = NULL; - HeapFree(GetProcessHeap(), 0, This); - TRACE("(%p) released\n", This); - } + if (!ref && !InterlockedDecrement(&This->numIfaces)) + primarybuffer_destroy(This); return ref; } @@ -1248,7 +1254,8 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl * return DSERR_OUTOFMEMORY; } - dsb->ref = 0; + dsb->ref = 1; + dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = (IDirectSoundBuffer8Vtbl *)&dspbvt; diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 0318420..a820c51 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -757,13 +757,9 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_QueryInterface( } if ( IsEqualGUID(riid, &IID_IDirectSoundBuffer) ) { - if (!This->device->primary) - primarybuffer_create(This->device, &This->device->primary, &This->device->dsbd); - if (This->device->primary) { - *ppobj = This->device->primary; - IDirectSoundBuffer_AddRef((LPDIRECTSOUNDBUFFER)*ppobj); - return S_OK; - } + *ppobj = &This->device->primary->IDirectSoundBuffer8_iface; + IDirectSoundBuffer8_AddRef(&This->device->primary->IDirectSoundBuffer8_iface); + return S_OK; } FIXME( "Unknown IID %s\n", debugstr_guid( riid ) ); @@ -774,7 +770,12 @@ static ULONG WINAPI IDirectSound3DListenerImpl_AddRef(LPDIRECTSOUND3DLISTENER if { IDirectSound3DListenerImpl *This = (IDirectSound3DListenerImpl *)iface; ULONG ref = InterlockedIncrement(&(This->ref)); + TRACE("(%p) ref was %d\n", This, ref - 1); + + if(ref == 1) + InterlockedIncrement(&This->device->primary->numIfaces); + return ref; } @@ -787,6 +788,8 @@ static ULONG WINAPI IDirectSound3DListenerImpl_Release(LPDIRECTSOUND3DLISTENER i if (!ref) { This->device->listener = 0; HeapFree(GetProcessHeap(), 0, This); + if (!InterlockedDecrement(&This->device->primary->numIfaces)) + primarybuffer_destroy(This->device->primary); TRACE("(%p) released\n", This); } return ref;

1 0

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

31 Aug '11

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

Andrew Talbot : mscoree: Fix a zero-sized array.
by Alexandre Julliard 31 Aug '11

31 Aug '11

Module: wine Branch: master Commit: ee9c02798650ecea1a8cee60feff9677125ec9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9c02798650ecea1a8cee60f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Aug 30 22:34:51 2011 +0100 mscoree: Fix a zero-sized array. --- dlls/mscoree/corruntimehost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 146dd23..609b73e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -149,7 +149,7 @@ static void RuntimeHost_DeleteDomain(RuntimeHost *This, MonoDomain *domain) static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *domain, IUnknown **punk) { HRESULT hr; - void *args[0]; + void *args[1]; MonoAssembly *assembly; MonoImage *image; MonoClass *klass;

1 0

← Newer
1
2
3
4
5
6
7
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011