August 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : kernel32/nls: Generate some plausible data for LOCALE_SNATIVEDISPLAYNAME.
by Alexandre Julliard 24 Aug '11

24 Aug '11

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d165ff6612427a61ea82ece27d0ba061a3edb597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165ff6612427a61ea82ece27… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Aug 23 21:35:19 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/po/lt.po b/po/lt.po index d6838af..75554ac 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-01 21:57+0300\n" +"PO-Revision-Date: 2011-08-23 21:32+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8765,13 +8765,12 @@ msgstr "" "Prašome naudoti kitą tekstų rengyklę." #: notepad.rc:81 -#, fuzzy msgid "" "You did not enter any text.\n" "Please type something and try again." msgstr "" "Jūs neįvedėte jokio teksto.\n" -"Prašome ką nors įvesti ir mėginti dar kartą" +"Prašome ką nors įvesti ir mėginti dar kartą." #: notepad.rc:83 msgid "" @@ -8861,21 +8860,19 @@ msgstr "&CoCreateInstance žymos bitai" #: oleview.rc:41 msgid "&In-process server" -msgstr "" +msgstr "&Serveris procese" #: oleview.rc:42 msgid "In-process &handler" -msgstr "" +msgstr "&Doroklė procese" #: oleview.rc:43 -#, fuzzy msgid "&Local server" -msgstr "Vietinė klaida" +msgstr "&Vietinis serveris" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "Pa&šalinti" +msgstr "&Nutolęs serveris" #: oleview.rc:47 msgid "View &Type information" @@ -9020,21 +9017,19 @@ msgstr "Parodo programos informaciją, versijos numerį ir autoriaus teises" #: oleview.rc:113 msgid "Ask for an in-process server when calling CoGetClassObject" -msgstr "" +msgstr "Prašyti serverio procese, kai kreipiamasi į CoGetClassObject" #: oleview.rc:114 msgid "Ask for an in-process handler when calling CoGetClassObject" -msgstr "" +msgstr "Prašyti doroklės procese, kai kreipiamasi į CoGetClassObject" #: oleview.rc:115 -#, fuzzy msgid "Ask for a local server when calling CoGetClassObject" -msgstr "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" +msgstr "Prašyti vietinio serverio, kai kreipiamasi į CoGetClassObject" #: oleview.rc:116 -#, fuzzy msgid "Ask for a remote server when calling CoGetClassObject" -msgstr "Naudoti CLSCTX_LOCAL_SERVER iškviečiant CoGetClassObject" +msgstr "Prašyti nutolusio serverio, kai kreipiamasi į CoGetClassObject" #: oleview.rc:128 msgid "ObjectClasses"

1 0

Frédéric Delanoy : cmd: Fix ECHO tab issues.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 6572de3cfa5099f90bc1f6376f05f60828960711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6572de3cfa5099f90bc1f6376… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 23 22:54:49 2011 +0200 cmd: Fix ECHO tab issues. --- programs/cmd/builtins.c | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cc3f5f6..c4ad231 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -864,7 +864,7 @@ void WCMD_echo (const WCHAR *command) { int count; const WCHAR *origcommand = command; - if (command[0]==' ' || command[0]=='.' || command[0]==':') + if (command[0]==' ' || command[0]=='\t' || command[0]=='.' || command[0]==':') command++; count = strlenW(command); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':') { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 18ba102..b86c012 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -52,13 +52,13 @@ word(a)space@@space@ word @pwd@>echo(a)tab@word(a)space@ -(a)todo_wine@word +word @pwd@>echo(a)tab@word(a)space@@tab@@space@ -(a)todo_wine@word(a)space@@tab@ +word(a)space@@tab@ @pwd@>echo(a)tab@word(a)tab@@space@@space@ -(a)todo_wine@word(a)tab@@space@ +word(a)tab@@space@ @todo_wine@@pwd@>echo word(a)space@ word @@ -70,7 +70,7 @@ word @space@@tab(a)word @pwd@>echo(a)tab@@tab(a)word@space@ -(a)todo_wine@@tab(a)word +(a)tab@word ------------ Testing 'echo' [OFF] -------------- word 'singlequotedword' @@ -88,13 +88,13 @@ word word(a)space@ word(a)space@@space@ word -(a)todo_wine@word -(a)todo_wine@word(a)space@@tab@ -(a)todo_wine@word(a)tab@@space@ +word +word(a)space@@tab@ +word(a)tab@@space@ word @tab(a)word @space@@tab(a)word -(a)todo_wine@@tab(a)word +(a)tab@word ------------ Testing redirection operators -------------- ...stdout redirection foo

1 0

Hans Leidekker : dnsapi: Implement DnsFree.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 8a29a4a66776a1d8bb963d4092cb7d6a9af0b932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a29a4a66776a1d8bb963d409… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:23:04 2011 +0200 dnsapi: Implement DnsFree. --- dlls/dnsapi/dnsapi.spec | 1 + dlls/dnsapi/record.c | 9 +++++++++ include/windns.h | 1 + 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index bb14f4b..2fb6846 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -35,6 +35,7 @@ @ stub DnsFlushResolverCacheEntry_A @ stub DnsFlushResolverCacheEntry_UTF8 @ stub DnsFlushResolverCacheEntry_W +@ stdcall DnsFree(ptr long) @ stub DnsFreeAdapterInformation @ stub DnsFreeNetworkInformation @ stub DnsFreeSearchInformation diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 15efbf1..e9252ef 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -640,6 +640,15 @@ VOID WINAPI DnsRecordListFree( PDNS_RECORD list, DNS_FREE_TYPE type ) } /****************************************************************************** + * DnsFree [DNSAPI.@] + * + */ +void WINAPI DnsFree( PVOID data, DNS_FREE_TYPE type ) +{ + return DnsRecordListFree( data, type ); +} + +/****************************************************************************** * DnsRecordSetCompare [DNSAPI.@] * */ diff --git a/include/windns.h b/include/windns.h index 205f30d..b8a3e09 100644 --- a/include/windns.h +++ b/include/windns.h @@ -619,6 +619,7 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) DNS_STATUS WINAPI DnsExtractRecordsFromMessage_W(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORDW*); DNS_STATUS WINAPI DnsExtractRecordsFromMessage_UTF8(PDNS_MESSAGE_BUFFER,WORD,PDNS_RECORDA*); +VOID WINAPI DnsFree(PVOID,DNS_FREE_TYPE); DNS_STATUS WINAPI DnsModifyRecordsInSet_A(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsModifyRecordsInSet_W(PDNS_RECORDW,PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsModifyRecordsInSet_UTF8(PDNS_RECORDA,PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID);

1 0

Hans Leidekker : gdi32/tests: Accept one more return value from EnumICMProfilesA.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 58cdb6405f9bb4f203fb4deb7cee823637509b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cdb6405f9bb4f203fb4deb7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:23:21 2011 +0200 gdi32/tests: Accept one more return value from EnumICMProfilesA. --- dlls/gdi32/tests/icm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 86f173a..65ce208 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -184,8 +184,8 @@ static void test_EnumICMProfilesA( HDC dc ) ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesA( dc, enum_profiles_callbackA, 0 ); - ok(ret == -1 || broken(ret == 0) /* nt4 */, - "expected -1, got %d\n", ret); + ok(ret == -1 || ret == 1 || broken(ret == 0) /* nt4 */, + "expected -1 or 1, got %d\n", ret); ret = EnumICMProfilesA( dc, NULL, 0 ); ok(ret == -1 || broken(ret == 0) /* nt4 */, "expected -1, got %d\n", ret); @@ -207,7 +207,7 @@ static void test_EnumICMProfilesW( HDC dc ) ok(ret == -1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret); ret = EnumICMProfilesW( dc, enum_profiles_callbackW, 0 ); - ok(ret == -1 || ret == 1 || broken(ret == 0) /* NT4 */, "expected -1, got %d\n", ret); + ok(ret == -1 || ret == 1 || broken(ret == 0) /* NT4 */, "expected -1 or 1, got %d\n", ret); } static void test_SetICMProfileA( HDC dc )

1 0

Hans Leidekker : winhttp: Support setting the WinHttpRequestOption_EnableRedirects option.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 1d0397d1516876d240eba7f399b261605e70b410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d0397d1516876d240eba7f39… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 24 10:53:22 2011 +0200 winhttp: Support setting the WinHttpRequestOption_EnableRedirects option. --- dlls/winhttp/request.c | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 97d10a3..a3c2207 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2175,6 +2175,7 @@ struct winhttp_request DWORD bytes_read; DWORD error; DWORD logon_policy; + DWORD disable_feature; LONG resolve_timeout; LONG connect_timeout; LONG send_timeout; @@ -2479,6 +2480,8 @@ static void initialize_request( struct winhttp_request *request ) request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; + request->disable_feature = WINHTTP_DISABLE_AUTHENTICATION; request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; request->proxy.lpszProxy = NULL; request->proxy.lpszProxyBypass = NULL; @@ -2507,7 +2510,7 @@ static HRESULT WINAPI winhttp_request_Open( HINTERNET hsession = NULL, hconnect = NULL, hrequest; URL_COMPONENTS uc; WCHAR *hostname, *path = NULL, *verb = NULL; - DWORD err = ERROR_OUTOFMEMORY, len, flags = 0, request_flags = 0, disable_flags; + DWORD err = ERROR_OUTOFMEMORY, len, flags = 0, request_flags = 0; TRACE("%p, %s, %s, %s\n", request, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -2559,12 +2562,6 @@ static HRESULT WINAPI winhttp_request_Open( err = get_last_error(); goto error; } - disable_flags = WINHTTP_DISABLE_AUTHENTICATION; - if (!WinHttpSetOption( hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &disable_flags, sizeof(disable_flags) )) - { - err = get_last_error(); - goto error; - } if (flags & WINHTTP_FLAG_ASYNC) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2851,6 +2848,11 @@ static HRESULT request_send( struct winhttp_request *request ) { return HRESULT_FROM_WIN32( get_last_error() ); } + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_DISABLE_FEATURE, &request->disable_feature, + sizeof(request->disable_feature) )) + { + return HRESULT_FROM_WIN32( get_last_error() ); + } if (!WinHttpSetTimeouts( request->hrequest, request->resolve_timeout, request->connect_timeout, @@ -3127,8 +3129,29 @@ static HRESULT WINAPI winhttp_request_put_Option( WinHttpRequestOption option, VARIANT value ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + HRESULT hr = S_OK; + + TRACE("%p, %u, %s\n", request, option, debugstr_variant(&value)); + + EnterCriticalSection( &request->cs ); + switch (option) + { + case WinHttpRequestOption_EnableRedirects: + { + if (V_BOOL( &value )) + request->disable_feature &= ~WINHTTP_DISABLE_REDIRECTS; + else + request->disable_feature |= WINHTTP_DISABLE_REDIRECTS; + break; + } + default: + FIXME("unimplemented option %u\n", option); + hr = E_NOTIMPL; + break; + } + LeaveCriticalSection( &request->cs ); + return hr; } /* critical section must be held */

1 0

Thomas Faber : user32/tests: Fix build with MSVC.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 37f12af5c84bc8ddca793b2623353ce122b8ca3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37f12af5c84bc8ddca793b262… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Aug 24 10:46:54 2011 +0200 user32/tests: Fix build with MSVC. --- dlls/user32/tests/cursoricon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index ddf37ef..c874924 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -185,8 +185,8 @@ typedef struct { 0, /* biYPelsPerMeter */ \ 0, /* biClrUsed */ \ 0 /* biClrImportant */ \ - }, \ - { /* DIB data: left uninitialized */ } \ + } \ + /* DIB data: left uninitialized */ \ } \ }

1 0

Scott Ritchie : shlwapi/tests: Fix an errant comment.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: d38909dade16571fa22033e499b305f18807b073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d38909dade16571fa22033e49… Author: Scott Ritchie <scott(a)open-vote.org> Date: Tue Aug 23 06:51:31 2011 -0700 shlwapi/tests: Fix an errant comment. --- dlls/shlwapi/tests/string.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 3628f86..1488e58 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -135,7 +135,7 @@ static const StrFormatSizeResult StrFormatSize_results[] = { { 0, NULL, NULL } }; -/* StrFormatByteSize64/StrFormatKBSize results */ +/* StrFromTimeIntervalA/StrFromTimeIntervalW results */ typedef struct tagStrFromTimeIntervalResult { DWORD ms;

1 0

Grazvydas Ignotas : ntdll/tests: Test NtQueryDirectoryFile with different ReturnSingleEntry and RestartScan flags .
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: fbf537fb60841118697490bcf96fc622efe286bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf537fb60841118697490bcf… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Thu Aug 4 23:24:48 2011 +0300 ntdll/tests: Test NtQueryDirectoryFile with different ReturnSingleEntry and RestartScan flags. --- dlls/ntdll/tests/directory.c | 106 +++++++++++++++++++++++++---------------- 1 files changed, 65 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 56840b5..b32c22a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -51,7 +51,8 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG * /* The attribute sets to test */ static struct testfile_s { - int todo; /* set if it doesn't work on wine yet */ + BOOL todo; /* set if it doesn't work on wine yet */ + BOOL attr_done; /* set if attributes were tested for this file already */ const DWORD attr; /* desired attribute */ const char *name; /* filename to use */ const char *target; /* what to point to (only for reparse pts) */ @@ -59,13 +60,13 @@ static struct testfile_s { int nfound; /* How many were found (expect 1) */ WCHAR nameW[20]; /* unicode version of name (filled in later) */ } testfiles[] = { - { 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, - { 1, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, - { 1, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, - { 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, - { 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, - { 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, - { 0, 0, NULL } + { 0, 0, FILE_ATTRIBUTE_NORMAL, "n.tmp", NULL, "normal" }, + { 1, 0, FILE_ATTRIBUTE_HIDDEN, "h.tmp", NULL, "hidden" }, + { 1, 0, FILE_ATTRIBUTE_SYSTEM, "s.tmp", NULL, "system" }, + { 0, 0, FILE_ATTRIBUTE_DIRECTORY, "d.tmp", NULL, "directory" }, + { 0, 0, FILE_ATTRIBUTE_DIRECTORY, ".", NULL, ". directory" }, + { 0, 0, FILE_ATTRIBUTE_DIRECTORY, "..", NULL, ".. directory" }, + { 0, 0, 0, NULL } }; static const int max_test_dir_size = 20; /* size of above plus some for .. etc */ @@ -82,7 +83,6 @@ static void set_up_attribute_test(const char *testdirA) char buf[MAX_PATH]; pRtlMultiByteToUnicodeN(testfiles[i].nameW, sizeof(testfiles[i].nameW), NULL, testfiles[i].name, strlen(testfiles[i].name)+1); - testfiles[i].nfound = 0; if (strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) continue; sprintf(buf, "%s\\%s", testdirA, testfiles[i].name); @@ -100,6 +100,14 @@ static void set_up_attribute_test(const char *testdirA) } } +static void reset_found_files(void) +{ + int i; + + for (i = 0; testfiles[i].name; i++) + testfiles[i].nfound = 0; +} + /* Remove the given test directory and the attribute test files, if any */ static void tear_down_attribute_test(const char *testdirA) { @@ -138,11 +146,14 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) int len = strlen(testfiles[i].name); if (namelen != len || memcmp(nameW, testfiles[i].nameW, len*sizeof(WCHAR))) continue; - if (testfiles[i].todo) { - todo_wine - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); - } else { - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); + if (!testfiles[i].attr_done) { + if (testfiles[i].todo) { + todo_wine + ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); + } else { + ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", testfiles[i].name, testfiles[i].description, testfiles[i].attr, attrib); + } + testfiles[i].attr_done = TRUE; } testfiles[i].nfound++; break; @@ -150,12 +161,9 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) ok(testfiles[i].name != NULL, "unexpected file found\n"); } -static void test_NtQueryDirectoryFile(void) +static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char *testdirA, + BOOLEAN single_entry, BOOLEAN restart_flag) { - OBJECT_ATTRIBUTES attr; - UNICODE_STRING ntdirname; - char testdirA[MAX_PATH]; - WCHAR testdirW[MAX_PATH]; HANDLE dirh; IO_STATUS_BLOCK io; UINT data_pos; @@ -166,31 +174,19 @@ static void test_NtQueryDirectoryFile(void) int numfiles; int i; - /* Clean up from prior aborted run, if any, then set up test files */ - ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); - strcat(testdirA, "NtQueryDirectoryFile.tmp"); - tear_down_attribute_test(testdirA); - set_up_attribute_test(testdirA); + reset_found_files(); /* Read the directory and note which files are found */ - pRtlMultiByteToUnicodeN(testdirW, sizeof(testdirW), NULL, testdirA, strlen(testdirA)+1); - if (!pRtlDosPathNameToNtPathName_U(testdirW, &ntdirname, NULL, NULL)) - { - ok(0,"RtlDosPathNametoNtPathName_U failed\n"); - goto done; - } - InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); - status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, &attr, &io, - FILE_OPEN, + status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE); ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdirA, status, GetLastError()); if (status != STATUS_SUCCESS) { skip("can't test if we can't open the directory\n"); - goto done; + return; } pNtQueryDirectoryFile( dirh, NULL, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, FALSE, NULL, FALSE ); + FileBothDirectoryInformation, single_entry, NULL, restart_flag ); ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); data_len = io.Information; ok (data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); @@ -204,7 +200,7 @@ static void test_NtQueryDirectoryFile(void) if (dir_info->NextEntryOffset == 0) { pNtQueryDirectoryFile( dirh, 0, NULL, NULL, &io, data, sizeof(data), - FileBothDirectoryInformation, FALSE, NULL, FALSE ); + FileBothDirectoryInformation, single_entry, NULL, FALSE ); if (U(io).Status == STATUS_NO_MORE_FILES) break; ok (U(io).Status == STATUS_SUCCESS, "filed to query directory; status %x\n", U(io).Status); @@ -220,17 +216,45 @@ static void test_NtQueryDirectoryFile(void) ok(numfiles < max_test_dir_size, "too many loops\n"); for (i=0; testfiles[i].name; i++) { - if (strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) { + if ((strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) && (single_entry || !restart_flag)) { todo_wine - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found\n", - testfiles[i].nfound, testfiles[i].description); + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); } else { - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found\n", - testfiles[i].nfound, testfiles[i].description); + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); } } pNtClose(dirh); +} + +static void test_NtQueryDirectoryFile(void) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ntdirname; + char testdirA[MAX_PATH]; + WCHAR testdirW[MAX_PATH]; + + /* Clean up from prior aborted run, if any, then set up test files */ + ok(GetTempPathA(MAX_PATH, testdirA), "couldn't get temp dir\n"); + strcat(testdirA, "NtQueryDirectoryFile.tmp"); + tear_down_attribute_test(testdirA); + set_up_attribute_test(testdirA); + + pRtlMultiByteToUnicodeN(testdirW, sizeof(testdirW), NULL, testdirA, strlen(testdirA)+1); + if (!pRtlDosPathNameToNtPathName_U(testdirW, &ntdirname, NULL, NULL)) + { + ok(0, "RtlDosPathNametoNtPathName_U failed\n"); + goto done; + } + InitializeObjectAttributes(&attr, &ntdirname, OBJ_CASE_INSENSITIVE, 0, NULL); + + test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, FALSE, FALSE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, TRUE); + test_flags_NtQueryDirectoryFile(&attr, testdirA, TRUE, FALSE); + done: tear_down_attribute_test(testdirA); pRtlFreeUnicodeString(&ntdirname);

1 0

Grazvydas Ignotas : ntdll: Use swapping method to return . and .. as first entries.
by Alexandre Julliard 24 Aug '11

24 Aug '11

Module: wine Branch: master Commit: 006413afe495fbf73542154462885e4fdbf12a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=006413afe495fbf7354215446… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Thu Aug 4 23:24:49 2011 +0300 ntdll: Use swapping method to return . and .. as first entries. --- dlls/ntdll/directory.c | 134 ++++++++++++++++++++++++++++-------------- dlls/ntdll/tests/directory.c | 13 +--- 2 files changed, 92 insertions(+), 55 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 42b3639..548189c 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1486,22 +1486,56 @@ static int read_directory_vfat( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG #endif /* VFAT_IOCTL_READDIR_BOTH */ +#ifdef USE_GETDENTS +/*********************************************************************** + * read_first_dent_name + * + * reads name of first or second dentry (if they have inodes). + */ +static char *read_first_dent_name( int which, int fd, off_t second_offs, KERNEL_DIRENT64 *de_first_two, + char *buffer, size_t size, BOOL *buffer_changed ) +{ + KERNEL_DIRENT64 *de; + int res; + + de = de_first_two; + if (de != NULL) + { + if (which == 1) + de = (KERNEL_DIRENT64 *)((char *)de + de->d_reclen); + + return de->d_ino ? de->d_name : NULL; + } + + *buffer_changed = TRUE; + lseek( fd, which == 1 ? second_offs : 0, SEEK_SET ); + res = getdents64( fd, buffer, size ); + if (res <= 0) + return NULL; + + de = (KERNEL_DIRENT64 *)buffer; + return de->d_ino ? de->d_name : NULL; +} + /*********************************************************************** * read_directory_getdents * * Read a directory using the Linux getdents64 system call; helper for NtQueryDirectoryFile. */ -#ifdef USE_GETDENTS static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, ULONG length, BOOLEAN single_entry, const UNICODE_STRING *mask, BOOLEAN restart_scan, FILE_INFORMATION_CLASS class ) { - off_t old_pos = 0; + static off_t second_entry_pos; + static struct file_identity last_dir_id; + off_t old_pos = 0, next_pos; size_t size = length; - int res, fake_dot_dot = 1; char *data, local_buffer[8192]; - KERNEL_DIRENT64 *de; + KERNEL_DIRENT64 *de, *de_first_two = NULL; union file_directory_info *info, *last_info = NULL; + const char *filename; + BOOL data_buffer_changed; + int res, swap_to; if (size <= sizeof(local_buffer) || !(data = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { @@ -1510,7 +1544,7 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U } if (restart_scan) lseek( fd, 0, SEEK_SET ); - else if (length < max_dir_info_size(class)) /* we may have to return a partial entry here */ + else { old_pos = lseek( fd, 0, SEEK_CUR ); if (old_pos == -1 && errno == ENOENT) @@ -1522,6 +1556,21 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U } io->u.Status = STATUS_SUCCESS; + de = (KERNEL_DIRENT64 *)data; + + /* if old_pos is not 0 we don't know how many entries have been returned already, + * so maintain second_entry_pos to know when to return '..' */ + if (old_pos != 0 && (last_dir_id.dev != curdir.dev || last_dir_id.ino != curdir.ino)) + { + lseek( fd, 0, SEEK_SET ); + res = getdents64( fd, data, size ); + if (res > 0) + { + second_entry_pos = de->d_off; + last_dir_id = curdir; + } + lseek( fd, old_pos, SEEK_SET ); + } res = getdents64( fd, data, size ); if (res == -1) @@ -1534,52 +1583,46 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U goto done; } - de = (KERNEL_DIRENT64 *)data; + if (old_pos == 0 && res > 0) + { + second_entry_pos = de->d_off; + last_dir_id = curdir; + if (res > de->d_reclen) + de_first_two = de; + } - if (restart_scan) + while (res > 0) { - /* check if we got . and .. from getdents */ - if (res > 0) - { - if (!strcmp( de->d_name, "." ) && res > de->d_reclen) - { - KERNEL_DIRENT64 *next_de = (KERNEL_DIRENT64 *)(data + de->d_reclen); - if (!strcmp( next_de->d_name, ".." )) fake_dot_dot = 0; - } - } - /* make sure we have enough room for both entries */ - if (fake_dot_dot) - { - const ULONG min_info_size = dir_info_size( class, 1 ) + dir_info_size( class, 2 ); - if (length < min_info_size || single_entry) - { - FIXME( "not enough room %u/%u for fake . and .. entries\n", length, single_entry ); - fake_dot_dot = 0; - } - } + res -= de->d_reclen; + next_pos = de->d_off; + filename = NULL; - if (fake_dot_dot) + /* we must return first 2 entries as "." and "..", but getdents64() + * can return them anywhere, so swap first entries with "." and ".." */ + if (old_pos == 0) + filename = "."; + else if (old_pos == second_entry_pos) + filename = ".."; + else if (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." )) { - if ((info = append_entry( buffer, io, length, ".", NULL, mask, class ))) - last_info = info; - if ((info = append_entry( buffer, io, length, "..", NULL, mask, class ))) - last_info = info; - - /* check if we still have enough space for the largest possible entry */ - if (last_info && io->Information + max_dir_info_size(class) > length) + swap_to = !strcmp( de->d_name, "." ) ? 0 : 1; + data_buffer_changed = FALSE; + + filename = read_first_dent_name( swap_to, fd, second_entry_pos, de_first_two, + data, size, &data_buffer_changed ); + if (filename != NULL && (!strcmp( filename, "." ) || !strcmp( filename, ".." ))) + filename = read_first_dent_name( swap_to ^ 1, fd, second_entry_pos, NULL, + data, size, &data_buffer_changed ); + if (data_buffer_changed) { - lseek( fd, 0, SEEK_SET ); /* reset pos to first entry */ + lseek( fd, next_pos, SEEK_SET ); res = 0; } } - } + else if (de->d_ino) + filename = de->d_name; - while (res > 0) - { - res -= de->d_reclen; - if (de->d_ino && - !(fake_dot_dot && (!strcmp( de->d_name, "." ) || !strcmp( de->d_name, ".." ))) && - (info = append_entry( buffer, io, length, de->d_name, NULL, mask, class ))) + if (filename && (info = append_entry( buffer, io, length, filename, NULL, mask, class ))) { last_info = info; if (io->u.Status == STATUS_BUFFER_OVERFLOW) @@ -1590,17 +1633,18 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U /* check if we still have enough space for the largest possible entry */ if (single_entry || io->Information + max_dir_info_size(class) > length) { - if (res > 0) lseek( fd, de->d_off, SEEK_SET ); /* set pos to next entry */ + if (res > 0) lseek( fd, next_pos, SEEK_SET ); /* set pos to next entry */ break; } } - old_pos = de->d_off; + old_pos = next_pos; /* move on to the next entry */ if (res > 0) de = (KERNEL_DIRENT64 *)((char *)de + de->d_reclen); else { res = getdents64( fd, data, size ); de = (KERNEL_DIRENT64 *)data; + de_first_two = NULL; } } diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index b32c22a..c74bf34 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -215,16 +215,9 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char } ok(numfiles < max_test_dir_size, "too many loops\n"); - for (i=0; testfiles[i].name; i++) { - if ((strcmp(testfiles[i].name, ".") == 0 || strcmp(testfiles[i].name, "..") == 0) && (single_entry || !restart_flag)) { - todo_wine - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", - testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); - } else { - ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", - testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); - } - } + for (i=0; testfiles[i].name; i++) + ok(testfiles[i].nfound == 1, "Wrong number %d of %s files found (ReturnSingleEntry=%d,RestartScan=%d)\n", + testfiles[i].nfound, testfiles[i].description, single_entry, restart_flag); pNtClose(dirh); }

1 0