- wine-devel - winehq.org

[PATCH 1/4] d3d9/tests: Try to make test_cursor_pos more reliable.
by Stefan Dösinger 31 Jan '22

31 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- The Win10 1709 behavior and apparent workaround of moving the pointer before the test don't quite make sense. In past testbot runs there have been cases where e.g. move 3 doesn't produce a message, or any other move. This patch has worked so far in all of my manual testbot submissions. The only way to know is to wait and see... I have sent this series on top of 225041 and 225042, but it should apply independently as well. --- dlls/d3d9/tests/device.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7effd0f28b8..9c2e94cc694 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5205,6 +5205,20 @@ static void test_cursor_pos(void) {0, 0}, }; + /* Windows 10 1709 is unreliable. One or more of the cursor movements we + * expect don't show up. Moving the mouse to a defined position beforehand + * seems to get it into better shape - only the final 150x150 move we do + * below is missing - it looks as if this Windows version filters redundant + * SetCursorPos calls on the user32 level, although I am not entirely sure. + * + * The weird thing is that the previous test leaves the cursor position + * reliably at 512x384 on the testbot. So the 50x50 mouse move shouldn't + * be stripped away anyway, but it might be a difference between moving the + * cursor through SetCursorPos vs moving it by changing the display mode. */ + ret = SetCursorPos(99, 99); + ok(ret, "Failed to set cursor position.\n"); + flush_events(); + wc.lpfnWndProc = test_cursor_proc; wc.lpszClassName = "d3d9_test_cursor_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -5239,7 +5253,8 @@ static void test_cursor_pos(void) IDirect3DDevice9_SetCursorPosition(device, 75, 75, 0); flush_events(); - /* SetCursorPosition() eats duplicates. */ + /* SetCursorPosition() eats duplicates. FIXME: Since we accept unexpected + * mouse moves the test doesn't actually demonstrate that. */ IDirect3DDevice9_SetCursorPosition(device, 75, 75, 0); flush_events(); @@ -5260,13 +5275,14 @@ static void test_cursor_pos(void) IDirect3DDevice9_SetCursorPosition(device, 150, 150, 0); flush_events(); - /* SetCursorPos() doesn't. */ + /* SetCursorPos() doesn't. Except for Win10 1709. */ ret = SetCursorPos(150, 150); ok(ret, "Failed to set cursor position.\n"); flush_events(); - ok(!expect_pos->x && !expect_pos->y, "Didn't receive MOUSEMOVE %u (%d, %d).\n", - (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); + ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), + "Didn't receive MOUSEMOVE %u (%d, %d).\n", + (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.34.1

4 14

[PATCH 1/2] d3d9/tests: Ignore random testbot failures in test_cursor.
by Stefan Dösinger 31 Jan '22

31 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c480a9d163e..7effd0f28b8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1886,11 +1886,19 @@ static void test_cursor(void) IDirect3DSurface9_Release(cursor); + /* On the testbot the cursor handle does not behave as expected in rare situations, + * leading to random test failures. Either the cursor handle changes before we expect + * it to, or it doesn't change afterwards (or already changed before we read the + * initial handle?). I was not able to reproduce this on my own machines. Moving the + * mouse outside the window results in similar behavior. However, I tested various + * obvious failure causes: Was the mouse moved? Was the window hidden or moved? Is + * the window in the background? Neither of those applies. Making the window topmost + * or using a fullscreen device doesn't improve the test's reliability either. */ memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ + ok(info.hCursor == cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ ret = IDirect3DDevice9_ShowCursor(device, TRUE); @@ -1904,7 +1912,7 @@ static void test_cursor(void) info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); - ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + ok(info.hCursor != cur || broken(1), "The cursor handle is %p\n", info.hCursor); /* Cursor dimensions must all be powers of two */ for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx) -- 2.34.1

3 5

[tools] testbot/SetWinLocale: Take --reboot into account when checking the results.
by Francois Gouget 31 Jan '22

31 Jan '22

Don't complain about settings that are only modified after a reboot if none took place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2ff8348fb3..6535c49396 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -904,7 +904,19 @@ if ($OptUTF8) } if ($OptMUI) { - CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($OptReboot) + { + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($Settings->{PreferredUILanguagesPending}) + { + Error("PreferredUILanguagesPending should not be set for --mui $OptMUI\n"); + $Success = 0; + } + } + else + { + CheckSetting($Settings, "PreferredUILanguagesPending", $OptMUI, "for --mui $OptMUI"); + } } if ($KeyboardIds) { @@ -923,7 +935,7 @@ if ($OptSysCopy) CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry"); CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry"); } - if ($OptMUI) + if ($OptMUI and $OptReboot) { CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI"); } @@ -932,6 +944,13 @@ if ($OptSysCopy) CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } } +if (!$OptReboot and ($OptSystem or $OptMUI)) +{ + my @Pending; + push @Pending, "--system $OptSystem" if ($OptSystem); + push @Pending, "--mui $OptMUI" if ($OptMUI); + Warning(join(" ", "the", @Pending, "changes are still pending\n")); +} Cleanup(); exit(1) if (!$Success); -- 2.30.2

1 0

[PATCH] mf/tests: Remove remaining kernel32 heap calls.
by Nikolay Sivov 31 Jan '22

31 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dede008fbd9..8ba93656a7d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1562,7 +1562,7 @@ static ULONG WINAPI test_source_Release(IMFMediaSource *iface) ULONG refcount = InterlockedDecrement(&source->refcount); if (!refcount) - HeapFree(GetProcessHeap(), 0, source); + free(source); return refcount; } @@ -1650,7 +1650,7 @@ static IMFMediaSource *create_test_source(void) { struct test_source *source; - source = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*source)); + source = calloc(1, sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; -- 2.34.1

1 0

[PATCH] rtworkq: Fix long types warnings.
by Nikolay Sivov 31 Jan '22

31 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/rtworkq/Makefile.in | 1 - dlls/rtworkq/queue.c | 58 ++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/rtworkq/Makefile.in b/dlls/rtworkq/Makefile.in index d5aa5ec0d0f..46268866ddb 100644 --- a/dlls/rtworkq/Makefile.in +++ b/dlls/rtworkq/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rtworkq.dll IMPORTLIB = rtworkq IMPORTS = ole32 diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index 58769a0be04..35ba1e28d03 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -426,7 +426,7 @@ static void CALLBACK serial_queue_finalization_callback(PTP_CALLBACK_INSTANCE in if (SUCCEEDED(hr = grab_queue(queue->target_queue, &target_queue))) target_queue->ops->submit(target_queue, next_item); else - WARN("Failed to grab queue for id %#x, hr %#x.\n", queue->target_queue, hr); + WARN("Failed to grab queue for id %#lx, hr %#lx.\n", queue->target_queue, hr); } LeaveCriticalSection(&queue->cs); @@ -478,7 +478,7 @@ static void serial_queue_submit(struct queue *queue, struct work_item *item) if (item->flags & RTWQ_REPLY_CALLBACK) { if (FAILED(hr = RtwqCreateAsyncResult(NULL, &queue->IRtwqAsyncCallback_iface, NULL, &item->reply_result))) - WARN("Failed to create reply object, hr %#x.\n", hr); + WARN("Failed to create reply object, hr %#lx.\n", hr); } else item->finalization_callback = queue->finalization_callback; @@ -512,7 +512,7 @@ static void serial_queue_submit(struct queue *queue, struct work_item *item) if (SUCCEEDED(hr = grab_queue(queue->target_queue, &target_queue))) target_queue->ops->submit(target_queue, next_item); else - WARN("Failed to grab queue for id %#x, hr %#x.\n", queue->target_queue, hr); + WARN("Failed to grab queue for id %#lx, hr %#lx.\n", queue->target_queue, hr); } LeaveCriticalSection(&queue->cs); @@ -875,7 +875,7 @@ static HRESULT queue_cancel_item(struct queue *queue, RTWQWORKITEM_KEY key) else if ((key & SCHEDULED_ITEM_KEY_MASK) == SCHEDULED_ITEM_KEY_MASK) CloseThreadpoolTimer(item->u.timer_object); else - WARN("Unknown item key mask %#x.\n", (DWORD)key); + WARN("Unknown item key mask %#lx.\n", (DWORD)key); queue_release_pending_item(item); hr = S_OK; break; @@ -964,7 +964,7 @@ static ULONG WINAPI async_result_AddRef(IRtwqAsyncResult *iface) struct async_result *result = impl_from_IRtwqAsyncResult(iface); ULONG refcount = InterlockedIncrement(&result->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); return refcount; } @@ -974,7 +974,7 @@ static ULONG WINAPI async_result_Release(IRtwqAsyncResult *iface) struct async_result *result = impl_from_IRtwqAsyncResult(iface); ULONG refcount = InterlockedDecrement(&result->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); if (!refcount) { @@ -1022,7 +1022,7 @@ static HRESULT WINAPI async_result_SetStatus(IRtwqAsyncResult *iface, HRESULT st { struct async_result *result = impl_from_IRtwqAsyncResult(iface); - TRACE("%p, %#x.\n", iface, status); + TRACE("%p, %#lx.\n", iface, status); result->result.hrStatusResult = status; @@ -1134,7 +1134,7 @@ static void init_system_queues(void) } if (FAILED(hr = CoIncrementMTAUsage(&mta_cookie))) - WARN("Failed to initialize MTA, hr %#x.\n", hr); + WARN("Failed to initialize MTA, hr %#lx.\n", hr); desc.queue_type = RTWQ_STANDARD_WORKQUEUE; desc.ops = &pool_queue_ops; @@ -1167,7 +1167,7 @@ static void shutdown_system_queues(void) } if (FAILED(hr = CoDecrementMTAUsage(mta_cookie))) - WARN("Failed to uninitialize MTA, hr %#x.\n", hr); + WARN("Failed to uninitialize MTA, hr %#lx.\n", hr); LeaveCriticalSection(&queues_section); } @@ -1190,7 +1190,7 @@ HRESULT WINAPI RtwqPutWaitingWorkItem(HANDLE event, LONG priority, IRtwqAsyncRes struct queue *queue; HRESULT hr; - TRACE("%p, %d, %p, %p.\n", event, priority, result, key); + TRACE("%p, %ld, %p, %p.\n", event, priority, result, key); if (FAILED(hr = grab_queue(RTWQ_CALLBACK_QUEUE_TIMER, &queue))) return hr; @@ -1251,7 +1251,7 @@ static ULONG WINAPI periodic_callback_AddRef(IRtwqAsyncCallback *iface) struct periodic_callback *callback = impl_from_IRtwqAsyncCallback(iface); ULONG refcount = InterlockedIncrement(&callback->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); return refcount; } @@ -1261,7 +1261,7 @@ static ULONG WINAPI periodic_callback_Release(IRtwqAsyncCallback *iface) struct periodic_callback *callback = impl_from_IRtwqAsyncCallback(iface); ULONG refcount = InterlockedDecrement(&callback->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); if (!refcount) free(callback); @@ -1352,7 +1352,7 @@ HRESULT WINAPI RtwqRemovePeriodicCallback(DWORD key) struct queue *queue; HRESULT hr; - TRACE("%#x.\n", key); + TRACE("%#lx.\n", key); if (FAILED(hr = grab_queue(RTWQ_CALLBACK_QUEUE_TIMER, &queue))) return hr; @@ -1382,7 +1382,7 @@ HRESULT WINAPI RtwqInvokeCallback(IRtwqAsyncResult *result) HRESULT WINAPI RtwqPutWorkItem(DWORD queue, LONG priority, IRtwqAsyncResult *result) { - TRACE("%#x, %d, %p.\n", queue, priority, result); + TRACE("%#lx, %ld, %p.\n", queue, priority, result); return queue_put_work_item(queue, priority, result); } @@ -1401,14 +1401,14 @@ HRESULT WINAPI RtwqAllocateWorkQueue(RTWQ_WORKQUEUE_TYPE queue_type, DWORD *queu HRESULT WINAPI RtwqLockWorkQueue(DWORD queue) { - TRACE("%#x.\n", queue); + TRACE("%#lx.\n", queue); return lock_user_queue(queue); } HRESULT WINAPI RtwqUnlockWorkQueue(DWORD queue) { - TRACE("%#x.\n", queue); + TRACE("%#lx.\n", queue); return unlock_user_queue(queue); } @@ -1419,7 +1419,7 @@ HRESULT WINAPI RtwqSetLongRunning(DWORD queue_id, BOOL enable) HRESULT hr; int i; - TRACE("%#x, %d.\n", queue_id, enable); + TRACE("%#lx, %d.\n", queue_id, enable); lock_user_queue(queue_id); @@ -1439,7 +1439,7 @@ HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, D struct queue_desc desc; HRESULT hr; - TRACE("%s, %d, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); + TRACE("%s, %ld, %p, %p.\n", debugstr_w(usageclass), priority, taskid, queue); if (!usageclass) return E_POINTER; @@ -1471,14 +1471,14 @@ HRESULT WINAPI RtwqLockSharedWorkQueue(const WCHAR *usageclass, LONG priority, D HRESULT WINAPI RtwqSetDeadline(DWORD queue_id, LONGLONG deadline, HANDLE *request) { - FIXME("%#x, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), request); + FIXME("%#lx, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), request); return E_NOTIMPL; } HRESULT WINAPI RtwqSetDeadline2(DWORD queue_id, LONGLONG deadline, LONGLONG predeadline, HANDLE *request) { - FIXME("%#x, %s, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), wine_dbgstr_longlong(predeadline), request); + FIXME("%#lx, %s, %s, %p.\n", queue_id, wine_dbgstr_longlong(deadline), wine_dbgstr_longlong(predeadline), request); return E_NOTIMPL; } @@ -1494,7 +1494,7 @@ HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue) { struct queue_desc desc; - TRACE("%#x, %p.\n", target_queue, queue); + TRACE("%#lx, %p.\n", target_queue, queue); desc.queue_type = RTWQ_STANDARD_WORKQUEUE; desc.ops = &serial_queue_ops; @@ -1504,42 +1504,42 @@ HRESULT WINAPI RtwqAllocateSerialWorkQueue(DWORD target_queue, DWORD *queue) HRESULT WINAPI RtwqJoinWorkQueue(DWORD queue, HANDLE hFile, HANDLE *cookie) { - FIXME("%#x, %p, %p.\n", queue, hFile, cookie); + FIXME("%#lx, %p, %p.\n", queue, hFile, cookie); return E_NOTIMPL; } HRESULT WINAPI RtwqUnjoinWorkQueue(DWORD queue, HANDLE cookie) { - FIXME("%#x, %p.\n", queue, cookie); + FIXME("%#lx, %p.\n", queue, cookie); return E_NOTIMPL; } HRESULT WINAPI RtwqGetWorkQueueMMCSSClass(DWORD queue, WCHAR *class, DWORD *length) { - FIXME("%#x, %p, %p.\n", queue, class, length); + FIXME("%#lx, %p, %p.\n", queue, class, length); return E_NOTIMPL; } HRESULT WINAPI RtwqGetWorkQueueMMCSSTaskId(DWORD queue, DWORD *taskid) { - FIXME("%#x, %p.\n", queue, taskid); + FIXME("%#lx, %p.\n", queue, taskid); return E_NOTIMPL; } HRESULT WINAPI RtwqGetWorkQueueMMCSSPriority(DWORD queue, LONG *priority) { - FIXME("%#x, %p.\n", queue, priority); + FIXME("%#lx, %p.\n", queue, priority); return E_NOTIMPL; } HRESULT WINAPI RtwqRegisterPlatformWithMMCSS(const WCHAR *class, DWORD *taskid, LONG priority) { - FIXME("%s, %p, %d.\n", debugstr_w(class), taskid, priority); + FIXME("%s, %p, %ld.\n", debugstr_w(class), taskid, priority); return E_NOTIMPL; } @@ -1554,7 +1554,7 @@ HRESULT WINAPI RtwqUnregisterPlatformFromMMCSS(void) HRESULT WINAPI RtwqBeginRegisterWorkQueueWithMMCSS(DWORD queue, const WCHAR *class, DWORD taskid, LONG priority, IRtwqAsyncCallback *callback, IUnknown *state) { - FIXME("%#x, %s, %u, %d, %p, %p.\n", queue, debugstr_w(class), taskid, priority, callback, state); + FIXME("%#lx, %s, %lu, %ld, %p, %p.\n", queue, debugstr_w(class), taskid, priority, callback, state); return E_NOTIMPL; } @@ -1568,7 +1568,7 @@ HRESULT WINAPI RtwqEndRegisterWorkQueueWithMMCSS(IRtwqAsyncResult *result, DWORD HRESULT WINAPI RtwqBeginUnregisterWorkQueueWithMMCSS(DWORD queue, IRtwqAsyncCallback *callback, IUnknown *state) { - FIXME("%#x, %p, %p.\n", queue, callback, state); + FIXME("%#lx, %p, %p.\n", queue, callback, state); return E_NOTIMPL; } -- 2.34.1

1 0

[PATCH] scrrun: Fix long types warnings.
by Nikolay Sivov 31 Jan '22

31 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/Makefile.in | 1 - dlls/scrrun/dictionary.c | 22 ++-- dlls/scrrun/filesystem.c | 216 ++++++++++++++++++++------------------- dlls/scrrun/scrrun.c | 6 +- 4 files changed, 122 insertions(+), 123 deletions(-) diff --git a/dlls/scrrun/Makefile.in b/dlls/scrrun/Makefile.in index c0beae245ef..31ef016f48e 100644 --- a/dlls/scrrun/Makefile.in +++ b/dlls/scrrun/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = scrrun.dll IMPORTS = uuid oleaut32 version advapi32 diff --git a/dlls/scrrun/dictionary.c b/dlls/scrrun/dictionary.c index d1c6eb24e0b..bb9c3610d1b 100644 --- a/dlls/scrrun/dictionary.c +++ b/dlls/scrrun/dictionary.c @@ -240,7 +240,7 @@ static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -249,7 +249,7 @@ static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -267,7 +267,7 @@ static HRESULT WINAPI dict_enum_Next(IEnumVARIANT *iface, ULONG count, VARIANT * struct keyitem_pair *pair; ULONG i = 0; - TRACE("(%p)->(%u %p %p)\n", This, count, keys, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, count, keys, fetched); if (fetched) *fetched = 0; @@ -292,7 +292,7 @@ static HRESULT WINAPI dict_enum_Skip(IEnumVARIANT *iface, ULONG count) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p)->(%u)\n", This, count); + TRACE("%p, %lu.\n", iface, count); if (!count) return S_OK; @@ -418,7 +418,7 @@ static ULONG WINAPI dictionary_AddRef(IDictionary *iface) struct dictionary *dictionary = impl_from_IDictionary(iface); ULONG ref = InterlockedIncrement(&dictionary->ref); - TRACE("%p, refcount %u.\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } @@ -428,7 +428,7 @@ static ULONG WINAPI dictionary_Release(IDictionary *iface) struct dictionary *dictionary = impl_from_IDictionary(iface); ULONG ref = InterlockedDecrement(&dictionary->ref); - TRACE("%p, refcount %u.\n", iface, ref); + TRACE("%p, refcount %lu.\n", iface, ref); if (!ref) { @@ -449,7 +449,7 @@ static HRESULT WINAPI dictionary_GetTypeInfoCount(IDictionary *iface, UINT *pcti static HRESULT WINAPI dictionary_GetTypeInfo(IDictionary *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - TRACE("%p, %u, %u, %p.\n", iface, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); return get_typeinfo(IDictionary_tid, ppTInfo); } @@ -460,7 +460,7 @@ static HRESULT WINAPI dictionary_GetIDsOfNames(IDictionary *iface, REFIID riid, ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p, %s, %p, %u, %u, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IDictionary_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -476,18 +476,16 @@ static HRESULT WINAPI dictionary_Invoke(IDictionary *iface, DISPID dispIdMember, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct dictionary *dictionary = impl_from_IDictionary(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("%p, %d, %s, %d, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IDictionary_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &dictionary->IDictionary_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index e525b9db8da..2b2255e1dfc 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -187,7 +187,7 @@ static inline HRESULT create_error(DWORD err) case ERROR_FILE_EXISTS: return CTL_E_FILEALREADYEXISTS; case ERROR_ALREADY_EXISTS: return CTL_E_FILEALREADYEXISTS; default: - FIXME("Unsupported error code: %d\n", err); + FIXME("Unsupported error code: %ld\n", err); return E_FAIL; } } @@ -308,9 +308,11 @@ static HRESULT WINAPI textstream_QueryInterface(ITextStream *iface, REFIID riid, static ULONG WINAPI textstream_AddRef(ITextStream *iface) { - struct textstream *This = impl_from_ITextStream(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct textstream *stream = impl_from_ITextStream(iface); + ULONG ref = InterlockedIncrement(&stream->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } @@ -319,7 +321,7 @@ static ULONG WINAPI textstream_Release(ITextStream *iface) struct textstream *stream = impl_from_ITextStream(iface); ULONG ref = InterlockedDecrement(&stream->ref); - TRACE("%p, refcount %d.\n", iface, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -342,8 +344,8 @@ static HRESULT WINAPI textstream_GetTypeInfoCount(ITextStream *iface, UINT *pcti static HRESULT WINAPI textstream_GetTypeInfo(ITextStream *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct textstream *This = impl_from_ITextStream(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(ITextStream_tid, ppTInfo); } @@ -351,11 +353,10 @@ static HRESULT WINAPI textstream_GetIDsOfNames(ITextStream *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct textstream *This = impl_from_ITextStream(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextStream_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -372,11 +373,10 @@ static HRESULT WINAPI textstream_Invoke(ITextStream *iface, DISPID dispIdMember, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct textstream *This = impl_from_ITextStream(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextStream_tid, &typeinfo); @@ -513,7 +513,7 @@ static HRESULT WINAPI textstream_Read(ITextStream *iface, LONG len, BSTR *text) struct textstream *This = impl_from_ITextStream(iface); HRESULT hr = S_OK; - TRACE("(%p)->(%d %p)\n", This, len, text); + TRACE("%p, %ld, %p.\n", iface, len, text); if (!text) return E_POINTER; @@ -685,15 +685,15 @@ static HRESULT WINAPI textstream_WriteLine(ITextStream *iface, BSTR text) static HRESULT WINAPI textstream_WriteBlankLines(ITextStream *iface, LONG lines) { - struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p)->(%d): stub\n", This, lines); + FIXME("%p, %ld stub\n", iface, lines); + return E_NOTIMPL; } static HRESULT WINAPI textstream_Skip(ITextStream *iface, LONG count) { - struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p)->(%d): stub\n", This, count); + FIXME("%p, %ld stub\n", iface, count); + return E_NOTIMPL; } @@ -866,9 +866,11 @@ static HRESULT WINAPI drive_QueryInterface(IDrive *iface, REFIID riid, void **ob static ULONG WINAPI drive_AddRef(IDrive *iface) { - struct drive *This = impl_from_IDrive(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct drive *drive = impl_from_IDrive(iface); + ULONG ref = InterlockedIncrement(&drive->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } @@ -877,7 +879,7 @@ static ULONG WINAPI drive_Release(IDrive *iface) struct drive *drive = impl_from_IDrive(iface); ULONG ref = InterlockedDecrement(&drive->ref); - TRACE("%p, refcount %d.\n", iface, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) free(drive); @@ -896,8 +898,8 @@ static HRESULT WINAPI drive_GetTypeInfoCount(IDrive *iface, UINT *pctinfo) static HRESULT WINAPI drive_GetTypeInfo(IDrive *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct drive *This = impl_from_IDrive(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IDrive_tid, ppTInfo); } @@ -905,11 +907,10 @@ static HRESULT WINAPI drive_GetIDsOfNames(IDrive *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct drive *This = impl_from_IDrive(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IDrive_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -926,11 +927,10 @@ static HRESULT WINAPI drive_Invoke(IDrive *iface, DISPID dispIdMember, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct drive *This = impl_from_IDrive(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IDrive_tid, &typeinfo); @@ -1218,7 +1218,7 @@ static ULONG WINAPI enumvariant_AddRef(IEnumVARIANT *iface) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -1227,7 +1227,7 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -1274,7 +1274,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel WIN32_FIND_DATAW data; ULONG count = 0; - TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, celt, var, fetched); if (fetched) *fetched = 0; @@ -1327,7 +1327,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel HANDLE handle = This->data.u.foldercoll.find; WIN32_FIND_DATAW data; - TRACE("(%p)->(%d)\n", This, celt); + TRACE("%p, %lu.\n", iface, celt); if (!celt) return S_OK; @@ -1409,7 +1409,7 @@ static ULONG WINAPI filecoll_enumvariant_Release(IEnumVARIANT *iface) struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -1428,7 +1428,7 @@ static HRESULT WINAPI filecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, WIN32_FIND_DATAW data; ULONG count = 0; - TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + TRACE("%p, %ld, %p, %p.\n", iface, celt, var, fetched); if (fetched) *fetched = 0; @@ -1475,7 +1475,7 @@ static HRESULT WINAPI filecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) HANDLE handle = This->data.u.filecoll.find; WIN32_FIND_DATAW data; - TRACE("(%p)->(%d)\n", This, celt); + TRACE("%p, %lu.\n", iface, celt); if (!celt) return S_OK; @@ -1551,7 +1551,7 @@ static ULONG WINAPI drivecoll_enumvariant_Release(IEnumVARIANT *iface) struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -1581,7 +1581,7 @@ static HRESULT WINAPI drivecoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt struct enumvariant *This = impl_from_IEnumVARIANT(iface); ULONG count = 0; - TRACE("(%p)->(%d %p %p)\n", This, celt, var, fetched); + TRACE("%p, %lu, %p, %p.\n", iface, celt, var, fetched); if (fetched) *fetched = 0; @@ -1612,7 +1612,7 @@ static HRESULT WINAPI drivecoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt { struct enumvariant *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p)->(%d)\n", This, celt); + TRACE("%p, %lu.\n", iface, celt); if (!celt) return S_OK; @@ -1696,22 +1696,25 @@ static HRESULT WINAPI foldercoll_QueryInterface(IFolderCollection *iface, REFIID static ULONG WINAPI foldercoll_AddRef(IFolderCollection *iface) { - struct foldercollection *This = impl_from_IFolderCollection(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct foldercollection *collection = impl_from_IFolderCollection(iface); + ULONG ref = InterlockedIncrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } static ULONG WINAPI foldercoll_Release(IFolderCollection *iface) { - struct foldercollection *This = impl_from_IFolderCollection(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct foldercollection *collection = impl_from_IFolderCollection(iface); + ULONG ref = InterlockedDecrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { - SysFreeString(This->path); - free(This); + SysFreeString(collection->path); + free(collection); } return ref; @@ -1728,8 +1731,8 @@ static HRESULT WINAPI foldercoll_GetTypeInfoCount(IFolderCollection *iface, UINT static HRESULT WINAPI foldercoll_GetTypeInfo(IFolderCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct foldercollection *This = impl_from_IFolderCollection(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFolderCollection_tid, ppTInfo); } @@ -1737,11 +1740,10 @@ static HRESULT WINAPI foldercoll_GetIDsOfNames(IFolderCollection *iface, REFIID LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct foldercollection *This = impl_from_IFolderCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IFolderCollection_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -1758,11 +1760,10 @@ static HRESULT WINAPI foldercoll_Invoke(IFolderCollection *iface, DISPID dispIdM DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct foldercollection *This = impl_from_IFolderCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IFolderCollection_tid, &typeinfo); @@ -1897,22 +1898,25 @@ static HRESULT WINAPI filecoll_QueryInterface(IFileCollection *iface, REFIID rii static ULONG WINAPI filecoll_AddRef(IFileCollection *iface) { - struct filecollection *This = impl_from_IFileCollection(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct filecollection *collection = impl_from_IFileCollection(iface); + ULONG ref = InterlockedIncrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } static ULONG WINAPI filecoll_Release(IFileCollection *iface) { - struct filecollection *This = impl_from_IFileCollection(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct filecollection *collection = impl_from_IFileCollection(iface); + ULONG ref = InterlockedDecrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { - SysFreeString(This->path); - free(This); + SysFreeString(collection->path); + free(collection); } return ref; @@ -1929,8 +1933,8 @@ static HRESULT WINAPI filecoll_GetTypeInfoCount(IFileCollection *iface, UINT *pc static HRESULT WINAPI filecoll_GetTypeInfo(IFileCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct filecollection *This = impl_from_IFileCollection(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFileCollection_tid, ppTInfo); } @@ -1938,11 +1942,10 @@ static HRESULT WINAPI filecoll_GetIDsOfNames(IFileCollection *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct filecollection *This = impl_from_IFileCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IFileCollection_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -1959,11 +1962,10 @@ static HRESULT WINAPI filecoll_Invoke(IFileCollection *iface, DISPID dispIdMembe DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct filecollection *This = impl_from_IFileCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IFileCollection_tid, &typeinfo); @@ -2089,20 +2091,23 @@ static HRESULT WINAPI drivecoll_QueryInterface(IDriveCollection *iface, REFIID r static ULONG WINAPI drivecoll_AddRef(IDriveCollection *iface) { - struct drivecollection *This = impl_from_IDriveCollection(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct drivecollection *collection = impl_from_IDriveCollection(iface); + ULONG ref = InterlockedIncrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } static ULONG WINAPI drivecoll_Release(IDriveCollection *iface) { - struct drivecollection *This = impl_from_IDriveCollection(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct drivecollection *collection = impl_from_IDriveCollection(iface); + ULONG ref = InterlockedDecrement(&collection->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) - free(This); + free(collection); return ref; } @@ -2118,8 +2123,8 @@ static HRESULT WINAPI drivecoll_GetTypeInfoCount(IDriveCollection *iface, UINT * static HRESULT WINAPI drivecoll_GetTypeInfo(IDriveCollection *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct drivecollection *This = impl_from_IDriveCollection(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IDriveCollection_tid, ppTInfo); } @@ -2127,11 +2132,10 @@ static HRESULT WINAPI drivecoll_GetIDsOfNames(IDriveCollection *iface, REFIID ri LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct drivecollection *This = impl_from_IDriveCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IDriveCollection_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -2148,11 +2152,10 @@ static HRESULT WINAPI drivecoll_Invoke(IDriveCollection *iface, DISPID dispIdMem DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct drivecollection *This = impl_from_IDriveCollection(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IDriveCollection_tid, &typeinfo); @@ -2259,22 +2262,25 @@ static HRESULT WINAPI folder_QueryInterface(IFolder *iface, REFIID riid, void ** static ULONG WINAPI folder_AddRef(IFolder *iface) { - struct folder *This = impl_from_IFolder(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct folder *folder = impl_from_IFolder(iface); + ULONG ref = InterlockedIncrement(&folder->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); + return ref; } static ULONG WINAPI folder_Release(IFolder *iface) { - struct folder *This = impl_from_IFolder(iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + struct folder *folder = impl_from_IFolder(iface); + ULONG ref = InterlockedDecrement(&folder->ref); + + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { - SysFreeString(This->path); - free(This); + SysFreeString(folder->path); + free(folder); } return ref; @@ -2291,8 +2297,8 @@ static HRESULT WINAPI folder_GetTypeInfoCount(IFolder *iface, UINT *pctinfo) static HRESULT WINAPI folder_GetTypeInfo(IFolder *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct folder *This = impl_from_IFolder(iface); - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFolder_tid, ppTInfo); } @@ -2300,11 +2306,10 @@ static HRESULT WINAPI folder_GetIDsOfNames(IFolder *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct folder *This = impl_from_IFolder(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IFolder_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -2321,11 +2326,10 @@ static HRESULT WINAPI folder_Invoke(IFolder *iface, DISPID dispIdMember, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct folder *This = impl_from_IFolder(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IFolder_tid, &typeinfo); @@ -2617,10 +2621,10 @@ static HRESULT WINAPI file_QueryInterface(IFile *iface, REFIID riid, void **obj) static ULONG WINAPI file_AddRef(IFile *iface) { - struct file *This = impl_from_IFile(iface); - LONG ref = InterlockedIncrement(&This->ref); + struct file *file = impl_from_IFile(iface); + LONG ref = InterlockedIncrement(&file->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -2630,7 +2634,7 @@ static ULONG WINAPI file_Release(IFile *iface) struct file *file = impl_from_IFile(iface); LONG ref = InterlockedDecrement(&file->ref); - TRACE("%p, refcount %d.\n", iface, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -2654,9 +2658,7 @@ static HRESULT WINAPI file_GetTypeInfoCount(IFile *iface, UINT *pctinfo) static HRESULT WINAPI file_GetTypeInfo(IFile *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - struct file *This = impl_from_IFile(iface); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); return get_typeinfo(IFile_tid, ppTInfo); } @@ -2664,11 +2666,10 @@ static HRESULT WINAPI file_GetTypeInfo(IFile *iface, static HRESULT WINAPI file_GetIDsOfNames(IFile *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - struct file *This = impl_from_IFile(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IFile_tid, &typeinfo); @@ -2679,13 +2680,13 @@ static HRESULT WINAPI file_GetIDsOfNames(IFile *iface, REFIID riid, return hr; } -static HRESULT WINAPI file_Invoke(IFile *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +static HRESULT WINAPI file_Invoke(IFile *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, + DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - struct file *This = impl_from_IFile(iface); ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IFile_tid, &typeinfo); @@ -3046,7 +3047,8 @@ static HRESULT WINAPI filesys_GetTypeInfoCount(IFileSystem3 *iface, UINT *pctinf static HRESULT WINAPI filesys_GetTypeInfo(IFileSystem3 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - TRACE("(%p)->(%u %u %p)\n", iface, iTInfo, lcid, ppTInfo); + TRACE("%p, %u, %lx, %p.\n", iface, iTInfo, lcid, ppTInfo); + return get_typeinfo(IFileSystem3_tid, ppTInfo); } @@ -3057,7 +3059,7 @@ static HRESULT WINAPI filesys_GetIDsOfNames(IFileSystem3 *iface, REFIID riid, ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%s %p %u %u %p)\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("%p, %s, %p, %u, %lx, %p.\n", iface, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(IFileSystem3_tid, &typeinfo); if(SUCCEEDED(hr)) @@ -3077,7 +3079,7 @@ static HRESULT WINAPI filesys_Invoke(IFileSystem3 *iface, DISPID dispIdMember, ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", iface, dispIdMember, debugstr_guid(riid), + TRACE("%p, %ld, %s, %lx, %d, %p, %p, %p, %p.\n", iface, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(IFileSystem3_tid, &typeinfo); @@ -3939,7 +3941,7 @@ static HRESULT WINAPI filesys_GetFileVersion(IFileSystem3 *iface, BSTR name, BST return HRESULT_FROM_WIN32(GetLastError()); } - ret = VerQueryValueW(ptr, L"\\", (void **)&info, &len); + ret = VerQueryValueW(ptr, L"\\", (void **)&info, NULL); if (!ret) { free(ptr); diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 7f39d0e642a..117256d666b 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -126,7 +126,7 @@ static HRESULT load_typelib(void) hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); + ERR("LoadRegTypeLib failed: %#lx.\n", hres); return hres; } @@ -157,7 +157,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if(FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + ERR("GetTypeInfoOfGuid(%s) failed: %#lx.\n", debugstr_guid(tid_ids[tid]), hres); return hres; } @@ -236,7 +236,7 @@ void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo * BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { - TRACE("%p, %u, %p\n", hinst, reason, reserved); + TRACE("%p, %lu, %p\n", hinst, reason, reserved); switch (reason) { -- 2.34.1

1 0

[PATCH 2/2] wbemdisp: Use CRT allocation functions.
by Hans Leidekker 31 Jan '22

31 Jan '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 62 +++++++++++++++++++---------------------- dlls/wbemdisp/main.c | 1 - 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 3e2566d5220..ffd6debec4d 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -29,7 +29,6 @@ #include "wbemdisp.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" @@ -55,7 +54,7 @@ static WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); + if ((dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; } @@ -162,7 +161,7 @@ static ULONG WINAPI property_Release( ISWbemProperty *iface ) TRACE( "destroying %p\n", property ); IWbemClassObject_Release( property->object ); SysFreeString( property->name ); - heap_free( property ); + free( property ); } return refs; } @@ -322,7 +321,7 @@ static HRESULT SWbemProperty_create( IWbemClassObject *wbem_object, BSTR name, I TRACE( "%p, %p\n", obj, wbem_object ); - if (!(property = heap_alloc( sizeof(*property) ))) return E_OUTOFMEMORY; + if (!(property = malloc( sizeof(*property) ))) return E_OUTOFMEMORY; property->ISWbemProperty_iface.lpVtbl = &property_vtbl; property->refs = 1; property->object = wbem_object; @@ -360,7 +359,7 @@ static ULONG WINAPI propertyset_Release( ISWbemPropertySet *iface ) { TRACE( "destroying %p\n", propertyset ); IWbemClassObject_Release( propertyset->object ); - heap_free( propertyset ); + free( propertyset ); } return refs; } @@ -520,7 +519,7 @@ static HRESULT SWbemPropertySet_create( IWbemClassObject *wbem_object, ISWbemPro TRACE( "%p, %p\n", obj, wbem_object ); - if (!(propertyset = heap_alloc( sizeof(*propertyset) ))) return E_OUTOFMEMORY; + if (!(propertyset = malloc( sizeof(*propertyset) ))) return E_OUTOFMEMORY; propertyset->ISWbemPropertySet_iface.lpVtbl = &propertyset_vtbl; propertyset->refs = 1; propertyset->object = wbem_object; @@ -613,8 +612,8 @@ static ULONG WINAPI method_Release( ISWbemMethod *iface ) { TRACE( "destroying %p\n", method ); ISWbemMethodSet_Release( &method->set->ISWbemMethodSet_iface ); - heap_free( method->name ); - heap_free( method ); + free( method->name ); + free( method ); } return refs; } @@ -779,8 +778,7 @@ static HRESULT SWbemMethod_create( struct methodset *set, const WCHAR *name, ISW { struct method *method; - if (!(method = heap_alloc(sizeof(*method)))) - return E_OUTOFMEMORY; + if (!(method = malloc( sizeof(*method) ))) return E_OUTOFMEMORY; method->ISWbemMethod_iface.lpVtbl = &methodvtbl; method->refs = 1; @@ -837,7 +835,7 @@ static ULONG WINAPI methodset_Release( ISWbemMethodSet *iface ) { TRACE( "destroying %p\n", set ); ISWbemObject_Release( &set->object->ISWbemObject_iface ); - heap_free( set ); + free( set ); } return refs; } @@ -982,8 +980,7 @@ static HRESULT SWbemMethodSet_create( struct object *object, ISWbemMethodSet **o { struct methodset *set; - if (!(set = heap_alloc(sizeof(*set)))) - return E_OUTOFMEMORY; + if (!(set = malloc( sizeof(*set) ))) return E_OUTOFMEMORY; set->ISWbemMethodSet_iface.lpVtbl = &methodsetvtbl; set->refs = 1; @@ -1024,8 +1021,8 @@ static ULONG WINAPI object_Release( IWbemClassObject_Release( object->object ); ISWbemServices_Release( &object->services->ISWbemServices_iface ); for (i = 0; i < object->nb_members; i++) SysFreeString( object->members[i].name ); - heap_free( object->members ); - heap_free( object ); + free( object->members ); + free( object ); } return refs; } @@ -1094,7 +1091,7 @@ static BOOL object_reserve_member( struct object *object, unsigned int count, un if (new_capacity < count) new_capacity = max_capacity; - if (!(new_members = heap_realloc( object->members, new_capacity * sizeof(*new_members) ))) + if (!(new_members = realloc( object->members, new_capacity * sizeof(*new_members) ))) return FALSE; object->members = new_members; @@ -1153,7 +1150,7 @@ static HRESULT init_members( struct object *object ) error: for (i = 0; i < count; ++i) SysFreeString( object->members[i].name ); - heap_free( object->members ); + free( object->members ); object->members = NULL; object->nb_members = 0; return E_FAIL; @@ -1677,7 +1674,7 @@ static HRESULT SWbemObject_create( struct services *services, IWbemClassObject * TRACE( "%p, %p\n", obj, wbem_object ); - if (!(object = heap_alloc( sizeof(*object) ))) return E_OUTOFMEMORY; + if (!(object = malloc( sizeof(*object) ))) return E_OUTOFMEMORY; object->ISWbemObject_iface.lpVtbl = &object_vtbl; object->refs = 1; object->object = wbem_object; @@ -1726,7 +1723,7 @@ static ULONG WINAPI objectset_Release( TRACE( "destroying %p\n", objectset ); IEnumWbemClassObject_Release( objectset->objectenum ); ISWbemServices_Release( &objectset->services->ISWbemServices_iface ); - heap_free( objectset ); + free( objectset ); } return refs; } @@ -1949,7 +1946,7 @@ static HRESULT SWbemObjectSet_create( struct services *services, IEnumWbemClassO TRACE( "%p, %p\n", obj, wbem_objectenum ); - if (!(objectset = heap_alloc( sizeof(*objectset) ))) return E_OUTOFMEMORY; + if (!(objectset = malloc( sizeof(*objectset) ))) return E_OUTOFMEMORY; objectset->ISWbemObjectSet_iface.lpVtbl = &objectset_vtbl; objectset->refs = 1; objectset->objectenum = wbem_objectenum; @@ -1994,7 +1991,7 @@ static ULONG WINAPI enumvar_Release( TRACE( "destroying %p\n", enumvar ); IEnumWbemClassObject_Release( enumvar->objectenum ); ISWbemServices_Release( &enumvar->services->ISWbemServices_iface ); - heap_free( enumvar ); + free( enumvar ); } return refs; } @@ -2087,7 +2084,7 @@ static HRESULT EnumVARIANT_create( struct services *services, IEnumWbemClassObje { struct enumvar *enumvar; - if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; + if (!(enumvar = malloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; enumvar->refs = 1; enumvar->objectenum = objectenum; @@ -2122,7 +2119,7 @@ static ULONG WINAPI services_Release( { TRACE( "destroying %p\n", services ); IWbemServices_Release( services->services ); - heap_free( services ); + free( services ); } return refs; } @@ -2587,7 +2584,7 @@ static HRESULT SWbemServices_create( IWbemServices *wbem_services, ISWbemService TRACE( "%p, %p\n", obj, wbem_services ); - if (!(services = heap_alloc( sizeof(*services) ))) return E_OUTOFMEMORY; + if (!(services = malloc( sizeof(*services) ))) return E_OUTOFMEMORY; services->ISWbemServices_iface.lpVtbl = &services_vtbl; services->refs = 1; services->services = wbem_services; @@ -2627,7 +2624,7 @@ static ULONG WINAPI locator_Release( TRACE( "destroying %p\n", locator ); if (locator->locator) IWbemLocator_Release( locator->locator ); - heap_free( locator ); + free( locator ); } return refs; } @@ -2829,7 +2826,7 @@ HRESULT SWbemLocator_create( void **obj ) TRACE( "%p\n", obj ); - if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; + if (!(locator = malloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; locator->refs = 1; locator->locator = NULL; @@ -2867,7 +2864,7 @@ static ULONG WINAPI security_Release( if (!refs) { TRACE( "destroying %p\n", security ); - heap_free( security ); + free( security ); } return refs; } @@ -3056,7 +3053,7 @@ static HRESULT ISWbemSecurity_create( ISWbemSecurity **obj ) TRACE( "%p\n", obj ); - if (!(security = heap_alloc( sizeof(*security) ))) return E_OUTOFMEMORY; + if (!(security = malloc( sizeof(*security) ))) return E_OUTOFMEMORY; security->ISWbemSecurity_iface.lpVtbl = &security_vtbl; security->refs = 1; security->implevel = wbemImpersonationLevelImpersonate; @@ -3122,7 +3119,7 @@ static ULONG WINAPI namedvalue_Release( if (!refs) { TRACE( "destroying %p\n", value ); - heap_free( value ); + free( value ); } return refs; } @@ -3249,8 +3246,7 @@ static HRESULT namedvalue_create( ISWbemNamedValue **value ) { struct namedvalue *object; - if (!(object = heap_alloc(sizeof(*object)))) - return E_OUTOFMEMORY; + if (!(object = malloc( sizeof(*object) ))) return E_OUTOFMEMORY; object->ISWbemNamedValue_iface.lpVtbl = &namedvaluevtbl; object->refs = 1; @@ -3301,7 +3297,7 @@ static ULONG WINAPI namedvalueset_Release( TRACE( "destroying %p\n", set ); if (set->context) IWbemContext_Release( set->context ); - heap_free( set ); + free( set ); } return refs; } @@ -3513,7 +3509,7 @@ HRESULT SWbemNamedValueSet_create( void **obj ) TRACE( "%p\n", obj ); - if (!(set = heap_alloc_zero( sizeof(*set) ))) return E_OUTOFMEMORY; + if (!(set = calloc( 1, sizeof(*set) ))) return E_OUTOFMEMORY; set->ISWbemNamedValueSet_iface.lpVtbl = &namedvalueset_vtbl; set->refs = 1; diff --git a/dlls/wbemdisp/main.c b/dlls/wbemdisp/main.c index 0ceb417ad52..b71efdb6da0 100644 --- a/dlls/wbemdisp/main.c +++ b/dlls/wbemdisp/main.c @@ -28,7 +28,6 @@ #include "rpcproxy.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wbemdisp_private.h" #include "wbemdisp_classes.h" -- 2.30.2

1 0

[PATCH 1/2] wbemprox: Use CRT allocation functions.
by Hans Leidekker 31 Jan '22

31 Jan '22

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 284 +++++++++++++++---------------- dlls/wbemprox/class.c | 52 +++--- dlls/wbemprox/qualifier.c | 22 +-- dlls/wbemprox/query.c | 50 +++--- dlls/wbemprox/reg.c | 20 +-- dlls/wbemprox/services.c | 70 ++++---- dlls/wbemprox/table.c | 16 +- dlls/wbemprox/tests/query.c | 5 +- dlls/wbemprox/wbemlocator.c | 21 ++- dlls/wbemprox/wbemprox_private.h | 5 +- dlls/wbemprox/wql.y | 2 +- 11 files changed, 270 insertions(+), 277 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5a09d64b8fb..c71bab80ee2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1055,7 +1055,7 @@ static BOOL resize_table( struct table *table, UINT row_count, UINT row_size ) { if (!table->num_rows_allocated) { - if (!(table->data = heap_alloc( row_count * row_size ))) return FALSE; + if (!(table->data = malloc( row_count * row_size ))) return FALSE; table->num_rows_allocated = row_count; return TRUE; } @@ -1063,7 +1063,7 @@ static BOOL resize_table( struct table *table, UINT row_count, UINT row_size ) { BYTE *data; UINT count = max( row_count, table->num_rows_allocated * 2 ); - if (!(data = heap_realloc( table->data, count * row_size ))) return FALSE; + if (!(data = realloc( table->data, count * row_size ))) return FALSE; table->data = data; table->num_rows_allocated = count; } @@ -1250,7 +1250,7 @@ static enum fill_status fill_baseboard( struct table *table, const struct expr * if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); - if (!(buf = heap_alloc( len ))) return FILL_STATUS_FAILED; + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_baseboard *)table->data; @@ -1264,7 +1264,7 @@ static enum fill_status fill_baseboard( struct table *table, const struct expr * if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; - heap_free( buf ); + free( buf ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -1331,7 +1331,7 @@ static WCHAR *convert_bios_date( const WCHAR *str ) else if (q - p == 2) year = 1900 + (p[0] - '0') * 10 + p[1] - '0'; else return NULL; - if (!(ret = heap_alloc( sizeof(fmtW) ))) return NULL; + if (!(ret = malloc( sizeof(fmtW) ))) return NULL; swprintf( ret, ARRAY_SIZE(fmtW), fmtW, year, month, day ); return ret; } @@ -1340,7 +1340,7 @@ static WCHAR *get_bios_releasedate( const char *buf, UINT len ) { WCHAR *ret, *date = get_bios_string( 3, buf, len ); if (!date || !(ret = convert_bios_date( date ))) ret = heap_strdupW( L"20120608000000.000000+000" ); - heap_free( date ); + free( date ); return ret; } @@ -1409,7 +1409,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); - if (!(buf = heap_alloc( len ))) return FILL_STATUS_FAILED; + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_bios *)table->data; @@ -1431,7 +1431,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; - heap_free( buf ); + free( buf ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -1500,11 +1500,11 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), NULL, 0, &len ); if (status != STATUS_INFO_LENGTH_MISMATCH) return get_processor_count(); - if (!(buf = heap_alloc( len ))) return get_processor_count(); + if (!(buf = malloc( len ))) return get_processor_count(); status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), buf, len, NULL ); if (status != STATUS_SUCCESS) { - heap_free( buf ); + free( buf ); return get_processor_count(); } @@ -1524,7 +1524,7 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages offset += entry->Size; } - heap_free( buf ); + free( buf ); if (num_physical) *num_physical = core_relation_count; if (num_packages) *num_packages = package_relation_count; return smt_enabled ? core_relation_count * 2 : core_relation_count; @@ -1553,7 +1553,7 @@ static WCHAR *get_computername(void) WCHAR *ret; DWORD size = MAX_COMPUTERNAME_LENGTH + 1; - if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( size * sizeof(WCHAR) ))) return NULL; GetComputerNameW( ret, &size ); return ret; } @@ -1569,7 +1569,7 @@ static WCHAR *get_username(void) usersize = 0; GetUserNameW( NULL, &usersize ); size = compsize + usersize; /* two null terminators account for the \ */ - if (!(ret = heap_alloc( size * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( size * sizeof(WCHAR) ))) return NULL; GetComputerNameW( ret, &compsize ); ret[compsize] = '\\'; GetUserNameW( ret + compsize + 1, &usersize ); @@ -1639,7 +1639,7 @@ static WCHAR *get_compsysproduct_uuid( const char *buf, UINT len ) if (!(hdr = find_smbios_entry( SMBIOS_TYPE_SYSTEM, buf, len )) || hdr->length < sizeof(*system)) goto done; system = (const struct smbios_system *)hdr; - if (!memcmp( system->uuid, none, sizeof(none) ) || !(ret = heap_alloc( 37 * sizeof(WCHAR) ))) goto done; + if (!memcmp( system->uuid, none, sizeof(none) ) || !(ret = malloc( 37 * sizeof(WCHAR) ))) goto done; ptr = system->uuid; swprintf( ret, 37, L"%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X", ptr[0], ptr[1], @@ -1674,7 +1674,7 @@ static enum fill_status fill_compsysproduct( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); - if (!(buf = heap_alloc( len ))) return FILL_STATUS_FAILED; + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_computersystemproduct *)table->data; @@ -1687,7 +1687,7 @@ static enum fill_status fill_compsysproduct( struct table *table, const struct e if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; - heap_free( buf ); + free( buf ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -1706,16 +1706,16 @@ static struct dirstack *alloc_dirstack( UINT size ) { struct dirstack *dirstack; - if (!(dirstack = heap_alloc( sizeof(*dirstack) ))) return NULL; - if (!(dirstack->dirs = heap_alloc( sizeof(WCHAR *) * size ))) + if (!(dirstack = malloc( sizeof(*dirstack) ))) return NULL; + if (!(dirstack->dirs = malloc( sizeof(WCHAR *) * size ))) { - heap_free( dirstack ); + free( dirstack ); return NULL; } - if (!(dirstack->len_dirs = heap_alloc( sizeof(UINT) * size ))) + if (!(dirstack->len_dirs = malloc( sizeof(UINT) * size ))) { - heap_free( dirstack->dirs ); - heap_free( dirstack ); + free( dirstack->dirs ); + free( dirstack ); return NULL; } dirstack->num_dirs = 0; @@ -1726,16 +1726,16 @@ static struct dirstack *alloc_dirstack( UINT size ) static void clear_dirstack( struct dirstack *dirstack ) { UINT i; - for (i = 0; i < dirstack->num_dirs; i++) heap_free( dirstack->dirs[i] ); + for (i = 0; i < dirstack->num_dirs; i++) free( dirstack->dirs[i] ); dirstack->num_dirs = 0; } static void free_dirstack( struct dirstack *dirstack ) { clear_dirstack( dirstack ); - heap_free( dirstack->dirs ); - heap_free( dirstack->len_dirs ); - heap_free( dirstack ); + free( dirstack->dirs ); + free( dirstack->len_dirs ); + free( dirstack ); } static BOOL push_dir( struct dirstack *dirstack, WCHAR *dir, UINT len ) @@ -1750,9 +1750,9 @@ static BOOL push_dir( struct dirstack *dirstack, WCHAR *dir, UINT len ) UINT *len_tmp; size = dirstack->num_allocated * 2; - if (!(tmp = heap_realloc( dirstack->dirs, size * sizeof(WCHAR *) ))) return FALSE; + if (!(tmp = realloc( dirstack->dirs, size * sizeof(WCHAR *) ))) return FALSE; dirstack->dirs = tmp; - if (!(len_tmp = heap_realloc( dirstack->len_dirs, size * sizeof(UINT) ))) return FALSE; + if (!(len_tmp = realloc( dirstack->len_dirs, size * sizeof(UINT) ))) return FALSE; dirstack->len_dirs = len_tmp; dirstack->num_allocated = size; } @@ -1785,7 +1785,7 @@ static WCHAR *build_glob( WCHAR drive, const WCHAR *path, UINT len ) UINT i = 0; WCHAR *ret; - if (!(ret = heap_alloc( (len + 6) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len + 6) * sizeof(WCHAR) ))) return NULL; ret[i++] = drive; ret[i++] = ':'; ret[i++] = '\\'; @@ -1811,7 +1811,7 @@ static WCHAR *build_name( WCHAR drive, const WCHAR *path ) if (*p == '\\') len += 2; else len++; }; - if (!(ret = heap_alloc( (len + 5) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len + 5) * sizeof(WCHAR) ))) return NULL; ret[i++] = drive; ret[i++] = ':'; ret[i++] = '\\'; @@ -1844,7 +1844,7 @@ static WCHAR *build_dirname( const WCHAR *path, UINT *ret_len ) while (p >= start && *p != '\\') { len--; p--; }; while (p >= start && *p == '\\') { len--; p--; }; - if (!(ret = heap_alloc( (len + 1) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len + 1) * sizeof(WCHAR) ))) return NULL; for (i = 0, p = start; p < start + len; p++) { if (p[0] == '\\' && p[1] == '\\') @@ -1897,11 +1897,11 @@ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR { if (seen_dir( dirstack, path )) { - heap_free( path ); + free( path ); return ++*count; } else if (push_dir( dirstack, path, len )) return ++*count; - heap_free( path ); + free( path ); return *count = 0; } } @@ -1923,7 +1923,7 @@ static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) *len = 0; if (path) len_path = lstrlenW( path ); - if (!(ret = heap_alloc( (len_path + len_segment + 2) * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( (len_path + len_segment + 2) * sizeof(WCHAR) ))) return NULL; if (path && len_path) { memcpy( ret, path, len_path * sizeof(WCHAR) ); @@ -1943,22 +1943,22 @@ static WCHAR *get_file_version( const WCHAR *filename ) void *block; WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = malloc( size ))) { - heap_free( ret ); + free( ret ); return NULL; } if (!GetFileVersionInfoW( filename, 0, size, block ) || !VerQueryValueW( block, L"\\", (void **)&info, &size )) { - heap_free( block ); - heap_free( ret ); + free( block ); + free( ret ); return NULL; } swprintf( ret, len, L"%u.%u.%u.%u", info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); - heap_free( block ); + free( block ); return ret; } @@ -1989,8 +1989,8 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c for (;;) { - heap_free( glob ); - heap_free( path ); + free( glob ); + free( path ); path = pop_dir( dirstack, &len ); if (!(glob = build_glob( root[0], path, len ))) { @@ -2019,7 +2019,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { if (push_dir( dirstack, new_path, len )) continue; - heap_free( new_path ); + free( new_path ); FindClose( handle ); status = FILL_STATUS_FAILED; goto done; @@ -2027,7 +2027,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c rec = (struct record_datafile *)(table->data + offset); rec->name = build_name( root[0], new_path ); rec->version = get_file_version( rec->name ); - heap_free( new_path ); + free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -2052,8 +2052,8 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c done: free_dirstack( dirstack ); - heap_free( glob ); - heap_free( path ); + free( glob ); + free( path ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -2117,8 +2117,8 @@ static enum fill_status fill_directory( struct table *table, const struct expr * for (;;) { - heap_free( glob ); - heap_free( path ); + free( glob ); + free( path ); path = pop_dir( dirstack, &len ); if (!(glob = build_glob( root[0], path, len ))) { @@ -2148,7 +2148,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * if (!(push_dir( dirstack, new_path, len ))) { - heap_free( new_path ); + free( new_path ); FindClose( handle ); status = FILL_STATUS_FAILED; goto done; @@ -2156,7 +2156,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * rec = (struct record_directory *)(table->data + offset); rec->accessmask = FILE_ALL_ACCESS; rec->name = build_name( root[0], new_path ); - heap_free( new_path ); + free( new_path ); if (!match_row( table, row, cond, &status )) { free_row_values( table, row ); @@ -2181,8 +2181,8 @@ static enum fill_status fill_directory( struct table *table, const struct expr * done: free_dirstack( dirstack ); - heap_free( glob ); - heap_free( path ); + free( glob ); + free( path ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -2229,15 +2229,15 @@ static WCHAR *get_diskdrive_serialnumber( WCHAR letter ) size = sizeof(*desc) + 256; for (;;) { - if (!(desc = heap_alloc( size ))) break; + if (!(desc = malloc( size ))) break; if (DeviceIoControl( handle, IOCTL_STORAGE_QUERY_PROPERTY, &query, sizeof(query), desc, size, NULL, NULL )) { if (desc->SerialNumberOffset) ret = heap_strdupAW( (const char *)desc + desc->SerialNumberOffset ); - heap_free( desc ); + free( desc ); break; } size = desc->Size; - heap_free( desc ); + free( desc ); if (GetLastError() != ERROR_MORE_DATA) break; } @@ -2308,10 +2308,10 @@ static void free_associations( struct association *assoc, UINT count ) if (!assoc) return; for (i = 0; i < count; i++) { - heap_free( assoc[i].ref ); - heap_free( assoc[i].ref2 ); + free( assoc[i].ref ); + free( assoc[i].ref2 ); } - heap_free( assoc ); + free( assoc ); } static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) @@ -2332,7 +2332,7 @@ static struct association *get_diskdrivetodiskpartition_pairs( UINT *count ) &query2->view, &query2->mem )) != S_OK) goto done; if ((hr = execute_view( query2->view )) != S_OK) goto done; - if (!(ret = heap_alloc_zero( query->view->result_count * sizeof(*ret) ))) goto done; + if (!(ret = calloc( query->view->result_count, sizeof(*ret) ))) goto done; for (i = 0; i < query->view->result_count; i++) { @@ -2387,7 +2387,7 @@ static enum fill_status fill_diskdrivetodiskpartition( struct table *table, cons row++; } - heap_free( assoc ); + free( assoc ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -2491,7 +2491,7 @@ static WCHAR *get_ip4_string( DWORD addr ) DWORD len = sizeof("ddd.ddd.ddd.ddd"); WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( ret, len, L"%u.%u.%u.%u", (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); return ret; } @@ -2504,15 +2504,15 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex enum fill_status status = FILL_STATUS_UNFILTERED; if (GetIpForwardTable( NULL, &size, TRUE ) != ERROR_INSUFFICIENT_BUFFER) return FILL_STATUS_FAILED; - if (!(forwards = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (!(forwards = malloc( size ))) return FILL_STATUS_FAILED; if (GetIpForwardTable( forwards, &size, TRUE )) { - heap_free( forwards ); + free( forwards ); return FILL_STATUS_FAILED; } if (!resize_table( table, max(forwards->dwNumEntries, 1), sizeof(*rec) )) { - heap_free( forwards ); + free( forwards ); return FILL_STATUS_FAILED; } @@ -2535,7 +2535,7 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex TRACE("created %u rows\n", row); table->num_rows = row; - heap_free( forwards ); + free( forwards ); return status; } @@ -2621,7 +2621,7 @@ static struct association *get_logicaldisktopartition_pairs( UINT *count ) &query2->mem )) != S_OK) goto done; if ((hr = execute_view( query2->view )) != S_OK) goto done; - if (!(ret = heap_alloc_zero( query->view->result_count * sizeof(*ret) ))) goto done; + if (!(ret = calloc( query->view->result_count, sizeof(*ret) ))) goto done; /* assume fixed and removable disks are enumerated in the same order as partitions */ for (i = 0; i < query->view->result_count; i++) @@ -2677,7 +2677,7 @@ static enum fill_status fill_logicaldisktopartition( struct table *table, const row++; } - heap_free( assoc ); + free( assoc ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -2701,7 +2701,7 @@ static UINT16 get_connection_status( IF_OPER_STATUS status ) static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) { WCHAR *ret; - if (len != 6 || !(ret = heap_alloc( 18 * sizeof(WCHAR) ))) return NULL; + if (len != 6 || !(ret = malloc( 18 * sizeof(WCHAR) ))) return NULL; swprintf( ret, 18, L"%02x:%02x:%02x:%02x:%02x:%02x", addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } @@ -2740,7 +2740,7 @@ static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) static WCHAR *guid_to_str( const GUID *ptr ) { WCHAR *ret; - if (!(ret = heap_alloc( GUID_SIZE * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( GUID_SIZE * sizeof(WCHAR) ))) return NULL; swprintf( ret, GUID_SIZE, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", ptr->Data1, ptr->Data2, ptr->Data3, ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3], ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); @@ -2767,10 +2767,10 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; - if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED; if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) { - heap_free( buffer ); + free( buffer ); return FILL_STATUS_FAILED; } for (aa = buffer; aa; aa = aa->Next) @@ -2779,7 +2779,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e } if (!resize_table( table, count, sizeof(*rec) )) { - heap_free( buffer ); + free( buffer ); return FILL_STATUS_FAILED; } for (aa = buffer; aa; aa = aa->Next) @@ -2814,7 +2814,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e TRACE("created %u rows\n", row); table->num_rows = row; - heap_free( buffer ); + free( buffer ); return status; } @@ -2838,10 +2838,10 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) if (!list) return NULL; for (gateway = list; gateway; gateway = gateway->Next) count++; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; - if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + if (!(ret = malloc( sizeof(*ret) ))) return NULL; + if (!(ptr = malloc( sizeof(*ptr) * count ))) { - heap_free( ret ); + free( ret ); return NULL; } for (gateway = list; gateway; gateway = gateway->Next) @@ -2850,9 +2850,9 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) if (WSAAddressToStringW( gateway->Address.lpSockaddr, gateway->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { - for (; i > 0; i--) heap_free( ptr[i - 1] ); - heap_free( ptr ); - heap_free( ret ); + for (; i > 0; i--) free( ptr[i - 1] ); + free( ptr ); + free( ret ); return NULL; } } @@ -2871,10 +2871,10 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li if (!list) return NULL; for (server = list; server; server = server->Next) count++; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; - if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + if (!(ret = malloc( sizeof(*ret) ))) return NULL; + if (!(ptr = malloc( sizeof(*ptr) * count ))) { - heap_free( ret ); + free( ret ); return NULL; } for (server = list; server; server = server->Next) @@ -2883,9 +2883,9 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li if (WSAAddressToStringW( server->Address.lpSockaddr, server->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { - for (; i > 0; i--) heap_free( ptr[i - 1] ); - heap_free( ptr ); - heap_free( ret ); + for (; i > 0; i--) free( ptr[i - 1] ); + free( ptr ); + free( ret ); return NULL; } if ((p = wcsrchr( ptr[i - 1], ':' ))) *p = 0; @@ -2905,10 +2905,10 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) if (!list) return NULL; for (address = list; address; address = address->Next) count++; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; - if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + if (!(ret = malloc( sizeof(*ret) ))) return NULL; + if (!(ptr = malloc( sizeof(*ptr) * count ))) { - heap_free( ret ); + free( ret ); return NULL; } for (address = list; address; address = address->Next) @@ -2917,9 +2917,9 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) if (WSAAddressToStringW( address->Address.lpSockaddr, address->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { - for (; i > 0; i--) heap_free( ptr[i - 1] ); - heap_free( ptr ); - heap_free( ret ); + for (; i > 0; i--) free( ptr[i - 1] ); + free( ptr ); + free( ret ); return NULL; } } @@ -2938,10 +2938,10 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) if (!list) return NULL; for (address = list; address; address = address->Next) count++; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; - if (!(ptr = heap_alloc( sizeof(*ptr) * count ))) + if (!(ret = malloc( sizeof(*ret) ))) return NULL; + if (!(ptr = malloc( sizeof(*ptr) * count ))) { - heap_free( ret ); + free( ret ); return NULL; } for (address = list; address; address = address->Next) @@ -2968,9 +2968,9 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } if (!ptr[i++]) { - for (; i > 0; i--) heap_free( ptr[i - 1] ); - heap_free( ptr ); - heap_free( ret ); + for (; i > 0; i--) free( ptr[i - 1] ); + free( ptr ); + free( ret ); return NULL; } } @@ -2998,10 +2998,10 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; - if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED; if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { - heap_free( buffer ); + free( buffer ); return FILL_STATUS_FAILED; } for (aa = buffer; aa; aa = aa->Next) @@ -3010,7 +3010,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st } if (!resize_table( table, count, sizeof(*rec) )) { - heap_free( buffer ); + free( buffer ); return FILL_STATUS_FAILED; } for (aa = buffer; aa; aa = aa->Next) @@ -3042,7 +3042,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st TRACE("created %u rows\n", row); table->num_rows = row; - heap_free( buffer ); + free( buffer ); return status; } @@ -3132,15 +3132,15 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, NULL, 0, &size, &count ); if (!count) return FILL_STATUS_UNFILTERED; - if (!(info = heap_alloc( size ))) return FILL_STATUS_FAILED; + if (!(info = malloc( size ))) return FILL_STATUS_FAILED; if (!EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 2, (BYTE *)info, size, &size, &count )) { - heap_free( info ); + free( info ); return FILL_STATUS_FAILED; } if (!resize_table( table, count, sizeof(*rec) )) { - heap_free( info ); + free( info ); return FILL_STATUS_FAILED; } @@ -3168,7 +3168,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co TRACE("created %u rows\n", num_rows); table->num_rows = num_rows; - heap_free( info ); + free( info ); return status; } @@ -3345,11 +3345,11 @@ static UINT get_processor_currentclockspeed( UINT index ) UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); NTSTATUS status; - if ((info = heap_alloc( size ))) + if ((info = malloc( size ))) { status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); if (!status) ret = info[index].CurrentMhz; - heap_free( info ); + free( info ); } return ret; } @@ -3359,11 +3359,11 @@ static UINT get_processor_maxclockspeed( UINT index ) UINT ret = 1000, size = get_processor_count() * sizeof(PROCESSOR_POWER_INFORMATION); NTSTATUS status; - if ((info = heap_alloc( size ))) + if ((info = malloc( size ))) { status = NtPowerInformation( ProcessorInformation, NULL, 0, info, size ); if (!status) ret = info[index].MaxMhz; - heap_free( info ); + free( info ); } return ret; } @@ -3429,7 +3429,7 @@ static WCHAR *get_lastbootuptime(void) TIME_FIELDS tf; WCHAR *ret; - if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( 26 * sizeof(WCHAR) ))) return NULL; NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); RtlTimeToTimeFields( &ti.BootTime, &tf ); @@ -3453,7 +3453,7 @@ static WCHAR *get_localdatetime(void) Bias+= tzi.DaylightBias; else Bias+= tzi.StandardBias; - if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( 26 * sizeof(WCHAR) ))) return NULL; GetLocalTime(&st); swprintf( ret, 26, L"%04u%02u%02u%02u%02u%02u.%06u%+03d", st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, @@ -3465,7 +3465,7 @@ static WCHAR *get_systemdirectory(void) void *redir; WCHAR *ret; - if (!(ret = heap_alloc( MAX_PATH * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( MAX_PATH * sizeof(WCHAR) ))) return NULL; Wow64DisableWow64FsRedirection( &redir ); GetSystemDirectoryW( ret, MAX_PATH ); Wow64RevertWow64FsRedirection( redir ); @@ -3473,32 +3473,32 @@ static WCHAR *get_systemdirectory(void) } static WCHAR *get_systemdrive(void) { - WCHAR *ret = heap_alloc( 3 * sizeof(WCHAR) ); /* "c:" */ + WCHAR *ret = malloc( 3 * sizeof(WCHAR) ); /* "c:" */ if (ret && GetEnvironmentVariableW( L"SystemDrive", ret, 3 )) return ret; - heap_free( ret ); + free( ret ); return NULL; } static WCHAR *get_codeset(void) { - WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); + WCHAR *ret = malloc( 11 * sizeof(WCHAR) ); if (ret) swprintf( ret, 11, L"%u", GetACP() ); return ret; } static WCHAR *get_countrycode(void) { - WCHAR *ret = heap_alloc( 6 * sizeof(WCHAR) ); + WCHAR *ret = malloc( 6 * sizeof(WCHAR) ); if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ICOUNTRY, ret, 6 ); return ret; } static WCHAR *get_locale(void) { - WCHAR *ret = heap_alloc( 5 * sizeof(WCHAR) ); + WCHAR *ret = malloc( 5 * sizeof(WCHAR) ); if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, ret, 5 ); return ret; } static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) { - WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); + WCHAR *ret = malloc( 11 * sizeof(WCHAR) ); if (ret) swprintf( ret, 11, L"%u", ver->dwBuildNumber ); return ret; } @@ -3519,7 +3519,7 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) int len = ARRAY_SIZE( windowsW ) - 1; WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); @@ -3549,7 +3549,7 @@ static WCHAR *get_osname( const WCHAR *caption ) int len = lstrlenW( caption ); WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(partitionW) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) + sizeof(partitionW) ))) return NULL; memcpy( ret, caption, len * sizeof(WCHAR) ); memcpy( ret + len, partitionW, sizeof(partitionW) ); return ret; @@ -3562,12 +3562,12 @@ static WCHAR *get_osserialnumber(void) if (!RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey ) && !RegQueryValueExW( hkey, L"ProductId", NULL, &type, NULL, &size ) && type == REG_SZ && - (ret = heap_alloc( size + sizeof(WCHAR) ))) + (ret = malloc( size + sizeof(WCHAR) ))) { size += sizeof(WCHAR); if (RegQueryValueExW( hkey, L"ProductId", NULL, NULL, (BYTE *)ret, &size )) { - heap_free( ret ); + free( ret ); ret = NULL; } } @@ -3577,7 +3577,7 @@ static WCHAR *get_osserialnumber(void) } static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { - WCHAR *ret = heap_alloc( 33 * sizeof(WCHAR) ); + WCHAR *ret = malloc( 33 * sizeof(WCHAR) ); if (ret) swprintf( ret, 33, L"%u.%u.%u", ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } @@ -3693,9 +3693,9 @@ static QUERY_SERVICE_CONFIGW *query_service_config( SC_HANDLE manager, const WCH if (!(service = OpenServiceW( manager, name, SERVICE_QUERY_CONFIG ))) return NULL; QueryServiceConfigW( service, NULL, 0, &size ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) goto done; - if (!(config = heap_alloc( size ))) goto done; + if (!(config = malloc( size ))) goto done; if (QueryServiceConfigW( service, config, size, &size )) goto done; - heap_free( config ); + free( config ); config = NULL; done: @@ -3716,7 +3716,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co BOOL ret; if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE ))) return FILL_STATUS_FAILED; - if (!(services = heap_alloc( size ))) goto done; + if (!(services = malloc( size ))) goto done; ret = EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, SERVICE_TYPE_ALL, SERVICE_STATE_ALL, (BYTE *)services, size, &needed, @@ -3725,7 +3725,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co { if (GetLastError() != ERROR_MORE_DATA) goto done; size = needed; - if (!(tmp = heap_realloc( services, size ))) goto done; + if (!(tmp = realloc( services, size ))) goto done; services = tmp; ret = EnumServicesStatusExW( manager, SC_ENUM_PROCESS_INFO, SERVICE_TYPE_ALL, SERVICE_STATE_ALL, (BYTE *)services, size, &needed, @@ -3758,7 +3758,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co rec->resume_service = service_resume_service; rec->start_service = service_start_service; rec->stop_service = service_stop_service; - heap_free( config ); + free( config ); if (!match_row( table, row, cond, &fill_status )) { free_row_values( table, row ); @@ -3773,7 +3773,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co done: CloseServiceHandle( manager ); - heap_free( services ); + free( services ); return fill_status; } @@ -3787,10 +3787,10 @@ static struct array *get_binaryrepresentation( PSID sid, UINT len ) struct array *ret; UINT8 *ptr; - if (!(ret = heap_alloc( sizeof(*ret) ))) return NULL; - if (!(ptr = heap_alloc( len ))) + if (!(ret = malloc( sizeof(*ret) ))) return NULL; + if (!(ptr = malloc( len ))) { - heap_free( ret ); + free( ret ); return NULL; } memcpy( ptr, sid, len ); @@ -3906,10 +3906,10 @@ static int get_systemenclosure_lockpresent( const char *buf, UINT len ) static struct array *dup_array( const struct array *src ) { struct array *dst; - if (!(dst = heap_alloc( sizeof(*dst) ))) return NULL; - if (!(dst->ptr = heap_alloc( src->count * src->elem_size ))) + if (!(dst = malloc( sizeof(*dst) ))) return NULL; + if (!(dst->ptr = malloc( src->count * src->elem_size ))) { - heap_free( dst ); + free( dst ); return NULL; } memcpy( dst->ptr, src->ptr, src->count * src->elem_size ); @@ -3928,10 +3928,10 @@ static struct array *get_systemenclosure_chassistypes( const char *buf, UINT len if (!(hdr = find_smbios_entry( SMBIOS_TYPE_CHASSIS, buf, len )) || hdr->length < sizeof(*chassis)) goto done; chassis = (const struct smbios_chassis *)hdr; - if (!(ret = heap_alloc( sizeof(*ret) ))) goto done; - if (!(types = heap_alloc( sizeof(*types) ))) + if (!(ret = malloc( sizeof(*ret) ))) goto done; + if (!(types = malloc( sizeof(*types) ))) { - heap_free( ret ); + free( ret ); return NULL; } types[0] = chassis->type & ~0x80; @@ -3955,7 +3955,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 ); - if (!(buf = heap_alloc( len ))) return FILL_STATUS_FAILED; + if (!(buf = malloc( len ))) return FILL_STATUS_FAILED; GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_systemenclosure *)table->data; @@ -3969,7 +3969,7 @@ static enum fill_status fill_systemenclosure( struct table *table, const struct if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; - heap_free( buf ); + free( buf ); TRACE("created %u rows\n", row); table->num_rows = row; @@ -3982,7 +3982,7 @@ static WCHAR *get_videocontroller_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) UINT len = sizeof(fmtW) + 2; WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( ret, len, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); return ret; } @@ -4082,7 +4082,7 @@ static WCHAR *get_sounddevice_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) UINT len = sizeof(fmtW) + 2; WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( ret, len, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); return ret; } diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index cabf1c9058d..6f93c58a0df 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -61,7 +61,7 @@ static ULONG WINAPI enum_class_object_Release( { TRACE("destroying %p\n", ec); release_query( ec->query ); - heap_free( ec ); + free( ec ); } return refs; } @@ -205,8 +205,7 @@ HRESULT EnumWbemClassObject_create( struct query *query, LPVOID *ppObj ) TRACE("%p\n", ppObj); - ec = heap_alloc( sizeof(*ec) ); - if (!ec) return E_OUTOFMEMORY; + if (!(ec = malloc( sizeof(*ec) ))) return E_OUTOFMEMORY; ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; @@ -225,10 +224,10 @@ static struct record *create_record( struct table *table ) UINT i; struct record *record; - if (!(record = heap_alloc( sizeof(struct record) ))) return NULL; - if (!(record->fields = heap_alloc( table->num_cols * sizeof(struct field) ))) + if (!(record = malloc( sizeof(struct record) ))) return NULL; + if (!(record->fields = malloc( table->num_cols * sizeof(struct field) ))) { - heap_free( record ); + free( record ); return NULL; } for (i = 0; i < table->num_cols; i++) @@ -247,10 +246,10 @@ void destroy_array( struct array *array, CIMTYPE type ) if (!array) return; if (type == CIM_STRING || type == CIM_DATETIME || type == CIM_REFERENCE) { - for (i = 0; i < array->count; i++) heap_free( *(WCHAR **)((char *)array->ptr + i * array->elem_size) ); + for (i = 0; i < array->count; i++) free( *(WCHAR **)((char *)array->ptr + i * array->elem_size) ); } - heap_free( array->ptr ); - heap_free( array ); + free( array->ptr ); + free( array ); } static void destroy_record( struct record *record ) @@ -263,12 +262,12 @@ static void destroy_record( struct record *record ) { if (record->fields[i].type == CIM_STRING || record->fields[i].type == CIM_DATETIME || - record->fields[i].type == CIM_REFERENCE) heap_free( record->fields[i].u.sval ); + record->fields[i].type == CIM_REFERENCE) free( record->fields[i].u.sval ); else if (record->fields[i].type & CIM_FLAG_ARRAY) destroy_array( record->fields[i].u.aval, record->fields[i].type & CIM_TYPE_MASK ); } - heap_free( record->fields ); - heap_free( record ); + free( record->fields ); + free( record ); } struct class_object @@ -307,8 +306,8 @@ static ULONG WINAPI class_object_Release( TRACE("destroying %p\n", co); if (co->iter) IEnumWbemClassObject_Release( co->iter ); destroy_record( co->record ); - heap_free( co->name ); - heap_free( co ); + free( co->name ); + free( co ); } return refs; } @@ -774,8 +773,8 @@ static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UI int i = 0; count = count_instances( iter ); - if (!(columns = heap_alloc( count * sizeof(struct column) ))) return E_OUTOFMEMORY; - if (!(row = heap_alloc_zero( count * sizeof(LONGLONG) ))) goto error; + if (!(columns = malloc( count * sizeof(struct column) ))) return E_OUTOFMEMORY; + if (!(row = calloc( count, sizeof(LONGLONG) ))) goto error; for (;;) { @@ -805,9 +804,9 @@ static HRESULT create_signature_columns_and_data( IEnumWbemClassObject *iter, UI return S_OK; error: - for (; i >= 0; i--) heap_free( (WCHAR *)columns[i].name ); - heap_free( columns ); - heap_free( row ); + for (; i >= 0; i--) free( (WCHAR *)columns[i].name ); + free( columns ); + free( row ); return hr; } @@ -825,7 +824,7 @@ static HRESULT create_signature_table( IEnumWbemClassObject *iter, enum wbm_name if (!(table = create_table( name, num_cols, columns, 1, 1, row, NULL ))) { free_columns( columns, num_cols ); - heap_free( row ); + free( row ); return E_OUTOFMEMORY; } if (!add_table( ns, table )) free_table( table ); /* already exists */ @@ -837,7 +836,7 @@ static WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *metho UINT len = ARRAY_SIZE(L"__%s_%s_%s") + ARRAY_SIZE(L"OUT") + lstrlenW( class ) + lstrlenW( method ); WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( ret, len, L"__%s_%s_%s", class, method, dir == PARAM_IN ? L"IN" : L"OUT" ); return wcsupr( ret ); } @@ -852,11 +851,11 @@ HRESULT create_signature( enum wbm_namespace ns, const WCHAR *class, const WCHAR HRESULT hr; len += lstrlenW( class ) + lstrlenW( method ); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(query = malloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; swprintf( query, len, selectW, class, method, dir >= 0 ? L">=0" : L"<=0" ); hr = exec_query( ns, query, &iter ); - heap_free( query ); + free( query ); if (hr != S_OK) return hr; if (!count_instances( iter )) @@ -876,7 +875,7 @@ HRESULT create_signature( enum wbm_namespace ns, const WCHAR *class, const WCHAR if (hr == S_OK) hr = get_object( ns, name, sig ); - heap_free( name ); + free( name ); return hr; } @@ -1064,15 +1063,14 @@ HRESULT create_class_object( enum wbm_namespace ns, const WCHAR *name, IEnumWbem TRACE("%s, %p\n", debugstr_w(name), obj); - co = heap_alloc( sizeof(*co) ); - if (!co) return E_OUTOFMEMORY; + if (!(co = malloc( sizeof(*co) ))) return E_OUTOFMEMORY; co->IWbemClassObject_iface.lpVtbl = &class_object_vtbl; co->refs = 1; if (!name) co->name = NULL; else if (!(co->name = heap_strdupW( name ))) { - heap_free( co ); + free( co ); return E_OUTOFMEMORY; } co->iter = iter; diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index 73075b85a06..aa032388759 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -60,9 +60,9 @@ static ULONG WINAPI qualifier_set_Release( if (!refs) { TRACE("destroying %p\n", set); - heap_free( set->class ); - heap_free( set->member ); - heap_free( set ); + free( set->class ); + free( set->member ); + free( set ); } return refs; } @@ -103,24 +103,24 @@ static HRESULT create_qualifier_enum( enum wbm_namespace ns, const WCHAR *class, if (member && name) { len = lstrlenW( class ) + lstrlenW( member ) + lstrlenW( name ) + ARRAY_SIZE(fmtW); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(query = malloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; swprintf( query, len, fmtW, class, member, name ); } else if (member) { len = lstrlenW( class ) + lstrlenW( member ) + ARRAY_SIZE(fmt2W); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(query = malloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; swprintf( query, len, fmt2W, class, member ); } else { len = lstrlenW( class ) + ARRAY_SIZE(fmt3W); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(query = malloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; swprintf( query, len, fmt3W, class ); } hr = exec_query( ns, query, iter ); - heap_free( query ); + free( query ); return hr; } @@ -279,19 +279,19 @@ HRESULT WbemQualifierSet_create( enum wbm_namespace ns, const WCHAR *class, cons TRACE("%p\n", ppObj); - if (!(set = heap_alloc( sizeof(*set) ))) return E_OUTOFMEMORY; + if (!(set = malloc( sizeof(*set) ))) return E_OUTOFMEMORY; set->IWbemQualifierSet_iface.lpVtbl = &qualifier_set_vtbl; if (!(set->class = heap_strdupW( class ))) { - heap_free( set ); + free( set ); return E_OUTOFMEMORY; } if (!member) set->member = NULL; else if (!(set->member = heap_strdupW( member ))) { - heap_free( set->class ); - heap_free( set ); + free( set->class ); + free( set ); return E_OUTOFMEMORY; } set->ns = ns; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 63007565766..56631cbca9e 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HRESULT append_table( struct view *view, struct table *table ) { struct table **tmp; - if (!(tmp = heap_realloc( view->table, (view->table_count + 1) * sizeof(*tmp) ))) return E_OUTOFMEMORY; + if (!(tmp = realloc( view->table, (view->table_count + 1) * sizeof(*tmp) ))) return E_OUTOFMEMORY; view->table = tmp; view->table[view->table_count++] = table; return S_OK; @@ -41,7 +41,7 @@ static HRESULT append_table( struct view *view, struct table *table ) HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *path, const struct keyword *keywordlist, const WCHAR *class, const struct property *proplist, const struct expr *cond, struct view **ret ) { - struct view *view = heap_alloc_zero( sizeof(*view) ); + struct view *view = calloc( 1, sizeof(*view) ); if (!view) return E_OUTOFMEMORY; @@ -59,7 +59,7 @@ HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *pa if (table && (hr = append_table( view, table )) != S_OK) { - heap_free( view ); + free( view ); return hr; } else if (!table && ns == WBEMPROX_NAMESPACE_LAST) return WBEM_E_INVALID_CLASS; @@ -69,7 +69,7 @@ HRESULT create_view( enum view_type type, enum wbm_namespace ns, const WCHAR *pa } default: ERR( "unhandled type %u\n", type ); - heap_free( view ); + free( view ); return E_INVALIDARG; } @@ -84,9 +84,9 @@ void destroy_view( struct view *view ) ULONG i; if (!view) return; for (i = 0; i < view->table_count; i++) release_table( view->table[i] ); - heap_free( view->table ); - heap_free( view->result ); - heap_free( view ); + free( view->table ); + free( view->result ); + free( view ); } static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) @@ -477,7 +477,7 @@ static WCHAR *build_assoc_query( const WCHAR *class, UINT class_len ) UINT len = class_len + ARRAY_SIZE(fmtW); WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( ret, len, fmtW, class ); return ret; } @@ -490,7 +490,7 @@ static HRESULT create_assoc_enum( enum wbm_namespace ns, const WCHAR *class, UIN if (!(query = build_assoc_query( class, class_len ))) return E_OUTOFMEMORY; hr = exec_query( ns, query, iter ); - heap_free( query ); + free( query ); return hr; } @@ -500,7 +500,7 @@ static WCHAR *build_antecedent_query( const WCHAR *assocclass, const WCHAR *depe UINT len = lstrlenW(assocclass) + lstrlenW(dependent) + ARRAY_SIZE(fmtW); WCHAR *ret; - if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( ret, len, fmtW, assocclass, dependent ); return ret; } @@ -534,7 +534,7 @@ static WCHAR *build_canonical_path( const WCHAR *relpath ) } len = ARRAY_SIZE( L"\\\\%s\\%s:" ) + SysStringLen( server ) + SysStringLen( namespace ) + lstrlenW( relpath ); - if ((ret = heap_alloc( len * sizeof(WCHAR ) ))) + if ((ret = malloc( len * sizeof(WCHAR ) ))) { len = swprintf( ret, len, L"\\\\%s\\%s:", server, namespace ); for (i = 0; i < lstrlenW( relpath ); i ++) @@ -577,8 +577,8 @@ static HRESULT get_antecedent( enum wbm_namespace ns, const WCHAR *assocclass, c done: if (iter) IEnumWbemClassObject_Release( iter ); - heap_free( str ); - heap_free( fullpath ); + free( str ); + free( fullpath ); return hr; } @@ -627,7 +627,7 @@ done: if (query) release_query( query ); free_path( path ); SysFreeString( antecedent ); - heap_free( str ); + free( str ); return hr; } @@ -671,7 +671,7 @@ static HRESULT exec_assoc_view( struct view *view ) if (view->table_count) { - if (!(view->result = heap_alloc_zero( view->table_count * sizeof(UINT) ))) hr = E_OUTOFMEMORY; + if (!(view->result = calloc( view->table_count, sizeof(UINT) ))) hr = E_OUTOFMEMORY; else view->result_count = view->table_count; } @@ -699,7 +699,7 @@ static HRESULT exec_select_view( struct view *view ) if (!table->num_rows) return S_OK; len = min( table->num_rows, 16 ); - if (!(view->result = heap_alloc( len * sizeof(UINT) ))) return E_OUTOFMEMORY; + if (!(view->result = malloc( len * sizeof(UINT) ))) return E_OUTOFMEMORY; for (i = 0; i < table->num_rows; i++) { @@ -711,7 +711,7 @@ static HRESULT exec_select_view( struct view *view ) { UINT *tmp; len *= 2; - if (!(tmp = heap_realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; + if (!(tmp = realloc( view->result, len * sizeof(UINT) ))) return E_OUTOFMEMORY; view->result = tmp; } if (status == FILL_STATUS_FILTERED) val = 1; @@ -743,7 +743,7 @@ struct query *create_query( enum wbm_namespace ns ) { struct query *query; - if (!(query = heap_alloc( sizeof(*query) ))) return NULL; + if (!(query = malloc( sizeof(*query) ))) return NULL; list_init( &query->mem ); query->ns = ns; query->refs = 1; @@ -756,8 +756,8 @@ void free_query( struct query *query ) if (!query) return; destroy_view( query->view ); - LIST_FOR_EACH_SAFE( mem, next, &query->mem ) { heap_free( mem ); } - heap_free( query ); + LIST_FOR_EACH_SAFE( mem, next, &query->mem ) { free( mem ); } + free( query ); } struct query *addref_query( struct query *query ) @@ -811,7 +811,7 @@ static BSTR build_proplist( const struct table *table, UINT row, UINT count, UIN UINT i, j, offset; BSTR *values, ret = NULL; - if (!(values = heap_alloc( count * sizeof(BSTR) ))) return NULL; + if (!(values = malloc( count * sizeof(BSTR) ))) return NULL; *len = j = 0; for (i = 0; i < table->num_cols; i++) @@ -839,7 +839,7 @@ static BSTR build_proplist( const struct table *table, UINT row, UINT count, UIN } } for (i = 0; i < count; i++) SysFreeString( values[i] ); - heap_free( values ); + free( values ); return ret; } @@ -1278,13 +1278,13 @@ static struct array *to_array( VARIANT *var, CIMTYPE *type ) if (SafeArrayGetVartype( V_ARRAY( var ), &vartype ) != S_OK) return NULL; if (!(basetype = to_cimtype( vartype ))) return NULL; if (SafeArrayGetUBound( V_ARRAY( var ), 1, &bound ) != S_OK) return NULL; - if (!(ret = heap_alloc( sizeof(struct array) ))) return NULL; + if (!(ret = malloc( sizeof(struct array) ))) return NULL; ret->count = bound + 1; ret->elem_size = get_type_size( basetype ); - if (!(ret->ptr = heap_alloc_zero( ret->count * ret->elem_size ))) + if (!(ret->ptr = calloc( ret->count, ret->elem_size ))) { - heap_free( ret ); + free( ret ); return NULL; } for (i = 0; i < ret->count; i++) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 361f0ec4b4a..eaa1db8bdde 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -171,11 +171,11 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemCo TRACE("%p, %s\n", root, debugstr_w(subkey)); - if (!(strings = heap_alloc( count * sizeof(BSTR) ))) return E_OUTOFMEMORY; + if (!(strings = malloc( count * sizeof(BSTR) ))) return E_OUTOFMEMORY; if ((res = RegOpenKeyExW( root, subkey, 0, KEY_ENUMERATE_SUB_KEYS | reg_get_access_mask( context ), &hkey ))) { set_variant( VT_UI4, res, NULL, retval ); - heap_free( strings ); + free( strings ); return S_OK; } for (;;) @@ -183,7 +183,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemCo if (i >= count) { count *= 2; - if (!(tmp = heap_realloc( strings, count * sizeof(BSTR) ))) + if (!(tmp = realloc( strings, count * sizeof(BSTR) ))) { RegCloseKey( hkey ); return E_OUTOFMEMORY; @@ -211,7 +211,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, IWbemCo } set_variant( VT_UI4, res, NULL, retval ); RegCloseKey( hkey ); - heap_free( strings ); + free( strings ); return hr; } @@ -287,9 +287,9 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI goto done; hr = E_OUTOFMEMORY; - if (!(buf = heap_alloc( (buflen + 1) * sizeof(WCHAR) ))) goto done; - if (!(value_names = heap_alloc( count * sizeof(BSTR) ))) goto done; - if (!(value_types = heap_alloc( count * sizeof(DWORD) ))) goto done; + if (!(buf = malloc( (buflen + 1) * sizeof(WCHAR) ))) goto done; + if (!(value_names = malloc( count * sizeof(BSTR) ))) goto done; + if (!(value_types = malloc( count * sizeof(DWORD) ))) goto done; hr = S_OK; for (;;) @@ -320,9 +320,9 @@ static HRESULT enum_values( HKEY root, const WCHAR *subkey, VARIANT *names, VARI done: set_variant( VT_UI4, res, NULL, retval ); RegCloseKey( hkey ); - heap_free( value_names ); - heap_free( value_types ); - heap_free( buf ); + free( value_names ); + free( value_types ); + free( buf ); return hr; } diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 1c54cf3123e..5184bf4a4fa 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -168,7 +168,7 @@ static void free_async( struct async_header *async ) if (async->sink) IWbemObjectSink_Release( async->sink ); CloseHandle( async->cancel ); CloseHandle( async->wait ); - heap_free( async ); + free( async ); } static BOOL init_async( struct async_header *async, IWbemObjectSink *sink, @@ -247,7 +247,7 @@ static ULONG WINAPI wbem_services_Release( DeleteCriticalSection( &ws->cs ); if (ws->context) IWbemContext_Release( ws->context ); - heap_free( ws ); + free( ws ); } return refs; } @@ -342,7 +342,7 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) const WCHAR *p = str, *q; UINT len; - if (!(path = heap_alloc_zero( sizeof(*path) ))) return E_OUTOFMEMORY; + if (!(path = calloc( 1, sizeof(*path) ))) return E_OUTOFMEMORY; if (*p == '\\') { @@ -353,7 +353,7 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) p++; if (*p != '\\') { - heap_free( path ); + free( path ); return WBEM_E_INVALID_OBJECT_PATH; } p++; @@ -362,14 +362,14 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) while (*p && *p != '\\') p++; if (!*p) { - heap_free( path ); + free( path ); return WBEM_E_INVALID_OBJECT_PATH; } len = p - q; if (!GetComputerNameW( server, &server_len ) || server_len != len || wcsnicmp( q, server, server_len )) { - heap_free( path ); + free( path ); return WBEM_E_NOT_SUPPORTED; } @@ -377,14 +377,14 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) while (*p && *p != ':') p++; if (!*p) { - heap_free( path ); + free( path ); return WBEM_E_INVALID_OBJECT_PATH; } len = p - q; if (len != ARRAY_SIZE(cimv2W) - 1 || wcsnicmp( q, cimv2W, ARRAY_SIZE(cimv2W) - 1 )) { - heap_free( path ); + free( path ); return WBEM_E_INVALID_NAMESPACE; } p++; @@ -394,9 +394,9 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) while (*p && *p != '.') p++; len = p - q; - if (!(path->class = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(path->class = malloc( (len + 1) * sizeof(WCHAR) ))) { - heap_free( path ); + free( path ); return E_OUTOFMEMORY; } memcpy( path->class, q, len * sizeof(WCHAR) ); @@ -409,10 +409,10 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) while (*q) q++; len = q - p; - if (!(path->filter = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(path->filter = malloc( (len + 1) * sizeof(WCHAR) ))) { - heap_free( path->class ); - heap_free( path ); + free( path->class ); + free( path ); return E_OUTOFMEMORY; } memcpy( path->filter, p, len * sizeof(WCHAR) ); @@ -426,9 +426,9 @@ HRESULT parse_path( const WCHAR *str, struct path **ret ) void free_path( struct path *path ) { if (!path) return; - heap_free( path->class ); - heap_free( path->filter ); - heap_free( path ); + free( path->class ); + free( path->filter ); + free( path ); } WCHAR *query_from_path( const struct path *path ) @@ -441,13 +441,13 @@ WCHAR *query_from_path( const struct path *path ) if (path->filter) { len = path->class_len + path->filter_len + ARRAY_SIZE(selectW); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(query = malloc( len * sizeof(WCHAR) ))) return NULL; swprintf( query, len, selectW, path->class, path->filter ); } else { len = path->class_len + ARRAY_SIZE(select_allW); - if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + if (!(query = malloc( len * sizeof(WCHAR) ))) return NULL; lstrcpyW( query, select_allW ); lstrcatW( query, path->class ); } @@ -461,7 +461,7 @@ static HRESULT create_instance_enum( enum wbm_namespace ns, const struct path *p if (!(query = query_from_path( path ))) return E_OUTOFMEMORY; hr = exec_query( ns, query, iter ); - heap_free( query ); + free( query ); return hr; } @@ -707,7 +707,7 @@ static void async_exec_query( struct async_header *hdr ) IEnumWbemClassObject_Release( result ); } IWbemObjectSink_SetStatus( query->hdr.sink, WBEM_STATUS_COMPLETE, hr, NULL, NULL ); - heap_free( query->str ); + free( query->str ); } static HRESULT WINAPI wbem_services_ExecQueryAsync( @@ -740,7 +740,7 @@ static HRESULT WINAPI wbem_services_ExecQueryAsync( hr = WBEM_E_FAILED; goto done; } - if (!(query = heap_alloc_zero( sizeof(*query) ))) goto done; + if (!(query = calloc( 1, sizeof(*query) ))) goto done; query->ns = services->ns; async = (struct async_header *)query; @@ -758,7 +758,7 @@ static HRESULT WINAPI wbem_services_ExecQueryAsync( if (hr == S_OK) services->async = async; else { - heap_free( query->str ); + free( query->str ); free_async( async ); } @@ -810,7 +810,7 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync( hr = WBEM_E_FAILED; goto done; } - if (!(query = heap_alloc_zero( sizeof(*query) ))) goto done; + if (!(query = calloc( 1, sizeof(*query) ))) goto done; async = (struct async_header *)query; if (!(init_async( async, sink, async_exec_query ))) @@ -827,7 +827,7 @@ static HRESULT WINAPI wbem_services_ExecNotificationQueryAsync( if (hr == S_OK) services->async = async; else { - heap_free( query->str ); + free( query->str ); free_async( async ); } @@ -896,7 +896,7 @@ done: if (obj) IWbemClassObject_Release( obj ); free_query( query ); free_path( path ); - heap_free( str ); + free( str ); return hr; } @@ -955,8 +955,7 @@ HRESULT WbemServices_create( const WCHAR *namespace, IWbemContext *context, LPVO else if ((ns = get_namespace_from_string( namespace )) == WBEMPROX_NAMESPACE_LAST) return WBEM_E_INVALID_NAMESPACE; - ws = heap_alloc_zero( sizeof(*ws) ); - if (!ws) return E_OUTOFMEMORY; + if (!(ws = calloc( 1, sizeof(*ws) ))) return E_OUTOFMEMORY; ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; @@ -994,8 +993,8 @@ static void wbem_context_delete_values(struct wbem_context *context) { list_remove( &value->entry ); VariantClear( &value->value ); - heap_free( value->name ); - heap_free( value ); + free( value->name ); + free( value ); } } @@ -1043,7 +1042,7 @@ static ULONG WINAPI wbem_context_Release( { TRACE("destroying %p\n", context); wbem_context_delete_values( context ); - heap_free( context ); + free( context ); } return refs; } @@ -1152,16 +1151,16 @@ static HRESULT WINAPI wbem_context_SetValue( } else { - if (!(value = heap_alloc_zero( sizeof(*value) ))) return E_OUTOFMEMORY; + if (!(value = calloc( 1, sizeof(*value) ))) return E_OUTOFMEMORY; if (!(value->name = heap_strdupW( name ))) { - heap_free( value ); + free( value ); return E_OUTOFMEMORY; } if (FAILED(hr = VariantCopy( &value->value, var ))) { - heap_free( value->name ); - heap_free( value ); + free( value->name ); + free( value ); return hr; } @@ -1232,8 +1231,7 @@ HRESULT WbemContext_create( void **obj ) TRACE("(%p)\n", obj); - context = heap_alloc( sizeof(*context) ); - if (!context) return E_OUTOFMEMORY; + if (!(context = malloc( sizeof(*context) ))) return E_OUTOFMEMORY; context->IWbemContext_iface.lpVtbl = &wbem_context_vtbl; context->refs = 1; diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 02551af6eed..d08646a1c50 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -291,7 +291,7 @@ void free_row_values( const struct table *table, UINT row ) type = table->columns[i].type & COL_TYPE_MASK; if (type == CIM_STRING || type == CIM_DATETIME || type == CIM_REFERENCE) { - if (get_value( table, row, i, &val ) == S_OK) heap_free( (void *)(INT_PTR)val ); + if (get_value( table, row, i, &val ) == S_OK) free( (void *)(INT_PTR)val ); } else if (type & CIM_FLAG_ARRAY) { @@ -312,7 +312,7 @@ void clear_table( struct table *table ) { table->num_rows = 0; table->num_rows_allocated = 0; - heap_free( table->data ); + free( table->data ); table->data = NULL; } } @@ -321,8 +321,8 @@ void free_columns( struct column *columns, UINT num_cols ) { UINT i; - for (i = 0; i < num_cols; i++) { heap_free( (WCHAR *)columns[i].name ); } - heap_free( columns ); + for (i = 0; i < num_cols; i++) { free( (WCHAR *)columns[i].name ); } + free( columns ); } void free_table( struct table *table ) @@ -333,11 +333,11 @@ void free_table( struct table *table ) if (table->flags & TABLE_FLAG_DYNAMIC) { TRACE("destroying %p\n", table); - heap_free( (WCHAR *)table->name ); + free( (WCHAR *)table->name ); free_columns( (struct column *)table->columns, table->num_cols ); - heap_free( table->data ); + free( table->data ); list_remove( &table->entry ); - heap_free( table ); + free( table ); } } @@ -375,7 +375,7 @@ struct table *create_table( const WCHAR *name, UINT num_cols, const struct colum { struct table *table; - if (!(table = heap_alloc( sizeof(*table) ))) return NULL; + if (!(table = malloc( sizeof(*table) ))) return NULL; table->name = heap_strdupW( name ); table->num_cols = num_cols; table->columns = columns; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a57a4398da3..954d39d244b 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -25,7 +25,6 @@ #include "initguid.h" #include "objidl.h" #include "wbemcli.h" -#include "wine/heap.h" #include "wine/test.h" static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemClassObject **result ) @@ -195,7 +194,7 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) hr = IEnumWbemClassObject_Reset( result ); ok( hr == S_OK, "got %08x\n", hr ); - obj = heap_alloc( num_objects * sizeof( IWbemClassObject * ) ); + obj = malloc( num_objects * sizeof( IWbemClassObject * ) ); count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); @@ -216,7 +215,7 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); - heap_free( obj ); + free( obj ); IEnumWbemClassObject_Release( result ); SysFreeString( query ); diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index dc2a13deda3..58cb4a86991 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -56,7 +56,7 @@ static ULONG WINAPI wbem_locator_Release( if (!refs) { TRACE("destroying %p\n", wl); - heap_free( wl ); + free( wl ); } return refs; } @@ -113,7 +113,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na while (*q && *q != '\\' && *q != '/') q++; if (!*q) return WBEM_E_INVALID_NAMESPACE; len = q - p; - if (!(*server = heap_alloc( (len + 1) * sizeof(WCHAR) ))) + if (!(*server = malloc( (len + 1) * sizeof(WCHAR) ))) { hr = E_OUTOFMEMORY; goto done; @@ -134,7 +134,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = lstrlenW( q ); - if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; + if (!(*namespace = malloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else { memcpy( *namespace, q, len * sizeof(WCHAR) ); @@ -145,8 +145,8 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na done: if (hr != S_OK) { - heap_free( *server ); - heap_free( *namespace ); + free( *server ); + free( *namespace ); } return hr; } @@ -174,8 +174,8 @@ static HRESULT WINAPI wbem_locator_ConnectServer( if (!is_local_machine( server )) { FIXME("remote computer not supported\n"); - heap_free( server ); - heap_free( namespace ); + free( server ); + free( namespace ); return WBEM_E_TRANSPORT_FAILURE; } if (User || Password || Authority) @@ -186,8 +186,8 @@ static HRESULT WINAPI wbem_locator_ConnectServer( FIXME("unsupported flags\n"); hr = WbemServices_create( namespace, context, (void **)ppNamespace ); - heap_free( namespace ); - heap_free( server ); + free( namespace ); + free( server ); if (SUCCEEDED( hr )) return WBEM_NO_ERROR; @@ -208,8 +208,7 @@ HRESULT WbemLocator_create( LPVOID *ppObj ) TRACE("(%p)\n", ppObj); - wl = heap_alloc( sizeof(*wl) ); - if (!wl) return E_OUTOFMEMORY; + if (!(wl = malloc( sizeof(*wl) ))) return E_OUTOFMEMORY; wl->IWbemLocator_iface.lpVtbl = &wbem_locator_vtbl; wl->refs = 1; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index a2bf5071612..9e900132419 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -17,7 +17,6 @@ */ #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" enum wbm_namespace @@ -280,7 +279,7 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); + if ((dst = malloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; } @@ -290,7 +289,7 @@ static inline WCHAR *heap_strdupAW( const char *src ) WCHAR *dst; if (!src) return NULL; len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); - if ((dst = heap_alloc( len * sizeof(*dst) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + if ((dst = malloc( len * sizeof(*dst) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); return dst; } diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index d1b608ac832..637eb6f05fa 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -49,7 +49,7 @@ struct string static void *alloc_mem( struct parser *parser, UINT size ) { - struct list *mem = heap_alloc( sizeof(struct list) + size ); + struct list *mem = malloc( sizeof(struct list) + size ); list_add_tail( parser->mem, mem ); return &mem[1]; } -- 2.30.2

1 0

[PATCH v2 2/2] msxml3: Make utf-8 the default encoding.
by Daniel Lehman 31 Jan '22

31 Jan '22

2 1

[PATCH v2 1/2] msxml3/tests: Add test saving XML with non-english characters.
by Daniel Lehman 31 Jan '22

31 Jan '22

v2: added some Releases

2 1

[PATCH 1/5] user32/tests: Tweak window size to fix Win10 results.
by Rémi Bernon 31 Jan '22

31 Jan '22

Fix these failures: > win.c:2445: Test failed: style 0x200000: expected !100 > win.c:2445: Test failed: style 0x300000: expected !100 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..e48d7bea513 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2249,7 +2249,7 @@ static void test_mdi(void) mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX /*| WS_VISIBLE*/, - 100, 100, CW_USEDEFAULT, CW_USEDEFAULT, + 200, 100, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); -- 2.34.1

2 10

[PATCH 1/4] windows.foundation.metadata: Add stub dll
by Fabian Maurer 31 Jan '22

31 Jan '22

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- configure | 2 + configure.ac | 1 + dlls/windows.foundation.metadata/Makefile.in | 8 + dlls/windows.foundation.metadata/classes.idl | 23 +++ dlls/windows.foundation.metadata/main.c | 157 ++++++++++++++++++ .../windows.foundation.metadata.spec | 3 + include/Makefile.in | 1 + include/windows.foundation.metadata.idl | 52 ++++++ 8 files changed, 247 insertions(+) create mode 100644 dlls/windows.foundation.metadata/Makefile.in create mode 100644 dlls/windows.foundation.metadata/classes.idl create mode 100644 dlls/windows.foundation.metadata/main.c create mode 100644 dlls/windows.foundation.metadata/windows.foundation.metadata.spec create mode 100644 include/windows.foundation.metadata.idl diff --git a/configure b/configure index 425d267ec50..f7f8cb581ef 100755 --- a/configure +++ b/configure @@ -1704,6 +1704,7 @@ enable_wiaservc enable_wimgapi enable_win32u enable_windows_devices_enumeration +enable_windows_foundation_metadata enable_windows_gaming_input enable_windows_globalization enable_windows_media_devices @@ -22470,6 +22471,7 @@ wine_fn_config_makefile dlls/win87em.dll16 enable_win16 wine_fn_config_makefile dlls/winaspi.dll16 enable_win16 wine_fn_config_makefile dlls/windebug.dll16 enable_win16 wine_fn_config_makefile dlls/windows.devices.enumeration enable_windows_devices_enumeration +wine_fn_config_makefile dlls/windows.foundation.metadata enable_windows_foundation_metadata wine_fn_config_makefile dlls/windows.gaming.input enable_windows_gaming_input wine_fn_config_makefile dlls/windows.gaming.input/tests enable_tests wine_fn_config_makefile dlls/windows.globalization enable_windows_globalization diff --git a/configure.ac b/configure.ac index fed12f61036..c66c6fd462f 100644 --- a/configure.ac +++ b/configure.ac @@ -3366,6 +3366,7 @@ WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/windows.devices.enumeration) +WINE_CONFIG_MAKEFILE(dlls/windows.foundation.metadata) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input) WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input/tests) WINE_CONFIG_MAKEFILE(dlls/windows.globalization) diff --git a/dlls/windows.foundation.metadata/Makefile.in b/dlls/windows.foundation.metadata/Makefile.in new file mode 100644 index 00000000000..311cfb0a845 --- /dev/null +++ b/dlls/windows.foundation.metadata/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_LONG_TYPES +MODULE = windows.foundation.metadata.dll +IMPORTS = combase uuid + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/windows.foundation.metadata/classes.idl b/dlls/windows.foundation.metadata/classes.idl new file mode 100644 index 00000000000..405fa9f1133 --- /dev/null +++ b/dlls/windows.foundation.metadata/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for windows.foundation.metadata.dll + * + * Copyright 2022 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register + +#include "windows.foundation.metadata.idl" diff --git a/dlls/windows.foundation.metadata/main.c b/dlls/windows.foundation.metadata/main.c new file mode 100644 index 00000000000..18a19ad1bca --- /dev/null +++ b/dlls/windows.foundation.metadata/main.c @@ -0,0 +1,157 @@ +/* WinRT Windows.Foundation.Metadata implementation + * + * Copyright 2022 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "initguid.h" +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + +WINE_DEFAULT_DEBUG_CHANNEL(metadata); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct windows_foundation_metadata +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct windows_foundation_metadata *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct windows_foundation_metadata, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE windows_foundation_metadata_QueryInterface( + IActivationFactory *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IInspectable) || + IsEqualGUID(iid, &IID_IAgileObject) || + IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE windows_foundation_metadata_AddRef( + IActivationFactory *iface) +{ + struct windows_foundation_metadata *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE windows_foundation_metadata_Release( + IActivationFactory *iface) +{ + struct windows_foundation_metadata *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %u.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE windows_foundation_metadata_GetIids( + IActivationFactory *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_foundation_metadata_GetRuntimeClassName( + IActivationFactory *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_foundation_metadata_GetTrustLevel( + IActivationFactory *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE windows_foundation_metadata_ActivateInstance( + IActivationFactory *iface, IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + windows_foundation_metadata_QueryInterface, + windows_foundation_metadata_AddRef, + windows_foundation_metadata_Release, + /* IInspectable methods */ + windows_foundation_metadata_GetIids, + windows_foundation_metadata_GetRuntimeClassName, + windows_foundation_metadata_GetTrustLevel, + /* IActivationFactory methods */ + windows_foundation_metadata_ActivateInstance, +}; + +static struct windows_foundation_metadata windows_foundation_metadata = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &windows_foundation_metadata.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/windows.foundation.metadata/windows.foundation.metadata.spec b/dlls/windows.foundation.metadata/windows.foundation.metadata.spec new file mode 100644 index 00000000000..20a8bfa98ea --- /dev/null +++ b/dlls/windows.foundation.metadata/windows.foundation.metadata.spec @@ -0,0 +1,3 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetActivationFactory(ptr ptr) +@ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/include/Makefile.in b/include/Makefile.in index 7fcf5f0ba7b..24c2b3fb448 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -777,6 +777,7 @@ SOURCES = \ windows.devices.enumeration.idl \ windows.foundation.collections.idl \ windows.foundation.idl \ + windows.foundation.metadata.idl \ windows.gaming.input.forcefeedback.idl \ windows.gaming.input.idl \ windows.globalization.idl \ diff --git a/include/windows.foundation.metadata.idl b/include/windows.foundation.metadata.idl new file mode 100644 index 00000000000..7673777e658 --- /dev/null +++ b/include/windows.foundation.metadata.idl @@ -0,0 +1,52 @@ +/* + * Copyright 2022 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows { + namespace Foundation { + namespace Metadata { + interface IApiInformationStatics; + runtimeclass ApiInformation; + } + } +} + +namespace Windows { + namespace Foundation { + namespace Metadata { + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Foundation.Metadata.IApiInformationStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass ApiInformation + { + } + } + } +} -- 2.35.1

2 5

[PATCH 01/22] propsys/tests: Avoid "misleading indentation" warnings.
by Fabian Maurer 31 Jan '22

31 Jan '22

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/propsys/tests/propsys.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 6370c01dc80..792ef1dd785 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -840,7 +840,7 @@ static void test_PropVariantCompareEx(void) /* VT_R4/VT_R8 */ res = PropVariantCompareEx(&r4_0, &r8_0, 0, 0); -todo_wine + todo_wine ok(res == 0, "res=%i\n", res); res = PropVariantCompareEx(&r4_0, &r4_0, 0, 0); @@ -2014,7 +2014,7 @@ static void test_PSCreatePropertyStoreFromObject(void) ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = PSCreatePropertyStoreFromObject((IUnknown *)propstore, STGM_READWRITE, &IID_IUnknown, (void **)&unk); -todo_wine + todo_wine ok(hr == S_OK, "Failed to create wrapper, hr %#x.\n", hr); if (SUCCEEDED(hr)) { -- 2.35.0

4 18

[PATCH v6 1/4] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf 31 Jan '22

31 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v6: - Use __ASM_GLOBAL_FUNC instead of __ASM_STDCALL_FUNC. - Use cdecl instead of stdcall in wdscore.spec. --- configure.ac | 1 + dlls/wdscore/Makefile.in | 3 ++ dlls/wdscore/main.c | 56 ++++++++++++++++++++++++++++ dlls/wdscore/tests/Makefile.in | 4 ++ dlls/wdscore/tests/main.c | 65 +++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- dlls/wdscore/wdscore_internal.h | 24 ++++++++++++ 7 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c create mode 100644 dlls/wdscore/tests/Makefile.in create mode 100644 dlls/wdscore/tests/main.c create mode 100644 dlls/wdscore/wdscore_internal.h diff --git a/configure.ac b/configure.ac index 0b1a53f3ff9..1923c95f4b4 100644 --- a/configure.ac +++ b/configure.ac @@ -3345,6 +3345,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) WINE_CONFIG_MAKEFILE(dlls/wdscore) +WINE_CONFIG_MAKEFILE(dlls/wdscore/tests) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/websocket) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..1ed00206adf --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,56 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +#include "wdscore_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +#ifdef __i386__ +__ASM_GLOBAL_FUNC(CurrentIP, + "movl (%esp), %eax\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_GLOBAL_FUNC(CurrentIP, + "movq (%rsp), %rax\n\t" + "ret" ) +#elif defined(__arm__) +__ASM_GLOBAL_FUNC(CurrentIP, + "mov r0, lr\n\t" + "bx lr" ) +#elif defined(__aarch64__) +__ASM_GLOBAL_FUNC(CurrentIP, + "mov x0, lr\n\t" + "ret" ) +#else +void *CurrentIP(void) +{ + FIXME( "not implemented\n" ); + return 0; +} +#endif diff --git a/dlls/wdscore/tests/Makefile.in b/dlls/wdscore/tests/Makefile.in new file mode 100644 index 00000000000..baf4adf23a1 --- /dev/null +++ b/dlls/wdscore/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wdscore.dll + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/tests/main.c b/dlls/wdscore/tests/main.c new file mode 100644 index 00000000000..f17abbbdb3f --- /dev/null +++ b/dlls/wdscore/tests/main.c @@ -0,0 +1,65 @@ +/* + * Unit test suite for wdscore + * + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/test.h" + +static HMODULE dll; +static void* (*pCurrentIP)(void); + +static BOOL init_function_pointers(void) +{ + dll = LoadLibraryA("wdscore.dll"); + + if (dll) + { + pCurrentIP = (void*)GetProcAddress(dll, "CurrentIP"); + return TRUE; + } + + return FALSE; +} + +static void test_CurrentIP(void) +{ + char *cur; + char *ret; + + cur = (char*)&test_CurrentIP; + ret = (char*)pCurrentIP(); + + ok(cur <= ret && ret < (cur + 0x100), "Address %p not in function starting at %p.\n", ret, cur); +} + +START_TEST(main) +{ + if (init_function_pointers()) + { + test_CurrentIP(); + FreeLibrary(dll); + } + else + skip("could not load wdscore.dll\n"); +} diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..c292f65505b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ cdecl CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask diff --git a/dlls/wdscore/wdscore_internal.h b/dlls/wdscore/wdscore_internal.h new file mode 100644 index 00000000000..595ce93a3e7 --- /dev/null +++ b/dlls/wdscore/wdscore_internal.h @@ -0,0 +1,24 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WDSCORE_INTERNAL_H +#define __WDSCORE_INTERNAL_H + +void *CurrentIP(void); + +#endif /* __WDSCORE_INTERNAL_H */ -- 2.35.0

1 3

[PATCH 1/5] windows.gaming.input/tests: Fix printf warnings with long types.
by Rémi Bernon 31 Jan '22

31 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/tests/Makefile.in | 1 - dlls/windows.gaming.input/tests/input.c | 80 ++++++++++----------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/windows.gaming.input/tests/Makefile.in b/dlls/windows.gaming.input/tests/Makefile.in index 19fb708d0d2..88e1c05fbcf 100644 --- a/dlls/windows.gaming.input/tests/Makefile.in +++ b/dlls/windows.gaming.input/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = windows.gaming.input.dll IMPORTS = combase uuid diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index 6e863def54d..5f2244d8666 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -113,13 +113,13 @@ static void test_Gamepad(void) gamepad_event_handler.IEventHandler_Gamepad_iface.lpVtbl = &gamepad_event_handler_vtbl; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(gamepad_name, wcslen(gamepad_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx\n", hr); if (hr == REGDB_E_CLASSNOTREG) { win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(gamepad_name)); @@ -127,78 +127,78 @@ static void test_Gamepad(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IGamepadStatics, (void **)&gamepad_statics); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGamepadStatics failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IGamepadStatics failed, hr %#lx\n", hr); hr = IGamepadStatics_QueryInterface(gamepad_statics, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IGamepadStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IGamepadStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IGamepadStatics_QueryInterface(gamepad_statics, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IGamepadStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IGamepadStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IGamepadStatics_get_Gamepads(gamepad_statics, &gamepads); - ok(hr == S_OK, "IGamepadStatics_get_Gamepads failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_get_Gamepads failed, hr %#lx\n", hr); hr = IVectorView_Gamepad_QueryInterface(gamepads, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_Gamepad_QueryInterface failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_Gamepad_QueryInterface failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_Gamepad_QueryInterface returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_Gamepad_QueryInterface(gamepads, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IVectorView_Gamepad_QueryInterface failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_Gamepad_QueryInterface failed, hr %#lx\n", hr); ok(tmp_agile_object != agile_object, "IVectorView_Gamepad_QueryInterface IID_IAgileObject returned agile_object\n"); IAgileObject_Release(tmp_agile_object); size = 0xdeadbeef; hr = IVectorView_Gamepad_get_Size(gamepads, &size); - ok(hr == S_OK, "IVectorView_Gamepad_get_Size failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_Gamepad_get_Size failed, hr %#lx\n", hr); ok(size != 0xdeadbeef, "IVectorView_Gamepad_get_Size returned %u\n", size); gamepad = (IGamepad *)0xdeadbeef; hr = IVectorView_Gamepad_GetAt(gamepads, size, &gamepad); - ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetAt failed, hr %#lx\n", hr); ok(gamepad == NULL, "IVectorView_Gamepad_GetAt returned %p\n", gamepad); hr = IVectorView_Gamepad_GetMany(gamepads, size, 1, &gamepad, &size); - ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetMany failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_Gamepad_GetMany failed, hr %#lx\n", hr); ok(size == 0, "IVectorView_Gamepad_GetMany returned count %u\n", size); size = 0xdeadbeef; found = TRUE; gamepad = (IGamepad *)0xdeadbeef; hr = IVectorView_Gamepad_IndexOf(gamepads, gamepad, &size, &found); - ok(hr == S_OK, "IVectorView_Gamepad_IndexOf failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_Gamepad_IndexOf failed, hr %#lx\n", hr); ok(size == 0 && found == FALSE, "IVectorView_Gamepad_IndexOf returned size %d, found %d\n", size, found); IVectorView_Gamepad_Release(gamepads); token.value = 0xdeadbeef; hr = IGamepadStatics_add_GamepadAdded(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); - ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#lx\n", hr); ok(token.value != 0xdeadbeef, "IGamepadStatics_add_GamepadAdded returned token %#I64x\n", token.value); hr = IGamepadStatics_remove_GamepadAdded(gamepad_statics, token); - ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#lx\n", hr); token.value = 0xdeadbeef; hr = IGamepadStatics_add_GamepadRemoved(gamepad_statics, &gamepad_event_handler.IEventHandler_Gamepad_iface, &token); - ok(hr == S_OK, "IGamepadStatics_add_GamepadRemoved failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_add_GamepadRemoved failed, hr %#lx\n", hr); ok(token.value != 0xdeadbeef, "IGamepadStatics_add_GamepadRemoved returned token %#I64x\n", token.value); hr = IGamepadStatics_remove_GamepadRemoved(gamepad_statics, token); - ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IGamepadStatics_add_GamepadAdded failed, hr %#lx\n", hr); hr = IGamepadStatics_add_GamepadAdded(gamepad_statics, NULL, &token); - ok(hr == E_INVALIDARG, "IGamepadStatics_add_GamepadAdded failed, hr %#x\n", hr); + ok(hr == E_INVALIDARG, "IGamepadStatics_add_GamepadAdded failed, hr %#lx\n", hr); IGamepadStatics_Release(gamepad_statics); @@ -290,13 +290,13 @@ static void test_RawGameController(void) controller_event_handler.IEventHandler_RawGameController_iface.lpVtbl = &controller_event_handler_vtbl; hr = RoInitialize(RO_INIT_MULTITHREADED); - ok(hr == S_OK || hr == S_FALSE, "RoInitialize failed, hr %#x\n", hr); + ok(hr == S_OK || hr == S_FALSE, "RoInitialize failed, hr %#lx\n", hr); hr = WindowsCreateString(controller_name, wcslen(controller_name), &str); - ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr); hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory); - ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#x\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "RoGetActivationFactory failed, hr %#lx\n", hr); if (hr == REGDB_E_CLASSNOTREG) { win_skip("%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w(controller_name)); @@ -304,78 +304,78 @@ static void test_RawGameController(void) } hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); hr = IActivationFactory_QueryInterface(factory, &IID_IRawGameControllerStatics, (void **)&controller_statics); - ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IRawGameControllerStatics failed, hr %#x\n", hr); + ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IRawGameControllerStatics failed, hr %#lx\n", hr); hr = IRawGameControllerStatics_QueryInterface(controller_statics, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IRawGameControllerStatics_QueryInterface IID_IInspectable failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_QueryInterface IID_IInspectable failed, hr %#lx\n", hr); ok(tmp_inspectable == inspectable, "IRawGameControllerStatics_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IRawGameControllerStatics_QueryInterface(controller_statics, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IRawGameControllerStatics_QueryInterface IID_IAgileObject failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr); ok(tmp_agile_object == agile_object, "IRawGameControllerStatics_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object); IAgileObject_Release(tmp_agile_object); hr = IRawGameControllerStatics_get_RawGameControllers(controller_statics, &controllers); - ok(hr == S_OK, "IRawGameControllerStatics_get_RawGameControllers failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_get_RawGameControllers failed, hr %#lx\n", hr); hr = IVectorView_RawGameController_QueryInterface(controllers, &IID_IInspectable, (void **)&tmp_inspectable); - ok(hr == S_OK, "IVectorView_RawGameController_QueryInterface failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_RawGameController_QueryInterface failed, hr %#lx\n", hr); ok(tmp_inspectable != inspectable, "IVectorView_RawGameController_QueryInterface returned %p, expected %p\n", tmp_inspectable, inspectable); IInspectable_Release(tmp_inspectable); hr = IVectorView_RawGameController_QueryInterface(controllers, &IID_IAgileObject, (void **)&tmp_agile_object); - ok(hr == S_OK, "IVectorView_RawGameController_QueryInterface failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_RawGameController_QueryInterface failed, hr %#lx\n", hr); ok(tmp_agile_object != agile_object, "IVectorView_RawGameController_QueryInterface IID_IAgileObject returned agile_object\n"); IAgileObject_Release(tmp_agile_object); size = 0xdeadbeef; hr = IVectorView_RawGameController_get_Size(controllers, &size); - ok(hr == S_OK, "IVectorView_RawGameController_get_Size failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_RawGameController_get_Size failed, hr %#lx\n", hr); ok(size != 0xdeadbeef, "IVectorView_RawGameController_get_Size returned %u\n", size); hr = IVectorView_RawGameController_GetMany(controllers, size, 1, &controller, &size); - ok(hr == E_BOUNDS, "IVectorView_RawGameController_GetMany failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_RawGameController_GetMany failed, hr %#lx\n", hr); ok(size == 0, "IVectorView_RawGameController_GetMany returned count %u\n", size); controller = (IRawGameController *)0xdeadbeef; hr = IVectorView_RawGameController_GetAt(controllers, size, &controller); - ok(hr == E_BOUNDS, "IVectorView_RawGameController_GetAt failed, hr %#x\n", hr); + ok(hr == E_BOUNDS, "IVectorView_RawGameController_GetAt failed, hr %#lx\n", hr); ok(controller == NULL, "IVectorView_RawGameController_GetAt returned %p\n", controller); size = 0xdeadbeef; found = TRUE; controller = (IRawGameController *)0xdeadbeef; hr = IVectorView_RawGameController_IndexOf(controllers, controller, &size, &found); - ok(hr == S_OK, "IVectorView_RawGameController_IndexOf failed, hr %#x\n", hr); + ok(hr == S_OK, "IVectorView_RawGameController_IndexOf failed, hr %#lx\n", hr); ok(size == 0 && found == FALSE, "IVectorView_RawGameController_IndexOf returned size %d, found %d\n", size, found); IVectorView_RawGameController_Release(controllers); token.value = 0xdeadbeef; hr = IRawGameControllerStatics_add_RawGameControllerAdded(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); - ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#lx\n", hr); ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerAdded returned token %#I64x\n", token.value); hr = IRawGameControllerStatics_remove_RawGameControllerAdded(controller_statics, token); - ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#lx\n", hr); token.value = 0xdeadbeef; hr = IRawGameControllerStatics_add_RawGameControllerRemoved(controller_statics, &controller_event_handler.IEventHandler_RawGameController_iface, &token); - ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerRemoved failed, hr %#lx\n", hr); ok(token.value != 0xdeadbeef, "IRawGameControllerStatics_add_RawGameControllerRemoved returned token %#I64x\n", token.value); hr = IRawGameControllerStatics_remove_RawGameControllerRemoved(controller_statics, token); - ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(hr == S_OK, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#lx\n", hr); hr = IRawGameControllerStatics_add_RawGameControllerAdded(controller_statics, NULL, &token); - ok(hr == E_INVALIDARG, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#x\n", hr); + ok(hr == E_INVALIDARG, "IRawGameControllerStatics_add_RawGameControllerAdded failed, hr %#lx\n", hr); IRawGameControllerStatics_Release(controller_statics); -- 2.34.1

1 4

[PATCH] shlwapi: Fix some spec file entries (resend)
by André Zwing 31 Jan '22

31 Jan '22

Signed-off-by: André Zwing <nerv(a)dawncrow.de> --- dlls/shlwapi/shlwapi.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 68d0e7f8122..6926fd13835 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -257,7 +257,7 @@ 257 stdcall -noname SHCreateWorkerWindowA(ptr ptr long long ptr long) 258 stub -noname SHRegisterWaitForSingleObject 259 stub -noname SHUnregisterWait -260 stdcall -noname SHQueueUserWorkItem(long long long long long long long) +260 stdcall -noname SHQueueUserWorkItem(long long long long long str long) 261 stub -noname SHCreateTimerQueue 262 stub -noname SHDeleteTimerQueue 263 stdcall -noname SHSetTimerQueueTimer(long ptr ptr long long str long) @@ -288,8 +288,8 @@ 288 stub -noname IUnknown_CPContainerInvokeIndirect 289 stdcall -noname PlaySoundWrapW(wstr long long) 290 stub -noname SHMirrorIcon -291 stdcall -noname SHMessageBoxCheckExA(ptr ptr ptr ptr ptr long str) -292 stdcall -noname SHMessageBoxCheckExW(ptr ptr ptr ptr ptr long wstr) +291 stdcall -noname SHMessageBoxCheckExA(ptr ptr str ptr ptr long str) +292 stdcall -noname SHMessageBoxCheckExW(ptr ptr wstr ptr ptr long wstr) 293 stub -noname SHCancelUserWorkItems 294 stdcall -noname SHGetIniStringW(wstr wstr ptr long wstr) 295 stdcall -noname SHSetIniStringW(wstr wstr wstr wstr) @@ -488,7 +488,7 @@ 488 stub -noname SHConvertGraphicsFile 489 stdcall -noname GlobalAddAtomWrapW(wstr) kernel32.GlobalAddAtomW 490 stdcall -noname GlobalFindAtomWrapW(wstr) kernel32.GlobalFindAtomW -491 stdcall -noname SHGetShellKey(long long long) +491 stdcall -noname SHGetShellKey(long wstr long) 492 stub -noname PrettifyFileDescriptionW 493 stub -noname SHPropertyBag_ReadType 494 stub -noname SHPropertyBag_ReadStr @@ -663,8 +663,8 @@ @ stdcall -import PathRenameExtensionW(wstr wstr) @ stdcall -import PathSearchAndQualifyA(str ptr long) @ stdcall -import PathSearchAndQualifyW(wstr ptr long) -@ stdcall PathSetDlgItemPathA (long long ptr) -@ stdcall PathSetDlgItemPathW (long long ptr) +@ stdcall PathSetDlgItemPathA (long long str) +@ stdcall PathSetDlgItemPathW (long long wstr) @ stdcall -import PathSkipRootA(str) @ stdcall -import PathSkipRootW(wstr) @ stdcall -import PathStripPathA(str) -- 2.25.1

2 4

[PATCH] explorer: Only try to destroy the IShellWindows object if it exists
by Alex Henrie 31 Jan '22

31 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52494 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/explorer/explorer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index cb0d63fb688..8fa732d6c1a 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -671,8 +671,11 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L switch(uMsg) { case WM_DESTROY: - IShellWindows_Revoke(info->sw, info->sw_cookie); - IShellWindows_Release(info->sw); + if(info->sw) + { + IShellWindows_Revoke(info->sw, info->sw_cookie); + IShellWindows_Release(info->sw); + } IExplorerBrowser_Unadvise(browser,info->advise_cookie); IExplorerBrowser_Destroy(browser); -- 2.35.1

1 0

[PATCH] WIP/krnl386: When freeing task, also reset internal variable
by Fabian Maurer 30 Jan '22

30 Jan '22

This is a WIP patch fixing crashes in the win16 program Nota Bene. The crash is caused by alloc_win16_thunk calling GlobalAlloc16, GlobalLock16 and keeping the pinned address as "thunk_array". Later we have the following chain: TASK_DeleteTask -> GlobalFreeAll16 -> GlobalFree16 This deletes the buffer behind "thunk_array", but since it's not NULL wine will continue to use it, causing funny heap corruption issues. This patch fixes the issue and seems logically correct to me, though it's very ugly architecturally. Any hints on how we should handle this case properly? Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12732 --- dlls/krnl386.exe16/krnl386.exe16.spec | 2 ++ dlls/krnl386.exe16/task.c | 9 +++++++++ dlls/user.exe16/message.c | 6 ++++++ include/wine/winbase16.h | 3 +++ 4 files changed, 20 insertions(+) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index d98e136c77e..a1e7db46c0f 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -751,3 +751,5 @@ # Snoop support 2001 pascal -register __wine_snoop_entry() 2002 pascal -register __wine_snoop_return() + +@ cdecl -arch=win32 __wine_set_taskkill_func(ptr) diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c index 30a40328c86..140b9190666 100644 --- a/dlls/krnl386.exe16/task.c +++ b/dlls/krnl386.exe16/task.c @@ -351,6 +351,12 @@ static TDB *TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, LPCSTR cmdline, BYT return pTask; } +static wine_taskkill_func taskkill; + +void __wine_set_taskkill_func(wine_taskkill_func func) +{ + taskkill = func; +} /*********************************************************************** * TASK_DeleteTask @@ -382,6 +388,9 @@ static void TASK_DeleteTask( HTASK16 hTask ) /* the environment block and the thunk segments). */ GlobalFreeAll16( hPDB ); + + if (taskkill) + taskkill(); } diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index b79b0cb7751..f5cadc5e387 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -144,6 +144,11 @@ static int winproc_to_index( WNDPROC16 handle ) return index; } +static void taskkill(void) +{ + thunk_array = 0; +} + /* allocate a 16-bit thunk for an existing window proc */ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) { @@ -156,6 +161,7 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) if (!thunk_array) /* allocate the array and its selector */ { + __wine_set_taskkill_func(taskkill); assert( MAX_WINPROCS16 * sizeof(WINPROC_THUNK) <= 0x10000 ); if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 1d052130e33..338a2af4e9e 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -567,4 +567,7 @@ BOOL16 WINAPI WriteProfileSection16(LPCSTR,LPCSTR); #define CURRENT_SP (((WORD *)NtCurrentTeb()->SystemReserved1)[0]) #define CURRENT_SS (((WORD *)NtCurrentTeb()->SystemReserved1)[1]) +typedef void (*wine_taskkill_func)(void); +extern void __wine_set_taskkill_func(wine_taskkill_func func); + #endif /* __WINE_WINE_WINBASE16_H */ -- 2.34.1

2 3

[PATCH v2 1/3] ntdll: Implement wcsnlen().
by Zebediah Figura 30 Jan '22

30 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..afb945d4665 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1609,6 +1609,7 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl wcsnlen(ptr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) @ cdecl wcsspn(wstr wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index a727e4defac..9422e4f676c 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -251,6 +251,17 @@ LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsnlen (NTDLL.@) + */ +size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) +{ + const WCHAR *s = str; + for (s = str; len && *s; s++, len--) ; + return s - str; +} + + /********************************************************************* * wcspbrk (NTDLL.@) */ -- 2.34.1

1 2

[PATCH 1/4] ntdll: Use str instead of ptr for the strnlen spec file entry.
by Zebediah Figura 30 Jan '22

30 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index bd8e1f5efe6..7fc46231ae9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1581,7 +1581,7 @@ @ cdecl strncat(str str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) -@ cdecl strnlen(ptr long) +@ cdecl strnlen(str long) @ cdecl strpbrk(str str) @ cdecl strrchr(str long) @ cdecl strspn(str str) -- 2.33.0

2 5

[PATCH] tiff: Explictly link to zlib.
by Zebediah Figura 30 Jan '22

30 Jan '22

This normally works because the only module linking to tiff (windowscodecs) also pulls in static zlib via PNG_PE_LIBS. However, if using shared libpng, windowscodecs will currently fail to link. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 425d267ec50..8578764ed5e 100755 --- a/configure +++ b/configure @@ -13359,7 +13359,7 @@ printf "%s\n" "$as_me:${as_lineno-$LINENO}: png libs: $PNG_PE_LIBS" >&5 if ${TIFF_PE_LIBS:+false} : then : - TIFF_PE_LIBS=tiff + TIFF_PE_LIBS="tiff \$(ZLIB_PE_LIBS)" if ${TIFF_PE_CFLAGS:+false} : then : TIFF_PE_CFLAGS="-I\$(top_srcdir)/libs/tiff/libtiff" diff --git a/configure.ac b/configure.ac index fed12f61036..54ef47f767c 100644 --- a/configure.ac +++ b/configure.ac @@ -1102,7 +1102,7 @@ WINE_EXTLIB_FLAGS(JXR, jxr, jxr, "-I\$(top_srcdir)/libs/jxr/jxrgluelib -I\$(top_ WINE_EXTLIB_FLAGS(LCMS2, lcms2, lcms2, "-I\$(top_srcdir)/libs/lcms2/include") WINE_EXTLIB_FLAGS(MPG123, mpg123, mpg123, "-I\$(top_srcdir)/libs/mpg123/src/libmpg123") WINE_EXTLIB_FLAGS(PNG, png, "png \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/png") -WINE_EXTLIB_FLAGS(TIFF, tiff, tiff, "-I\$(top_srcdir)/libs/tiff/libtiff") +WINE_EXTLIB_FLAGS(TIFF, tiff, "tiff \$(ZLIB_PE_LIBS)", "-I\$(top_srcdir)/libs/tiff/libtiff") WINE_EXTLIB_FLAGS(XML2, xml2, xml2, "-I\$(top_srcdir)/libs/xml2/include -DLIBXML_STATIC") WINE_EXTLIB_FLAGS(XSLT, xslt, xslt, "-I\$(top_srcdir)/libs/xslt -DLIBXSLT_STATIC") WINE_EXTLIB_FLAGS(ZLIB, zlib, z, "-I\$(top_srcdir)/libs/zlib -DFAR= -DZ_SOLO") -- 2.33.0

1 0

[PATCH 1/5] include: Add ISymUnmanagedWriter definition.
by Esme Povirk 29 Jan '22

29 Jan '22

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- include/Makefile.in | 1 + include/corsym.idl | 97 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 include/corsym.idl diff --git a/include/Makefile.in b/include/Makefile.in index 7fcf5f0ba7b..2f1e4767848 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -89,6 +89,7 @@ SOURCES = \ cordebug.idl \ corerror.h \ corhdr.h \ + corsym.idl \ cpl.h \ crtrow.idl \ cryptdlg.h \ diff --git a/include/corsym.idl b/include/corsym.idl new file mode 100644 index 00000000000..5faf32c0ddd --- /dev/null +++ b/include/corsym.idl @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2022 Esme Povirk + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "objidl.idl"; +import "oaidl.idl"; + +cpp_quote("#if 0") +/* defined in corhdr.h */ +typedef UINT32 mdToken; +typedef mdToken mdMethodDef; +typedef mdToken mdTypeDef; +/* defined in winnt.h */ +typedef SIZE_T IMAGE_DEBUG_DIRECTORY; +cpp_quote("#endif") + +[ + object, + uuid(b01fafeb-c450-3a4d-beec-b4ceec01e006), + pointer_default(unique) +] +interface ISymUnmanagedDocumentWriter : IUnknown +{ + HRESULT SetSource([in] ULONG32 sourceSize, [in, size_is(sourceSize)] BYTE source[]); + HRESULT SetCheckSum([in] GUID algorithmId, + [in] ULONG32 checkSumSize, [in, size_is(checkSumSize)] BYTE checkSum[]); +} + +[ + object, + uuid(ed14aa72-78e2-4884-84e2-334293ae5214), + pointer_default(unique) +] +interface ISymUnmanagedWriter : IUnknown +{ + HRESULT DefineDocument([in] const WCHAR *url, [in] const GUID *language, [in] const GUID *languageVendor, + [in] const GUID *documentType, [out, retval] ISymUnmanagedDocumentWriter** pRetVal); + HRESULT SetUserEntryPoint([in] mdMethodDef entryMethod); + HRESULT OpenMethod([in] mdMethodDef method); + HRESULT CloseMethod(); + HRESULT OpenScope([in] ULONG32 startOffset, [out, retval] ULONG32 *pRetVal); + HRESULT CloseScope([in] ULONG32 endOffset); + HRESULT SetScopeRange([in] ULONG32 scopeID, [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineLocalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3, + [in] ULONG32 startOffset, [in] ULONG32 endOffset); + HRESULT DefineParameter([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 sequence, + [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineField([in] mdTypeDef parent, [in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT DefineGlobalVariable([in] const WCHAR *name, [in] ULONG32 attributes, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[], [in] ULONG32 addrKind, + [in] ULONG32 addr1, [in] ULONG32 addr2, [in] ULONG32 addr3); + HRESULT Close(); + HRESULT SetSymAttributes([in] mdToken parent, [in] const WCHAR *name, + [in] ULONG32 cData, [in, size_is(cData)] unsigned char data[]); + HRESULT OpenNamespace([in] const WCHAR *name); + HRESULT CloseNamespace(); + HRESULT UsingNamespace([in] const WCHAR *fullName); + HRESULT SetMethodSourceRange([in] ISymUnmanagedDocumentWriter *startDoc, ULONG32 startLine, ULONG32 startColumn, + [in] ISymUnmanagedDocumentWriter *endDoc, ULONG32 endLine, ULONG32 endColumn); + HRESULT Initialize([in] IUnknown *emitter, [in] const WCHAR *filename, [in] IStream *pIStream, + [in] BOOL fFullBuild); + HRESULT GetDebugInfo([in, out] IMAGE_DEBUG_DIRECTORY *pIDD, [in] DWORD cData, [out] DWORD *pcData, + [out, size_is(cData), length_is(*pcData)] BYTE data[]); + HRESULT DefineSequencePoints([in] ISymUnmanagedDocumentWriter *document, [in] ULONG32 spCount, + [in, size_is(spCount)] ULONG32 offsets[], [in, size_is(spCount)] ULONG32 lines[], + [in, size_is(spCount)] ULONG32 columns[], [in, size_is(spCount)] ULONG32 endLines[], + [in, size_is(spCount)] ULONG32 endColumns[]); + HRESULT RemapToken([in] mdToken oldToken, [in] mdToken newToken); + HRESULT Initialize2([in] IUnknown *emitter, [in] const WCHAR *tempFilename, [in] IStream *pIStream, + [in] BOOL fFullBuild, [in] const WCHAR *finalFilename); + HRESULT DefineConstant([in] const WCHAR *name, [in] VARIANT value, [in] ULONG32 cSig, + [in, size_is(cSig)] unsigned char signature[]); + HRESULT Abort(); +} + +cpp_quote("DEFINE_GUID(CLSID_CorSymWriter_SxS, 0x0ae2deb0,0xf901,0x478b,0xbb,0x9f,0x88,0x1e,0xe8,0x06,0x67,0x88);") + -- 2.30.2

2 6

Wine staging 7.1 release
by Alistair Leslie-Hughes 28 Jan '22

28 Jan '22

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.1 (561 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [49412] ws2_32: Support WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY * [49678] xactengine: Implement callback notifications. * [44514] wined3d: Use bindless textures for GLSL shaders. Updated: * nvcuda-CUDA_Support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH vkd3d v2 1/3] vkd3d-shader/hlsl: Handle branches in copy propagation.
by Giovanni Mascellani 28 Jan '22

28 Jan '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> -- v2 (well, I don't remember which version number we were, but it was over a month ago, so I'll restart over): * differentiate between a value that was not written in a scope and a value that was dynamically written (i.e., we don't know statically which node the written value came from); Maybe "statically" and "dynamically" are not as understandable as possible, I'm open to suggestions. --- libs/vkd3d-shader/hlsl_codegen.c | 176 +++++++++++++++++++++++++++---- 1 file changed, 154 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..1c334f88 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -274,8 +274,16 @@ static bool lower_broadcasts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, v return false; } +enum copy_propagation_value_state +{ + VALUE_STATE_NOT_WRITTEN = 0, + VALUE_STATE_STATICALLY_WRITTEN, + VALUE_STATE_DYNAMICALLY_WRITTEN, +}; + struct copy_propagation_value { + enum copy_propagation_value_state state; struct hlsl_ir_node *node; unsigned int component; }; @@ -290,6 +298,7 @@ struct copy_propagation_var_def struct copy_propagation_state { struct rb_tree var_defs; + struct copy_propagation_state *parent; }; static int copy_propagation_var_def_compare(const void *key, const struct rb_entry *entry) @@ -307,15 +316,23 @@ static void copy_propagation_var_def_destroy(struct rb_entry *entry, void *conte vkd3d_free(var_def); } -static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy_propagation_state *state, - struct hlsl_ir_var *var) +static struct copy_propagation_value *copy_propagation_get_value(struct copy_propagation_state *state, + struct hlsl_ir_var *var, unsigned component) { - struct rb_entry *entry = rb_get(&state->var_defs, var); + for (; state; state = state->parent) + { + struct rb_entry *entry = rb_get(&state->var_defs, var); + if (entry) + { + struct copy_propagation_var_def *var_def = RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); + assert(component < var_def->var->data_type->reg_size); - if (entry) - return RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); - else - return NULL; + if (var_def->values[component].state != VALUE_STATE_NOT_WRITTEN) + return &var_def->values[component]; + } + } + + return NULL; } static struct copy_propagation_var_def *copy_propagation_create_var_def(struct hlsl_ctx *ctx, @@ -339,10 +356,35 @@ static struct copy_propagation_var_def *copy_propagation_create_var_def(struct h return var_def; } +static void copy_propagation_invalidate_variable(struct copy_propagation_var_def *var_def, + unsigned offset, unsigned char writemask) +{ + unsigned i; + + TRACE("Invalidate variable %s[%u]%s.\n", var_def->var->name, offset, debug_hlsl_writemask(writemask)); + + for (i = 0; i < 4; ++i) + { + if (writemask & (1u << i)) + { + memset(&var_def->values[offset + i], 0, sizeof(var_def->values[offset + i])); + var_def->values[offset + i].state = VALUE_STATE_DYNAMICALLY_WRITTEN; + } + } +} + static void copy_propagation_invalidate_whole_variable(struct copy_propagation_var_def *var_def) { + unsigned i; + TRACE("Invalidate variable %s.\n", var_def->var->name); + memset(var_def->values, 0, sizeof(*var_def->values) * var_def->var->data_type->reg_size); + + for (i = 0; i < var_def->var->data_type->reg_size; ++i) + { + var_def->values[i].state = VALUE_STATE_DYNAMICALLY_WRITTEN; + } } static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, unsigned int offset, @@ -356,29 +398,35 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, { TRACE("Variable %s[%u] is written by instruction %p%s.\n", var_def->var->name, offset + i, node, debug_hlsl_writemask(1u << i)); + var_def->values[offset + i].state = VALUE_STATE_STATICALLY_WRITTEN; var_def->values[offset + i].node = node; var_def->values[offset + i].component = j++; } } } -static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_var_def *var_def, - unsigned int offset, unsigned int count, unsigned int *swizzle) +static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_state *state, + struct hlsl_ir_var *var, unsigned int offset, unsigned int count, unsigned int *swizzle) { struct hlsl_ir_node *node = NULL; unsigned int i; - assert(offset + count <= var_def->var->data_type->reg_size); + assert(offset + count <= var->data_type->reg_size); *swizzle = 0; for (i = 0; i < count; ++i) { + struct copy_propagation_value *value = copy_propagation_get_value(state, var, offset + i); + + if (!value || value->state != VALUE_STATE_STATICALLY_WRITTEN) + return NULL; + if (!node) - node = var_def->values[offset + i].node; - else if (node != var_def->values[offset + i].node) + node = value->node; + else if (node != value->node) return NULL; - *swizzle |= var_def->values[offset + i].component << i * 2; + *swizzle |= value->component << i * 2; } return node; @@ -388,7 +436,6 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l struct copy_propagation_state *state) { struct hlsl_ir_node *node = &load->node, *new_node; - struct copy_propagation_var_def *var_def; struct hlsl_type *type = node->data_type; struct hlsl_ir_swizzle *swizzle_node; struct hlsl_deref *src = &load->src; @@ -401,10 +448,7 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l if (!hlsl_offset_from_deref(src, &offset)) return false; - if (!(var_def = copy_propagation_get_var_def(state, var))) - return false; - - if (!(new_node = copy_propagation_compute_replacement(var_def, offset, type->dimx, &swizzle))) + if (!(new_node = copy_propagation_compute_replacement(state, var, offset, type->dimx, &swizzle))) { TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, offset, offset + type->dimx); return false; @@ -436,6 +480,94 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s copy_propagation_invalidate_whole_variable(var_def); } +static void copy_propagation_state_init(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct copy_propagation_state *parent) +{ + rb_init(&state->var_defs, copy_propagation_var_def_compare); + state->parent = parent; +} + +static void copy_propagation_state_destroy(struct copy_propagation_state *state) +{ + rb_destroy(&state->var_defs, copy_propagation_var_def_destroy, NULL); +} + +static void copy_propagation_invalidate_from_block(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct hlsl_block *block) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_STORE: + { + struct hlsl_ir_store *store = hlsl_ir_store(instr); + struct copy_propagation_var_def *var_def; + struct hlsl_deref *lhs = &store->lhs; + struct hlsl_ir_var *var = lhs->var; + unsigned int offset; + + if (!(var_def = copy_propagation_create_var_def(ctx, state, var))) + continue; + + if (hlsl_offset_from_deref(lhs, &offset)) + copy_propagation_invalidate_variable(var_def, offset, store->writemask); + else + copy_propagation_invalidate_whole_variable(var_def); + + break; + } + + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + + copy_propagation_invalidate_from_block(ctx, state, &loop->body); + + break; + } + + default: + break; + } + } +} + +static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct copy_propagation_state *state); + +static bool copy_propagation_process_if(struct hlsl_ctx *ctx, struct hlsl_ir_if *iff, + struct copy_propagation_state *state) +{ + struct copy_propagation_state inner_state; + bool progress = false; + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->then_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->else_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + return progress; +} + static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, struct copy_propagation_state *state) { @@ -455,8 +587,8 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b break; case HLSL_IR_IF: - FIXME("Copy propagation doesn't support conditionals yet, leaving.\n"); - return progress; + progress |= copy_propagation_process_if(ctx, hlsl_ir_if(instr), state); + break; case HLSL_IR_LOOP: FIXME("Copy propagation doesn't support loops yet, leaving.\n"); @@ -475,11 +607,11 @@ static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *bl struct copy_propagation_state state; bool progress; - rb_init(&state.var_defs, copy_propagation_var_def_compare); + copy_propagation_state_init(ctx, &state, NULL); progress = copy_propagation_transform_block(ctx, block, &state); - rb_destroy(&state.var_defs, copy_propagation_var_def_destroy, NULL); + copy_propagation_state_destroy(&state); return progress; } -- 2.34.1

3 6

[PATCH] widl: Fix finding standalone tlb files for PE importlib.
by Jacek Caban 28 Jan '22

28 Jan '22

From: Tom Ritter <tom(a)ritter.vg> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/widl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH v4 00/10] Avoid performance degradation due to vDSO unmapping (#52313)
by Jinoh Kang 28 Jan '22

28 Jan '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. Changelog: - v3 -> v4: - address review comments - add more comments and documentation The following test script has been used to test each changes (use with git rebase --exec=...): set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done Jinoh Kang (10): loader: Refactor argv/envp/auxv management. loader: Refactor number parsing to own function. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Don't clobber existing memory mappings when reserving addresses. loader: Fix return type of get_auxiliary(). loader: Relocate vDSO on conflict with reserved ranges. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Switch stack if the old stack address is in reserved range. loader: Enable all remap logic by default. loader/preloader.c | 1523 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1407 insertions(+), 116 deletions(-) -- 2.34.1

1 11

[tools 1/3] testbot/SetWinLocale: Add --sys-copy and --def-copy options.
by Francois Gouget 28 Jan '22

28 Jan '22

These provide control over copying the new locale to the system and default user accounts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 94 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 86 insertions(+), 8 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index fa5f90cdbb..e544a580d3 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -310,7 +310,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptReboot); +my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -323,6 +323,22 @@ while (@ARGV) { $OptShow = 1; } + elsif ($Arg eq "--sys-copy") + { + $OptSysCopy = 1; + } + elsif ($Arg eq "--no-sys-copy") + { + $OptSysCopy = 0; + } + elsif ($Arg eq "--def-copy") + { + $OptDefCopy = 1; + } + elsif ($Arg eq "--no-def-copy") + { + $OptDefCopy = 0; + } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -426,13 +442,32 @@ if (!defined $Usage) } } - if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry and !$OptUTF8 and !$OptShow) + if (!$OptLocale and !$OptCountry and !$OptSystem and !$OptUTF8 and + !$OptMUI and !$OptKeyboard and !defined $OptSysCopy and + !defined $OptDefCopy) + { + if (!$OptShow) + { + Error("you must specify at least one locale to change\n"); + $Usage = 2; + } + if (defined $OptReboot) + { + Error("--(no-)reboot can only be used when changing a locale\n"); + $Usage = 2; + } + } + if ($OptShow and ($OptLocale or $OptCountry or $OptSystem or $OptUTF8 or + $OptMUI or $OptKeyboard or defined $OptSysCopy or + defined $OptDefCopy or defined $OptReboot)) { - Error("you must specify at least one locale to change\n"); + Error("--show and the locale options are mutually incompatible\n"); $Usage = 2; } + $OptSysCopy = 1 if (!defined $OptSysCopy); + $OptDefCopy = 1 if (!defined $OptDefCopy); + # Two settings only take effect after a reboot: # - System locale changes. # - Display language changes only require a log out + log in but that cannot @@ -447,7 +482,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-reboot] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--no-reboot] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -490,13 +525,32 @@ if (defined $Usage) print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; - print " . APIs: GetSystemPreferredUILanguages(),\n"; + print " . APIs: GetSystemPreferredUILanguages() (--sys-copy case),\n"; print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; print " . Powershell: Set-WinUILanguageOverride -Language MUI\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; + print " --sys-copy Copy the current locales (--locale --country --mui --keyboard)\n"; + print " to the system accounts (System/LocalSystem, NT Authority) and\n"; + print " in particular the one used by the logon screen. This is the\n"; + print " default.\n"; + print " . This requires elevated privileges.\n"; + print " . Windows 10 GUI: Time & language -> Language -> Administrative\n"; + print " language settings -> Copy Settings -> Welcome Screen and\n"; + print " system accounts.\n"; + print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -WelcomeScreen \$True\n"; + print " . Intl.cpl: CopySettingsToSystemAcct='true'\n"; + print " --no-sys-copy Do not copy the current locale to the system accounts such as\n"; + print " the one used by the logon screen.\n"; + print " --def-copy Copy the current locales (--locale --country --mui --keyboard)\n"; + print " to the default user account. This is the default.\n"; + print " . Windows 10 GUI: Time & language -> Language -> Administrative\n"; + print " language settings -> Copy Settings -> New user accounts.\n"; + print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -NewUser \$True\n"; + print " . Intl.cpl: CopySettingsToDefaultUserAcct='true'\n"; + print " --no-def-copy Do not copy the current locales to the default user account.\n"; print " --no-reboot Do not reboot Windows. Some locale changes only take effect\n"; print " after a reboot so this option should only be used for\n"; print " debugging.\n"; @@ -652,7 +706,7 @@ sub ShowWinSettings($) print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n"; print "\n"; - print ".DEFAULT account:\n"; + print ".DEFAULT account (see --sys-copy):\n"; # Locale used for the date and time in the logon screen print "Locale (--locale) = ", Value2Str($Settings->{DefLocale}), "\n"; print "LocaleName (--locale) = ", Value2Str($Settings->{DefLocaleName}), "\n"; @@ -772,11 +826,13 @@ $OptKeyboard ||= $OptDefault; # Generate the intl.cpl configuration # +my $CopyToSys = $OptSysCopy ? "true" : "false"; +my $CopyToDef = $OptDefCopy ? "true" : "false"; my @Config = ( # intl.cpl does not want single quotes on that one line! "<gs:GlobalizationServices xmlns:gs=\"urn:longhornGlobalizationUnattend\">", " <gs:UserList>", - " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", + " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='$CopyToDef' CopySettingsToSystemAcct='$CopyToSys'/>", " </gs:UserList>", ); if (defined $CountryId) @@ -952,6 +1008,28 @@ if ($KeyboardIds) CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } +if ($OptSysCopy) +{ + if ($OptLocale) + { + CheckSetting($Settings, "DefLocale", "0000$LCIDLocale", "for --locale $OptLocale", 1); + CheckSetting($Settings, "DefLocaleName", $OptLocale, "for --locale $OptLocale"); + } + if ($OptCountry) + { + CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry"); + CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry"); + } + if ($OptMUI) + { + CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + } + if ($KeyboardIds) + { + CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); + } +} + Cleanup(); exit(1) if (!$Success); Debug(Elapsed($Start), " All done!\n"); -- 2.30.2

1 2

[PATCH 00/15] Enabling compilation with long types
by Eric Pouech 28 Jan '22

28 Jan '22

There are 745 modules to be migrated to using long types. Start by enabling also attribute(format) on msvcrt APIs (for printf and scanf -like APIs) And continue by migration some modules in programs. FWI, I've scripted the migration. Between 80 and 90% of the modules can be done automatically (ie fully migrated without warnings); for the remaining modules, again 80 to 90% of the warnings are fixed automatically. The remaining must be done manually. Regular items to be looked into: - "complex" format strings (multi-line, in static variable, embedded inside macros...) - long/int mismatch (in pointer as argument, in proto vs definition of function...). Here the fix must be decided on a case by case basis. - multi-directories modules (like d3d, msvcrt, atl to name a few). Likely, requires migrating several modules at once. If you're interested at looking into your favorite module, don't hesitate to go back to me (I can provide the raw automated changes if this can help you). The plan is to start to migrate programs/*. Then likely dlls/*. The [dlls/programs]/tests/* shall wait for Fabian to finish the gcc11 todo fixes. A+ -- Eric Pouech (15): include/msvcrt: add attribute((format)) to printf and scanf -like APIs programs/attrib: enable compilation with long types programs/cabarc: enable compilation with long types programs/chcp.com: enable compilation with long types programs/cmd: enable compilation with long types programs/conhost: enable compilation with long types programs/[cw]script: enable compilation with long types programs/dxdiag: enable compilation with long types programs/eject: enable compilation with long types programs/explorer: enable compilation with long types programs/fsutil: enable compilation with long types programs/msiexec: enable compilation with long types programs/net: enable compilation with long types programs/netstat: enable compilation with long types programs/ping: enable compilation with long types dlls/compobj.dll16/compobj.c | 2 +- dlls/crypt32/sip.c | 2 +- dlls/iphlpapi/iphlpapi_main.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 4 +- dlls/msdmo/tests/msdmo.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/oleaut32/oleaut.c | 2 +- dlls/oleaut32/typelib.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 4 +- dlls/shell32/classes.c | 2 +- dlls/shell32/debughlp.c | 2 +- dlls/shell32/shfldr.h | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/typelib.dll16/typelib.c | 2 +- dlls/webservices/writer.c | 4 +- include/msvcrt/corecrt.h | 8 +++ include/msvcrt/crtdbg.h | 2 +- include/msvcrt/stdio.h | 90 ++++++++++++++++++++++------------ programs/attrib/Makefile.in | 1 - programs/attrib/attrib.c | 6 +-- programs/cabarc/Makefile.in | 1 - programs/cabarc/cabarc.c | 2 +- programs/chcp.com/Makefile.in | 1 - programs/chcp.com/main.c | 4 +- programs/cmd/Makefile.in | 1 - programs/cmd/builtins.c | 20 ++++---- programs/cmd/directory.c | 4 +- programs/cmd/wcmdmain.c | 14 +++--- programs/conhost/Makefile.in | 1 - programs/conhost/conhost.c | 18 +++---- programs/conhost/window.c | 10 ++-- programs/cscript/Makefile.in | 2 +- programs/dxdiag/Makefile.in | 1 - programs/dxdiag/information.c | 2 +- programs/dxdiag/output.c | 6 +-- programs/eject/Makefile.in | 1 - programs/eject/eject.c | 6 +-- programs/explorer/Makefile.in | 1 - programs/explorer/appbar.c | 2 +- programs/explorer/desktop.c | 52 ++++++++++---------- programs/explorer/explorer.c | 4 +- programs/explorer/systray.c | 2 +- programs/fsutil/Makefile.in | 1 - programs/fsutil/main.c | 2 +- programs/msiexec/Makefile.in | 1 - programs/msiexec/msiexec.c | 12 ++--- programs/msiexec/service.c | 4 +- programs/net/Makefile.in | 1 - programs/net/net.c | 4 +- programs/netstat/Makefile.in | 1 - programs/netstat/netstat.c | 2 +- programs/ping/Makefile.in | 1 - programs/ping/ping_main.c | 2 +- programs/winetest/main.c | 2 +- programs/wscript/Makefile.in | 1 - programs/wscript/arguments.c | 8 +-- programs/wscript/host.c | 10 ++-- programs/wscript/main.c | 6 +-- 58 files changed, 190 insertions(+), 166 deletions(-)

1 15

[PATCH 1/3] wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
by Zebediah Figura 28 Jan '22

28 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b42c7bd919a..3d66af3e5e6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co if (locations & WINED3D_LOCATION_DISCARDED) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); - if (!wined3d_buffer_prepare_location(buffer, context, locations)) + if (!wined3d_buffer_load_location(buffer, context, locations)) { data->buffer_object = 0; data->addr = NULL; return 0; } - wined3d_buffer_validate_location(buffer, locations); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); } if (locations & WINED3D_LOCATION_BUFFER) { -- 2.34.1

4 7

[PATCH vkd3d v2 2/2] vkd3d: Replace atomic_add_fetch() by InterlockedAdd().
by Alexandre Julliard 28 Jan '22

28 Jan '22

By analogy with InterlockedIncrement. It avoids the need for a configure check on Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- v2: make enqueued_fence_count a LONG as well --- include/private/vkd3d_common.h | 13 ++++--------- libs/vkd3d/command.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d22c26c098c7..1e19758abc40 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -201,6 +201,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x) { return __sync_add_and_fetch(x, 1); } +static inline LONG InterlockedAdd(LONG volatile *x, LONG val) +{ + return __sync_add_and_fetch(x, val); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -215,15 +219,6 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # endif #endif /* _WIN32 */ -#if HAVE_SYNC_ADD_AND_FETCH -# define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) -#elif defined(_MSC_VER) -/* InterlockedAdd returns value after increment, like add_and_fetch. */ -# define atomic_add_fetch(ptr, val) InterlockedAdd(ptr, val) -#else -# error "atomic_add_fetch() not implemented for this platform" -#endif /* HAVE_SYNC_ADD_AND_FETCH */ - static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2cf1eba23d94..f1ec6be3fd20 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -288,7 +288,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s LONG count; int rc; - if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) return; WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -299,7 +299,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s return; } - while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) { TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -410,7 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) { vkd3d_wait_for_gpu_fences(worker); - if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0)) + if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { if ((rc = pthread_mutex_lock(&worker->mutex))) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 136b020330a9..d21cd411ec8a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -192,7 +192,7 @@ struct vkd3d_fence_worker bool should_exit; bool pending_fence_destruction; - size_t enqueued_fence_count; + LONG enqueued_fence_count; struct vkd3d_enqueued_fence { VkFence vk_fence; -- 2.34.1

2 1

[PATCH vkd3d v2 1/2] vkd3d: Always use _BitScanReverse on Windows.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Use ULONG instead of unsigned long for non-Mingw msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- v2: unchanged --- include/private/vkd3d_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index b7ce9ae4046a..d22c26c098c7 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,10 +88,10 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { -#ifdef _MSC_VER +#ifdef _WIN32 /* _BitScanReverse returns the index of the highest set bit, * unlike clz which is 31 - index. */ - unsigned long result; + ULONG result; _BitScanReverse(&result, x); return (unsigned int)result; #elif defined(HAVE_BUILTIN_CLZ) -- 2.34.1

2 1

[PATCH vkd3d 1/2] vkd3d: Always use _BitScanReverse on Windows.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Use ULONG instead of unsigned long for non-Mingw msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index b7ce9ae4046a..d22c26c098c7 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,10 +88,10 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { -#ifdef _MSC_VER +#ifdef _WIN32 /* _BitScanReverse returns the index of the highest set bit, * unlike clz which is 31 - index. */ - unsigned long result; + ULONG result; _BitScanReverse(&result, x); return (unsigned int)result; #elif defined(HAVE_BUILTIN_CLZ) -- 2.34.1

2 1

[PATCH] iphlpapi: Avoid use of uninitialized variable
by Gerald Pfeifer 28 Jan '22

28 Jan '22

In gateway_and_prefix_addresses_alloc prefix_len isn't set in the error case, but used unconditionally. Avoid this by initializing upon declaration. (Identified by GCC 12.) Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..720f8147476 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -992,7 +992,8 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG struct nsi_ipv6_forward_key *key6; IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; IP_ADAPTER_PREFIX *prefix, **prefix_next; - DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD err, count, i, prefix_len = 0; + DWORD key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); DWORD sockaddr_size = (family == AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); SOCKADDR_INET sockaddr; NET_LUID *luid; -- 2.32.0

2 2

[PATCH vkd3d 2/2] vkd3d: Replace atomic_add_fetch() by InterlockedAdd().
by Alexandre Julliard 28 Jan '22

28 Jan '22

By analogy with InterlockedIncrement. It avoids the need for a configure check on Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_common.h | 13 ++++--------- libs/vkd3d/command.c | 6 +++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d22c26c098c7..1e19758abc40 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -201,6 +201,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x) { return __sync_add_and_fetch(x, 1); } +static inline LONG InterlockedAdd(LONG volatile *x, LONG val) +{ + return __sync_add_and_fetch(x, val); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -215,15 +219,6 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # endif #endif /* _WIN32 */ -#if HAVE_SYNC_ADD_AND_FETCH -# define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) -#elif defined(_MSC_VER) -/* InterlockedAdd returns value after increment, like add_and_fetch. */ -# define atomic_add_fetch(ptr, val) InterlockedAdd(ptr, val) -#else -# error "atomic_add_fetch() not implemented for this platform" -#endif /* HAVE_SYNC_ADD_AND_FETCH */ - static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2cf1eba23d94..f1ec6be3fd20 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -288,7 +288,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s LONG count; int rc; - if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) return; WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -299,7 +299,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s return; } - while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) { TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -410,7 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) { vkd3d_wait_for_gpu_fences(worker); - if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0)) + if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { if ((rc = pthread_mutex_lock(&worker->mutex))) { -- 2.34.1

2 1

[PATCH v3 6/6] msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 20 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-)

1 0

[PATCH v3 5/6] msvcp140_atomic_wait: Implement __std_close_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 9 ++++++--- 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[PATCH v3 4/6] msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH v3 3/6] msvcp140_atomic_wait: Implement __std_submit_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH v3 2/6] msvcp140_atomic_wait: Implement __std_create_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-)

1 0

[PATCH v3 1/6] msvcp140_atomic_wait/tests: Add test for threadpool_work functions.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - fix compilation warnings .../tests/msvcp140_atomic_wait.c | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+)

1 0

[PATCH 6/6] wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
by Henri Verbeet 28 Jan '22

28 Jan '22

From: Zebediah Figura <zfigura(a)codeweavers.com> wined3d_buffer_load_location() can handle loading from WINED3D_LOCATION_DISCARDED just fine, so use it instead of duplicating the functionality here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 224835. v2: Add a commit messages. Otherwise unmodified. dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b42c7bd919a..3d66af3e5e6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co if (locations & WINED3D_LOCATION_DISCARDED) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); - if (!wined3d_buffer_prepare_location(buffer, context, locations)) + if (!wined3d_buffer_load_location(buffer, context, locations)) { data->buffer_object = 0; data->addr = NULL; return 0; } - wined3d_buffer_validate_location(buffer, locations); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); } if (locations & WINED3D_LOCATION_BUFFER) { -- 2.30.2

1 0

[PATCH 5/6] wined3d: Use wined3d_bit_scan() in shader_arb_load_np2fixup_constants().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 820ba0199e8..54a90a690ac 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -497,27 +497,26 @@ static void shader_arb_load_np2fixup_constants(const struct arb_ps_np2fixup_info const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) { GLfloat np2fixup_constants[4 * WINED3D_MAX_FRAGMENT_SAMPLERS]; - WORD active = fixup->super.active; - UINT i; + uint32_t active = fixup->super.active; + const struct wined3d_texture *tex; + unsigned char idx; + GLfloat *tex_dim; + unsigned int i; if (!active) return; - for (i = 0; active; active >>= 1, ++i) + while (active) { - const struct wined3d_texture *tex = state->textures[i]; - unsigned char idx = fixup->super.idx[i]; - GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; - - if (!(active & 1)) - continue; - - if (!tex) + i = wined3d_bit_scan(&active); + if (!(tex = state->textures[i])) { ERR("Nonexistent texture is flagged for NP2 texcoord fixup.\n"); continue; } + idx = fixup->super.idx[i]; + tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (idx % 2) { tex_dim[2] = tex->pow2_matrix[0]; -- 2.30.2

1 0

[PATCH 4/6] wined3d: Use wined3d_bit_scan() in shader_glsl_generate_fragment_shader().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5a2111e46a7..d10b84a9e05 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7643,7 +7643,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; - DWORD map; + uint32_t map; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; @@ -7762,11 +7762,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + map = reg_maps->bumpmat; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); shader_addline(buffer, "uniform mat2 bumpenv_mat%u;\n", i); if (reg_maps->luminanceparams & (1u << i)) @@ -7903,7 +7902,6 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (reg_maps->shader_version.major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) { unsigned int i; - WORD map = reg_maps->texcoord; if (legacy_syntax) { @@ -7913,19 +7911,18 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "ffp_varying_specular = gl_SecondaryColor;\n"); } - for (i = 0; map; map >>= 1, ++i) + map = reg_maps->texcoord; + while (map) { - if (map & 1) - { - if (args->pointsprite) - shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); - else if (args->texcoords_initialized & (1u << i)) - shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, - legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); - else - shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); - shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); - } + i = wined3d_bit_scan(&map); + if (args->pointsprite) + shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); + else if (args->texcoords_initialized & (1u << i)) + shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, + legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); + else + shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); + shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); } if (legacy_syntax) -- 2.30.2

1 0

[PATCH 3/6] wined3d: Use wined3d_bit_scan() in shader_generate_glsl_declarations().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index aa3c8780269..5a2111e46a7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2168,7 +2168,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c const struct wined3d_shader_lconst *lconst; const char *prefix; unsigned int i; - DWORD map; + uint32_t map; if (wined3d_settings.strict_shader_math) shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); @@ -2176,9 +2176,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ - for (i = 0, map = reg_maps->labels; map; map >>= 1, ++i) + map = reg_maps->labels; + while (map) { - if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "void subroutine%u();\n", i); } if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE) @@ -2500,9 +2502,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c } /* Declare address variables */ - for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + map = reg_maps->address; + while (map) { - if (map & 1) shader_addline(buffer, "ivec4 A%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "ivec4 A%u;\n", i); } /* Declare output register temporaries */ @@ -2517,10 +2521,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c } else if (version->major < 4) { - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (map & 1) - shader_addline(buffer, "vec4 R%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "vec4 R%u;\n", i); } } -- 2.30.2

1 0

[PATCH 2/6] wined3d: Use wined3d_bit_scan() in shader_glsl_load_constantsB().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1ebd067ae56..aa3c8780269 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1239,16 +1239,15 @@ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, co } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const GLint locations[WINED3D_MAX_CONSTS_B], const BOOL *constants, WORD constants_set) +static void shader_glsl_load_constants_b(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const BOOL *constants, const GLint locations[WINED3D_MAX_CONSTS_B], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform1iv(locations[i], 1, &constants[i])); } @@ -1546,8 +1545,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->vs.uniform_i_locations, vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) - shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, - vshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(vshader, gl_info, state->vs_consts_b, + prog->vs.uniform_b_locations, vshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { @@ -1699,8 +1698,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) - shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, - pshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(pshader, gl_info, state->ps_consts_b, + prog->ps.uniform_b_locations, pshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_PS_BUMP_ENV) { -- 2.30.2

1 0

[PATCH 1/6] wined3d: Use wined3d_bit_scan() in shader_glsl_load_constants_i().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c812b2d8b08..1ebd067ae56 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1211,16 +1211,15 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co /* Context activation is done by the caller. */ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], WORD constants_set) + const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - /* We found this uniform name in the program - go ahead and send the data */ + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i].x)); } -- 2.30.2

1 0

[PATCH] dwrite/tests: Remove remaining kernel32 heap calls.
by Nikolay Sivov 28 Jan '22

28 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/analyzer.c | 11 ++++------- dlls/dwrite/tests/font.c | 35 +++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 14 ++++++-------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 875503ed5a3..d1d44c94012 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -134,16 +134,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, const struc if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof(*call_seq->sequence)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof(*call_seq->sequence)); } assert(call_seq->sequence); @@ -155,7 +152,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index { struct call_sequence *call_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -165,7 +162,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct call_sequence)); + seq[i] = calloc(1, sizeof(*seq[i])); } static void test_uint(UINT32 actual, UINT32 expected, const char *name, const struct testcontext *ctxt) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 26f94a1e3b1..10722fee444 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -783,11 +783,13 @@ static ULONG WINAPI fontdatastream_AddRef(IDWriteFontFileStream *iface) static ULONG WINAPI fontdatastream_Release(IDWriteFontFileStream *iface) { - struct test_fontdatastream *This = impl_from_IDWriteFontFileStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); - return ref; + struct test_fontdatastream *stream = impl_from_IDWriteFontFileStream(iface); + ULONG refcount = InterlockedDecrement(&stream->ref); + + if (!refcount) + free(stream); + + return refcount; } static HRESULT WINAPI fontdatastream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) @@ -836,16 +838,17 @@ static const IDWriteFontFileStreamVtbl fontdatastreamvtbl = static HRESULT create_fontdatastream(LPVOID data, UINT size, IDWriteFontFileStream** iface) { - struct test_fontdatastream *This = HeapAlloc(GetProcessHeap(), 0, sizeof(struct test_fontdatastream)); - if (!This) + struct test_fontdatastream *object = calloc(1, sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - This->data = data; - This->size = size; - This->ref = 1; - This->IDWriteFontFileStream_iface.lpVtbl = &fontdatastreamvtbl; + object->IDWriteFontFileStream_iface.lpVtbl = &fontdatastreamvtbl; + object->ref = 1; + object->data = data; + object->size = size; + + *iface = &object->IDWriteFontFileStream_iface; - *iface = &This->IDWriteFontFileStream_iface; return S_OK; } @@ -6014,7 +6017,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(!IsRectEmpty(&rect), "Unexpected empty bbox.\n"); size = (rect.right - rect.left) * (rect.bottom - rect.top); - bits = HeapAlloc(GetProcessHeap(), 0, size); + bits = malloc(size); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect, bits, size); ok(hr == S_OK, "Failed to get alpha texture, hr %#x.\n", hr); @@ -6029,7 +6032,7 @@ static void test_CreateGlyphRunAnalysis(void) todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, bits); + free(bits); hr = IDWriteFactory_CreateCustomRenderingParams(factory, 0.1f, 0.0f, 1.0f, DWRITE_PIXEL_GEOMETRY_FLAT, DWRITE_RENDERING_MODE_NATURAL, &params); @@ -6095,7 +6098,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(!IsRectEmpty(&rect), "Unexpected empty bbox.\n"); size = (rect.right - rect.left) * (rect.bottom - rect.top); - bits = HeapAlloc(GetProcessHeap(), 0, size); + bits = malloc(size); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect, bits, size); ok(hr == S_OK, "Failed to get alpha texture, hr %#x.\n", hr); @@ -6110,7 +6113,7 @@ static void test_CreateGlyphRunAnalysis(void) todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, bits); + free(bits); IDWriteGlyphRunAnalysis_Release(analysis); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3a6add954d9..95166376ac7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -343,14 +343,12 @@ static void add_call(struct drawcall_sequence **seq, int sequence_index, const s if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, call_seq->size * sizeof (struct drawcall_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof(*call_seq->sequence)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct drawcall_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof(*call_seq->sequence)); } assert(call_seq->sequence); @@ -361,7 +359,7 @@ static inline void flush_sequence(struct drawcall_sequence **seg, int sequence_i { struct drawcall_sequence *call_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -371,7 +369,7 @@ static void init_call_sequences(struct drawcall_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct drawcall_sequence)); + seq[i] = calloc(1, sizeof(*seq[i])); } static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, @@ -879,7 +877,7 @@ static ULONG WINAPI testeffect_Release(IUnknown *iface) LONG ref = InterlockedDecrement(&effect->ref); if (!ref) - HeapFree(GetProcessHeap(), 0, effect); + free(effect); return ref; } @@ -894,7 +892,7 @@ static IUnknown *create_test_effect(void) { struct test_effect *effect; - effect = HeapAlloc(GetProcessHeap(), 0, sizeof(*effect)); + effect = calloc(1, sizeof(*effect)); effect->IUnknown_iface.lpVtbl = &testeffectvtbl; effect->ref = 1; -- 2.34.1

3 2

[PATCH v2] kernel32/tests: Add tests for SetCurrentConsoleFontEx
by Hugh McMaster 28 Jan '22

28 Jan '22

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- Changes in this version: - Simplify tests. - Verify font size change with GetConsoleFontSize instead of calculating manually. dlls/kernel32/tests/console.c | 69 ++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..9766e5c9fa2 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3560,10 +3560,11 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; HANDLE pipe1, pipe2; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + COORD c; orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3657,16 +3658,80 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Try setting console font information for the current window size */ + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 0; + cfix.FontFamily = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"Lucida Console"); + + tmp.cbSize = sizeof(tmp); + + /* Test font height 20 */ + cfix.dwFontSize.Y = 20; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + todo_wine ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + todo_wine ok(c.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", c.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test font height 16 */ + cfix.dwFontSize.Y = 16; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + ok(c.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", c.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font height */ + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + todo_wine ok(tmp.dwFontSize.Y == 12, "got %d, expected 12\n", tmp.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + todo_wine ok(c.Y == 12, "got %d, expected 12\n", c.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font weight */ + cfix.dwFontSize.Y = 16; + cfix.FontWeight = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + ok(tmp.dwFontSize.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", + tmp.dwFontSize.Y, cfix.dwFontSize.Y); + c = GetConsoleFontSize(std_output, tmp.nFont); + ok(c.Y == cfix.dwFontSize.Y, "got %d, expected %d\n", c.Y, cfix.dwFontSize.Y); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); -- 2.34.1

1 0

[PATCH 1/7] winhttp: Pass server initiated websocket close request to application.
by Paul Gofman 28 Jan '22

28 Jan '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ff2c18c469b..10c1beb0d2b 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3591,6 +3591,8 @@ static DWORD receive_close_status( struct socket *socket, unsigned int len ) static DWORD handle_control_frame( struct socket *socket ) { + DWORD ret; + TRACE( "opcode %u.\n", socket->opcode ); switch (socket->opcode) @@ -3602,7 +3604,7 @@ static DWORD handle_control_frame( struct socket *socket ) return socket_drain( socket ); case SOCKET_OPCODE_CLOSE: - if (socket->state != SOCKET_STATE_CLOSED) + if (socket->state < SOCKET_STATE_SHUTDOWN) WARN( "SOCKET_OPCODE_CLOSE received, socket->state %u.\n", socket->state ); if (socket->close_frame_received) { @@ -3610,9 +3612,9 @@ static DWORD handle_control_frame( struct socket *socket ) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; } - receive_close_status( socket, socket->read_size ); + ret = receive_close_status( socket, socket->read_size ); socket->read_size = 0; - return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + return ret; default: ERR("unhandled control opcode %02x\n", socket->opcode); @@ -3654,7 +3656,8 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD { if (!(ret = receive_frame( socket, &socket->read_size, &socket->opcode ))) { - if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket ))) break; + if (!(socket->opcode & CONTROL_BIT) || (ret = handle_control_frame( socket )) + || socket->opcode == SOCKET_OPCODE_CLOSE) break; } else if (ret == WSAETIMEDOUT) ret = socket_send_pong( socket ); if (ret) break; -- 2.34.1

3 18

[PATCH resend] server: implement file random access hint on OS X
by Luke Deller 28 Jan '22

28 Jan '22

Disable read ahead for files opened with FILE_RANDOM_ACCESS hint on Mac OS X and FreeBSD. Signed-off-by: Luke Deller <luke(a)deller.id.au> --- server/fd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/fd.c b/server/fd.c index c9a21186722..ebcbd4266cc 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2054,6 +2054,13 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_RANDOM ); break; } +#elif defined F_RDAHEAD /* Mac OS X, FreeBSD */ + switch (options & (FILE_SEQUENTIAL_ONLY | FILE_RANDOM_ACCESS)) + { + case FILE_RANDOM_ACCESS: + fcntl( fd->unix_fd, F_RDAHEAD, 0 ); + break; + } #endif if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ -- 2.32.0 (Apple Git-132)

1 0

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-devel