December 2009 - Wine-Commits

Francois Gouget : dsound: Reorder the capture functions to avoid forward declarations.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 5ab62a5c885135906fa2a4e26ae905fc39e62f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab62a5c885135906fa2a4e26… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 2 12:12:37 2009 +0100 dsound: Reorder the capture functions to avoid forward declarations. --- dlls/dsound/capture.c | 962 ++++++++++++++++++++++++------------------------- 1 files changed, 479 insertions(+), 483 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ab62a5c885135906fa2a…

1 0

Francois Gouget : dsound: Make some capture functions static.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 5b5f00d5523d8a47dfcc0985425ef4850c3a69dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5f00d5523d8a47dfcc09854… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 2 12:12:47 2009 +0100 dsound: Make some capture functions static. --- dlls/dsound/capture.c | 12 ++++++------ dlls/dsound/dsound_private.h | 22 ---------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 29d9f40..26c86b8 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -821,7 +821,7 @@ DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, TRACE("completed\n"); } -HRESULT IDirectSoundCaptureBufferImpl_Create( +static HRESULT IDirectSoundCaptureBufferImpl_Create( DirectSoundCaptureDevice *device, IDirectSoundCaptureBufferImpl ** ppobj, LPCDSCBUFFERDESC lpcDSCBufferDesc) @@ -1006,7 +1006,7 @@ static HRESULT DirectSoundCaptureDevice_Create( return DS_OK; } -ULONG DirectSoundCaptureDevice_Release( +static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); @@ -1033,7 +1033,7 @@ ULONG DirectSoundCaptureDevice_Release( return ref; } -HRESULT DirectSoundCaptureDevice_Initialize( +static HRESULT DirectSoundCaptureDevice_Initialize( DirectSoundCaptureDevice ** ppDevice, LPCGUID lpcGUID) { @@ -1221,7 +1221,7 @@ IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) return ref; } -HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( +static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( LPDIRECTSOUNDCAPTURE iface, LPCDSCBUFFERDESC lpcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, @@ -1262,7 +1262,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( return hr; } -HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( +static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( LPDIRECTSOUNDCAPTURE iface, LPDSCCAPS lpDSCCaps ) { @@ -1294,7 +1294,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( return DS_OK; } -HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( +static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( LPDIRECTSOUNDCAPTURE iface, LPCGUID lpcGUID ) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 4a095c7..d52d697 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -273,12 +273,6 @@ struct DirectSoundCaptureDevice CRITICAL_SECTION lock; }; -HRESULT DirectSoundCaptureDevice_Initialize( - DirectSoundCaptureDevice ** ppDevice, - LPCGUID lpcGUID); -ULONG DirectSoundCaptureDevice_Release( - DirectSoundCaptureDevice * device); - /***************************************************************************** * IDirectSoundCaptureBuffer implementation structure */ @@ -301,11 +295,6 @@ struct IDirectSoundCaptureBufferImpl PIDSDRIVERNOTIFY hwnotify; }; -HRESULT IDirectSoundCaptureBufferImpl_Create( - DirectSoundCaptureDevice *device, - IDirectSoundCaptureBufferImpl ** ppobj, - LPCDSCBUFFERDESC lpcDSCBufferDesc); - /***************************************************************************** * IDirectSound3DListener implementation structure */ @@ -416,17 +405,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb); HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC); HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8); -HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( - LPDIRECTSOUNDCAPTURE iface, - LPCDSCBUFFERDESC lpcDSCBufferDesc, - LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, - LPUNKNOWN pUnk); -HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( - LPDIRECTSOUNDCAPTURE iface, - LPDSCCAPS lpDSCCaps); -HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( - LPDIRECTSOUNDCAPTURE iface, - LPCGUID lpcGUID); #define STATE_STOPPED 0 #define STATE_STARTING 1

1 0

Marcus Meissner : winex11.drv: Check NULL before calling (Coverity).
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 8a06bd9e1c60ec2374ec5f33947fc06938fd4990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a06bd9e1c60ec2374ec5f339… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 23:47:34 2009 +0100 winex11.drv: Check NULL before calling (Coverity). --- dlls/winex11.drv/xfont.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xfont.c b/dlls/winex11.drv/xfont.c index a45a3a3..aa3eb76 100644 --- a/dlls/winex11.drv/xfont.c +++ b/dlls/winex11.drv/xfont.c @@ -1674,7 +1674,6 @@ static void XFONT_LoadAliases( HKEY hkey ) /* then user specified aliases */ do { - BOOL bSubst; char subsection[32]; snprintf( subsection, sizeof(subsection), "%s%i", INIAliasSection, i++ ); @@ -1690,9 +1689,9 @@ static void XFONT_LoadAliases( HKEY hkey ) XFONT_InitialCapitals(buffer); lpResource = XFONT_GetStringItem( buffer ); - bSubst = (XFONT_GetStringItem( lpResource )) ? TRUE : FALSE; if( lpResource && *lpResource ) { + BOOL bSubst = (XFONT_GetStringItem( lpResource )) ? TRUE : FALSE; if (LFD_Parse(lpResource, &lfd)) XFONT_LoadAlias(&lfd, buffer, bSubst); } else

1 0

Marcus Meissner : shell32: Check for NULL lpText (Coverity).
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 482354bdf74daaac18f0c3b572e6e3f569f3fbd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=482354bdf74daaac18f0c3b57… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 23:14:10 2009 +0100 shell32: Check for NULL lpText (Coverity). --- dlls/shell32/shlmenu.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index efdd6b5..957711f 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -392,12 +392,15 @@ BOOL WINAPI FileMenu_AppendItemAW( { BOOL ret; - if ((SHELL_OsIsUnicode() && (lpText!=FM_SEPARATOR)) || (lpText == NULL)) + if (!lpText) return FALSE; + + if (SHELL_OsIsUnicode() || lpText == FM_SEPARATOR) ret = FileMenu_AppendItemW(hMenu, lpText, uID, icon, hMenuPopup, nItemHeight); else { DWORD len = MultiByteToWideChar( CP_ACP, 0, lpText, -1, NULL, 0 ); LPWSTR lpszText = HeapAlloc ( GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!lpszText) return FALSE; MultiByteToWideChar( CP_ACP, 0, lpText, -1, lpszText, len ); ret = FileMenu_AppendItemW(hMenu, lpszText, uID, icon, hMenuPopup, nItemHeight); HeapFree( GetProcessHeap(), 0, lpszText );

1 0

Henri Verbeet : d3d9/tests: Add a small test for IDirect3D9Ex:: GetAdapterLUID().
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: b644d113337c6546bab1e816db32df8f5bd01377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b644d113337c6546bab1e816d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 10:41:24 2009 +0100 d3d9/tests: Add a small test for IDirect3D9Ex::GetAdapterLUID(). --- dlls/d3d9/tests/d3d9ex.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 36520f2..1a052ac 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -184,6 +184,38 @@ out: DestroyWindow(window); } +static void test_get_adapter_luid(void) +{ + HWND window = create_window(); + IDirect3D9Ex *d3d9ex; + UINT count; + HRESULT hr; + LUID luid; + + hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); + if (FAILED(hr)) + { + skip("Direct3D9Ex is not available.\n"); + DestroyWindow(window); + return; + } + + count = IDirect3D9Ex_GetAdapterCount(d3d9ex); + if (!count) + { + skip("No adapters available.\n"); + IDirect3D9Ex_Release(d3d9ex); + DestroyWindow(window); + return; + } + + hr = IDirect3D9Ex_GetAdapterLUID(d3d9ex, D3DADAPTER_DEFAULT, &luid); + ok(SUCCEEDED(hr), "GetAdapterLUID failed, hr %#x.\n", hr); + trace("adapter luid: %08x:%08x.\n", luid.HighPart, luid.LowPart); + + IDirect3D9Ex_Release(d3d9ex); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -206,4 +238,5 @@ START_TEST(d3d9ex) test_qi_base_to_ex(); test_qi_ex_to_base(); + test_get_adapter_luid(); }

1 0

Marcus Meissner : mshtml: Check for NULL return from allocations.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 5013c4d96e24456091d0d89faf39fd60f0de601a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5013c4d96e24456091d0d89fa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Dec 1 23:28:50 2009 +0100 mshtml: Check for NULL return from allocations. --- dlls/mshtml/txtrange.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index c068c06..0ece6ec 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -177,12 +177,14 @@ static BOOL is_space_elem(nsIDOMNode *node) return ret; } -static inline void wstrbuf_init(wstrbuf_t *buf) +static inline BOOL wstrbuf_init(wstrbuf_t *buf) { buf->len = 0; buf->size = 16; buf->buf = heap_alloc(buf->size * sizeof(WCHAR)); + if (!buf->buf) return FALSE; *buf->buf = 0; + return TRUE; } static inline void wstrbuf_finish(wstrbuf_t *buf) @@ -549,13 +551,14 @@ HRESULT get_node_text(HTMLDOMNode *node, BSTR *ret) wstrbuf_t buf; HRESULT hres = S_OK; - wstrbuf_init(&buf); + if (!wstrbuf_init(&buf)) + return E_OUTOFMEMORY; wstrbuf_append_node_rec(&buf, node->nsnode); if(buf.buf) { *ret = SysAllocString(buf.buf); if(!*ret) hres = E_OUTOFMEMORY; - }else { + } else { *ret = NULL; } wstrbuf_finish(&buf); @@ -1171,9 +1174,10 @@ static HRESULT WINAPI HTMLTxtRange_get_text(IHTMLTxtRange *iface, BSTR *p) if(!This->nsrange) return S_OK; - wstrbuf_init(&buf); + if (!wstrbuf_init(&buf)) + return E_OUTOFMEMORY; range_to_string(This, &buf); - if(buf.buf) + if (buf.buf) *p = SysAllocString(buf.buf); wstrbuf_finish(&buf);

1 0

Huw Davies : iphlpapi: Provide statistics on non-ethernet based interfaces too.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 8dd5c04c32bdb471fbfc9519f459f287dc4bb60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd5c04c32bdb471fbfc9519f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 2 10:15:47 2009 +0000 iphlpapi: Provide statistics on non-ethernet based interfaces too. --- dlls/iphlpapi/ipstats.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 69f3376..8847e09 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -353,7 +353,7 @@ DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) for ( end = buf + needed; buf < end; buf += ifm->ifm_msglen) { ifm = (struct if_msghdr *) buf; - if(ifm->ifm_type == RTM_IFINFO && ifm->ifm_data.ifi_type == IFT_ETHER) + if(ifm->ifm_type == RTM_IFINFO) { ifdata = ifm->ifm_data; entry->dwMtu = ifdata.ifi_mtu;

1 0

Andrew Eikum : mshtml: Implement IHTMLStyle::{get, put}_border{Top, Bottom, Right}.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: d97b4d260ee921888680c946f8877cbf58965ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d97b4d260ee921888680c946f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Dec 1 14:04:38 2009 -0600 mshtml: Implement IHTMLStyle::{get, put}_border{Top, Bottom, Right}. --- dlls/mshtml/htmlstyle.c | 33 ++++++++++------ dlls/mshtml/htmlstyle.h | 3 + dlls/mshtml/tests/dom.c | 102 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d97b4d260ee921888680c…

1 0

Henri Verbeet : d3d10core: Allow a NULL vertex buffer to be set in IASetVertexBuffers().
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 03f61decc987a0a5c55da43a42cb843040b9c916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f61decc987a0a5c55da43a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 10:41:22 2009 +0100 d3d10core: Allow a NULL vertex buffer to be set in IASetVertexBuffers(). --- dlls/d3d10core/device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6f96218..cfc7dec 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -202,7 +202,8 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac for (i = 0; i < buffer_count; ++i) { IWineD3DDevice_SetStreamSource(This->wined3d_device, start_slot, - ((struct d3d10_buffer *)buffers[i])->wined3d_buffer, offsets[i], strides[i]); + buffers[i] ? ((struct d3d10_buffer *)buffers[i])->wined3d_buffer : NULL, + offsets[i], strides[i]); } }

1 0

Dan Kegel : kernel32: Fix write buffer overrun in format_insertW.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 1cd395153da2ac340e2f5e2e45129d71d93ce332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd395153da2ac340e2f5e2e4… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Dec 1 21:24:11 2009 -0800 kernel32: Fix write buffer overrun in format_insertW. --- dlls/kernel32/format_msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 4b5b00c..c312acd 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -356,7 +356,7 @@ static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, (format[0] == 'C')) { char ch = arg; - wstring = HeapAlloc( GetProcessHeap(), 0, 2 ); + wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, &ch, 1, wstring, 1 ); wstring[1] = 0; arg = (ULONG_PTR)wstring;

1 0