ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32: Fix return value of RegNotifyChangeKeyValue for pending events. 

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Sebastian Lackner 2016-04-05 16:20:05 +02:00 committed by Alexandre Julliard
parent d2ca5419e3
commit df77e490d8
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/advapi32/registry.c
View File

@ -2760,7 +2760,7 @@ LSTATUS WINAPI RegNotifyChangeKeyValue( HKEY hkey, BOOL fWatchSubTree,
fdwNotifyFilter, fWatchSubTree, NULL, 0, fdwNotifyFilter, fWatchSubTree, NULL, 0,
fAsync); fAsync);
if (status && status != STATUS_TIMEOUT) if (status && status != STATUS_PENDING)
return RtlNtStatusToDosError( status ); return RtlNtStatusToDosError( status );
return ERROR_SUCCESS; return ERROR_SUCCESS;

28
dlls/advapi32/tests/registry.c
View File

@ -3452,6 +3452,33 @@ static void test_RegOpenCurrentUser(void)
RegCloseKey(key); RegCloseKey(key);
} }
static void test_RegNotifyChangeKeyValue(void)
{
HKEY key, subkey;
HANDLE event;
DWORD dwret;
LONG ret;
event = CreateEventW(NULL, FALSE, TRUE, NULL);
ok(event != NULL, "CreateEvent failed, error %u\n", GetLastError());
ret = RegCreateKeyA(hkey_main, "TestKey", &key);
ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret);
ret = RegNotifyChangeKeyValue(key, TRUE, REG_NOTIFY_CHANGE_NAME, event, TRUE);
ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret);
dwret = WaitForSingleObject(event, 0);
ok(dwret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", dwret);
ret = RegCreateKeyA(key, "SubKey", &subkey);
ok(ret == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", ret);
dwret = WaitForSingleObject(event, 0);
ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret);
RegDeleteKeyA(key, "");
RegCloseKey(key);
CloseHandle(event);
}
START_TEST(registry) START_TEST(registry)
{ {
/* Load pointers for functions that are not available in all Windows versions */ /* Load pointers for functions that are not available in all Windows versions */
@ -3486,6 +3513,7 @@ START_TEST(registry)
test_delete_value(); test_delete_value();
test_delete_key_value(); test_delete_key_value();
test_RegOpenCurrentUser(); test_RegOpenCurrentUser();
test_RegNotifyChangeKeyValue();
/* cleanup */ /* cleanup */
delete_key( hkey_main ); delete_key( hkey_main );