- Wine-Commits - list.winehq.org

Dmitry Timoshkov : secur32/tests: Add some tests for "Negotiate" LSA package.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 835d73379fd885ceb3b0112ec53104cf639b2f38 URL: https://gitlab.winehq.org/wine/wine/-/commit/835d73379fd885ceb3b0112ec53104… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 1 13:45:25 2023 +0300 secur32/tests: Add some tests for "Negotiate" LSA package. Fixed test failures under some Windows versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/negotiate.c | 78 ++++++++++++++++++++++++++++++++++++++++++ include/ntsecapi.h | 21 ++++++++++++ 2 files changed, 99 insertions(+) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index 22a0e7793df..dc470a332c7 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -21,6 +21,9 @@ #include <stdarg.h> #include <stdio.h> + +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #define SECURITY_WIN32 @@ -28,6 +31,9 @@ #include <rpc.h> #include <rpcdce.h> #include <secext.h> +#include <security.h> +#include <ntsecapi.h> +#include <winternl.h> #include "wine/test.h" @@ -346,6 +352,77 @@ done: } } +static void test_Negotiate(void) +{ + HANDLE lsa; + NTSTATUS status, call_status; + LSA_STRING name; + ULONG size, id; + NEGOTIATE_CALLER_NAME_REQUEST req; + NEGOTIATE_CALLER_NAME_RESPONSE *resp; + + status = LsaConnectUntrusted(&lsa); + ok(!status, "got %08lx\n", status); + + RtlInitAnsiString(&name, "Negotiate"); + id = 0xdeadbeef; + status = LsaLookupAuthenticationPackage(lsa, &name, &id); + ok(!status, "got %08lx\n", status); + ok(id == 0, "got %lu\n", id); + + req.MessageType = NegGetCallerName; + req.LogonId.LowPart = 0; + req.LogonId.HighPart = 0; + resp = (void *)(ULONG_PTR)0xdeadbeef; + size = 0xdeadbeef; + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, &req, sizeof(req), (void **)&resp, &size, &call_status); + ok(status == STATUS_SUCCESS, "got %08lx\n", status); + ok(call_status == STATUS_NO_SUCH_LOGON_SESSION || call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + if (call_status == STATUS_NO_SUCH_LOGON_SESSION) + { + ok(size == 0, "got %lu\n", size); + ok(resp == NULL, "got %p\n", resp); + } + else /* STATUS_SUCCESS */ + { + if (resp && resp->CallerName) + trace("resp->CallerName = %s\n", debugstr_w(resp->CallerName)); + ok(resp != NULL, "got NULL\n"); + ok(resp->MessageType == NegGetCallerName, "got %lu\n", resp->MessageType); + ok((char *)resp->CallerName >= (char *)(resp + 1), "got %p/%p\n", resp, resp->CallerName); + ok(size >= sizeof(*resp) + (wcslen(resp->CallerName) + 1) * sizeof(WCHAR), "got %lu\n", size); + } + + size = 0xdeadbeef; + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, NULL, 0, NULL, &size, &call_status); + ok(status == STATUS_INVALID_PARAMETER, "got %08lx\n", status); + ok(call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + ok(size == 0, "got %08lx\n", size); + + size = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, NULL, 0, NULL, &size, NULL); + ok(status == STATUS_INVALID_PARAMETER, "got %08lx\n", status); + ok(size == 0, "got %08lx\n", size); + + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0, NULL, 0, NULL, NULL, &call_status); + ok(status == STATUS_INVALID_PARAMETER, "got %08lx\n", status); + ok(call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + + resp = (void *)(ULONG_PTR)0xdeadbeef; + size = 0xdeadbeef; + call_status = 0xdeadbeef; + status = LsaCallAuthenticationPackage(lsa, 0xdeadbeef, NULL, 0, (void **)&resp, &size, &call_status); + ok(status == STATUS_NO_SUCH_PACKAGE, "got %08lx\n", status); + ok(call_status == STATUS_SUCCESS, "got %08lx\n", call_status); + ok(size == 0, "got %08lx\n", size); + ok(resp == NULL, "got %p\n", resp); + + LsaDeregisterLogonProcess(lsa); +} + START_TEST(negotiate) { SecPkgInfoA *info; @@ -367,4 +444,5 @@ START_TEST(negotiate) FreeContextBuffer( info ); test_authentication(); + test_Negotiate(); } diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 992aebf66d2..ded31b41e56 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -356,6 +356,27 @@ typedef struct _AUDIT_POLICY_INFORMATION GUID AuditCategoryGuid; } AUDIT_POLICY_INFORMATION, *PAUDIT_POLICY_INFORMATION; +enum NEGOTIATE_MESSAGES +{ + NegEnumPackagePrefixes, + NegGetCallerName, + NegTransferCredentials, + NegMsgReserved1, + NegCallPackageMax +}; + +typedef struct _NEGOTIATE_CALLER_NAME_REQUEST +{ + ULONG MessageType; + LUID LogonId; +} NEGOTIATE_CALLER_NAME_REQUEST, *PNEGOTIATE_CALLER_NAME_REQUEST; + +typedef struct _NEGOTIATE_CALLER_NAME_RESPONSE +{ + ULONG MessageType; + PWSTR CallerName; +} NEGOTIATE_CALLER_NAME_RESPONSE, *PNEGOTIATE_CALLER_NAME_RESPONSE; + #define MICROSOFT_KERBEROS_NAME_A "Kerberos" #if defined(_MSC_VER) || defined(__MINGW32__) #define MICROSOFT_KERBEROS_NAME_W L"Kerberos"

1 0

Dmitry Timoshkov : secur32: Convert "Negotiate" to an LSA package.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 021547cabcb811c38060a2f7e675c25d26f16d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/021547cabcb811c38060a2f7e675c2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 31 17:25:50 2023 +0300 secur32: Convert "Negotiate" to an LSA package. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 98 +++++-- dlls/secur32/negotiate.c | 700 ++++++++++++++++++-------------------------- dlls/secur32/secur32.c | 4 - dlls/secur32/secur32_priv.h | 6 +- 4 files changed, 353 insertions(+), 455 deletions(-)

1 0

Dmitry Timoshkov : secur32: Add a better stub for LsaApCallPackageUntrusted(NegGetCallerName).
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 519f5cc20a5f849138c6c6a80cd5c3773c11d012 URL: https://gitlab.winehq.org/wine/wine/-/commit/519f5cc20a5f849138c6c6a80cd5c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Aug 1 13:31:05 2023 +0300 secur32: Add a better stub for LsaApCallPackageUntrusted(NegGetCallerName). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 6 +++++- dlls/secur32/negotiate.c | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fca290f4ae9..56d365edc7c 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -98,6 +98,10 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id TRACE("%p,%lu,%p,%lu,%p,%p,%p\n", lsa_handle, package_id, in_buffer, in_buffer_length, out_buffer, out_buffer_length, status); + if (out_buffer) *out_buffer = NULL; + if (out_buffer_length) *out_buffer_length = 0; + if (status) *status = STATUS_SUCCESS; + for (i = 0; i < loaded_packages_count; i++) { if (loaded_packages[i].package_id == package_id) @@ -110,7 +114,7 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id } } - return STATUS_INVALID_PARAMETER; + return STATUS_NO_SUCH_PACKAGE; } static struct lsa_handle *alloc_lsa_handle(ULONG magic) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index c5d89a38228..323d14e9eaa 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -71,9 +71,23 @@ static WCHAR negotiate_comment_W[] = static NTSTATUS NTAPI nego_LsaApCallPackageUntrusted( PLSA_CLIENT_REQUEST req, void *in_buf, void *client_buf_base, ULONG in_buf_len, void **out_buf, ULONG *out_buf_len, NTSTATUS *ret_status ) { + ULONG *MessageType; + FIXME("%p, %p, %p, %lu, %p, %p, %p: stub\n", req, in_buf, client_buf_base, in_buf_len, out_buf, out_buf_len, ret_status); - return SEC_E_UNSUPPORTED_FUNCTION; + if (!in_buf || in_buf_len < sizeof(*MessageType) || !out_buf || !out_buf_len || !ret_status) + return STATUS_INVALID_PARAMETER; + + MessageType = in_buf; + switch (*MessageType) + { + case 1: /* NegGetCallerName */ + *ret_status = STATUS_NO_SUCH_LOGON_SESSION; + return STATUS_SUCCESS; + + default: + return SEC_E_UNSUPPORTED_FUNCTION; + } } static NTSTATUS NTAPI nego_LsaApInitializePackage( ULONG package_id, PLSA_DISPATCH_TABLE dispatch,

1 0

Sven Baars : quartz/tests: Fix some media type leaks (Valgrind).
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 35cff9ec6e818d7d34a8e17b0281288a50edfe66 URL: https://gitlab.winehq.org/wine/wine/-/commit/35cff9ec6e818d7d34a8e17b028128… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Aug 1 18:47:18 2023 +0200 quartz/tests: Fix some media type leaks (Valgrind). --- dlls/quartz/tests/avidec.c | 2 ++ dlls/quartz/tests/avisplit.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 46ce5d9eeda..f28dfee7402 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -1525,6 +1525,8 @@ static void test_connect_pin(void) ok(testsource.source.pin.peer == sink, "Got peer %p.\n", testsource.source.pin.peer); IFilterGraph2_Disconnect(graph, &testsource.source.pin.IPin_iface); + FreeMediaType(&source_mt); + FreeMediaType(&req_mt); IMemInputPin_Release(meminput); IPin_Release(sink); IPin_Release(source); diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 8b7e8a222b0..25e313aa4b4 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -1233,6 +1233,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1281,6 +1282,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Bernhard Kölbl : winegstreamer: Leave media source critical section before unlocking workqueue.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: ef1b964826ba47105ef9338dc72a7881a77bf265 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef1b964826ba47105ef9338dc72a78… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Wed Aug 2 21:05:30 2023 +0200 winegstreamer: Leave media source critical section before unlocking workqueue. Today, if media_source_Shutdown is called around the same time as a work item is put on the async_commands_queue, we end up in a deadlock if Shutdown enters media source's cs first, as it waits for the queue's callback to finish, which, in turn, waits for the object's cs to be released. To avoid this leave the cs, before unlocking the workqueue, to let any callback on the queue finish running. Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 7b0857158ae..8b9d42ea3f0 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1570,10 +1570,10 @@ static HRESULT WINAPI media_source_Shutdown(IMFMediaSource *iface) free(source->descriptors); free(source->streams); - MFUnlockWorkQueue(source->async_commands_queue); - LeaveCriticalSection(&source->cs); + MFUnlockWorkQueue(source->async_commands_queue); + return S_OK; }

1 0

Sven Baars : quartz: Fix some critical section leaks (Valgrind).
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: c5ca3b001169f3e45f4a45921f3c33ee512a412b URL: https://gitlab.winehq.org/wine/wine/-/commit/c5ca3b001169f3e45f4a45921f3c33… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Aug 1 16:28:03 2023 +0200 quartz: Fix some critical section leaks (Valgrind). --- dlls/quartz/filesource.c | 5 +++-- dlls/quartz/filtergraph.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 48950026ddf..7d6292df579 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -333,14 +333,15 @@ static void async_reader_destroy(struct strmbase_filter *iface) free(filter->requests); } CloseHandle(filter->file); - filter->sample_cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->sample_cs); strmbase_source_cleanup(&filter->source); free(filter->pszFileName); FreeMediaType(&filter->mt); } + filter->sample_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->sample_cs); + PostQueuedCompletionStatus(filter->port, 0, 1, NULL); WaitForSingleObject(filter->io_thread, INFINITE); CloseHandle(filter->io_thread); diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e0e126d8ef0..4100e71be3a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -486,8 +486,9 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) } LeaveCriticalSection(&message_cs); - This->cs.DebugInfo->Spare[0] = 0; + This->event_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->event_cs); + This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); free(This); }

1 0

Zebediah Figura : qcap/audiorecord: Enumerate the currently set media type first.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: f03ae651e62e1b6b5c9598ae7d03ce31673eea8c URL: https://gitlab.winehq.org/wine/wine/-/commit/f03ae651e62e1b6b5c9598ae7d03ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 25 18:51:29 2023 -0500 qcap/audiorecord: Enumerate the currently set media type first. --- dlls/qcap/audiorecord.c | 20 +++++++++++++------- dlls/qcap/tests/audiorecord.c | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 5ece56e97ec..eefac79b409 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -114,13 +114,17 @@ audio_formats[] = {96000, 16, 1}, }; -static HRESULT fill_media_type(unsigned int index, AM_MEDIA_TYPE *mt) +static HRESULT fill_media_type(struct audio_record *filter, unsigned int index, AM_MEDIA_TYPE *mt) { WAVEFORMATEX *format; - if (index >= ARRAY_SIZE(audio_formats)) + if (index >= 1 + ARRAY_SIZE(audio_formats)) return VFW_S_NO_MORE_ITEMS; + if (!index) + return CopyMediaType(mt, &filter->format); + --index; + if (!(format = CoTaskMemAlloc(sizeof(*format)))) return E_OUTOFMEMORY; @@ -147,7 +151,9 @@ static HRESULT fill_media_type(unsigned int index, AM_MEDIA_TYPE *mt) static HRESULT audio_record_source_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) { - return fill_media_type(index, mt); + struct audio_record *filter = impl_from_strmbase_filter(iface->filter); + + return fill_media_type(filter, index, mt); } static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_source *iface, @@ -283,7 +289,7 @@ static HRESULT WINAPI stream_config_GetNumberOfCapabilities(IAMStreamConfig *ifa TRACE("filter %p, count %p, size %p.\n", filter, count, size); - *count = ARRAY_SIZE(audio_formats); + *count = 1 + ARRAY_SIZE(audio_formats); *size = sizeof(AUDIO_STREAM_CONFIG_CAPS); return S_OK; } @@ -298,13 +304,13 @@ static HRESULT WINAPI stream_config_GetStreamCaps(IAMStreamConfig *iface, TRACE("filter %p, index %d, ret_mt %p, caps %p.\n", filter, index, ret_mt, caps); - if (index >= ARRAY_SIZE(audio_formats)) + if (index >= 1 + ARRAY_SIZE(audio_formats)) return S_FALSE; if (!(mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) return E_OUTOFMEMORY; - if ((hr = fill_media_type(index, mt)) != S_OK) + if ((hr = fill_media_type(filter, index, mt)) != S_OK) { CoTaskMemFree(mt); return hr; @@ -795,7 +801,7 @@ HRESULT audio_record_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; } - if ((hr = fill_media_type(0, &object->format))) + if ((hr = fill_media_type(object, 1, &object->format))) { CloseHandle(object->event); free(object); diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index ddf54e68e21..11397531064 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -1122,13 +1122,13 @@ static void test_stream_config(IBaseFilter *filter) IPin_EnumMediaTypes(source, &enummt); hr = IEnumMediaTypes_Next(enummt, 1, &mt2, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine_if (i > 0) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); DeleteMediaType(mt2); IEnumMediaTypes_Release(enummt); hr = IAMStreamConfig_GetStreamCaps(config, 0, &mt2, (BYTE *)&caps); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine_if (i > 0) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); DeleteMediaType(mt2); DeleteMediaType(mt);

1 0

Zebediah Figura : qcap/tests: Add more tests for audio record media types.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: b0f7f843277cc33c68f015f9e4fa51fd6524b2f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0f7f843277cc33c68f015f9e4fa51… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 25 18:45:21 2023 -0500 qcap/tests: Add more tests for audio record media types. --- dlls/qcap/tests/audiorecord.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index e0a130fefb3..ddf54e68e21 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -1118,6 +1118,19 @@ static void test_stream_config(IBaseFilter *filter) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); DeleteMediaType(mt2); + /* The first entry in the list is always the same as the format set. */ + IPin_EnumMediaTypes(source, &enummt); + hr = IEnumMediaTypes_Next(enummt, 1, &mt2, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine_if (i > 0) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + DeleteMediaType(mt2); + IEnumMediaTypes_Release(enummt); + + hr = IAMStreamConfig_GetStreamCaps(config, 0, &mt2, (BYTE *)&caps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine_if (i > 0) ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + DeleteMediaType(mt2); + DeleteMediaType(mt); winetest_pop_context(); @@ -1135,6 +1148,9 @@ static void test_stream_config(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); + hr = IPin_QueryAccept(source, mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + DeleteMediaType(mt2); DeleteMediaType(mt); }

1 0

Michael Stefaniuc : msxml3/tests: Use wide strings to generate BSTRs in schema.c.
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: c84e7d6714864522e830868d0c044d55c71fd437 URL: https://gitlab.winehq.org/wine/wine/-/commit/c84e7d6714864522e830868d0c044d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Aug 1 23:05:47 2023 +0200 msxml3/tests: Use wide strings to generate BSTRs in schema.c. --- dlls/msxml3/tests/schema.c | 152 +++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 80 deletions(-)

1 0

Tim Clem : wow64: Correct a reversed strcpy in wow64_NtQuerySystemInformation(SystemModuleInformation).
by Alexandre Julliard Aug. 3, 2023

Aug. 3, 2023

Module: wine Branch: master Commit: 198917ee1e1a91bdc636c9f230d17826332f572c URL: https://gitlab.winehq.org/wine/wine/-/commit/198917ee1e1a91bdc636c9f230d178… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed Aug 2 08:28:35 2023 -0700 wow64: Correct a reversed strcpy in wow64_NtQuerySystemInformation(SystemModuleInformation). --- dlls/wow64/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64/system.c b/dlls/wow64/system.c index 21e191b8a29..ba19ef5314d 100644 --- a/dlls/wow64/system.c +++ b/dlls/wow64/system.c @@ -393,7 +393,7 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformation( UINT *args ) info32->Modules[i].InitOrderIndex = info->Modules[i].InitOrderIndex; info32->Modules[i].LoadCount = info->Modules[i].LoadCount; info32->Modules[i].NameOffset = info->Modules[i].NameOffset; - strcpy( (char *)info->Modules[i].Name, (char *)info32->Modules[i].Name ); + strcpy( (char *)info32->Modules[i].Name, (char *)info->Modules[i].Name ); } } }

1 0