wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

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 : 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

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

George Stephanos : advapi32/tests: delete_key() permissions fix.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 4bdba5c4021f665f9a9a7cfe7397da8210d016be URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bdba5c4021f665f9a9a7cfe7… Author: George Stephanos <gaf.stephanos(a)gmail.com> Date: Tue Aug 20 21:58:41 2013 +0200 advapi32/tests: delete_key() permissions fix. --- dlls/advapi32/tests/registry.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 1a98f91..197ff07 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -144,6 +144,7 @@ static DWORD delete_key( HKEY hkey ) char name[MAX_PATH]; DWORD ret; + if ((ret = RegOpenKeyExA( hkey, "", 0, KEY_ENUMERATE_SUB_KEYS, &hkey ))) return ret; while (!(ret = RegEnumKeyA(hkey, 0, name, sizeof(name)))) { HKEY tmp; @@ -156,6 +157,7 @@ static DWORD delete_key( HKEY hkey ) } if (ret != ERROR_NO_MORE_ITEMS) return ret; RegDeleteKeyA( hkey, "" ); + RegCloseKey(hkey); return 0; } @@ -2214,10 +2216,10 @@ static void test_classesroot(void) res = RegSetValueExA(hkcr, "val2", 0, REG_SZ, (const BYTE *)"hkcr", sizeof("hkcr")); ok(res == ERROR_SUCCESS, "RegSetValueExA failed: %d, GLE=%x\n", res, GetLastError()); - /* check that the value is not modified in hklm classes */ + /* check that the value is modified in hklm classes */ res = RegQueryValueExA(hklm, "val2", NULL, &type, (LPBYTE)buffer, &size); ok(res == ERROR_SUCCESS, "RegQueryValueExA failed: %d, GLE=%x\n", res, GetLastError()); - ok(!strcmp( buffer, "hklm" ), "value set to '%s'\n", buffer ); + ok(!strcmp( buffer, "hkcr" ), "value set to '%s'\n", buffer ); if (RegCreateKeyExA( HKEY_CURRENT_USER, "Software\\Classes\\WineTestCls", 0, NULL, 0, KEY_QUERY_VALUE|KEY_SET_VALUE, NULL, &hkey, NULL )) return;

1 0

Dmitry Timoshkov : kernel32/tests: Revert inadvertent change.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 2192745042b510b5acd8e4dc369b4be19e6d14b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2192745042b510b5acd8e4dc3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:36:34 2013 +0900 kernel32/tests: Revert inadvertent change. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 12a808d..75944e9 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1628,7 +1628,7 @@ static void test_WaitRing(void) success, err, evtmask, after-before, after1-before); ok(evtmask & EV_RING, "Failed to detect EV_RING: 0x%08x, expected 0x%08x\n", - evtmask, EV_CTS); + evtmask, EV_RING); ok(GetCommModemStatus(hcom, &evtmask), "GetCommModemStatus failed\n"); if(defaultStat & MS_RING_ON) ok((evtmask & MS_RING_ON) == 0,"DTR didn't change state!\n");

1 0

Dmitry Timoshkov : ntdll/tests: Add the tests for some error cases.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: aa14c2daa5e390b74d0a4f60c1f1d80afe84d21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa14c2daa5e390b74d0a4f60c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:33:46 2013 +0900 ntdll/tests: Add the tests for some error cases. --- dlls/ntdll/tests/file.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 879c3f2..e30ada0 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1941,11 +1941,41 @@ static void test_read_write(void) DWORD ret, bytes, status; LARGE_INTEGER offset; + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtReadFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(INVALID_HANDLE_VALUE, 0, NULL, NULL, &iob, buf, sizeof(buf), &offset, NULL); + ok(status == STATUS_OBJECT_TYPE_MISMATCH || status == STATUS_INVALID_HANDLE, "expected STATUS_OBJECT_TYPE_MISMATCH, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + hfile = create_temp_file(0); if (!hfile) return; iob.Status = -1; iob.Information = -1; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_INVALID_USER_BUFFER, "expected STATUS_INVALID_USER_BUFFER, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; + status = pNtReadFile(hfile, 0, NULL, NULL, &iob, NULL, sizeof(contents), NULL, NULL); + ok(status == STATUS_ACCESS_VIOLATION, "expected STATUS_ACCESS_VIOLATION, got %#x\n", status); + ok(iob.Status == -1, "expected -1, got %#x\n", iob.Status); + ok(iob.Information == -1, "expected -1, got %lu\n", iob.Information); + + iob.Status = -1; + iob.Information = -1; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), NULL, NULL); ok(status == STATUS_SUCCESS, "NtWriteFile error %#x\n", status); ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status);

1 0

Dmitry Timoshkov : ntdll/tests: Use NtWriteFile instead of WriteFile in order to detect broken overlapped IO implementation .
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 8ec8d70adae0ab4af5a5183ae8173f7c8a95d6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec8d70adae0ab4af5a5183ae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:33:05 2013 +0900 ntdll/tests: Use NtWriteFile instead of WriteFile in order to detect broken overlapped IO implementation. --- dlls/ntdll/tests/file.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 46541d5..879c3f2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2107,38 +2107,29 @@ todo_wine todo_wine ok(iob.Information == -1, "expected -1, got %ld\n", iob.Information); - S(U(ovl)).Offset = 0; - S(U(ovl)).OffsetHigh = 0; - ovl.Internal = -1; - ovl.InternalHigh = -1; - ovl.hEvent = 0; - bytes = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = WriteFile(hfile, contents, sizeof(contents), &bytes, &ovl); -todo_wine - ok(!ret || broken(ret) /* see below */, "WriteFile should fail\n"); + iob.Status = -1; + iob.Information = -1; + offset.QuadPart = 0; + status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); todo_wine - ok(GetLastError() == ERROR_IO_PENDING || broken(GetLastError() == 0xdeadbeef), "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* see below */, "expected STATUS_PENDING, got %#x\n", status); + ok(iob.Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x\n", iob.Status); + ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); /* even fully updated XP passes this test, but it looks like some VMs * in a testbot get never updated, so overlapped IO is broken. Instead * of fighting with broken tests and adding a bunch of broken() statements * it's better to skip further tests completely. */ - if (GetLastError() != ERROR_IO_PENDING) + if (status != STATUS_PENDING) { todo_wine win_skip("broken overlapped IO implementation, update your OS\n"); CloseHandle(hfile); return; } - ok(bytes == 0, "bytes %u\n", bytes); - ok(ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); - ok(ovl.InternalHigh == sizeof(contents), "expected sizeof(contents), got %lu\n", ovl.InternalHigh); - bytes = 0xdeadbeef; - ret = GetOverlappedResult(hfile, &ovl, &bytes, TRUE); - ok(ret, "GetOverlappedResult error %d\n", GetLastError()); - ok(bytes == sizeof(contents), "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); bytes = 0xdeadbeef; SetLastError(0xdeadbeef);

1 0

Dmitry Timoshkov : ntdll/tests: Fix the typos.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: b45ec4607babf8d545be66916c8d0f47c388171e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b45ec4607babf8d545be66916… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 21 18:32:10 2013 +0900 ntdll/tests: Fix the typos. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 37d11d1..46541d5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2243,7 +2243,7 @@ todo_wine ok(iob.Information == 4, "expected 4, got %lu\n", iob.Information); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "GetOverlappedResult error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); iob.Status = -1; iob.Information = -1; @@ -2254,7 +2254,7 @@ todo_wine ok(iob.Information == sizeof(contents), "expected sizeof(contents), got %lu\n", iob.Information); ret = WaitForSingleObject(hfile, 3000); - ok(ret == WAIT_OBJECT_0, "GetOverlappedResult error %d\n", ret); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); ok(!memcmp(contents, buf, sizeof(contents) - 4), "file contents mismatch\n"); ok(!memcmp(buf + sizeof(contents) - 4, "DCBA", 4), "file contents mismatch\n");

1 0

Henri Verbeet : d3dx9: ID3DXBaseEffectImpl doesn' t need to be a COM implementation.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 1cb70eb07a7e6d7c60771d85a21c5f34592b60aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb70eb07a7e6d7c60771d85a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:31 2013 +0200 d3dx9: ID3DXBaseEffectImpl doesn't need to be a COM implementation. --- dlls/d3dx9_36/effect.c | 1647 +++++++++++++++++++----------------------------- 1 files changed, 664 insertions(+), 983 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cb70eb07a7e6d7c60771…

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXMATRIX.
by Alexandre Julliard 21 Aug '13

21 Aug '13

Module: wine Branch: master Commit: 3b4b61f03aae9fdd763bfd25e4d302909089cd2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4b61f03aae9fdd763bfd25e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 21 08:29:30 2013 +0200 d3dx9: Avoid LPD3DXMATRIX. --- dlls/d3dx9_36/skin.c | 2 +- dlls/d3dx9_36/tests/math.c | 2 +- include/d3dx9mesh.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index c3857d6..85c4d64 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -285,7 +285,7 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_SetBoneOffsetMatrix(ID3DXSkinInfo *iface return D3D_OK; } -static LPD3DXMATRIX WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num) +static D3DXMATRIX * WINAPI ID3DXSkinInfoImpl_GetBoneOffsetMatrix(ID3DXSkinInfo *iface, DWORD bone_num) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5f92729..9f30f52 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -234,7 +234,7 @@ static void D3DXFresnelTest(void) static void D3DXMatrixTest(void) { D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; - LPD3DXMATRIX funcpointer; + D3DXMATRIX *funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; D3DXVECTOR3 at, axis, eye, last; diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 8fee738..1347a79 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -529,7 +529,7 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(SetBoneName)(THIS_ DWORD bone, LPCSTR name) PURE; STDMETHOD_(LPCSTR, GetBoneName)(THIS_ DWORD bone) PURE; STDMETHOD(SetBoneOffsetMatrix)(THIS_ DWORD bone, CONST D3DXMATRIX* bone_transform) PURE; - STDMETHOD_(LPD3DXMATRIX, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE; + STDMETHOD_(D3DXMATRIX *, GetBoneOffsetMatrix)(THIS_ DWORD bone) PURE; STDMETHOD(Clone)(THIS_ ID3DXSkinInfo **skin_info) PURE; STDMETHOD(Remap)(THIS_ DWORD num_vertices, DWORD* vertex_remap) PURE; STDMETHOD(SetFVF)(THIS_ DWORD FVF) PURE;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2013