May 2020 - Wine-commits - list.winehq.org

Paul Gofman : ntoskrnl.exe: Add stub for ExUnregisterCallback() function.
by Alexandre Julliard 29 May '20

29 May '20

Module: wine Branch: master Commit: 9effc3f96333d809ffba43b975fa062cbf8912d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9effc3f96333d809ffba43b9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:07 2020 +0300 ntoskrnl.exe: Add stub for ExUnregisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f0892141c2..3c8b207a4a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2071,6 +2071,11 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, return (void *)0xdeadbeef; } +void WINAPI ExUnregisterCallback(void *callback_registration) +{ + FIXME("callback_registration %p stub.\n", callback_registration); +} + /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dcec2375df..c442656694 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -191,7 +191,7 @@ @ stdcall ExSetTimerResolution(long long) @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime -@ stub ExUnregisterCallback +@ stdcall ExUnregisterCallback(ptr) @ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 282ea14b77..0d98680cfa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1632,6 +1632,7 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); +void WINAPI ExUnregisterCallback(void*); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG);

1 0

Paul Gofman : ntoskrnl.exe: Reimplement KeSetTimerEx() on top of thread pool.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 68a03b6393220a8f24f862da9db2369349042d50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a03b6393220a8f24f862da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:16 2020 +0300 ntoskrnl.exe: Reimplement KeSetTimerEx() on top of thread pool. This is needed to call the DPC callbacks later as SetWaitableTimer() will call the callback only when the thread is in alertable wait state. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index d5a635efad..1954b8befb 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -388,6 +388,15 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) return ret; } +static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void *timer_, PTP_TIMER tp_timer) +{ + KTIMER *timer = timer_; + + TRACE("instance %p, timer %p, tp_timer %p.\n", instance, timer, tp_timer); + + SetEvent(timer->Header.WaitListHead.Blink); +} + /*********************************************************************** * KeInitializeTimerEx (NTOSKRNL.EXE.@) */ @@ -431,9 +440,18 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, ret = timer->Header.Inserted; timer->Header.Inserted = TRUE; - timer->Header.WaitListHead.Blink = CreateWaitableTimerW( NULL, timer->Header.Type == TYPE_MANUAL_TIMER, NULL ); - SetWaitableTimer( timer->Header.WaitListHead.Blink, &duetime, period, NULL, NULL, FALSE ); + timer->Header.WaitListHead.Blink = CreateEventW( NULL, timer->Header.Type == TYPE_MANUAL_TIMER, FALSE, NULL ); + if (!timer->TimerListEntry.Blink) + timer->TimerListEntry.Blink = (void *)CreateThreadpoolTimer(ke_timer_complete_proc, timer, NULL); + + if (!timer->TimerListEntry.Blink) + ERR("Could not create thread pool timer.\n"); + + timer->DueTime.QuadPart = duetime.QuadPart; + timer->Period = period; + + SetThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink, (FILETIME *)&duetime, period, 0); LeaveCriticalSection( &sync_cs ); return ret; @@ -446,6 +464,21 @@ BOOLEAN WINAPI KeCancelTimer( KTIMER *timer ) TRACE("timer %p.\n", timer); EnterCriticalSection( &sync_cs ); + if (timer->TimerListEntry.Blink) + { + SetThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink, NULL, 0, 0); + + LeaveCriticalSection( &sync_cs ); + WaitForThreadpoolTimerCallbacks((TP_TIMER *)timer->TimerListEntry.Blink, TRUE); + EnterCriticalSection( &sync_cs ); + + if (timer->TimerListEntry.Blink) + { + CloseThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink); + timer->TimerListEntry.Blink = NULL; + } + } + ret = timer->Header.Inserted; timer->Header.Inserted = FALSE; CloseHandle(timer->Header.WaitListHead.Blink);

1 0

Paul Gofman : ntoskrnl.exe: Avoid leaking events on multipe KeSetTimerEx() calls.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 4584ffaddae059ae2308d6f1f81fe143608763d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4584ffaddae059ae2308d6f1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:17 2020 +0300 ntoskrnl.exe: Avoid leaking events on multipe KeSetTimerEx() calls. As the consequent testing shows we can't just close the events on timer reset. That would result in wrong wait results for current waiters. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 1954b8befb..912dc046ba 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -83,9 +83,11 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], { switch (objs[i]->Type) { + case TYPE_MANUAL_TIMER: case TYPE_MANUAL_EVENT: objs[i]->WaitListHead.Blink = CreateEventW( NULL, TRUE, objs[i]->SignalState, NULL ); break; + case TYPE_AUTO_TIMER: case TYPE_AUTO_EVENT: objs[i]->WaitListHead.Blink = CreateEventW( NULL, FALSE, objs[i]->SignalState, NULL ); break; @@ -99,9 +101,6 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], semaphore->Header.SignalState, semaphore->Limit, NULL ); break; } - case TYPE_MANUAL_TIMER: - case TYPE_AUTO_TIMER: - break; } } @@ -137,6 +136,8 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], { switch (objs[i]->Type) { + case TYPE_AUTO_TIMER: + case TYPE_MANUAL_TIMER: case TYPE_MANUAL_EVENT: case TYPE_AUTO_EVENT: case TYPE_SEMAPHORE: @@ -394,7 +395,11 @@ static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void TRACE("instance %p, timer %p, tp_timer %p.\n", instance, timer, tp_timer); - SetEvent(timer->Header.WaitListHead.Blink); + EnterCriticalSection( &sync_cs ); + timer->Header.SignalState = TRUE; + if (timer->Header.WaitListHead.Blink) + SetEvent(timer->Header.WaitListHead.Blink); + LeaveCriticalSection( &sync_cs ); } /*********************************************************************** @@ -440,7 +445,6 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, ret = timer->Header.Inserted; timer->Header.Inserted = TRUE; - timer->Header.WaitListHead.Blink = CreateEventW( NULL, timer->Header.Type == TYPE_MANUAL_TIMER, FALSE, NULL ); if (!timer->TimerListEntry.Blink) timer->TimerListEntry.Blink = (void *)CreateThreadpoolTimer(ke_timer_complete_proc, timer, NULL); @@ -478,11 +482,15 @@ BOOLEAN WINAPI KeCancelTimer( KTIMER *timer ) timer->TimerListEntry.Blink = NULL; } } + timer->Header.SignalState = FALSE; + if (timer->Header.WaitListHead.Blink && !*((ULONG_PTR *)&timer->Header.WaitListHead.Flink)) + { + CloseHandle(timer->Header.WaitListHead.Blink); + timer->Header.WaitListHead.Blink = NULL; + } ret = timer->Header.Inserted; timer->Header.Inserted = FALSE; - CloseHandle(timer->Header.WaitListHead.Blink); - timer->Header.WaitListHead.Blink = NULL; LeaveCriticalSection( &sync_cs ); return ret;

1 0

Paul Gofman : ntoskrnl.exe: Cancel active timer before setting it.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 6cb3588969a9cbad1232dfdb9c0811ffdc7ead2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cb3588969a9cbad1232dfdb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:18 2020 +0300 ntoskrnl.exe: Cancel active timer before setting it. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 912dc046ba..36fa12fe00 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -443,7 +443,9 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, EnterCriticalSection( &sync_cs ); - ret = timer->Header.Inserted; + if ((ret = timer->Header.Inserted)) + KeCancelTimer(timer); + timer->Header.Inserted = TRUE; if (!timer->TimerListEntry.Blink)

1 0

Paul Gofman : ntoskrnl.exe: Support DPCs with timers.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: a4a903f97a11625ea36a8eb0425f89be44d853c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4a903f97a11625ea36a8eb0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:19 2020 +0300 ntoskrnl.exe: Support DPCs with timers. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/sync.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 36fa12fe00..5e06ab2f2b 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -392,9 +392,15 @@ LONG WINAPI KeReleaseMutex( PRKMUTEX mutex, BOOLEAN wait ) static void CALLBACK ke_timer_complete_proc(PTP_CALLBACK_INSTANCE instance, void *timer_, PTP_TIMER tp_timer) { KTIMER *timer = timer_; + KDPC *dpc = timer->Dpc; TRACE("instance %p, timer %p, tp_timer %p.\n", instance, timer, tp_timer); + if (dpc && dpc->DeferredRoutine) + { + TRACE("Calling dpc->DeferredRoutine %p, dpc->DeferredContext %p.\n", dpc->DeferredRoutine, dpc->DeferredContext); + dpc->DeferredRoutine(dpc, dpc->DeferredContext, dpc->SystemArgument1, dpc->SystemArgument2); + } EnterCriticalSection( &sync_cs ); timer->Header.SignalState = TRUE; if (timer->Header.WaitListHead.Blink) @@ -435,12 +441,6 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, TRACE("timer %p, duetime %s, period %d, dpc %p.\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); - if (dpc) - { - FIXME("Unhandled DPC %p.\n", dpc); - return FALSE; - } - EnterCriticalSection( &sync_cs ); if ((ret = timer->Header.Inserted)) @@ -456,6 +456,7 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, timer->DueTime.QuadPart = duetime.QuadPart; timer->Period = period; + timer->Dpc = dpc; SetThreadpoolTimer((TP_TIMER *)timer->TimerListEntry.Blink, (FILETIME *)&duetime, period, 0); LeaveCriticalSection( &sync_cs );

1 0

Paul Gofman : ntoskrnl.exe/tests: Add more timer tests.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 6870f137042b8aac71a1500a6ce81ee8d82dcae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6870f137042b8aac71a1500a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 12:15:20 2020 +0300 ntoskrnl.exe/tests: Add more timer tests. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 88 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dc576bfb1b..e762ad0ccd 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -382,6 +382,14 @@ static void test_critical_region(BOOL is_dispatcher) "KeAreApcsDisabled returned %x\n", result); } +static void sleep_1ms(void) +{ + LARGE_INTEGER timeout; + + timeout.QuadPart = -1 * 10000; + KeDelayExecutionThread( KernelMode, FALSE, &timeout ); +} + static void sleep(void) { LARGE_INTEGER timeout; @@ -447,18 +455,32 @@ static void WINAPI remove_lock_thread(void *arg) PsTerminateSystemThread(STATUS_SUCCESS); } +struct test_sync_dpc_context +{ + BOOL called; +}; + +static void WINAPI test_sync_dpc(KDPC *dpc, void *context, void *system_argument1, void *system_argument2) +{ + struct test_sync_dpc_context *c = context; + + c->called = TRUE; +} + static void test_sync(void) { static const ULONG wine_tag = 0x454e4957; /* WINE */ - KSEMAPHORE semaphore, semaphore2; + struct test_sync_dpc_context dpc_context; KEVENT manual_event, auto_event, *event; - KTIMER timer; + KSEMAPHORE semaphore, semaphore2; IO_REMOVE_LOCK remove_lock; LARGE_INTEGER timeout; OBJECT_ATTRIBUTES attr; HANDLE handle, thread; void *objs[2]; + KTIMER timer; NTSTATUS ret; + KDPC dpc; int i; KeInitializeEvent(&manual_event, NotificationEvent, FALSE); @@ -711,13 +733,19 @@ static void test_sync(void) KeCancelTimer(&timer); KeInitializeTimerEx(&timer, SynchronizationTimer); - KeSetTimerEx(&timer, timeout, 0, NULL); + memset(&dpc_context, 0, sizeof(dpc_context)); + KeInitializeDpc(&dpc, test_sync_dpc, &dpc_context); + + KeSetTimerEx(&timer, timeout, 0, &dpc); ret = wait_single(&timer, 0); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(!dpc_context.called, "DPC was called unexpectedly.\n"); ret = wait_single(&timer, -40 * 10000); ok(ret == 0, "got %#x\n", ret); + sleep_1ms(); + ok(dpc_context.called, "DPC was not called.\n"); ret = wait_single(&timer, -40 * 10000); ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); @@ -742,6 +770,60 @@ static void test_sync(void) KeCancelTimer(&timer); + /* Test cancelling timer. */ + dpc_context.called = 0; + KeSetTimerEx(&timer, timeout, 0, &dpc); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(!dpc_context.called, "DPC was called.\n"); + + KeCancelTimer(&timer); + dpc_context.called = 0; + ret = wait_single(&timer, -40 * 10000); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + ok(!dpc_context.called, "DPC was called.\n"); + + KeSetTimerEx(&timer, timeout, 20, &dpc); + KeSetTimerEx(&timer, timeout, 0, &dpc); + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -40 * 10000); + ok(ret == 0, "got %#x\n", ret); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -40 * 10000); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + ret = wait_single(&timer, -40 * 10000); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + + KeCancelTimer(&timer); + /* Test reinitializing timer. */ + KeSetTimerEx(&timer, timeout, 0, &dpc); + KeInitializeTimerEx(&timer, SynchronizationTimer); + dpc_context.called = 0; + ret = wait_single(&timer, -40 * 10000); + ok(ret == 0, "got %#x\n", ret); + sleep_1ms(); + todo_wine ok(dpc_context.called, "DPC was not called.\n"); + + ret = wait_single(&timer, 0); + ok(ret == WAIT_TIMEOUT, "got %#x\n", ret); + sleep_1ms(); + todo_wine ok(dpc_context.called, "DPC was not called.\n"); + + dpc_context.called = 0; + KeSetTimerEx(&timer, timeout, 0, &dpc); + ret = wait_single(&timer, -40 * 10000); + ok(ret == 0, "got %#x\n", ret); + sleep_1ms(); + ok(dpc_context.called, "DPC was not called.\n"); + + KeCancelTimer(&timer); /* remove locks */ IoInitializeRemoveLockEx(&remove_lock, wine_tag, 0, 0, sizeof(IO_REMOVE_LOCK_COMMON_BLOCK));

1 0

Aaro Altonen : msado15: Add IConnectionPointContainer stub to _Connection.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 93dfc9b60e849a6512d2899f2300d86f4f4140c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93dfc9b60e849a6512d2899f… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Thu May 28 16:13:40 2020 +0300 msado15: Add IConnectionPointContainer stub to _Connection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49272 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 69 ++++++++++++++++++++++++++++++++++++++++---- dlls/msado15/main.c | 1 - dlls/msado15/tests/msado15.c | 5 ++++ 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 2f0aa0c8df..8ed39a3a51 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -20,6 +20,8 @@ #include "windef.h" #include "winbase.h" #define COBJMACROS +#include "initguid.h" +#include "ocidl.h" #include "objbase.h" #include "msado15_backcompat.h" @@ -32,12 +34,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct connection { - _Connection Connection_iface; - ISupportErrorInfo ISupportErrorInfo_iface; - LONG refs; - ObjectStateEnum state; - LONG timeout; - WCHAR *datasource; + _Connection Connection_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + IConnectionPointContainer IConnectionPointContainer_iface; + LONG refs; + ObjectStateEnum state; + LONG timeout; + WCHAR *datasource; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -50,6 +53,11 @@ static inline struct connection *impl_from_ISupportErrorInfo( ISupportErrorInfo return CONTAINING_RECORD( iface, struct connection, ISupportErrorInfo_iface ); } +static inline struct connection *impl_from_IConnectionPointContainer( IConnectionPointContainer *iface ) +{ + return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -83,6 +91,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid { *obj = &connection->ISupportErrorInfo_iface; } + else if (IsEqualGUID( riid, &IID_IConnectionPointContainer )) + { + *obj = &connection->IConnectionPointContainer_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -397,6 +409,50 @@ static const struct ISupportErrorInfoVtbl support_error_vtbl = supporterror_InterfaceSupportsErrorInfo }; +static HRESULT WINAPI connpointcontainer_QueryInterface( IConnectionPointContainer *iface, + REFIID riid, void **obj ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_QueryInterface( &connection->Connection_iface, riid, obj ); +} + +static ULONG WINAPI connpointcontainer_AddRef( IConnectionPointContainer *iface ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_AddRef( &connection->Connection_iface ); +} + +static ULONG WINAPI connpointcontainer_Release( IConnectionPointContainer *iface ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + return connection_Release( &connection->Connection_iface ); +} + +static HRESULT WINAPI connpointcontainer_EnumConnectionPoints( IConnectionPointContainer *iface, + IEnumConnectionPoints **points ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + FIXME( "%p, %p\n", connection, points ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **point ) +{ + struct connection *connection = impl_from_IConnectionPointContainer( iface ); + FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); + return E_NOTIMPL; +} + +static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = +{ + connpointcontainer_QueryInterface, + connpointcontainer_AddRef, + connpointcontainer_Release, + connpointcontainer_EnumConnectionPoints, + connpointcontainer_FindConnectionPoint +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -404,6 +460,7 @@ HRESULT Connection_create( void **obj ) if (!(connection = heap_alloc( sizeof(*connection) ))) return E_OUTOFMEMORY; connection->Connection_iface.lpVtbl = &connection_vtbl; connection->ISupportErrorInfo_iface.lpVtbl = &support_error_vtbl; + connection->IConnectionPointContainer_iface.lpVtbl = &connpointcontainer_vtbl; connection->refs = 1; connection->state = adStateClosed; connection->timeout = 30; diff --git a/dlls/msado15/main.c b/dlls/msado15/main.c index 3115474b84..770a02fc59 100644 --- a/dlls/msado15/main.c +++ b/dlls/msado15/main.c @@ -19,7 +19,6 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "initguid.h" #define COBJMACROS #include "objbase.h" #include "rpcproxy.h" diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 9834f55863..349363b7c5 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -666,6 +666,7 @@ static void test_Connection(void) _Connection *connection; IRunnableObject *runtime; ISupportErrorInfo *errorinfo; + IConnectionPointContainer *pointcontainer; LONG state, timeout; BSTR str, str2; @@ -679,6 +680,10 @@ static void test_Connection(void) ok(hr == S_OK, "Failed to get ISupportErrorInfo interface\n"); ISupportErrorInfo_Release(errorinfo); + hr = _Connection_QueryInterface(connection, &IID_IConnectionPointContainer, (void**)&pointcontainer); + ok(hr == S_OK, "Failed to get IConnectionPointContainer interface %08x\n", hr); + IConnectionPointContainer_Release(pointcontainer); + if (0) /* Crashes on windows */ { hr = _Connection_get_State(connection, NULL);

1 0

Jacek Caban : mshtml: Use return_nsstr_variant in HTMLTable_get_width.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0dfc101e1702b7415f7acffd11534f034854c973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dfc101e1702b7415f7acffd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 23:06:38 2020 +0200 mshtml: Use return_nsstr_variant in HTMLTable_get_width. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 4 ++-- dlls/mshtml/htmltable.c | 38 +++----------------------------------- dlls/mshtml/mshtml_private.h | 4 +++- dlls/mshtml/nsembed.c | 22 +++++++++++++++++----- dlls/mshtml/tests/dom.c | 10 ++++++++++ 5 files changed, 35 insertions(+), 43 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d80c615e72..b2d35f4660 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1234,7 +1234,7 @@ static HRESULT WINAPI HTMLDOMNode3_get_namespaceURI(IHTMLDOMNode3 *iface, VARIAN nsAString_InitDepend(&nsstr, NULL); nsres = nsIDOMNode_GetNamespaceURI(This->nsnode, &nsstr); - return return_nsstr_variant(nsres, &nsstr, p); + return return_nsstr_variant(nsres, &nsstr, 0, p); } static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT v) @@ -1266,7 +1266,7 @@ static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT nsAString_Init(&nsstr, NULL); nsres = nsIDOMNode_GetTextContent(This->nsnode, &nsstr); - return return_nsstr_variant(nsres, &nsstr, p); + return return_nsstr_variant(nsres, &nsstr, 0, p); } static HRESULT WINAPI HTMLDOMNode3_isEqualNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isEqual) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index a37ab35413..2f40bb078d 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -1014,26 +1014,6 @@ static HRESULT var2str(const VARIANT *p, nsAString *nsstr) return ret ? S_OK : E_OUTOFMEMORY; } -static HRESULT nsstr_to_truncated_bstr(const nsAString *nsstr, BSTR *ret_ptr) -{ - const PRUnichar *str, *ptr, *end = NULL; - BSTR ret; - - nsAString_GetData(nsstr, &str); - - for(ptr = str; is_digit(*ptr); ptr++); - if(*ptr == '.') { - for(end = ptr++; is_digit(*ptr); ptr++); - if(*ptr) - end = NULL; - } - - ret = end ? SysAllocStringLen(str, end-str) : SysAllocString(str); - - *ret_ptr = ret; - return ret ? S_OK : E_OUTOFMEMORY; -} - static HRESULT WINAPI HTMLTable_QueryInterface(IHTMLTable *iface, REFIID riid, void **ppv) { @@ -1244,7 +1224,7 @@ static HRESULT WINAPI HTMLTable_get_cellPadding(IHTMLTable *iface, VARIANT *p) nsAString_Init(&val, NULL); nsres = nsIDOMHTMLTableElement_GetCellPadding(This->nstable, &val); - return return_nsstr_variant(nsres, &val, p); + return return_nsstr_variant(nsres, &val, 0, p); } static HRESULT WINAPI HTMLTable_put_background(IHTMLTable *iface, BSTR v) @@ -1440,25 +1420,13 @@ static HRESULT WINAPI HTMLTable_get_width(IHTMLTable *iface, VARIANT *p) { HTMLTable *This = impl_from_IHTMLTable(iface); nsAString val; - BSTR bstr; nsresult nsres; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); + nsAString_Init(&val, NULL); nsres = nsIDOMHTMLTableElement_GetWidth(This->nstable, &val); - if (NS_FAILED(nsres)){ - ERR("Get Width failed!\n"); - nsAString_Finish(&val); - return E_FAIL; - } - - hres = nsstr_to_truncated_bstr(&val, &bstr); - nsAString_Finish(&val); - - V_VT(p) = VT_BSTR; - V_BSTR(p) = bstr; - return hres; + return return_nsstr_variant(nsres, &val, NSSTR_IMPLICIT_PX, p); } static HRESULT WINAPI HTMLTable_put_height(IHTMLTable *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index cc9eefc528..565a2428ba 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -981,9 +981,11 @@ void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; +#define NSSTR_IMPLICIT_PX 0x01 + HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; -HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; +HRESULT return_nsstr_variant(nsresult,nsAString*,unsigned,VARIANT*) DECLSPEC_HIDDEN; HRESULT variant_to_nsstr(VARIANT*,BOOL,nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2122536fc5..2d1eb817dc 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -962,10 +962,8 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) return S_OK; } -HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) +HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p) { - const PRUnichar *str; - if(NS_FAILED(nsres)) { ERR("failed: %08x\n", nsres); nsAString_Finish(nsstr); @@ -976,10 +974,24 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) TRACE("ret null\n"); V_VT(p) = VT_NULL; }else { + const WCHAR *str; + size_t len; nsAString_GetData(nsstr, &str); - TRACE("ret %s\n", debugstr_w(str)); + len = wcslen(str); + if(flags & NSSTR_IMPLICIT_PX) { + const WCHAR *iter; + if(len > 2 && !wcscmp(str + len - 2, L"px")) + len -= 2; + for(iter = str; iter < str + len && is_digit(*iter); iter++); + if(*iter == '.') { + const WCHAR *dot = iter++; + while(iter < str + len && is_digit(*iter)) iter++; + if(iter == str + len && dot) len = dot - str; + } + } + TRACE("ret %s\n", debugstr_wn(str, len)); if(*str) { - V_BSTR(p) = SysAllocString(str); + V_BSTR(p) = SysAllocStringLen(str, len); if(!V_BSTR(p)) { nsAString_Finish(nsstr); return E_OUTOFMEMORY; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 024ea21324..cb8141da93 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7910,6 +7910,16 @@ static void test_table_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"12px"); + hres = IHTMLTable_put_width(table, v); + ok(hres == S_OK, "put_width = %08x\n", hres); + VariantClear(&v); + hres = IHTMLTable_get_width(table, &v); + ok(hres == S_OK, "get_width = %08x\n", hres); + ok(!lstrcmpW(V_BSTR(&v), L"12"), "Expected 12, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"11"); hres = IHTMLTable_put_width(table, v);

1 0

Jacek Caban : mshtml: Add IHTMLTableCell::height property implementation.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 0702f0617718ea457d5d6f7812f27ad4113feefa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0702f0617718ea457d5d6f78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 23:06:47 2020 +0200 mshtml: Add IHTMLTableCell::height property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 2f40bb078d..1429631d44 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -346,15 +346,32 @@ static HRESULT WINAPI HTMLTableCell_get_width(IHTMLTableCell *iface, VARIANT *p) static HRESULT WINAPI HTMLTableCell_put_height(IHTMLTableCell *iface, VARIANT v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hres = variant_to_nsstr(&v, FALSE, &nsstr); + if(FAILED(hres)) + return hres; + + nsres = nsIDOMHTMLTableCellElement_SetHeight(This->nscell, &nsstr); + nsAString_Finish(&nsstr); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLTableCell_get_height(IHTMLTableCell *iface, VARIANT *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTableCellElement_GetHeight(This->nscell, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_IMPLICIT_PX, p); } static HRESULT WINAPI HTMLTableCell_get_cellIndex(IHTMLTableCell *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cb8141da93..433e0d561a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7564,7 +7564,7 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) HRESULT hres; LONG lval; BSTR str; - VARIANT vbg, vDefaultbg; + VARIANT vbg, vDefaultbg, v; test_elem_set_innerhtml((IUnknown*)div, L"<table id=\"tbl\"><tbody>" @@ -7626,6 +7626,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(!lstrcmpW(V_BSTR(&vbg), L"#ff0000"), "Unexpected bgcolor %s\n", wine_dbgstr_w(V_BSTR(&vbg))); VariantClear(&vbg); + V_VT(&v) = VT_I4; + V_I4(&v) = 100; + hres = IHTMLTableCell_put_height(cell, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_height(cell, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"100"), "height = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"110px"); + hres = IHTMLTableCell_put_height(cell, v); + ok(hres == S_OK, "put_height failed: %08x\n", hres); + SysFreeString(V_BSTR(&v)); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_height(cell, &v); + ok(hres == S_OK, "get_height failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Add IHTMLTableCell::width property implementation.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: f6595bbdffeaac5bafd415b5ed1c9b574c4633ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6595bbdffeaac5bafd415b5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 28 23:06:54 2020 +0200 mshtml: Add IHTMLTableCell::width property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltable.c | 25 +++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 1429631d44..43a4f6ba08 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -332,15 +332,32 @@ static HRESULT WINAPI HTMLTableCell_get_borderColorDark(IHTMLTableCell *iface, V static HRESULT WINAPI HTMLTableCell_put_width(IHTMLTableCell *iface, VARIANT v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + hres = variant_to_nsstr(&v, FALSE, &nsstr); + if(FAILED(hres)) + return hres; + + nsres = nsIDOMHTMLTableCellElement_SetWidth(This->nscell, &nsstr); + nsAString_Finish(&nsstr); + return map_nsresult(nsres); } static HRESULT WINAPI HTMLTableCell_get_width(IHTMLTableCell *iface, VARIANT *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLTableCellElement_GetWidth(This->nscell, &nsstr); + return return_nsstr_variant(nsres, &nsstr, NSSTR_IMPLICIT_PX, p); } static HRESULT WINAPI HTMLTableCell_put_height(IHTMLTableCell *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 433e0d561a..25b8b3536c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7649,6 +7649,29 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"110"), "height = %s\n", wine_dbgstr_variant(&v)); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 200; + hres = IHTMLTableCell_put_width(cell, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_width(cell, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"200"), "width = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"210px"); + hres = IHTMLTableCell_put_width(cell, v); + ok(hres == S_OK, "put_width failed: %08x\n", hres); + SysFreeString(V_BSTR(&v)); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLTableCell_get_width(cell, &v); + ok(hres == S_OK, "get_width failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR && !lstrcmpW(V_BSTR(&v), L"210"), "width = %s\n", wine_dbgstr_variant(&v)); + VariantClear(&v); + /* Restore Original */ hres = IHTMLTableCell_put_bgColor(cell, vDefaultbg); ok(hres == S_OK, "put_bgColor failed: %08x\n", hres);

1 0