September 2023 - Wine-Commits

Jeff Smith : xaudio2/tests: Improve IID_IXAudio2 interface version checking.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 5c1f9012947bd38b733fcbbaf5d6cda0c9b58cbe URL: https://gitlab.winehq.org/wine/wine/-/commit/5c1f9012947bd38b733fcbbaf5d6cd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Sat Sep 2 21:21:03 2023 -0500 xaudio2/tests: Improve IID_IXAudio2 interface version checking. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55108 --- dlls/xaudio2_7/tests/xaudio2.c | 46 +++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 759bf5b00af..2b3102d21fe 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -39,6 +39,7 @@ static const GUID IID_IXAudio27 = {0x8bcf1f58, 0x9fe7, 0x4583, {0x8a, 0xc6, 0xe2, 0xad, 0xc4, 0x65, 0xc8, 0xbb}}; static const GUID IID_IXAudio28 = {0x60d8dac8, 0x5aa1, 0x4e8e, {0xb5, 0x97, 0x2f, 0x5e, 0x28, 0x83, 0xd4, 0x84}}; +static const GUID IID_IXAudio29 = {0x2b02e3cf, 0x2e0b, 0x4ec3, {0xbe, 0x45, 0x1b, 0x2a, 0x3f, 0xe7, 0x21, 0x0d}}; static const GUID CLSID_AudioVolumeMeter20 = {0xc0c56f46, 0x29b1, 0x44e9, {0x99, 0x39, 0xa3, 0x2c, 0xe8, 0x68, 0x67, 0xe2}}; static const GUID CLSID_AudioVolumeMeter21 = {0xc1e3f122, 0xa2ea, 0x442c, {0x85, 0x4f, 0x20, 0xd9, 0x8f, 0x83, 0x57, 0xa1}}; @@ -83,6 +84,39 @@ static IXAudio2 *create_xaudio2(void) return audio; } +static void test_interfaces(IXAudio2 *audio) +{ + const GUID *td[] = + { + &IID_IXAudio27, /* DirectX SDK */ + &IID_IXAudio28, /* Windows 8 */ + &IID_IXAudio29, /* Windows 10 */ + }; + UINT match_count = 0; + INT last_match = -1; + IXAudio2 *audio2; + HRESULT hr; + UINT i; + + for (i = 0; i < ARRAY_SIZE(td); i++) + { + hr = IXAudio2_QueryInterface(audio, td[i], (void **)&audio2); + ok(hr == S_OK || hr == E_NOINTERFACE, "%u: Got hr %#lx.\n", i, hr); + if (hr == S_OK) + { + IXAudio2_Release(audio2); + ++match_count; + last_match = i; + } + } + ok(match_count == 1, "Found %u matching interfaces.\n", match_count); +#if XAUDIO2_VER <= 7 + ok(last_match < 1, "Unexpectedly matched interface (%d).\n", last_match); +#else + ok(last_match != 0, "Unexpectedly matched interface (%d).\n", last_match); +#endif +} + static HRESULT create_mastering_voice(IXAudio2 *audio, unsigned int channel_count, IXAudio2MasteringVoice **voice) { #if XAUDIO2_VER <= 7 @@ -1198,8 +1232,7 @@ static UINT32 check_has_devices(IXAudio2 *xa) START_TEST(xaudio2) { - IXAudio2 *audio, *audio2; - HRESULT hr; + IXAudio2 *audio; ULONG ref; CoInitialize(NULL); @@ -1209,14 +1242,7 @@ START_TEST(xaudio2) if (!(audio = create_xaudio2())) return; - hr = IXAudio2_QueryInterface(audio, &IID_IXAudio27, (void **)&audio2); - ok(hr == (xaudio27 ? S_OK : E_NOINTERFACE), "Got hr %#lx.\n", hr); - if (hr == S_OK) - IXAudio2_Release(audio2); - hr = IXAudio2_QueryInterface(audio, &IID_IXAudio28, (void **)&audio2); - ok(hr == (xaudio27 ? E_NOINTERFACE : S_OK), "Got hr %#lx.\n", hr); - if (hr == S_OK) - IXAudio2_Release(audio2); + test_interfaces(audio); if (check_has_devices(audio)) {

1 0

Dmitry Timoshkov : dnsapi: Accept name records of exact size at the end of the packet.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: a36e0a16cd6f4329beec1d2fa83428575269540f URL: https://gitlab.winehq.org/wine/wine/-/commit/a36e0a16cd6f4329beec1d2fa83428… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 1 14:32:55 2023 +0300 dnsapi: Accept name records of exact size at the end of the packet. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dnsapi/record.c | 2 +- dlls/dnsapi/tests/record.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 01786842b73..cfd55a44852 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -199,7 +199,7 @@ static const BYTE *get_name( const BYTE *base, const BYTE *end, const BYTE *ptr, return NULL; } } - if (ptr >= end) return NULL; + if (ptr > end) return NULL; if (out == name) *out++ = '.'; *out = 0; return next ? next : ptr; diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 8abcdadaacc..340d10f6024 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -224,11 +224,8 @@ static void test_DnsExtractRecordsFromMessage(void) rec = NULL; ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_full_srv, sizeof(msg_full_srv), &rec ); - todo_wine ok( !ret, "failed %ld\n", ret ); - todo_wine ok( rec != NULL, "record not set\n" ); - if (!rec) goto next; ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName ); ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section ); ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet ); @@ -240,7 +237,6 @@ static void test_DnsExtractRecordsFromMessage(void) ok( !rec->pNext, "next record %p\n", rec->pNext ); DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); -next: rec = (void *)0xdeadbeef; ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question_srv, sizeof(msg_question_srv), &rec ); ok( !ret, "failed %ld\n", ret ); @@ -248,11 +244,8 @@ next: rec = NULL; ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_answer_srv, sizeof(msg_answer_srv), &rec ); - todo_wine ok( !ret, "failed %ld\n", ret ); - todo_wine ok( rec != NULL, "record not set\n" ); - if (!rec) goto next2; ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName ); ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section ); ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet ); @@ -264,7 +257,6 @@ next: ok( !rec->pNext, "next record %p\n", rec->pNext ); DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); -next2: ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec ); ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */, "failed %ld\n", ret );

1 0

Paul Gofman : kernelbase: Get unprocessed mask in FindFirstFileExW().
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: a90f695f78e67b0e4cdd330c8898a72be4c7b09a URL: https://gitlab.winehq.org/wine/wine/-/commit/a90f695f78e67b0e4cdd330c8898a7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 30 18:36:25 2023 -0600 kernelbase: Get unprocessed mask in FindFirstFileExW(). --- dlls/kernel32/tests/file.c | 4 ++-- dlls/kernelbase/file.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0918651bc1c..af2347504e0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3019,8 +3019,8 @@ static void test_FindFirstFile_wildcards(void) {1, "..< ", ", '..a'"}, {1, "?", ", '.', '..', 'a'"}, - {1, "?.", ", '.', '..', 'a'"}, - {1, "?. ", ", '.', '..', 'a'"}, + {0, "?.", ", '.', '..', 'a'"}, + {0, "?. ", ", '.', '..', 'a'"}, {1, "??.", ", '.', '..', 'a', 'aa'"}, {1, "??. ", ", '.', '..', 'a', 'aa'"}, {1, "???.", ", '.', '..', 'a', 'aa', 'aaa'"}, diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index e4d9a1d70c1..f6d5087aa2b 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1190,6 +1190,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ if (has_wildcard) { size = 8192; + mask = PathFindFileNameW( filename ); mask_size = (lstrlenW( mask ) + 1) * sizeof(*mask); } else size = max_entry_size; @@ -1408,7 +1409,7 @@ static BOOL match_filename( const WCHAR *name, int length, const WCHAR *mask ) } } - while (mask < mask_end && (*mask == '.' || *mask == '*')) + while (mask < mask_end && (*mask == ' ' || *mask == '.' || *mask == '*')) mask++; return (name == name_end && mask == mask_end); }

1 0

Hans Leidekker : webservices/tests: Fully initialize xmlstr.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: be68006628a4218b39178b9c6c29fe5f2cdb18ed URL: https://gitlab.winehq.org/wine/wine/-/commit/be68006628a4218b39178b9c6c29fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 4 11:55:55 2023 +0200 webservices/tests: Fully initialize xmlstr. --- dlls/webservices/tests/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 3f83c66d962..7f42d0488e3 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4048,6 +4048,7 @@ static void test_WsResetError(void) WsFreeError( error ); memset( &fault, 0, sizeof(fault) ); + memset( &xmlstr, 0, sizeof(xmlstr) ); xmlstr.bytes = (BYTE *)"str"; xmlstr.length = 3; @@ -4056,7 +4057,7 @@ static void test_WsResetError(void) hr = WsSetFaultErrorProperty( error, WS_FAULT_ERROR_PROPERTY_FAULT, &fault, sizeof(fault) ); ok( hr == S_OK, "got %#lx\n", hr ); - hr = WsSetFaultErrorProperty( error, WS_FAULT_ERROR_PROPERTY_ACTION, &xmlstr, sizeof(WS_XML_STRING) ); + hr = WsSetFaultErrorProperty( error, WS_FAULT_ERROR_PROPERTY_ACTION, &xmlstr, sizeof(xmlstr) ); ok( hr == S_OK, "got %#lx\n", hr ); hr = WsResetError( error );

1 0

Dmitry Timoshkov : dnsapi/tests: Add some tests for DNS_TYPE_SRV messages.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: c3c477b77deab992565b97154d16d3bd01644d58 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3c477b77deab992565b97154d16d3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 1 14:30:10 2023 +0300 dnsapi/tests: Add some tests for DNS_TYPE_SRV messages. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dnsapi/tests/record.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 20738de3618..8abcdadaacc 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -193,6 +193,28 @@ static BYTE msg_types[] = /* various record types */ /* KEY */ 0xc0, 0x0c, 0x00, 0x19, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x00, 0x06, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, /* TXT */ 0x01, 't', 0x01, 'x', 0x00, 0x00, 0x10, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x00, 0x09, 0x02, 'z', 'y', 0x00, 0x04, 'X', 'Y', 0xc3, 0xa9 }; +static BYTE msg_question_srv[] = /* SRV question only */ +{ + 0x12, 0x34, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00,0x00,0x00,0x21,0x00 +}; +static BYTE msg_answer_srv[] = /* SRV answer only */ +{ + 0x12, 0x34, 0x81, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00, + 0x00,0x21,0x00,0x01,0x04,0x05,0x06,0x07, + 0x00,0x15,0x00,0x00,0x00,0x00,0x01,0x85, + 2,'d','c',6,'w','i','n','e','h','q',3,'o','r','g',0x00 +}; +static BYTE msg_full_srv[] = /* SRV question + answer */ +{ + 0x12, 0x34, 0x81, 0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 5,'_','l','d','a','p',4,'_','t','c','p',2,'d','c',6,'_','m','s','d','c','s',6,'w','i','n','e','h','q',3,'o','r','g',0x00, + 0x00,0x21,0x00,0x01, + 0xc0,0x0c,0x00,0x21,0x00,0x01,0x04,0x05,0x06,0x07, + 0x00,0x15,0x00,0x00,0x00,0x00,0x01,0x85, + 2,'d','c',6,'w','i','n','e','h','q',3,'o','r','g',0x00 +}; static void test_DnsExtractRecordsFromMessage(void) { @@ -200,6 +222,49 @@ static void test_DnsExtractRecordsFromMessage(void) DNS_RECORDA *rec, *r; DNS_RECORDW *recW, *rW; + rec = NULL; + ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_full_srv, sizeof(msg_full_srv), &rec ); + todo_wine + ok( !ret, "failed %ld\n", ret ); + todo_wine + ok( rec != NULL, "record not set\n" ); + if (!rec) goto next; + ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName ); + ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section ); + ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet ); + ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType ); + todo_wine + ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength ); + ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl ); + ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget ); + ok( !rec->pNext, "next record %p\n", rec->pNext ); + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + +next: + rec = (void *)0xdeadbeef; + ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_question_srv, sizeof(msg_question_srv), &rec ); + ok( !ret, "failed %ld\n", ret ); + ok( !rec, "record %p\n", rec ); + + rec = NULL; + ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_answer_srv, sizeof(msg_answer_srv), &rec ); + todo_wine + ok( !ret, "failed %ld\n", ret ); + todo_wine + ok( rec != NULL, "record not set\n" ); + if (!rec) goto next2; + ok( !strcmp( rec->pName, "_ldap._tcp.dc._msdcs.winehq.org" ), "wrong name %s\n", rec->pName ); + ok( rec->Flags.S.Section == DnsSectionAnswer, "wrong section %u\n", rec->Flags.S.Section ); + ok( rec->Flags.S.CharSet == DnsCharSetUtf8, "wrong charset %u\n", rec->Flags.S.CharSet ); + ok( rec->wType == DNS_TYPE_SRV, "wrong type %u\n", rec->wType ); + todo_wine + ok( rec->wDataLength == sizeof(DNS_SRV_DATAA) + strlen( "dc.winehq.org" ) + 1, "wrong len %u\n", rec->wDataLength ); + ok( rec->dwTtl == 0x04050607, "wrong ttl %#lx\n", rec->dwTtl ); + ok( !strcmp( rec->Data.SRV.pNameTarget, "dc.winehq.org"), "wrong target %s\n", rec->Data.SRV.pNameTarget ); + ok( !rec->pNext, "next record %p\n", rec->pNext ); + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + +next2: ret = DnsExtractRecordsFromMessage_UTF8( (DNS_MESSAGE_BUFFER *)msg_empty, sizeof(msg_empty) - 1, &rec ); ok( ret == ERROR_INVALID_PARAMETER || broken(ret == DNS_ERROR_BAD_PACKET) /* win7 */, "failed %ld\n", ret );

1 0

Hans Leidekker : wtsapi/tests: Use a heap buffer for the user SID.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 9c238a5dc00c941ec90d2b146bc22c355d367638 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c238a5dc00c941ec90d2b146bc22c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 11 14:27:33 2023 +0200 wtsapi/tests: Use a heap buffer for the user SID. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55227 --- dlls/wtsapi32/tests/wtsapi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 6e8de7b232d..5be1764b6b3 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -68,8 +68,7 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) for (i = 0; i < count; i++) { - char sid_buffer[50]; - SID_AND_ATTRIBUTES *sid = (SID_AND_ATTRIBUTES *)sid_buffer; + SID_AND_ATTRIBUTES *sid; const SYSTEM_PROCESS_INFORMATION *nt_process; HANDLE process, token; DWORD size; @@ -88,11 +87,13 @@ static void check_wts_process_info(const WTS_PROCESS_INFOW *info, DWORD count) if ((process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, info[i].ProcessId))) { + sid = malloc(50); ret = OpenProcessToken(process, TOKEN_QUERY, &token); ok(ret, "failed to open token, error %lu\n", GetLastError()); - ret = GetTokenInformation(token, TokenUser, sid_buffer, sizeof(sid_buffer), &size); + ret = GetTokenInformation(token, TokenUser, sid, 50, &size); ok(ret, "failed to get token user, error %lu\n", GetLastError()); ok(EqualSid(info[i].pUserSid, sid->Sid), "SID did not match\n"); + free(sid); CloseHandle(token); CloseHandle(process); }

1 0

Alex Henrie : cmd: Handle `if exist` with an empty string argument.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 859d5e68ddec5156f49efb3c1126db02691416af URL: https://gitlab.winehq.org/wine/wine/-/commit/859d5e68ddec5156f49efb3c1126db… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Sep 2 18:45:30 2023 -0600 cmd: Handle `if exist` with an empty string argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55505 --- programs/cmd/builtins.c | 15 +++++++++------ programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 419e812103a..ca703af52ec 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2841,13 +2841,16 @@ int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); int len = lstrlenW(param); - if (!len) goto syntax_err; - /* FindFirstFile does not like a directory path ending in '\' or '/', append a '.' */ - if (param[len-1] == '\\' || param[len-1] == '/') lstrcatW(param, L"."); + if (!len) { + *test = FALSE; + } else { + /* FindFirstFile does not like a directory path ending in '\' or '/', so append a '.' */ + if (param[len-1] == '\\' || param[len-1] == '/') wcscat(param, L"."); - hff = FindFirstFileW(param, &fd); - *test = (hff != INVALID_HANDLE_VALUE ); - if (*test) FindClose(hff); + hff = FindFirstFileW(param, &fd); + *test = (hff != INVALID_HANDLE_VALUE); + if (*test) FindClose(hff); + } WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 28b935ad521..08595933622 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1176,6 +1176,11 @@ if exist "subdir/" ( ) else ( echo ERROR exist subdir with / and quotes not working ) +if not exist "" ( + echo exist empty string works +) else ( + echo exist empty string broken +) del foo subdir\bar rd subdir diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 57e72a77387..85e734b048a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -833,6 +833,7 @@ exist subdir with \ and quotes ok exist subdir with /. ok exist subdir with / ok exist subdir with / and quotes ok +exist empty string works ------ for numbers negative numbers handled negative numbers handled

1 0

Jinoh Kang : user32/tests: Isolate window update region tests in a temporary desktop.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: fa038c3c3714cd1293e4de6aad44c1440ab845b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa038c3c3714cd1293e4de6aad44c1… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Sep 1 00:45:10 2023 +0900 user32/tests: Isolate window update region tests in a temporary desktop. Today, user32:msg window update region tests may fail if there are visible topmost windows in the current desktop, which conceals test windows and thus affects update regions. Fix this by introducing a temporary desktop to isolate fragile tests in. Take a precaution to check for unexpected USER environment. user32 tests are often hard to debug due to its graphical nature, especially in batch WineTest runs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55465 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55374 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54202 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53891 --- dlls/user32/tests/msg.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b4a5410622c..53f8953902a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9706,6 +9706,155 @@ static void test_hvredraw(void) DestroyWindow( htoplevel ); } +struct run_in_temp_desktop_args +{ + const char *file; + int line; + const char *name; + void (*test_func)(void); +}; + +static DWORD WINAPI run_in_temp_desktop_thread_func(LPVOID param) +{ + HDESK prev_thr_desktop, prev_inp_desktop, post_inp_desktop, temp_desktop; + char temp_desktop_name[1024], curr_desktop_name[1024]; + struct run_in_temp_desktop_args *args = param; + const char *file = args->file; + int line = args->line; + LARGE_INTEGER qpc; + DWORD length; + int result; + + result = QueryPerformanceCounter( &qpc ); + ok_(file, line)( result, "QueryPerformanceCounter error %lu\n", GetLastError() ); + + /* + * Temporary desktops from previous runs may leak due to a Windows bug. + * Generate a unique name that is unlikely to collide with previous runs. + */ + result = snprintf( temp_desktop_name, ARRAY_SIZE(temp_desktop_name), + "WineTest-%08lX-%08lX-%08lX%08lX-%s", + GetCurrentProcessId(), GetCurrentThreadId(), + qpc.HighPart, qpc.LowPart, args->name ); + ok_(file, line)( result > 0 && result < ARRAY_SIZE(temp_desktop_name), + "sprintf returned %d (out of memory, or name too long?)\n", result ); + + if (winetest_debug > 1) + trace_(file, line)( "creating desktop: %s\n", debugstr_a( temp_desktop_name ) ); + + temp_desktop = CreateDesktopA( temp_desktop_name, NULL, NULL, 0, GENERIC_ALL, NULL ); + ok_(file, line)( temp_desktop != NULL, "CreateDesktopA(%s, ..) error %lu\n", + debugstr_a( temp_desktop_name ), GetLastError() ); + + prev_inp_desktop = OpenInputDesktop( 0, FALSE, DESKTOP_SWITCHDESKTOP ); + ok_(file, line)( prev_inp_desktop != NULL, "OpenInputDesktop [prev] error %lu\n", GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "sanity check: no concurrent WineTest desktop\n" ); + + /* + * Check if the desktop has not been properly restored. This is done to + * avoid any possible hard-to-debug failures due to unexpected desktop. + */ + result = GetUserObjectInformationA( prev_inp_desktop, UOI_NAME, + curr_desktop_name, sizeof(curr_desktop_name), &length ); + ok_(file, line)( result, "GetUserObjectInformationA error %lu [rl = %lu]\n", + GetLastError(), length ); + ok_(file, line)( _strnicmp( curr_desktop_name, temp_desktop_name, 8 ) != 0, + "unexpected input desktop name %s (concurrent WineTest run?)\n", + debugstr_a( curr_desktop_name ) ); + + if (winetest_debug > 1) + trace_(file, line)( "switching desktop to: %s (%p)\n", debugstr_a( temp_desktop_name ), temp_desktop ); + + result = SwitchDesktop( temp_desktop ); + ok_(file, line)( result, "SwitchDesktop(temp_desktop=%p) error %lu\n", + temp_desktop, GetLastError() ); + + prev_thr_desktop = GetThreadDesktop( GetCurrentThreadId() ); + ok_(file, line)( prev_thr_desktop != NULL, "GetThreadDesktop error %lu\n", GetLastError() ); + + result = SetThreadDesktop( temp_desktop ); + ok_(file, line)( result, "SetThreadDesktop(temp_desktop=%p) error %lu\n", + temp_desktop, GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "running test function %s()\n", args->name ); + + args->test_func(); + + if (winetest_debug > 1) + trace_(file, line)( "sanity check: input desktop has not been changed\n" ); + + /* + * Check if the input desktop has been tampered with. This is done to + * avoid any possible hard-to-debug failures due to unexpected desktop. + */ + post_inp_desktop = OpenInputDesktop( 0, FALSE, DESKTOP_ENUMERATE ); + ok_(file, line)( post_inp_desktop != NULL, "OpenInputDesktop [post] error %lu\n", GetLastError() ); + + result = GetUserObjectInformationA( post_inp_desktop, UOI_NAME, + curr_desktop_name, sizeof(curr_desktop_name), &length ); + ok_(file, line)( result, "GetUserObjectInformationA(post_inp_desktop=%p) error %lu [rl = %lu]\n", + post_inp_desktop, GetLastError(), length ); + todo_wine + ok_(file, line)( strcmp( curr_desktop_name, temp_desktop_name ) == 0, + "different desktop name: %s != %s (no switch or concurrent WineTest run?)\n", + debugstr_a( curr_desktop_name ), debugstr_a( temp_desktop_name ) ); + + result = CloseDesktop( post_inp_desktop ); + ok_(file, line)( result, "CloseDesktop(post_inp_desktop=%p) error %lu\n", + post_inp_desktop, GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "restoring previous desktop\n" ); + + result = SetThreadDesktop( prev_thr_desktop ); + ok_(file, line)( result || broken( GetLastError() == ERROR_BUSY ) /* == W10 */, + "SetThreadDesktop(prev_thr_desktop=%p) error %lu\n", + prev_thr_desktop, GetLastError() ); + + result = SwitchDesktop( prev_inp_desktop ); + ok_(file, line)( result, "SwitchDesktop(prev_inp_desktop=%p) error %lu\n", + prev_inp_desktop, GetLastError() ); + + result = CloseDesktop( prev_inp_desktop ); + ok_(file, line)( result, "CloseDesktop(prev_inp_desktop=%p) error %lu\n", + prev_inp_desktop, GetLastError() ); + + if (winetest_debug > 1) + trace_(file, line)( "closing desktop: %s (%p)\n", debugstr_a( temp_desktop_name ), temp_desktop ); + + result = CloseDesktop( temp_desktop ); + ok_(file, line)( result || broken( GetLastError() == ERROR_BUSY ) /* == W10 */, + "CloseDesktop(temp_desktop=%p) error %lu\n", + temp_desktop, GetLastError() ); + + return 0; +} + +#define run_in_temp_desktop(f) run_in_temp_desktop_(__FILE__, __LINE__, #f, f) +static void run_in_temp_desktop_(const char *file, int line, const char *name, void (*test_func)(void)) +{ + struct run_in_temp_desktop_args args; + HANDLE thread; + DWORD result; + + args.file = file; + args.line = line; + args.name = name; + args.test_func = test_func; + + thread = CreateThread( NULL, 0, run_in_temp_desktop_thread_func, &args, 0, NULL ); + ok_(file, line)( thread != NULL, "CreateThread error %lu\n", GetLastError() ); + + result = WaitForSingleObject( thread, INFINITE ); + ok_(file, line)( result == WAIT_OBJECT_0, "WaitForSingleObject returned %lu, error %lu\n", + result, GetLastError() ); + + CloseHandle( thread ); +} + struct wnd_event { HWND hwnd; @@ -19893,10 +20042,10 @@ START_TEST(msg) test_combobox_messages(); test_wmime_keydown_message(); test_paint_messages(); - test_swp_paint_regions(); - test_swp_paint_region_on_show(); - test_swp_paint_region_on_extend_zerosize(); - test_hvredraw(); + run_in_temp_desktop(test_swp_paint_regions); + run_in_temp_desktop(test_swp_paint_region_on_show); + run_in_temp_desktop(test_swp_paint_region_on_extend_zerosize); + run_in_temp_desktop(test_hvredraw); test_interthread_messages(); test_message_conversion(); test_accelerators();

1 0

Billy Laws : include: Add CHPEV2 CPU area definitions.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 23736e69ce7b70af74c441a23530483ff7fa1d0a URL: https://gitlab.winehq.org/wine/wine/-/commit/23736e69ce7b70af74c441a2353048… Author: Billy Laws <blaws05(a)gmail.com> Date: Sun Sep 3 15:44:17 2023 +0100 include: Add CHPEV2 CPU area definitions. --- include/winternl.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index bb0eee70ef3..d3537cc774d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -296,6 +296,19 @@ typedef struct _TEB_FLS_DATA void **fls_data_chunks[8]; } TEB_FLS_DATA, *PTEB_FLS_DATA; +typedef struct _CHPE_V2_CPU_AREA_INFO +{ + BOOLEAN InSimulation; /* 000 */ + BOOLEAN InSyscallCallback; /* 001 */ + ULONG64 EmulatorStackBase; /* 008 */ + ULONG64 EmulatorStackLimit; /* 010 */ + ARM64EC_NT_CONTEXT *ContextAmd64; /* 018 */ + ULONG *SuspendDoorbell; /* 020 */ + ULONG64 LoadingModuleModflag; /* 028 */ + void *EmulatorData[4]; /* 030 */ + ULONG64 EmulatorDataInline; /* 050 */ +} CHPE_V2_CPU_AREA_INFO, *PCHPE_V2_CPU_AREA_INFO; + #define TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED 0x00000001 #define TEB_ACTIVE_FRAME_FLAG_EXTENDED 0x00000001 @@ -507,7 +520,10 @@ typedef struct _TEB PVOID ThreadPoolData; /* f90/1778 */ PVOID *TlsExpansionSlots; /* f94/1780 */ #ifdef _WIN64 - PVOID DeallocationBStore; /* /1788 */ + union { + PVOID DeallocationBStore; /* /1788 */ + CHPE_V2_CPU_AREA_INFO *ChpeV2CpuAreaInfo; /* /1788 */ + } DUMMYUNIONNAME; PVOID BStoreLimit; /* /1790 */ #endif ULONG MuiGeneration; /* f98/1798 */ @@ -1140,7 +1156,10 @@ typedef struct _TEB64 ULONG64 ReservedForCodeCoverage; /* 1770 */ ULONG64 ThreadPoolData; /* 1778 */ ULONG64 TlsExpansionSlots; /* 1780 */ - ULONG64 DeallocationBStore; /* 1788 */ + union { + ULONG64 DeallocationBStore; /* 1788 */ + ULONG64 ChpeV2CpuAreaInfo; /* 1788 */ + } DUMMYUNIONNAME; ULONG64 BStoreLimit; /* 1790 */ ULONG MuiGeneration; /* 1798 */ ULONG IsImpersonating; /* 179c */

1 0

Alex Henrie : mpr: Use CRT allocation functions.
by Alexandre Julliard Sept. 4, 2023

Sept. 4, 2023

Module: wine Branch: master Commit: 61c5d2a0e303cda1ccd4c3fcadb2a1853ff8e121 URL: https://gitlab.winehq.org/wine/wine/-/commit/61c5d2a0e303cda1ccd4c3fcadb2a1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Aug 28 23:53:29 2023 -0600 mpr: Use CRT allocation functions. --- dlls/mpr/mpr_main.c | 13 ++---- dlls/mpr/pwcache.c | 12 ++--- dlls/mpr/wnet.c | 124 +++++++++++++++++++++++++--------------------------- 3 files changed, 69 insertions(+), 80 deletions(-)

1 0