November 2009 - Wine-Commits

Jörg Höhle : mciqtz32: Fix open/close omissions.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: c4faae94122a83b12be9b22b96818ab0a08ce039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4faae94122a83b12be9b22b9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Nov 23 09:28:00 2009 +0100 mciqtz32: Fix open/close omissions. --- dlls/mciqtz32/mciqtz.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 8371227..354a9f5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -105,6 +105,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) /* finish all outstanding things */ MCIQTZ_mciClose(dwDevID, MCI_WAIT, NULL); + mciSetDriverData(dwDevID, 0); HeapFree(GetProcessHeap(), 0, wma); return 1; } @@ -166,7 +167,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, goto err; } - if (!((dwFlags & MCI_OPEN_ELEMENT) && (dwFlags & MCI_OPEN_ELEMENT))) { + if (!(dwFlags & MCI_OPEN_ELEMENT) || (dwFlags & MCI_OPEN_ELEMENT_ID)) { TRACE("Wrong dwFlags %x\n", dwFlags); goto err; }

1 0

Paul Vriens : mshtml/tests: Use the globally available wine_dbgstr_w.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: cb5a2bbb021469b6ebea56d8d3b3078474ab13dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5a2bbb021469b6ebea56d8d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 30 15:31:08 2009 +0100 mshtml/tests: Use the globally available wine_dbgstr_w. --- dlls/mshtml/tests/events.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 1f4b466..5371f76 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -87,13 +87,6 @@ static const char click_doc_str[] = "<div id=\"clickdiv\" style=\"text-align: center; background: red; font-size: 32\">click here</div>" "</body></html>"; -static const char *debugstr_w(LPCWSTR str) -{ - static char buf[1024]; - WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); - return buf; -} - static const char *debugstr_guid(REFIID riid) { static char buf[50]; @@ -264,7 +257,7 @@ static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) hres = IHTMLElement_get_tagName(elem, &tag); IHTMLElement_Release(elem); ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); - ok_(__FILE__, line) (!strcmp_wa(tag, extag), "got tag: %s, expected %s\n", debugstr_w(tag), extag); + ok_(__FILE__, line) (!strcmp_wa(tag, extag), "got tag: %s, expected %s\n", wine_dbgstr_w(tag), extag); SysFreeString(tag); } @@ -737,7 +730,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - ok(0, "unexpected call %s %x\n", debugstr_w(bstrName), grfdex); + ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); return E_NOTIMPL; }

1 0

Paul Chitescu : kernel32: Reduce registry access to KEY_READ wherever possible.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 590cc1ad55e953d986e29341dc77408914b1e927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=590cc1ad55e953d986e29341d… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Mon Nov 30 14:57:16 2009 +0200 kernel32: Reduce registry access to KEY_READ wherever possible. --- dlls/kernel32/computername.c | 8 ++++---- dlls/kernel32/except.c | 2 +- dlls/kernel32/locale.c | 2 +- dlls/kernel32/process.c | 8 ++++---- dlls/kernel32/relay16.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 7ddbac8..258f297 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -206,12 +206,12 @@ static BOOL get_use_dns_option(void) BOOL ret = TRUE; _init_attr( &attr, &nameW ); - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); + RtlOpenCurrentUser( KEY_READ, &root ); attr.RootDirectory = root; RtlInitUnicodeString( &nameW, NetworkW ); /* @@ Wine registry key: HKCU\Software\Wine\Network */ - if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) + if (!NtOpenKey( &hkey, KEY_READ, &attr )) { RtlInitUnicodeString( &nameW, UseDNSW ); if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, tmp, sizeof(tmp), &dummy )) @@ -321,12 +321,12 @@ BOOL WINAPI GetComputerNameW(LPWSTR name,LPDWORD size) _init_attr ( &attr, &nameW ); RtlInitUnicodeString( &nameW, ComputerW ); - if ( ( st = NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) ) != STATUS_SUCCESS ) + if ( ( st = NtOpenKey( &hkey, KEY_READ, &attr ) ) != STATUS_SUCCESS ) goto out; attr.RootDirectory = hkey; RtlInitUnicodeString( &nameW, ActiveComputerNameW ); - if ( ( st = NtOpenKey( &hsubkey, KEY_ALL_ACCESS, &attr ) ) != STATUS_SUCCESS ) + if ( ( st = NtOpenKey( &hsubkey, KEY_READ, &attr ) ) != STATUS_SUCCESS ) goto out; RtlInitUnicodeString( &nameW, ComputerNameW ); diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index ca39ec6..701f921 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -212,7 +212,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, AeDebugW ); - if (!NtOpenKey( &hDbgConf, KEY_ALL_ACCESS, &attr )) + if (!NtOpenKey( &hDbgConf, KEY_READ, &attr )) { char buffer[64]; KEY_VALUE_PARTIAL_INFORMATION *info; diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index fb9b517..f1e6370 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3017,7 +3017,7 @@ static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName) RtlInitUnicodeString( &keyName, szKeyName ); InitializeObjectAttributes(&attr, &keyName, 0, hRootKey, NULL); - if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) != STATUS_SUCCESS) + if (NtOpenKey( &hkey, KEY_READ, &attr ) != STATUS_SUCCESS) hkey = 0; return hkey; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7918048..83d3f6c 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -432,7 +432,7 @@ static BOOL set_registry_environment(void) /* first the system environment variables */ RtlInitUnicodeString( &nameW, env_keyW ); - if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS) + if (NtOpenKey( &hkey, KEY_READ, &attr ) == STATUS_SUCCESS) { set_registry_variables( hkey, REG_SZ ); set_registry_variables( hkey, REG_EXPAND_SZ ); @@ -441,9 +441,9 @@ static BOOL set_registry_environment(void) } /* then the ones for the current user */ - if (RtlOpenCurrentUser( KEY_ALL_ACCESS, &attr.RootDirectory ) != STATUS_SUCCESS) return ret; + if (RtlOpenCurrentUser( KEY_READ, &attr.RootDirectory ) != STATUS_SUCCESS) return ret; RtlInitUnicodeString( &nameW, envW ); - if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr ) == STATUS_SUCCESS) + if (NtOpenKey( &hkey, KEY_READ, &attr ) == STATUS_SUCCESS) { set_registry_variables( hkey, REG_SZ ); set_registry_variables( hkey, REG_EXPAND_SZ ); @@ -542,7 +542,7 @@ static void set_additional_environment(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; RtlInitUnicodeString( &nameW, profile_keyW ); - if (!NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) + if (!NtOpenKey( &hkey, KEY_READ, &attr )) { profile_dir = get_reg_value( hkey, profiles_valueW ); all_users_dir = get_reg_value( hkey, all_users_valueW ); diff --git a/dlls/kernel32/relay16.c b/dlls/kernel32/relay16.c index b3ac234..f5a710f 100644 --- a/dlls/kernel32/relay16.c +++ b/dlls/kernel32/relay16.c @@ -119,7 +119,7 @@ void RELAY16_InitDebugLists(void) static const WCHAR SnoopIncludeW[] = {'S','n','o','o','p','I','n','c','l','u','d','e',0}; static const WCHAR SnoopExcludeW[] = {'S','n','o','o','p','E','x','c','l','u','d','e',0}; - RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); + RtlOpenCurrentUser( KEY_READ, &root ); attr.Length = sizeof(attr); attr.RootDirectory = root; attr.ObjectName = &name; @@ -129,7 +129,7 @@ void RELAY16_InitDebugLists(void) RtlInitUnicodeString( &name, configW ); /* @@ Wine registry key: HKCU\Software\Wine\Debug */ - if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0; + if (NtOpenKey( &hkey, KEY_READ, &attr )) hkey = 0; NtClose( root ); if (!hkey) return;

1 0

Paul Chitescu : fwpuclnt: Add initial minimal stub implementation.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 77b98c9e6580d18cec8087389c7303eefe747efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b98c9e6580d18cec8087389… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Fri Nov 27 18:43:27 2009 +0200 fwpuclnt: Add initial minimal stub implementation. --- configure | 9 +++ configure.ac | 1 + dlls/fwpuclnt/Makefile.in | 13 ++++ dlls/fwpuclnt/fwpuclnt.spec | 146 ++++++++++++++++++++++++++++++++++++++++++ dlls/fwpuclnt/main.c | 149 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 318 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77b98c9e6580d18cec808…

1 0

Maarten Lankhorst : dsound: Call DSOUND_FullDuplexCreate instead of creating it directly.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 9123f28e46d0fe2d6bc64a4ec90a47fc2dacd7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9123f28e46d0fe2d6bc64a4ec… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:16:52 2009 +0100 dsound: Call DSOUND_FullDuplexCreate instead of creating it directly. --- dlls/dsound/duplex.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 305bea0..2faf507 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -745,22 +745,8 @@ DirectSoundFullDuplexCreate( return DSERR_INVALIDPARAM; } - /* Get dsound configuration */ - setup_dsound_options(); - - This = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(IDirectSoundFullDuplexImpl)); - - if (This == NULL) { - WARN("out of memory\n"); - *ppDSFD = NULL; - return DSERR_OUTOFMEMORY; - } - - This->lpVtbl = &dsfdvt; - This->ref = 1; - This->capture_device = NULL; - This->renderer_device = NULL; + hres = DSOUND_FullDuplexCreate(&IID_IDirectSoundFullDuplex, (LPDIRECTSOUNDFULLDUPLEX*)&This); + if (FAILED(hres)) return hres; hres = IDirectSoundFullDuplexImpl_Initialize((LPDIRECTSOUNDFULLDUPLEX)This, pcGuidCaptureDevice, @@ -770,7 +756,7 @@ DirectSoundFullDuplexCreate( hWnd, dwLevel, ppDSCBuffer8, ppDSBuffer8); if (hres != DS_OK) { - HeapFree(GetProcessHeap(), 0, This); + IUnknown_Release((LPDIRECTSOUNDFULLDUPLEX)This); WARN("IDirectSoundFullDuplexImpl_Initialize failed\n"); *ppDSFD = NULL; } else

1 0

Maarten Lankhorst : dsound: Don't use DirectSoundDevice calls directly.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 52400723c962a526a7e345afc13c721df90b7da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52400723c962a526a7e345afc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:32:23 2009 +0100 dsound: Don't use DirectSoundDevice calls directly. --- dlls/dsound/duplex.c | 52 ++++++++++++++++--------------------------------- 1 files changed, 17 insertions(+), 35 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index e516c49..dbe811b 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -49,7 +49,7 @@ typedef struct IDirectSoundFullDuplexImpl LONG ref; /* IDirectSoundFullDuplexImpl fields */ - DirectSoundDevice *renderer_device; + IDirectSound8 *renderer_device; IDirectSoundCapture *capture_device; LPUNKNOWN pUnknown; @@ -195,7 +195,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_CreateSoundBuffer( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p,%p,%p,%p)\n",This,dsbd,ppdsb,lpunk); - return DirectSoundDevice_CreateSoundBuffer(This->pdsfd->renderer_device,dsbd,ppdsb,lpunk,TRUE); + return IDirectSound8_CreateSoundBuffer(This->pdsfd->renderer_device,dsbd,ppdsb,lpunk); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_GetCaps( @@ -204,7 +204,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_GetCaps( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p,%p)\n",This,lpDSCaps); - return DirectSoundDevice_GetCaps(This->pdsfd->renderer_device, lpDSCaps); + return IDirectSound8_GetCaps(This->pdsfd->renderer_device, lpDSCaps); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_DuplicateSoundBuffer( @@ -214,7 +214,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_DuplicateSoundBuffer( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p,%p,%p)\n",This,psb,ppdsb); - return DirectSoundDevice_DuplicateSoundBuffer(This->pdsfd->renderer_device,psb,ppdsb); + return IDirectSound8_DuplicateSoundBuffer(This->pdsfd->renderer_device,psb,ppdsb); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_SetCooperativeLevel( @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_SetCooperativeLevel( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p,%p,%s)\n",This,hwnd,dumpCooperativeLevel(level)); - return DirectSoundDevice_SetCooperativeLevel(This->pdsfd->renderer_device,hwnd,level); + return IDirectSound8_SetCooperativeLevel(This->pdsfd->renderer_device,hwnd,level); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_Compact( @@ -232,7 +232,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_Compact( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p)\n", This); - return DirectSoundDevice_Compact(This->pdsfd->renderer_device); + return IDirectSound8_Compact(This->pdsfd->renderer_device); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_GetSpeakerConfig( @@ -241,7 +241,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_GetSpeakerConfig( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p, %p)\n", This, lpdwSpeakerConfig); - return DirectSoundDevice_GetSpeakerConfig(This->pdsfd->renderer_device,lpdwSpeakerConfig); + return IDirectSound8_GetSpeakerConfig(This->pdsfd->renderer_device,lpdwSpeakerConfig); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_SetSpeakerConfig( @@ -250,7 +250,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_SetSpeakerConfig( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p,0x%08x)\n",This,config); - return DirectSoundDevice_SetSpeakerConfig(This->pdsfd->renderer_device,config); + return IDirectSound8_SetSpeakerConfig(This->pdsfd->renderer_device,config); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_Initialize( @@ -259,7 +259,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_Initialize( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p, %s)\n", This, debugstr_guid(lpcGuid)); - return DirectSoundDevice_Initialize(&This->pdsfd->renderer_device,lpcGuid); + return IDirectSound8_Initialize(This->pdsfd->renderer_device,lpcGuid); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_VerifyCertification( @@ -268,7 +268,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSound8_VerifyCertification( { IDirectSoundFullDuplex_IDirectSound8 *This = (IDirectSoundFullDuplex_IDirectSound8 *)iface; TRACE("(%p, %p)\n", This, cert); - return DirectSoundDevice_VerifyCertification(This->pdsfd->renderer_device,cert); + return IDirectSound8_VerifyCertification(This->pdsfd->renderer_device,cert); } static const IDirectSound8Vtbl DirectSoundFullDuplex_DirectSound8_Vtbl = @@ -525,7 +525,7 @@ IDirectSoundFullDuplexImpl_Release( LPDIRECTSOUNDFULLDUPLEX iface ) if (This->capture_device) IDirectSoundCapture_Release(This->capture_device); if (This->renderer_device) - DirectSoundDevice_Release(This->renderer_device); + IDirectSound_Release(This->renderer_device); HeapFree( GetProcessHeap(), 0, This ); TRACE("(%p) released\n", This); } @@ -546,7 +546,6 @@ IDirectSoundFullDuplexImpl_Initialize( { HRESULT hr; IDirectSoundFullDuplexImpl *This = (IDirectSoundFullDuplexImpl *)iface; - IDirectSoundBufferImpl * dsb; TRACE("(%p,%s,%s,%p,%p,%p,%x,%p,%p)\n", This, debugstr_guid(pCaptureGuid), debugstr_guid(pRendererGuid), @@ -560,7 +559,9 @@ IDirectSoundFullDuplexImpl_Initialize( return DSERR_ALREADYINITIALIZED; } - hr = DirectSoundDevice_Initialize(&This->renderer_device, pRendererGuid); + hr = DSOUND_Create8(&IID_IDirectSound8, &This->renderer_device); + if (SUCCEEDED(hr)) + hr = IDirectSound_Initialize(This->renderer_device, pRendererGuid); if (hr != DS_OK) { WARN("DirectSoundDevice_Initialize() failed\n"); *lplpDirectSoundCaptureBuffer8 = NULL; @@ -568,20 +569,10 @@ IDirectSoundFullDuplexImpl_Initialize( return hr; } - if (dwLevel==DSSCL_PRIORITY || dwLevel==DSSCL_EXCLUSIVE) { - WARN("level=%s not fully supported\n", - dwLevel==DSSCL_PRIORITY ? "DSSCL_PRIORITY" : "DSSCL_EXCLUSIVE"); - } - This->renderer_device->priolevel = dwLevel; + IDirectSound8_SetCooperativeLevel(This->renderer_device, hWnd, dwLevel); - hr = DSOUND_PrimarySetFormat(This->renderer_device, lpDsBufferDesc->lpwfxFormat, dwLevel == DSSCL_EXCLUSIVE); - if (hr != DS_OK) { - WARN("DSOUND_PrimarySetFormat() failed\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; - return hr; - } - hr = IDirectSoundBufferImpl_Create(This->renderer_device, &dsb, lpDsBufferDesc); + hr = IDirectSound8_CreateSoundBuffer(This->renderer_device, lpDsBufferDesc, + (IDirectSoundBuffer**)lplpDirectSoundBuffer8, NULL); if (hr != DS_OK) { WARN("IDirectSoundBufferImpl_Create() failed\n"); *lplpDirectSoundCaptureBuffer8 = NULL; @@ -589,15 +580,6 @@ IDirectSoundFullDuplexImpl_Initialize( return hr; } - hr = SecondaryBufferImpl_Create(dsb, (SecondaryBufferImpl **)lplpDirectSoundBuffer8); - if (hr != DS_OK) { - WARN("SecondaryBufferImpl_Create() failed\n"); - *lplpDirectSoundCaptureBuffer8 = NULL; - *lplpDirectSoundBuffer8 = NULL; - return hr; - } - IDirectSoundBuffer8_AddRef(*lplpDirectSoundBuffer8); - hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, &This->capture_device); if (SUCCEEDED(hr)) hr = IDirectSoundCapture_Initialize(This->capture_device, pCaptureGuid);

1 0

Maarten Lankhorst : dsound: Use DirectSoundCapture properly in duplex.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 26df03d2df09d4e02c2acad607d2fe7673f1dee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26df03d2df09d4e02c2acad60… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:22:29 2009 +0100 dsound: Use DirectSoundCapture properly in duplex. --- dlls/dsound/duplex.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index 2faf507..e516c49 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -24,6 +24,8 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION +#define CINTERFACE +#define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -48,7 +50,7 @@ typedef struct IDirectSoundFullDuplexImpl /* IDirectSoundFullDuplexImpl fields */ DirectSoundDevice *renderer_device; - DirectSoundCaptureDevice *capture_device; + IDirectSoundCapture *capture_device; LPUNKNOWN pUnknown; LPDIRECTSOUND8 pDS8; @@ -368,7 +370,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_CreateCaptureBu { IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; TRACE("(%p,%p,%p,%p)\n",This,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); - return IDirectSoundCaptureImpl_CreateCaptureBuffer(This->pdsfd->pDSC,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); + return IDirectSoundCapture_CreateCaptureBuffer(This->pdsfd->capture_device,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_GetCaps( @@ -377,7 +379,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_GetCaps( { IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; TRACE("(%p,%p)\n",This,lpDSCCaps); - return IDirectSoundCaptureImpl_GetCaps(This->pdsfd->pDSC, lpDSCCaps); + return IDirectSoundCapture_GetCaps(This->pdsfd->capture_device, lpDSCCaps); } static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_Initialize( @@ -386,7 +388,7 @@ static HRESULT WINAPI IDirectSoundFullDuplex_IDirectSoundCapture_Initialize( { IDirectSoundFullDuplex_IDirectSoundCapture *This = (IDirectSoundFullDuplex_IDirectSoundCapture *)iface; TRACE("(%p, %s)\n", This, debugstr_guid(lpcGUID)); - return IDirectSoundCaptureImpl_Initialize(This->pdsfd->pDSC,lpcGUID); + return IDirectSoundCapture_Initialize(This->pdsfd->capture_device,lpcGUID); } static const IDirectSoundCaptureVtbl DirectSoundFullDuplex_DirectSoundCapture_Vtbl = @@ -521,7 +523,7 @@ IDirectSoundFullDuplexImpl_Release( LPDIRECTSOUNDFULLDUPLEX iface ) if (!ref) { if (This->capture_device) - DirectSoundCaptureDevice_Release(This->capture_device); + IDirectSoundCapture_Release(This->capture_device); if (This->renderer_device) DirectSoundDevice_Release(This->renderer_device); HeapFree( GetProcessHeap(), 0, This ); @@ -596,7 +598,9 @@ IDirectSoundFullDuplexImpl_Initialize( } IDirectSoundBuffer8_AddRef(*lplpDirectSoundBuffer8); - hr = DirectSoundCaptureDevice_Initialize(&This->capture_device, pCaptureGuid); + hr = DSOUND_CaptureCreate8(&IID_IDirectSoundCapture8, &This->capture_device); + if (SUCCEEDED(hr)) + hr = IDirectSoundCapture_Initialize(This->capture_device, pCaptureGuid); if (hr != DS_OK) { WARN("DirectSoundCaptureDevice_Initialize() failed\n"); *lplpDirectSoundCaptureBuffer8 = NULL; @@ -604,9 +608,10 @@ IDirectSoundFullDuplexImpl_Initialize( return hr; } - hr = IDirectSoundCaptureBufferImpl_Create(This->capture_device, - (IDirectSoundCaptureBufferImpl **)lplpDirectSoundCaptureBuffer8, - lpDscBufferDesc); + hr = IDirectSoundCapture_CreateCaptureBuffer(This->capture_device, + lpDscBufferDesc, + (IDirectSoundCaptureBuffer**)lplpDirectSoundCaptureBuffer8, + NULL); if (hr != DS_OK) { WARN("IDirectSoundCaptureBufferImpl_Create() failed\n"); *lplpDirectSoundCaptureBuffer8 = NULL;

1 0

Maarten Lankhorst : dsound: Remove directsound interface in duplex.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: c9b70ddf7e08d5feb70663b5061b9cf50082779e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b70ddf7e08d5feb70663b50… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 24 14:10:52 2009 +0100 dsound: Remove directsound interface in duplex. --- dlls/dsound/dsound.c | 4 +- dlls/dsound/dsound_private.h | 2 + dlls/dsound/duplex.c | 199 +++--------------------------------------- 3 files changed, 16 insertions(+), 189 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9b70ddf7e08d5feb7066…

1 0

Gerald Pfeifer : winspool/tests: Guard debugging code by #ifdef instead of plain #if.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: 5b4fdcc8f153ddf300dd83f6862ce773ebd480ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4fdcc8f153ddf300dd83f68… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Nov 26 00:55:00 2009 +0100 winspool/tests: Guard debugging code by #ifdef instead of plain #if. --- dlls/winspool.drv/tests/info.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 2fb09f3..0e12b07 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2481,7 +2481,7 @@ static void test_DeviceCapabilities(void) papers = HeapAlloc(GetProcessHeap(), 0, sizeof(*papers) * n_papers); ret = DeviceCapabilities(device, port, DC_PAPERS, (LPSTR)papers, NULL); ok(ret == n_papers, "expected %d, got %d\n", n_papers, ret); -#if VERBOSE +#ifdef VERBOSE for (ret = 0; ret < n_papers; ret++) trace("papers[%d] = %d\n", ret, papers[ret]); #endif @@ -2493,7 +2493,7 @@ static void test_DeviceCapabilities(void) paper_size = HeapAlloc(GetProcessHeap(), 0, sizeof(*paper_size) * n_paper_size); ret = DeviceCapabilities(device, port, DC_PAPERSIZE, (LPSTR)paper_size, NULL); ok(ret == n_paper_size, "expected %d, got %d\n", n_paper_size, ret); -#if VERBOSE +#ifdef VERBOSE for (ret = 0; ret < n_paper_size; ret++) trace("paper_size[%d] = %d x %d\n", ret, paper_size[ret].x, paper_size[ret].y); #endif @@ -2505,7 +2505,7 @@ static void test_DeviceCapabilities(void) paper_name = HeapAlloc(GetProcessHeap(), 0, sizeof(*paper_name) * n_paper_names); ret = DeviceCapabilities(device, port, DC_PAPERNAMES, (LPSTR)paper_name, NULL); ok(ret == n_paper_names, "expected %d, got %d\n", n_paper_names, ret); -#if VERBOSE +#ifdef VERBOSE for (ret = 0; ret < n_paper_names; ret++) trace("paper_name[%u] = %s\n", ret, paper_name[ret].name); #endif

1 0

Paul Vriens : advapi32/tests: Add some EnumServicesStatus*W tests.
by Alexandre Julliard Nov. 30, 2009

Nov. 30, 2009

Module: wine Branch: master Commit: a29581ba36c90f9cfb7565813d88f99bc1cd5299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29581ba36c90f9cfb7565813… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 30 11:32:45 2009 +0100 advapi32/tests: Add some EnumServicesStatus*W tests. --- dlls/advapi32/tests/service.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 0851384..17f89d1 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -38,6 +38,9 @@ static BOOL (WINAPI *pChangeServiceConfig2A)(SC_HANDLE,DWORD,LPVOID); static BOOL (WINAPI *pEnumServicesStatusExA)(SC_HANDLE, SC_ENUM_TYPE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD, LPDWORD, LPCSTR); +static BOOL (WINAPI *pEnumServicesStatusExW)(SC_HANDLE, SC_ENUM_TYPE, DWORD, + DWORD, LPBYTE, DWORD, LPDWORD, + LPDWORD, LPDWORD, LPCWSTR); static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMATION, PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); static BOOL (WINAPI *pQueryServiceConfig2A)(SC_HANDLE,DWORD,LPBYTE,DWORD,LPDWORD); @@ -51,6 +54,7 @@ static void init_function_pointers(void) pChangeServiceConfig2A = (void*)GetProcAddress(hadvapi32, "ChangeServiceConfig2A"); pEnumServicesStatusExA= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExA"); + pEnumServicesStatusExW= (void*)GetProcAddress(hadvapi32, "EnumServicesStatusExW"); pGetSecurityInfo = (void *)GetProcAddress(hadvapi32, "GetSecurityInfo"); pQueryServiceConfig2A= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2A"); pQueryServiceConfig2W= (void*)GetProcAddress(hadvapi32, "QueryServiceConfig2W"); @@ -1030,6 +1034,7 @@ static void test_enum_svc(void) SC_HANDLE scm_handle; BOOL ret; DWORD bufsize, needed, returned, resume; + DWORD neededW, returnedW; DWORD tempneeded, tempreturned, missing; DWORD servicecountactive, servicecountinactive; ENUM_SERVICE_STATUS *services; @@ -1160,6 +1165,12 @@ static void test_enum_svc(void) "Expected ERROR_MORE_DATA, got %d\n", GetLastError()); } + /* Test to show we get the same needed buffer size for the W-call */ + neededW = 0xdeadbeef; + ret = EnumServicesStatusW(scm_handle, SERVICE_WIN32, SERVICE_STATE_ALL, NULL, 0, + &neededW, &returnedW, NULL); + ok(neededW == needed, "Expected needed buffersize to be the same for A- and W-calls\n"); + /* Store the needed bytes */ tempneeded = needed; @@ -1506,6 +1517,12 @@ static void test_enum_svc(void) "Expected ERROR_MORE_DATA, got %d\n", GetLastError()); } + /* Test to show we get the same needed buffer size for the W-call */ + neededW = 0xdeadbeef; + ret = pEnumServicesStatusExW(scm_handle, 0, SERVICE_WIN32, SERVICE_STATE_ALL, + NULL, 0, &neededW, &returnedW, NULL, NULL); + ok(neededW == needed, "Expected needed buffersize to be the same for A- and W-calls\n"); + /* Store the needed bytes */ tempneeded = needed;

1 0