wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Nikolay Sivov : rtworkq: Add a structure for queue initialization parameters.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: b8805c1e7d23d5273c622a21283ab71ac66613e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8805c1e7d23d5273c622a21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:06 2020 +0300 rtworkq: Add a structure for queue initialization parameters. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index c6a0c68d54..38d376342d 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -136,6 +136,11 @@ static const TP_CALLBACK_PRIORITY priorities[] = TP_CALLBACK_PRIORITY_LOW, }; +struct queue_desc +{ + RTWQ_WORKQUEUE_TYPE queue_type; +}; + struct queue { TP_POOL *pool; @@ -228,7 +233,7 @@ static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IR return item; } -static void init_work_queue(RTWQ_WORKQUEUE_TYPE queue_type, struct queue *queue) +static void init_work_queue(const struct queue_desc *desc, struct queue *queue) { TP_CALLBACK_ENVIRON_V3 env; unsigned int max_thread, i; @@ -250,12 +255,12 @@ static void init_work_queue(RTWQ_WORKQUEUE_TYPE queue_type, struct queue *queue) list_init(&queue->pending_items); InitializeCriticalSection(&queue->cs); - max_thread = (queue_type == RTWQ_STANDARD_WORKQUEUE || queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; + max_thread = (desc->queue_type == RTWQ_STANDARD_WORKQUEUE || desc->queue_type == RTWQ_WINDOW_WORKQUEUE) ? 1 : 4; SetThreadpoolThreadMinimum(queue->pool, 1); SetThreadpoolThreadMaximum(queue->pool, max_thread); - if (queue_type == RTWQ_WINDOW_WORKQUEUE) + if (desc->queue_type == RTWQ_WINDOW_WORKQUEUE) FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); } @@ -277,6 +282,8 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) } else if (queue) { + struct queue_desc desc; + EnterCriticalSection(&queues_section); switch (queue_id) { @@ -288,7 +295,9 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) default: queue_type = RTWQ_STANDARD_WORKQUEUE; } - init_work_queue(queue_type, queue); + + desc.queue_type = queue_type; + init_work_queue(&desc, queue); LeaveCriticalSection(&queues_section); *ret = queue; return S_OK; @@ -604,7 +613,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) return hr; } -static HRESULT alloc_user_queue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue_id) +static HRESULT alloc_user_queue(const struct queue_desc *desc, DWORD *queue_id) { struct queue_handle *entry; struct queue *queue; @@ -618,7 +627,8 @@ static HRESULT alloc_user_queue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue_id) queue = heap_alloc_zero(sizeof(*queue)); if (!queue) return E_OUTOFMEMORY; - init_work_queue(queue_type, queue); + + init_work_queue(desc, queue); EnterCriticalSection(&queues_section); @@ -839,6 +849,8 @@ HRESULT WINAPI RtwqUnlockPlatform(void) static void init_system_queues(void) { + struct queue_desc desc; + /* Always initialize standard queue, keep the rest lazy. */ EnterCriticalSection(&queues_section); @@ -849,7 +861,8 @@ static void init_system_queues(void) return; } - init_work_queue(RTWQ_STANDARD_WORKQUEUE, &system_queues[SYS_QUEUE_STANDARD]); + desc.queue_type = RTWQ_STANDARD_WORKQUEUE; + init_work_queue(&desc, &system_queues[SYS_QUEUE_STANDARD]); LeaveCriticalSection(&queues_section); } @@ -1096,9 +1109,12 @@ HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *res HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queue) { + struct queue_desc desc; + TRACE("%d, %p.\n", queue_type, queue); - return alloc_user_queue(queue_type, queue); + desc.queue_type = queue_type; + return alloc_user_queue(&desc, queue); } HRESULT WINAPI RtwqLockWorkQueue(DWORD queue)

1 0

Nikolay Sivov : rtworkq: Store item priority and callback flags.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 570c969ee7ee4f2ac6099d963bc085901ab70b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=570c969ee7ee4f2ac6099d96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:05 2020 +0300 rtworkq: Store item priority and callback flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 866c2b532f..c6a0c68d54 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -115,6 +115,8 @@ struct work_item IRtwqAsyncResult *result; struct queue *queue; RTWQWORKITEM_KEY key; + LONG priority; + DWORD flags; union { TP_WAIT *wait_object; @@ -204,8 +206,10 @@ static const IUnknownVtbl work_item_vtbl = work_item_Release, }; -static struct work_item * alloc_work_item(struct queue *queue, IRtwqAsyncResult *result) +static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IRtwqAsyncResult *result) { + RTWQASYNCRESULT *async_result = (RTWQASYNCRESULT *)result; + DWORD flags = 0, queue_id = 0; struct work_item *item; item = heap_alloc_zero(sizeof(*item)); @@ -216,6 +220,10 @@ static struct work_item * alloc_work_item(struct queue *queue, IRtwqAsyncResult item->refcount = 1; item->queue = queue; list_init(&item->entry); + item->priority = priority; + + if (SUCCEEDED(IRtwqAsyncCallback_GetParameters(async_result->pCallback, &flags, &queue_id))) + item->flags = flags; return item; } @@ -377,7 +385,7 @@ static HRESULT queue_submit_item(struct queue *queue, LONG priority, IRtwqAsyncR struct work_item *item; TP_WORK *work_object; - if (!(item = alloc_work_item(queue, result))) + if (!(item = alloc_work_item(queue, priority, result))) return E_OUTOFMEMORY; if (priority == 0) @@ -515,7 +523,7 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit PTP_WAIT_CALLBACK callback; struct work_item *item; - if (!(item = alloc_work_item(queue, result))) + if (!(item = alloc_work_item(queue, priority, result))) return E_OUTOFMEMORY; if (key) @@ -543,7 +551,7 @@ static HRESULT queue_submit_timer(struct queue *queue, IRtwqAsyncResult *result, FILETIME filetime; LARGE_INTEGER t; - if (!(item = alloc_work_item(queue, result))) + if (!(item = alloc_work_item(queue, 0, result))) return E_OUTOFMEMORY; if (key)

1 0

Nikolay Sivov : rtworkq: Use IUnknown wrapper for work item management.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: a4143e211c1b5f69e7f9f8edd2fd894eb3173d79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4143e211c1b5f69e7f9f8ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:04 2020 +0300 rtworkq: Use IUnknown wrapper for work item management. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 83 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 59 insertions(+), 24 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index a2fb3824c3..866c2b532f 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -109,8 +109,9 @@ enum system_queue_index struct work_item { - struct list entry; + IUnknown IUnknown_iface; LONG refcount; + struct list entry; IRtwqAsyncResult *result; struct queue *queue; RTWQWORKITEM_KEY key; @@ -121,6 +122,11 @@ struct work_item } u; }; +static struct work_item *work_item_impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct work_item, IUnknown_iface); +} + static const TP_CALLBACK_PRIORITY priorities[] = { TP_CALLBACK_PRIORITY_HIGH, @@ -158,32 +164,59 @@ static void CALLBACK standard_queue_cleanup_callback(void *object_data, void *gr { } -static struct work_item * alloc_work_item(struct queue *queue, IRtwqAsyncResult *result) +static HRESULT WINAPI work_item_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { - struct work_item *item; + if (IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IUnknown_AddRef(iface); + return S_OK; + } - item = heap_alloc_zero(sizeof(*item)); - item->result = result; - IRtwqAsyncResult_AddRef(item->result); - item->refcount = 1; - item->queue = queue; - list_init(&item->entry); + *obj = NULL; + return E_NOINTERFACE; +} - return item; +static ULONG WINAPI work_item_AddRef(IUnknown *iface) +{ + struct work_item *item = work_item_impl_from_IUnknown(iface); + return InterlockedIncrement(&item->refcount); } -static void release_work_item(struct work_item *item) +static ULONG WINAPI work_item_Release(IUnknown *iface) { - if (InterlockedDecrement(&item->refcount) == 0) + struct work_item *item = work_item_impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&item->refcount); + + if (!refcount) { IRtwqAsyncResult_Release(item->result); heap_free(item); } + + return refcount; } -static struct work_item *grab_work_item(struct work_item *item) +static const IUnknownVtbl work_item_vtbl = { - InterlockedIncrement(&item->refcount); + work_item_QueryInterface, + work_item_AddRef, + work_item_Release, +}; + +static struct work_item * alloc_work_item(struct queue *queue, IRtwqAsyncResult *result) +{ + struct work_item *item; + + item = heap_alloc_zero(sizeof(*item)); + + item->IUnknown_iface.lpVtbl = &work_item_vtbl; + item->result = result; + IRtwqAsyncResult_AddRef(item->result); + item->refcount = 1; + item->queue = queue; + list_init(&item->entry); + return item; } @@ -294,7 +327,7 @@ static void shutdown_queue(struct queue *queue) LIST_FOR_EACH_ENTRY_SAFE(item, item2, &queue->pending_items, struct work_item, entry) { list_remove(&item->entry); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } LeaveCriticalSection(&queue->cs); @@ -335,7 +368,7 @@ static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void IRtwqAsyncCallback_Invoke(result->pCallback, item->result); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } static HRESULT queue_submit_item(struct queue *queue, LONG priority, IRtwqAsyncResult *result) @@ -399,7 +432,7 @@ static void queue_release_pending_item(struct work_item *item) { list_remove(&item->entry); item->key = 0; - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } LeaveCriticalSection(&item->queue->cs); } @@ -413,7 +446,7 @@ static void CALLBACK waiting_item_callback(TP_CALLBACK_INSTANCE *instance, void invoke_async_callback(item->result); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } static void CALLBACK waiting_item_cancelable_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_WAIT *wait, @@ -427,7 +460,7 @@ static void CALLBACK waiting_item_cancelable_callback(TP_CALLBACK_INSTANCE *inst invoke_async_callback(item->result); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } static void CALLBACK scheduled_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) @@ -438,7 +471,7 @@ static void CALLBACK scheduled_item_callback(TP_CALLBACK_INSTANCE *instance, voi invoke_async_callback(item->result); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) @@ -451,16 +484,18 @@ static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *in invoke_async_callback(item->result); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } static void CALLBACK periodic_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) { - struct work_item *item = grab_work_item(context); + struct work_item *item = context; + + IUnknown_AddRef(&item->IUnknown_iface); invoke_async_callback(item->result); - release_work_item(item); + IUnknown_Release(&item->IUnknown_iface); } static void queue_mark_item_pending(DWORD mask, struct work_item *item, RTWQWORKITEM_KEY *key) @@ -470,7 +505,7 @@ static void queue_mark_item_pending(DWORD mask, struct work_item *item, RTWQWORK EnterCriticalSection(&item->queue->cs); list_add_tail(&item->queue->pending_items, &item->entry); - grab_work_item(item); + IUnknown_AddRef(&item->IUnknown_iface); LeaveCriticalSection(&item->queue->cs); }

1 0

Nikolay Sivov : include: Add the rest of async callback flags.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 0e2ee84710a2b47c93a3b8a89af151a8dfa0e4bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e2ee84710a2b47c93a3b8a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:03 2020 +0300 include: Add the rest of async callback flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfobjects.idl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 203acc770f..758fd82cb1 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -425,8 +425,11 @@ interface IMFRemoteAsyncCallback : IUnknown HRESULT Invoke([in] HRESULT hr, [in] IUnknown *pRemoteResult); } -cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x0001") -cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x0002" ) +cpp_quote("#define MFASYNC_FAST_IO_PROCESSING_CALLBACK 0x00000001") +cpp_quote("#define MFASYNC_SIGNAL_CALLBACK 0x00000002") +cpp_quote("#define MFASYNC_BLOCKING_CALLBACK 0x00000004") +cpp_quote("#define MFASYNC_REPLY_CALLBACK 0x00000008") +cpp_quote("#define MFASYNC_LOCALIZE_REMOTE_CALLBACK 0x00000010") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_UNDEFINED 0x00000000") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_STANDARD 0x00000001")

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: b24b4ec87566e4853570701afceecb86d48abbe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b24b4ec87566e4853570701a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 11 09:04:01 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 54 +++++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/po/lt.po b/po/lt.po index 18bb45fc37..af0bc8f476 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-05 23:25+0200\n" +"PO-Revision-Date: 2020-02-11 09:01+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.3\n" "X-Project-Style: default\n" #: appwiz.rc:58 @@ -8377,38 +8377,28 @@ msgid "Advanced" msgstr "Pažengęs" #: version.rc:89 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Tinklo diskas" +msgstr "Tinklo nuostatos" #: version.rc:90 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Blogas apsimetimo lygis.\n" +msgstr "&Apsimetimo lygis:" #: version.rc:92 msgid "P&rotection level:" -msgstr "" +msgstr "Ap&saugos lygis:" #: version.rc:95 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Prijungta" +msgstr "Prisijungti:" #: version.rc:97 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "sek." +msgstr "sekundės." #: version.rc:98 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Sėkmė" +msgstr "&Prieiga:" #: version.rc:36 msgid "Data Link Properties" @@ -8419,38 +8409,32 @@ msgid "OLE DB Provider(s)" msgstr "OLE DB tiekėjai" #: version.rc:39 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Parengta" +msgstr "Skaitymas" #: version.rc:40 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Skaityk:" +msgstr "SkaitymasRašymas" #: version.rc:41 msgid "Share Deny None" -msgstr "" +msgstr "Bendra nieko nedrausti" #: version.rc:42 msgid "Share Deny Read" -msgstr "" +msgstr "Bendra drausti skaitymą" #: version.rc:43 msgid "Share Deny Write" -msgstr "" +msgstr "Bendra drausti rašymą" #: version.rc:44 msgid "Share Exclusive" -msgstr "" +msgstr "Bendra išskirtinė" #: version.rc:45 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "I/O rašymai" +msgstr "Rašymas" #: oledlg.rc:55 msgid "Insert Object" @@ -8663,7 +8647,7 @@ msgstr "µs" #: serialui.rc:28 msgid "Settings for %s" -msgstr "%s nustatymai" +msgstr "%s nuostatos" #: serialui.rc:31 msgid "Baud Rate" @@ -12032,7 +12016,7 @@ msgstr "" "\n" "Aplinkos pakeitimai padaryti po SETLOCAL yra lokalūs komandų faile ir\n" "išlaikomi iki kol sutinkamas kitas ENDLOCAL (arba failo pabaiga, kas\n" -"pasitaiko pirmiau), tada atkuriami ankstesnės aplinkos nustatymai.\n" +"pasitaiko pirmiau), tada atkuriamos ankstesnės aplinkos nuostatos.\n" #: cmd.rc:275 msgid "" @@ -13177,7 +13161,7 @@ msgstr "Atverti TypeLib failą ir peržiūrėti jo turinį" #: oleview.rc:107 msgid "Change machine wide Distributed COM settings" -msgstr "Keisti paskirstytojo COM kompiuterio nustatymus" +msgstr "Keisti paskirstytojo COM kompiuterio nuostatas" #: oleview.rc:108 msgid "Run the Wine registry editor" @@ -16049,7 +16033,7 @@ msgstr "Pulto parametrai" #: wineconsole.rc:132 msgid "Retain these settings for later sessions" -msgstr "Išsaugoti vėlesniems seansams" +msgstr "Išsaugoti nuostatas vėlesniems seansams" #: wineconsole.rc:133 msgid "Modify only current session"

1 0

Dmitry Timoshkov : gdiplus: Print fixme in GdipGetNearestColor only once.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: a99cad4ae735143321628e1a2d8e1b87a6d576a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99cad4ae735143321628e1a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 11 13:06:19 2020 +0800 gdiplus: Print fixme in GdipGetNearestColor only once. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 8f3272b281..e8606f6b60 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4785,8 +4785,9 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if (graphics->image->type == ImageTypeBitmap) { + static int once; GpBitmap *bitmap = (GpBitmap *)graphics->image; - if (IsIndexedPixelFormat(bitmap->format)) + if (IsIndexedPixelFormat(bitmap->format) && !once++) FIXME("(%p, %p): Passing color unmodified\n", graphics, argb); }

1 0

Zebediah Figura : d3d9: Stop setting the device state when setting pixel shader constants.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 54cd29bd385bc5e49e7b136c87ba760457022788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54cd29bd385bc5e49e7b136c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:56:00 2020 -0600 d3d9: Stop setting the device state when setting pixel shader constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f6ff9466b1..1ff178881c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3899,9 +3899,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_f(device->update_state, reg_idx, count, (const struct wined3d_vec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_f(device->wined3d_device, - reg_idx, count, (const struct wined3d_vec4 *)data); wined3d_mutex_unlock(); return hr; @@ -3937,9 +3934,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, - reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; @@ -3976,8 +3970,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if wined3d_mutex_lock(); hr = wined3d_stateblock_set_ps_consts_b(device->update_state, reg_idx, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d9: Retrieve pixel shader constants from the primary stateblock.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: ace7d485643adf25fc8aa86ecf1d3c5053b06aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace7d485643adf25fc8aa86e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:59 2020 -0600 d3d9: Retrieve pixel shader constants from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 04fb158bc6..f6ff9466b1 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3908,19 +3908,22 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(IDirect3DDevice9Ex *if } static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(IDirect3DDevice9Ex *iface, - UINT reg_idx, float *data, UINT count) + UINT start_idx, float *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_PS_CONSTS_F || count > WINED3D_MAX_PS_CONSTS_F - start_idx) + return WINED3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, - reg_idx, count, (struct wined3d_vec4 *)data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *iface, @@ -3943,19 +3946,24 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if } static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *iface, - UINT reg_idx, int *data, UINT count) + UINT start_idx, int *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; + const struct wined3d_ivec4 *src; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_i(device->wined3d_device, - reg_idx, count, (struct wined3d_ivec4 *)data); + src = wined3d_stateblock_get_state(device->state)->ps_consts_i; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *iface, @@ -3976,18 +3984,22 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if } static HRESULT WINAPI d3d9_device_GetPixelShaderConstantB(IDirect3DDevice9Ex *iface, - UINT reg_idx, BOOL *data, UINT count) + UINT start_idx, BOOL *constants, UINT count) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; - TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, count, data); + memcpy(constants, &wined3d_stateblock_get_state(device->state)->ps_consts_b[start_idx], count * sizeof(*constants)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_DrawRectPatch(IDirect3DDevice9Ex *iface, UINT handle,

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetPixelShader().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 37af1676d23fbcbf094538cf8dc41172dc0dac7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=37af1676d23fbcbf094538cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:58 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetPixelShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 63312b939b..04fb158bc6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3855,9 +3855,6 @@ static HRESULT WINAPI d3d9_device_SetPixelShader(IDirect3DDevice9Ex *iface, IDir wined3d_mutex_lock(); wined3d_stateblock_set_pixel_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, - shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Stop setting the device state when setting vertex shader constants.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 4b8d328885c7006707c910a08b1f4946f28229bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b8d328885c7006707c910a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 20:55:57 2020 -0600 d3d9: Stop setting the device state when setting vertex shader constants. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f0741045ad..63312b939b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3556,11 +3556,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantF(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_f(device->update_state, reg_idx, count, (const struct wined3d_vec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - { - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, - reg_idx, count, (const struct wined3d_vec4 *)data); - } wined3d_mutex_unlock(); return hr; @@ -3603,9 +3598,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_i(device->wined3d_device, - reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; @@ -3642,8 +3634,6 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantB(IDirect3DDevice9Ex *i wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_b(device->update_state, reg_idx, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr;

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2020