November 2009 - Wine-commits

Rob Shearman : ole32: Fix behaviour of CoLockObjectExternal with fLastUnlockReleases as FALSE.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: a7b621bd9b9a5ca93feca3033cbf85739d414366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b621bd9b9a5ca93feca3033… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 23 15:07:38 2009 +0000 ole32: Fix behaviour of CoLockObjectExternal with fLastUnlockReleases as FALSE. The parameter controls whether weak references are ignored, not whether the last stub_manager_int_release should be called when the total reference count goes to zero. --- dlls/ole32/marshal.c | 2 +- dlls/ole32/stubmanager.c | 8 +++++--- dlls/ole32/tests/marshal.c | 3 --- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 821cb87..54a3a87 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1336,7 +1336,7 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v /* unref the ifstub. FIXME: only do this on success? */ if (!stub_manager_is_table_marshaled(stubmgr, &stdobjref.ipid)) - stub_manager_ext_release(stubmgr, stdobjref.cPublicRefs, stdobjref.flags & SORFP_TABLEWEAK, TRUE); + stub_manager_ext_release(stubmgr, stdobjref.cPublicRefs, stdobjref.flags & SORFP_TABLEWEAK, FALSE); stub_manager_int_release(stubmgr); return hres; diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 12813c6..f6b8bfa 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -406,13 +406,15 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea rc = (m->extrefs -= refs); if (tableweak) - rc += --m->weakrefs; + --m->weakrefs; + if (!last_unlock_releases) + rc += m->weakrefs; LeaveCriticalSection(&m->lock); TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); - if (rc == 0 && last_unlock_releases) + if (rc == 0) stub_manager_int_release(m); return rc; @@ -551,7 +553,7 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) refs = 1; - stub_manager_ext_release(m, refs, tableweak, TRUE); + stub_manager_ext_release(m, refs, tableweak, FALSE); } /* is an ifstub table marshaled? */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 93fd9a6..bb2b508 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1278,10 +1278,7 @@ static void test_lock_object_external(void) CoLockObjectExternal((IUnknown*)&Test_ClassFactory, FALSE, FALSE); - todo_wine ok_no_locks(); - if (cLocks > 0) - CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); /* test CoLockObjectExternal doesn't release the last reference to an * object with fLastUnlockReleases as TRUE and there is a weak reference

1 0

Rob Shearman : ole32: Add inproc handler object creation support for CoCreateInstance.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 24cccbf4d1df23db1969cdf32ed6708d2281b627 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24cccbf4d1df23db1969cdf32… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 23 15:07:49 2009 +0000 ole32: Add inproc handler object creation support for CoCreateInstance. --- dlls/ole32/compobj.c | 27 +++++++++++++++ dlls/ole32/compobj_private.h | 3 ++ dlls/ole32/defaulthandler.c | 74 ++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/oleproxy.c | 8 ++++- dlls/ole32/tests/marshal.c | 1 - 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 580f4d3..7dc1568 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4106,6 +4106,33 @@ HRESULT WINAPI CoGetContextToken( ULONG_PTR *token ) return S_OK; } +HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0}; + HKEY hkey; + HRESULT hres; + + hres = COM_OpenKeyForCLSID(rclsid, wszInprocHandler32, KEY_READ, &hkey); + if (SUCCEEDED(hres)) + { + WCHAR dllpath[MAX_PATH+1]; + + if (COM_RegReadPath(hkey, NULL, NULL, dllpath, ARRAYSIZE(dllpath)) == ERROR_SUCCESS) + { + static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0}; + if (!strcmpiW(dllpath, wszOle32)) + { + RegCloseKey(hkey); + return HandlerCF_Create(rclsid, riid, ppv); + } + } + else + WARN("not creating object for inproc handler path %s\n", debugstr_w(dllpath)); + RegCloseKey(hkey); + } + + return CLASS_E_CLASSNOTAVAILABLE; +} /*********************************************************************** * DllMain (OLE32.@) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index fb05934..076d845 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -313,6 +313,9 @@ extern HRESULT WINAPI OLE32_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID extern HRESULT WINAPI OLE32_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLE32_DllUnregisterServer(void) DECLSPEC_HIDDEN; +extern HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); +extern HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + /* Exported non-interface Data Advise Holder functions */ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDelegate); void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface); diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 4102d50..a3da0dd 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -2122,3 +2122,77 @@ HRESULT WINAPI OleCreateDefaultHandler(REFCLSID clsid, LPUNKNOWN pUnkOuter, return OleCreateEmbeddingHelper(clsid, pUnkOuter, EMBDHLP_INPROC_HANDLER | EMBDHLP_CREATENOW, NULL, riid, ppvObj); } + +typedef struct HandlerCF +{ + const IClassFactoryVtbl *lpVtbl; + LONG refs; + CLSID clsid; +} HandlerCF; + +static HRESULT WINAPI +HandlerCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, LPVOID *ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid,&IID_IUnknown) || + IsEqualIID(riid,&IID_IClassFactory)) + { + *ppv = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI HandlerCF_AddRef(LPCLASSFACTORY iface) +{ + HandlerCF *This = (HandlerCF *)iface; + return InterlockedIncrement(&This->refs); +} + +static ULONG WINAPI HandlerCF_Release(LPCLASSFACTORY iface) +{ + HandlerCF *This = (HandlerCF *)iface; + ULONG refs = InterlockedDecrement(&This->refs); + if (!refs) + HeapFree(GetProcessHeap(), 0, This); + return refs; +} + +static HRESULT WINAPI +HandlerCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, + REFIID riid, LPVOID *ppv) +{ + HandlerCF *This = (HandlerCF *)iface; + return OleCreateDefaultHandler(&This->clsid, pUnk, riid, ppv); +} + +static HRESULT WINAPI HandlerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) +{ + FIXME("(%d), stub!\n",fLock); + return S_OK; +} + +static const IClassFactoryVtbl HandlerClassFactoryVtbl = { + HandlerCF_QueryInterface, + HandlerCF_AddRef, + HandlerCF_Release, + HandlerCF_CreateInstance, + HandlerCF_LockServer +}; + +HRESULT HandlerCF_Create(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + HRESULT hr; + HandlerCF *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) return E_OUTOFMEMORY; + This->lpVtbl = &HandlerClassFactoryVtbl; + This->refs = 0; + This->clsid = *rclsid; + + hr = IUnknown_QueryInterface((IUnknown *)&This->lpVtbl, riid, ppv); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, This); + + return hr; +} diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 11a3ad1..184aca1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -46,6 +46,8 @@ */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) { + HRESULT hr; + *ppv = NULL; if (IsEqualIID(rclsid,&CLSID_DfMarshal)&&( IsEqualIID(iid,&IID_IClassFactory) || @@ -70,5 +72,9 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualGUID(rclsid, &CLSID_StdComponentCategoriesMgr)) return ComCatCF_Create(iid, ppv); - return OLE32_DllGetClassObject(rclsid, iid, ppv); + hr = OLE32_DllGetClassObject(rclsid, iid, ppv); + if (SUCCEEDED(hr)) + return hr; + + return Handler_DllGetClassObject(rclsid, iid, ppv); } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index bb2b508..b4a2384 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2314,7 +2314,6 @@ static void test_inproc_handler(void) reg_unreg_wine_test_class(TRUE); hr = CoCreateInstance(&CLSID_WineTest, NULL, CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void **)&pObject); - todo_wine ok_ole_success(hr, "CoCreateInstance"); if (SUCCEEDED(hr))

1 0

Jacek Caban : mshtml: Share connection points between HTMLDocumentObj and its main HTMLDocumentNode .
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 19415addecb470f652ee441d477b74130c65ef59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19415addecb470f652ee441d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 23 19:28:17 2009 +0100 mshtml: Share connection points between HTMLDocumentObj and its main HTMLDocumentNode. --- dlls/mshtml/conpoint.c | 3 +++ dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/mshtml_private.h | 3 ++- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 10d8e29..293e303 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -260,6 +260,9 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo TRACE("(%p)->(%s %p)\n", This, debugstr_cp_guid(riid), ppCP); + if(This->forward_container) + return IConnectionPointContainer_FindConnectionPoint(CONPTCONT(This), riid, ppCP); + *ppCP = NULL; for(iter = This->cp_list; iter; iter = iter->next) { diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5dfc4db..0e76a9c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1825,6 +1825,8 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob doc->ref = 1; doc->basedoc.window = window; + if(window == doc_obj->basedoc.window) + doc->basedoc.cp_container.forward_container = &doc_obj->basedoc.cp_container; nsIDOMHTMLDocument_AddRef(nsdoc); doc->nsdoc = nsdoc; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ce13b48..17e01a2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -261,11 +261,12 @@ typedef enum { EDITMODE } USERMODE; -typedef struct { +typedef struct ConnectionPointContainer { const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; ConnectionPoint *cp_list; IUnknown *outer; + struct ConnectionPointContainer *forward_container; } ConnectionPointContainer; struct ConnectionPoint {

1 0

Jacek Caban : mshtml: Added support for connection point HTML notification.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 1c5c822b07b96e85084ecc991e7c12b367b33d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c5c822b07b96e85084ecc991… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 23 19:28:43 2009 +0100 mshtml: Added support for connection point HTML notification. --- dlls/mshtml/conpoint.c | 3 +- dlls/mshtml/dispex.c | 56 ++++++++++++++++ dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmldoc.c | 9 ++- dlls/mshtml/htmlevent.c | 147 ++++++++++++++++++++++++++++++++++-------- dlls/mshtml/htmltable.c | 2 +- dlls/mshtml/htmltextcont.c | 2 +- dlls/mshtml/mshtml_private.h | 12 +++- 8 files changed, 198 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5c822b07b96e85084ec…

1 0

Jacek Caban : mshtml: Added connection point notification test.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 9718e04775c3c094276ac60f26b241769dd84334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9718e04775c3c094276ac60f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 23 19:29:04 2009 +0100 mshtml: Added connection point notification test. --- dlls/mshtml/tests/events.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 131 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 9d23775..1f4b466 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "mshtml.h" +#include "mshtmdid.h" #include "docobj.h" #include "hlink.h" #include "dispex.h" @@ -61,6 +62,7 @@ DEFINE_EXPECT(body_onclick); DEFINE_EXPECT(div_onclick); DEFINE_EXPECT(div_onclick_attached); DEFINE_EXPECT(timeout); +DEFINE_EXPECT(doccp_onclick); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -847,6 +849,74 @@ static HRESULT WINAPI nocall(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFla EVENT_HANDLER_FUNC_OBJ(nocall); +#define CONNECTION_POINT_OBJ(cpname, diid) \ + static HRESULT WINAPI cpname ## _QueryInterface(IDispatchEx *iface, REFIID riid, void **ppv) \ + { \ + *ppv = NULL; \ + if(IsEqualGUID(riid, &IID_IUnknown) \ + || IsEqualGUID(riid, &IID_IDispatch) \ + || IsEqualGUID(riid, &diid)) \ + *ppv = iface; \ + else { \ + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); \ + return E_NOINTERFACE; \ + } \ + return S_OK; \ + } \ + static IDispatchExVtbl cpname ## Vtbl = { \ + cpname ## _QueryInterface, \ + DispatchEx_AddRef, \ + DispatchEx_Release, \ + DispatchEx_GetTypeInfoCount, \ + DispatchEx_GetTypeInfo, \ + DispatchEx_GetIDsOfNames, \ + cpname, \ + DispatchEx_GetDispID, \ + DispatchEx_InvokeEx, \ + DispatchEx_DeleteMemberByName, \ + DispatchEx_DeleteMemberByDispID, \ + DispatchEx_GetMemberProperties, \ + DispatchEx_GetMemberName, \ + DispatchEx_GetNextDispID, \ + DispatchEx_GetNameSpaceParent \ + }; \ + static IDispatchEx cpname ## _obj = { &cpname ## Vtbl } + +#define test_cp_args(a,b,c,d,e,f) _test_cp_args(__LINE__,a,b,c,d,e,f) +static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr) +{ + ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); + ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); + ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); + ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); + ok_(__FILE__,line)(V_VT(vres) == VT_EMPTY, "V_VT(vres) = %d\n", V_VT(vres)); + ok_(__FILE__,line)(ei != NULL, "ei == NULL\n"); + ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); +} + +static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(doccp_onclick); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(doccp, DIID_HTMLDocumentEvents); + static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -899,9 +969,51 @@ static void pump_msgs(BOOL *b) } } +static IConnectionPoint *get_cp(IUnknown *unk, REFIID riid) +{ + IConnectionPointContainer *cp_container; + IConnectionPoint *cp; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IConnectionPointContainer, (void**)&cp_container); + ok(hres == S_OK, "Could not get IConnectionPointContainer: %08x\n", hres); + + hres = IConnectionPointContainer_FindConnectionPoint(cp_container, riid, &cp); + IConnectionPointContainer_Release(cp_container); + ok(hres == S_OK, "FindConnectionPoint failed: %08x\n", hres); + + return cp; +} + +static DWORD register_cp(IUnknown *unk, REFIID riid, IUnknown *sink) +{ + IConnectionPoint *cp; + DWORD cookie; + HRESULT hres; + + cp = get_cp(unk, riid); + hres = IConnectionPoint_Advise(cp, sink, &cookie); + IConnectionPoint_Release(cp); + ok(hres == S_OK, "Advise failed: %08x\n", hres); + + return cookie; +} + +static void unregister_cp(IUnknown *unk, REFIID riid, DWORD cookie) +{ + IConnectionPoint *cp; + HRESULT hres; + + cp = get_cp(unk, riid); + hres = IConnectionPoint_Unadvise(cp, cookie); + IConnectionPoint_Release(cp); + ok(hres == S_OK, "Unadvise failed: %08x\n", hres); +} + static void test_onclick(IHTMLDocument2 *doc) { IHTMLElement *div, *body; + DWORD cp_cookie; VARIANT v; HRESULT hres; @@ -991,6 +1103,25 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(body_onclick); CHECK_CALLED(document_onclick); + cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + + SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_attached); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + SET_EXPECT(doccp_onclick); + + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + + CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + CHECK_CALLED(doccp_onclick); + + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + IHTMLElement_Release(div); IHTMLElement_Release(body); }

1 0

Marcus Meissner : user32: Fixed NULL ptr checks (Coverity).
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 1667a2469e0c015ddb514ebb943b4329e549f5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1667a2469e0c015ddb514ebb9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 23 22:14:44 2009 +0100 user32: Fixed NULL ptr checks (Coverity). --- dlls/user32/dde_misc.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/user32/dde_misc.c b/dlls/user32/dde_misc.c index d2de954..ae1df40 100644 --- a/dlls/user32/dde_misc.c +++ b/dlls/user32/dde_misc.c @@ -1983,7 +1983,13 @@ WDML_CONV* WDML_GetConv(HCONV hConv, BOOL checkConnected) /* FIXME: should do better checking */ if (pConv == NULL || pConv->magic != WDML_CONV_MAGIC) return NULL; - if (!pConv->instance || pConv->instance->threadID != GetCurrentThreadId()) + if (!pConv->instance) + { + WARN("wrong thread ID, no instance\n"); + return NULL; + } + + if (pConv->instance->threadID != GetCurrentThreadId()) { WARN("wrong thread ID\n"); pConv->instance->lastError = DMLERR_INVALIDPARAMETER; /* FIXME: check */

1 0

Marcus Meissner : ole32: Some missing error checking in FileMonikerImpl_CommonPrefixWith (Coverity) .
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 000e1e0ce05fdbdb8c669c7da9ec9719c204f155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=000e1e0ce05fdbdb8c669c7da… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 23 22:23:36 2009 +0100 ole32: Some missing error checking in FileMonikerImpl_CommonPrefixWith (Coverity). --- dlls/ole32/filemoniker.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index c179b7f..ff543aa 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -960,20 +960,32 @@ FileMonikerImpl_CommonPrefixWith(IMoniker* iface,IMoniker* pmkOther,IMoniker** p if(mkSys==MKSYS_FILEMONIKER){ HRESULT ret; - CreateBindCtx(0,&pbind); + ret = CreateBindCtx(0,&pbind); + if (FAILED(ret)) + return ret; /* create a string based on common part of the two paths */ - IMoniker_GetDisplayName(iface,pbind,NULL,&pathThis); - IMoniker_GetDisplayName(pmkOther,pbind,NULL,&pathOther); + ret = IMoniker_GetDisplayName(iface,pbind,NULL,&pathThis); + if (FAILED(ret)) + return ret; + ret = IMoniker_GetDisplayName(pmkOther,pbind,NULL,&pathOther); + if (FAILED(ret)) + return ret; nb1=FileMonikerImpl_DecomposePath(pathThis,&stringTable1); + if (FAILED(nb1)) + return nb1; nb2=FileMonikerImpl_DecomposePath(pathOther,&stringTable2); + if (FAILED(nb2)) + return nb2; if (nb1==0 || nb2==0) return MK_E_NOPREFIX; commonPath=HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*(min(lstrlenW(pathThis),lstrlenW(pathOther))+1)); + if (!commonPath) + return E_OUTOFMEMORY; *commonPath=0;

1 0

Alexandre Julliard : server: Move the functions to extend file to mapping. c since it's the only user.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 78d211b3bd61468aa53e3e0b2330b27211c76b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d211b3bd61468aa53e3e0b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 15:58:25 2009 +0100 server: Move the functions to extend file to mapping.c since it's the only user. --- server/file.c | 42 ------------------------------------------ server/file.h | 1 - server/mapping.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/server/file.c b/server/file.c index a74de14..01fefdb 100644 --- a/server/file.c +++ b/server/file.c @@ -641,48 +641,6 @@ struct file *grab_file_unless_removable( struct file *file ) return (struct file *)grab_object( file ); } -/* extend a file beyond the current end of file */ -static int extend_file( struct file *file, file_pos_t new_size ) -{ - static const char zero; - int unix_fd = get_file_unix_fd( file ); - off_t size = new_size; - - if (unix_fd == -1) return 0; - - if (sizeof(new_size) > sizeof(size) && size != new_size) - { - set_error( STATUS_INVALID_PARAMETER ); - return 0; - } - /* extend the file one byte beyond the requested size and then truncate it */ - /* this should work around ftruncate implementations that can't extend files */ - if (pwrite( unix_fd, &zero, 1, size ) != -1) - { - ftruncate( unix_fd, size ); - return 1; - } - file_set_error(); - return 0; -} - -/* try to grow the file to the specified size */ -int grow_file( struct file *file, file_pos_t size ) -{ - struct stat st; - int unix_fd = get_file_unix_fd( file ); - - if (unix_fd == -1) return 0; - - if (fstat( unix_fd, &st ) == -1) - { - file_set_error(); - return 0; - } - if (st.st_size >= size) return 1; /* already large enough */ - return extend_file( file, size ); -} - /* create a file */ DECL_HANDLER(create_file) { diff --git a/server/file.h b/server/file.h index f59ec9e..21b3879 100644 --- a/server/file.h +++ b/server/file.h @@ -110,7 +110,6 @@ extern struct file *get_file_obj( struct process *process, obj_handle_t handle, extern int get_file_unix_fd( struct file *file ); extern int is_same_file( struct file *file1, struct file *file2 ); extern struct file *grab_file_unless_removable( struct file *file ); -extern int grow_file( struct file *file, file_pos_t size ); extern struct file *create_temp_file( int access ); extern void file_set_error(void); extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); diff --git a/server/mapping.c b/server/mapping.c index a303111..39c7f50 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -126,6 +126,48 @@ static void init_page_size(void) #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) +/* extend a file beyond the current end of file */ +static int extend_file( struct file *file, file_pos_t new_size ) +{ + static const char zero; + int unix_fd = get_file_unix_fd( file ); + off_t size = new_size; + + if (unix_fd == -1) return 0; + + if (sizeof(new_size) > sizeof(size) && size != new_size) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + /* extend the file one byte beyond the requested size and then truncate it */ + /* this should work around ftruncate implementations that can't extend files */ + if (pwrite( unix_fd, &zero, 1, size ) != -1) + { + ftruncate( unix_fd, size ); + return 1; + } + file_set_error(); + return 0; +} + +/* try to grow the file to the specified size */ +static int grow_file( struct file *file, file_pos_t size ) +{ + struct stat st; + int unix_fd = get_file_unix_fd( file ); + + if (unix_fd == -1) return 0; + + if (fstat( unix_fd, &st ) == -1) + { + file_set_error(); + return 0; + } + if (st.st_size >= size) return 1; /* already large enough */ + return extend_file( file, size ); +} + /* find the shared PE mapping for a given mapping */ static struct file *get_shared_file( struct mapping *mapping ) {

1 0

Alexandre Julliard : server: Also store a file descriptor object for mappings.
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: d57692d86b77af2d41a9b1cc027f883396a7dfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57692d86b77af2d41a9b1cc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 15:59:37 2009 +0100 server: Also store a file descriptor object for mappings. --- server/mapping.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 39c7f50..2c4bc43 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -56,6 +56,7 @@ struct mapping struct object obj; /* object header */ mem_size_t size; /* mapping size */ int protect; /* protection flags */ + struct fd *fd; /* fd for mapped file */ struct file *file; /* file mapped */ int header_size; /* size of headers (for PE image mapping) */ client_ptr_t base; /* default base addr (for PE image mapping) */ @@ -446,6 +447,7 @@ static struct object *create_mapping( struct directory *root, const struct unico SACL_SECURITY_INFORMATION ); mapping->header_size = 0; mapping->base = 0; + mapping->fd = NULL; mapping->file = NULL; mapping->shared_file = NULL; mapping->committed = NULL; @@ -461,6 +463,7 @@ static struct object *create_mapping( struct directory *root, const struct unico goto error; } if (!(mapping->file = get_file_obj( current->process, handle, access ))) goto error; + mapping->fd = get_obj_fd( (struct object *)mapping->file ); if (protect & VPROT_IMAGE) { if (!get_image_params( mapping )) goto error; @@ -494,6 +497,7 @@ static struct object *create_mapping( struct directory *root, const struct unico mapping->committed->max = 8; } if (!(mapping->file = create_temp_file( access ))) goto error; + mapping->fd = get_obj_fd( (struct object *)mapping->file ); if (!grow_file( mapping->file, size )) goto error; } mapping->size = (size + page_mask) & ~((mem_size_t)page_mask); @@ -509,10 +513,10 @@ static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); - fprintf( stderr, "Mapping size=%08x%08x prot=%08x file=%p header_size=%08x base=%08lx " + fprintf( stderr, "Mapping size=%08x%08x prot=%08x fd=%p header_size=%08x base=%08lx " "shared_file=%p ", (unsigned int)(mapping->size >> 32), (unsigned int)mapping->size, - mapping->protect, mapping->file, mapping->header_size, + mapping->protect, mapping->fd, mapping->header_size, (unsigned long)mapping->base, mapping->shared_file ); dump_object_name( &mapping->obj ); fputc( '\n', stderr ); @@ -528,7 +532,7 @@ static struct object_type *mapping_get_type( struct object *obj ) static struct fd *mapping_get_fd( struct object *obj ) { struct mapping *mapping = (struct mapping *)obj; - return get_obj_fd( (struct object *)mapping->file ); + return (struct fd *)grab_object( mapping->fd ); } static unsigned int mapping_map_access( struct object *obj, unsigned int access ) @@ -545,6 +549,7 @@ static void mapping_destroy( struct object *obj ) struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); if (mapping->file) release_object( mapping->file ); + if (mapping->fd) release_object( mapping->fd ); if (mapping->shared_file) { release_object( mapping->shared_file );

1 0

Alexandre Julliard : server: Use the file descriptor instead of the file object where possible in memory mappings .
by Alexandre Julliard 24 Nov '09

24 Nov '09

Module: wine Branch: master Commit: 0f4068ac6fa29276e637aa9a169a475eb8cfe835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f4068ac6fa29276e637aa9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 16:03:37 2009 +0100 server: Use the file descriptor instead of the file object where possible in memory mappings. --- server/mapping.c | 67 ++++++++++++++--------------------------------------- 1 files changed, 18 insertions(+), 49 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 2c4bc43..67760c9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -128,14 +128,11 @@ static void init_page_size(void) /* extend a file beyond the current end of file */ -static int extend_file( struct file *file, file_pos_t new_size ) +static int grow_file( int unix_fd, file_pos_t new_size ) { static const char zero; - int unix_fd = get_file_unix_fd( file ); off_t size = new_size; - if (unix_fd == -1) return 0; - if (sizeof(new_size) > sizeof(size) && size != new_size) { set_error( STATUS_INVALID_PARAMETER ); @@ -152,30 +149,13 @@ static int extend_file( struct file *file, file_pos_t new_size ) return 0; } -/* try to grow the file to the specified size */ -static int grow_file( struct file *file, file_pos_t size ) -{ - struct stat st; - int unix_fd = get_file_unix_fd( file ); - - if (unix_fd == -1) return 0; - - if (fstat( unix_fd, &st ) == -1) - { - file_set_error(); - return 0; - } - if (st.st_size >= size) return 1; /* already large enough */ - return extend_file( file, size ); -} - /* find the shared PE mapping for a given mapping */ static struct file *get_shared_file( struct mapping *mapping ) { struct mapping *ptr; LIST_FOR_EACH_ENTRY( ptr, &shared_list, struct mapping, shared_entry ) - if (is_same_file( ptr->file, mapping->file )) + if (is_same_file_fd( ptr->fd, mapping->fd )) return (struct file *)grab_object( ptr->shared_file ); return NULL; } @@ -301,8 +281,8 @@ static int build_shared_mapping( struct mapping *mapping, int fd, /* create a temp file for the mapping */ if (!(mapping->shared_file = create_temp_file( FILE_GENERIC_READ|FILE_GENERIC_WRITE ))) return 0; - if (!grow_file( mapping->shared_file, total_size )) goto error; if ((shared_fd = get_file_unix_fd( mapping->shared_file )) == -1) goto error; + if (!grow_file( shared_fd, total_size )) goto error; if (!(buffer = malloc( max_size ))) goto error; @@ -343,7 +323,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } /* retrieve the mapping parameters for an executable (PE) image */ -static int get_image_params( struct mapping *mapping ) +static int get_image_params( struct mapping *mapping, int unix_fd ) { IMAGE_DOS_HEADER dos; IMAGE_SECTION_HEADER *sec = NULL; @@ -357,14 +337,11 @@ static int get_image_params( struct mapping *mapping ) IMAGE_OPTIONAL_HEADER64 hdr64; } opt; } nt; - struct fd *fd; off_t pos; - int unix_fd, size; + int size; /* load the headers */ - if (!(fd = mapping_get_fd( &mapping->obj ))) return 0; - if ((unix_fd = get_unix_fd( fd )) == -1) goto error; if (pread( unix_fd, &dos, sizeof(dos), 0 ) != sizeof(dos)) goto error; if (dos.e_magic != IMAGE_DOS_SIGNATURE) goto error; pos = dos.e_lfanew; @@ -406,33 +383,22 @@ static int get_image_params( struct mapping *mapping ) mapping->protect = VPROT_IMAGE; free( sec ); - release_object( fd ); return 1; error: free( sec ); - release_object( fd ); set_error( STATUS_INVALID_FILE_FOR_SECTION ); return 0; } -/* get the size of the unix file associated with the mapping */ -static inline int get_file_size( struct file *file, mem_size_t *size ) -{ - struct stat st; - int unix_fd = get_file_unix_fd( file ); - - if (unix_fd == -1 || fstat( unix_fd, &st ) == -1) return 0; - *size = st.st_size; - return 1; -} - static struct object *create_mapping( struct directory *root, const struct unicode_str *name, unsigned int attr, mem_size_t size, int protect, obj_handle_t handle, const struct security_descriptor *sd ) { struct mapping *mapping; int access = 0; + int unix_fd; + struct stat st; if (!page_mask) init_page_size(); @@ -464,24 +430,26 @@ static struct object *create_mapping( struct directory *root, const struct unico } if (!(mapping->file = get_file_obj( current->process, handle, access ))) goto error; mapping->fd = get_obj_fd( (struct object *)mapping->file ); + if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; if (protect & VPROT_IMAGE) { - if (!get_image_params( mapping )) goto error; + if (!get_image_params( mapping, unix_fd )) goto error; return &mapping->obj; } + if (fstat( unix_fd, &st ) == -1) + { + file_set_error(); + goto error; + } if (!size) { - if (!get_file_size( mapping->file, &size )) goto error; - if (!size) + if (!(size = st.st_size)) { set_error( STATUS_MAPPED_FILE_SIZE_ZERO ); goto error; } } - else - { - if (!grow_file( mapping->file, size )) goto error; - } + else if (st.st_size < size && !grow_file( unix_fd, size )) goto error; } else /* Anonymous mapping (no associated file) */ { @@ -498,7 +466,8 @@ static struct object *create_mapping( struct directory *root, const struct unico } if (!(mapping->file = create_temp_file( access ))) goto error; mapping->fd = get_obj_fd( (struct object *)mapping->file ); - if (!grow_file( mapping->file, size )) goto error; + if ((unix_fd = get_unix_fd( mapping->fd )) == -1) goto error; + if (!grow_file( unix_fd, size )) goto error; } mapping->size = (size + page_mask) & ~((mem_size_t)page_mask); mapping->protect = protect;

1 0