February 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMComment.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 14705ad8f5bce9a34a27b31bc4944f34dab5206d URL: http://source.winehq.org/git/wine.git/?a=commit;h=14705ad8f5bce9a34a27b31bc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 11:34:56 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMComment. --- dlls/msxml3/comment.c | 57 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index 702a339..bbc9c47 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -106,8 +106,13 @@ static HRESULT WINAPI domcomment_GetTypeInfoCount( IXMLDOMComment *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI domcomment_GetTypeInfo( @@ -115,8 +120,14 @@ static HRESULT WINAPI domcomment_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMComment_tid, ppTInfo); + + return hr; } static HRESULT WINAPI domcomment_GetIDsOfNames( @@ -124,8 +135,24 @@ static HRESULT WINAPI domcomment_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMComment_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domcomment_Invoke( @@ -134,8 +161,22 @@ static HRESULT WINAPI domcomment_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domcomment *This = impl_from_IXMLDOMComment( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMComment_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domcomment_get_nodeName(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMProcessingInstruction.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 9fecdccc63e0e7d8a0cf6f161d2bb3486b3e40b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fecdccc63e0e7d8a0cf6f161… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 09:21:06 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMProcessingInstruction. --- dlls/msxml3/pi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 1129690..a0b0cf2 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -106,8 +106,13 @@ static HRESULT WINAPI dom_pi_GetTypeInfoCount( IXMLDOMProcessingInstruction *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI dom_pi_GetTypeInfo( @@ -115,8 +120,14 @@ static HRESULT WINAPI dom_pi_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, ppTInfo); + + return hr; } static HRESULT WINAPI dom_pi_GetIDsOfNames( @@ -124,8 +135,24 @@ static HRESULT WINAPI dom_pi_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI dom_pi_Invoke( @@ -134,8 +161,22 @@ static HRESULT WINAPI dom_pi_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMProcessingInstruction_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI dom_pi_get_nodeName(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMCDATASection.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 2ad03e8d07e2152317a3518adab49606411cbdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad03e8d07e2152317a3518ad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 10:59:15 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMCDATASection. --- dlls/msxml3/cdata.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index 186b9e4..446b58c 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -107,8 +107,13 @@ static HRESULT WINAPI domcdata_GetTypeInfoCount( IXMLDOMCDATASection *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI domcdata_GetTypeInfo( @@ -116,8 +121,14 @@ static HRESULT WINAPI domcdata_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMCDATASection_tid, ppTInfo); + + return hr; } static HRESULT WINAPI domcdata_GetIDsOfNames( @@ -125,8 +136,24 @@ static HRESULT WINAPI domcdata_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMCDATASection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domcdata_Invoke( @@ -135,8 +162,22 @@ static HRESULT WINAPI domcdata_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domcdata *This = impl_from_IXMLDOMCDATASection( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMCDATASection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domcdata_get_nodeName(

1 0

Rob Shearman : shdocvw: The WINAPI modifier on function pointers should become before the '*' for portability.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 99bde8b0b4f31e1280f73526227209e2ad67e609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99bde8b0b4f31e1280f735262… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 19 11:37:21 2008 +0000 shdocvw: The WINAPI modifier on function pointers should become before the '*' for portability. --- dlls/shdocvw/shdocvw_main.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 8338eeb..99af73b 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -217,7 +217,7 @@ static void* fetch_shlwapi_ordinal(unsigned ord) */ DWORD WINAPI WhichPlatformFORWARD(void) { - static DWORD (*WINAPI p)(void); + static DWORD (WINAPI *p)(void); if (p || (p = fetch_shlwapi_ordinal(276))) return p(); return 1; /* not integrated, see shlwapi.WhichPlatform */ @@ -228,7 +228,7 @@ DWORD WINAPI WhichPlatformFORWARD(void) */ void WINAPI StopWatchModeFORWARD(void) { - static void (*WINAPI p)(void); + static void (WINAPI *p)(void); if (p || (p = fetch_shlwapi_ordinal(241))) p(); } @@ -238,7 +238,7 @@ void WINAPI StopWatchModeFORWARD(void) */ void WINAPI StopWatchFlushFORWARD(void) { - static void (*WINAPI p)(void); + static void (WINAPI *p)(void); if (p || (p = fetch_shlwapi_ordinal(242))) p(); } @@ -249,7 +249,7 @@ void WINAPI StopWatchFlushFORWARD(void) DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (*WINAPI p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCWSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(243))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp); @@ -262,7 +262,7 @@ DWORD WINAPI StopWatchWFORWARD(DWORD dwClass, LPCWSTR lpszStr, DWORD dwUnknown, DWORD WINAPI StopWatchAFORWARD(DWORD dwClass, LPCSTR lpszStr, DWORD dwUnknown, DWORD dwMode, DWORD dwTimeStamp) { - static DWORD (*WINAPI p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); + static DWORD (WINAPI *p)(DWORD, LPCSTR, DWORD, DWORD, DWORD); if (p || (p = fetch_shlwapi_ordinal(244))) return p(dwClass, lpszStr, dwUnknown, dwMode, dwTimeStamp);

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMText.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 003beeafb9672899dbe5b3c81c88a465aa5443f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003beeafb9672899dbe5b3c81… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 09:04:36 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMText. --- dlls/msxml3/text.c | 57 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 0d402a4..4c57cce 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -107,8 +107,13 @@ static HRESULT WINAPI domtext_GetTypeInfoCount( IXMLDOMText *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI domtext_GetTypeInfo( @@ -116,8 +121,14 @@ static HRESULT WINAPI domtext_GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMText_tid, ppTInfo); + + return hr; } static HRESULT WINAPI domtext_GetIDsOfNames( @@ -125,8 +136,24 @@ static HRESULT WINAPI domtext_GetIDsOfNames( REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMText_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domtext_Invoke( @@ -135,8 +162,22 @@ static HRESULT WINAPI domtext_Invoke( WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + domtext *This = impl_from_IXMLDOMText( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMText_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI domtext_get_nodeName(

1 0

Alistair Leslie-Hughes : msxml3: Implemented IDispatch for IXMLDOMSchemaCollection.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 4a053e66ce63ffac395a37da4ea71074e58fd99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a053e66ce63ffac395a37da4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 19 09:10:40 2008 +1100 msxml3: Implemented IDispatch for IXMLDOMSchemaCollection. --- dlls/msxml3/schema.c | 57 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 0eec06c..08f4933 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -94,15 +94,26 @@ static ULONG WINAPI schema_cache_Release( IXMLDOMSchemaCollection *iface ) static HRESULT WINAPI schema_cache_GetTypeInfoCount( IXMLDOMSchemaCollection *iface, UINT* pctinfo ) { - FIXME("\n"); - return E_NOTIMPL; + schema_t *This = impl_from_IXMLDOMSchemaCollection( iface ); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + + return S_OK; } static HRESULT WINAPI schema_cache_GetTypeInfo( IXMLDOMSchemaCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) { - FIXME("\n"); - return E_NOTIMPL; + schema_t *This = impl_from_IXMLDOMSchemaCollection( iface ); + HRESULT hr; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hr = get_typeinfo(IXMLDOMSchemaCollection_tid, ppTInfo); + + return hr; } static HRESULT WINAPI schema_cache_GetIDsOfNames( IXMLDOMSchemaCollection *iface, @@ -112,8 +123,24 @@ static HRESULT WINAPI schema_cache_GetIDsOfNames( IXMLDOMSchemaCollection *iface LCID lcid, DISPID* rgDispId ) { - FIXME("\n"); - return E_NOTIMPL; + schema_t *This = impl_from_IXMLDOMSchemaCollection( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + if(!rgszNames || cNames == 0 || !rgDispId) + return E_INVALIDARG; + + hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI schema_cache_Invoke( IXMLDOMSchemaCollection *iface, @@ -126,8 +153,22 @@ static HRESULT WINAPI schema_cache_Invoke( IXMLDOMSchemaCollection *iface, EXCEPINFO* pExcepInfo, UINT* puArgErr ) { - FIXME("\n"); - return E_NOTIMPL; + schema_t *This = impl_from_IXMLDOMSchemaCollection( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IXMLDOMSchemaCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; } static HRESULT WINAPI schema_cache_add( IXMLDOMSchemaCollection *iface, BSTR uri, VARIANT var )

1 0

Jeff Latimer : pdh: Pass parameters through to PdhLookupPerfIndexByNameW for checking.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: c0700eeff30e80d46f21b3e3890c77df0f09b1ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0700eeff30e80d46f21b3e38… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Feb 19 21:17:19 2008 +1100 pdh: Pass parameters through to PdhLookupPerfIndexByNameW for checking. --- dlls/pdh/pdh_main.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index f2ecc89..423f033 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -779,23 +779,22 @@ PDH_STATUS WINAPI PdhGetRawCounterValue( PDH_HCOUNTER handle, LPDWORD type, PDH_STATUS WINAPI PdhLookupPerfIndexByNameA( LPCSTR machine, LPCSTR name, LPDWORD index ) { PDH_STATUS ret; + WCHAR *machineW = NULL; WCHAR *nameW; TRACE("%s %s %p\n", debugstr_a(machine), debugstr_a(name), index); - if (!name || !index) return PDH_INVALID_ARGUMENT; + if (!name) return PDH_INVALID_ARGUMENT; + + if (machine && !(machineW = pdh_strdup_aw( machine ))) return PDH_MEMORY_ALLOCATION_FAILURE; - if (machine) - { - FIXME("remote machine not supported\n"); - return PDH_CSTATUS_NO_MACHINE; - } if (!(nameW = pdh_strdup_aw( name ))) return PDH_MEMORY_ALLOCATION_FAILURE; - ret = PdhLookupPerfIndexByNameW( NULL, nameW, index ); + ret = PdhLookupPerfIndexByNameW( machineW, nameW, index ); heap_free( nameW ); + heap_free( machineW ); return ret; }

1 0

Rob Shearman : d3d9: Fix copy and paste error in reset_enum_callback.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: dfda3c4dc8f77336c9dfac9e70fe5c70816326ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfda3c4dc8f77336c9dfac9e7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 19 11:37:09 2008 +0000 d3d9: Fix copy and paste error in reset_enum_callback. vertex_desc.Pool should obviously be used in the WINED3DRTYPE_VERTEXBUFFER case instead of index_desc.Pool. --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 27940b4..7d63a10 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -283,7 +283,7 @@ static HRESULT WINAPI reset_enum_callback(IWineD3DResource *resource, void *data case WINED3DRTYPE_VERTEXBUFFER: IWineD3DVertexBuffer_GetDesc((IWineD3DVertexBuffer *) resource, &vertex_desc); - pool = index_desc.Pool; + pool = vertex_desc.Pool; break; /* No need to check for textures. If there is a D3DPOOL_DEFAULT texture, there

1 0

Rob Shearman : avifil32: Simplify a comparison in AVIBuildFilterW.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: c6c205a1d56bf78f026c1470df87640929b106d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c205a1d56bf78f026c1470d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 19 11:36:55 2008 +0000 avifil32: Simplify a comparison in AVIBuildFilterW. --- dlls/avifil32/api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 7753e39..47947b5 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1077,7 +1077,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) break; /* a new one */ } - if (count - i == -1U) { + if (i == count + 1) { /* it's a new CLSID */ /* FIXME: How do we get info's about read/write capabilities? */

1 0

Rob Shearman : Add the nounistd option to all lex source files.
by Alexandre Julliard Feb. 19, 2008

Feb. 19, 2008

Module: wine Branch: master Commit: 878ea5d2e215b9591085724652620f8250de0c43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878ea5d2e215b959108572465… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 19 11:48:03 2008 +0000 Add the nounistd option to all lex source files. --- libs/wpp/ppl.l | 1 + programs/winedbg/debug.l | 2 +- programs/winhelp/macro.lex.l | 2 +- tools/widl/parser.l | 1 + tools/wrc/parser.l | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index eae5465..198fcdb 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -128,6 +128,7 @@ %option 8bit never-interactive %option nounput %option prefix="ppy_" +%option nounistd %x pp_pp %x pp_eol diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index d3b3b36..6e6c888 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option nounput interactive 8bit prefix="dbg_" +%option nounput interactive 8bit prefix="dbg_" nounistd %{ #include <stdlib.h> diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index 1ff76ce..55e7ad6 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option nounput interactive 8bit +%option nounput interactive 8bit nounistd %x quote %{ #include <assert.h> diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 2497a5e..a701453 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -21,6 +21,7 @@ %option stack %option nounput noyy_top_state %option 8bit never-interactive prefix="parser_" +%option nounistd nl \r?\n ws [ \f\t\r] diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index 98f9c85..f4d0c19 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -87,6 +87,7 @@ %option nounput noyy_top_state noyywrap %option 8bit never-interactive %option prefix="parser_" +%option nounistd /* Some shortcut definitions */ ws [ \f\t\r]

1 0