wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Paul Vriens : snmpapi/tests: Run tests again on win98 and NT4.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 5aeb63eb4510b3f9734d26aa896848d5b9a5a888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aeb63eb4510b3f9734d26aa8… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 8 17:58:29 2007 +0200 snmpapi/tests: Run tests again on win98 and NT4. --- dlls/snmpapi/tests/util.c | 102 +++++++++++++++++++++++++++++++-------------- 1 files changed, 71 insertions(+), 31 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index 160ec19..d3504ff 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -23,6 +23,26 @@ #include <windef.h> #include <snmp.h> +static HMODULE hSnmpapi = 0; +static INT (WINAPI *pSnmpUtilAsnAnyCpy)(AsnAny*, AsnAny*); +static VOID (WINAPI *pSnmpUtilAsnAnyFree)(AsnAny*); +static INT (WINAPI *pSnmpUtilOctetsCmp)(AsnOctetString*, AsnOctetString*); +static INT (WINAPI *pSnmpUtilOctetsCpy)(AsnOctetString*, AsnOctetString*); +static VOID (WINAPI *pSnmpUtilOctetsFree)(AsnOctetString*); +static INT (WINAPI *pSnmpUtilOctetsNCmp)(AsnOctetString*, AsnOctetString*, UINT); + +static void InitFunctionPtrs(void) +{ + hSnmpapi = GetModuleHandle("snmpapi.dll"); + + pSnmpUtilAsnAnyCpy = (void*)GetProcAddress(hSnmpapi, "SnmpUtilAsnAnyCpy"); + pSnmpUtilAsnAnyFree = (void*)GetProcAddress(hSnmpapi, "SnmpUtilAsnAnyFree"); + pSnmpUtilOctetsCmp = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsCmp"); + pSnmpUtilOctetsCpy = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsCpy"); + pSnmpUtilOctetsFree = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsFree"); + pSnmpUtilOctetsNCmp = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsNCmp"); +} + static void test_SnmpUtilOidToA(void) { LPSTR ret; @@ -108,24 +128,24 @@ static void test_SnmpUtilAsnAnyCpyFree(void) static AsnAny dst, src = { ASN_INTEGER, { 1 } }; if (0) { /* these crash on XP */ - ret = SnmpUtilAsnAnyCpy(NULL, NULL); + ret = pSnmpUtilAsnAnyCpy(NULL, NULL); ok(!ret, "SnmpUtilAsnAnyCpy succeeded\n"); - ret = SnmpUtilAsnAnyCpy(&dst, NULL); + ret = pSnmpUtilAsnAnyCpy(&dst, NULL); ok(!ret, "SnmpUtilAsnAnyCpy succeeded\n"); - ret = SnmpUtilAsnAnyCpy(NULL, &src); + ret = pSnmpUtilAsnAnyCpy(NULL, &src); ok(!ret, "SnmpUtilAsnAnyCpy succeeded\n"); } - ret = SnmpUtilAsnAnyCpy(&dst, &src); + ret = pSnmpUtilAsnAnyCpy(&dst, &src); ok(ret, "SnmpUtilAsnAnyCpy failed\n"); ok(!memcmp(&src, &dst, sizeof(AsnAny)), "SnmpUtilAsnAnyCpy failed\n"); if (0) { /* crashes on XP */ - SnmpUtilAsnAnyFree(NULL); + pSnmpUtilAsnAnyFree(NULL); } - SnmpUtilAsnAnyFree(&dst); + pSnmpUtilAsnAnyFree(&dst); ok(dst.asnType == ASN_NULL, "SnmpUtilAsnAnyFree failed\n"); ok(dst.asnValue.number == 1, "SnmpUtilAsnAnyFree failed\n"); } @@ -136,28 +156,28 @@ static void test_SnmpUtilOctetsCpyFree(void) static BYTE stream[] = { '1', '2', '3', '4' }; static AsnOctetString dst, src = { stream, 4, TRUE }; - ret = SnmpUtilOctetsCpy(NULL, NULL); + ret = pSnmpUtilOctetsCpy(NULL, NULL); ok(!ret, "SnmpUtilOctetsCpy succeeded\n"); memset(&dst, 1, sizeof(AsnOctetString)); - ret = SnmpUtilOctetsCpy(&dst, NULL); + ret = pSnmpUtilOctetsCpy(&dst, NULL); ok(ret, "SnmpUtilOctetsCpy failed\n"); ok(dst.length == 0, "SnmpUtilOctetsCpy failed\n"); ok(dst.stream == NULL, "SnmpUtilOctetsCpy failed\n"); ok(dst.dynamic == FALSE, "SnmpUtilOctetsCpy failed\n"); - ret = SnmpUtilOctetsCpy(NULL, &src); + ret = pSnmpUtilOctetsCpy(NULL, &src); ok(!ret, "SnmpUtilOctetsCpy succeeded\n"); memset(&dst, 0, sizeof(AsnOctetString)); - ret = SnmpUtilOctetsCpy(&dst, &src); + ret = pSnmpUtilOctetsCpy(&dst, &src); ok(ret, "SnmpUtilOctetsCpy failed\n"); ok(src.length == dst.length, "SnmpUtilOctetsCpy failed\n"); ok(!memcmp(src.stream, dst.stream, dst.length), "SnmpUtilOctetsCpy failed\n"); ok(dst.dynamic == TRUE, "SnmpUtilOctetsCpy failed\n"); - SnmpUtilOctetsFree(NULL); - SnmpUtilOctetsFree(&dst); + pSnmpUtilOctetsFree(NULL); + pSnmpUtilOctetsFree(&dst); ok(dst.stream == NULL, "SnmpUtilOctetsFree failed\n"); ok(dst.length == 0, "SnmpUtilOctetsFree failed\n"); ok(dst.dynamic == FALSE, "SnmpUtilOctetsFree failed\n"); @@ -201,34 +221,34 @@ static void test_SnmpUtilOctetsNCmp(void) static AsnOctetString octets1 = { stream1, 4, FALSE }; static AsnOctetString octets2 = { stream2, 4, FALSE }; - ret = SnmpUtilOctetsNCmp(NULL, NULL, 0); + ret = pSnmpUtilOctetsNCmp(NULL, NULL, 0); ok(!ret, "SnmpUtilOctetsNCmp succeeded\n"); - ret = SnmpUtilOctetsNCmp(NULL, NULL, 1); + ret = pSnmpUtilOctetsNCmp(NULL, NULL, 1); ok(!ret, "SnmpUtilOctetsNCmp succeeded\n"); - ret = SnmpUtilOctetsNCmp(&octets1, NULL, 0); + ret = pSnmpUtilOctetsNCmp(&octets1, NULL, 0); ok(!ret, "SnmpUtilOctetsNCmp succeeded\n"); - ret = SnmpUtilOctetsNCmp(&octets1, NULL, 1); + ret = pSnmpUtilOctetsNCmp(&octets1, NULL, 1); ok(!ret, "SnmpUtilOctetsNCmp succeeded\n"); - ret = SnmpUtilOctetsNCmp(NULL, &octets2, 0); + ret = pSnmpUtilOctetsNCmp(NULL, &octets2, 0); ok(!ret, "SnmpUtilOctetsNCmp succeeded\n"); - ret = SnmpUtilOctetsNCmp(NULL, &octets2, 1); + ret = pSnmpUtilOctetsNCmp(NULL, &octets2, 1); ok(!ret, "SnmpUtilOctetsNCmp succeeded\n"); - ret = SnmpUtilOctetsNCmp(&octets1, &octets1, 0); + ret = pSnmpUtilOctetsNCmp(&octets1, &octets1, 0); ok(!ret, "SnmpUtilOctetsNCmp failed\n"); - ret = SnmpUtilOctetsNCmp(&octets1, &octets1, 4); + ret = pSnmpUtilOctetsNCmp(&octets1, &octets1, 4); ok(!ret, "SnmpUtilOctetsNCmp failed\n"); - ret = SnmpUtilOctetsNCmp(&octets1, &octets2, 4); + ret = pSnmpUtilOctetsNCmp(&octets1, &octets2, 4); ok(ret == -4, "SnmpUtilOctetsNCmp failed\n"); - ret = SnmpUtilOctetsNCmp(&octets2, &octets1, 4); + ret = pSnmpUtilOctetsNCmp(&octets2, &octets1, 4); ok(ret == 4, "SnmpUtilOctetsNCmp failed\n"); } @@ -241,20 +261,20 @@ static void test_SnmpUtilOctetsCmp(void) static AsnOctetString octets2 = { stream2, 4, FALSE }; if (0) { /* these crash on XP */ - ret = SnmpUtilOctetsCmp(NULL, NULL); + ret = pSnmpUtilOctetsCmp(NULL, NULL); ok(!ret, "SnmpUtilOctetsCmp succeeded\n"); - ret = SnmpUtilOctetsCmp(&octets1, NULL); + ret = pSnmpUtilOctetsCmp(&octets1, NULL); ok(!ret, "SnmpUtilOctetsCmp succeeded\n"); - ret = SnmpUtilOctetsCmp(NULL, &octets2); + ret = pSnmpUtilOctetsCmp(NULL, &octets2); ok(!ret, "SnmpUtilOctetsCmp succeeded\n"); } - ret = SnmpUtilOctetsCmp(&octets2, &octets1); + ret = pSnmpUtilOctetsCmp(&octets2, &octets1); ok(ret == 1, "SnmpUtilOctetsCmp failed\n"); - ret = SnmpUtilOctetsCmp(&octets1, &octets2); + ret = pSnmpUtilOctetsCmp(&octets1, &octets2); ok(ret == -1, "SnmpUtilOctetsCmp failed\n"); } @@ -426,12 +446,32 @@ static void test_SnmpUtilVarBindListCpyFree(void) START_TEST(util) { + InitFunctionPtrs(); + test_SnmpUtilOidToA(); - test_SnmpUtilAsnAnyCpyFree(); - test_SnmpUtilOctetsCpyFree(); + + if (!pSnmpUtilAsnAnyCpy || !pSnmpUtilAsnAnyFree) + skip("SnmpUtilAsnAnyCpy and/or SnmpUtilAsnAnyFree not available\n"); + else + test_SnmpUtilAsnAnyCpyFree(); + + if (!pSnmpUtilOctetsCpy || !pSnmpUtilOctetsFree) + skip("SnmpUtilOctetsCpy and/or SnmpUtilOctetsFree not available\n"); + else + test_SnmpUtilOctetsCpyFree(); + test_SnmpUtilOidCpyFree(); - test_SnmpUtilOctetsNCmp(); - test_SnmpUtilOctetsCmp(); + + if (!pSnmpUtilOctetsNCmp) + skip("SnmpUtilOctetsNCmp not available\n"); + else + test_SnmpUtilOctetsNCmp(); + + if (!pSnmpUtilOctetsCmp) + skip("SnmpUtilOctetsCmp not available\n"); + else + test_SnmpUtilOctetsCmp(); + test_SnmpUtilOidCmp(); test_SnmpUtilOidNCmp(); test_SnmpUtilOidAppend();

1 0

Huw Davies : ole32: The default handler needs to have its own implementation of IPersistStorage .
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 54f2f60b5489c31188eae8d25871ed19ffe96b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f2f60b5489c31188eae8d25… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 8 12:36:37 2007 +0100 ole32: The default handler needs to have its own implementation of IPersistStorage. For now we forward the methods to the data cache as before. --- dlls/ole32/defaulthandler.c | 177 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 170 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 4513727..ba70e0f 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -75,6 +75,7 @@ struct DefaultHandler const IDataObjectVtbl* lpvtblIDataObject; const IRunnableObjectVtbl* lpvtblIRunnableObject; const IAdviseSinkVtbl *lpvtblIAdviseSink; + const IPersistStorageVtbl *lpvtblIPersistStorage; /* Reference count of this object */ LONG ref; @@ -87,6 +88,8 @@ struct DefaultHandler /* IUnknown implementation of the datacache. */ IUnknown* dataCache; + /* IPersistStorage implementation of the datacache. */ + IPersistStorage* dataCache_PersistStg; /* Client site for the embedded object. */ IOleClientSite* clientSite; @@ -151,6 +154,11 @@ static inline DefaultHandler *impl_from_IAdviseSink( IAdviseSink *iface ) return (DefaultHandler *)((char*)iface - FIELD_OFFSET(DefaultHandler, lpvtblIAdviseSink)); } +static inline DefaultHandler *impl_from_IPersistStorage( IPersistStorage *iface ) +{ + return (DefaultHandler *)((char*)iface - FIELD_OFFSET(DefaultHandler, lpvtblIPersistStorage)); +} + static void DefaultHandler_Destroy(DefaultHandler* This); static inline BOOL object_is_running(DefaultHandler *This) @@ -193,8 +201,9 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( else if (IsEqualIID(&IID_IRunnableObject, riid)) *ppvObject = (IRunnableObject*)&This->lpvtblIRunnableObject; else if (IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStorage, riid) || - IsEqualIID(&IID_IViewObject, riid) || + IsEqualIID(&IID_IPersistStorage, riid)) + *ppvObject = &This->lpvtblIPersistStorage; + else if (IsEqualIID(&IID_IViewObject, riid) || IsEqualIID(&IID_IViewObject2, riid) || IsEqualIID(&IID_IOleCache, riid) || IsEqualIID(&IID_IOleCache2, riid)) @@ -1451,6 +1460,140 @@ static void WINAPI DefaultHandler_IAdviseSink_OnClose( DefaultHandler_Stop(This); } + +/************************************************************************ + * DefaultHandler_IPersistStorage_QueryInterface + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_QueryInterface( + IPersistStorage* iface, + REFIID riid, + void** ppvObject) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IUnknown_QueryInterface(This->outerUnknown, riid, ppvObject); +} + +/************************************************************************ + * DefaultHandler_IPersistStorage_AddRef + * + */ +static ULONG WINAPI DefaultHandler_IPersistStorage_AddRef( + IPersistStorage* iface) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IUnknown_AddRef(This->outerUnknown); +} + +/************************************************************************ + * DefaultHandler_IPersistStorage_Release + * + */ +static ULONG WINAPI DefaultHandler_IPersistStorage_Release( + IPersistStorage* iface) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IUnknown_Release(This->outerUnknown); +} + +/************************************************************************ + * DefaultHandler_IPersistStorage_GetClassID + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_GetClassID( + IPersistStorage* iface, + CLSID* clsid) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_GetClassID(This->dataCache_PersistStg, clsid); +} + +/************************************************************************ + * DefaultHandler_IPersistStorage_IsDirty + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_IsDirty( + IPersistStorage* iface) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_IsDirty(This->dataCache_PersistStg); +} + +/************************************************************************ + * DefaultHandler_IPersistStorage_InitNew + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_InitNew( + IPersistStorage* iface, + IStorage* pStg) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_InitNew(This->dataCache_PersistStg, pStg); +} + + +/************************************************************************ + * DefaultHandler_IPersistStorage_Load + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( + IPersistStorage* iface, + IStorage* pStg) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_Load(This->dataCache_PersistStg, pStg); +} + + +/************************************************************************ + * DefaultHandler_IPersistStorage_Save + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_Save( + IPersistStorage* iface, + IStorage* pStgSave, + BOOL fSaveAsLoad) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_Save(This->dataCache_PersistStg, pStgSave, fSaveAsLoad); +} + + +/************************************************************************ + * DefaultHandler_IPersistStorage_SaveCompleted + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_SaveCompleted( + IPersistStorage* iface, + IStorage* pStgNew) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_SaveCompleted(This->dataCache_PersistStg, pStgNew); +} + + +/************************************************************************ + * DefaultHandler_IPersistStorage_HandsOffStorage + * + */ +static HRESULT WINAPI DefaultHandler_IPersistStorage_HandsOffStorage( + IPersistStorage* iface) +{ + DefaultHandler *This = impl_from_IPersistStorage(iface); + + return IPersistStorage_HandsOffStorage(This->dataCache_PersistStg); +} + + /* * Virtual function tables for the DefaultHandler class. */ @@ -1529,6 +1672,20 @@ static const IAdviseSinkVtbl DefaultHandler_IAdviseSink_VTable = DefaultHandler_IAdviseSink_OnClose }; +static const IPersistStorageVtbl DefaultHander_IPersistStorage_VTable = +{ + DefaultHandler_IPersistStorage_QueryInterface, + DefaultHandler_IPersistStorage_AddRef, + DefaultHandler_IPersistStorage_Release, + DefaultHandler_IPersistStorage_GetClassID, + DefaultHandler_IPersistStorage_IsDirty, + DefaultHandler_IPersistStorage_InitNew, + DefaultHandler_IPersistStorage_Load, + DefaultHandler_IPersistStorage_Save, + DefaultHandler_IPersistStorage_SaveCompleted, + DefaultHandler_IPersistStorage_HandsOffStorage +}; + /********************************************************* * Methods implementation for the DefaultHandler class. */ @@ -1537,6 +1694,7 @@ static DefaultHandler* DefaultHandler_Construct( LPUNKNOWN pUnkOuter) { DefaultHandler* This = NULL; + HRESULT hr; /* * Allocate space for the object. @@ -1574,11 +1732,14 @@ static DefaultHandler* DefaultHandler_Construct( * We aggregate with the datacache. Make sure we pass our outer * unknown as the datacache's outer unknown. */ - CreateDataCache(This->outerUnknown, - clsid, - &IID_IUnknown, - (void**)&This->dataCache); - + hr = CreateDataCache(This->outerUnknown, + clsid, + &IID_IUnknown, + (void**)&This->dataCache); + if(SUCCEEDED(hr)) + hr = IUnknown_QueryInterface(This->dataCache, &IID_IPersistStorage, (void**)&This->dataCache_PersistStg); + if(FAILED(hr)) + ERR("Unexpected error creating data cache\n"); /* * Initialize the other data members of the class. */ @@ -1612,7 +1773,9 @@ static void DefaultHandler_Destroy( /* Release our reference to the data cache. */ if (This->dataCache) { + IPersistStorage_Release(This->dataCache_PersistStg); IUnknown_Release(This->dataCache); + This->dataCache_PersistStg = NULL; This->dataCache = NULL; }

1 0

Huw Davies : ole32: Factor out the running object test into a separate function.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: e97c5be2ed592a7afd612bd7d924d80c8615bd0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97c5be2ed592a7afd612bd7d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 8 12:13:46 2007 +0100 ole32: Factor out the running object test into a separate function. --- dlls/ole32/defaulthandler.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 6170083..4513727 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -153,6 +153,10 @@ static inline DefaultHandler *impl_from_IAdviseSink( IAdviseSink *iface ) static void DefaultHandler_Destroy(DefaultHandler* This); +static inline BOOL object_is_running(DefaultHandler *This) +{ + return IRunnableObject_IsRunning((IRunnableObject*)&This->lpvtblIRunnableObject); +} /********************************************************* * Method implementation for the non delegating IUnknown @@ -316,7 +320,7 @@ static HRESULT WINAPI DefaultHandler_SetClientSite( TRACE("(%p, %p)\n", iface, pClientSite); - if (This->pOleDelegate) + if (object_is_running(This)) hr = IOleObject_SetClientSite(This->pOleDelegate, pClientSite); /* @@ -380,7 +384,7 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( debugstr_w(szContainerApp), debugstr_w(szContainerObj)); - if (This->pOleDelegate) + if (object_is_running(This)) IOleObject_SetHostNames(This->pOleDelegate, szContainerApp, szContainerObj); /* Be sure to cleanup before re-assinging the strings. */ @@ -409,7 +413,7 @@ static HRESULT WINAPI DefaultHandler_SetHostNames( /* undos the work done by DefaultHandler_Run */ static void WINAPI DefaultHandler_Stop(DefaultHandler *This) { - if (!This->pOleDelegate) + if (!object_is_running(This)) return; IOleObject_Unadvise(This->pOleDelegate, This->dwAdvConn); @@ -449,7 +453,7 @@ static HRESULT WINAPI DefaultHandler_Close( TRACE("(%d)\n", dwSaveOption); - if (!This->pOleDelegate) + if (!object_is_running(This)) return S_OK; hr = IOleObject_Close(This->pOleDelegate, dwSaveOption); @@ -478,7 +482,7 @@ static HRESULT WINAPI DefaultHandler_SetMoniker( dwWhichMoniker, pmk); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_SetMoniker(This->pOleDelegate, dwWhichMoniker, pmk); return S_OK; @@ -502,7 +506,7 @@ static HRESULT WINAPI DefaultHandler_GetMoniker( TRACE("(%p, %d, %d, %p)\n", iface, dwAssign, dwWhichMoniker, ppmk); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_GetMoniker(This->pOleDelegate, dwAssign, dwWhichMoniker, ppmk); @@ -537,7 +541,7 @@ static HRESULT WINAPI DefaultHandler_InitFromData( TRACE("(%p, %p, %d, %d)\n", iface, pDataObject, fCreation, dwReserved); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_InitFromData(This->pOleDelegate, pDataObject, fCreation, dwReserved); return OLE_E_NOTRUNNING; @@ -560,7 +564,7 @@ static HRESULT WINAPI DefaultHandler_GetClipboardData( TRACE("(%p, %d, %p)\n", iface, dwReserved, ppDataObject); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_GetClipboardData(This->pOleDelegate, dwReserved, ppDataObject); @@ -606,7 +610,7 @@ static HRESULT WINAPI DefaultHandler_EnumVerbs( TRACE("(%p, %p)\n", iface, ppEnumOleVerb); - if (This->pOleDelegate) + if (object_is_running(This)) hr = IOleObject_EnumVerbs(This->pOleDelegate, ppEnumOleVerb); if (hr == OLE_S_USEREG) @@ -652,7 +656,7 @@ static HRESULT WINAPI DefaultHandler_GetUserClassID( TRACE("(%p, %p)\n", iface, pClsid); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_GetUserClassID(This->pOleDelegate, pClsid); /* Sanity check. */ @@ -701,7 +705,7 @@ static HRESULT WINAPI DefaultHandler_SetExtent( TRACE("(%p, %x, (%d x %d))\n", iface, dwDrawAspect, psizel->cx, psizel->cy); - if (This->pOleDelegate) + if (object_is_running(This)) IOleObject_SetExtent(This->pOleDelegate, dwDrawAspect, psizel); return OLE_E_NOTRUNNING; @@ -728,7 +732,7 @@ static HRESULT WINAPI DefaultHandler_GetExtent( TRACE("(%p, %x, %p)\n", iface, dwDrawAspect, psizel); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_GetExtent(This->pOleDelegate, dwDrawAspect, psizel); hres = IUnknown_QueryInterface(This->dataCache, &IID_IViewObject2, (void**)&cacheView); @@ -862,7 +866,7 @@ static HRESULT WINAPI DefaultHandler_GetMiscStatus( TRACE("(%p, %x, %p)\n", iface, dwAspect, pdwStatus); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_GetMiscStatus(This->pOleDelegate, dwAspect, pdwStatus); hres = OleRegGetMiscStatus(&This->clsid, dwAspect, pdwStatus); @@ -888,7 +892,7 @@ static HRESULT WINAPI DefaultHandler_SetColorScheme( TRACE("(%p, %p))\n", iface, pLogpal); - if (This->pOleDelegate) + if (object_is_running(This)) return IOleObject_SetColorScheme(This->pOleDelegate, pLogpal); return OLE_E_NOTRUNNING; @@ -1272,7 +1276,7 @@ static HRESULT WINAPI DefaultHandler_Run( FIXME("(%p): semi-stub\n", pbc); /* already running? if so nothing to do */ - if (This->pOleDelegate) + if (object_is_running(This)) return S_OK; hr = CoCreateInstance(&This->clsid, NULL, CLSCTX_LOCAL_SERVER,

1 0

Huw Davies : ole32: Fix a few comments.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 0c8ce0d68b5be34df4b03274c6b65bab48a61209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c8ce0d68b5be34df4b03274c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 2 18:16:14 2007 +0100 ole32: Fix a few comments. --- dlls/ole32/defaulthandler.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 9486813..6170083 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -164,7 +164,7 @@ static void DefaultHandler_Destroy(DefaultHandler* This); * * See Windows documentation for more details on IUnknown methods. * - * This version of QueryInterface will not delegate it's implementation + * This version of QueryInterface will not delegate its implementation * to the outer unknown. */ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( @@ -221,7 +221,7 @@ static HRESULT WINAPI DefaultHandler_NDIUnknown_QueryInterface( * * See Windows documentation for more details on IUnknown methods. * - * This version of QueryInterface will not delegate it's implementation + * This version of QueryInterface will not delegate its implementation * to the outer unknown. */ static ULONG WINAPI DefaultHandler_NDIUnknown_AddRef( @@ -236,7 +236,7 @@ static ULONG WINAPI DefaultHandler_NDIUnknown_AddRef( * * See Windows documentation for more details on IUnknown methods. * - * This version of QueryInterface will not delegate it's implementation + * This version of QueryInterface will not delegate its implementation * to the outer unknown. */ static ULONG WINAPI DefaultHandler_NDIUnknown_Release( @@ -740,7 +740,7 @@ static HRESULT WINAPI DefaultHandler_GetExtent( * * Here we would build a valid DVTARGETDEVICE structure * but, since we are calling into the data cache, we - * know it's implementation and we'll skip this + * know its implementation and we'll skip this * extra work until later. */ targetDevice = NULL; @@ -1224,7 +1224,7 @@ static HRESULT WINAPI DefaultHandler_IRunnableObject_QueryInterface( } /************************************************************************ - * DefaultHandler_IRunnableObject_QueryInterface (IUnknown) + * DefaultHandler_IRunnableObject_AddRef (IUnknown) * * See Windows documentation for more details on IUnknown methods. */ @@ -1237,7 +1237,7 @@ static ULONG WINAPI DefaultHandler_IRunnableObject_AddRef( } /************************************************************************ - * DefaultHandler_IRunnableObject_QueryInterface (IUnknown) + * DefaultHandler_IRunnableObject_Release (IUnknown) * * See Windows documentation for more details on IUnknown methods. */ @@ -1557,7 +1557,7 @@ static DefaultHandler* DefaultHandler_Construct( /* * Initialize the outer unknown * We don't keep a reference on the outer unknown since, the way - * aggregation works, our lifetime is at least as large as it's + * aggregation works, our lifetime is at least as large as its * lifetime. */ if (!pUnkOuter)

1 0

Alexandre Julliard : user32: WM_IME_CHAR should result in posted, not sent, WM_CHAR messages.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: c7b1b4c68bdcabe76a3de5672b33d24a6cbabe26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b1b4c68bdcabe76a3de5672… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 9 13:14:20 2007 +0200 user32: WM_IME_CHAR should result in posted, not sent, WM_CHAR messages. --- dlls/user32/defwnd.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 489f720..6f97880 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -812,20 +812,15 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam result = 1; /* success. FIXME: check text length */ break; - /* for far east users (IMM32) - <hidenori(a)a2.ctktv.ne.jp> */ case WM_IME_CHAR: - { - CHAR chChar1 = (CHAR)( (wParam>>8) & 0xff ); - CHAR chChar2 = (CHAR)( wParam & 0xff ); - - if (chChar1) - SendMessageA( hwnd, WM_CHAR, (WPARAM)chChar1, lParam ); - SendMessageA( hwnd, WM_CHAR, (WPARAM)chChar2, lParam ); - } + if (HIBYTE(wParam)) PostMessageA( hwnd, WM_CHAR, HIBYTE(wParam), lParam ); + PostMessageA( hwnd, WM_CHAR, LOBYTE(wParam), lParam ); break; + case WM_IME_KEYDOWN: result = SendMessageA( hwnd, WM_KEYDOWN, wParam, lParam ); break; + case WM_IME_KEYUP: result = SendMessageA( hwnd, WM_KEYUP, wParam, lParam ); break; @@ -968,10 +963,10 @@ LRESULT WINAPI DefWindowProcW( result = 1; /* success. FIXME: check text length */ break; - /* for far east users (IMM32) - <hidenori(a)a2.ctktv.ne.jp> */ case WM_IME_CHAR: - SendMessageW( hwnd, WM_CHAR, wParam, lParam ); + PostMessageW( hwnd, WM_CHAR, wParam, lParam ); break; + case WM_IME_SETCONTEXT: { HWND hwndIME;

1 0

Alexandre Julliard : user32: Support for the magic WM_CHAR W-> A conversion in Get/PeekMessage.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 2ce799c4f6099625aad2f9cb958bb0402bbda648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce799c4f6099625aad2f9cb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 20:35:24 2007 +0200 user32: Support for the magic WM_CHAR W->A conversion in Get/PeekMessage. --- dlls/user32/message.c | 85 +++++++++++++++++++++++++++++++------------- dlls/user32/tests/msg.c | 68 +++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + 3 files changed, 129 insertions(+), 25 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index bd6c103..c89a7ff 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -307,6 +307,18 @@ static inline BOOL check_hwnd_filter( const MSG *msg, HWND hwnd_filter ) return (msg->hwnd == hwnd_filter || IsChild( hwnd_filter, msg->hwnd )); } +/* check for pending WM_CHAR message with DBCS trailing byte */ +static inline BOOL get_pending_wmchar( MSG *msg, UINT first, UINT last, BOOL remove ) +{ + struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; + + if (!data || !data->get_msg.message) return FALSE; + if ((first || last) && (first > WM_CHAR || last < WM_CHAR)) return FALSE; + if (!msg) return FALSE; + *msg = data->get_msg; + if (remove) data->get_msg.message = 0; + return TRUE; +} /*********************************************************************** * broadcast_message_callback @@ -435,39 +447,60 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping * * Convert the wparam of a Unicode message to ASCII. */ -static WPARAM map_wparam_WtoA( UINT message, WPARAM wparam ) +static void map_wparam_WtoA( MSG *msg, BOOL remove ) { - switch(message) + BYTE ch[2]; + WCHAR wch[2]; + DWORD len; + + switch(msg->message) { + case WM_CHAR: + if (!HIWORD(msg->wParam)) + { + wch[0] = LOWORD(msg->wParam); + ch[0] = ch[1] = 0; + RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, wch, sizeof(wch[0]) ); + if (len == 2) /* DBCS char */ + { + struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; + if (!data) + { + if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return; + get_user_thread_info()->wmchar_data = data; + } + if (remove) + { + data->get_msg = *msg; + data->get_msg.wParam = ch[1]; + } + msg->wParam = ch[0]; + return; + } + } + /* else fall through */ case WM_CHARTOITEM: case EM_SETPASSWORDCHAR: - case WM_CHAR: case WM_DEADCHAR: case WM_SYSCHAR: case WM_SYSDEADCHAR: case WM_MENUCHAR: - { - WCHAR wch[2]; - BYTE ch[2]; - wch[0] = LOWORD(wparam); - wch[1] = HIWORD(wparam); - WideCharToMultiByte( CP_ACP, 0, wch, 2, (LPSTR)ch, 2, NULL, NULL ); - wparam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); - } + wch[0] = LOWORD(msg->wParam); + wch[1] = HIWORD(msg->wParam); + ch[0] = ch[1] = 0; + RtlUnicodeToMultiByteN( (LPSTR)ch, 2, NULL, wch, sizeof(wch) ); + msg->wParam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); break; case WM_IME_CHAR: - { - WCHAR wch = LOWORD(wparam); - BYTE ch[2]; - - if (WideCharToMultiByte( CP_ACP, 0, &wch, 1, (LPSTR)ch, 2, NULL, NULL ) == 2) - wparam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wparam) ); - else - wparam = MAKEWPARAM( ch[0], HIWORD(wparam) ); - } + wch[0] = LOWORD(msg->wParam); + ch[0] = ch[1] = 0; + RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, wch, sizeof(wch[0]) ); + if (len == 2) + msg->wParam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(msg->wParam) ); + else + msg->wParam = MAKEWPARAM( ch[0], HIWORD(msg->wParam) ); break; } - return wparam; } @@ -2876,9 +2909,10 @@ BOOL WINAPI PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT f */ BOOL WINAPI PeekMessageA( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags ) { - BOOL ret = PeekMessageW( msg, hwnd, first, last, flags ); - if (ret) msg->wParam = map_wparam_WtoA( msg->message, msg->wParam ); - return ret; + if (get_pending_wmchar( msg, first, last, (flags & PM_REMOVE) )) return TRUE; + if (!PeekMessageW( msg, hwnd, first, last, flags )) return FALSE; + map_wparam_WtoA( msg, (flags & PM_REMOVE) ); + return TRUE; } @@ -2940,8 +2974,9 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) */ BOOL WINAPI GetMessageA( MSG *msg, HWND hwnd, UINT first, UINT last ) { + if (get_pending_wmchar( msg, first, last, TRUE )) return TRUE; GetMessageW( msg, hwnd, first, last ); - msg->wParam = map_wparam_WtoA( msg->message, msg->wParam ); + map_wparam_WtoA( msg, TRUE ); return (msg->message != WM_QUIT); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index d51cf91..336cdce 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9281,6 +9281,8 @@ static void test_dbcs_wm_char(void) WCHAR wch, bad_wch; HWND hwnd, hwnd2; MSG msg; + DWORD time; + POINT pt; DWORD_PTR res; CPINFOEXA cpinfo; UINT i, j, k; @@ -9481,6 +9483,72 @@ static void test_dbcs_wm_char(void) ok( msg.wParam == bad_wch, "bad wparam %lx/%x\n", msg.wParam, bad_wch ); ok( !PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); + /* test retrieving messages */ + + PostMessageW( hwnd, WM_CHAR, wch, 0 ); + ok( PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[0], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[1], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( !PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); + + /* message filters */ + PostMessageW( hwnd, WM_CHAR, wch, 0 ); + ok( PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[0], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + /* message id is filtered, hwnd is not */ + ok( !PeekMessageA( &msg, hwnd, WM_MOUSEFIRST, WM_MOUSELAST, PM_REMOVE ), "no message\n" ); + ok( PeekMessageA( &msg, hwnd2, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[1], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( !PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); + + /* mixing GetMessage and PostMessage */ + PostMessageW( hwnd, WM_CHAR, wch, 0xbeef ); + ok( GetMessageA( &msg, hwnd, 0, 0 ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[0], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( msg.lParam == 0xbeef, "bad lparam %lx\n", msg.lParam ); + time = msg.time; + pt = msg.pt; + ok( time - GetTickCount() <= 100, "bad time %x\n", msg.time ); + ok( PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[1], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( msg.lParam == 0xbeef, "bad lparam %lx\n", msg.lParam ); + ok( msg.time == time, "bad time %x/%x\n", msg.time, time ); + ok( msg.pt.x == pt.x && msg.pt.y == pt.y, "bad point %u,%u/%u,%u\n", msg.pt.x, msg.pt.y, pt.x, pt.y ); + ok( !PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); + + /* without PM_REMOVE */ + PostMessageW( hwnd, WM_CHAR, wch, 0 ); + ok( PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[0], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[0], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[1], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( PeekMessageA( &msg, 0, 0, 0, PM_REMOVE ), "no message\n" ); + ok( msg.hwnd == hwnd, "unexpected hwnd %p\n", msg.hwnd ); + ok( msg.message == WM_CHAR, "unexpected message %x\n", msg.message ); + ok( msg.wParam == dbch[1], "bad wparam %lx/%x\n", msg.wParam, dbch[0] ); + ok( !PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); + DestroyWindow(hwnd); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 85039fd..fd46832 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -185,6 +185,7 @@ enum wm_char_mapping struct wm_char_mapping_data { BYTE lead_byte[WMCHAR_MAP_COUNT]; + MSG get_msg; }; /* this is the structure stored in TEB->Win32ClientInfo */

1 0

Alexandre Julliard : user32/tests: Added test cases for WM_CHAR conversions .
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: b9540cf9e73e63a595ea1bb840c16b4ab9822bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9540cf9e73e63a595ea1bb84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 18:25:57 2007 +0200 user32/tests: Added test cases for WM_CHAR conversions. --- dlls/user32/tests/msg.c | 241 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 226 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9540cf9e73e63a595ea1…

1 0

Alexandre Julliard : user32: Added support for the magic WM_CHAR A-> W conversions in Send/Post/DispatchMessage.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 82964f5032f805a79d78667bf8702d8e1843f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82964f5032f805a79d78667bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 18:25:38 2007 +0200 user32: Added support for the magic WM_CHAR A->W conversions in Send/Post/DispatchMessage. --- dlls/user32/message.c | 118 ++++++++++++++++++++++++++++++++------------ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 28 +++++++++- dlls/user32/winproc.c | 66 ++++++++++-------------- 4 files changed, 139 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82964f5032f805a79d786…

1 0

Alexandre Julliard : user32: Factor out the calling of a window' s winproc into a separate function.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 334ede409935e3327ef31318ea236ac0731bfd97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334ede409935e3327ef31318e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 17:02:42 2007 +0200 user32: Factor out the calling of a window's winproc into a separate function. --- dlls/user32/message.c | 76 +++++++++++--------------------------------- dlls/user32/user_private.h | 2 + dlls/user32/winproc.c | 41 +++++++++++++++++++++++ 3 files changed, 62 insertions(+), 57 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 25cf934..a7c93d9 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1513,7 +1513,6 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar { struct user_thread_info *thread_info = get_user_thread_info(); LRESULT result = 0; - WNDPROC winproc; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; @@ -1535,16 +1534,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, unicode ); /* now call the window procedure */ - if (unicode) - { - if (!(winproc = (WNDPROC)GetWindowLongPtrW( hwnd, GWLP_WNDPROC ))) goto done; - result = CallWindowProcW( winproc, hwnd, msg, wparam, lparam ); - } - else - { - if (!(winproc = (WNDPROC)GetWindowLongPtrA( hwnd, GWLP_WNDPROC ))) goto done; - result = CallWindowProcA( winproc, hwnd, msg, wparam, lparam ); - } + if (!WINPROC_call_window( hwnd, msg, wparam, lparam, &result, unicode )) goto done; /* and finally the WH_CALLWNDPROCRET hook */ cwpret.lResult = result; @@ -2971,9 +2961,7 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) */ LRESULT WINAPI DispatchMessageA( const MSG* msg ) { - WND * wndPtr; LRESULT retval; - WNDPROC winproc; /* Process timer messages */ if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) @@ -2981,31 +2969,19 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) if (msg->lParam) return CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, msg->message, msg->wParam, GetTickCount() ); } + if (!msg->hwnd) return 0; - if (!(wndPtr = WIN_GetPtr( msg->hwnd ))) - { - if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) - { - if (IsWindow( msg->hwnd )) SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - else SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr->tid != GetCurrentThreadId()) + SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, + msg->wParam, msg->lParam ); + + if (!WINPROC_call_window( msg->hwnd, msg->message, msg->wParam, msg->lParam, + &retval, FALSE )) { - SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - WIN_ReleasePtr( wndPtr ); - return 0; + if (!IsWindow( msg->hwnd )) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + else SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + retval = 0; } - winproc = wndPtr->winproc; - WIN_ReleasePtr( wndPtr ); - SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, - msg->wParam, msg->lParam ); - retval = CallWindowProcA( winproc, msg->hwnd, msg->message, - msg->wParam, msg->lParam ); SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval, msg->wParam, msg->lParam ); @@ -3043,9 +3019,7 @@ LRESULT WINAPI DispatchMessageA( const MSG* msg ) */ LRESULT WINAPI DispatchMessageW( const MSG* msg ) { - WND * wndPtr; LRESULT retval; - WNDPROC winproc; /* Process timer messages */ if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) @@ -3053,31 +3027,19 @@ LRESULT WINAPI DispatchMessageW( const MSG* msg ) if (msg->lParam) return CallWindowProcW( (WNDPROC)msg->lParam, msg->hwnd, msg->message, msg->wParam, GetTickCount() ); } + if (!msg->hwnd) return 0; - if (!(wndPtr = WIN_GetPtr( msg->hwnd ))) - { - if (msg->hwnd) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) - { - if (IsWindow( msg->hwnd )) SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - else SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr->tid != GetCurrentThreadId()) + SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, + msg->wParam, msg->lParam ); + + if (!WINPROC_call_window( msg->hwnd, msg->message, msg->wParam, msg->lParam, + &retval, TRUE )) { - SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - WIN_ReleasePtr( wndPtr ); - return 0; + if (!IsWindow( msg->hwnd )) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + else SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + retval = 0; } - winproc = wndPtr->winproc; - WIN_ReleasePtr( wndPtr ); - SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, - msg->wParam, msg->lParam ); - retval = CallWindowProcW( winproc, msg->hwnd, msg->message, - msg->wParam, msg->lParam ); SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval, msg->wParam, msg->lParam ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 692eca9..f580e6f 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -246,6 +246,8 @@ extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + LRESULT *result, BOOL unicode ); /* message spy definitions */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 50b5858..0664b37 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -2197,6 +2197,47 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT /********************************************************************** + * WINPROC_call_window + * + * Call the window procedure of the specified window. + */ +BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, + LRESULT *result, BOOL unicode ) +{ + WND *wndPtr; + WINDOWPROC *proc; + + if (!(wndPtr = WIN_GetPtr( hwnd ))) return FALSE; + if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; + if (wndPtr->tid != GetCurrentThreadId()) + { + WIN_ReleasePtr( wndPtr ); + return FALSE; + } + proc = handle_to_proc( wndPtr->winproc ); + WIN_ReleasePtr( wndPtr ); + + if (!proc) return TRUE; + + if (unicode) + { + if (proc->procW) + call_window_proc( hwnd, msg, wParam, lParam, result, proc->procW ); + else + WINPROC_CallProcWtoA( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procA ); + } + else + { + if (proc->procA) + call_window_proc( hwnd, msg, wParam, lParam, result, proc->procA ); + else + WINPROC_CallProcAtoW( call_window_proc, hwnd, msg, wParam, lParam, result, proc->procW ); + } + return TRUE; +} + + +/********************************************************************** * CallWindowProc (USER.122) */ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,

1 0

Alexandre Julliard : user32: Factor out the various SendMessage functions into a common routine.
by Alexandre Julliard 09 Aug '07

09 Aug '07

Module: wine Branch: master Commit: 01de889c0fd588d65f5d27f7107c2627f26190cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=01de889c0fd588d65f5d27f71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 8 16:23:23 2007 +0200 user32: Factor out the various SendMessage functions into a common routine. --- dlls/user32/message.c | 241 +++++++++++++++++++++++++------------------------ 1 files changed, 125 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01de889c0fd588d65f5d2…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007