February 2020 - Wine-commits

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: Initialize queue with specific set of functionality.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 9b1fac2dfd3fd9d5cfc339beed943d23c60b228d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1fac2dfd3fd9d5cfc339be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:07 2020 +0300 rtworkq: Initialize queue with specific set of functionality. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 162 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 108 insertions(+), 54 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 38d376342d..e5026b6298 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #define COBJMACROS #define NONAMELESSUNION @@ -136,13 +138,25 @@ static const TP_CALLBACK_PRIORITY priorities[] = TP_CALLBACK_PRIORITY_LOW, }; +struct queue; +struct queue_desc; + +struct queue_ops +{ + HRESULT (*init)(const struct queue_desc *desc, struct queue *queue); + BOOL (*shutdown)(struct queue *queue); + void (*submit)(struct queue *queue, struct work_item *item); +}; + struct queue_desc { RTWQ_WORKQUEUE_TYPE queue_type; + const struct queue_ops *ops; }; struct queue { + const struct queue_ops *ops; TP_POOL *pool; TP_CALLBACK_ENVIRON_V3 envs[ARRAY_SIZE(priorities)]; CRITICAL_SECTION cs; @@ -171,6 +185,88 @@ static void CALLBACK standard_queue_cleanup_callback(void *object_data, void *gr { } +static HRESULT pool_queue_init(const struct queue_desc *desc, struct queue *queue) +{ + TP_CALLBACK_ENVIRON_V3 env; + unsigned int max_thread, i; + + queue->pool = CreateThreadpool(NULL); + + memset(&env, 0, sizeof(env)); + env.Version = 3; + env.Size = sizeof(env); + env.Pool = queue->pool; + env.CleanupGroup = CreateThreadpoolCleanupGroup(); + env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; + env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + { + queue->envs[i] = env; + queue->envs[i].CallbackPriority = priorities[i]; + } + list_init(&queue->pending_items); + InitializeCriticalSection(&queue->cs); + + 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 (desc->queue_type == RTWQ_WINDOW_WORKQUEUE) + FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); + + return S_OK; +} + +static BOOL pool_queue_shutdown(struct queue *queue) +{ + if (!queue->pool) + return FALSE; + + CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); + CloseThreadpool(queue->pool); + queue->pool = NULL; + + return TRUE; +} + +static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) +{ + struct work_item *item = context; + RTWQASYNCRESULT *result = (RTWQASYNCRESULT *)item->result; + + TRACE("result object %p.\n", result); + + IRtwqAsyncCallback_Invoke(result->pCallback, item->result); + + IUnknown_Release(&item->IUnknown_iface); +} + +static void pool_queue_submit(struct queue *queue, struct work_item *item) +{ + TP_CALLBACK_PRIORITY callback_priority; + TP_WORK *work_object; + + if (item->priority == 0) + callback_priority = TP_CALLBACK_PRIORITY_NORMAL; + else if (item->priority < 0) + callback_priority = TP_CALLBACK_PRIORITY_LOW; + else + callback_priority = TP_CALLBACK_PRIORITY_HIGH; + work_object = CreateThreadpoolWork(standard_queue_worker, item, + (TP_CALLBACK_ENVIRON *)&queue->envs[callback_priority]); + SubmitThreadpoolWork(work_object); + + TRACE("dispatched %p.\n", item->result); +} + +static const struct queue_ops pool_queue_ops = +{ + pool_queue_init, + pool_queue_shutdown, + pool_queue_submit, +}; + static HRESULT WINAPI work_item_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -235,33 +331,14 @@ static struct work_item * alloc_work_item(struct queue *queue, LONG priority, IR static void init_work_queue(const struct queue_desc *desc, struct queue *queue) { - TP_CALLBACK_ENVIRON_V3 env; - unsigned int max_thread, i; - - queue->pool = CreateThreadpool(NULL); + assert(desc->ops != NULL); - memset(&env, 0, sizeof(env)); - env.Version = 3; - env.Size = sizeof(env); - env.Pool = queue->pool; - env.CleanupGroup = CreateThreadpoolCleanupGroup(); - env.CleanupGroupCancelCallback = standard_queue_cleanup_callback; - env.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; - for (i = 0; i < ARRAY_SIZE(queue->envs); ++i) + queue->ops = desc->ops; + if (SUCCEEDED(queue->ops->init(desc, queue))) { - queue->envs[i] = env; - queue->envs[i].CallbackPriority = priorities[i]; + list_init(&queue->pending_items); + InitializeCriticalSection(&queue->cs); } - list_init(&queue->pending_items); - InitializeCriticalSection(&queue->cs); - - 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 (desc->queue_type == RTWQ_WINDOW_WORKQUEUE) - FIXME("RTWQ_WINDOW_WORKQUEUE is not supported.\n"); } static HRESULT grab_queue(DWORD queue_id, struct queue **ret) @@ -297,6 +374,7 @@ static HRESULT grab_queue(DWORD queue_id, struct queue **ret) } desc.queue_type = queue_type; + desc.ops = &pool_queue_ops; init_work_queue(&desc, queue); LeaveCriticalSection(&queues_section); *ret = queue; @@ -333,13 +411,9 @@ static void shutdown_queue(struct queue *queue) { struct work_item *item, *item2; - if (!queue->pool) + if (!queue->ops || !queue->ops->shutdown(queue)) return; - CloseThreadpoolCleanupGroupMembers(queue->envs[0].CleanupGroup, TRUE, NULL); - CloseThreadpool(queue->pool); - queue->pool = NULL; - EnterCriticalSection(&queue->cs); LIST_FOR_EACH_ENTRY_SAFE(item, item2, &queue->pending_items, struct work_item, entry) { @@ -349,6 +423,8 @@ static void shutdown_queue(struct queue *queue) LeaveCriticalSection(&queue->cs); DeleteCriticalSection(&queue->cs); + + memset(queue, 0, sizeof(*queue)); } static HRESULT unlock_user_queue(DWORD queue) @@ -376,38 +452,14 @@ static HRESULT unlock_user_queue(DWORD queue) return hr; } -static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) -{ - struct work_item *item = context; - RTWQASYNCRESULT *result = (RTWQASYNCRESULT *)item->result; - - TRACE("result object %p.\n", result); - - IRtwqAsyncCallback_Invoke(result->pCallback, item->result); - - IUnknown_Release(&item->IUnknown_iface); -} - static HRESULT queue_submit_item(struct queue *queue, LONG priority, IRtwqAsyncResult *result) { - TP_CALLBACK_PRIORITY callback_priority; struct work_item *item; - TP_WORK *work_object; if (!(item = alloc_work_item(queue, priority, result))) return E_OUTOFMEMORY; - if (priority == 0) - callback_priority = TP_CALLBACK_PRIORITY_NORMAL; - else if (priority < 0) - callback_priority = TP_CALLBACK_PRIORITY_LOW; - else - callback_priority = TP_CALLBACK_PRIORITY_HIGH; - work_object = CreateThreadpoolWork(standard_queue_worker, item, - (TP_CALLBACK_ENVIRON *)&queue->envs[callback_priority]); - SubmitThreadpoolWork(work_object); - - TRACE("dispatched %p.\n", result); + queue->ops->submit(queue, item); return S_OK; } @@ -862,6 +914,7 @@ static void init_system_queues(void) } desc.queue_type = RTWQ_STANDARD_WORKQUEUE; + desc.ops = &pool_queue_ops; init_work_queue(&desc, &system_queues[SYS_QUEUE_STANDARD]); LeaveCriticalSection(&queues_section); @@ -1114,6 +1167,7 @@ HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queu TRACE("%d, %p.\n", queue_type, queue); desc.queue_type = queue_type; + desc.ops = &pool_queue_ops; return alloc_user_queue(&desc, queue); }

1 0

Nikolay Sivov : rtworkq: Add support for serial work queues.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 5737cdc97d13e2a16e33fc283728d7b07db38cd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5737cdc97d13e2a16e33fc28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:08 2020 +0300 rtworkq: Add support for serial work queues. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtworkq/queue.c | 327 +++++++++++++++++++++++++++++++++++++++------- dlls/rtworkq/rtworkq.spec | 2 +- include/rtworkq.idl | 1 + 3 files changed, 280 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5737cdc97d13e2a16e33…

1 0

Nikolay Sivov : mfplat: Add MFAllocateSerialWorkQueue() export.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 19519f025e1e0a8fd14d8c18202e90759420bf5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=19519f025e1e0a8fd14d8c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:19:09 2020 +0300 mfplat: Add MFAllocateSerialWorkQueue() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 2 +- include/mfapi.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index ba835b694a..85e28792c6 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -16,6 +16,7 @@ @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool @ stdcall MFAddPeriodicCallback(ptr ptr ptr) rtworkq.RtwqAddPeriodicCallback +@ stdcall MFAllocateSerialWorkQueue(long ptr) rtworkq.RtwqAllocateSerialWorkQueue @ stdcall MFAllocateWorkQueue(ptr) @ stdcall MFAllocateWorkQueueEx(long ptr) rtworkq.RtwqAllocateWorkQueue @ stub MFAppendCollection diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index d0e05650c2..56aa23c68c 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2251,7 +2251,7 @@ static void test_serial_queue(void) if (!pMFAllocateSerialWorkQueue) { - skip("Serial queues are not supported.\n"); + win_skip("Serial queues are not supported.\n"); return; } diff --git a/include/mfapi.h b/include/mfapi.h index 7c9e713ac2..910b45e68f 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -389,6 +389,7 @@ typedef enum #define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); +HRESULT WINAPI MFAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFBeginCreateFile(MF_FILE_ACCESSMODE access_mode, MF_FILE_OPENMODE open_mode, MF_FILE_FLAGS flags,

1 0

Derek Lesho : mfplat: Implement IMFByteStream::GetLength() for file streams.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: e756c28b0b47323e1ad131504452eefdd30a4203 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e756c28b0b47323e1ad13150… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Feb 11 12:19:10 2020 +0300 mfplat: Implement IMFByteStream::GetLength() for file streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 27 +++++++++++++++++++-------- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e96a972909..1ebd443131 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3278,13 +3278,6 @@ static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *ca return S_OK; } -static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) -{ - FIXME("%p, %p.\n", iface, length); - - return E_NOTIMPL; -} - static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) { mfbytestream *This = impl_from_IMFByteStream(iface); @@ -3312,6 +3305,24 @@ static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWOR return E_NOTIMPL; } +static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER li; + + TRACE("%p, %p.\n", iface, length); + + if (!length) + return E_INVALIDARG; + + if (GetFileSizeEx(stream->hfile, &li)) + *length = li.QuadPart; + else + return HRESULT_FROM_WIN32(GetLastError()); + + return S_OK; +} + static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3440,7 +3451,7 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_AddRef, bytestream_Release, bytestream_GetCapabilities, - mfbytestream_GetLength, + bytestream_file_GetLength, mfbytestream_SetLength, mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 56aa23c68c..7ec0b01982 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1342,6 +1342,7 @@ static void test_file_stream(void) IMFByteStream *bytestream, *bytestream2; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; + QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; @@ -1405,6 +1406,15 @@ static void test_file_stream(void) IMFAttributes_Release(attributes); + /* Length. */ + hr = IMFByteStream_GetLength(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + bytestream_length = 0; + hr = IMFByteStream_GetLength(bytestream, &bytestream_length); + ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); + ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Zebediah Figura : quartz/vmr9: Reimplement VMR9_GetStaticImage().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 9b1ba3414953fe09cf8b95e781e5d9c0119cacfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b1ba3414953fe09cf8b95e7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:17 2020 -0600 quartz/vmr9: Reimplement VMR9_GetStaticImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr7.c | 25 ++++++++------ dlls/quartz/tests/vmr9.c | 25 ++++++++------ dlls/quartz/vmr9.c | 88 +++++++++++++++++++++++------------------------- 3 files changed, 70 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b1ba3414953fe09cf8b…

1 0

Zebediah Figura : quartz/videorenderer: Clean up VideoRenderer_GetStaticImage().
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: a4e8e4dfd9148a6bf1bb9816349cd331bafeff1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4e8e4dfd9148a6bf1bb9816… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:18 2020 -0600 quartz/videorenderer: Clean up VideoRenderer_GetStaticImage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 4 +-- dlls/quartz/videorenderer.c | 70 +++++++++++++++++---------------------- 2 files changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f0c84c60e3..dae4d7ed66 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1117,8 +1117,8 @@ static void test_current_image(IBaseFilter *filter, IMemInputPin *input, size = sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1; hr = IBasicVideo_GetCurrentImage(video, &size, buffer); - todo_wine ok(hr == E_OUTOFMEMORY, "Got hr %#x.\n", hr); - todo_wine ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1, "Got size %d.\n", size); + ok(hr == E_OUTOFMEMORY, "Got hr %#x.\n", hr); + ok(size == sizeof(BITMAPINFOHEADER) + 32 * 16 * 2 - 1, "Got size %d.\n", size); size = sizeof(BITMAPINFOHEADER) + 32 * 16 * 2; memset(buffer, 0xcc, sizeof(buffer)); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9b671ff370..b75f7bc4e7 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -350,62 +350,54 @@ static HRESULT WINAPI VideoRenderer_GetSourceRect(BaseControlVideo* iface, RECT return S_OK; } -static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo* iface, LONG *pBufferSize, LONG *pDIBImage) +static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG *size, LONG *image) { - VideoRendererImpl *This = impl_from_BaseControlVideo(iface); - AM_MEDIA_TYPE *amt = &This->renderer.sink.pin.mt; - BITMAPINFOHEADER *bmiHeader; - LONG needed_size; - char *ptr; + VideoRendererImpl *filter = impl_from_BaseControlVideo(iface); + const AM_MEDIA_TYPE *mt = &filter->renderer.sink.pin.mt; + const BITMAPINFOHEADER *bih; + size_t image_size; + BYTE *sample_data; - FIXME("(%p/%p)->(%p, %p): partial stub\n", This, iface, pBufferSize, pDIBImage); + TRACE("filter %p, size %p, image %p.\n", filter, size, image); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.csRenderLock); - if (!This->renderer.pMediaSample) - { - LeaveCriticalSection(&This->renderer.filter.csFilter); - return (This->renderer.filter.state == State_Paused ? E_UNEXPECTED : VFW_E_NOT_PAUSED); - } + if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + bih = &((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader; + else /* if (IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo2)) */ + bih = &((VIDEOINFOHEADER2 *)mt->pbFormat)->bmiHeader; + image_size = bih->biWidth * bih->biHeight * bih->biBitCount / 8; - if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo)) + if (!image) { - bmiHeader = &((VIDEOINFOHEADER *)amt->pbFormat)->bmiHeader; - } - else if (IsEqualIID(&amt->formattype, &FORMAT_VideoInfo2)) - { - bmiHeader = &((VIDEOINFOHEADER2 *)amt->pbFormat)->bmiHeader; + LeaveCriticalSection(&filter->renderer.csRenderLock); + *size = sizeof(BITMAPINFOHEADER) + image_size; + return S_OK; } - else + + if (filter->renderer.filter.state != State_Paused) { - FIXME("Unknown type %s\n", debugstr_guid(&amt->subtype)); - LeaveCriticalSection(&This->renderer.filter.csFilter); - return VFW_E_RUNTIME_ERROR; + LeaveCriticalSection(&filter->renderer.csRenderLock); + return VFW_E_NOT_PAUSED; } - needed_size = bmiHeader->biSize; - needed_size += IMediaSample_GetActualDataLength(This->renderer.pMediaSample); - - if (!pDIBImage) + if (!filter->renderer.pMediaSample) { - *pBufferSize = needed_size; - LeaveCriticalSection(&This->renderer.filter.csFilter); - return S_OK; + LeaveCriticalSection(&filter->renderer.csRenderLock); + return E_UNEXPECTED; } - if (needed_size < *pBufferSize) + if (*size < sizeof(BITMAPINFOHEADER) + image_size) { - ERR("Buffer too small %u/%u\n", needed_size, *pBufferSize); - LeaveCriticalSection(&This->renderer.filter.csFilter); - return E_FAIL; + LeaveCriticalSection(&filter->renderer.csRenderLock); + return E_OUTOFMEMORY; } - *pBufferSize = needed_size; - memcpy(pDIBImage, bmiHeader, bmiHeader->biSize); - IMediaSample_GetPointer(This->renderer.pMediaSample, (BYTE **)&ptr); - memcpy((char *)pDIBImage + bmiHeader->biSize, ptr, IMediaSample_GetActualDataLength(This->renderer.pMediaSample)); + memcpy(image, bih, sizeof(BITMAPINFOHEADER)); + IMediaSample_GetPointer(filter->renderer.pMediaSample, &sample_data); + memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.csRenderLock); return S_OK; }

1 0

Zebediah Figura : quartz/videorenderer: Track the current sample locally.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 5f9ce6870cea074c713325d8119a29f6d18581ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9ce6870cea074c713325d8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:19 2020 -0600 quartz/videorenderer: Track the current sample locally. Only the video renderer uses it. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index b75f7bc4e7..4383f66e44 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -56,6 +56,7 @@ typedef struct VideoRendererImpl DWORD saved_style; HANDLE run_event; + IMediaSample *current_sample; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -177,9 +178,13 @@ static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *ifa { const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event}; + filter->current_sample = pSample; + LeaveCriticalSection(&filter->renderer.csRenderLock); WaitForMultipleObjects(2, events, FALSE, INFINITE); EnterCriticalSection(&filter->renderer.csRenderLock); + + filter->current_sample = NULL; } return S_OK; @@ -381,7 +386,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG return VFW_E_NOT_PAUSED; } - if (!filter->renderer.pMediaSample) + if (!filter->current_sample) { LeaveCriticalSection(&filter->renderer.csRenderLock); return E_UNEXPECTED; @@ -394,7 +399,7 @@ static HRESULT WINAPI VideoRenderer_GetStaticImage(BaseControlVideo *iface, LONG } memcpy(image, bih, sizeof(BITMAPINFOHEADER)); - IMediaSample_GetPointer(filter->renderer.pMediaSample, &sample_data); + IMediaSample_GetPointer(filter->current_sample, &sample_data); memcpy((char *)image + sizeof(BITMAPINFOHEADER), sample_data, image_size); LeaveCriticalSection(&filter->renderer.csRenderLock);

1 0

Zebediah Figura : strmbase: Get rid of current sample tracking.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: fa72a28c51e2d678f26b5701529d8e9714b941ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa72a28c51e2d678f26b5701… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 10 19:22:20 2020 -0600 strmbase: Get rid of current sample tracking. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 17 ----------------- include/wine/strmbase.h | 2 -- 2 files changed, 19 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 8470da40f0..1f2154393d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -84,7 +84,6 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) if (filter->sink.pin.peer) ResetEvent(filter->state_event); filter->eos = FALSE; - BaseRendererImpl_ClearPendingSample(filter); ResetEvent(filter->flush_event); if (filter->pFuncsTable->renderer_init_stream) filter->pFuncsTable->renderer_init_stream(filter); @@ -228,7 +227,6 @@ static HRESULT sink_begin_flush(struct strmbase_sink *iface) { struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); - BaseRendererImpl_ClearPendingSample(filter); SetEvent(filter->flush_event); return S_OK; @@ -279,7 +277,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) filter->csRenderLock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&filter->csRenderLock); - BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->state_event); CloseHandle(filter->advise_event); CloseHandle(filter->flush_event); @@ -313,9 +310,6 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa DeleteMediaType(pmt); } - This->pMediaSample = pSample; - IMediaSample_AddRef(pSample); - if (This->pFuncsTable->pfnPrepareReceive) hr = This->pFuncsTable->pfnPrepareReceive(This, pSample); if (FAILED(hr)) @@ -388,22 +382,11 @@ HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSa QualityControlRender_DoQOS(This->qcimpl); - BaseRendererImpl_ClearPendingSample(This); LeaveCriticalSection(&This->csRenderLock); return hr; } -HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *iface) -{ - if (iface->pMediaSample) - { - IMediaSample_Release(iface->pMediaSample); - iface->pMediaSample = NULL; - } - return S_OK; -} - HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 57ff024708..5151e68644 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -483,7 +483,6 @@ struct strmbase_renderer /* Signaled when a flush or state change occurs, i.e. anything that needs * to immediately unblock the streaming thread. */ HANDLE flush_event; - IMediaSample *pMediaSample; REFERENCE_TIME stream_start; IQualityControl *pQSink; @@ -522,7 +521,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,

1 0

Dmitry Timoshkov : comctl32: Switch to using a structure for extra storage.
by Alexandre Julliard 11 Feb '20

11 Feb '20

Module: wine Branch: master Commit: 0caf5af18e299915970f372a1f416d8e2bda30ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=0caf5af18e299915970f372a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 16:31:39 2020 +0800 comctl32: Switch to using a structure for extra storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/static.c | 92 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 5cc02ced97..d08710c06f 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -36,6 +36,7 @@ #include "winuser.h" #include "commctrl.h" +#include "wine/heap.h" #include "wine/debug.h" #include "comctl32.h" @@ -50,10 +51,16 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -/* offsets for GetWindowLong for static private information */ -#define HFONT_GWL_OFFSET 0 -#define HICON_GWL_OFFSET (sizeof(HFONT)) -#define STATIC_EXTRA_BYTES (HICON_GWL_OFFSET + sizeof(HICON)) +struct static_extra_info +{ + HFONT hfont; + union + { + HICON hicon; + HBITMAP hbitmap; + HENHMETAFILE hemf; + } image; +}; typedef void (*pfPaint)( HWND hwnd, HDC hdc, DWORD style ); @@ -80,6 +87,18 @@ static const pfPaint staticPaintFunc[SS_TYPEMASK+1] = STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; +static struct static_extra_info *get_extra_ptr( HWND hwnd, BOOL force ) +{ + struct static_extra_info *extra = (struct static_extra_info *)GetWindowLongPtrW( hwnd, 0 ); + if (!extra && force) + { + extra = heap_alloc_zero( sizeof(*extra) ); + if (extra) + SetWindowLongPtrW( hwnd, 0, (ULONG_PTR)extra ); + } + return extra; +} + static BOOL get_icon_size( HICON handle, SIZE *size ) { ICONINFO info; @@ -111,6 +130,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) { HICON prevIcon; SIZE size; + struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_ICON) return 0; if (hicon && !get_icon_size( hicon, &size )) @@ -118,7 +138,12 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) WARN("hicon != 0, but invalid\n"); return 0; } - prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + prevIcon = extra->image.hicon; + extra->image.hicon = hicon; if (hicon && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { /* Windows currently doesn't implement SS_RIGHTJUST */ @@ -146,6 +171,7 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { HBITMAP hOldBitmap; + struct static_extra_info *extra; if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) @@ -153,7 +179,12 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) WARN("hBitmap != 0, but it's not a bitmap\n"); return 0; } - hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + hOldBitmap = extra->image.hbitmap; + extra->image.hbitmap = hBitmap; if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; @@ -183,13 +214,23 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) */ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) { + HENHMETAFILE old_hemf; + struct static_extra_info *extra; + if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); return 0; } - return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); + + extra = get_extra_ptr( hwnd, TRUE ); + if (!extra) return 0; + + old_hemf = extra->image.hemf; + extra->image.hemf = hEnhMetaFile; + + return old_hemf; } /*********************************************************************** @@ -200,6 +241,8 @@ static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, */ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) { + struct static_extra_info *extra; + switch (style & SS_TYPEMASK) { case SS_ICON: @@ -215,7 +258,22 @@ static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) default: return NULL; } - return (HANDLE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + + extra = get_extra_ptr( hwnd, FALSE ); + return extra ? extra->image.hbitmap : 0; +} + +static void STATIC_SetFont( HWND hwnd, HFONT hfont ) +{ + struct static_extra_info *extra = get_extra_ptr( hwnd, TRUE ); + if (extra) + extra->hfont = hfont; +} + +static HFONT STATIC_GetFont( HWND hwnd ) +{ + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); + return extra ? extra->hfont : 0; } /*********************************************************************** @@ -327,6 +385,8 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_NCDESTROY: if (style == SS_ICON) { + struct static_extra_info *extra = get_extra_ptr( hwnd, FALSE ); + heap_free( extra ); /* * FIXME * DestroyIcon32( STATIC_SetIcon( wndPtr, 0 ) ); @@ -423,14 +483,14 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, case WM_SETFONT: if (hasTextStyle( full_style )) { - SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); + STATIC_SetFont( hwnd, (HFONT)wParam ); if (LOWORD(lParam)) RedrawWindow( hwnd, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ALLCHILDREN ); } break; case WM_GETFONT: - return GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + return (LRESULT)STATIC_GetFont( hwnd ); case WM_NCHITTEST: if (full_style & SS_NOTIFY) @@ -508,7 +568,7 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); - font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + font = STATIC_GetFont( hwnd ); if (font) oldFont = SelectObject( hdc, font ); SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); @@ -572,7 +632,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) format |= DT_SINGLELINE | DT_WORD_ELLIPSIS; } - if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) + if ((hFont = STATIC_GetFont( hwnd ))) hOldFont = SelectObject( hdc, hFont ); /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned @@ -668,7 +728,7 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); + hIcon = STATIC_GetImage( hwnd, IMAGE_ICON, style ); if (!hIcon || !get_icon_size( hIcon, &size )) { FillRect(hdc, &rc, hbrush); @@ -698,7 +758,7 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); - if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) + if ((hBitmap = STATIC_GetImage( hwnd, IMAGE_BITMAP, style )) && (GetObjectType(hBitmap) == OBJ_BITMAP) && (hMemDC = CreateCompatibleDC( hdc ))) { @@ -742,7 +802,7 @@ static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) GetClientRect(hwnd, &rc); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); FillRect(hdc, &rc, hbrush); - if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) + if ((hEnhMetaFile = STATIC_GetImage( hwnd, IMAGE_ENHMETAFILE, style ))) { /* The control's current font is not selected into the device context! */ @@ -779,7 +839,7 @@ void STATIC_Register(void) wndClass.style = CS_DBLCLKS | CS_PARENTDC | CS_GLOBALCLASS; wndClass.lpfnWndProc = STATIC_WindowProc; wndClass.cbClsExtra = 0; - wndClass.cbWndExtra = STATIC_EXTRA_BYTES; + wndClass.cbWndExtra = sizeof(struct static_extra_info *); wndClass.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = NULL; wndClass.lpszClassName = WC_STATICW;

1 0