January 2017 - Wine-commits

Aric Stewart : hidclass.sys: When processing reads fill all the buffers.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 68ecd3b76a7f3ef901cf2b648d25773b8ab9db91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ecd3b76a7f3ef901cf2b648… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jan 26 08:59:22 2017 -0600 hidclass.sys: When processing reads fill all the buffers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 36 +++++++++++++++++++++++++++++++++++- dlls/hidclass.sys/device.c | 2 +- dlls/hidclass.sys/hid.h | 3 ++- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index 0b29f97..731f1e0 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -127,7 +127,7 @@ NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) return STATUS_SUCCESS; } -void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) +void RingBuffer_ReadNew(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) { void *ret = NULL; @@ -155,6 +155,40 @@ void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UI } } +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) +{ + int pointer; + void *ret = NULL; + + EnterCriticalSection(&ring->lock); + if (index >= ring->pointer_alloc || ring->pointers[index] == POINTER_UNUSED + || ring->end == ring->start) + { + LeaveCriticalSection(&ring->lock); + *size = 0; + return; + } + + pointer = ring->pointers[index]; + + if (pointer == ring->end) + pointer--; + + if (pointer < 0) + pointer = ring->size - 1; + + ret = &ring->buffer[pointer * ring->buffer_size]; + memcpy(output, ret, ring->buffer_size); + if (pointer == ring->pointers[index]) + { + ring->pointers[index]++; + if (ring->pointers[index] == ring->size) + ring->pointers[index] = 0; + } + LeaveCriticalSection(&ring->lock); + *size = ring->buffer_size; +} + UINT RingBuffer_AddPointer(struct ReportRingBuffer *ring) { UINT idx; diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index fe79212..ff9655e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -663,7 +663,7 @@ NTSTATUS WINAPI HID_Device_read(DEVICE_OBJECT *device, IRP *irp) ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); irp->IoStatus.Information = 0; - RingBuffer_Read(ext->ring_buffer, ptr, packet, &buffer_size); + RingBuffer_ReadNew(ext->ring_buffer, ptr, packet, &buffer_size); if (buffer_size) { diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index adc547c..1829319 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -62,7 +62,8 @@ typedef struct _BASE_DEVICE_EXTENSION { void RingBuffer_Write(struct ReportRingBuffer *buffer, void *data) DECLSPEC_HIDDEN; UINT RingBuffer_AddPointer(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_RemovePointer(struct ReportRingBuffer *ring, UINT index) DECLSPEC_HIDDEN; -void RingBuffer_Read(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; +void RingBuffer_Read(struct ReportRingBuffer *ring, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; +void RingBuffer_ReadNew(struct ReportRingBuffer *buffer, UINT index, void *output, UINT *size) DECLSPEC_HIDDEN; UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; UINT RingBuffer_GetSize(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN;

1 0

Piotr Caban : msvcr100: Add reader_writer_lock class stub.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 245426c77e3ca31dc3eca00a79c734b71a6bd754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=245426c77e3ca31dc3eca00a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 26 17:30:20 2017 +0100 msvcr100: Add reader_writer_lock class stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 28 ++++++------- dlls/msvcr100/msvcr100.spec | 28 ++++++------- dlls/msvcr110/msvcr110.spec | 42 ++++++++++---------- dlls/msvcr120/msvcr120.spec | 42 ++++++++++---------- dlls/msvcr120_app/msvcr120_app.spec | 42 ++++++++++---------- dlls/msvcrt/lock.c | 79 +++++++++++++++++++++++++++++++++++++ 6 files changed, 170 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=245426c77e3ca31dc3eca…

1 0

Piotr Caban : msvcr100: Add reader_writer_lock implementation.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: a9c215cee3fee0df604c993e5ced26d4d525c7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c215cee3fee0df604c993e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 26 17:30:30 2017 +0100 msvcr100: Add reader_writer_lock implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/lock.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 170 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 0aa1f1f..8c1061a 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -746,7 +746,17 @@ typedef struct DEFINE_THISCALL_WRAPPER(reader_writer_lock_ctor, 4) reader_writer_lock* __thiscall reader_writer_lock_ctor(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if (!keyed_event) { + HANDLE event; + + NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); + if (InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) + NtClose(event); + } + + memset(this, 0, sizeof(*this)); return this; } @@ -755,7 +765,42 @@ reader_writer_lock* __thiscall reader_writer_lock_ctor(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_dtor, 4) void __thiscall reader_writer_lock_dtor(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if (this->thread_id != 0 || this->count) + WARN("destroying locked reader_writer_lock\n"); +} + +static inline void spin_wait_for_next_rwl(rwl_queue *q) +{ + SpinWait sw; + + if(q->next) return; + + SpinWait_ctor(&sw, &spin_wait_yield); + SpinWait__Reset(&sw); + while(!q->next) + SpinWait__SpinOnce(&sw); + SpinWait_dtor(&sw); +} + +/* Remove when proper InterlockedOr implementation is added to wine */ +static LONG InterlockedOr(LONG *d, LONG v) +{ + LONG l; + while (~(l = *d) & v) + if (InterlockedCompareExchange(d, l|v, l) == l) break; + return l; +} + +static LONG InterlockedAnd(LONG *d, LONG v) +{ + LONG l = *d, old; + while ((l & v) != l) { + if((old = InterlockedCompareExchange(d, l&v, l)) == l) break; + l = old; + } + return l; } /* ?lock(a)reader_writer_lock@Concurrency@@QAEXXZ */ @@ -763,7 +808,30 @@ void __thiscall reader_writer_lock_dtor(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock, 4) void __thiscall reader_writer_lock_lock(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + rwl_queue q = { NULL }, *last; + + TRACE("(%p)\n", this); + + if (this->thread_id == GetCurrentThreadId()) + FIXME("throw improper_lock exception\n"); + + last = InterlockedExchangePointer((void**)&this->writer_tail, &q); + if (last) { + last->next = &q; + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } else { + this->writer_head = &q; + if (InterlockedOr(&this->count, WRITER_WAITING)) + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } + + this->thread_id = GetCurrentThreadId(); + this->writer_head = &this->active; + this->active.next = NULL; + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &this->active, &q) != &q) { + spin_wait_for_next_rwl(&q); + this->active.next = q.next; + } } /* ?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ */ @@ -771,7 +839,37 @@ void __thiscall reader_writer_lock_lock(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_lock_read, 4) void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + rwl_queue q; + + TRACE("(%p)\n", this); + + if (this->thread_id == GetCurrentThreadId()) + FIXME("throw improper_lock exception\n"); + + do { + q.next = this->reader_head; + } while(InterlockedCompareExchangePointer((void**)&this->reader_head, &q, q.next) != q.next); + + if (!q.next) { + rwl_queue *head; + LONG count; + + while (!((count = this->count) & WRITER_WAITING)) + if (InterlockedCompareExchange(&this->count, count+1, count) == count) break; + + if (count & WRITER_WAITING) + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + + head = InterlockedExchangePointer((void**)&this->reader_head, NULL); + while(head && head != &q) { + rwl_queue *next = head->next; + InterlockedIncrement(&this->count); + NtReleaseKeyedEvent(keyed_event, head, 0, NULL); + head = next; + } + } else { + NtWaitForKeyedEvent(keyed_event, &q, 0, NULL); + } } /* ?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ */ @@ -779,7 +877,37 @@ void __thiscall reader_writer_lock_lock_read(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_try_lock, 4) MSVCRT_bool __thiscall reader_writer_lock_try_lock(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + rwl_queue q = { NULL }; + + TRACE("(%p)\n", this); + + if (this->thread_id == GetCurrentThreadId()) + FIXME("throw improper_lock exception\n"); + + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &q, NULL)) + return FALSE; + this->writer_head = &q; + if (!InterlockedCompareExchange(&this->count, WRITER_WAITING, 0)) { + this->thread_id = GetCurrentThreadId(); + this->writer_head = &this->active; + this->active.next = NULL; + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, &this->active, &q) != &q) { + spin_wait_for_next_rwl(&q); + this->active.next = q.next; + } + return TRUE; + } + + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, NULL, &q) == &q) + return FALSE; + spin_wait_for_next_rwl(&q); + this->writer_head = q.next; + if (!InterlockedOr(&this->count, WRITER_WAITING)) { + this->thread_id = GetCurrentThreadId(); + this->writer_head = &this->active; + this->active.next = q.next; + return TRUE; + } return FALSE; } @@ -788,7 +916,12 @@ MSVCRT_bool __thiscall reader_writer_lock_try_lock(reader_writer_lock *this) DEFINE_THISCALL_WRAPPER(reader_writer_lock_try_lock_read, 4) MSVCRT_bool __thiscall reader_writer_lock_try_lock_read(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + LONG count; + + TRACE("(%p)\n", this); + + while (!((count = this->count) & WRITER_WAITING)) + if (InterlockedCompareExchange(&this->count, count+1, count) == count) return TRUE; return FALSE; } @@ -797,7 +930,37 @@ MSVCRT_bool __thiscall reader_writer_lock_try_lock_read(reader_writer_lock *this DEFINE_THISCALL_WRAPPER(reader_writer_lock_unlock, 4) void __thiscall reader_writer_lock_unlock(reader_writer_lock *this) { - FIXME("(%p) stub\n", this); + LONG count; + rwl_queue *head, *next; + + TRACE("(%p)\n", this); + + if ((count = this->count) & ~WRITER_WAITING) { + count = InterlockedDecrement(&this->count); + if (count != WRITER_WAITING) + return; + NtReleaseKeyedEvent(keyed_event, this->writer_head, 0, NULL); + return; + } + + this->thread_id = 0; + next = this->writer_head->next; + if (next) { + NtReleaseKeyedEvent(keyed_event, next, 0, NULL); + return; + } + InterlockedAnd(&this->count, ~WRITER_WAITING); + head = InterlockedExchangePointer((void**)&this->reader_head, NULL); + while (head) { + next = head->next; + InterlockedIncrement(&this->count); + NtReleaseKeyedEvent(keyed_event, head, 0, NULL); + head = next; + } + + if (InterlockedCompareExchangePointer((void**)&this->writer_tail, NULL, this->writer_head) == this->writer_head) + return; + InterlockedOr(&this->count, WRITER_WAITING); } #endif

1 0

Piotr Caban : msvcr100: Add reader_writer_lock tests.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 00475e1dfd56caa47e5f2b5670e77301f07d89aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=00475e1dfd56caa47e5f2b567… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 26 17:30:45 2017 +0100 msvcr100: Add reader_writer_lock tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 4c66ed5..045d698 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -155,6 +155,14 @@ static void (__thiscall *pSpinWait__SetSpinCount)(SpinWait*, unsigned int); static MSVCRT_bool (__thiscall *pSpinWait__ShouldSpinAgain)(SpinWait*); static MSVCRT_bool (__thiscall *pSpinWait__SpinOnce)(SpinWait*); +static void* (__thiscall *preader_writer_lock_ctor)(void*); +static void (__thiscall *preader_writer_lock_dtor)(void*); +static void (__thiscall *preader_writer_lock_lock)(void*); +static void (__thiscall *preader_writer_lock_lock_read)(void*); +static void (__thiscall *preader_writer_lock_unlock)(void*); +static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock)(void*); +static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock_read)(void*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -195,6 +203,14 @@ static BOOL init(void) SET(pSpinWait__SetSpinCount, "?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QEAAXI(a)Z"); SET(pSpinWait__ShouldSpinAgain, "?_ShouldSpinAgain@?$_SpinWait@$00(a)details@Concurrency@@IEAA_NXZ"); SET(pSpinWait__SpinOnce, "?_SpinOnce@?$_SpinWait@$00(a)details@Concurrency@@QEAA_NXZ"); + + SET(preader_writer_lock_ctor, "??0reader_writer_lock(a)Concurrency@@QEAA(a)XZ"); + SET(preader_writer_lock_dtor, "??1reader_writer_lock(a)Concurrency@@QEAA(a)XZ"); + SET(preader_writer_lock_lock, "?lock(a)reader_writer_lock@Concurrency@@QEAAXXZ"); + SET(preader_writer_lock_lock_read, "?lock_read(a)reader_writer_lock@Concurrency@@QEAAXXZ"); + SET(preader_writer_lock_unlock, "?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ"); + SET(preader_writer_lock_try_lock, "?try_lock(a)reader_writer_lock@Concurrency@@QEAA_NXZ"); + SET(preader_writer_lock_try_lock_read, "?try_lock_read(a)reader_writer_lock@Concurrency@@QEAA_NXZ"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); @@ -203,6 +219,14 @@ static BOOL init(void) SET(pSpinWait__SetSpinCount, "?_SetSpinCount@?$_SpinWait@$00(a)details@Concurrency@@QAEXI(a)Z"); SET(pSpinWait__ShouldSpinAgain, "?_ShouldSpinAgain@?$_SpinWait@$00(a)details@Concurrency@@IAE_NXZ"); SET(pSpinWait__SpinOnce, "?_SpinOnce@?$_SpinWait@$00(a)details@Concurrency@@QAE_NXZ"); + + SET(preader_writer_lock_ctor, "??0reader_writer_lock(a)Concurrency@@QAE(a)XZ"); + SET(preader_writer_lock_dtor, "??1reader_writer_lock(a)Concurrency@@QAE(a)XZ"); + SET(preader_writer_lock_lock, "?lock(a)reader_writer_lock@Concurrency@@QAEXXZ"); + SET(preader_writer_lock_lock_read, "?lock_read(a)reader_writer_lock@Concurrency@@QAEXXZ"); + SET(preader_writer_lock_unlock, "?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ"); + SET(preader_writer_lock_try_lock, "?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ"); + SET(preader_writer_lock_try_lock_read, "?try_lock_read(a)reader_writer_lock@Concurrency@@QAE_NXZ"); } init_thiscall_thunk(); @@ -557,6 +581,65 @@ static void test__SpinWait(void) call_func1(pSpinWait_dtor, &sp); } +static DWORD WINAPI lock_read_thread(void *rw_lock) +{ + return (MSVCRT_bool)call_func1(preader_writer_lock_try_lock_read, rw_lock); +} + +static void test_reader_writer_lock(void) +{ + /* define reader_writer_lock data big enough to hold every version of structure */ + char rw_lock[100]; + MSVCRT_bool ret; + HANDLE thread; + DWORD d; + + call_func1(preader_writer_lock_ctor, rw_lock); + + ret = call_func1(preader_writer_lock_try_lock, rw_lock); + ok(ret, "reader_writer_lock:try_lock returned %x\n", ret); + ret = call_func1(preader_writer_lock_try_lock, rw_lock); + ok(!ret, "reader_writer_lock:try_lock returned %x\n", ret); + ret = call_func1(preader_writer_lock_try_lock_read, rw_lock); + ok(!ret, "reader_writer_lock:try_lock_read returned %x\n", ret); + call_func1(preader_writer_lock_unlock, rw_lock); + + /* test lock for read on already locked section */ + ret = call_func1(preader_writer_lock_try_lock_read, rw_lock); + ok(ret, "reader_writer_lock:try_lock_read returned %x\n", ret); + ret = call_func1(preader_writer_lock_try_lock_read, rw_lock); + ok(ret, "reader_writer_lock:try_lock_read returned %x\n", ret); + ret = call_func1(preader_writer_lock_try_lock, rw_lock); + ok(!ret, "reader_writer_lock:try_lock returned %x\n", ret); + call_func1(preader_writer_lock_unlock, rw_lock); + ret = call_func1(preader_writer_lock_try_lock, rw_lock); + ok(!ret, "reader_writer_lock:try_lock returned %x\n", ret); + call_func1(preader_writer_lock_unlock, rw_lock); + ret = call_func1(preader_writer_lock_try_lock, rw_lock); + ok(ret, "reader_writer_lock:try_lock returned %x\n", ret); + call_func1(preader_writer_lock_unlock, rw_lock); + + call_func1(preader_writer_lock_lock, rw_lock); + thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL); + ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n"); + ok(!d, "reader_writer_lock::try_lock_read succeeded on already locked object\n"); + CloseHandle(thread); + call_func1(preader_writer_lock_unlock, rw_lock); + + call_func1(preader_writer_lock_lock_read, rw_lock); + thread = CreateThread(NULL, 0, lock_read_thread, rw_lock, 0, NULL); + ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); + WaitForSingleObject(thread, INFINITE); + ok(GetExitCodeThread(thread, &d), "GetExitCodeThread failed\n"); + ok(d, "reader_writer_lock::try_lock_read failed on object locked for reading\n"); + CloseHandle(thread); + call_func1(preader_writer_lock_unlock, rw_lock); + + call_func1(preader_writer_lock_dtor, rw_lock); +} + START_TEST(msvcr100) { if (!init()) @@ -568,4 +651,5 @@ START_TEST(msvcr100) test__aligned_msize(); test_atoi(); test__SpinWait(); + test_reader_writer_lock(); }

1 0

Sebastian Lackner : ntdll: Catch page faults in NtQueryPerformanceCounter.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: b60b50ba35c762d59b6d1f228a38c5fdf803eec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60b50ba35c762d59b6d1f228… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 26 17:05:10 2017 +0100 ntdll: Catch page faults in NtQueryPerformanceCounter. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/time.c | 23 +++++++++++++++++++++++ dlls/ntdll/time.c | 14 +++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/time.c b/dlls/ntdll/tests/time.c index 48f4640..b684bc1 100644 --- a/dlls/ntdll/tests/time.c +++ b/dlls/ntdll/tests/time.c @@ -26,6 +26,7 @@ static VOID (WINAPI *pRtlTimeToTimeFields)( const LARGE_INTEGER *liTime, PTIME_FIELDS TimeFields) ; static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_INTEGER Time) ; +static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); static const int MonthLengths[2][12] = { @@ -94,13 +95,35 @@ static void test_pRtlTimeToTimeFields(void) } } +static void test_NtQueryPerformanceCounter(void) +{ + LARGE_INTEGER counter, frequency; + NTSTATUS status; + + status = pNtQueryPerformanceCounter(NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + status = pNtQueryPerformanceCounter(NULL, &frequency); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + status = pNtQueryPerformanceCounter(&counter, (void *)0xdeadbee0); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + status = pNtQueryPerformanceCounter((void *)0xdeadbee0, &frequency); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %08x\n", status); + + status = pNtQueryPerformanceCounter(&counter, NULL); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); + status = pNtQueryPerformanceCounter(&counter, &frequency); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); +} + START_TEST(time) { HMODULE mod = GetModuleHandleA("ntdll.dll"); pRtlTimeToTimeFields = (void *)GetProcAddress(mod,"RtlTimeToTimeFields"); pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime"); + pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter"); if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime) test_pRtlTimeToTimeFields(); else win_skip("Required time conversion functions are not available\n"); + test_NtQueryPerformanceCounter(); } diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index d232c4c..3ba3c68 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -46,6 +46,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "wine/exception.h" #include "wine/unicode.h" #include "wine/debug.h" #include "ntdll_misc.h" @@ -472,10 +473,17 @@ NTSTATUS WINAPI NtQuerySystemTime( PLARGE_INTEGER Time ) */ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) { - if (!counter) return STATUS_ACCESS_VIOLATION; + __TRY + { + counter->QuadPart = monotonic_counter(); + if (frequency) frequency->QuadPart = TICKSPERSEC; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY - counter->QuadPart = monotonic_counter(); - if (frequency) frequency->QuadPart = TICKSPERSEC; return STATUS_SUCCESS; }

1 0

Jacek Caban : inetcomm: Added IInternetProtocolInfo stub implementation.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: fe3e5b9c31abdcfe1a3850800d07a9d9974b38a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3e5b9c31abdcfe1a3850800… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 15:22:12 2017 +0100 inetcomm: Added IInternetProtocolInfo stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/tests/mimeole.c | 14 ++++++++ 2 files changed, 91 insertions(+) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index a722550..d560b90 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct { IInternetProtocol IInternetProtocol_iface; + IInternetProtocolInfo IInternetProtocolInfo_iface; LONG ref; } MimeHtmlProtocol; @@ -50,6 +51,9 @@ static HRESULT WINAPI MimeHtmlProtocol_QueryInterface(IInternetProtocol *iface, }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { TRACE("(%p)->(IID_IInternetProtocol %p)\n", iface, ppv); *ppv = &This->IInternetProtocol_iface; + }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { + TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", iface, ppv); + *ppv = &This->IInternetProtocolInfo_iface; }else { FIXME("unknown interface %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -173,6 +177,78 @@ static const IInternetProtocolVtbl MimeHtmlProtocolVtbl = { MimeHtmlProtocol_UnlockRequest }; +static inline MimeHtmlProtocol *impl_from_IInternetProtocolInfo(IInternetProtocolInfo *iface) +{ + return CONTAINING_RECORD(iface, MimeHtmlProtocol, IInternetProtocolInfo_iface); +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, REFIID riid, void **ppv) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + return IInternetProtocol_QueryInterface(&This->IInternetProtocol_iface, riid, ppv); +} + +static ULONG WINAPI MimeHtmlProtocolInfo_AddRef(IInternetProtocolInfo *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + return IInternetProtocol_AddRef(&This->IInternetProtocol_iface); +} + +static ULONG WINAPI MimeHtmlProtocolInfo_Release(IInternetProtocolInfo *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + return IInternetProtocol_Release(&This->IInternetProtocol_iface); +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, + DWORD* pcchResult, DWORD dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %d %x %p %d %p %d)\n", This, debugstr_w(pwzUrl), ParseAction, + dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); + return INET_E_DEFAULT_ACTION; +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_CombineUrl(IInternetProtocolInfo *iface, + LPCWSTR pwzBaseUrl, LPCWSTR pwzRelativeUrl, DWORD dwCombineFlags, LPWSTR pwzResult, + DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %s %08x %p %d %p %d)\n", This, debugstr_w(pwzBaseUrl), + debugstr_w(pwzRelativeUrl), dwCombineFlags, pwzResult, cchResult, + pcchResult, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_CompareUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl1, + LPCWSTR pwzUrl2, DWORD dwCompareFlags) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %s %08x)\n", This, debugstr_w(pwzUrl1), debugstr_w(pwzUrl2), dwCompareFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, + DWORD dwReserved) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); + FIXME("(%p)->(%s %08x %08x %p %d %p %d)\n", This, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, + cbBuffer, pcbBuf, dwReserved); + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; +} + +static const IInternetProtocolInfoVtbl MimeHtmlProtocolInfoVtbl = { + MimeHtmlProtocolInfo_QueryInterface, + MimeHtmlProtocolInfo_AddRef, + MimeHtmlProtocolInfo_Release, + MimeHtmlProtocolInfo_ParseUrl, + MimeHtmlProtocolInfo_CombineUrl, + MimeHtmlProtocolInfo_CompareUrl, + MimeHtmlProtocolInfo_QueryInfo +}; + HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) { MimeHtmlProtocol *protocol; @@ -185,6 +261,7 @@ HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) return E_OUTOFMEMORY; protocol->IInternetProtocol_iface.lpVtbl = &MimeHtmlProtocolVtbl; + protocol->IInternetProtocolInfo_iface.lpVtbl = &MimeHtmlProtocolInfoVtbl; protocol->ref = 1; *obj = &protocol->IInternetProtocol_iface; diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index fed5fbd..7d68a25 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -760,6 +760,18 @@ static void test_MimeOleGetPropertySchema(void) IMimePropertySchema_Release(schema); } +static void test_mhtml_protocol_info(void) +{ + IInternetProtocolInfo *protocol_info; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_IMimeHtmlProtocol, NULL, CLSCTX_INPROC_SERVER, + &IID_IInternetProtocolInfo, (void**)&protocol_info); + ok(hres == S_OK, "Could not create protocol info: %08x\n", hres); + + IInternetProtocolInfo_Release(protocol_info); +} + static void test_mhtml_protocol(void) { IUnknown *unk, *unk2; @@ -777,6 +789,8 @@ static void test_mhtml_protocol(void) ok(hres == E_NOINTERFACE, "IInternetProtocolInfo supported\n"); IUnknown_Release(unk); + + test_mhtml_protocol_info(); } START_TEST(mimeole)

1 0

Jacek Caban : inetcomm: Added COM aggregation support to MimeHtmlProtocol object.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: a1d0c6d721196ff5df3a10bab241b5a835b9bb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d0c6d721196ff5df3a10bab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 26 15:23:04 2017 +0100 inetcomm: Added COM aggregation support to MimeHtmlProtocol object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm_main.c | 9 +++++- dlls/inetcomm/protocol.c | 75 ++++++++++++++++++++++++++++++------------- dlls/inetcomm/tests/mimeole.c | 42 +++++++++++++++++++++--- 3 files changed, 99 insertions(+), 27 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 4cb5522..7543628 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -117,13 +117,20 @@ static HRESULT WINAPI cf_CreateInstance( IClassFactory *iface, LPUNKNOWN pOuter, *ppobj = NULL; + if (pOuter && !IsEqualGUID(&IID_IUnknown, riid)) + return CLASS_E_NOAGGREGATION; + r = This->create_object( pOuter, (LPVOID*) &punk ); if (FAILED(r)) return r; + if (IsEqualGUID(&IID_IUnknown, riid)) { + *ppobj = punk; + return S_OK; + } + r = IUnknown_QueryInterface( punk, riid, ppobj ); IUnknown_Release( punk ); - return r; } diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index d560b90..f6600b9 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -28,31 +28,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct { + IUnknown IUnknown_inner; IInternetProtocol IInternetProtocol_iface; IInternetProtocolInfo IInternetProtocolInfo_iface; + LONG ref; + IUnknown *outer_unk; } MimeHtmlProtocol; -static inline MimeHtmlProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) +static inline MimeHtmlProtocol *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, MimeHtmlProtocol, IInternetProtocol_iface); + return CONTAINING_RECORD(iface, MimeHtmlProtocol, IUnknown_inner); } -static HRESULT WINAPI MimeHtmlProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +static HRESULT WINAPI MimeHtmlProtocol_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { - MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + MimeHtmlProtocol *This = impl_from_IUnknown(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { - TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) { - TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", iface, ppv); + TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv); *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocol, riid)) { - TRACE("(%p)->(IID_IInternetProtocol %p)\n", iface, ppv); + TRACE("(%p)->(IID_IInternetProtocol %p)\n", This, ppv); *ppv = &This->IInternetProtocol_iface; }else if(IsEqualGUID(&IID_IInternetProtocolInfo, riid)) { - TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", iface, ppv); + TRACE("(%p)->(IID_IInternetProtocolInfo %p)\n", This, ppv); *ppv = &This->IInternetProtocolInfo_iface; }else { FIXME("unknown interface %s\n", debugstr_guid(riid)); @@ -64,9 +67,9 @@ static HRESULT WINAPI MimeHtmlProtocol_QueryInterface(IInternetProtocol *iface, return S_OK; } -static ULONG WINAPI MimeHtmlProtocol_AddRef(IInternetProtocol *iface) +static ULONG WINAPI MimeHtmlProtocol_AddRef(IUnknown *iface) { - MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + MimeHtmlProtocol *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -74,9 +77,9 @@ static ULONG WINAPI MimeHtmlProtocol_AddRef(IInternetProtocol *iface) return ref; } -static ULONG WINAPI MimeHtmlProtocol_Release(IInternetProtocol *iface) +static ULONG WINAPI MimeHtmlProtocol_Release(IUnknown *iface) { - MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + MimeHtmlProtocol *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%x\n", This, ref); @@ -87,6 +90,35 @@ static ULONG WINAPI MimeHtmlProtocol_Release(IInternetProtocol *iface) return ref; } +static const IUnknownVtbl MimeHtmlProtocolInnerVtbl = { + MimeHtmlProtocol_QueryInterface, + MimeHtmlProtocol_AddRef, + MimeHtmlProtocol_Release +}; + +static inline MimeHtmlProtocol *impl_from_IInternetProtocol(IInternetProtocol *iface) +{ + return CONTAINING_RECORD(iface, MimeHtmlProtocol, IInternetProtocol_iface); +} + +static HRESULT WINAPI InternetProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); +} + +static ULONG WINAPI InternetProtocol_AddRef(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_AddRef(This->outer_unk); +} + +static ULONG WINAPI InternetProtocol_Release(IInternetProtocol *iface) +{ + MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + return IUnknown_Release(This->outer_unk); +} + static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCHAR *szUrl, IInternetProtocolSink* pOIProtSink, IInternetBindInfo* pOIBindInfo, DWORD grfPI, HANDLE_PTR dwReserved) @@ -162,9 +194,9 @@ static HRESULT WINAPI MimeHtmlProtocol_UnlockRequest(IInternetProtocol *iface) } static const IInternetProtocolVtbl MimeHtmlProtocolVtbl = { - MimeHtmlProtocol_QueryInterface, - MimeHtmlProtocol_AddRef, - MimeHtmlProtocol_Release, + InternetProtocol_QueryInterface, + InternetProtocol_AddRef, + InternetProtocol_Release, MimeHtmlProtocol_Start, MimeHtmlProtocol_Continue, MimeHtmlProtocol_Abort, @@ -185,19 +217,19 @@ static inline MimeHtmlProtocol *impl_from_IInternetProtocolInfo(IInternetProtoco static HRESULT WINAPI MimeHtmlProtocolInfo_QueryInterface(IInternetProtocolInfo *iface, REFIID riid, void **ppv) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - return IInternetProtocol_QueryInterface(&This->IInternetProtocol_iface, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static ULONG WINAPI MimeHtmlProtocolInfo_AddRef(IInternetProtocolInfo *iface) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - return IInternetProtocol_AddRef(&This->IInternetProtocol_iface); + return IUnknown_AddRef(This->outer_unk); } static ULONG WINAPI MimeHtmlProtocolInfo_Release(IInternetProtocolInfo *iface) { MimeHtmlProtocol *This = impl_from_IInternetProtocolInfo(iface); - return IInternetProtocol_Release(&This->IInternetProtocol_iface); + return IUnknown_Release(This->outer_unk); } static HRESULT WINAPI MimeHtmlProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, @@ -253,17 +285,16 @@ HRESULT MimeHtmlProtocol_create(IUnknown *outer, void **obj) { MimeHtmlProtocol *protocol; - if(outer) - FIXME("outer not supported\n"); - protocol = heap_alloc(sizeof(*protocol)); if(!protocol) return E_OUTOFMEMORY; + protocol->IUnknown_inner.lpVtbl = &MimeHtmlProtocolInnerVtbl; protocol->IInternetProtocol_iface.lpVtbl = &MimeHtmlProtocolVtbl; protocol->IInternetProtocolInfo_iface.lpVtbl = &MimeHtmlProtocolInfoVtbl; protocol->ref = 1; + protocol->outer_unk = outer ? outer : &protocol->IUnknown_inner; - *obj = &protocol->IInternetProtocol_iface; + *obj = &protocol->IUnknown_inner; return S_OK; } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 7d68a25..924e0e3 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -772,8 +772,32 @@ static void test_mhtml_protocol_info(void) IInternetProtocolInfo_Release(protocol_info); } +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl outer_vtbl = { + outer_QueryInterface, + outer_AddRef, + outer_Release +}; + static void test_mhtml_protocol(void) { + IUnknown outer = { &outer_vtbl }; + IClassFactory *class_factory; IUnknown *unk, *unk2; HRESULT hres; @@ -781,15 +805,25 @@ static void test_mhtml_protocol(void) hres = CoGetClassObject(&CLSID_IMimeHtmlProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); - hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&unk2); - ok(hres == S_OK, "Could not get IClassFactory iface: %08x\n", hres); - IUnknown_Release(unk2); - hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocolInfo, (void**)&unk2); ok(hres == E_NOINTERFACE, "IInternetProtocolInfo supported\n"); + hres = IUnknown_QueryInterface(unk, &IID_IClassFactory, (void**)&class_factory); + ok(hres == S_OK, "Could not get IClassFactory iface: %08x\n", hres); IUnknown_Release(unk); + hres = IClassFactory_CreateInstance(class_factory, &outer, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "CreateInstance returned: %08x\n", hres); + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == S_OK, "Coult not get IInternetProtocol iface: %08x\n", hres); + IUnknown_Release(unk2); + IUnknown_Release(unk); + + hres = IClassFactory_CreateInstance(class_factory, (IUnknown*)0xdeadbeef, &IID_IInternetProtocol, (void**)&unk2); + ok(hres == CLASS_E_NOAGGREGATION, "CreateInstance returned: %08x\n", hres); + + IClassFactory_Release(class_factory); + test_mhtml_protocol_info(); }

1 0

Nikolay Sivov : dwrite: Initial support for line trimming signs.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 1e8f554ef911e5b961b8e4576f51b19931538196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8f554ef911e5b961b8e4576… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 07:41:50 2017 +0300 dwrite: Initial support for line trimming signs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 82 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index f400671..0d1ffb4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -193,8 +193,9 @@ struct layout_effective_run { struct layout_effective_inline { struct list entry; - const struct layout_run *run; /* nominal run this one is based on */ + IDWriteInlineObject *object; /* inline object, set explicitly or added when trimming a line */ IUnknown *effect; /* original reference is kept only at range level */ + FLOAT baseline; FLOAT origin_x; /* left X position */ FLOAT origin_y; /* left top corner Y position */ FLOAT align_dx; /* adjustment from text alignment */ @@ -1205,11 +1206,12 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const if (!inlineobject) return E_OUTOFMEMORY; - inlineobject->run = r; + inlineobject->object = r->u.object.object; inlineobject->width = get_cluster_range_width(layout, first_cluster, first_cluster + cluster_count); inlineobject->origin_x = is_rtl ? origin_x - inlineobject->width : origin_x; inlineobject->origin_y = 0.0f; /* set after line is built */ inlineobject->align_dx = 0.0f; + inlineobject->baseline = r->baseline; /* It's not clear how these two are set, possibly directionality is derived from surrounding text (replaced text could have @@ -1585,7 +1587,7 @@ static void layout_apply_par_alignment(struct dwrite_textlayout *layout) } while (inrun && inrun->line == line) { - inrun->origin_y = origin_y - inrun->run->baseline; + inrun->origin_y = origin_y - inrun->baseline; inrun = layout_get_next_inline_run(layout, inrun); } } @@ -1722,10 +1724,12 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; struct layout_final_splitting_params params, prev_params; - UINT32 strlength, index, start, pos = *textpos; + DWRITE_INLINE_OBJECT_METRICS sign_metrics = { 0 }; UINT32 line = layout->metrics.lineCount, i; DWRITE_LINE_METRICS1 metrics = { 0 }; + UINT32 index, start, pos = *textpos; FLOAT descent, trailingspacewidth; + BOOL append_trimming_run = FALSE; const struct layout_run *run; FLOAT width, origin_x; HRESULT hr; @@ -1766,6 +1770,26 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust /* Does not include trailing space width */ width = get_cluster_range_width(layout, first_cluster, last_cluster + 1); + /* Append trimming run if necessary */ + if (width > layout->metrics.layoutWidth && layout->format.trimmingsign != NULL && + layout->format.trimming.granularity != DWRITE_TRIMMING_GRANULARITY_NONE) { + FLOAT trimmed_width = width; + + hr = IDWriteInlineObject_GetMetrics(layout->format.trimmingsign, &sign_metrics); + if (SUCCEEDED(hr)) { + while (last_cluster > first_cluster) { + if (trimmed_width + sign_metrics.width <= layout->metrics.layoutWidth) + break; + trimmed_width -= layout->clustermetrics[last_cluster--].width; + } + append_trimming_run = TRUE; + } + else + WARN("Failed to get trimming sign metrics, lines won't be trimmed, hr %#x.\n", hr); + + width = trimmed_width + sign_metrics.width; + } + layout_splitting_params_from_pos(layout, pos, &params); prev_params = params; run = layout->clusters[first_cluster].run; @@ -1795,24 +1819,39 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust if (FAILED(hr)) return; + if (append_trimming_run) { + struct layout_effective_inline *trimming_sign; + + trimming_sign = heap_alloc(sizeof(*trimming_sign)); + if (!trimming_sign) + return; + + trimming_sign->object = layout->format.trimmingsign; + trimming_sign->width = sign_metrics.width; + origin_x += is_rtl ? -get_cluster_range_width(layout, start, i) : get_cluster_range_width(layout, start, i); + trimming_sign->origin_x = is_rtl ? origin_x - trimming_sign->width : origin_x; + trimming_sign->origin_y = 0.0f; /* set after line is built */ + trimming_sign->align_dx = 0.0f; + trimming_sign->baseline = sign_metrics.baseline; + + trimming_sign->is_sideways = FALSE; + trimming_sign->is_rtl = FALSE; + trimming_sign->line = line; + + trimming_sign->effect = NULL; /* FIXME */ + + list_add_tail(&layout->inlineobjects, &trimming_sign->entry); + } + /* Look for max baseline and descent for this line */ - strlength = metrics.length - metrics.trailingWhitespaceLength; - index = last_cluster; - metrics.baseline = 0.0f; - descent = 0.0f; - while (strlength) { - DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; + for (index = first_cluster, metrics.baseline = 0.0f, descent = 0.0f; index <= last_cluster; index++) { const struct layout_run *cur = layout->clusters[index].run; FLOAT cur_descent = cur->height - cur->baseline; if (cur->baseline > metrics.baseline) metrics.baseline = cur->baseline; - if (cur_descent > descent) descent = cur_descent; - - strlength -= cluster->length; - index--; } layout->metrics.width = max(width, layout->metrics.width); @@ -1820,7 +1859,7 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust layout->metrics.widthIncludingTrailingWhitespace); metrics.height = descent + metrics.baseline; - metrics.isTrimmed = width > layout->metrics.layoutWidth; + metrics.isTrimmed = append_trimming_run || width > layout->metrics.layoutWidth; layout_set_line_metrics(layout, &metrics); *textpos += metrics.length; @@ -1937,10 +1976,11 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* Same for inline runs */ while (inrun && inrun->line == line) { - inrun->origin_y = origin_y - inrun->run->baseline; + inrun->origin_y = origin_y - inrun->baseline; inrun = layout_get_next_inline_run(layout, inrun); } } + /* Use last line origin y + line descent as total content height */ line--; layout->metrics.height = origin_y + layout->lines[line].height - layout->lines[line].baseline; @@ -3360,7 +3400,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout3 *iface, context, inlineobject->origin_x + inlineobject->align_dx + origin_x, SNAP_COORD(inlineobject->origin_y + origin_y), - inlineobject->run->u.object.object, + inlineobject->object, inlineobject->is_sideways, inlineobject->is_rtl, inlineobject->effect); @@ -4728,12 +4768,17 @@ static HRESULT WINAPI dwritetrimmingsign_Draw(IDWriteInlineObject *iface, void * { struct dwrite_trimmingsign *This = impl_from_IDWriteInlineObject(iface); DWRITE_TEXT_RANGE range = { 0, ~0u }; + DWRITE_TEXT_METRICS metrics; + DWRITE_LINE_METRICS line; + UINT32 line_count; HRESULT hr; TRACE("(%p)->(%p %p %.2f %.2f %d %d %p)\n", This, context, renderer, originX, originY, is_sideways, is_rtl, effect); IDWriteTextLayout_SetDrawingEffect(This->layout, effect, range); - hr = IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY); + IDWriteTextLayout_GetLineMetrics(This->layout, &line, 1, &line_count); + IDWriteTextLayout_GetMetrics(This->layout, &metrics); + hr = IDWriteTextLayout_Draw(This->layout, context, renderer, originX, originY - line.baseline); IDWriteTextLayout_SetDrawingEffect(This->layout, NULL, range); return hr; } @@ -4844,6 +4889,7 @@ HRESULT create_trimmingsign(IDWriteFactory4 *factory, IDWriteTextFormat *format, } IDWriteTextLayout_SetWordWrapping(This->layout, DWRITE_WORD_WRAPPING_NO_WRAP); + IDWriteTextLayout_SetParagraphAlignment(This->layout, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); *sign = &This->IDWriteInlineObject_iface; return S_OK;

1 0

Huw Davies : gdi32: Add the ability to disable a DC.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: 0805b0d56750637619529e91c301fb5e94d47564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0805b0d56750637619529e91c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:30:19 2017 +0000 gdi32: Add the ability to disable a DC. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 10 ++++++++++ dlls/gdi32/gdi_private.h | 1 + include/wine/gdi_driver.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 27e89ae..892d3e9 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -203,6 +203,11 @@ DC *get_dc_ptr( HDC hdc ) { DC *dc = get_dc_obj( hdc ); if (!dc) return NULL; + if (dc->disabled) + { + GDI_ReleaseObj( hdc ); + return NULL; + } if (!InterlockedCompareExchange( &dc->refcount, 1, 0 )) { @@ -1269,6 +1274,11 @@ WORD WINAPI SetHookFlags( HDC hdc, WORD flags ) else if (flags & DCHF_VALIDATEVISRGN || !flags) ret = InterlockedExchange( &dc->dirty, 0 ); + if (flags & DCHF_DISABLEDC) + ret = InterlockedExchange( &dc->disabled, 1 ); + else if (flags & DCHF_ENABLEDC) + ret = InterlockedExchange( &dc->disabled, 0 ); + GDI_ReleaseObj( hdc ); if (flags & DCHF_RESETDC) ret = reset_dc_state( hdc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e4633d1..ab3c9bb 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -65,6 +65,7 @@ typedef struct tagDC DWORD thread; /* thread owning the DC */ LONG refcount; /* thread refcount */ LONG dirty; /* dirty flag */ + LONG disabled; /* get_dc_ptr() will return NULL. Controlled by DCHF_(DISABLE|ENABLE)DC */ INT saveLevel; struct tagDC *saved_dc; DWORD_PTR dwHookData; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 6f67653..32d17f7 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -266,6 +266,8 @@ static inline ULONG window_surface_release( struct window_surface *surface ) #define DCHF_INVALIDATEVISRGN 0x0001 #define DCHF_VALIDATEVISRGN 0x0002 #define DCHF_RESETDC 0x0004 /* Wine extension */ +#define DCHF_DISABLEDC 0x0008 /* Wine extension */ +#define DCHF_ENABLEDC 0x0010 /* Wine extension */ typedef BOOL (CALLBACK *DCHOOKPROC)(HDC,WORD,DWORD_PTR,LPARAM);

1 0

Huw Davies : user32: Disable cached DCs once they are released.
by Alexandre Julliard 26 Jan '17

26 Jan '17

Module: wine Branch: master Commit: a60144ee74e1db170f04edeb8cfd3a5a17d36d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a60144ee74e1db170f04edeb8… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 26 09:30:20 2017 +0000 user32: Disable cached DCs once they are released. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 13 ++++++++++--- dlls/user32/tests/dce.c | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 622dcad..7a6b0dc 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -476,7 +476,11 @@ static INT release_dc( HWND hwnd, HDC hdc, BOOL end_paint ) { if (!(dce->flags & DCX_NORESETATTRS)) SetHookFlags( dce->hdc, DCHF_RESETDC ); if (end_paint || (dce->flags & DCX_CACHE)) delete_clip_rgn( dce ); - if (dce->flags & DCX_CACHE) dce->count = 0; + if (dce->flags & DCX_CACHE) + { + dce->count = 0; + SetHookFlags( dce->hdc, DCHF_DISABLEDC ); + } ret = TRUE; } USER_Unlock(); @@ -1007,8 +1011,11 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if (!found && count >= DCE_CACHE_SIZE) found = dceUnused; dce = found; - if (dce) dce->count = 1; - + if (dce) + { + dce->count = 1; + SetHookFlags( dce->hdc, DCHF_ENABLEDC ); + } USER_Unlock(); /* if there's no dce empty or unused, allocate a new one */ diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index b5f9722..382d10a 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -112,9 +112,9 @@ static void test_dc_attributes(void) /* Released cache DCs are 'disabled' */ rop = SetROP2( old_hdc, R2_BLACK ); - todo_wine ok( rop == 0, "got %d\n", rop ); + ok( rop == 0, "got %d\n", rop ); rop = GetROP2( old_hdc ); - todo_wine ok( rop == 0, "got %d\n", rop ); + ok( rop == 0, "got %d\n", rop ); /* test own DC */

1 0