November 2020 - Wine-Commits

Zhiyi Zhang : rpcrt4: Implement RpcIfInqId().
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 1775c17f379d09bd62774b4c4349c044ffdf798b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1775c17f379d09bd62774b4c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 1 10:59:34 2020 +0800 rpcrt4: Implement RpcIfInqId(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49257 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d3a934be367e6b7bf7ba2ad127279fa8fc930fc4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 2 +- dlls/rpcrt4/rpcrt4_main.c | 25 ++++++++++++++++++++++++ dlls/rpcrt4/tests/rpc.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ include/rpcdce.h | 3 +++ 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 5d558bff753..ebba3cd503b 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -388,7 +388,7 @@ @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus @ stub RpcIfIdVectorFree -@ stub RpcIfInqId +@ stdcall RpcIfInqId(ptr ptr) @ stdcall RpcImpersonateClient(ptr) @ stdcall RpcInitializeAsyncHandle(ptr long) RpcAsyncInitializeHandle @ stdcall RpcMgmtEnableIdleCleanup() diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index e716f7cfff2..57e33673c7a 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -95,6 +95,12 @@ struct threaddata struct context_handle_list *context_handle_list; }; +struct interface_header +{ + unsigned int length; + RPC_SYNTAX_IDENTIFIER id; +}; + /*********************************************************************** * DllMain * @@ -178,6 +184,25 @@ RPC_STATUS WINAPI RpcStringFreeW(RPC_WSTR* String) return RPC_S_OK; } +/************************************************************************* + * RpcIfInqId [RPCRT4.@] + * + * Get interface UUID and version. + */ +RPC_STATUS WINAPI RpcIfInqId(RPC_IF_HANDLE if_handle, RPC_IF_ID *if_id) +{ + struct interface_header *header = (struct interface_header *)if_handle; + + TRACE("(%p,%p)\n", if_handle, if_id); + + if_id->Uuid = header->id.SyntaxGUID; + if_id->VersMajor = header->id.SyntaxVersion.MajorVersion; + if_id->VersMinor = header->id.SyntaxVersion.MinorVersion; + TRACE("UUID:%s VersMajor:%hu VersMinor:%hu.\n", debugstr_guid(&if_id->Uuid), if_id->VersMajor, + if_id->VersMinor); + return RPC_S_OK; +} + /************************************************************************* * RpcRaiseException [RPCRT4.@] * diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d3a3aee6c8c..ce16145119b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -854,6 +854,55 @@ static void test_RpcBindingFree(void) status); } +static void test_RpcIfInqId(void) +{ + static const GUID guid = {0x12345678, 0xdead, 0xbeef, {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08}}; + static RPC_STATUS (WINAPI *pRpcIfInqId)(RPC_IF_HANDLE, RPC_IF_ID *); + RPC_SERVER_INTERFACE server_interface; + RPC_CLIENT_INTERFACE client_interface; + RPC_IF_HANDLE test_handles[2]; + RPC_STATUS status; + RPC_IF_ID if_id; + UINT test_idx; + + pRpcIfInqId = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "RpcIfInqId"); + + memset(&server_interface, 0, sizeof(server_interface)); + memset(&client_interface, 0, sizeof(client_interface)); + server_interface.InterfaceId.SyntaxGUID = guid; + server_interface.InterfaceId.SyntaxVersion.MajorVersion = 1; + server_interface.InterfaceId.SyntaxVersion.MinorVersion = 2; + client_interface.InterfaceId.SyntaxGUID = guid; + client_interface.InterfaceId.SyntaxVersion.MajorVersion = 1; + client_interface.InterfaceId.SyntaxVersion.MinorVersion = 2; + + /* Crash on Windows */ + if (0) + { + status = pRpcIfInqId(NULL, &if_id); + ok(status == RPC_S_INVALID_ARG, "Expected %#x, got %#x.\n", RPC_S_INVALID_ARG, status); + + status = pRpcIfInqId((RPC_IF_HANDLE)&server_interface, NULL); + ok(status == RPC_S_INVALID_ARG, "Expected %#x, got %#x.\n", RPC_S_INVALID_ARG, status); + } + + test_handles[0] = (RPC_IF_HANDLE)&server_interface; + test_handles[1] = (RPC_IF_HANDLE)&client_interface; + + for (test_idx = 0; test_idx < ARRAY_SIZE(test_handles); ++test_idx) + { + memset(&if_id, 0, sizeof(if_id)); + status = pRpcIfInqId(test_handles[test_idx], &if_id); + ok(status == RPC_S_OK, "Test %u: Expected %#x, got %#x.\n", test_idx, RPC_S_OK, status); + ok(!memcmp(&if_id.Uuid, &guid, sizeof(guid)), "Test %u: Expected UUID %s, got %s.\n", test_idx, + wine_dbgstr_guid(&guid), wine_dbgstr_guid(&if_id.Uuid)); + ok(if_id.VersMajor == 1, "Test %u: Expected major version %hu, got %hu.\n", test_idx, 1, + if_id.VersMajor); + ok(if_id.VersMinor == 2, "Test %u: Expected minor version %hu, got %hu.\n", test_idx, 2, + if_id.VersMinor); + } +} + static void test_RpcServerInqDefaultPrincName(void) { RPC_STATUS ret; @@ -1204,6 +1253,7 @@ START_TEST( rpc ) test_UuidCreate(); test_UuidCreateSequential(); test_RpcBindingFree(); + test_RpcIfInqId(); test_RpcServerInqDefaultPrincName(); test_RpcServerRegisterAuthInfo(); diff --git a/include/rpcdce.h b/include/rpcdce.h index fc1fcea77b9..2b289b26550 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -593,6 +593,9 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringFreeW(RPC_WSTR* String); #define RpcStringFree WINELIB_NAME_AW(RpcStringFree) +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcIfInqId( RPC_IF_HANDLE RpcIfHandle, RPC_IF_ID *RpcIfId ); + RPCRTAPI RPC_STATUS RPC_ENTRY UuidToStringA( UUID* Uuid, RPC_CSTR* StringUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Paul Gofman : ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 7d53600e4d162bff81f6d5fdeb1848cb880c8e30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d53600e4d162bff81f6d5fd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:05 2020 +0300 ntoskrnl.exe: Return STATUS_SUCCESS from ExCreateCallback() stub. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1cad86fced2b8eb32dcc1e2d58858f45e8135ea3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 25ace4f1a39..ec0f376d6cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2054,7 +2054,7 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, { FIXME("(%p, %p, %u, %u): stub\n", obj, attr, create, allow_multiple); - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; }

1 0

Jacek Caban : winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 021799db66ab489c6519a4ccb93af2ef86653830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=021799db66ab489c6519a4cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 20:19:04 2020 +0200 winnt.h: Provide inline NtCurrentTeb implementation for mingw arm builds. Based on mingw-w64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a05b84ecaf6fa1f3343011351f9bdd2e4e5eaf2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/winnt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 41fb6a82897..4c7fd3544a9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2668,6 +2668,13 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } +#elif defined(__arm__) && defined(__MINGW32__) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + struct _TEB *teb; + __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); + return teb; +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Louis Lenders : shcore: Return S_OK in SetCurrentProcessExplicitAppUserModelID.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: d0ec13d31bcdf820979c1e45a5f650ffbcdec0b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ec13d31bcdf820979c1e45… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed May 20 23:19:18 2020 +0200 shcore: Return S_OK in SetCurrentProcessExplicitAppUserModelID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49189 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f8ca13d30ff85665644189ec3823b3f5d1f77dbc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 3f95c1ffd87..e552ba277f7 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -245,7 +245,7 @@ HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site) HRESULT WINAPI SetCurrentProcessExplicitAppUserModelID(const WCHAR *appid) { FIXME("%s: stub\n", debugstr_w(appid)); - return E_NOTIMPL; + return S_OK; } HRESULT WINAPI GetCurrentProcessExplicitAppUserModelID(const WCHAR **appid)

1 0

Aaro Altonen : msado15: Implement _Command get/put CommandType.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: baa0431972184441b7bbdcbde5f2b020d9de57e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa0431972184441b7bbdcbd… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon May 25 17:01:30 2020 +0300 msado15: Implement _Command get/put CommandType. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6255b031af691988f96c4e648c4f0975575f0487) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/command.c | 34 ++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 13 +++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index a96fd739908..9081f1554f3 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -31,8 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct command { - _Command Command_iface; - LONG ref; + _Command Command_iface; + LONG ref; + CommandTypeEnum type; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -193,14 +194,34 @@ static HRESULT WINAPI command_get_Parameters( _Command *iface, Parameters **para static HRESULT WINAPI command_put_CommandType( _Command *iface, CommandTypeEnum type ) { - FIXME( "%p, %d\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %d\n", iface, type ); + + switch (type) + { + case adCmdUnspecified: + case adCmdUnknown: + case adCmdText: + case adCmdTable: + case adCmdStoredProc: + case adCmdFile: + case adCmdTableDirect: + command->type = type; + return S_OK; + } + + return MAKE_ADO_HRESULT( adErrInvalidArgument ); } static HRESULT WINAPI command_get_CommandType( _Command *iface, CommandTypeEnum *type ) { - FIXME( "%p, %p\n", iface, type ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + + TRACE( "%p, %p\n", iface, type ); + + *type = command->type; + return S_OK; } static HRESULT WINAPI command_get_Name(_Command *iface, BSTR *name) @@ -305,6 +326,7 @@ HRESULT Command_create( void **obj ) if (!(command = heap_alloc( sizeof(*command) ))) return E_OUTOFMEMORY; command->Command_iface.lpVtbl = &command_vtbl; + command->type = adCmdUnknown; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index afdf0dfb6aa..e17cda4fdb1 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -706,6 +706,7 @@ static void test_Command(void) _ADO *ado; Command15 *command15; Command25 *command25; + CommandTypeEnum cmd_type = adCmdUnspecified; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -722,6 +723,18 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); Command25_Release( command25 ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdUnknown, "got %08x\n", cmd_type ); + + _Command_put_CommandType( command, adCmdText ); + hr = _Command_get_CommandType( command, &cmd_type ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( cmd_type == adCmdText, "got %08x\n", cmd_type ); + + hr = _Command_put_CommandType( command, 0xdeadbeef ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidArgument ), "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExRegisterCallback() function.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: cdd4c607a654550462b0275d233638846edd78ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd4c607a654550462b0275d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:06 2020 +0300 ntoskrnl.exe: Add stub for ExRegisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7bc99ae1254f467a23b46756dce40a15494f0758) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index ec0f376d6cd..5b99d4d17ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2057,6 +2057,14 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, return STATUS_SUCCESS; } +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, + PCALLBACK_FUNCTION callback_function, void *callback_context) +{ + FIXME("callback_object %p, callback_function %p, callback_context %p stub.\n", + callback_object, callback_function, callback_context); + + return (void *)0xdeadbeef; +} /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) @@ -2993,6 +3001,7 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) if (!pFunc) { hMod = GetModuleHandleW( halW ); + if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); } RtlFreeAnsiString( &routineNameA ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a39247811e5..b65857b82b8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -180,7 +180,7 @@ @ stub ExRaiseException @ stub ExRaiseHardError @ stub ExRaiseStatus -@ stub ExRegisterCallback +@ stdcall ExRegisterCallback(ptr ptr ptr) @ stub ExReinitializeResourceLite @ stdcall ExReleaseResourceForThreadLite(ptr long) @ extern ExSemaphoreObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5152a89842b..fbb9242cd5b 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1296,6 +1296,7 @@ typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); +typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *); #ifdef _WIN64 #define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN @@ -1567,6 +1568,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPI LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Aaro Altonen : msado15: Add IConnectionPoint stub to _Connection.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 27d497896a7e68b6327c2fa69e3b98b5f73f84fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=27d497896a7e68b6327c2fa6… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:17 2020 +0300 msado15: Add IConnectionPoint stub to _Connection. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a8b647d8f89e6927bc1591d505eb63eb5ebfe860) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 8ed39a3a518..be201cb90b3 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct connection; + +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + struct connection *conn; + const IID *riid; +}; + struct connection { _Connection Connection_iface; @@ -41,6 +50,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + struct connection_point cp_connev; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -58,6 +68,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -453,6 +468,86 @@ static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = connpointcontainer_FindConnectionPoint }; +static HRESULT WINAPI connpoint_QueryInterface( IConnectionPoint *iface, REFIID riid, void **obj ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IConnectionPoint, riid )) + { + *obj = &connpoint->IConnectionPoint_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid( riid ) ); + return E_NOINTERFACE; + } + + connection_AddRef( &connpoint->conn->Connection_iface ); + return S_OK; +} + +static ULONG WINAPI connpoint_AddRef( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_AddRef( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static ULONG WINAPI connpoint_Release( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_Release( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static HRESULT WINAPI connpoint_GetConnectionInterface( IConnectionPoint *iface, IID *iid ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, iid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_GetConnectionPointContainer( IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, container ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d\n", connpoint, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, + IEnumConnections **points ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, points ); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connpoint_vtbl = +{ + connpoint_QueryInterface, + connpoint_AddRef, + connpoint_Release, + connpoint_GetConnectionInterface, + connpoint_GetConnectionPointContainer, + connpoint_Advise, + connpoint_Unadvise, + connpoint_EnumConnections +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -466,6 +561,10 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; + connection->cp_connev.conn = connection; + connection->cp_connev.riid = &DIID_ConnectionEvents; + connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); return S_OK;

1 0

Aaro Altonen : msado15: Implement IConnectionPointContainer_FindConnectionPoint.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: c5cb0eea37d3dd28183060fdad1fef71d8cbc15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5cb0eea37d3dd28183060fd… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:18 2020 +0300 msado15: Implement IConnectionPointContainer_FindConnectionPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49303 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1222a3595c8eafaef7df95b3804fa2205ac3c84) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/connection.c | 17 +++++++++++++++-- dlls/msado15/tests/msado15.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index be201cb90b3..9e8c05522ef 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "olectl.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -455,8 +456,20 @@ static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointCo REFIID riid, IConnectionPoint **point ) { struct connection *connection = impl_from_IConnectionPointContainer( iface ); - FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); - return E_NOTIMPL; + + TRACE( "%p, %s %p\n", connection, debugstr_guid( riid ), point ); + + if (!point) return E_POINTER; + + if (IsEqualIID( riid, connection->cp_connev.riid )) + { + *point = &connection->cp_connev.IConnectionPoint_iface; + IConnectionPoint_AddRef( *point ); + return S_OK; + } + + FIXME( "unsupported connection point %s\n", debugstr_guid( riid ) ); + return CONNECT_E_NOCONNECTION; } static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index cd6516d45d6..9cde03dd07a 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <initguid.h> #include <oledb.h> +#include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" @@ -799,10 +800,36 @@ static void test_Command(void) _Command_Release( command ); } +static void test_ConnectionPoint(void) +{ + HRESULT hr; + ULONG refs; + IConnectionPoint *point; + IConnectionPointContainer *pointcontainer; + + hr = CoCreateInstance( &CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, + &IID_IConnectionPointContainer, (void**)&pointcontainer ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_RecordsetEvents, &point ); + ok( hr == CONNECT_E_NOCONNECTION, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); + ok( hr == S_OK, "got %08x\n", hr ); + + refs = IConnectionPoint_Release( point ); + ok( refs == 1, "got %u", refs ); + + IConnectionPointContainer_Release( pointcontainer ); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ConnectionPoint(); test_Fields(); test_Recordset(); test_Stream();

1 0

Zebediah Figura : setupapi: Reset the source file pointer when comparing files.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: 7678c5878aa92a91422ace79f57ca7c3032af834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7678c5878aa92a91422ace79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 11:16:30 2020 -0500 setupapi: Reset the source file pointer when comparing files. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 007a9c9726e455fc99d7362e3bafaa89bec11ab4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 3b5d62b682c..3b0c9477747 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -933,6 +933,8 @@ static BOOL find_existing_inf(const WCHAR *source, WCHAR *target) if (dest_file == INVALID_HANDLE_VALUE) continue; + SetFilePointer( source_file, 0, NULL, FILE_BEGIN ); + if (GetFileSizeEx( dest_file, &dest_file_size ) && dest_file_size.QuadPart == source_file_size.QuadPart && !compare_files( source_file, dest_file ))

1 0

Zebediah Figura : setupapi: Use the original INF source path if possible when copying files.
by Alexandre Julliard Nov. 10, 2020

Nov. 10, 2020

Module: wine Branch: stable Commit: e67cd6901b6ed447ed1355a9366728503b8ca2d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e67cd6901b6ed447ed1355a9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 11 11:16:32 2020 -0500 setupapi: Use the original INF source path if possible when copying files. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35903 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f779f36da3d6bc9b3ae2f223063fc02602fe3dc6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/setupapi/install.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 0859739be5d..ed82d750253 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -32,6 +32,7 @@ #include "winnls.h" #include "winsvc.h" #include "shlobj.h" +#include "shlwapi.h" #include "objidl.h" #include "objbase.h" #include "setupapi.h" @@ -146,6 +147,29 @@ static WCHAR *dup_section_line_field( HINF hinf, const WCHAR *section, const WCH return buffer; } +static void get_inf_src_path( HINF hinf, WCHAR *path ) +{ + const WCHAR *inf_path = PARSER_get_inf_filename( hinf ); + WCHAR pnf_path[MAX_PATH]; + FILE *pnf; + + wcscpy( pnf_path, inf_path ); + PathRemoveExtensionW( pnf_path ); + PathAddExtensionW( pnf_path, L".pnf" ); + if ((pnf = _wfopen( pnf_path, L"r" ))) + { + if (fgetws( path, MAX_PATH, pnf ) && !wcscmp( path, PNF_HEADER )) + { + fgetws( path, MAX_PATH, pnf ); + TRACE("using original source path %s\n", debugstr_w(path)); + fclose( pnf ); + return; + } + fclose( pnf ); + } + wcscpy( path, inf_path ); +} + /*********************************************************************** * copy_files_callback * @@ -175,7 +199,7 @@ static BOOL copy_files_callback( HINF hinf, PCWSTR field, void *arg ) } else { - lstrcpyW( src_root, PARSER_get_inf_filename( hinf ) ); + get_inf_src_path( hinf, src_root ); if ((p = wcsrchr( src_root, '\\' ))) *p = 0; } }

1 0