August 2006 - Wine-commits - list.winehq.org

Robert Shearman : rpcrt4: Complex types should be dereferenced an extra time in the old format stubless code .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: e26bcb7fb2a0f2396b03cb854f360f474b10ace9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e26bcb7fb2a0f2396b03cb8… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:21 2006 +0100 rpcrt4: Complex types should be dereferenced an extra time in the old format stubless code. --- dlls/rpcrt4/ndr_stubless.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e7c54e3..55a7778 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -898,17 +898,17 @@ #endif case PROXY_CALCSIZE: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction & RPC_FC_IN_OUT_PARAM) - call_buffer_sizer(&stubMsg, pArg, pTypeFormat); + call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); break; case PROXY_MARSHAL: if (pParam->param_direction == RPC_FC_IN_PARAM || pParam->param_direction & RPC_FC_IN_OUT_PARAM) - call_marshaller(&stubMsg, pArg, pTypeFormat); + call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); break; case PROXY_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_OUT_PARAM) - call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); + call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); else if (pParam->param_direction == RPC_FC_RETURN_PARAM) call_unmarshaller(&stubMsg, (unsigned char **)&RetVal, pTypeFormat, 0); break; @@ -1483,18 +1483,18 @@ #endif if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_marshaller(&stubMsg, pArg, pTypeFormat); + call_marshaller(&stubMsg, *(unsigned char **)pArg, pTypeFormat); break; case STUBLESS_UNMARSHAL: if (pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_IN_PARAM) - call_unmarshaller(&stubMsg, &pArg, pTypeFormat, 0); + call_unmarshaller(&stubMsg, (unsigned char **)pArg, pTypeFormat, 0); break; case STUBLESS_CALCSIZE: if (pParam->param_direction == RPC_FC_OUT_PARAM || pParam->param_direction == RPC_FC_IN_OUT_PARAM || pParam->param_direction == RPC_FC_RETURN_PARAM) - call_buffer_sizer(&stubMsg, pArg, pTypeFormat); + call_buffer_sizer(&stubMsg, *(unsigned char **)pArg, pTypeFormat); break; default: RpcRaiseException(RPC_S_INTERNAL_ERROR);

1 0

Robert Shearman : ole32: Add a check for NULL This-> dataAdviseHolder in DefaultHandler_Stop.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: c350e0000f52e9ca105a83f2376b5d217682730f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c350e0000f52e9ca105a83f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:06 2006 +0100 ole32: Add a check for NULL This->dataAdviseHolder in DefaultHandler_Stop. Cleanup DefaultHandler_GetCanonicalFormatEtc by using This->pDataDelegate instead of querying for IDataObject from This->pOleDelegate. --- dlls/ole32/defaulthandler.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5058468..4158f50 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -416,7 +416,8 @@ static void WINAPI DefaultHandler_Stop(D /* FIXME: call IOleCache_OnStop */ - DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); + if (This->dataAdviseHolder) + DataAdviseHolder_OnDisconnect(This->dataAdviseHolder); if (This->pDataDelegate) { IDataObject_Release(This->pDataDelegate); @@ -1030,16 +1031,13 @@ static HRESULT WINAPI DefaultHandler_Get LPFORMATETC pformatetcOut) { DefaultHandler *This = impl_from_IDataObject(iface); - IDataObject *pDataObject; - HRESULT hr; TRACE("(%p, %p, %p)\n", iface, pformatetcIn, pformatetcOut); - if (!This->pOleDelegate) + if (!This->pDataDelegate) return OLE_E_NOTRUNNING; - hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, (void **)&pDataObject); - return IDataObject_GetCanonicalFormatEtc(pDataObject, pformatetcIn, pformatetcOut); + return IDataObject_GetCanonicalFormatEtc(This->pDataDelegate, pformatetcIn, pformatetcOut); } /************************************************************************

1 0

Robert Shearman : rpcrt4: Fix the stack offset for the old format stubless code when an object' s method is being called.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 64828b75203d26ba2314742920c76fcf1f0fa89c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=64828b75203d26ba2314742… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:16 2006 +0100 rpcrt4: Fix the stack offset for the old format stubless code when an object's method is being called. --- dlls/rpcrt4/ndr_stubless.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 2e56c98..e7c54e3 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -834,15 +834,19 @@ #endif { NDR_PARAM_OI_BASETYPE * pParam = (NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - unsigned char * pArg = ARG_FROM_OFFSET(stubMsg, current_stack_offset); + /* note: current_stack_offset starts after the This pointer + * if present, so adjust this */ + unsigned short current_stack_offset_adjusted = current_stack_offset + + ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) ? sizeof(void *) : 0); + unsigned char * pArg = ARG_FROM_OFFSET(stubMsg, current_stack_offset_adjusted); /* no more parameters; exit loop */ - if (current_stack_offset > stack_size) + if (current_stack_offset_adjusted >= stack_size) break; TRACE("param[%d]: old format\n", i); TRACE("\tparam_direction: %x\n", pParam->param_direction); - TRACE("\tstack_offset: 0x%x\n", current_stack_offset); + TRACE("\tstack_offset: 0x%x\n", current_stack_offset_adjusted); TRACE("\tmemory addr (before): %p\n", pArg); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || @@ -1420,13 +1424,19 @@ #endif { NDR_PARAM_OI_BASETYPE *pParam = (NDR_PARAM_OI_BASETYPE *)&pFormat[current_offset]; - unsigned char *pArg = (unsigned char *)(args+current_stack_offset); + /* note: current_stack_offset starts after the This pointer + * if present, so adjust this */ + unsigned short current_stack_offset_adjusted = current_stack_offset + + ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) ? sizeof(void *) : 0); + unsigned char *pArg = (unsigned char *)(args+current_stack_offset_adjusted); /* no more parameters; exit loop */ - if (current_stack_offset > stack_size) + if (current_stack_offset_adjusted >= stack_size) break; - TRACE("param[%d]: old format\n\tparam_direction: 0x%x\n", i, pParam->param_direction); + TRACE("param[%d]: old format\n", i); + TRACE("\tparam_direction: 0x%x\n", pParam->param_direction); + TRACE("\tstack_offset: %x\n", current_stack_offset_adjusted); if (pParam->param_direction == RPC_FC_IN_PARAM_BASETYPE || pParam->param_direction == RPC_FC_RETURN_PARAM_BASETYPE)

1 0

Robert Shearman : ole32: When comparing monikers use the abData field of MInterfacePointer
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 8f513e35769a54aa3379e55f827a1fb3ebdc4bf3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f513e35769a54aa3379e55… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:15:46 2006 +0100 ole32: When comparing monikers use the abData field of MInterfacePointer as ulCntData doesn't include the size of its own field. --- dlls/ole32/moniker.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 0498b7f..327038b 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -448,7 +448,7 @@ RunningObjectTableImpl_IsRunning( IRunni LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(moniker_data, rot_entry->moniker_data, moniker_data->ulCntData)) + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) { hr = S_OK; break; @@ -494,7 +494,7 @@ RunningObjectTableImpl_GetObject( IRunni LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(moniker_data, rot_entry->moniker_data, moniker_data->ulCntData)) + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) { IStream *pStream; hr = create_stream_on_mip_ro(rot_entry->object, &pStream); @@ -585,7 +585,7 @@ RunningObjectTableImpl_GetTimeOfLastChan LIST_FOR_EACH_ENTRY(rot_entry, &This->rot, struct rot_entry, entry) { if ((rot_entry->moniker_data->ulCntData == moniker_data->ulCntData) && - !memcmp(moniker_data, rot_entry->moniker_data, moniker_data->ulCntData)) + !memcmp(&moniker_data->abData, &rot_entry->moniker_data->abData, moniker_data->ulCntData)) { *pfiletime = rot_entry->last_modified; hr = S_OK;

1 0

Robert Shearman : ole32: Fix a typo in IEnumSTATSTGImpl_QueryInterface where IStorage was being compared against instead of IEnumSTATSTG .
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 8d7bfca965b91c8d1dbdded9fdaf38b6677985ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d7bfca965b91c8d1dbdded… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:16:10 2006 +0100 ole32: Fix a typo in IEnumSTATSTGImpl_QueryInterface where IStorage was being compared against instead of IEnumSTATSTG. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index abf944a..d44d381 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3716,7 +3716,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Q * Compare the riid with the interface IDs implemented by this object. */ if (IsEqualGUID(&IID_IUnknown, riid) || - IsEqualGUID(&IID_IStorage, riid)) + IsEqualGUID(&IID_IEnumSTATSTG, riid)) { *ppvObject = (IEnumSTATSTG*)This; IEnumSTATSTG_AddRef((IEnumSTATSTG*)This);

1 0

Robert Shearman : ole32: Zero stg in case ADVF_NODATA is specified.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: f589ec8081727755664b8e26fb6b07c8f6db77fe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f589ec8081727755664b8e2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:15:38 2006 +0100 ole32: Zero stg in case ADVF_NODATA is specified. Otherwise IDataObject_GetData fails before using it in DataAdviseHolder_SendOnDataChange. --- dlls/ole32/oleobj.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index f9c8668..7a00d8f 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -827,6 +827,7 @@ static HRESULT WINAPI DataAdviseHold for(index = 0; index < This->maxCons; index++) { if(This->Connections[index].sink != NULL) { + memset(&stg, 0, sizeof(stg)); if(!(This->Connections[index].advf & ADVF_NODATA)) { TRACE("Calling IDataObject_GetData\n"); res = IDataObject_GetData(pDataObject,

1 0

Robert Shearman : include: Add DLL registration macros to rpcproxy. h for dlldata.c files.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 891c83d976299f010794138e45c17fa6b15c578a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=891c83d976299f010794138… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:15:56 2006 +0100 include: Add DLL registration macros to rpcproxy.h for dlldata.c files. --- include/rpcproxy.h | 31 ++++++++++++++++++++++++++++++- 1 files changed, 30 insertions(+), 1 deletions(-) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 824462a..a4adc02 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -303,7 +303,36 @@ #define DLLCANUNLOADNOW(factory) \ return NdrDllCanUnloadNow((factory)); \ } -#define DLLREGISTRY_ROUTINES(pfl, factory_clsid) +#define REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) \ + HINSTANCE hProxyDll = NULL; \ + \ + BOOL WINAPI DLLMAIN_ENTRY(HINSTANCE hinstDLL, DWORD fdwReason, \ + LPVOID lpvReserved) \ + { \ + if (fdwReason == DLL_PROCESS_ATTACH) \ + { \ + DisableThreadLibraryCalls(hinstDLL); \ + hProxyDll = hinstDLL; \ + } \ + return TRUE; \ + } \ + \ + HRESULT WINAPI DLLREGISTERSERVER_ENTRY(void) \ + { \ + return NdrDllRegisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + } \ + \ + HRESULT WINAPI DLLUNREGISTERSERVER_ENTRY(void) \ + { \ + return NdrDllUnregisterProxy(hProxyDll, (pfl), (factory_clsid)); \ + } + +#ifdef REGISTER_PROXY_DLL +# define DLLREGISTRY_ROUTINES(pfl, factory_clsid) \ + REGISTER_PROXY_DLL_ROUTINES(pfl, factory_clsid) +#else +# define DLLREGISTRY_ROUTINES(pfl, factory_clsid) +#endif #define DLLDATA_ROUTINES(pfl, factory_clsid) \ CLSID_PSFACTORYBUFFER \

1 0

Francois Gouget : ole32: Register the CLSID_Picture_Metafile and CLSID_Picture_Dib ProgIDs.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 7bb2c3f8a63b4cd77398bf0986c9a7f9173f0876 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7bb2c3f8a63b4cd77398bf0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 19:54:02 2006 +0200 ole32: Register the CLSID_Picture_Metafile and CLSID_Picture_Dib ProgIDs. --- dlls/ole32/regsvr.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 21474d6..fad8f8a 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -68,6 +68,7 @@ struct regsvr_coclass LPCSTR ips; /* can be NULL to omit */ LPCSTR ips32; /* can be NULL to omit */ LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ }; static HRESULT register_coclasses(struct regsvr_coclass const *list); @@ -97,6 +98,8 @@ static WCHAR const ips_keyname[13] = { static WCHAR const ips32_keyname[15] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; static char const tmodel_valuename[] = "ThreadingModel"; /*********************************************************************** @@ -107,7 +110,10 @@ static LONG register_key_defvalueW(HKEY WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); +static LONG register_progid(WCHAR const *clsid, char const *progid, + char const *name); static LONG recursive_delete_key(HKEY key); +static LONG recursive_delete_keyA(HKEY base, char const *name); /*********************************************************************** @@ -268,6 +274,15 @@ static HRESULT register_coclasses(struct if (res != ERROR_SUCCESS) goto error_close_clsid_key; } + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, list->name); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + error_close_clsid_key: RegCloseKey(clsid_key); } @@ -306,6 +321,11 @@ static HRESULT unregister_coclasses(stru res = recursive_delete_key(clsid_key); RegCloseKey(clsid_key); if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } } error_close_coclass_key: @@ -366,6 +386,38 @@ static LONG register_key_defvalueA( } /*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *name) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** * recursive_delete_key */ static LONG recursive_delete_key(HKEY key) @@ -398,6 +450,22 @@ static LONG recursive_delete_key(HKEY ke } /*********************************************************************** + * recursive_delete_keyA + */ +static LONG recursive_delete_keyA(HKEY base, char const *name) +{ + LONG res; + HKEY key; + + res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); + if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; + if (res != ERROR_SUCCESS) return res; + res = recursive_delete_key(key); + RegCloseKey(key); + return res; +} + +/*********************************************************************** * coclass list */ static GUID const CLSID_StdOleLink = { @@ -465,13 +533,15 @@ static struct regsvr_coclass const cocla "Picture (Metafile)", NULL, "ole32.dll", - NULL + NULL, + "StaticMetafile" }, { &CLSID_Picture_Dib, "Picture (Device Independent Bitmap)", NULL, "ole32.dll", - NULL + NULL, + "StaticDib" }, { &CLSID_ClassMoniker, "ClassMoniker",

1 0

Robert Shearman : include: Fix rpcproxy. h to allow the compilation of dlldata.c files.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: a966a80d9fff811aef71f7fcd9abfda82d2851c1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a966a80d9fff811aef71f7f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Aug 9 18:15:51 2006 +0100 include: Fix rpcproxy.h to allow the compilation of dlldata.c files. Add macros for generating the GetProxyDllInfo, DllGetClassObject and DllCanUnloadNow functions. --- include/rpcproxy.h | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 2 deletions(-) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 7c40a1d..824462a 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -229,7 +229,7 @@ #define IID_BS_LOOKUP_RETURN_RESULT(name /* macros used in dlldata.c files */ #define EXTERN_PROXY_FILE(proxy) \ - EXTERN_C const ProxyFileInfo proxy##_ProxyFileInfo + EXTERN_C const ProxyFileInfo proxy##_ProxyFileInfo; #define PROXYFILE_LIST_START \ const ProxyFileInfo *aProxyFileList[] = \ @@ -241,7 +241,80 @@ #define REFERENCE_PROXY_FILE(proxy) \ #define PROXYFILE_LIST_END \ NULL \ }; - + + +/* define PROXY_CLSID to use an existing CLSID */ +/* define PROXY_CLSID_IS to specify the CLSID data of the PSFactoryBuffer */ +/* define neither to use the GUID of the first interface */ +#ifdef PROXY_CLSID +# define CLSID_PSFACTORYBUFFER extern CLSID PROXY_CLSID; +#else +# ifdef PROXY_CLSID_IS +# define CLSID_PSFACTORYBUFFER const CLSID CLSID_PSFactoryBuffer = \ + PROXY_CLSID_IS; +# define PROXY_CLSID CLSID_PSFactoryBuffer +# else +# define CLSID_PSFACTORYBUFFER +# endif +#endif + +#ifndef PROXY_CLSID +# define GET_DLL_CLSID (aProxyFileList[0]->pStubVtblList[0] ? \ + aProxyFileList[0]->pStubVtblList[0]->header.piid : NULL) +#else +# define GET_DLL_CLSID &PROXY_CLSID +#endif + +#ifdef ENTRY_PREFIX +# define __rpc_macro_expand2(a, b) a##b +# define __rpc_macro_expand(a, b) __rpc_macro_expand2(a, b) +# define DLLREGISTERSERVER_ENTRY __rpc_macro_expand(ENTRY_PREFIX, DllRegisterServer) +# define DLLUNREGISTERSERVER_ENTRY __rpc_macro_expand(ENTRY_PREFIX, DllUnregisterServer) +# define DLLMAIN_ENTRY __rpc_macro_expand(ENTRY_PREFIX, DllMain) +# define DLLGETCLASSOBJECT_ENTRY __rpc_macro_expand(ENTRY_PREFIX, DllGetClassObject) +# define DLLCANUNLOADNOW_ENTRY __rpc_macro_expand(ENTRY_PREFIX, DllCanUnloadNow) +#else +# define DLLREGISTERSERVER_ENTRY DllRegisterServer +# define DLLUNREGISTERSERVER_ENTRY DllUnregisterServer +# define DLLMAIN_ENTRY DllMain +# define DLLGETCLASSOBJECT_ENTRY DllGetClassObject +# define DLLCANUNLOADNOW_ENTRY DllCanUnloadNow +#endif + +#define DLLDATA_GETPROXYDLLINFO(pfl, rclsid) \ + void RPC_ENTRY GetProxyDllInfo(const ProxyFileInfo ***ppProxyFileInfo, \ + const CLSID **ppClsid) \ + { \ + *ppProxyFileInfo = (pfl); \ + *ppClsid = (rclsid); \ + } + +#define DLLGETCLASSOBJECTROUTINE(pfl, factory_clsid, factory) \ + HRESULT WINAPI DLLGETCLASSOBJECT_ENTRY(REFCLSID rclsid, REFIID riid, \ + void **ppv) \ + { \ + return NdrDllGetClassObject(rclsid, riid, ppv, (pfl), \ + (factory_clsid), factory); \ + } + +#define DLLCANUNLOADNOW(factory) \ + HRESULT WINAPI DLLCANUNLOADNOW_ENTRY(void) \ + { \ + return NdrDllCanUnloadNow((factory)); \ + } + +#define DLLREGISTRY_ROUTINES(pfl, factory_clsid) + +#define DLLDATA_ROUTINES(pfl, factory_clsid) \ + CLSID_PSFACTORYBUFFER \ + CStdPSFactoryBuffer gPFactory = { NULL, 0, NULL, 0 }; \ + DLLDATA_GETPROXYDLLINFO(pfl, factory_clsid) \ + DLLGETCLASSOBJECTROUTINE(pfl, factory_clsid, &gPFactory) \ + DLLCANUNLOADNOW(&gPFactory) \ + CSTDSTUBBUFFERRELEASE(&gPFactory) \ + CSTDSTUBBUFFER2RELEASE(&gPFactory) \ + DLLREGISTRY_ROUTINES(pfl, factory_clsid) + #if 0 /* see http://www.microsoft.com/msj/0199/com/com0199.aspx */

1 0

Francois Gouget : msi: Link the WindowsInstaller. Installer ProgId back to the right CLSID.
by Alexandre Julliard 09 Aug '06

09 Aug '06

Module: wine Branch: refs/heads/master Commit: 407468e8515b7d9352957b0758de60aab71a6cd6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=407468e8515b7d9352957b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Aug 9 19:13:17 2006 +0200 msi: Link the WindowsInstaller.Installer ProgId back to the right CLSID. --- dlls/msi/regsvr.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/regsvr.c b/dlls/msi/regsvr.c index 65c00a2..dca1c80 100644 --- a/dlls/msi/regsvr.c +++ b/dlls/msi/regsvr.c @@ -72,11 +72,15 @@ struct regsvr_coclass { LPCSTR ips; /* can be NULL to omit */ LPCSTR ips32; /* can be NULL to omit */ LPCSTR ips32_tmodel; /* can be NULL to omit, if apartment, iph32 must be set */ + DWORD flags; LPCSTR progid; /* can be NULL to omit */ LPCSTR viprogid; /* can be NULL to omit */ LPCSTR progid_extra; /* can be NULL to omit */ }; +/* flags for regsvr_coclass.flags */ +#define PROGID_CLSID 0x00000010 + static HRESULT register_coclasses(struct regsvr_coclass const *list); static HRESULT unregister_coclasses(struct regsvr_coclass const *list); @@ -296,7 +300,8 @@ static HRESULT register_coclasses(struct list->progid); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - res = register_progid(buf, list->progid, NULL, + res = register_progid(list->flags & PROGID_CLSID ? buf : NULL, + list->progid, NULL, list->name, list->progid_extra); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -306,7 +311,8 @@ static HRESULT register_coclasses(struct list->viprogid); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - res = register_progid(buf, list->viprogid, list->progid, + res = register_progid(list->flags & PROGID_CLSID ? buf : NULL, + list->viprogid, list->progid, list->name, list->progid_extra); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } @@ -526,6 +532,7 @@ static struct regsvr_coclass const cocla NULL, "msi.dll", "Apartment", + PROGID_CLSID, "IMsiServer", NULL }, @@ -536,6 +543,7 @@ static struct regsvr_coclass const cocla NULL, "msi.dll", NULL, + PROGID_CLSID, "WindowsInstaller.Message", NULL }, @@ -546,6 +554,7 @@ static struct regsvr_coclass const cocla NULL, "msi.dll", "Apartment", + 0, "WindowsInstaller.Installer", NULL }, @@ -556,6 +565,7 @@ static struct regsvr_coclass const cocla NULL, "msi.dll", "Apartment", + PROGID_CLSID, "WindowsInstaller.Installer", NULL }, @@ -566,6 +576,7 @@ static struct regsvr_coclass const cocla NULL, "msi.dll", "Apartment", + 0, "WindowsInstaller.Installer", NULL },

1 0