September 2016 - Wine-Commits

Huw Davies : user32: EC_USEFONTINFO behaviour depends on whether the font' s charset is CJK or not.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: c247a36eedb5a046921bec1a0440a1ac144642d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c247a36eedb5a046921bec1a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 1 11:35:10 2016 +0100 user32: EC_USEFONTINFO behaviour depends on whether the font's charset is CJK or not. In the non-CJK case, the margins are half of the width returned by GdiGetCharDimensions() but only if the client rect's width is above a certain size. There is an exception if the client rect is empty if the font is sufficiently small. In the CJK case, the margins are independent of the client rect size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 60 ++++++++++--------- dlls/user32/tests/edit.c | 153 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 147 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c247a36eedb5a046921be…

1 0

Alexandre Julliard : server: Add a release_clipboard request, and notify the owner and viewer on release.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: bddab0e7f8037e1eebebf4234ca883151389488b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddab0e7f8037e1eebebf4234… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 20:06:09 2016 +0900 server: Add a release_clipboard request, and notify the owner and viewer on release. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 11 ++++++++--- dlls/user32/tests/clipboard.c | 36 ++++++++++++++++++++++++++++++++---- dlls/user32/win.c | 4 ++-- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/clipboard.c | 40 +++++++++++++++++++++++++++++----------- server/protocol.def | 8 ++++++++ server/request.h | 6 ++++++ server/trace.c | 14 ++++++++++++++ 8 files changed, 117 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bddab0e7f8037e1eebebf…

1 0

Alexandre Julliard : ole32: Cope with receiving WM_RENDERALLFORMATS even when the clipboard is empty.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 27a73216c04e512d848d3df36338f074437d86b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a73216c04e512d848d3df36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 22:01:44 2016 +0900 ole32: Cope with receiving WM_RENDERALLFORMATS even when the clipboard is empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 2cc1cfa..e3c93c9 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -2040,10 +2040,12 @@ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, case WM_RENDERALLFORMATS: { DWORD i; - ole_priv_data_entry *entries = clipbrd->cached_enum->entries; + ole_priv_data_entry *entries; TRACE("(): WM_RENDERALLFORMATS\n"); + if (!clipbrd || !clipbrd->cached_enum) break; + entries = clipbrd->cached_enum->entries; for(i = 0; i < clipbrd->cached_enum->count; i++) { if(entries[i].first_use)

1 0

Alexandre Julliard : server: Don' t release the clipboard owner window when the owner thread terminates.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 2b8021d4d00e2e3c8cc4fd0c36ed0798bb19c111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8021d4d00e2e3c8cc4fd0c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 22:13:53 2016 +0900 server: Don't release the clipboard owner window when the owner thread terminates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 18 ++++++++++++++++++ server/clipboard.c | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 7e0e41c..360ec8d 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -57,6 +57,14 @@ static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) return 0; } +static DWORD WINAPI open_and_empty_clipboard_win_thread(LPVOID arg) +{ + HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); + ok(OpenClipboard(hwnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); + return 0; +} + static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) { HWND hwnd = arg; @@ -329,6 +337,8 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); + ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); @@ -347,6 +357,14 @@ static void test_ClipboardOwner(void) ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); + run_thread( open_and_empty_clipboard_thread, GetDesktopWindow(), __LINE__ ); + ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner window %p / %p\n", + GetClipboardOwner(), GetDesktopWindow() ); + + run_thread( open_and_empty_clipboard_win_thread, 0, __LINE__ ); + ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); } static void test_RegisterClipboardFormatA(void) diff --git a/server/clipboard.c b/server/clipboard.c index 21e6c9e..323fdb9 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -220,7 +220,7 @@ void cleanup_clipboard_thread(struct thread *thread) if ((clipboard = winstation->clipboard)) { - if (thread == clipboard->owner_thread) release_clipboard( clipboard ); + if (thread == clipboard->owner_thread) clipboard->owner_thread = NULL; if (thread == clipboard->open_thread) { user_handle_t viewer = close_clipboard( clipboard );

1 0

Huw Davies : rpcrt4/tests: Remove an unnecessary and confusing message.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 225c43b8124aaeb4c2e307379ab98036db1a38b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=225c43b8124aaeb4c2e307379… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 1 14:15:49 2016 +0100 rpcrt4/tests: Remove an unnecessary and confusing message. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index d260827..23b9e36 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -431,13 +431,10 @@ static void test_I_RpcMapWin32Status(void) RPC_STATUS rpc_status; BOOL w2k3_up = FALSE; - /* Windows 2003 and Vista return STATUS_UNSUCCESSFUL if given an unknown status */ + /* Windows 2003 and above return STATUS_UNSUCCESSFUL if given an unknown status */ win32status = I_RpcMapWin32Status(9999); if (win32status == STATUS_UNSUCCESSFUL) - { - trace("We are on Windows 2003 or Vista\n"); w2k3_up = TRUE; - } /* On Windows XP-SP1 and below some statuses are not mapped and return * the given status

1 0

Stefan Dösinger : ddraw/tests: Extend TransformVertices invalid data tests.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: b12ab05f101c4fc64219e811f92743ce8efc996e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12ab05f101c4fc64219e811f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:27 2016 +0100 ddraw/tests: Extend TransformVertices invalid data tests. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f04ccd3..e8194b3 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9440,9 +9440,61 @@ static void test_transform_vertices(void) ok(offscreen == D3DCLIP_RIGHT, "Offscreen is %x.\n", offscreen); /* Invalid flags. */ + offscreen = 0xdeadbeef; hr = IDirect3DViewport_TransformVertices(viewport, ARRAY_SIZE(position_tests), &transformdata, 0, &offscreen); ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + + /* NULL transform data. */ + hr = IDirect3DViewport_TransformVertices(viewport, 1, + NULL, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + hr = IDirect3DViewport_TransformVertices(viewport, 0, + NULL, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + + /* NULL transform data and NULL dwOffscreen. + * + * Valid transform data + NULL dwOffscreen -> crash. */ + hr = IDirect3DViewport_TransformVertices(viewport, 1, + NULL, D3DTRANSFORM_UNCLIPPED, NULL); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + + /* No vertices. */ + hr = IDirect3DViewport_TransformVertices(viewport, 0, + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(!offscreen, "Offscreen is %x.\n", offscreen); + hr = IDirect3DViewport_TransformVertices(viewport, 0, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); + + /* Invalid sizes. */ + offscreen = 0xdeadbeef; + transformdata.dwSize = sizeof(transformdata) - 1; + hr = IDirect3DViewport_TransformVertices(viewport, 1, + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + transformdata.dwSize = sizeof(transformdata) + 1; + hr = IDirect3DViewport_TransformVertices(viewport, 1, + &transformdata, D3DTRANSFORM_UNCLIPPED, &offscreen); + ok(hr == DDERR_INVALIDPARAMS, "TransformVertices returned %#x.\n", hr); + ok(offscreen == 0xdeadbeef, "Offscreen is %x.\n", offscreen); + + /* NULL lpIn or lpOut -> crash, except when transforming 0 vertices. */ + transformdata.dwSize = sizeof(transformdata); + transformdata.lpIn = NULL; + transformdata.lpOut = NULL; + offscreen = 0xdeadbeef; + hr = IDirect3DViewport_TransformVertices(viewport, 0, + &transformdata, D3DTRANSFORM_CLIPPED, &offscreen); + ok(SUCCEEDED(hr), "Failed to transform vertices, hr %#x.\n", hr); + ok(offscreen == ~0U, "Offscreen is %x.\n", offscreen); destroy_viewport(device, viewport); refcount = IDirect3DDevice_Release(device);

1 0

Stefan Dösinger : ddraw: Validate the input data in TransformVertices.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 3cd0d92c8c48b1507c9cb8c9b449a597ef368a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd0d92c8c48b1507c9cb8c9b… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Aug 31 22:01:26 2016 +0100 ddraw: Validate the input data in TransformVertices. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index d857dc3..393113e 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -370,7 +370,7 @@ static HRESULT WINAPI d3d_viewport_SetViewport(IDirect3DViewport3 *iface, D3DVIE * * Params: * dwVertexCount: The number of vertices to be transformed - * lpData: Pointer to the vertex data + * data: Pointer to the vertex input / output data. * dwFlags: D3DTRANSFORM_CLIPPED or D3DTRANSFORM_UNCLIPPED * offscreen: Logical AND of the planes that clipped the vertices if clipping * is on. 0 if clipping is off. @@ -391,7 +391,7 @@ struct transform_vertices_vertex }; static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, - DWORD dwVertexCount, D3DTRANSFORMDATA *lpData, DWORD dwFlags, DWORD *offscreen) + DWORD dwVertexCount, D3DTRANSFORMDATA *data, DWORD dwFlags, DWORD *offscreen) { struct d3d_viewport *viewport = impl_from_IDirect3DViewport3(iface); D3DVIEWPORT vp = viewport->viewports.vp1; @@ -401,8 +401,8 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, unsigned int i; D3DHVERTEX *outH; - TRACE("iface %p, vertex_count %u, vertex_data %p, flags %#x, offscreen %p.\n", - iface, dwVertexCount, lpData, dwFlags, offscreen); + TRACE("iface %p, vertex_count %u, data %p, flags %#x, offscreen %p.\n", + iface, dwVertexCount, data, dwFlags, offscreen); /* Tests on windows show that Windows crashes when this occurs, * so don't return the (intuitive) return value @@ -413,7 +413,12 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, } */ - if(!(dwFlags & (D3DTRANSFORM_UNCLIPPED | D3DTRANSFORM_CLIPPED))) + if (!data || data->dwSize != sizeof(*data)) + { + WARN("Transform data is NULL or size is incorrect, returning DDERR_INVALIDPARAMS\n"); + return DDERR_INVALIDPARAMS; + } + if (!(dwFlags & (D3DTRANSFORM_UNCLIPPED | D3DTRANSFORM_CLIPPED))) { WARN("No clipping flag passed, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; @@ -434,11 +439,11 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, else *offscreen = 0; - outH = lpData->lpHOut; + outH = data->lpHOut; for(i = 0; i < dwVertexCount; i++) { - in = (struct transform_vertices_vertex *)((char *)lpData->lpIn + lpData->dwInSize * i); - out = (struct transform_vertices_vertex *)((char *)lpData->lpOut + lpData->dwOutSize * i); + in = (struct transform_vertices_vertex *)((char *)data->lpIn + data->dwInSize * i); + out = (struct transform_vertices_vertex *)((char *)data->lpOut + data->dwOutSize * i); x = (in->x * mat._11) + (in->y * mat._21) + (in->z * mat._31) + mat._41; y = (in->x * mat._12) + (in->y * mat._22) + (in->z * mat._32) + mat._42;

1 0

Andrew Eikum : winhttp: Also pass hostname to jsproxy.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: c8b166e3bf4e4a4fe865f7216340a35f5394cc96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b166e3bf4e4a4fe865f7216… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 31 14:21:05 2016 -0500 winhttp: Also pass hostname to jsproxy. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/session.c | 20 +++++++++++++++++--- dlls/winhttp/winhttp_private.h | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 90e7946..600624c 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1813,6 +1813,7 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX char *result, *urlA; DWORD len_result; struct AUTO_PROXY_SCRIPT_BUFFER buffer; + URL_COMPONENTSW uc; buffer.dwStructSize = sizeof(buffer); buffer.lpszScriptBuffer = script; @@ -1824,10 +1825,23 @@ static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROX heap_free( urlA ); return FALSE; } - if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), NULL, 0, &result, &len_result ))) + + memset( &uc, 0, sizeof(uc) ); + uc.dwStructSize = sizeof(uc); + uc.dwHostNameLength = -1; + + if (WinHttpCrackUrl( url, 0, 0, &uc )) { - ret = parse_script_result( result, info ); - heap_free( result ); + char *hostnameA = strdupWA_sized( uc.lpszHostName, uc.dwHostNameLength ); + + if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), + hostnameA, strlen(hostnameA), &result, &len_result ))) + { + ret = parse_script_result( result, info ); + heap_free( result ); + } + + heap_free( hostnameA ); } heap_free( urlA ); return InternetDeInitializeAutoProxyDll( NULL, 0 ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b3e28d2..388fc33 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -365,4 +365,19 @@ static inline char *strdupWA( const WCHAR *src ) return dst; } +static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, 0, src, size, NULL, 0, NULL, NULL ) + 1; + if ((dst = heap_alloc( len ))) + { + WideCharToMultiByte( CP_ACP, 0, src, len, dst, size, NULL, NULL ); + dst[len - 1] = 0; + } + } + return dst; +} + #endif /* _WINE_WINHTTP_PRIVATE_H_ */

1 0

Sebastian Lackner : webservices: Fix invalid memory access in remove_header.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 4358f7c39ecc013855a9bd0b3d062a7b1016f16b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4358f7c39ecc013855a9bd0b3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 31 21:09:25 2016 +0200 webservices: Fix invalid memory access in remove_header. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 6fcd046..e7da06f 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -787,7 +787,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val static void remove_header( struct msg *msg, ULONG i ) { free_header( msg->header[i] ); - memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i - 1) * sizeof(struct header *) ); msg->header_count--; }

1 0

Aric Stewart : ntoskrnl.exe: Stub IoInvalidateDeviceRelations.
by Alexandre Julliard Sept. 1, 2016

Sept. 1, 2016

Module: wine Branch: master Commit: 9f99a045a306acc7066d29607bb5fb7165335589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f99a045a306acc7066d29607… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 1 09:28:00 2016 +0200 ntoskrnl.exe: Stub IoInvalidateDeviceRelations. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a2cbb74..507ffdd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4,6 +4,7 @@ * Copyright (C) 2007 Alexandre Julliard * Copyright (C) 2010 Damjan Jovanovic * Copyright (C) 2016 Sebastian Lackner + * Copyright (C) 2016 CodeWeavers, Aric Stewart * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2788,3 +2789,12 @@ done: CloseServiceHandle( service_handle ); return status; } + + +/*********************************************************************** + * IoInvalidateDeviceRelations (NTOSKRNL.EXE.@) + */ +void WINAPI IoInvalidateDeviceRelations( DEVICE_OBJECT *device_object, DEVICE_RELATION_TYPE type ) +{ + FIXME( "(%p, %i): stub\n", device_object, type ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 119d406..c94b902 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -400,7 +400,7 @@ @ stdcall IoInitializeIrp(ptr long long) @ stdcall IoInitializeRemoveLockEx(ptr long long long long) @ stdcall IoInitializeTimer(ptr ptr ptr) -@ stub IoInvalidateDeviceRelations +@ stdcall IoInvalidateDeviceRelations(ptr long) @ stub IoInvalidateDeviceState @ stub IoIsFileOriginRemote @ stub IoIsOperationSynchronous diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1c00fda..918797e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1235,6 +1235,7 @@ PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); +void WINAPI IoInvalidateDeviceRelations(PDEVICE_OBJECT,DEVICE_RELATION_TYPE); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0