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

George Stephanos : advapi32/tests: RegEnumKey and RegEnumValue tests for merged view of HKCR.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: babc0724719d9db66bfefdd6c47832c70ff4c66d URL: http://source.winehq.org/git/wine.git/?a=commit;h=babc0724719d9db66bfefdd6c… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Tue Aug 20 21:58:42 2013 +0200 advapi32/tests: RegEnumKey and RegEnumValue tests for merged view of HKCR. --- dlls/advapi32/tests/registry.c | 178 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 178 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 197ff07..bd7e4e2 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -2385,6 +2385,183 @@ static void test_classesroot(void) RegCloseKey( hkcrsub2 ); } +static void test_classesroot_enum(void) +{ + HKEY hkcu=0, hklm=0, hkcr=0, hkcusub[2]={0}, hklmsub[2]={0}; + DWORD size; + static CHAR buffer[2]; + LONG res; + + /* prepare initial testing env in HKCU */ + if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", &hkcu )) + { + delete_key( hkcu ); + RegCloseKey( hkcu ); + } + res = RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_SET_VALUE|KEY_ENUMERATE_SUB_KEYS, NULL, &hkcu, NULL ); + + if (res != ERROR_SUCCESS) + { + skip("failed to add a user class\n"); + return; + } + + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "WineTestCls", &hkcr ); + todo_wine ok(res == ERROR_SUCCESS || + broken(res == ERROR_FILE_NOT_FOUND /* WinNT */), + "test key not found in hkcr: %d\n", res); + if (res) + { + skip("HKCR key merging not supported\n"); + delete_key( hkcu ); + RegCloseKey( hkcu ); + return; + } + + res = RegSetValueExA( hkcu, "X", 0, REG_SZ, (const BYTE *) "AA", 3 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegSetValueExA( hkcu, "Y", 0, REG_SZ, (const BYTE *) "B", 2 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegCreateKeyA( hkcu, "A", &hkcusub[0] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + res = RegCreateKeyA( hkcu, "B", &hkcusub[1] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + + /* test on values in HKCU */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Y" ), "expected 'Y', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "B" ), "expected 'B', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + /* prepare test env in HKLM */ + if (!RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", &hklm )) + { + delete_key( hklm ); + RegCloseKey( hklm ); + } + + res = RegCreateKeyExA( HKEY_LOCAL_MACHINE, "Software\\Classes\\WineTestCls", 0, NULL, 0, + KEY_SET_VALUE|KEY_ENUMERATE_SUB_KEYS, NULL, &hklm, NULL ); + + if (res == ERROR_ACCESS_DENIED) + { + RegCloseKey( hkcusub[0] ); + RegCloseKey( hkcusub[1] ); + delete_key( hkcu ); + RegCloseKey( hkcu ); + RegCloseKey( hkcr ); + skip("not enough privileges to add a system class\n"); + return; + } + + res = RegSetValueExA( hklm, "X", 0, REG_SZ, (const BYTE *) "AB", 3 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegSetValueExA( hklm, "Z", 0, REG_SZ, (const BYTE *) "C", 2 ); + ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", res); + res = RegCreateKeyA( hklm, "A", &hklmsub[0] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + res = RegCreateKeyA( hklm, "C", &hklmsub[1] ); + ok(res == ERROR_SUCCESS, "RegCreateKeyA failed: %d\n", res); + + /* test on values/keys in both HKCU and HKLM */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Y" ), "expected 'Y', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Z" ), "expected 'Z', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 3, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "B" ), "expected 'B', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "C" ), "expected 'C', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 3, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + /* delete values/keys from HKCU to test only on HKLM */ + RegCloseKey( hkcusub[0] ); + RegCloseKey( hkcusub[1] ); + delete_key( hkcu ); + RegCloseKey( hkcu ); + + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_KEY_DELETED || + res == ERROR_NO_SYSTEM_RESOURCES, /* Windows XP */ + "expected ERROR_KEY_DELETED, got %d\n", res); + size = sizeof(buffer); + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_KEY_DELETED || + res == ERROR_NO_SYSTEM_RESOURCES, /* Windows XP */ + "expected ERROR_KEY_DELETED, got %d\n", res); + + /* reopen HKCR handle */ + RegCloseKey( hkcr ); + res = RegOpenKeyA( HKEY_CLASSES_ROOT, "WineTestCls", &hkcr ); + ok(res == ERROR_SUCCESS, "test key not found in hkcr: %d\n", res); + if (res) goto cleanup; + + /* test on values/keys in HKLM */ + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 0, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "X" ), "expected 'X', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 1, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_SUCCESS, "RegEnumValueA failed: %d\n", res ); + ok(!strcmp( buffer, "Z" ), "expected 'Z', got '%s'\n", buffer); + size = sizeof(buffer); + res = RegEnumValueA( hkcr, 2, buffer, &size, NULL, NULL, NULL, NULL ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + + res = RegEnumKeyA( hkcr, 0, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "A" ), "expected 'A', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 1, buffer, size ); + ok(res == ERROR_SUCCESS, "RegEnumKey failed: %d\n", res ); + ok(!strcmp( buffer, "C" ), "expected 'C', got '%s'\n", buffer); + res = RegEnumKeyA( hkcr, 2, buffer, size ); + ok(res == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %d\n", res ); + +cleanup: + RegCloseKey( hklmsub[0] ); + RegCloseKey( hklmsub[1] ); + delete_key( hklm ); + RegCloseKey( hklm ); + RegCloseKey( hkcr ); +} + static void test_deleted_key(void) { HKEY hkey, hkey2; @@ -2478,6 +2655,7 @@ START_TEST(registry) test_symlinks(); test_redirection(); test_classesroot(); + test_classesroot_enum(); /* SaveKey/LoadKey require the SE_BACKUP_NAME privilege to be set */ if (set_privileges(SE_BACKUP_NAME, TRUE) &&

1 0

Alexandre Julliard : ntdll: Add the keyed events entry points.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: bf3e23bb3629e5f29e09796cb399c8cb2c355844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3e23bb3629e5f29e09796cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 12:51:31 2013 +0200 ntdll: Add the keyed events entry points. --- dlls/ntdll/ntdll.spec | 16 ++++++++-------- dlls/ntdll/sync.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 4 ++++ 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5caff45..e4ed913 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -129,7 +129,7 @@ @ stdcall NtCreateJobObject(ptr long ptr) # @ stub NtCreateJobSet @ stdcall NtCreateKey(ptr long ptr long ptr long long) -# @ stub NtCreateKeyedEvent +@ stdcall NtCreateKeyedEvent(ptr long ptr long) @ stdcall NtCreateMailslotFile(long long long long long long long long) @ stdcall NtCreateMutant(ptr long ptr long) @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @@ -212,7 +212,7 @@ @ stdcall NtOpenIoCompletion(ptr long ptr) @ stdcall NtOpenJobObject(ptr long ptr) @ stdcall NtOpenKey(ptr long ptr) -# @ stub NtOpenKeyedEvent +@ stdcall NtOpenKeyedEvent(ptr long ptr) @ stdcall NtOpenMutant(ptr long ptr) @ stub NtOpenObjectAuditAlarm @ stdcall NtOpenProcess(ptr long ptr ptr) @@ -283,7 +283,7 @@ @ stdcall NtReadVirtualMemory(long ptr ptr long ptr) @ stub NtRegisterNewDevice @ stdcall NtRegisterThreadTerminatePort(ptr) -# @ stub NtReleaseKeyedEvent +@ stdcall NtReleaseKeyedEvent(long ptr long ptr) @ stdcall NtReleaseMutant(long ptr) @ stub NtReleaseProcessMutant @ stdcall NtReleaseSemaphore(long long ptr) @@ -370,7 +370,7 @@ @ stub NtVdmControl @ stub NtW32Call # @ stub NtWaitForDebugEvent -# @ stub NtWaitForKeyedEvent +@ stdcall NtWaitForKeyedEvent(long ptr long ptr) @ stdcall NtWaitForMultipleObjects(long ptr long long ptr) @ stub NtWaitForProcessMutant @ stdcall NtWaitForSingleObject(long long long) @@ -991,7 +991,7 @@ @ stdcall ZwCreateJobObject(ptr long ptr) NtCreateJobObject # @ stub ZwCreateJobSet @ stdcall ZwCreateKey(ptr long ptr long ptr long long) NtCreateKey -# @ stub ZwCreateKeyedEvent +@ stdcall ZwCreateKeyedEvent(ptr long ptr long) NtCreateKeyedEvent @ stdcall ZwCreateMailslotFile(long long long long long long long long) NtCreateMailslotFile @ stdcall ZwCreateMutant(ptr long ptr long) NtCreateMutant @ stdcall ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @@ -1072,7 +1072,7 @@ @ stdcall ZwOpenIoCompletion(ptr long ptr) NtOpenIoCompletion @ stdcall ZwOpenJobObject(ptr long ptr) NtOpenJobObject @ stdcall ZwOpenKey(ptr long ptr) NtOpenKey -# @ stub ZwOpenKeyedEvent +@ stdcall ZwOpenKeyedEvent(ptr long ptr) NtOpenKeyedEvent @ stdcall ZwOpenMutant(ptr long ptr) NtOpenMutant @ stub ZwOpenObjectAuditAlarm @ stdcall ZwOpenProcess(ptr long ptr ptr) NtOpenProcess @@ -1143,7 +1143,7 @@ @ stdcall ZwReadVirtualMemory(long ptr ptr long ptr) NtReadVirtualMemory @ stub ZwRegisterNewDevice @ stdcall ZwRegisterThreadTerminatePort(ptr) NtRegisterThreadTerminatePort -# @ stub ZwReleaseKeyedEvent +@ stdcall ZwReleaseKeyedEvent(long ptr long ptr) NtReleaseKeyedEvent @ stdcall ZwReleaseMutant(long ptr) NtReleaseMutant @ stub ZwReleaseProcessMutant @ stdcall ZwReleaseSemaphore(long long ptr) NtReleaseSemaphore @@ -1230,7 +1230,7 @@ @ stub ZwVdmControl @ stub ZwW32Call # @ stub ZwWaitForDebugEvent -# @ stub ZwWaitForKeyedEvent +@ stdcall ZwWaitForKeyedEvent(long ptr long ptr) NtWaitForKeyedEvent @ stdcall ZwWaitForMultipleObjects(long ptr long long ptr) NtWaitForMultipleObjects @ stub ZwWaitForProcessMutant @ stdcall ZwWaitForSingleObject(long long long) NtWaitForSingleObject diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 7e3b57f..d0b6be0 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1242,6 +1242,46 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou return STATUS_SUCCESS; } + +/****************************************************************************** + * NtCreateKeyedEvent (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateKeyedEvent( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, ULONG flags ) +{ + FIXME( "stub\n" ); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtOpenKeyedEvent (NTDLL.@) + */ +NTSTATUS WINAPI NtOpenKeyedEvent( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + FIXME( "stub\n" ); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtWaitForKeyedEvent (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForKeyedEvent( HANDLE handle, const void *key, + BOOLEAN alertable, const LARGE_INTEGER *timeout ) +{ + FIXME( "stub\n" ); + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtReleaseKeyedEvent (NTDLL.@) + */ +NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, + BOOLEAN alertable, const LARGE_INTEGER *timeout ) +{ + FIXME( "stub\n" ); + return STATUS_NOT_IMPLEMENTED; +} + /****************************************************************** * NtCreateIoCompletion (NTDLL.@) * ZwCreateIoCompletion (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index d3c1ce8..41ba0a0 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2054,6 +2054,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PI NTSYSAPI NTSTATUS WINAPI NtCreateIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,ULONG); NTSYSAPI NTSTATUS WINAPI NtCreateJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtCreateKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); NTSYSAPI NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); @@ -2113,6 +2114,7 @@ NTSYSAPI NTSTATUS WINAPI NtOpenFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_ NTSYSAPI NTSTATUS WINAPI NtOpenIoCompletion(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES); NTSYSAPI NTSTATUS WINAPI NtOpenJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES *); +NTSYSAPI NTSTATUS WINAPI NtOpenKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenMutant(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*); NTSYSAPI NTSTATUS WINAPI NtOpenObjectAuditAlarm(PUNICODE_STRING,PHANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,HANDLE,ACCESS_MASK,ACCESS_MASK,PPRIVILEGE_SET,BOOLEAN,BOOLEAN,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI NtOpenProcess(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const CLIENT_ID*); @@ -2175,6 +2177,7 @@ NTSYSAPI NTSTATUS WINAPI NtReadFileScatter(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID, NTSYSAPI NTSTATUS WINAPI NtReadRequestData(HANDLE,PLPC_MESSAGE,ULONG,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtReadVirtualMemory(HANDLE,const void*,void*,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtRegisterThreadTerminatePort(HANDLE); +NTSYSAPI NTSTATUS WINAPI NtReleaseKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtReleaseMutant(HANDLE,PLONG); NTSYSAPI NTSTATUS WINAPI NtReleaseSemaphore(HANDLE,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtRemoveIoCompletion(HANDLE,PULONG_PTR,PULONG_PTR,PIO_STATUS_BLOCK,PLARGE_INTEGER); @@ -2239,6 +2242,7 @@ NTSYSAPI NTSTATUS WINAPI NtUnlockFile(HANDLE,PIO_STATUS_BLOCK,PLARGE_INTEGER,PL NTSYSAPI NTSTATUS WINAPI NtUnlockVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtUnmapViewOfSection(HANDLE,PVOID); NTSYSAPI NTSTATUS WINAPI NtVdmControl(ULONG,PVOID); +NTSYSAPI NTSTATUS WINAPI NtWaitForKeyedEvent(HANDLE,const void*,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForSingleObject(HANDLE,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitForMultipleObjects(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); NTSYSAPI NTSTATUS WINAPI NtWaitHighEventPair(HANDLE);

1 0

Alexandre Julliard : server: Add support for keyed event objects.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: dbf9d71ef80f0f689d4c0e6d06e4af69d3ea93d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf9d71ef80f0f689d4c0e6d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 12:54:17 2013 +0200 server: Add support for keyed event objects. --- dlls/ntdll/sync.c | 50 ++++++++++++++- include/wine/server_protocol.h | 41 ++++++++++++- server/event.c | 130 ++++++++++++++++++++++++++++++++++++++++ server/object.h | 3 + server/protocol.def | 20 ++++++ server/request.h | 15 +++++ server/trace.c | 31 ++++++++++ 7 files changed, 285 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dbf9d71ef80f0f689d4c0…

1 0

Alexandre Julliard : server: Create the critical section keyed event object on startup.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8c0796c4a7ffa758c70df0fe4931339599d6d2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0796c4a7ffa758c70df0fe4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 21 12:51:31 2013 +0200 server: Create the critical section keyed event object on startup. --- server/directory.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/directory.c b/server/directory.c index 6250177..e5e82b0 100644 --- a/server/directory.c +++ b/server/directory.c @@ -413,6 +413,7 @@ void init_directories(void) static const WCHAR event_high_memW[] = {'H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; static const WCHAR event_high_pagedW[] = {'H','i','g','h','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; static const WCHAR event_high_nonpgW[] = {'H','i','g','h','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR keyed_event_crit_sectW[] = {'C','r','i','t','S','e','c','O','u','t','O','f','M','e','m','o','r','y','E','v','e','n','t'}; static const struct unicode_str kernel_events[] = { { event_low_memW, sizeof(event_low_memW) }, @@ -422,9 +423,11 @@ void init_directories(void) { event_high_pagedW, sizeof(event_high_pagedW) }, { event_high_nonpgW, sizeof(event_high_nonpgW) } }; + static const struct unicode_str keyed_event_crit_sect_str = {keyed_event_crit_sectW, sizeof(keyed_event_crit_sectW)}; struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel; struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot, *link_0, *link_session; + struct keyed_event *keyed_event; unsigned int i; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); @@ -469,6 +472,8 @@ void init_directories(void) struct event *event = create_event( dir_kernel, &kernel_events[i], 0, 1, 0, NULL ); make_object_static( (struct object *)event ); } + keyed_event = create_keyed_event( dir_kernel, &keyed_event_crit_sect_str, 0, NULL ); + make_object_static( (struct object *)keyed_event ); /* the objects hold references so we can release these directories */ release_object( dir_global );

1 0

Nikolay Sivov : msxml3: Fix a warning in DTD dumping code on recent libxml2 versions.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 9554dfb13c9ecdad0c63f74d141f2ae48b2a9130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9554dfb13c9ecdad0c63f74d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 21 14:31:28 2013 +0400 msxml3: Fix a warning in DTD dumping code on recent libxml2 versions. --- dlls/msxml3/node.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 79de75c..a196f4e 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -896,6 +896,50 @@ HRESULT node_get_xml(xmlnode *This, BOOL ensure_eol, BSTR *ret) return *ret ? S_OK : E_OUTOFMEMORY; } +/* duplicates xmlBufferWriteQuotedString() logic */ +static void xml_write_quotedstring(xmlOutputBufferPtr buf, const xmlChar *string) +{ + const xmlChar *cur, *base; + + if (xmlStrchr(string, '\"')) + { + if (xmlStrchr(string, '\'')) + { + xmlOutputBufferWrite(buf, 1, "\""); + base = cur = string; + + while (*cur) + { + if (*cur == '"') + { + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 6, """); + cur++; + base = cur; + } + else + cur++; + } + if (base != cur) + xmlOutputBufferWrite(buf, cur-base, (const char*)base); + xmlOutputBufferWrite(buf, 1, "\""); + } + else + { + xmlOutputBufferWrite(buf, 1, "\'"); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\'"); + } + } + else + { + xmlOutputBufferWrite(buf, 1, "\""); + xmlOutputBufferWriteString(buf, (const char*)string); + xmlOutputBufferWrite(buf, 1, "\""); + } +} + static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) { xmlDtdPtr cur = doc->intSubset; @@ -905,17 +949,17 @@ static void htmldtd_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) if (cur->ExternalID) { xmlOutputBufferWriteString(buf, " PUBLIC "); - xmlBufferWriteQuotedString(buf->buffer, cur->ExternalID); + xml_write_quotedstring(buf, cur->ExternalID); if (cur->SystemID) { xmlOutputBufferWriteString(buf, " "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } } else if (cur->SystemID) { xmlOutputBufferWriteString(buf, " SYSTEM "); - xmlBufferWriteQuotedString(buf->buffer, cur->SystemID); + xml_write_quotedstring(buf, cur->SystemID); } xmlOutputBufferWriteString(buf, ">\n"); }

1 0

Nikolay Sivov : msxml3: Fix a warning accessing internal buffer of xmlOutputBuffer.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: db79c6bd89345a8e8016b56c3f04995a3d0bb410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db79c6bd89345a8e8016b56c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 21 16:11:05 2013 +0400 msxml3: Fix a warning accessing internal buffer of xmlOutputBuffer. --- dlls/msxml3/node.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a196f4e..4c03571 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -987,6 +987,15 @@ static void htmldoc_dumpcontent(xmlOutputBufferPtr buf, xmlDocPtr doc) doc->type = type; } +static const xmlChar *get_output_buffer_content(xmlOutputBufferPtr output) +{ +#ifdef LIBXML2_NEW_BUFFER + return xmlOutputBufferGetContent(output); +#else + return xmlBufferContent(output->buffer); +#endif +} + HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR *p) { #ifdef SONAME_LIBXSLT @@ -1015,7 +1024,7 @@ HRESULT node_transform_node(const xmlnode *This, IXMLDOMNode *stylesheet, BSTR * if (output) { htmldoc_dumpcontent(output, result->doc); - content = xmlBufferContent(output->buffer); + content = get_output_buffer_content(output); *p = bstr_from_xmlChar(content); xmlOutputBufferClose(output); }

1 0

Jacek Caban : ieframe/tests: Use winehq snapshot instead of the main page.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 00bbc620101a2048f3a438ef7838948d8ff89eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bbc620101a2048f3a438ef7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 21 13:45:31 2013 +0200 ieframe/tests: Use winehq snapshot instead of the main page. --- dlls/ieframe/tests/webbrowser.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 217ff28..675bc12 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2742,7 +2742,7 @@ static void test_download(DWORD flags) test_ready_state((flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH)) ? READYSTATE_COMPLETE : READYSTATE_LOADING); - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) SET_EXPECT(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2784,7 +2784,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } - if((is_http && !(flags & (DWL_FROM_GOBACK|DWL_FROM_GOFORWARD|DWL_REFRESH))) || (flags & DWL_EXPECT_BEFORE_NAVIGATE)) + if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) todo_wine CHECK_CALLED(Invoke_PROPERTYCHANGE); if(flags & DWL_EXPECT_BEFORE_NAVIGATE) { @@ -2914,6 +2914,8 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) BSTR str; HRESULT hres; + trace("put_href(%s)...\n", url); + doc = get_document(unk); location = NULL; @@ -2922,6 +2924,8 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) ok(hres == S_OK, "get_location failed: %08x\n", hres); ok(location != NULL, "location == NULL\n"); + is_http = !memcmp(url, "http:", 5); + SET_EXPECT(TranslateUrl); SET_EXPECT(Invoke_BEFORENAVIGATE2); if(!is_http) @@ -2929,7 +2933,6 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - is_http = !memcmp(url, "http:", 5); str = a2bstr(current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3423,7 +3426,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_Refresh(webbrowser); trace("put_href http URL...\n"); - test_put_href(webbrowser, "http://www.winehq.org/"); + test_put_href(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_PUT_HREF|DWL_HTTP); trace("GoBack...\n"); @@ -3431,7 +3434,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) test_download(DWL_FROM_GOBACK|DWL_HTTP); trace("GoForward...\n"); - test_go_forward(webbrowser, "http://www.winehq.org/"); + test_go_forward(webbrowser, "http://test.winehq.org/tests/winehq_snapshot/"); test_download(DWL_FROM_GOFORWARD|DWL_HTTP); }

1 0

Hans Leidekker : wbemprox: Accept the root\default namespace.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: d799a664f46623282b6173ff8bcf5562444a30d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d799a664f46623282b6173ff8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 21 14:09:28 2013 +0200 wbemprox: Accept the root\default namespace. --- dlls/wbemprox/tests/services.c | 8 +++++++- dlls/wbemprox/wbemlocator.c | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index 5d659b1..7f8a7a2 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -108,6 +108,9 @@ static void test_IWbemLocator(void) static const WCHAR path19W[] = {'R','O','O','T','\\','\\','C','I','M','V','2',0}; static const WCHAR path20W[] = {'R','O','O','T','\\','C','I','M','V','2','\\',0}; static const WCHAR path21W[] = {'R','O','O','T','/','C','I','M','V','2',0}; + static const WCHAR path22W[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; + static const WCHAR path23W[] = {'r','o','o','t','\\','c','i','m','v','0',0}; + static const WCHAR path24W[] = {'r','o','o','t','\\','c','i','m','v','1',0}; static const struct { const WCHAR *path; @@ -138,7 +141,10 @@ static void test_IWbemLocator(void) { path18W, S_OK }, { path19W, WBEM_E_INVALID_NAMESPACE }, { path20W, WBEM_E_INVALID_NAMESPACE }, - { path21W, S_OK } + { path21W, S_OK }, + { path22W, S_OK }, + { path23W, WBEM_E_INVALID_NAMESPACE }, + { path24W, WBEM_E_INVALID_NAMESPACE } }; IWbemLocator *locator; IWbemServices *services; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index e869a6a..07bd89f 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -101,6 +101,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na { static const WCHAR rootW[] = {'R','O','O','T'}; static const WCHAR cimv2W[] = {'C','I','M','V','2'}; + static const WCHAR defaultW[] = {'D','E','F','A','U','L','T'}; HRESULT hr = WBEM_E_INVALID_NAMESPACE; const WCHAR *p, *q; unsigned int len; @@ -138,7 +139,9 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na goto done; } q++; - if ((len = strlenW( q )) != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) + len = strlenW( q ); + if ((len != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) && + (len != sizeof(defaultW) / sizeof(defaultW[0]) || memicmpW( q, defaultW, len ))) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else

1 0

André Hentschel : schannel/tests: Fix test on win8.1.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8e5b8600b2eb7cb218c9fa8c8211c90ec91742e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5b8600b2eb7cb218c9fa8c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 21 00:24:30 2013 +0200 schannel/tests: Fix test on win8.1. --- dlls/schannel/tests/main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index 83c107a..d8ade9a 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -216,8 +216,9 @@ static void testGetInfo(void) if (status == STATUS_SUCCESS) { - ok(PackageInfo.fCapabilities == LSA_BASE_CAPS, "fCapabilities: 0x%x\n", - PackageInfo.fCapabilities); + ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || + PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH), + "fCapabilities: 0x%x\n", PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); ok(PackageInfo.cbMaxToken == 0x4000 ||

1 0

Piotr Caban : msvcrt: Improve setting standard handles flags.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: f42c631d6e1b5c6cc16de4d329f29141dea47518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42c631d6e1b5c6cc16de4d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 21 13:52:10 2013 +0200 msvcrt: Improve setting standard handles flags. --- dlls/msvcrt/file.c | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8403b4b..0df95d9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -65,6 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 +#define WX_NOSEEK 0x40 #define WX_TEXT 0x80 /* values for exflag - it's used differently in msvcr90.dll*/ @@ -347,7 +348,7 @@ static int msvcrt_set_fd(HANDLE hand, int flag, int fd) } fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE)); + fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE | WX_NOSEEK)); fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; @@ -515,16 +516,31 @@ void msvcrt_init_io(void) } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_INPUT_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDIN_FILENO); + } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDOUT_FILENO); + } fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); - if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - msvcrt_set_fd(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); + if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) { + HANDLE h = GetStdHandle(STD_ERROR_HANDLE); + DWORD type = GetFileType(h); + + msvcrt_set_fd(h, WX_OPEN|WX_TEXT|((type&0xf)==FILE_TYPE_CHAR ? WX_NOSEEK : 0) + |((type&0xf)==FILE_TYPE_PIPE ? WX_PIPE : 0), MSVCRT_STDERR_FILENO); + } TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, @@ -2343,7 +2359,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) buf[0] = '\n'; else { buf[0] = '\r'; - if(fdinfo->wxflag & WX_PIPE) + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2391,7 +2407,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(char_len+i <= pos) i += char_len; - if(fdinfo->wxflag & WX_PIPE) { + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { if(i < pos) fdinfo->lookahead[0] = readbuf[i]; if(i+1 < pos) @@ -2419,7 +2435,7 @@ static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) if(lookahead != '\n') readbuf[j++] = '\r'; - if(fdinfo->wxflag & WX_PIPE) + if(fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) fdinfo->lookahead[0] = lookahead; else SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); @@ -2553,7 +2569,7 @@ static int read_i(int fd, void *buf, unsigned int count) if(utf16) bufstart[j++] = 0; } - if (fdinfo->wxflag & WX_PIPE) + if (fdinfo->wxflag & (WX_PIPE | WX_NOSEEK)) { fdinfo->lookahead[0] = lookahead[0]; fdinfo->lookahead[1] = lookahead[1];

1 0