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

Piotr Caban : include: Added IHTMLAttributeCollection definition.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 51aafd5683aba62dc4c919d57fc5725b52d1c5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51aafd5683aba62dc4c919d57… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 23 11:32:52 2011 +0200 include: Added IHTMLAttributeCollection definition. --- include/mshtmdid.h | 11 ++++++ include/mshtml.idl | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index cf03d64..622581f 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -1029,6 +1029,17 @@ /* IHTMLElementCollection3 */ #define DISPID_IHTMLELEMENTCOLLECTION3_NAMEDITEM DISPID_COLLECTION+6 + +/* IHTMLAttributeCollection */ +#define DISPID_IHTMLATTRIBUTECOLLECTION_LENGTH DISPID_COLLECTION +#define DISPID_IHTMLATTRIBUTECOLLECTION__NEWENUM DISPID_NEWENUM +#define DISPID_IHTMLATTRIBUTECOLLECTION_ITEM DISPID_VALUE + +/* IHTMLAttributeCollection2 */ +#define DISPID_IHTMLATTRIBUTECOLLECTION2_GETNAMEDITEM DISPID_COLLECTION+1 +#define DISPID_IHTMLATTRIBUTECOLLECTION2_SETNAMEDITEM DISPID_COLLECTION+2 +#define DISPID_IHTMLATTRIBUTECOLLECTION2_REMOVENAMEDITEM DISPID_COLLECTION+3 + /* IHTMLAttributeCollection3 */ #define DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_GETNAMEDITEM DISPID_IE8_NAMEDNODEMAP #define DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_SETNAMEDITEM DISPID_IE8_NAMEDNODEMAP+1 diff --git a/include/mshtml.idl b/include/mshtml.idl index 13c0fa3..a840944 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -4149,6 +4149,58 @@ methods: } /***************************************************************************** + * IHTMLAttributeCollection interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f4c3-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLAttributeCollection : IDispatch +{ + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION_LENGTH)] + HRESULT length( + [retval, out] long *p); + + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION__NEWENUM), hidden, restricted] + HRESULT _newEnum( + [retval, out] IUnknown **p); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION_ITEM)] + HRESULT item( + [optional, in] VARIANT *name, + [retval, out] IDispatch **pdisp); +} + +/***************************************************************************** + * IHTMLAttributeCollection2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f80a-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IHTMLAttributeCollection2 : IDispatch +{ + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_GETNAMEDITEM)] + HRESULT getNamedItem( + [in] BSTR bstrName, + [retval, out] IHTMLDOMAttribute **newretNode); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_SETNAMEDITEM)] + HRESULT setNamedItem( + [in] IHTMLDOMAttribute *ppNode, + [retval, out] IHTMLDOMAttribute **newretNode); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_REMOVENAMEDITEM)] + HRESULT removeNamedItem( + [in] BSTR bstrName, + [retval, out] IHTMLDOMAttribute **newretNode); +} + +/***************************************************************************** * IHTMLAttributeCollection3 interface */ [ @@ -4184,6 +4236,54 @@ interface IHTMLAttributeCollection3 : IDispatch } /***************************************************************************** + * DispHTMLAttributeCollection dispinterface + */ +[ + hidden, + uuid(3050f56c-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLAttributeCollection +{ +properties: +methods: + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION_LENGTH)] + long length(); + + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION__NEWENUM), hidden, restricted] + IUnknown *_newEnum(); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION_ITEM)] + IDispatch *item([optional, in] VARIANT *name); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_GETNAMEDITEM)] + IHTMLDOMAttribute *getNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_SETNAMEDITEM)] + IHTMLDOMAttribute *setNamedItem([in] IHTMLDOMAttribute *ppNode); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION2_REMOVENAMEDITEM)] + IHTMLDOMAttribute *removeNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_GETNAMEDITEM)] + IHTMLDOMAttribute *ie8_getNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_SETNAMEDITEM)] + IHTMLDOMAttribute *ie8_setNamedItem([in] IHTMLDOMAttribute *pNodeIn); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_REMOVENAMEDITEM)] + IHTMLDOMAttribute *ie8_removeNamedItem([in] BSTR bstrName); + + [id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_ITEM)] + IHTMLDOMAttribute *ie8_item([in] long index); + + [propget, id(DISPID_IHTMLATTRIBUTECOLLECTION3_IE8_LENGTH)] + long ie8_length(); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * IHTMLDOMChildrenCollection interface */ [

1 0

Michael Stefaniuc : ole32: COM cleanup in antimoniker.c.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: cd3f8a8078c4bf564b1345e08d095f2e7886b97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd3f8a8078c4bf564b1345e08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 23 10:14:42 2011 +0200 ole32: COM cleanup in antimoniker.c. --- dlls/ole32/antimoniker.c | 51 ++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 7f04036..9f1958b 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -37,22 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* AntiMoniker data structure */ typedef struct AntiMonikerImpl{ - - const IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ - - /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether - * two monikers are equal. That's whay IROTData interface is implemented by monikers. - */ - const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ - - LONG ref; /* reference counter for this object */ - + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG ref; IUnknown *pMarshal; /* custom marshaler */ } AntiMonikerImpl; -static inline IMoniker *impl_from_IROTData( IROTData *iface ) +static inline AntiMonikerImpl *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, AntiMonikerImpl, IMoniker_iface); +} + +static inline AntiMonikerImpl *impl_from_IROTData(IROTData *iface) { - return (IMoniker *)((char*)iface - FIELD_OFFSET(AntiMonikerImpl, lpvtbl2)); + return CONTAINING_RECORD(iface, AntiMonikerImpl, IROTData_iface); } @@ -62,7 +60,7 @@ static inline IMoniker *impl_from_IROTData( IROTData *iface ) static HRESULT WINAPI AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + AntiMonikerImpl *This = impl_from_IMoniker(iface); TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -80,7 +78,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IMoniker, riid)) *ppvObject = iface; else if (IsEqualIID(&IID_IROTData, riid)) - *ppvObject = &This->lpvtbl2; + *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) { HRESULT hr = S_OK; @@ -107,7 +105,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface) { - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + AntiMonikerImpl *This = impl_from_IMoniker(iface); TRACE("(%p)\n",This); @@ -120,7 +118,7 @@ AntiMonikerImpl_AddRef(IMoniker* iface) static ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface) { - AntiMonikerImpl *This = (AntiMonikerImpl *)iface; + AntiMonikerImpl *This = impl_from_IMoniker(iface); ULONG ref; TRACE("(%p)\n",This); @@ -496,11 +494,11 @@ AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) static HRESULT WINAPI AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - IMoniker *This = impl_from_IROTData(iface); + AntiMonikerImpl *This = impl_from_IROTData(iface); TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); - return AntiMonikerImpl_QueryInterface(This, riid, ppvObject); + return AntiMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } /*********************************************************************** @@ -508,11 +506,11 @@ AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObje */ static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) { - IMoniker *This = impl_from_IROTData(iface); + AntiMonikerImpl *This = impl_from_IROTData(iface); TRACE("(%p)\n",iface); - return AntiMonikerImpl_AddRef(This); + return AntiMonikerImpl_AddRef(&This->IMoniker_iface); } /*********************************************************************** @@ -520,11 +518,11 @@ static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) */ static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) { - IMoniker *This = impl_from_IROTData(iface); + AntiMonikerImpl *This = impl_from_IROTData(iface); TRACE("(%p)\n",iface); - return AntiMonikerImpl_Release(This); + return AntiMonikerImpl_Release(&This->IMoniker_iface); } /****************************************************************************** @@ -597,8 +595,8 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) TRACE("(%p)\n",This); /* Initialize the virtual function table. */ - This->lpvtbl1 = &VT_AntiMonikerImpl; - This->lpvtbl2 = &VT_ROTDataImpl; + This->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl; + This->IROTData_iface.lpVtbl = &VT_ROTDataImpl; This->ref = 0; This->pMarshal = NULL; @@ -608,7 +606,7 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This) /****************************************************************************** * CreateAntiMoniker [OLE32.@] ******************************************************************************/ -HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) +HRESULT WINAPI CreateAntiMoniker(IMoniker **ppmk) { AntiMonikerImpl* newAntiMoniker; HRESULT hr; @@ -627,7 +625,8 @@ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) return hr; } - return AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&IID_IMoniker,(void**)ppmk); + return AntiMonikerImpl_QueryInterface(&newAntiMoniker->IMoniker_iface, &IID_IMoniker, + (void**)ppmk); } static HRESULT WINAPI AntiMonikerCF_QueryInterface(LPCLASSFACTORY iface,

1 0

Nikolay Sivov : ntdll: While requesting TokenGroups calculate required user buffer size in server .
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 573db9ef639f65385f1efab5593b52c72b4b4108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=573db9ef639f65385f1efab55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 23 11:16:27 2011 +0400 ntdll: While requesting TokenGroups calculate required user buffer size in server. --- dlls/advapi32/tests/security.c | 18 ++++++++ dlls/ntdll/nt.c | 92 ++++++++++++++++------------------------ server/token.c | 17 ++++++- 3 files changed, 68 insertions(+), 59 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 17c52dc..336cc9c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1442,6 +1442,24 @@ static void test_token_attr(void) ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); /* groups */ + /* insufficient buffer length */ + SetLastError(0xdeadbeef); + Size2 = 0; + ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size2); + ok(Size2 > 1, "got %d\n", Size2); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%d with error %d\n", ret, GetLastError()); + Size2 -= 1; + Groups = HeapAlloc(GetProcessHeap(), 0, Size2); + memset(Groups, 0xcc, Size2); + Size = 0; + ret = GetTokenInformation(Token, TokenGroups, Groups, Size2, &Size); + ok(Size > 1, "got %d\n", Size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%d with error %d\n", ret, GetLastError()); + ok(*((BYTE*)Groups) == 0xcc, "buffer altered\n"); + HeapFree(GetProcessHeap(), 0, Groups); + SetLastError(0xdeadbeef); ret = GetTokenInformation(Token, TokenGroups, NULL, 0, &Size); ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 3e5d420..83a341f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -320,68 +320,48 @@ NTSTATUS WINAPI NtQueryInformationToken( break; case TokenGroups: { - char stack_buffer[256]; - unsigned int server_buf_len = sizeof(stack_buffer); - void *buffer = stack_buffer; - BOOLEAN need_more_memory; - - /* we cannot work out the size of the server buffer required for the - * input size, since there are two factors affecting how much can be - * stored in the buffer - number of groups and lengths of sids */ - do + void *buffer; + + /* reply buffer is always shorter than output one */ + buffer = tokeninfolength ? RtlAllocateHeap(GetProcessHeap(), 0, tokeninfolength) : NULL; + + SERVER_START_REQ( get_token_groups ) { - need_more_memory = FALSE; + TOKEN_GROUPS *groups = tokeninfo; - SERVER_START_REQ( get_token_groups ) + req->handle = wine_server_obj_handle( token ); + wine_server_set_reply( req, buffer, tokeninfolength ); + status = wine_server_call( req ); + if (status == STATUS_BUFFER_TOO_SMALL) { - TOKEN_GROUPS *groups = tokeninfo; - - req->handle = wine_server_obj_handle( token ); - wine_server_set_reply( req, buffer, server_buf_len ); - status = wine_server_call( req ); - if (status == STATUS_BUFFER_TOO_SMALL) - { - if (buffer == stack_buffer) - buffer = RtlAllocateHeap(GetProcessHeap(), 0, reply->user_len); - else - buffer = RtlReAllocateHeap(GetProcessHeap(), 0, buffer, reply->user_len); - if (!buffer) return STATUS_NO_MEMORY; - - server_buf_len = reply->user_len; - need_more_memory = TRUE; - } - else if (status == STATUS_SUCCESS) - { - struct token_groups *tg = buffer; - unsigned int *attr = (unsigned int *)(tg + 1); - ULONG i; - const int non_sid_portion = (sizeof(struct token_groups) + tg->count * sizeof(unsigned int)); - SID *sids = (SID *)((char *)tokeninfo + FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); - ULONG needed_bytes = FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] ) + - reply->user_len - non_sid_portion; + if (retlen) *retlen = reply->user_len; + } + else if (status == STATUS_SUCCESS) + { + struct token_groups *tg = buffer; + unsigned int *attr = (unsigned int *)(tg + 1); + ULONG i; + const int non_sid_portion = (sizeof(struct token_groups) + tg->count * sizeof(unsigned int)); + SID *sids = (SID *)((char *)tokeninfo + FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); - if (retlen) *retlen = needed_bytes; + if (retlen) *retlen = reply->user_len; - if (needed_bytes <= tokeninfolength) - { - groups->GroupCount = tg->count; - memcpy( sids, (char *)buffer + non_sid_portion, - reply->user_len - non_sid_portion ); + groups->GroupCount = tg->count; + memcpy( sids, (char *)buffer + non_sid_portion, + reply->user_len - non_sid_portion - FIELD_OFFSET( TOKEN_GROUPS, Groups[tg->count] )); - for (i = 0; i < tg->count; i++) - { - groups->Groups[i].Attributes = attr[i]; - groups->Groups[i].Sid = sids; - sids = (SID *)((char *)sids + RtlLengthSid(sids)); - } - } - else status = STATUS_BUFFER_TOO_SMALL; + for (i = 0; i < tg->count; i++) + { + groups->Groups[i].Attributes = attr[i]; + groups->Groups[i].Sid = sids; + sids = (SID *)((char *)sids + RtlLengthSid(sids)); } - else if (retlen) *retlen = 0; - } - SERVER_END_REQ; - } while (need_more_memory); - if (buffer != stack_buffer) RtlFreeHeap(GetProcessHeap(), 0, buffer); + } + else if (retlen) *retlen = 0; + } + SERVER_END_REQ; + + RtlFreeHeap(GetProcessHeap(), 0, buffer); break; } case TokenPrimaryGroup: diff --git a/server/token.c b/server/token.c index ab07a81..a0ec143 100644 --- a/server/token.c +++ b/server/token.c @@ -1295,19 +1295,30 @@ DECL_HANDLER(get_token_groups) &token_ops ))) { size_t size_needed = sizeof(struct token_groups); + size_t sid_size = 0; unsigned int group_count = 0; const struct group *group; LIST_FOR_EACH_ENTRY( group, &token->groups, const struct group, entry ) { group_count++; - size_needed += FIELD_OFFSET(SID, SubAuthority[group->sid.SubAuthorityCount]); + sid_size += FIELD_OFFSET(SID, SubAuthority[group->sid.SubAuthorityCount]); } + size_needed += sid_size; + /* attributes size */ size_needed += sizeof(unsigned int) * group_count; - reply->user_len = size_needed; + /* reply buffer contains size_needed bytes formatted as: - if (size_needed <= get_reply_max_size()) + unsigned int count; + unsigned int attrib[count]; + char sid_data[]; + + user_len includes extra data needed for TOKEN_GROUPS representation, + required caller buffer size calculated here to avoid extra server call */ + reply->user_len = FIELD_OFFSET( TOKEN_GROUPS, Groups[group_count] ) + sid_size; + + if (reply->user_len <= get_reply_max_size()) { struct token_groups *tg = set_reply_data_size( size_needed ); if (tg)

1 0

Michael Stefaniuc : ole32: COM cleanup in classmoniker.c.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 7d7c79db1d94c7d8032635190546bc53024b6621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7c79db1d94c7d8032635190… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 23 10:18:37 2011 +0200 ole32: COM cleanup in classmoniker.c. --- dlls/ole32/classmoniker.c | 62 ++++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 8b927f8..d220d91 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -43,16 +43,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* ClassMoniker data structure */ typedef struct ClassMoniker { - const IMonikerVtbl* lpVtbl; /* VTable relative to the IMoniker interface.*/ - const IROTDataVtbl* lpVtblRotData; /* VTable relative to the IROTData interface.*/ - LONG ref; /* reference counter for this object */ + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG ref; CLSID clsid; /* clsid identified by this moniker */ IUnknown *pMarshal; /* custom marshaler */ } ClassMoniker; -static inline IMoniker *impl_from_IROTData( IROTData *iface ) +static inline ClassMoniker *impl_from_IMoniker(IMoniker *iface) { - return (IMoniker *)((char*)iface - FIELD_OFFSET(ClassMoniker, lpVtblRotData)); + return CONTAINING_RECORD(iface, ClassMoniker, IMoniker_iface); +} + +static inline ClassMoniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, ClassMoniker, IROTData_iface); } /******************************************************************************* @@ -60,7 +65,7 @@ static inline IMoniker *impl_from_IROTData( IROTData *iface ) *******************************************************************************/ static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -80,7 +85,7 @@ static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,vo *ppvObject = iface; } else if (IsEqualIID(&IID_IROTData, riid)) - *ppvObject = &This->lpVtblRotData; + *ppvObject = &This->IROTData_iface; else if (IsEqualIID(&IID_IMarshal, riid)) { HRESULT hr = S_OK; @@ -106,7 +111,7 @@ static HRESULT WINAPI ClassMoniker_QueryInterface(IMoniker* iface,REFIID riid,vo ******************************************************************************/ static ULONG WINAPI ClassMoniker_AddRef(IMoniker* iface) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); TRACE("(%p)\n",This); @@ -132,7 +137,7 @@ static HRESULT ClassMoniker_Destroy(ClassMoniker* This) ******************************************************************************/ static ULONG WINAPI ClassMoniker_Release(IMoniker* iface) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); ULONG ref; TRACE("(%p)\n",This); @@ -179,7 +184,7 @@ static HRESULT WINAPI ClassMoniker_IsDirty(IMoniker* iface) ******************************************************************************/ static HRESULT WINAPI ClassMoniker_Load(IMoniker* iface,IStream* pStm) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); HRESULT hr; DWORD zero; @@ -197,11 +202,9 @@ static HRESULT WINAPI ClassMoniker_Load(IMoniker* iface,IStream* pStm) /****************************************************************************** * ClassMoniker_Save ******************************************************************************/ -static HRESULT WINAPI ClassMoniker_Save(IMoniker* iface, - IStream* pStm,/* pointer to the stream where the object is to be saved */ - BOOL fClearDirty)/* Specifies whether to clear the dirty flag */ +static HRESULT WINAPI ClassMoniker_Save(IMoniker* iface, IStream* pStm, BOOL fClearDirty) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); HRESULT hr; DWORD zero = 0; @@ -235,7 +238,7 @@ static HRESULT WINAPI ClassMoniker_BindToObject(IMoniker* iface, REFIID riid, VOID** ppvResult) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); BIND_OPTS2 bindopts; IClassActivator *pActivator; HRESULT hr; @@ -425,7 +428,7 @@ static HRESULT WINAPI ClassMoniker_IsEqual(IMoniker* iface,IMoniker* pmkOtherMon ******************************************************************************/ static HRESULT WINAPI ClassMoniker_Hash(IMoniker* iface,DWORD* pdwHash) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); TRACE("(%p)\n", pdwHash); @@ -532,7 +535,7 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) { - ClassMoniker *This = (ClassMoniker *)iface; + ClassMoniker *This = impl_from_IMoniker(iface); static const WCHAR wszClsidPrefix[] = {'c','l','s','i','d',':',0}; TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName); @@ -593,11 +596,11 @@ static HRESULT WINAPI ClassMoniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMks static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - IMoniker *This = impl_from_IROTData(iface); + ClassMoniker *This = impl_from_IROTData(iface); TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); - return ClassMoniker_QueryInterface(This, riid, ppvObject); + return ClassMoniker_QueryInterface(&This->IMoniker_iface, riid, ppvObject); } /*********************************************************************** @@ -605,11 +608,11 @@ static HRESULT WINAPI ClassMonikerROTData_QueryInterface(IROTData *iface,REFIID */ static ULONG WINAPI ClassMonikerROTData_AddRef(IROTData *iface) { - IMoniker *This = impl_from_IROTData(iface); + ClassMoniker *This = impl_from_IROTData(iface); TRACE("(%p)\n",iface); - return ClassMoniker_AddRef(This); + return ClassMoniker_AddRef(&This->IMoniker_iface); } /*********************************************************************** @@ -617,11 +620,11 @@ static ULONG WINAPI ClassMonikerROTData_AddRef(IROTData *iface) */ static ULONG WINAPI ClassMonikerROTData_Release(IROTData* iface) { - IMoniker *This = impl_from_IROTData(iface); + ClassMoniker *This = impl_from_IROTData(iface); TRACE("(%p)\n",iface); - return ClassMoniker_Release(This); + return ClassMoniker_Release(&This->IMoniker_iface); } /****************************************************************************** @@ -632,7 +635,7 @@ static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface, ULONG cbMax, ULONG* pcbData) { - ClassMoniker *This = (ClassMoniker *)impl_from_IROTData(iface); + ClassMoniker *This = impl_from_IROTData(iface); TRACE("(%p, %u, %p)\n", pbData, cbMax, pcbData); @@ -696,8 +699,8 @@ static HRESULT ClassMoniker_Construct(ClassMoniker* This, REFCLSID rclsid) TRACE("(%p,%s)\n",This,debugstr_guid(rclsid)); /* Initialize the virtual function table. */ - This->lpVtbl = &ClassMonikerVtbl; - This->lpVtblRotData = &ROTDataVtbl; + This->IMoniker_iface.lpVtbl = &ClassMonikerVtbl; + This->IROTData_iface.lpVtbl = &ROTDataVtbl; This->ref = 0; This->clsid = *rclsid; This->pMarshal = NULL; @@ -728,11 +731,12 @@ HRESULT WINAPI CreateClassMoniker(REFCLSID rclsid, IMoniker **ppmk) return hr; } - return ClassMoniker_QueryInterface((IMoniker *)newClassMoniker, &IID_IMoniker, (void**)ppmk); + return ClassMoniker_QueryInterface(&newClassMoniker->IMoniker_iface, &IID_IMoniker, + (void**)ppmk); } -HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, - LPDWORD pchEaten, LPMONIKER *ppmk) +HRESULT ClassMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, LPDWORD pchEaten, + IMoniker **ppmk) { HRESULT hr; LPCWSTR s = strchrW(szDisplayName, ':');

1 0

Andrew Talbot : netapi32: Fix to prevent access beyond nul terminator.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 18549f335761dab893531adfac50a00dfd186ff4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18549f335761dab893531adfa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 22 21:47:07 2011 +0100 netapi32: Fix to prevent access beyond nul terminator. --- dlls/netapi32/nbt.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 1115967..404fbd9 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1497,13 +1497,17 @@ void NetBTInit(void) NetBTNameEncode */ char *ptr, *lenPtr; - for (ptr = gScopeID + 1; ptr - gScopeID < sizeof(gScopeID) && *ptr; ) + for (ptr = gScopeID + 1, lenPtr = gScopeID; ptr - gScopeID < sizeof(gScopeID) && *ptr; ++ptr) { - for (lenPtr = ptr - 1, *lenPtr = 0; - ptr - gScopeID < sizeof(gScopeID) && *ptr && *ptr != '.'; - ptr++) - *lenPtr += 1; - ptr++; + if (*ptr == '.') + { + lenPtr = ptr; + *lenPtr = 0; + } + else + { + ++*lenPtr; + } } } if (RegQueryValueExW(hKey, CacheTimeoutW, NULL, NULL,

1 0

Andrew Talbot : winmm: Constify some variables.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 4aca7601265ca76339662aa4e1a9c6669cebc9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aca7601265ca76339662aa4e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 22 20:31:51 2011 +0100 winmm: Constify some variables. --- dlls/winmm/mmio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index aff150a..8c49826 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -380,8 +380,8 @@ static FOURCC MMIO_ParseExtA(LPCSTR szFileName) FOURCC ret = 0; /* Note that ext{Start,End} point to the . and + respectively */ - LPSTR extEnd; - LPSTR extStart; + LPCSTR extEnd; + LPCSTR extStart; CHAR ext[5];

1 0

Andrew Talbot : krnl386.exe16: Constify a variable.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: daa5f4bf1506e8cd4dfaa10b60b48c72a07d7d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=daa5f4bf1506e8cd4dfaa10b6… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 22 20:31:43 2011 +0100 krnl386.exe16: Constify a variable. --- dlls/krnl386.exe16/ne_module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index a90d90f..95dcab8 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -1871,9 +1871,9 @@ static HMODULE16 create_dummy_module( HMODULE module32 ) HMODULE16 hModule; NE_MODULE *pModule; SEGTABLEENTRY *pSegment; - char *pStr,*s; + char *pStr; unsigned int len; - const char* basename; + const char *basename, *s; OFSTRUCT *ofs; int of_size, size; char filename[MAX_PATH];

1 0

Andrew Talbot : msvcrt: Constify some variables.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: dce81b946545c71b1cd5bd774ea611eedf19c6e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce81b946545c71b1cd5bd774… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 22 20:31:47 2011 +0100 msvcrt: Constify some variables. --- dlls/msvcrt/locale.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 64960d9..b329dbc 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -213,7 +213,7 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) { LCID lcid; locale_search_t search; - char *cp, *region; + const char *cp, *region; memset(&search, 0, sizeof(locale_search_t)); @@ -676,7 +676,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) else if(!locale[0]) lcid[0] = GetSystemDefaultLCID(); else if (locale[0] == 'L' && locale[1] == 'C' && locale[2] == '_') { - char *p; + const char *p; while(1) { locale += 3; /* LC_ */

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 94c0407caca727e2a9e5f48bc611cf3a7fb07e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94c0407caca727e2a9e5f48bc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 22 20:31:39 2011 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/stabs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 3f28009..1bdd706 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -583,7 +583,7 @@ static int stabs_pts_read_range(struct ParseTypedefData* ptd, const char* typena static inline int stabs_pts_read_method_info(struct ParseTypedefData* ptd) { struct symt* dt; - char* tmp; + const char* tmp; char mthd; do @@ -740,7 +740,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd, break; case ':': { - char* tmp; + const char* tmp; /* method parameters... terminated by ';' */ PTS_ABORTIF(ptd, !(tmp = strchr(ptd->ptr, ';'))); ptd->ptr = tmp + 1;

1 0

Andrew Eikum : mmdevapi: Disable sound if the user explicitly selects no driver.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 23c26982e9b62e4dfb9a291932ae039ffacef3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c26982e9b62e4dfb9a29193… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 22 14:16:04 2011 -0500 mmdevapi: Disable sound if the user explicitly selects no driver. This also tweaks the no-driver behavior to report 0 active devices instead of returning an error code. --- dlls/mmdevapi/devenum.c | 6 +++--- dlls/mmdevapi/main.c | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 7acc3f6..8a71262 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -445,6 +445,9 @@ static HRESULT load_driver_devices(EDataFlow flow) UINT num, def, i; HRESULT hr; + if(!drvs.pGetEndpointIDs) + return S_OK; + hr = drvs.pGetEndpointIDs(flow, &ids, &keys, &num, &def); if(FAILED(hr)) return hr; @@ -824,9 +827,6 @@ HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { MMDevEnumImpl *This = MMDevEnumerator; - if(!drvs.pGetAudioEndpoint) - return AUDCLNT_E_SERVICE_NOT_RUNNING; - if (!This) { This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 3063a11..c694c6e 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -104,9 +104,12 @@ static BOOL init_driver(void) DWORD size = sizeof(driver_name); if(RegQueryValueExW(key, drv_value, 0, NULL, (BYTE*)driver_name, - &size) == ERROR_SUCCESS && driver_name[0] != '\0'){ + &size) == ERROR_SUCCESS){ RegCloseKey(key); + if(driver_name[0] == '\0') + return TRUE; + for(next = p = driver_name; next; p = next + 1){ next = strchrW(p, ','); if(next)

1 0