mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 19:26:32 +00:00
Sync to Wine-20050211
Robert Shearman <[email protected]> - Add documentation for most Co* functions. - Move several functions into different files to group them with similar functions. - Implement CoDisconnectObject. - Change CoLockObjectExternal so that it does the correct action now and eliminate a fair few lines of now redundant code. - Rename OLE32_Dll{Register,Unregister}Server to Dll{Register,Unregister}Server. - Move OLE automation interface registration to oleaut32. - Add IRemUnknown to list of interfaces to register. - Make proxy manager use IMultiQI instead of IInternalUnknown as tests show that IInternalUnknown isn't exposed. - Implement IMultiQI on top of IRemUnknown calls. - Silence some fixmes that occur during tests and don't give us any useful information. - Fix typo in class factory proxy that caused us to use the wrong offset into the CFProxy structure, causing us to not call the outer_unknown properly. - Use InterlockedIncrement for the ipid counter instead of a critical section (suggested by Mike Hearn). - Remove a line added by a bad merge. - Implement RemUnkStub_Disconnect. - Remove all of the RPC disconnect code. - Implement IRemUnknown. - Use IRemUnknown for life-cycle management instead of the current hacks. - Generate machine-local IPIDs. - Make pipes be uniquely identified only by their IPID. - Implement table marshaling. - The apartment reference should be held while the stub manager reference is held. - Fix same apartment-unmarshal detection. - Proxies/stubs for IRemUnknown methods, based on code written by Ove Ksven. - Initialize ppv pointer in ClientIdentity_QueryInterface to NULL as apps depend on this. - Don't release IRpcProxyBuffer on ifproxy destruction - the caller will do this for us. - Make find_proxy_manager add a reference to the proxy manager and make proxy_manager_construct return an object with a valid ref-count. - Remove stray not operator to fix a memory leak / crash in proxy_manager_destroy. - More debug messages, especially on errors. - Fix ref-count leak in the Class Factory proxy. - Add a test case for IClassFactory_CreateInstance. - Split up apartment creation so that the long code paths that don't need locking no longer have locking. - Add special cases for the threads that join apartments but can't increase the refcount of the apartment. - Free TLS storage on thread destruction (including releasing the apartment the thread is in, if any, and so making another test pass). - More tests. - Change return code of CoGetPSClsid to match test result. - Do a slight hack to make IRemUnknown proxies be added after the proxy that uses them to stop them being used after they are destroyed. - Fix multiple local server connections. - The apartment reference should be held while the stub manager reference is held. - Fix same apartment-unmarshal detection. - Don't use the pipe caching code because it doesn't work correctly at the moment. - Always write disconnect reply packet, even in failure cases. - Move object-to-stub-manager mapping rule to register_ifstub. - Pass the original IID to IMarshal_UnmarshalInterface and query for the requested interface. - Unmarshaling IID_NULL means use the IID the interface was originally marshaled with. - Add code for destroying the thread-local storage data, but don't use it yet. - Don't release apartment on changing modes because we didn't add a reference anywhere. - Quieten the RPC_E_DISCONNECTED error message as it is an expected return code. - Treat IID_NULL the same as IID_IUnknown. - Make tests compile on Win95 again. - Fix copy+paste error where the test failure should be from the CoUnmarshalInterface function. - Give IUnknown its own ifstub to fix ref-counting and ipid storage issues. - Add a new flag SORFP_NOLIFETIMEMGMT to tell the proxy manager not to call any IRemUnknown functions. - Move the low-level unmarshaling code into a new function, unmarshal_object, so that it can be easily reused for unmarshaling IRemUnknown. - Consolidate more stub creation details into register_ifstub. - Replace the current wine_marshal_id structure with STDOBJREF for the on-the-wire format. - Initialize clsid member to the marshaler clsid to fix custom marshaling. - Make proxy shutdown test succeed by releasing the channel on disconnect. - Remove wine_marshal_data: it is unneeded and there is no equivalent in STDOBJREF. - Remove obsolete structs, rearrange things to group the structs together and to group similar functions. - Document thread-safety of members of structs. - Document CoSetState & CoGetState. - Rewrite them to only retrieve TLS info once. - Remove trailing whitespace in COM_CurrentInfo. - Release the client security objects when no longer needed (reported by Mike McCormack). - Implement CoSetProxyBlanket, CoQueryProxyBlanket and CoCopyProxy. - Update todo list. - Destroy stubs on apartment shutdown. - Make MTA dynamically allocated so that proxies and other resources are freed at the proper time. - Changed/removed some incorrect comments regarding apartments. Mike Hearn <[email protected]> - Various formatting/style changes. - Force context switch on chanbuf disconnect to avoid a race in the test suite. Mike Hearn <[email protected]> Robert Shearman <[email protected]> - Rework RPC dispatch layer to be simpler and not get confused by server/client duality. - Make threads shut down at the right time and not access freed memory after apartment destruction. - Rename stub_dispatch_thread to client_dispatch_thread. - Add some more tracing - Check return value of WaitNamedPipe. - Change named pipe timeouts to 0.5s, which should be enough for even the slowest machines. Christian Costa <[email protected]> - CoInitialize(Ex) should return S_FALSE when COM is already initialized for the current thread. svn path=/trunk/; revision=13532
This commit is contained in:
Gé van Geldorp
@@ -143,6 +143,18 @@ inline static void list_init( struct list *list )
|
||||
#define LIST_FOR_EACH(cursor,list) \
|
||||
for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next)
|
||||
|
||||
/* iterate through the list, with safety against removal */
|
||||
#define LIST_FOR_EACH_SAFE(cursor, cursor2, list) \
|
||||
for ((cursor) = (list)->next, (cursor2) = (cursor)->next; \
|
||||
(cursor) != (list); \
|
||||
(cursor) = (cursor2), (cursor2) = (cursor)->next)
|
||||
|
||||
/* iterate through the list using a list entry */
|
||||
#define LIST_FOR_EACH_ENTRY(elem, list, type, field) \
|
||||
for ((elem) = LIST_ENTRY((list)->next, type, field); \
|
||||
&(elem)->field != (list); \
|
||||
(elem) = LIST_ENTRY((elem)->field.next, type, field))
|
||||
|
||||
/* macros for statically initialized lists */
|
||||
#define LIST_INIT(list) { &(list), &(list) }
|
||||
|
||||
|
||||
@@ -984,6 +984,17 @@ DECLARE_INTERFACE_(IClientSecurity,IUnknown)
|
||||
};
|
||||
#undef INTERFACE
|
||||
|
||||
#ifdef COBJMACROS
|
||||
/*** IUnknown methods ***/
|
||||
#define IClientSecurity_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
|
||||
#define IClientSecurity_AddRef(p) (p)->lpVtbl->AddRef(p)
|
||||
#define IClientSecurity_Release(p) (p)->lpVtbl->Release(p)
|
||||
/*** IClientSecurity methods ***/
|
||||
#define IClientSecurity_QueryBlanket(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->QueryBlanket(p,a,b,c,d,e,f,g,h)
|
||||
#define IClientSecurity_SetBlanket(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->SetBlanket(p,a,b,c,d,e,f,g,h)
|
||||
#define IClientSecurity_CopyProxy(p,a,b) (p)->lpVtbl->CopyProxy(p,a,b)
|
||||
#endif
|
||||
|
||||
EXTERN_C const IID IID_IServerSecurity;
|
||||
#define INTERFACE IServerSecurity
|
||||
DECLARE_INTERFACE_(IServerSecurity,IUnknown)
|
||||
@@ -2005,5 +2016,78 @@ struct IInternalUnknownVtbl {
|
||||
|
||||
#endif /* __IInternalUnknown_INTERFACE_DEFINED__ */
|
||||
|
||||
#ifndef __IMultiQI_FWD_DEFINED__
|
||||
#define __IMultiQI_FWD_DEFINED__
|
||||
typedef struct IMultiQI IMultiQI;
|
||||
#endif
|
||||
|
||||
typedef IMultiQI *LPMULTIQI;
|
||||
|
||||
/*****************************************************************************
|
||||
* IMultiQI interface
|
||||
*/
|
||||
#ifndef __IMultiQI_INTERFACE_DEFINED__
|
||||
#define __IMultiQI_INTERFACE_DEFINED__
|
||||
|
||||
#if defined(__cplusplus) && !defined(CINTERFACE)
|
||||
struct IMultiQI : public IUnknown
|
||||
{
|
||||
virtual HRESULT STDMETHODCALLTYPE QueryMultipleInterfaces(
|
||||
ULONG cMQIs,
|
||||
MULTI_QI* pMQIs) = 0;
|
||||
|
||||
};
|
||||
#else
|
||||
typedef struct IMultiQIVtbl IMultiQIVtbl;
|
||||
struct IMultiQI {
|
||||
const IMultiQIVtbl* lpVtbl;
|
||||
};
|
||||
struct IMultiQIVtbl {
|
||||
BEGIN_INTERFACE
|
||||
|
||||
/*** IUnknown methods ***/
|
||||
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
|
||||
IMultiQI* This,
|
||||
REFIID riid,
|
||||
void** ppvObject);
|
||||
|
||||
ULONG (STDMETHODCALLTYPE *AddRef)(
|
||||
IMultiQI* This);
|
||||
|
||||
ULONG (STDMETHODCALLTYPE *Release)(
|
||||
IMultiQI* This);
|
||||
|
||||
/*** IMultiQI methods ***/
|
||||
HRESULT (STDMETHODCALLTYPE *QueryMultipleInterfaces)(
|
||||
IMultiQI* This,
|
||||
ULONG cMQIs,
|
||||
MULTI_QI* pMQIs);
|
||||
|
||||
END_INTERFACE
|
||||
};
|
||||
|
||||
#ifdef COBJMACROS
|
||||
/*** IUnknown methods ***/
|
||||
#define IMultiQI_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
|
||||
#define IMultiQI_AddRef(p) (p)->lpVtbl->AddRef(p)
|
||||
#define IMultiQI_Release(p) (p)->lpVtbl->Release(p)
|
||||
/*** IMultiQI methods ***/
|
||||
#define IMultiQI_QueryMultipleInterfaces(p,a,b) (p)->lpVtbl->QueryMultipleInterfaces(p,a,b)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
HRESULT CALLBACK IMultiQI_QueryMultipleInterfaces_Proxy(
|
||||
IMultiQI* This,
|
||||
ULONG cMQIs,
|
||||
MULTI_QI* pMQIs);
|
||||
void __RPC_STUB IMultiQI_QueryMultipleInterfaces_Stub(
|
||||
struct IRpcStubBuffer* This,
|
||||
struct IRpcChannelBuffer* pRpcChannelBuffer,
|
||||
PRPC_MESSAGE pRpcMessage,
|
||||
DWORD* pdwStubPhase);
|
||||
|
||||
#endif /* __IMultiQI_INTERFACE_DEFINED__ */
|
||||
|
||||
|
||||
#endif /* __WINE_OBJIDL_H */
|
||||
|
||||
Reference in New Issue
Block a user