wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Zebediah Figura : quartz/systemclock: Clarify some field names.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: ba5a6436f806ecc5946640f8cc46d07a11d91439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5a6436f806ecc5946640f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 19:11:01 2019 -0500 quartz/systemclock: Clarify some field names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 70 +++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index c445f57..0cc6d87 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct advise_sink { struct list entry; - HANDLE hEvent; - REFERENCE_TIME rtBaseTime, rtIntervalTime; + HANDLE handle; + REFERENCE_TIME due_time, period; }; typedef struct SystemClockImpl { @@ -40,7 +40,7 @@ typedef struct SystemClockImpl { BOOL thread_created; HANDLE thread, notify_event, stop_event; REFERENCE_TIME last_time; - CRITICAL_SECTION safe; + CRITICAL_SECTION cs; /* These lists are ordered by expiration time (soonest first). */ struct list single_sinks, periodic_sinks; @@ -53,12 +53,12 @@ static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) static void insert_advise_sink(struct advise_sink *sink, struct list *queue) { - REFERENCE_TIME due_time = sink->rtBaseTime + sink->rtIntervalTime; + REFERENCE_TIME due_time = sink->due_time + sink->period; struct advise_sink *cursor; LIST_FOR_EACH_ENTRY(cursor, queue, struct advise_sink, entry) { - if (cursor->rtBaseTime + cursor->rtIntervalTime > due_time) + if (cursor->due_time + cursor->period > due_time) { list_add_before(&cursor->entry, &sink->entry); return; @@ -79,17 +79,17 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { TRACE("(%p): Main Loop\n", This); while (TRUE) { - EnterCriticalSection(&This->safe); + EnterCriticalSection(&This->cs); curTime = GetTickCount64() * 10000; /** First SingleShots Advice: sorted list */ LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &This->single_sinks, struct advise_sink, entry) { - if (sink->rtBaseTime + sink->rtIntervalTime > curTime) + if (sink->due_time + sink->period > curTime) break; - SetEvent(sink->hEvent); + SetEvent(sink->handle); list_remove(&sink->entry); heap_free(sink); } @@ -97,23 +97,23 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { if ((entry = list_head(&This->single_sinks))) { sink = LIST_ENTRY(entry, struct advise_sink, entry); - timeOut = (sink->rtBaseTime + sink->rtIntervalTime - curTime) / 10000; + timeOut = (sink->due_time + sink->period - curTime) / 10000; } else timeOut = INFINITE; /** Now Periodics Advice: semi sorted list (sort cannot be used) */ LIST_FOR_EACH_ENTRY(sink, &This->periodic_sinks, struct advise_sink, entry) { - if (sink->rtBaseTime <= curTime) + if (sink->due_time <= curTime) { - DWORD periods = ((curTime - sink->rtBaseTime) / sink->rtIntervalTime) + 1; - ReleaseSemaphore(sink->hEvent, periods, NULL); - sink->rtBaseTime += periods * sink->rtIntervalTime; + DWORD periods = ((curTime - sink->due_time) / sink->period) + 1; + ReleaseSemaphore(sink->handle, periods, NULL); + sink->due_time += periods * sink->period; } - timeOut = min(timeOut, (sink->rtBaseTime - curTime) / 10000); + timeOut = min(timeOut, (sink->due_time - curTime) / 10000); } - LeaveCriticalSection(&This->safe); + LeaveCriticalSection(&This->cs); if (WaitForMultipleObjects(2, handles, FALSE, timeOut) == 0) return 0; @@ -173,8 +173,8 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) CloseHandle(clock->notify_event); CloseHandle(clock->stop_event); } - clock->safe.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&clock->safe); + clock->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&clock->cs); heap_free(clock); } return refcount; @@ -194,12 +194,12 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ ret = GetTickCount64() * 10000; - EnterCriticalSection(&clock->safe); + EnterCriticalSection(&clock->cs); hr = (ret == clock->last_time) ? S_FALSE : S_OK; *time = clock->last_time = ret; - LeaveCriticalSection(&clock->safe); + LeaveCriticalSection(&clock->cs); return hr; } @@ -225,13 +225,13 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, if (!(sink = heap_alloc_zero(sizeof(*sink)))) return E_OUTOFMEMORY; - sink->hEvent = (HANDLE)event; - sink->rtBaseTime = base + offset; - sink->rtIntervalTime = 0; + sink->handle = (HANDLE)event; + sink->due_time = base + offset; + sink->period = 0; - EnterCriticalSection(&clock->safe); + EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->single_sinks); - LeaveCriticalSection(&clock->safe); + LeaveCriticalSection(&clock->cs); notify_thread(clock); @@ -260,13 +260,13 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, if (!(sink = heap_alloc_zero(sizeof(*sink)))) return E_OUTOFMEMORY; - sink->hEvent = (HANDLE)semaphore; - sink->rtBaseTime = start; - sink->rtIntervalTime = period; + sink->handle = (HANDLE)semaphore; + sink->due_time = start; + sink->period = period; - EnterCriticalSection(&clock->safe); + EnterCriticalSection(&clock->cs); insert_advise_sink(sink, &clock->periodic_sinks); - LeaveCriticalSection(&clock->safe); + LeaveCriticalSection(&clock->cs); notify_thread(clock); @@ -281,7 +281,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR TRACE("clock %p, cookie %#lx.\n", clock, cookie); - EnterCriticalSection(&clock->safe); + EnterCriticalSection(&clock->cs); LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) { @@ -289,7 +289,7 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR { list_remove(&sink->entry); heap_free(sink); - LeaveCriticalSection(&clock->safe); + LeaveCriticalSection(&clock->cs); return S_OK; } } @@ -300,12 +300,12 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR { list_remove(&sink->entry); heap_free(sink); - LeaveCriticalSection(&clock->safe); + LeaveCriticalSection(&clock->cs); return S_OK; } } - LeaveCriticalSection(&clock->safe); + LeaveCriticalSection(&clock->cs); return S_FALSE; } @@ -336,8 +336,8 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; list_init(&object->single_sinks); list_init(&object->periodic_sinks); - InitializeCriticalSection(&object->safe); - object->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); + InitializeCriticalSection(&object->cs); + object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); return SystemClockImpl_QueryInterface(&object->IReferenceClock_iface, &IID_IReferenceClock, out); }

1 0

Zebediah Figura : quartz/systemclock: Also wake the semaphore at the given start time.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: b5eff130a7ad8211e91f25f1fe429a81b52ff7de URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5eff130a7ad8211e91f25f1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 19:11:00 2019 -0500 quartz/systemclock: Also wake the semaphore at the given start time. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 4 ++-- dlls/quartz/tests/systemclock.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 8291fe5..c445f57 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -106,11 +106,11 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { { if (sink->rtBaseTime <= curTime) { - DWORD periods = (curTime - sink->rtBaseTime) / sink->rtIntervalTime; + DWORD periods = ((curTime - sink->rtBaseTime) / sink->rtIntervalTime) + 1; ReleaseSemaphore(sink->hEvent, periods, NULL); sink->rtBaseTime += periods * sink->rtIntervalTime; } - timeOut = min(timeOut, ((sink->rtBaseTime + sink->rtIntervalTime) - curTime) / 10000); + timeOut = min(timeOut, (sink->rtBaseTime - curTime) / 10000); } LeaveCriticalSection(&This->safe); diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index 77e6c63..cd291e1 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -160,7 +160,7 @@ static void test_advise(void) hr = IReferenceClock_AdvisePeriodic(clock, current, 500 * 10000, (HSEMAPHORE)semaphore, &cookie); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); + ok(!WaitForSingleObject(semaphore, 10), "Semaphore should be signaled.\n"); for (i = 0; i < 5; ++i) { ok(WaitForSingleObject(semaphore, 480) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n");

1 0

Zebediah Figura : quartz/systemclock: Simplify notifying the advise thread.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: 9ff0c09e389730a8c284873e11eb28511924f93a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ff0c09e389730a8c284873e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 19:10:59 2019 -0500 quartz/systemclock: Simplify notifying the advise thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 133 ++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 87 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 511abf6..8291fe5 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -34,18 +34,16 @@ struct advise_sink }; typedef struct SystemClockImpl { - IReferenceClock IReferenceClock_iface; - LONG ref; - - /** IReferenceClock */ - HANDLE adviseThread; - DWORD adviseThreadId; - BOOL adviseThreadActive; - REFERENCE_TIME last_time; - CRITICAL_SECTION safe; - - /* These lists are ordered by expiration time (soonest first). */ - struct list single_sinks, periodic_sinks; + IReferenceClock IReferenceClock_iface; + LONG ref; + + BOOL thread_created; + HANDLE thread, notify_event, stop_event; + REFERENCE_TIME last_time; + CRITICAL_SECTION safe; + + /* These lists are ordered by expiration time (soonest first). */ + struct list single_sinks, periodic_sinks; } SystemClockImpl; static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -70,25 +68,17 @@ static void insert_advise_sink(struct advise_sink *sink, struct list *queue) list_add_tail(queue, &sink->entry); } -#define MAX_REFTIME (REFERENCE_TIME)(0x7FFFFFFFFFFFFFFF) -#define ADVISE_EXIT (WM_APP + 0) -#define ADVISE_REMOVE (WM_APP + 2) -#define ADVISE_ADD_SINGLESHOT (WM_APP + 4) -#define ADVISE_ADD_PERIODIC (WM_APP + 8) - static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { SystemClockImpl* This = lpParam; struct advise_sink *sink, *cursor; struct list *entry; DWORD timeOut = INFINITE; - MSG msg; REFERENCE_TIME curTime; + HANDLE handles[2] = {This->stop_event, This->notify_event}; TRACE("(%p): Main Loop\n", This); while (TRUE) { - if (timeOut > 0) MsgWaitForMultipleObjects(0, NULL, FALSE, timeOut, QS_POSTMESSAGE|QS_SENDMESSAGE|QS_TIMER); - EnterCriticalSection(&This->safe); curTime = GetTickCount64() * 10000; @@ -124,58 +114,21 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { } LeaveCriticalSection(&This->safe); - - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { - /** if hwnd we suppose that is a windows event ... */ - if (NULL != msg.hwnd) { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } else { - switch (msg.message) { - case WM_QUIT: - case ADVISE_EXIT: - goto outofthread; - case ADVISE_ADD_SINGLESHOT: - case ADVISE_ADD_PERIODIC: - /** set timeout to 0 to do a rescan now */ - timeOut = 0; - break; - case ADVISE_REMOVE: - /** hmmmm what we can do here ... */ - timeOut = INFINITE; - break; - default: - ERR("Unhandled message %u. Critical Path\n", msg.message); - break; - } - } - } - } -outofthread: - TRACE("(%p): Exiting\n", This); - return 0; + if (WaitForMultipleObjects(2, handles, FALSE, timeOut) == 0) + return 0; + } } -/*static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { */ - -static BOOL SystemClockPostMessageToAdviseThread(SystemClockImpl* This, UINT iMsg) { - if (FALSE == This->adviseThreadActive) { - BOOL res; - This->adviseThread = CreateThread(NULL, 0, SystemClockAdviseThread, This, 0, &This->adviseThreadId); - if (NULL == This->adviseThread) return FALSE; - SetThreadPriority(This->adviseThread, THREAD_PRIORITY_TIME_CRITICAL); - This->adviseThreadActive = TRUE; - while(1) { - res = PostThreadMessageW(This->adviseThreadId, iMsg, 0, 0); - /* Let the thread creates its message queue (with MsgWaitForMultipleObjects call) by yielding and retrying */ - if (!res && (GetLastError() == ERROR_INVALID_THREAD_ID)) - Sleep(0); - else - break; + +static void notify_thread(SystemClockImpl *clock) +{ + if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) + { + clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); + clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); + clock->stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); } - return res; - } - return PostThreadMessageW(This->adviseThreadId, iMsg, 0, 0); + SetEvent(clock->notify_event); } static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { @@ -203,20 +156,28 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF return E_NOINTERFACE; } -static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - if (ref == 0) { - if (This->adviseThreadActive && SystemClockPostMessageToAdviseThread(This, ADVISE_EXIT)) { - WaitForSingleObject(This->adviseThread, INFINITE); - CloseHandle(This->adviseThread); +static ULONG WINAPI SystemClockImpl_Release(IReferenceClock *iface) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + ULONG refcount = InterlockedDecrement(&clock->ref); + + TRACE("%p decreasing refcount to %u.\n", clock, refcount); + + if (!refcount) + { + if (clock->thread) + { + SetEvent(clock->stop_event); + WaitForSingleObject(clock->thread, INFINITE); + CloseHandle(clock->thread); + CloseHandle(clock->notify_event); + CloseHandle(clock->stop_event); + } + clock->safe.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&clock->safe); + heap_free(clock); } - This->safe.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->safe); - heap_free(This); - } - return ref; + return refcount; } static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_TIME *time) @@ -272,7 +233,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, insert_advise_sink(sink, &clock->single_sinks); LeaveCriticalSection(&clock->safe); - SystemClockPostMessageToAdviseThread(clock, ADVISE_ADD_SINGLESHOT); + notify_thread(clock); *cookie = (DWORD_PTR)sink; return S_OK; @@ -307,7 +268,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, insert_advise_sink(sink, &clock->periodic_sinks); LeaveCriticalSection(&clock->safe); - SystemClockPostMessageToAdviseThread(clock, ADVISE_ADD_PERIODIC); + notify_thread(clock); *cookie = (DWORD_PTR)sink; return S_OK; @@ -328,7 +289,6 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR { list_remove(&sink->entry); heap_free(sink); - SystemClockPostMessageToAdviseThread(clock, ADVISE_REMOVE); LeaveCriticalSection(&clock->safe); return S_OK; } @@ -340,7 +300,6 @@ static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR { list_remove(&sink->entry); heap_free(sink); - SystemClockPostMessageToAdviseThread(clock, ADVISE_REMOVE); LeaveCriticalSection(&clock->safe); return S_OK; }

1 0

Zebediah Figura : quartz/systemclock: Use GetTickCount64() directly.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: 0467b96c4fae9aca3258f05270b16093895b6b37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0467b96c4fae9aca3258f052… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 19:10:58 2019 -0500 quartz/systemclock: Use GetTickCount64() directly. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index d95bd3a..511abf6 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -82,7 +82,6 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { struct list *entry; DWORD timeOut = INFINITE; MSG msg; - HRESULT hr; REFERENCE_TIME curTime; TRACE("(%p): Main Loop\n", This); @@ -91,12 +90,8 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { if (timeOut > 0) MsgWaitForMultipleObjects(0, NULL, FALSE, timeOut, QS_POSTMESSAGE|QS_SENDMESSAGE|QS_TIMER); EnterCriticalSection(&This->safe); - /*timeOut = IReferenceClock_OnTimerUpdated(This); */ - hr = IReferenceClock_GetTime(&This->IReferenceClock_iface, &curTime); - if (FAILED(hr)) { - timeOut = INFINITE; - goto outrefresh; - } + + curTime = GetTickCount64() * 10000; /** First SingleShots Advice: sorted list */ LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &This->single_sinks, struct advise_sink, entry) @@ -128,7 +123,6 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { timeOut = min(timeOut, ((sink->rtBaseTime + sink->rtIntervalTime) - curTime) / 10000); } -outrefresh: LeaveCriticalSection(&This->safe); while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {

1 0

Zebediah Figura : quartz/systemclock: Use the standard linked list implementation.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: d7e9563b15481ae654c56a0114261d9078efaf06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7e9563b15481ae654c56a01… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 14 19:10:57 2019 -0500 quartz/systemclock: Use the standard linked list implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 262 +++++++++++++++++++++++----------------------- 1 file changed, 130 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e9563b15481ae654c5…

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetVectorArray() helper.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: a4ea70af146850d690e0de64436253aef098a86d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4ea70af146850d690e0de64… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 01:56:25 2019 +0100 d3dx9: Merge the d3dx_effect_SetVectorArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 91 +++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 50 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b471c84..0a52940 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,55 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && param->element_count && param->element_count >= count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_VECTOR: - set_dirty(param); - if (param->type == D3DXPT_FLOAT) - { - if (param->columns == 4) - memcpy(param->data, vector, count * 4 * sizeof(float)); - else - for (i = 0; i < count; ++i) - memcpy((float *)param->data + param->columns * i, vector + i, - param->columns * sizeof(float)); - return D3D_OK; - } - - for (i = 0; i < count; ++i) - { - set_vector(&param->members[i], &vector[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -2923,10 +2874,50 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE const D3DXVECTOR4 *vector, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); - return d3dx9_base_effect_set_vector_array(&effect->base_effect, parameter, vector, count); + if (param && param->element_count && param->element_count >= count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + set_dirty(param); + if (param->type == D3DXPT_FLOAT) + { + if (param->columns == 4) + memcpy(param->data, vector, count * 4 * sizeof(float)); + else + for (i = 0; i < count; ++i) + memcpy((float *)param->data + param->columns * i, vector + i, + param->columns * sizeof(float)); + return D3D_OK; + } + + for (i = 0; i < count; ++i) + set_vector(&param->members[i], &vector[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetVector() helper.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: 6eb69d2cf6a9049a3fedc3ec71146b3745f17e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6eb69d2cf6a9049a3fedc3ec… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 01:56:24 2019 +0100 d3dx9: Merge the d3dx_effect_SetVector() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 99 +++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 53 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ccf9baf..b471c84 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,58 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - set_dirty(param); - if (param->type == D3DXPT_INT && param->bytes == 4) - { - DWORD tmp; - - TRACE("INT fixup\n"); - tmp = (DWORD)(max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI); - tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; - tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; - tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; - - *(INT *)param->data = tmp; - return D3D_OK; - } - if (param->type == D3DXPT_FLOAT) - { - memcpy(param->data, vector, param->columns * sizeof(float)); - return D3D_OK; - } - - set_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2877,10 +2825,55 @@ static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE p static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); + if (param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + set_dirty(param); + if (param->type == D3DXPT_INT && param->bytes == 4) + { + DWORD tmp; + + TRACE("INT fixup.\n"); + tmp = max(min(vector->z, 1.0f), 0.0f) * INT_FLOAT_MULTI; + tmp += ((DWORD)(max(min(vector->y, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((DWORD)(max(min(vector->x, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 16; + tmp += ((DWORD)(max(min(vector->w, 1.0f), 0.0f) * INT_FLOAT_MULTI)) << 24; + + *(int *)param->data = tmp; + return D3D_OK; + } + if (param->type == D3DXPT_FLOAT) + { + memcpy(param->data, vector, param->columns * sizeof(float)); + return D3D_OK; + } + + set_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetVectorArray() helper.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: 4d978ec0812cd18960337d5709853d93d98a1f2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d978ec0812cd18960337d57… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 01:56:23 2019 +0100 d3dx9: Merge the d3dx_effect_GetVectorArray() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 72 ++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ea3c97b..ccf9baf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1278,45 +1278,6 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_vector_array(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!count) return D3D_OK; - - if (vector && param && count <= param->element_count) - { - UINT i; - - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_VECTOR: - for (i = 0; i < count; ++i) - { - get_vector(&param->members[i], &vector[i]); - } - return D3D_OK; - - case D3DXPC_SCALAR: - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) { @@ -2979,10 +2940,41 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE D3DXVECTOR4 *vector, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); - return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count); + if (!count) + return D3D_OK; + + if (vector && param && count <= param->element_count) + { + unsigned int i; + + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_VECTOR: + for (i = 0; i < count; ++i) + get_vector(&param->members[i], &vector[i]); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetVector() helper.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: 3754ba683f2d3ccb16354a75b530c317382929d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3754ba683f2d3ccb16354a75… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 01:56:22 2019 +0100 d3dx9: Merge the d3dx_effect_GetVector() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 77 +++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9736165..ea3c97b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1229,47 +1229,6 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (vector && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - if (param->type == D3DXPT_INT && param->bytes == 4) - { - TRACE("INT fixup\n"); - vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; - vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - return D3D_OK; - } - get_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2966,10 +2925,44 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); + if (vector && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + TRACE("INT fixup.\n"); + vector->x = (((*(int *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + vector->y = (((*(int *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + vector->z = ((*(int *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; + vector->w = (((*(int *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + return D3D_OK; + } + get_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_SetValue() helper.
by Alexandre Julliard 15 Mar '19

15 Mar '19

Module: wine Branch: master Commit: bd731f6dd12d1e61daf3d6abefb3e01be35f5104 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd731f6dd12d1e61daf3d6ab… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 19:07:07 2019 +0100 d3dx9: Merge the d3dx_effect_SetValue() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 145 +++++++++++++++++++++++-------------------------- 1 file changed, 67 insertions(+), 78 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0dc56e2..9736165 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,83 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - unsigned int i; - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - switch (param->type) - { - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *old_texture = ((IUnknown **)param->data)[i]; - IUnknown *new_texture = ((IUnknown **)data)[i]; - - if (new_texture == old_texture) - continue; - - if (new_texture) - IUnknown_AddRef(new_texture); - if (old_texture) - IUnknown_Release(old_texture); - } - /* fallthrough */ - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - TRACE("Copy %u bytes.\n", param->bytes); - memcpy(param->data, data, param->bytes); - set_dirty(param); - break; - - case D3DXPT_STRING: - { - HRESULT hr; - - set_dirty(param); - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) - return hr; - } - break; - } - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); - break; - } - - return D3D_OK; - } - - WARN("Invalid argument specified\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2542,10 +2465,76 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame const void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + unsigned int i; TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); - return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + WARN("Parameter is a sampler, returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *old_texture = ((IUnknown **)param->data)[i]; + IUnknown *new_texture = ((IUnknown **)data)[i]; + + if (new_texture == old_texture) + continue; + + if (new_texture) + IUnknown_AddRef(new_texture); + if (old_texture) + IUnknown_Release(old_texture); + } + /* fallthrough */ + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(param->data, data, param->bytes); + set_dirty(param); + break; + + case D3DXPT_STRING: + { + HRESULT hr; + + set_dirty(param); + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019