September 2023 - Wine-commits

Hans Leidekker : webservices/tests: Fully initialize xmlstr.
by Alexandre Julliard 04 Sep '23

04 Sep '23

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 04 Sep '23

04 Sep '23

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

Dmitry Timoshkov : dnsapi: Accept name records of exact size at the end of the packet.
by Alexandre Julliard 04 Sep '23

04 Sep '23

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

Dmitry Timoshkov : dnsapi: Set correct wDataLength for DNS_TYPE_SRV records.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 0cc49f360a1b5d0e130d37446452f1752147a798 URL: https://gitlab.winehq.org/wine/wine/-/commit/0cc49f360a1b5d0e130d37446452f1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 1 14:48:23 2023 +0300 dnsapi: Set correct wDataLength for DNS_TYPE_SRV records. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dnsapi/record.c | 4 ++++ dlls/dnsapi/tests/record.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index cfd55a44852..1b4cbfeac0f 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -1046,6 +1046,10 @@ static DNS_STATUS extract_rdata( const BYTE *base, const BYTE *end, const BYTE * if (!get_name( base, end, pos, name )) return DNS_ERROR_BAD_PACKET; if (!(r->Data.SRV.pNameTarget = strdupX( name, in, out ))) return ERROR_NOT_ENOUGH_MEMORY; r->wDataLength = sizeof(DNS_SRV_DATAA); + if (out == DnsCharSetUnicode) + r->wDataLength += (wcslen( (const WCHAR *)r->Data.SRV.pNameTarget ) + 1) * sizeof(WCHAR); + else + r->wDataLength += strlen( r->Data.SRV.pNameTarget ) + 1; break; case DNS_TYPE_HINFO: diff --git a/dlls/dnsapi/tests/record.c b/dlls/dnsapi/tests/record.c index 340d10f6024..d340c064554 100644 --- a/dlls/dnsapi/tests/record.c +++ b/dlls/dnsapi/tests/record.c @@ -230,7 +230,6 @@ static void test_DnsExtractRecordsFromMessage(void) 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 ); @@ -250,7 +249,6 @@ static void test_DnsExtractRecordsFromMessage(void) 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 );

1 0

Jeff Smith : xaudio2/tests: Improve IID_IXAudio2 interface version checking.
by Alexandre Julliard 04 Sep '23

04 Sep '23

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

Paul Gofman : ntdll/tests: Add tests for RtlGetFullPathName_U and RtlDosPathNameToNtPathName_U with mask.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 9e04cd31bcfacbfbccf1f0c9525493189710e8de URL: https://gitlab.winehq.org/wine/wine/-/commit/9e04cd31bcfacbfbccf1f0c9525493… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 30 12:19:48 2023 -0600 ntdll/tests: Add tests for RtlGetFullPathName_U and RtlDosPathNameToNtPathName_U with mask. --- dlls/ntdll/tests/path.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9210cfb8843..4771a3f588b 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -306,6 +306,9 @@ static void test_RtlGetFullPathName_U(void) { "c:/test../file", "c:\\test.\\file", "file", "c:\\test..\\file", "file"}, /* vista */ { "c:\\test", "c:\\test", "test"}, + { "c:\\test\\*.", "c:\\test\\*", "*"}, + { "c:\\test\\a*b.*", "c:\\test\\a*b.*", "a*b.*"}, + { "c:\\test\\a*b*.", "c:\\test\\a*b*", "a*b*"}, { "C:\\test", "C:\\test", "test"}, { "c:/", "c:\\", NULL}, { "c:.", "C:\\windows", "windows"}, @@ -441,6 +444,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) tests[] = { {L"c:\\", L"\\??\\c:\\", -1}, + {L"c:\\test\\*.", L"\\??\\c:\\test\\*", 12}, {L"c:/", L"\\??\\c:\\", -1}, {L"c:/foo", L"\\??\\c:\\foo", 7}, {L"c:/foo.", L"\\??\\c:\\foo", 7},

1 0

Paul Gofman : ntdll/tests: Test NtQueryDirectoryFile with wildcards.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 98c929d73e684f42c5d77044e7fa2fe27d4c5cec URL: https://gitlab.winehq.org/wine/wine/-/commit/98c929d73e684f42c5d77044e7fa2f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 30 13:19:51 2023 -0600 ntdll/tests: Test NtQueryDirectoryFile with wildcards. --- dlls/ntdll/tests/directory.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 3b9cd693c3e..7210c1bbaa3 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -70,6 +70,7 @@ static struct testfile_s { { 0, FILE_ATTRIBUTE_NORMAL, {0xe9,'a','.','t','m','p'}, "normal" }, { 0, FILE_ATTRIBUTE_NORMAL, {0xc9,'b','.','t','m','p'}, "normal" }, { 0, FILE_ATTRIBUTE_NORMAL, {'e','a','.','t','m','p'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'e','a'}, "normal" }, { 0, FILE_ATTRIBUTE_DIRECTORY, {'.'}, ". directory" }, { 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" } }; @@ -237,13 +238,13 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char } ok(numfiles < max_test_dir_size, "too many loops\n"); - if (mask) + if (mask && !wcspbrk( mask->Buffer, L"*?" )) for (i = 0; i < test_dir_count; i++) ok(testfiles[i].nfound == (testfiles[i].name == mask->Buffer), "Wrong number %d of %s files found (single_entry=%d,mask=%s)\n", testfiles[i].nfound, testfiles[i].description, single_entry, wine_dbgstr_wn(mask->Buffer, mask->Length/sizeof(WCHAR) )); - else + else if (!mask) for (i = 0; i < test_dir_count; i++) ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (single_entry=%d,restart=%d)\n", testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); @@ -448,11 +449,27 @@ static void test_NtQueryDirectoryFile_classes( HANDLE handle, UNICODE_STRING *ma static void test_NtQueryDirectoryFile(void) { + static const struct + { + const WCHAR *mask; + int found[ARRAY_SIZE(testfiles)]; + BOOL todo_missing; + } + mask_tests[] = + { + {L"*.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, TRUE}, + {L"*.*", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}, TRUE}, + {L"*.**", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1}, TRUE}, + {L"*", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"**", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"??.???", {0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0}}, + }; + OBJECT_ATTRIBUTES attr; UNICODE_STRING ntdirname, mask; char testdirA[MAX_PATH], buffer[MAX_PATH]; WCHAR testdirW[MAX_PATH]; - int i; + int i, j; IO_STATUS_BLOCK io; WCHAR short_name[12]; UINT data_size; @@ -494,6 +511,19 @@ static void test_NtQueryDirectoryFile(void) test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, TRUE, FALSE); } + for (i = 0; i < ARRAY_SIZE(mask_tests); ++i) + { + winetest_push_context("mask %s", debugstr_w(mask_tests[i].mask)); + RtlInitUnicodeString(&mask, mask_tests[i].mask); + test_flags_NtQueryDirectoryFile(&attr, testdirA, &mask, FALSE, TRUE); + for (j = 0; j < test_dir_count; j++) + { + todo_wine_if(mask_tests[i].todo_missing && !mask_tests[i].found[j]) + ok(testfiles[j].nfound == mask_tests[i].found[j], "%S, got %d.\n", testfiles[j].name, testfiles[j].nfound); + } + winetest_pop_context(); + } + /* short path passed as mask */ status = pNtOpenFile(&dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT | FILE_DIRECTORY_FILE);

1 0

Paul Gofman : kernel32/tests: Add more tests for FindFirstFile with wildcards.
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 6f3c76c9a576b2e3c424124aa586b8f8858426c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f3c76c9a576b2e3c424124aa586b8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Aug 31 11:59:14 2023 -0600 kernel32/tests: Add more tests for FindFirstFile with wildcards. --- dlls/kernel32/tests/file.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 22137dbc79a..0918651bc1c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2963,38 +2963,43 @@ static void test_FindFirstFile_wildcards(void) int i; static const char* files[] = { "..a", "..a.a", ".a", ".a..a", ".a.a", ".aaa", - "a", "a..a", "a.a", "a.a.a", "aa", "aaa", "aaaa" + "a", "a..a", "a.a", "a.a.a", "aa", "aaa", "aaaa", " .a" }; static const struct { int todo; const char *pattern, *result; } tests[] = { - {0, "*.*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, - {0, "*.*.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*.*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, + {0, "*.*.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {0, ".*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, - {0, "*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {0, ".*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, {1, "*.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {0, "*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {1, "*..*", ", '.', '..', '..a', '..a.a', '.a..a', 'a..a'"}, {1, "*..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, ".*.", ", '.', '..', '.a', '.aaa'"}, {0, "..*", ", '.', '..', '..a', '..a.a'"}, - {0, "**", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, - {0, "**.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, - {0, "*. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "**", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, + {0, "**.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, + {0, "*. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {1, "* .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {0, "* . ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, - {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "* . ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, + {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {0, " *..", ""}, + {1, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, + {1, "a*.", ", '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, + {0, "*a ", ", '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, + + /* a.a.a not found due to short name mismatch, a.a.a -> "AA6BF5~1.A on Windows. */ + {1, "*aa*", ", '.aaa', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, {1, "<.<.<", ", '..a', '..a.a', '.a..a', '.a.a', 'a..a', 'a.a.a'"}, - {1, "<.<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a'"}, + {1, "<.<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a', ' .a'"}, {1, ".<.<", ", '..a', '..a.a', '.a..a', '.a.a'"}, - {1, "<.<", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a'"}, + {1, "<.<", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a', ' .a'"}, {1, ".<", ", '.', '..', '.a', '.aaa'"}, {1, "<.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, "<", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, @@ -3002,8 +3007,8 @@ static void test_FindFirstFile_wildcards(void) {1, "<..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, ".<.", ", '.', '..', '.a', '.aaa'"}, {1, "..<", ", '..a'"}, - {1, "<<", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, - {1, "<<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "<<", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, + {1, "<<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa', ' .a'"}, {1, "<. ", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, {1, "< .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, "< . ", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, @@ -3019,7 +3024,7 @@ static void test_FindFirstFile_wildcards(void) {1, "??.", ", '.', '..', 'a', 'aa'"}, {1, "??. ", ", '.', '..', 'a', 'aa'"}, {1, "???.", ", '.', '..', 'a', 'aa', 'aaa'"}, - {1, "?.??.", ", '.', '..', '.a', 'a', 'a.a'"}, + {1, "?.??.", ", '.', '..', '.a', 'a', 'a.a', ' .a'"}, {1, ">", ", '.', '..', 'a'"}, {1, ">.", ", '.', '..', 'a'"}, @@ -3027,7 +3032,7 @@ static void test_FindFirstFile_wildcards(void) {1, ">>.", ", '.', '..', 'a', 'aa'"}, {1, ">>. ", ", '.', '..', 'a', 'aa'"}, {1, ">>>.", ", '.', '..', 'a', 'aa', 'aaa'"}, - {1, ">.>>.", ", '.', '..', '.a', 'a.a'"}, + {1, ">.>>.", ", '.', '..', '.a', 'a.a', ' .a'"}, }; CreateDirectoryA("test-dir", NULL);

1 0

Paul Gofman : kernelbase: Duplicate file name matching code for FindNextFileW().
by Alexandre Julliard 04 Sep '23

04 Sep '23

Module: wine Branch: master Commit: 68fecd77eb103b6a6cfa53f8de559fb28b29b7b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/68fecd77eb103b6a6cfa53f8de559f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Aug 30 16:10:44 2023 -0600 kernelbase: Duplicate file name matching code for FindNextFileW(). --- dlls/kernelbase/file.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 93 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 29d005e0e28..e4d9a1d70c1 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -58,6 +58,7 @@ typedef struct UINT data_pos; /* current position in dir data */ UINT data_len; /* length of dir data */ UINT data_size; /* size of data buffer, or 0 when everything has been read */ + WCHAR *mask; /* mask string to match if wildcards are used */ BYTE data[1]; /* directory data */ } FIND_FIRST_INFO; @@ -1124,7 +1125,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; - DWORD size, device = 0; + DWORD size, mask_size = 0, device = 0; TRACE( "%s %d %p %d %p %lx\n", debugstr_w(filename), level, data, search_op, filter, flags ); @@ -1186,10 +1187,15 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ { nt_name.Length = (mask - nt_name.Buffer) * sizeof(WCHAR); has_wildcard = wcspbrk( mask, L"*?" ) != NULL; - size = has_wildcard ? 8192 : max_entry_size; + if (has_wildcard) + { + size = 8192; + mask_size = (lstrlenW( mask ) + 1) * sizeof(*mask); + } + else size = max_entry_size; } - if (!(info = HeapAlloc( GetProcessHeap(), 0, offsetof( FIND_FIRST_INFO, data[size] )))) + if (!(info = HeapAlloc( GetProcessHeap(), 0, offsetof( FIND_FIRST_INFO, data[size + mask_size] )))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); goto error; @@ -1233,6 +1239,13 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ info->data_size = size; info->search_op = search_op; info->level = level; + if (mask_size) + { + info->mask = (WCHAR *)(info->data + size); + memcpy( info->mask, mask, mask_size ); + mask = NULL; + } + else info->mask = NULL; if (device) { @@ -1250,7 +1263,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_ RtlInitUnicodeString( &mask_str, mask ); status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, - FileBothDirectoryInformation, FALSE, &mask_str, TRUE ); + FileBothDirectoryInformation, FALSE, has_wildcard ? NULL : &mask_str, TRUE ); if (status) { FindClose( info ); @@ -1333,6 +1346,74 @@ BOOL WINAPI DECLSPEC_HOTPATCH FindNextFileA( HANDLE handle, WIN32_FIND_DATAA *da } +/*********************************************************************** + * match_filename + * + * Check if the file name matches mask containing wildcards. + */ +static BOOL match_filename( const WCHAR *name, int length, const WCHAR *mask ) +{ + BOOL mismatch; + const WCHAR *name_end = name + length; + const WCHAR *mask_end = mask + lstrlenW( mask ); + const WCHAR *lastjoker = NULL; + const WCHAR *next_to_retry = NULL; + + while (name < name_end && mask < mask_end) + { + switch(*mask) + { + case '*': + mask++; + while (mask < mask_end && *mask == '*') mask++; + if (mask == mask_end) return TRUE; /* end of mask is all '*', so match */ + lastjoker = mask; + + /* skip to the next match after the joker(s) */ + while (name < name_end && towupper( *name ) != towupper( *mask )) name++; + next_to_retry = name; + break; + case '?': + case '>': + mask++; + name++; + break; + default: + mismatch = towupper( *mask ) != towupper( *name ); + + if (!mismatch) + { + mask++; + name++; + if (mask == mask_end) + { + if (name == name_end) return TRUE; + if (lastjoker) mask = lastjoker; + } + } + else /* mismatch ! */ + { + if (lastjoker) /* we had an '*', so we can try unlimitedly */ + { + mask = lastjoker; + + /* this scan sequence was a mismatch, so restart + * 1 char after the first char we checked last time */ + next_to_retry++; + name = next_to_retry; + } + else return FALSE; + } + break; + } + } + + while (mask < mask_end && (*mask == '.' || *mask == '*')) + mask++; + return (name == name_end && mask == mask_end); +} + + /****************************************************************************** * FindNextFileW (kernelbase.@) */ @@ -1392,6 +1473,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *da dir_info->FileName[0] == '.' && dir_info->FileName[1] == '.') continue; } + if (info->mask) + { + if (!match_filename( dir_info->FileName, dir_info->FileNameLength / sizeof(WCHAR), info->mask ) + && (!dir_info->ShortNameLength + || !match_filename( dir_info->ShortName, dir_info->ShortNameLength / sizeof(WCHAR), info->mask ))) + continue; + } + data->dwFileAttributes = dir_info->FileAttributes; data->ftCreationTime = *(FILETIME *)&dir_info->CreationTime; data->ftLastAccessTime = *(FILETIME *)&dir_info->LastAccessTime;

1 0

Paul Gofman : kernelbase: Get unprocessed mask in FindFirstFileExW().
by Alexandre Julliard 04 Sep '23

04 Sep '23

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