January 2022 - Wine-Commits

Eric Pouech : dsound: Use correct integral type.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: c5b0974b93b7cc54aee4defdda445b0aa7e89a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5b0974b93b7cc54aee4defd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:15:17 2022 +0100 dsound: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index d28cc8dc5aa..1f91bc4dc0e 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -694,7 +694,8 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, LPBYTE pos, DWORD bytes) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - DWORD block, pad_frames, pad_bytes, frames; + DWORD block, pad_bytes, frames; + UINT32 pad_frames; HRESULT hr; TRACE("(%p)\n", device);

1 0

Eric Pouech : include/msvcrt: Add attribute((format)) to printf and scanf -like APIs.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: bb1fc33570098543e2ec8b6b43fa155adfea2182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb1fc33570098543e2ec8b6b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:13:15 2022 +0100 include/msvcrt: Add attribute((format)) to printf and scanf -like APIs. Fix a bunch of warnings generated by this patch and the migration of GUID.Data1 to long in ae2693e2c4079edcc719c08abed5ad58ba7aace7 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 +- dlls/winebus.sys/main.c | 10 ++--- include/msvcrt/corecrt.h | 8 ++++ include/msvcrt/crtdbg.h | 2 +- include/msvcrt/stdio.h | 90 ++++++++++++++++++++++++++++-------------- programs/winetest/main.c | 2 +- 20 files changed, 93 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb1fc33570098543e2ec…

1 0

Eric Pouech : winedbg: Use correct integral type.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: f44f3c23a6fd029d208947f90aba5193bb1f2b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f44f3c23a6fd029d208947f9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 31 14:14:11 2022 +0100 winedbg: Use correct integral type. (* as width or precision specifier in printf requires an int not a long) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index b676bc8d955..0cc2f8b7a6c 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -39,7 +39,7 @@ #include "oaidl.h" #include <wine/list.h> -#define ADDRSIZE (dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : (int)sizeof(void*)) +#define ADDRSIZE ((int)(dbg_curr_process ? dbg_curr_process->be_cpu->pointer_size : sizeof(void*))) #define ADDRWIDTH (ADDRSIZE * 2) /* the debugger uses these exceptions for its internal use */

1 0

Nikolay Sivov : wshom: Fix long types warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 52b74b36bdf55510ef3990e3642945b493be7100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52b74b36bdf55510ef3990e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:12:09 2022 +0300 wshom: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/Makefile.in | 1 - dlls/wshom.ocx/shell.c | 97 ++++++++++++++++++++------------------------- dlls/wshom.ocx/wshom_main.c | 6 +-- 3 files changed, 47 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=52b74b36bdf55510ef39…

1 0

Hans Leidekker : wbemprox: Use CRT allocation functions.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: a89db3180f20db7b1f5298bd28b6917aadd1fb4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a89db3180f20db7b1f5298bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 31 14:49:43 2022 +0100 wbemprox: Use CRT allocation functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a89db3180f20db7b1f52…

1 0

Nikolay Sivov : mf/tests: Remove remaining kernel32 heap calls.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: ca1c586291feed4bc3f33cc6b95a67df47a51e81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1c586291feed4bc3f33cc6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:06:46 2022 +0300 mf/tests: Remove remaining kernel32 heap calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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;

1 0

Nikolay Sivov : scrrun: Fix long types warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 5bb7a6d5ea1761a80c6ecbc50b2e886d40473ed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb7a6d5ea1761a80c6ecbc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:05:24 2022 +0300 scrrun: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5bb7a6d5ea1761a80c6e…

1 0

Nikolay Sivov : rtworkq: Fix long types warnings.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: cc1a9e23799ca452910eec0c1e1a1958efc309bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc1a9e23799ca452910eec0c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:06:09 2022 +0300 rtworkq: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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; }

1 0

Rémi Bernon : winebus.sys: Fix warnings with long integer types.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 3bb0e2e5e50437502cce7780ef15b35e36d340ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb0e2e5e50437502cce7780… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 31 10:10:59 2022 +0100 winebus.sys: Fix warnings with long integer types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 1 - dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 10 +++++----- dlls/winebus.sys/hid.c | 2 +- dlls/winebus.sys/main.c | 36 ++++++++++++++++++------------------ dlls/winebus.sys/unix_private.h | 10 +++++----- dlls/winebus.sys/unixlib.c | 4 ++-- dlls/winebus.sys/unixlib.h | 16 ++++++++-------- 9 files changed, 41 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3bb0e2e5e50437502cce…

1 0

Daniel Lehman : msxml3: Make utf-8 the default encoding.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: wine Branch: master Commit: 5260ab30cda07b896eaf8704890f7797dadd85f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5260ab30cda07b896eaf8704… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Nov 24 08:33:06 2021 -0800 msxml3: Make utf-8 the default encoding. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 3 +++ dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 4013f106cc6..082d7950f8d 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2603,6 +2603,9 @@ static char *xmldoc_encoding(IXMLDOMDocument3 *doc) IXMLDOMNode_Release(node); } + if (!encoding && (encoding = heap_alloc(sizeof("UTF-8")))) + strcpy(encoding, "UTF-8"); + return encoding; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 761688c187b..ad4d255abe7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6636,7 +6636,7 @@ static void test_save(void) { ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); ok(read != 0, "could not read file\n"); - todo_wine ok(!memcmp(buffer, cheA, sizeof(cheA)-1), "got: %s\n", buffer); + ok(!memcmp(buffer, cheA, sizeof(cheA)-1), "got: %s\n", buffer); CloseHandle(hfile); DeleteFileA("test.xml");

1 0