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

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

Aug. 31, 2011

Module: wine Branch: master Commit: 2f1917956b9a568682822a851139821f548ac8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f1917956b9a568682822a851… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:05:52 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateTextW. --- 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 d07d4bd..04ee7d0 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5344,11 +5344,11 @@ HRESULT WINAPI D3DXCreateTextW(LPDIRECT3DDEVICE9 device, if (FAILED(hr)) goto error; - hr = mesh->lpVtbl->LockVertexBuffer(mesh, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, (LPVOID *)&vertices); if (FAILED(hr)) goto error; - hr = mesh->lpVtbl->LockIndexBuffer(mesh, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, (LPVOID *)&faces); if (FAILED(hr)) goto error;

1 0

André Hentschel : shell32/tests: Fix checking the child strings.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 4e862b8440f4b8f15d6bc655ae5afdce2ba23d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e862b8440f4b8f15d6bc655a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 30 21:20:40 2011 +0200 shell32/tests: Fix checking the child strings. --- dlls/shell32/tests/shlexec.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 31b0930..bae0c21 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -680,6 +680,11 @@ static void _okChildString(const char* file, int line, const char* key, const ch { char* result; result=getChildString("Arguments", key); + if (!result) + { + ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + return; + } ok_(file, line)(lstrcmpiA(result, expected) == 0, "%s expected '%s', got '%s'\n", key, expected, result); } @@ -688,6 +693,11 @@ static void _okChildPath(const char* file, int line, const char* key, const char { char* result; result=getChildString("Arguments", key); + if (!result) + { + ok_(file, line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected); + return; + } ok_(file, line)(StrCmpPath(result, expected) == 0, "%s expected '%s', got '%s'\n", key, expected, result); }

1 0

Alistair Leslie-Hughes : uxtheme: Set last error on NULL pointer.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 81079ef35b0da17de0b3d75022be26f712740d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079ef35b0da17de0b3d7502… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 30 23:15:25 2011 +1000 uxtheme: Set last error on NULL pointer. --- dlls/uxtheme/system.c | 6 ++++++ dlls/uxtheme/tests/system.c | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2d5b41e..6ee1dac 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -641,6 +641,12 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) HTHEME hTheme = NULL; TRACE("(%p,%s, %x)\n", hwnd, debugstr_w(pszClassList), flags); + if(!pszClassList) + { + SetLastError(E_POINTER); + return NULL; + } + if(flags) FIXME("unhandled flags: %x\n", flags); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 0aaadbd..8dd413b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -192,8 +192,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeData(NULL, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -232,8 +231,7 @@ static void test_OpenThemeData(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeData(hWnd, NULL); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -359,8 +357,7 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(NULL, NULL, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError()); @@ -399,8 +396,7 @@ static void test_OpenThemeDataEx(void) SetLastError(0xdeadbeef); hTheme = pOpenThemeDataEx(hWnd, NULL, 0); ok( hTheme == NULL, "Expected a NULL return, got %p\n", hTheme); - todo_wine - ok( GetLastError() == E_POINTER, + ok( GetLastError() == E_POINTER, "Expected GLE() to be E_POINTER, got 0x%08x\n", GetLastError());

1 0

Marcus Meissner : msi: Check return value of msi_string2idW (Coverity).
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: ee12b4feed8885a4c22716eade4154101ec5577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee12b4feed8885a4c22716ead… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 18:17:21 2011 +0200 msi: Check return value of msi_string2idW (Coverity). --- dlls/msi/streams.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 56b38e3..71616e9 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -296,10 +296,12 @@ static UINT STREAMS_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *n static UINT streams_find_row(MSISTREAMSVIEW *sv, MSIRECORD *rec, UINT *row) { LPCWSTR str; - UINT i, id, data; + UINT r, i, id, data; str = MSI_RecordGetString(rec, 1); - msi_string2idW(sv->db->strings, str, &id); + r = msi_string2idW(sv->db->strings, str, &id); + if (r != ERROR_SUCCESS) + return r; for (i = 0; i < sv->num_rows; i++) {

1 0

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

Aug. 31, 2011

Module: wine Branch: master Commit: bae50905c513decb3fd3755771a7c1492f65887d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae50905c513decb3fd375577… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Aug 19 19:04:40 2011 +0200 d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXCreateCylinder. --- 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 6fc3ef5..d07d4bd 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4232,14 +4232,14 @@ HRESULT WINAPI D3DXCreateCylinder(LPDIRECT3DDEVICE9 device, FLOAT radius1, FLOAT return hr; } - hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, D3DLOCK_DISCARD, (LPVOID *)&vertices); + hr = cylinder->lpVtbl->LockVertexBuffer(cylinder, 0, (LPVOID *)&vertices); if (FAILED(hr)) { cylinder->lpVtbl->Release(cylinder); return hr; } - hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, D3DLOCK_DISCARD, (LPVOID *)&faces); + hr = cylinder->lpVtbl->LockIndexBuffer(cylinder, 0, (LPVOID *)&faces); if (FAILED(hr)) { cylinder->lpVtbl->UnlockVertexBuffer(cylinder);

1 0

Marcus Meissner : ntdll: Handle errno also for non ENOENT errors on lseek ( Coverity).
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 956487434d02c1911a942bed1a3949719fe54d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956487434d02c1911a942bed1… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 16:41:29 2011 +0200 ntdll: Handle errno also for non ENOENT errors on lseek (Coverity). --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 548189c..5d6d2cc 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1547,9 +1547,9 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U else { old_pos = lseek( fd, 0, SEEK_CUR ); - if (old_pos == -1 && errno == ENOENT) + if (old_pos == -1) { - io->u.Status = STATUS_NO_MORE_FILES; + io->u.Status = (errno == ENOENT) ? STATUS_NO_MORE_FILES : FILE_GetNtStatus(); res = 0; goto done; }

1 0

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

Aug. 31, 2011

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

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

Aug. 31, 2011

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

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

Aug. 31, 2011

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 Stefaniuc : dsound: Handle primary buffers in IDirectSoundBufferImpl_SetFormat.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

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