November 2015 - Wine-commits

Józef Kucia : d3d11/tests: Port test_fragment_coords( ) from d3d10core.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: a74d3ed212b14ecae39458bfac46132aaf0cccd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74d3ed212b14ecae39458bfa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:14 2015 +0100 d3d11/tests: Port test_fragment_coords() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 222 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 222 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a74d3ed212b14ecae3945…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_UpdateSubresource().
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 203860503024cd59c7f5f526625454c6d66f9864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203860503024cd59c7f5f5266… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:15 2015 +0100 d3d11: Implement d3d11_immediate_context_UpdateSubresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d8a219e..3e209f2 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -709,8 +709,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De ID3D11Resource *resource, UINT subresource_idx, const D3D11_BOX *box, const void *data, UINT row_pitch, UINT depth_pitch) { - FIXME("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct wined3d_resource *wined3d_resource; + struct wined3d_box wined3d_box; + + TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u.\n", iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); + + if (box) + { + wined3d_box.left = box->left; + wined3d_box.top = box->top; + wined3d_box.front = box->front; + wined3d_box.right = box->right; + wined3d_box.bottom = box->bottom; + wined3d_box.back = box->back; + } + + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + wined3d_mutex_lock(); + wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, + subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext *iface, @@ -2684,27 +2704,15 @@ static void STDMETHODCALLTYPE d3d10_device_UpdateSubresource(ID3D10Device1 *ifac const void *data, UINT row_pitch, UINT depth_pitch) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct wined3d_resource *wined3d_resource; - struct wined3d_box wined3d_box; + ID3D11Resource *d3d11_resource; TRACE("iface %p, resource %p, subresource_idx %u, box %p, data %p, row_pitch %u, depth_pitch %u.\n", iface, resource, subresource_idx, box, data, row_pitch, depth_pitch); - if (box) - { - wined3d_box.left = box->left; - wined3d_box.top = box->top; - wined3d_box.front = box->front; - wined3d_box.right = box->right; - wined3d_box.bottom = box->bottom; - wined3d_box.back = box->back; - } - - wined3d_resource = wined3d_resource_from_d3d10_resource(resource); - wined3d_mutex_lock(); - wined3d_device_update_sub_resource(device->wined3d_device, wined3d_resource, - subresource_idx, box ? &wined3d_box : NULL, data, row_pitch, depth_pitch); - wined3d_mutex_unlock(); + ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource); + d3d11_immediate_context_UpdateSubresource(&device->immediate_context.ID3D11DeviceContext_iface, + d3d11_resource, subresource_idx, (const D3D11_BOX *)box, data, row_pitch, depth_pitch); + ID3D11Resource_Release(d3d11_resource); } static void STDMETHODCALLTYPE d3d10_device_ClearRenderTargetView(ID3D10Device1 *iface,

1 0

Józef Kucia : d3d11/tests: Port test_update_subresource() from d3d10core.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 294b172a9e383a500e598e3cd8726ce05e2814cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=294b172a9e383a500e598e3cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:16 2015 +0100 d3d11/tests: Port test_update_subresource() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 274 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=294b172a9e383a500e598…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GSSetConstantBuffers().
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 38ef285262d7430f7ef6cb9569bbf5e0dd8a9d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38ef285262d7430f7ef6cb956… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:17 2015 +0100 d3d11: Implement d3d11_immediate_context_GSSetConstantBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 3e209f2..89dcf19 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -361,8 +361,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11Device static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetConstantBuffers(ID3D11DeviceContext *iface, UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + wined3d_mutex_lock(); + for (i = 0; i < buffer_count; ++i) + { + struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]); + + wined3d_device_set_gs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_GSSetShaderResources().
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 6dc3a0117df1368e816f43444ef5e75caed596de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dc3a0117df1368e816f43444… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Nov 6 18:38:18 2015 +0100 d3d11: Implement d3d11_immediate_context_GSSetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 89dcf19..9f98104 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -450,7 +450,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11Devic static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView *const *views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d_shader_resource_view *view = unsafe_impl_from_ID3D11ShaderResourceView(views[i]); + + wined3d_device_set_gs_resource_view(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_GSSetSamplers(ID3D11DeviceContext *iface,

1 0

Martin Storsjo : ucrtbase: Hook up _seh_filter_exe and _seh_filter_dll.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: cd785109739a568abcdbd1057c08c8a462112ffd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd785109739a568abcdbd1057… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Nov 9 14:10:05 2015 +0200 ucrtbase: Hook up _seh_filter_exe and _seh_filter_dll. This gives more sensible crash behaviour e.g. if an unimplemented function is called. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index d52b81b..6afa042 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -63,8 +63,8 @@ @ stub _register_onexit_function @ stub _register_thread_local_exe_atexit_callback @ cdecl _resetstkoflw() ucrtbase._resetstkoflw -@ stub _seh_filter_dll -@ stub _seh_filter_exe +@ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) ucrtbase._seh_filter_dll +@ cdecl _seh_filter_exe(long ptr) ucrtbase._seh_filter_exe @ cdecl _set_abort_behavior(long long) ucrtbase._set_abort_behavior @ cdecl _set_app_type(long) ucrtbase._set_app_type @ cdecl _set_controlfp(long long) ucrtbase._set_controlfp diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7d8d4d1..c3f76d1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1874,8 +1874,8 @@ @ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf @ cdecl _searchenv(str str ptr) MSVCRT__searchenv @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s -@ stub _seh_filter_dll -@ stub _seh_filter_exe +@ cdecl -arch=i386,x86_64,arm _seh_filter_dll(long ptr) __CppXcptFilter +@ cdecl _seh_filter_exe(long ptr) _XcptFilter @ stub _set_FMA3_enable @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr)

1 0

Jacek Caban : ntdll: Return STATUS_PENDING in NtNotifyChangeKey if async notify is performed.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 7d66a01fc2f4153f74a1b19cb6d796cb0e573539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d66a01fc2f4153f74a1b19cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 12:42:16 2015 +0100 ntdll: Return STATUS_PENDING in NtNotifyChangeKey if async notify is performed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 6 +++--- dlls/ntdll/tests/reg.c | 26 ++++++++++++++++++++++++-- server/registry.c | 2 ++ 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 4dff186..1bcd8fd 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -678,12 +678,12 @@ NTSTATUS WINAPI NtNotifyChangeKey( if (!Asynchronous) { - if (ret == STATUS_SUCCESS) - NtWaitForSingleObject( Event, FALSE, NULL ); + if (ret == STATUS_PENDING) + ret = NtWaitForSingleObject( Event, FALSE, NULL ); NtClose( Event ); } - return STATUS_SUCCESS; + return ret; } /****************************************************************************** diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1fe9ef3..7b4ae25 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -147,6 +147,7 @@ static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); static NTSTATUS (WINAPI * pNtNotifyChangeKey)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); +static NTSTATUS (WINAPI * pNtWaitForSingleObject)(HANDLE,BOOLEAN,const LARGE_INTEGER*); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -195,6 +196,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(RtlZeroMemory) NTDLL_GET_PROC(RtlpNtQueryValueKey) NTDLL_GET_PROC(RtlOpenCurrentUser) + NTDLL_GET_PROC(NtWaitForSingleObject) /* optional functions */ pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); @@ -1507,9 +1509,11 @@ static void test_NtQueryKey(void) static void test_notify(void) { OBJECT_ATTRIBUTES attr; + LARGE_INTEGER timeout; IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + HANDLE key, event, subkey; NTSTATUS status; - HANDLE key, event; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); @@ -1520,7 +1524,25 @@ static void test_notify(void) ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); status = pNtNotifyChangeKey(key, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); - todo_wine ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + timeout.QuadPart = 0; + status = pNtWaitForSingleObject(event, FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); + + attr.RootDirectory = key; + attr.ObjectName = &str; + + pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); + status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + + status = pNtWaitForSingleObject(event, FALSE, &timeout); + todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + + status = pNtDeleteKey(subkey); + ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); + pNtClose(subkey); pNtClose(key); pNtClose(event); diff --git a/server/registry.c b/server/registry.c index 7f7a7b1..5b4250b 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2289,6 +2289,8 @@ DECL_HANDLER(set_registry_notification) list_add_head( &key->notify_list, &notify->entry ); } } + if (notify) + set_error( STATUS_PENDING ); release_object( event ); } release_object( key );

1 0

Jacek Caban : server: Reset event in set_registry_notification.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: deba2faf607f989f1277eacd08952082fc344fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deba2faf607f989f1277eacd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 12:42:28 2015 +0100 server: Reset event in set_registry_notification. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 2 +- server/registry.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 7b4ae25..3dfca57 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1520,7 +1520,7 @@ static void test_notify(void) status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - event = CreateEventW(NULL, FALSE, FALSE, NULL); + event = CreateEventW(NULL, FALSE, TRUE, NULL); ok(event != NULL, "CreateEvent failed: %u\n", GetLastError()); status = pNtNotifyChangeKey(key, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); diff --git a/server/registry.c b/server/registry.c index 5b4250b..f9b1cd5 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2290,7 +2290,10 @@ DECL_HANDLER(set_registry_notification) } } if (notify) + { + reset_event( event ); set_error( STATUS_PENDING ); + } release_object( event ); } release_object( key );

1 0

Jacek Caban : server: Notify parent key when subkey is created.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: e0d51609a14c4ed4394d912c15ca59135cb03b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d51609a14c4ed4394d912c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 12:42:41 2015 +0100 server: Notify parent key when subkey is created. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 2 +- server/registry.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3dfca57..b6ff53e 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1538,7 +1538,7 @@ static void test_notify(void) ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); status = pNtWaitForSingleObject(event, FALSE, &timeout); - todo_wine ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); status = pNtDeleteKey(subkey); ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); diff --git a/server/registry.c b/server/registry.c index f9b1cd5..3c9ae70 100644 --- a/server/registry.c +++ b/server/registry.c @@ -814,6 +814,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, free(key->class); if (!(key->class = memdup( class->str, key->classlen ))) key->classlen = 0; } + touch_key( key->parent, REG_NOTIFY_CHANGE_NAME ); grab_object( key ); return key; }

1 0

Jacek Caban : ntdll: Added NtNotifyChangeMultipleKeys implementation.
by Alexandre Julliard 09 Nov '15

09 Nov '15

Module: wine Branch: master Commit: 7bd852c6ce0299f14fa585c124bae029f0d6d214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd852c6ce0299f14fa585c12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 13:07:10 2015 +0100 ntdll: Added NtNotifyChangeMultipleKeys implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/reg.c | 55 +++++++++++++++++++++++++++++++++++--------------- dlls/ntdll/tests/reg.c | 38 ++++++++++++++++++++++++++++++++-- 3 files changed, 77 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 464b233..23261ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -205,7 +205,7 @@ # @ stub NtModifyBootEntry @ stdcall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) @ stdcall NtNotifyChangeKey(long long ptr ptr ptr long long ptr long long) -# @ stub NtNotifyChangeMultipleKeys +@ stdcall NtNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) @ stdcall NtOpenDirectoryObject(long long long) @ stdcall NtOpenEvent(long long long) @ stub NtOpenEventPair @@ -1121,7 +1121,7 @@ # @ stub ZwModifyBootEntry @ stdcall ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey -# @ stub ZwNotifyChangeMultipleKeys +@ stdcall ZwNotifyChangeMultipleKeys(long long ptr long ptr ptr ptr long long ptr long long) NtNotifyChangeMultipleKeys @ stdcall ZwOpenDirectoryObject(long long long) NtOpenDirectoryObject @ stdcall ZwOpenEvent(long long long) NtOpenEvent @ stub ZwOpenEventPair diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 1bcd8fd..5248595 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -633,28 +633,30 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil } /****************************************************************************** - * NtNotifyChangeKey [NTDLL.@] - * ZwNotifyChangeKey [NTDLL.@] + * NtNotifyChangeMultipleKeys [NTDLL.@] + * ZwNotifyChangeMultipleKeys [NTDLL.@] */ -NTSTATUS WINAPI NtNotifyChangeKey( - IN HANDLE KeyHandle, - IN HANDLE Event, - IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, - IN PVOID ApcContext OPTIONAL, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN ULONG CompletionFilter, - IN BOOLEAN WatchSubtree, - OUT PVOID ChangeBuffer, - IN ULONG Length, - IN BOOLEAN Asynchronous) +NTSTATUS WINAPI NtNotifyChangeMultipleKeys( + HANDLE KeyHandle, + ULONG Count, + OBJECT_ATTRIBUTES *SubordinateObjects, + HANDLE Event, + PIO_APC_ROUTINE ApcRoutine, + PVOID ApcContext, + PIO_STATUS_BLOCK IoStatusBlock, + ULONG CompletionFilter, + BOOLEAN WatchSubtree, + PVOID ChangeBuffer, + ULONG Length, + BOOLEAN Asynchronous) { NTSTATUS ret; - TRACE("(%p,%p,%p,%p,%p,0x%08x, 0x%08x,%p,0x%08x,0x%08x)\n", - KeyHandle, Event, ApcRoutine, ApcContext, IoStatusBlock, CompletionFilter, + TRACE("(%p,%u,%p,%p,%p,%p,%p,0x%08x, 0x%08x,%p,0x%08x,0x%08x)\n", + KeyHandle, Count, SubordinateObjects, Event, ApcRoutine, ApcContext, IoStatusBlock, CompletionFilter, Asynchronous, ChangeBuffer, Length, WatchSubtree); - if (ApcRoutine || ApcContext || ChangeBuffer || Length) + if (Count || SubordinateObjects || ApcRoutine || ApcContext || ChangeBuffer || Length) FIXME("Unimplemented optional parameter\n"); if (!Asynchronous) @@ -687,6 +689,27 @@ NTSTATUS WINAPI NtNotifyChangeKey( } /****************************************************************************** + * NtNotifyChangeKey [NTDLL.@] + * ZwNotifyChangeKey [NTDLL.@] + */ +NTSTATUS WINAPI NtNotifyChangeKey( + IN HANDLE KeyHandle, + IN HANDLE Event, + IN PIO_APC_ROUTINE ApcRoutine OPTIONAL, + IN PVOID ApcContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG CompletionFilter, + IN BOOLEAN WatchSubtree, + OUT PVOID ChangeBuffer, + IN ULONG Length, + IN BOOLEAN Asynchronous) +{ + return NtNotifyChangeMultipleKeys(KeyHandle, 0, NULL, Event, ApcRoutine, ApcContext, + IoStatusBlock, CompletionFilter, WatchSubtree, + ChangeBuffer, Length, Asynchronous); +} + +/****************************************************************************** * NtQueryMultipleValueKey [NTDLL] * ZwQueryMultipleValueKey */ diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b6ff53e..9ab2f35 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -147,6 +147,8 @@ static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); static NTSTATUS (WINAPI * pNtNotifyChangeKey)(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,BOOLEAN,PVOID,ULONG,BOOLEAN); +static NTSTATUS (WINAPI * pNtNotifyChangeMultipleKeys)(HANDLE,ULONG,OBJECT_ATTRIBUTES*,HANDLE,PIO_APC_ROUTINE, + void*,IO_STATUS_BLOCK*,ULONG,BOOLEAN,void*,ULONG,BOOLEAN); static NTSTATUS (WINAPI * pNtWaitForSingleObject)(HANDLE,BOOLEAN,const LARGE_INTEGER*); static HMODULE hntdll = 0; @@ -201,6 +203,7 @@ static BOOL InitFunctionPtrs(void) /* optional functions */ pNtQueryLicenseValue = (void *)GetProcAddress(hntdll, "NtQueryLicenseValue"); pNtOpenKeyEx = (void *)GetProcAddress(hntdll, "NtOpenKeyEx"); + pNtNotifyChangeMultipleKeys = (void *)GetProcAddress(hntdll, "NtNotifyChangeMultipleKeys"); return TRUE; } @@ -1516,7 +1519,6 @@ static void test_notify(void) NTSTATUS status; InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); - status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); @@ -1543,8 +1545,40 @@ static void test_notify(void) status = pNtDeleteKey(subkey); ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); pNtClose(subkey); - pNtClose(key); + + if (pNtNotifyChangeMultipleKeys) + { + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_ALL_ACCESS, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + status = pNtNotifyChangeMultipleKeys(key, 0, NULL, event, NULL, NULL, &iosb, REG_NOTIFY_CHANGE_NAME, FALSE, NULL, 0, TRUE); + ok(status == STATUS_PENDING, "NtNotifyChangeKey returned %x\n", status); + + timeout.QuadPart = 0; + status = pNtWaitForSingleObject(event, FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "NtWaitForSingleObject returned %x\n", status); + + attr.RootDirectory = key; + attr.ObjectName = &str; + pRtlCreateUnicodeStringFromAsciiz(&str, "test_subkey"); + status = pNtCreateKey(&subkey, GENERIC_ALL, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status); + + status = pNtWaitForSingleObject(event, FALSE, &timeout); + ok(status == STATUS_SUCCESS, "NtWaitForSingleObject returned %x\n", status); + + status = pNtDeleteKey(subkey); + ok(status == STATUS_SUCCESS, "NtDeleteSubkey failed: %x\n", status); + pNtClose(subkey); + pNtClose(key); + } + else + { + win_skip("NtNotifyChangeMultipleKeys not available\n"); + } + pNtClose(event); }

1 0