wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Jacek Caban : ws2def.h: Added ADDRINFOEX declaration.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 59d123288c087f238339faa6a18662d72c6833ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=59d123288c087f238339faa6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:49 2015 +0200 ws2def.h: Added ADDRINFOEX declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2def.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/ws2def.h b/include/ws2def.h index 6255c68..5ea8ff3 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -110,4 +110,32 @@ typedef struct _WSAMSG { (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) +typedef struct addrinfoexA { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + GUID *ai_provider; + struct addrinfoexA *ai_next; +} ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; + +typedef struct addrinfoexW { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + WCHAR *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + GUID *ai_provider; + struct addrinfoexW *ai_next; +} ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW; + #endif /* _WS2DEF_ */

1 0

Jacek Caban : windns.h: Added DnsCancelQuery declaration.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 61ee6d25ddb492e9892cfbdfa0b7c05886149de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ee6d25ddb492e9892cfbdfa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 15:50:41 2015 +0200 windns.h: Added DnsCancelQuery declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windns.h | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/include/windns.h b/include/windns.h index fc2a49c..7b11e3a 100644 --- a/include/windns.h +++ b/include/windns.h @@ -618,6 +618,67 @@ typedef struct _DnsRRSet _prrset->pLastRR->pNext = NULL; \ } +#define DNS_ADDR_MAX_SOCKADDR_LENGTH 32 + +#include <pshpack1.h> + +typedef struct _DnsAddr +{ + char MaxSa[DNS_ADDR_MAX_SOCKADDR_LENGTH]; + union { + DWORD DnsAddrUserDword[8]; + } Data; +} DNS_ADDR, *PDNS_ADDR; + +typedef struct _DnsAddrArray +{ + DWORD MaxCount; + DWORD AddrCount; + DWORD Tag; + WORD Family; + WORD WordReserved; + DWORD Flags; + DWORD MatchFlag; + DWORD Reserved1; + DWORD Reserved2; + DNS_ADDR AddrArray[1]; +} DNS_ADDR_ARRAY, *PDNS_ADDR_ARRAY; + +#include <poppack.h> + +#define DNS_QUERY_RESULTS_VERSION1 0x1 + +typedef struct _DNS_QUERY_RESULT +{ + ULONG Version; + DNS_STATUS QueryStatus; + ULONG64 QueryOptions; + DNS_RECORD *pQueryRecords; + void *Reserved; +} DNS_QUERY_RESULT, *PDNS_QUERY_RESULT; + +typedef void WINAPI DNS_QUERY_COMPLETION_ROUTINE(void*,DNS_QUERY_RESULT*); +typedef DNS_QUERY_COMPLETION_ROUTINE *PDNS_QUERY_COMPLETION_ROUTINE; + +#define DNS_QUERY_REQUEST_VERSION1 0x1 + +typedef struct _DNS_QUERY_REQUEST +{ + ULONG Version; + const WCHAR *QueryName; + WORD QueryType; + ULONG64 QueryOptions; + PDNS_ADDR_ARRAY pDnsServerList; + ULONG InterfaceIndex; + PDNS_QUERY_COMPLETION_ROUTINE pQueryCompletionCallback; + void *pQueryContext; +} DNS_QUERY_REQUEST, *PDNS_QUERY_REQUEST; + +typedef struct _DNS_QUERY_CANCEL +{ + char Reserved[32]; +} DNS_QUERY_CANCEL, *PDNS_QUERY_CANCEL; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -635,6 +696,8 @@ DNS_STATUS WINAPI DnsQuery_A(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); DNS_STATUS WINAPI DnsQuery_W(PCWSTR,WORD,DWORD,PVOID,PDNS_RECORDW*,PVOID*); DNS_STATUS WINAPI DnsQuery_UTF8(PCSTR,WORD,DWORD,PVOID,PDNS_RECORDA*,PVOID*); #define DnsQuery WINELIB_NAME_AW(DnsQuery_) +DNS_STATUS WINAPI DnsQueryEx(DNS_QUERY_REQUEST*,DNS_QUERY_RESULT*,DNS_QUERY_CANCEL*); +DNS_STATUS WINAPI DnsCancelQuery(DNS_QUERY_CANCEL*); DNS_STATUS WINAPI DnsQueryConfig(DNS_CONFIG_TYPE,DWORD,PCWSTR,PVOID,PVOID,PDWORD); BOOL WINAPI DnsRecordCompare(PDNS_RECORD,PDNS_RECORD); PDNS_RECORD WINAPI DnsRecordCopyEx(PDNS_RECORD,DNS_CHARSET,DNS_CHARSET);

1 0

Huw Davies : ole32: Silence an incorrect fixme.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: afbb4afc6cb373038ec103d423db74839978d892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbb4afc6cb373038ec103d42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:17 2015 +0100 ole32: Silence an incorrect fixme. The remote unknown object should not implement IExternalConnection. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index a7d00c5..57048c6 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -667,7 +667,8 @@ static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, return S_OK; } - FIXME("No interface for iid %s\n", debugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IExternalConnection)) + FIXME("No interface for iid %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE;

1 0

Huw Davies : ole32/tests: Test calling CoDisconnectObject from within a COM call to the object.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 1dcf3f8e0a7969ffcc99b025aa1ec30837e0adba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf3f8e0a7969ffcc99b025a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:16 2015 +0100 ole32/tests: Test calling CoDisconnectObject from within a COM call to the object. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 117 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 100 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 55c32d6..afa58a5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2927,6 +2927,63 @@ static void UnlockModuleOOP(void) static HWND hwnd_app; +struct local_server +{ + IPersist IPersist_iface; /* a nice short interface */ +}; + +static HRESULT WINAPI local_server_QueryInterface(IPersist *iface, REFIID iid, void **obj) +{ + *obj = NULL; + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IPersist)) + *obj = iface; + + if (*obj) + { + IPersist_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI local_server_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI local_server_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI local_server_GetClassID(IPersist *iface, CLSID *clsid) +{ + HRESULT hr; + + *clsid = IID_IUnknown; + + /* Test calling CoDisconnectObject within a COM call */ + hr = CoDisconnectObject((IUnknown *)iface, 0); + ok(hr == S_OK, "got %08x\n", hr); + + return S_OK; +} + +static const IPersistVtbl local_server_persist_vtbl = +{ + local_server_QueryInterface, + local_server_AddRef, + local_server_Release, + local_server_GetClassID +}; + +struct local_server local_server_class = +{ + {&local_server_persist_vtbl} +}; + static HRESULT WINAPI TestOOP_IClassFactory_QueryInterface( LPCLASSFACTORY iface, REFIID riid, @@ -2961,12 +3018,12 @@ static HRESULT WINAPI TestOOP_IClassFactory_CreateInstance( REFIID riid, LPVOID *ppvObj) { - if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) - { - *ppvObj = iface; - return S_OK; - } - return CLASS_E_CLASSNOTAVAILABLE; + IPersist *persist = &local_server_class.IPersist_iface; + HRESULT hr; + IPersist_AddRef( persist ); + hr = IPersist_QueryInterface( persist, riid, ppvObj ); + IPersist_Release( persist ); + return hr; } static HRESULT WINAPI TestOOP_IClassFactory_LockServer( @@ -2996,24 +3053,25 @@ static void test_register_local_server(void) DWORD cookie; HRESULT hr; HANDLE ready_event; - HANDLE quit_event; DWORD wait; + HANDLE handles[2]; heventShutdown = CreateEventA(NULL, TRUE, FALSE, NULL); + ready_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); + handles[0] = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); + handles[1] = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Repeat Event"); +again: hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&TestOOP_ClassFactory, CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie); ok_ole_success(hr, CoRegisterClassObject); - ready_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); SetEvent(ready_event); - quit_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); - do { - wait = MsgWaitForMultipleObjects(1, &quit_event, FALSE, 30000, QS_ALLINPUT); - if (wait == WAIT_OBJECT_0+1) + wait = MsgWaitForMultipleObjects(2, handles, FALSE, 30000, QS_ALLINPUT); + if (wait == WAIT_OBJECT_0+2) { MSG msg; @@ -3024,12 +3082,20 @@ static void test_register_local_server(void) DispatchMessageA(&msg); } } + else if (wait == WAIT_OBJECT_0+1) + { + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, CoRevokeClassObject); + goto again; + } } - while (wait == WAIT_OBJECT_0+1); + while (wait == WAIT_OBJECT_0+2); ok( wait == WAIT_OBJECT_0, "quit event wait timed out\n" ); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); + CloseHandle(handles[0]); + CloseHandle(handles[1]); } static HANDLE create_target_process(const char *arg) @@ -3057,10 +3123,13 @@ static void test_local_server(void) DWORD cookie; HRESULT hr; IClassFactory * cf; + IPersist *persist; DWORD ret; HANDLE process; HANDLE quit_event; HANDLE ready_event; + HANDLE repeat_event; + CLSID clsid; heventShutdown = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -3127,16 +3196,30 @@ static void test_local_server(void) ready_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); ok( !WaitForSingleObject(ready_event, 10000), "wait timed out\n" ); - CloseHandle(ready_event); - hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf); + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IPersist, (void **)&persist); ok_ole_success(hr, CoCreateInstance); - IClassFactory_Release(cf); + IPersist_Release(persist); - hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf); + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IPersist, (void **)&persist); ok(hr == REGDB_E_CLASSNOTREG, "Second CoCreateInstance on REGCLS_SINGLEUSE object should have failed\n"); + /* Re-register the class and try calling CoDisconnectObject from within a call to that object */ + repeat_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Repeat Event"); + SetEvent(repeat_event); + CloseHandle(repeat_event); + + ok( !WaitForSingleObject(ready_event, 10000), "wait timed out\n" ); + CloseHandle(ready_event); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IPersist, (void **)&persist); + ok_ole_success(hr, CoCreateInstance); + + /* GetClassID will call CoDisconnectObject */ + IPersist_GetClassID(persist, &clsid); + IPersist_Release(persist); + quit_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); SetEvent(quit_event);

1 0

Huw Davies : ole32: Don't block inside CoDisconnectObject.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 327100fef98b2259842e8df4a7a1ebbd7e61ce01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327100fef98b2259842e8df4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:15 2015 +0100 ole32: Don't block inside CoDisconnectObject. This may be called inside a COM call to the object. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 1 + dlls/ole32/compobj_private.h | 4 +++- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/stubmanager.c | 19 ++++++++++++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0d0459a..82904a8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2042,6 +2042,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) manager = get_stub_manager_from_object(apt, lpUnk, FALSE); if (manager) { + stub_manager_disconnect(manager); /* Release stub manager twice, to remove the apartment reference. */ stub_manager_int_release(manager); stub_manager_int_release(manager); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index b2cf92e..7ceee2c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -107,6 +107,7 @@ struct stub_manager */ ULONG norm_refs; /* refcount of normal marshals (CS lock) */ + BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ }; /* imported interface proxy */ @@ -195,6 +196,7 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obje BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; +void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; HRESULT start_apartment_remote_unknown(void) DECLSPEC_HIDDEN; @@ -213,7 +215,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; void RPC_ExecuteCall(struct dispatch_params *params) DECLSPEC_HIDDEN; HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; -void RPC_UnregisterInterface(REFIID riid) DECLSPEC_HIDDEN; +void RPC_UnregisterInterface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN; HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) DECLSPEC_HIDDEN; void RPC_StopLocalServer(void *registration) DECLSPEC_HIDDEN; HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 0797784..e8bf9bf 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1581,7 +1581,7 @@ HRESULT RPC_RegisterInterface(REFIID riid) } /* stub unregistration */ -void RPC_UnregisterInterface(REFIID riid) +void RPC_UnregisterInterface(REFIID riid, BOOL wait) { struct registered_if *rif; EnterCriticalSection(&csRegIf); @@ -1591,7 +1591,7 @@ void RPC_UnregisterInterface(REFIID riid) { if (!--rif->refs) { - RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, TRUE); + RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, wait); list_remove(&rif->entry); HeapFree(GetProcessHeap(), 0, rif); } diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index fa9a704..a7d00c5 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -123,7 +123,8 @@ static void stub_manager_delete_ifstub(struct stub_manager *m, struct ifstub *if list_remove(&ifstub->entry); - RPC_UnregisterInterface(&ifstub->iid); + if (!m->disconnected) + RPC_UnregisterInterface(&ifstub->iid, TRUE); if (ifstub->stubbuffer) IRpcStubBuffer_Release(ifstub->stubbuffer); IUnknown_Release(ifstub->iface); @@ -223,6 +224,7 @@ static struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) * the marshalled ifptr. */ sm->extrefs = 0; + sm->disconnected = FALSE; hres = IUnknown_QueryInterface(object, &IID_IExternalConnection, (void**)&sm->extern_conn); if(FAILED(hres)) @@ -238,6 +240,21 @@ static struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) return sm; } +void stub_manager_disconnect(struct stub_manager *m) +{ + struct ifstub *ifstub; + + EnterCriticalSection(&m->lock); + if (!m->disconnected) + { + LIST_FOR_EACH_ENTRY(ifstub, &m->ifstubs, struct ifstub, entry) + RPC_UnregisterInterface(&ifstub->iid, FALSE); + + m->disconnected = TRUE; + } + LeaveCriticalSection(&m->lock); +} + /* caller must remove stub manager from apartment prior to calling this function */ static void stub_manager_delete(struct stub_manager *m) {

1 0

Huw Davies : ole32: Hold a reference to the stub manager throughout an incoming call.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 35571a725455a1592ba5b761c00fd3733931b148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35571a725455a1592ba5b761c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:14 2015 +0100 ole32: Hold a reference to the stub manager throughout an incoming call. This will enable us to defer deleting the manager until the call has finished. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 3 ++- dlls/ole32/rpc.c | 6 ++++-- dlls/ole32/stubmanager.c | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 857943a..b2cf92e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -195,7 +195,8 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obje BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, + IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; HRESULT start_apartment_remote_unknown(void) DECLSPEC_HIDDEN; HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 2455464..0797784 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -682,7 +682,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, } RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, &message_state->params.stub, + hr = ipid_get_dispatch_params(&ipid, &apt, NULL, &message_state->params.stub, &message_state->params.chan, &message_state->params.iid, &message_state->params.iface); @@ -1441,6 +1441,7 @@ exit: static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { struct dispatch_params *params; + struct stub_manager *stub_manager; APARTMENT *apt; IPID ipid; HRESULT hr; @@ -1456,7 +1457,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) return; } - hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, + hr = ipid_get_dispatch_params(&ipid, &apt, &stub_manager, &params->stub, &params->chan, &params->iid, &params->iface); if (hr != S_OK) { @@ -1514,6 +1515,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) IRpcStubBuffer_Release(params->stub); HeapFree(GetProcessHeap(), 0, params); + stub_manager_int_release(stub_manager); apartment_release(apt); /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 30e2054..fa9a704 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -506,6 +506,7 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, + struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) { @@ -528,7 +529,10 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, *iid = ifstub->iid; *iface = ifstub->iface; - stub_manager_int_release(stubmgr); + if (manager) + *manager = stubmgr; + else + stub_manager_int_release(stubmgr); return S_OK; } else

1 0

Jactry Zeng : winex11: Implement FlashWindowEx.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: c2dc6f3ef26fb18e7766956ef0a8cbadccc364d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2dc6f3ef26fb18e7766956ef… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 13 13:52:37 2015 +0800 winex11: Implement FlashWindowEx. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/window.c | 29 +++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 1 + dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 32 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b7ec06e..b763677 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2767,3 +2767,32 @@ failed: release_win_data( data ); return -1; } + +void CDECL X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) +{ + struct x11drv_win_data *data = get_win_data( pfinfo->hwnd ); + XEvent xev; + + if (!data) + return; + + if (data->mapped) + { + xev.type = ClientMessage; + xev.xclient.window = data->whole_window; + xev.xclient.message_type = x11drv_atom( _NET_WM_STATE ); + xev.xclient.serial = 0; + xev.xclient.display = data->display; + xev.xclient.send_event = True; + xev.xclient.format = 32; + xev.xclient.data.l[0] = pfinfo->dwFlags ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; + xev.xclient.data.l[1] = x11drv_atom( _NET_WM_STATE_DEMANDS_ATTENTION ); + xev.xclient.data.l[2] = 0; + xev.xclient.data.l[3] = 1; + xev.xclient.data.l[4] = 0; + + XSendEvent( data->display, DefaultRootWindow( data->display ), False, + SubstructureNotifyMask, &xev ); + } + release_win_data( data ); +} diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index d9bbebc..182b351 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -30,6 +30,7 @@ @ cdecl EmptyClipboard() X11DRV_EmptyClipboard @ cdecl EndClipboardUpdate() X11DRV_EndClipboardUpdate @ cdecl EnumClipboardFormats(long) X11DRV_EnumClipboardFormats +@ cdecl FlashWindowEx(ptr) X11DRV_FlashWindowEx @ cdecl GetClipboardData(long) X11DRV_GetClipboardData @ cdecl GetDC(long long long ptr ptr long) X11DRV_GetDC @ cdecl IsClipboardFormatAvailable(long) X11DRV_IsClipboardFormatAvailable diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index cb4b0bb..2694d23 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -421,6 +421,7 @@ enum x11drv_atoms XATOM__NET_WM_PING, XATOM__NET_WM_STATE, XATOM__NET_WM_STATE_ABOVE, + XATOM__NET_WM_STATE_DEMANDS_ATTENTION, XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_MAXIMIZED_HORZ, XATOM__NET_WM_STATE_MAXIMIZED_VERT, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 85c69bf..d4f5c84 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -138,6 +138,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_PING", "_NET_WM_STATE", "_NET_WM_STATE_ABOVE", + "_NET_WM_STATE_DEMANDS_ATTENTION", "_NET_WM_STATE_FULLSCREEN", "_NET_WM_STATE_MAXIMIZED_HORZ", "_NET_WM_STATE_MAXIMIZED_VERT",

1 0

Jactry Zeng : user32: Add driver entry point for FlashWindowEx.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: b007a98e1aa0ef53c4ace658d3c5c088eeb29b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b007a98e1aa0ef53c4ace658d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Oct 13 13:51:42 2015 +0800 user32: Add driver entry point for FlashWindowEx. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 12 ++++++++++++ dlls/user32/user_private.h | 1 + dlls/user32/win.c | 2 ++ 3 files changed, 15 insertions(+) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index ced8836..59bfc5c 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -134,6 +134,7 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(CreateDesktopWindow); GET_USER_FUNC(CreateWindow); GET_USER_FUNC(DestroyWindow); + GET_USER_FUNC(FlashWindowEx); GET_USER_FUNC(GetDC); GET_USER_FUNC(MsgWaitForMultipleObjectsEx); GET_USER_FUNC(ReleaseDC); @@ -410,6 +411,10 @@ static void CDECL nulldrv_DestroyWindow( HWND hwnd ) { } +static void CDECL nulldrv_FlashWindowEx( FLASHWINFO *info ) +{ +} + static void CDECL nulldrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { @@ -546,6 +551,7 @@ static USER_DRIVER null_driver = nulldrv_CreateDesktopWindow, nulldrv_CreateWindow, nulldrv_DestroyWindow, + nulldrv_FlashWindowEx, nulldrv_GetDC, nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, @@ -733,6 +739,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) return load_driver()->pCreateWindow( hwnd ); } +static void CDECL loaderdrv_FlashWindowEx( FLASHWINFO *info ) +{ + load_driver()->pFlashWindowEx( info ); +} + static void CDECL loaderdrv_GetDC( HDC hdc, HWND hwnd, HWND top_win, const RECT *win_rect, const RECT *top_rect, DWORD flags ) { @@ -795,6 +806,7 @@ static USER_DRIVER lazy_load_driver = loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, nulldrv_DestroyWindow, + loaderdrv_FlashWindowEx, loaderdrv_GetDC, nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index d3affb0..ead7a53 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -96,6 +96,7 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pCreateDesktopWindow)(HWND); BOOL (CDECL *pCreateWindow)(HWND); void (CDECL *pDestroyWindow)(HWND); + void (CDECL *pFlashWindowEx)(FLASHWINFO*); void (CDECL *pGetDC)(HDC,HWND,HWND,const RECT *,const RECT *,DWORD); DWORD (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD); void (CDECL *pReleaseDC)(HWND,HDC); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index fb320c7..66749e3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3460,6 +3460,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) wndPtr->flags &= ~WIN_NCACTIVATED; } WIN_ReleasePtr( wndPtr ); + USER_Driver->pFlashWindowEx( pfinfo ); return TRUE; } else @@ -3476,6 +3477,7 @@ BOOL WINAPI FlashWindowEx( PFLASHWINFO pfinfo ) WIN_ReleasePtr( wndPtr ); SendMessageW( hwnd, WM_NCACTIVATE, wparam, 0 ); + USER_Driver->pFlashWindowEx( pfinfo ); return wparam; } }

1 0

Jacek Caban : ieframe/tests: Fixed tests on win10.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: bf8103b4e9f19c17bdd58280c050a8528e1f2bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8103b4e9f19c17bdd58280c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 14:10:42 2015 +0200 ieframe/tests: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3e0e760..c8dfa5b 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -452,11 +452,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { + case 63: /* win10 */ case 105: /* TODO */ + case 132: /* win10 */ case 133: /* IE11 */ case 134: /* TODO (IE10) */ case 135: /* IE11 */ case 136: /* TODO (IE10) */ + case 137: /* win10 */ case 138: /* TODO */ case 140: /* TODO (Win7) */ case 144: /* TODO */ @@ -464,6 +467,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 179: /* IE11 */ case 180: /* IE11 */ case 181: /* IE11 */ + case 182: /* win10 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Jacek Caban : mshtml/tests: Fixed some tests on win10.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: f986d3a72fdf8aee8eee381d8c8360f36b1b1005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f986d3a72fdf8aee8eee381d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 13 14:05:29 2015 +0200 mshtml/tests: Fixed some tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index bdb3eb2..0e7781b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -872,7 +872,8 @@ static IHlinkFrame HlinkFrame = { &HlinkFrameVtbl }; static HRESULT WINAPI NewWindowManager_QueryInterface(INewWindowManager *iface, REFIID riid, void **ppv) { - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); + *ppv = NULL; return E_NOINTERFACE; } @@ -2983,7 +2984,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID return E_NOTIMPL; case 83: + case 101: case 102: + case 132: case 133: case 134: /* TODO */ case 135: @@ -2997,6 +3000,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 180: case 181: case 182: + case 183: return E_NOTIMPL; default:

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
75
Older →

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 October 2015