wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Nikolay Sivov : d2d1: Return bitmap options.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: bccd14f2f6c8758e14b67ffdd11f7ef2f35f5e2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bccd14f2f6c8758e14b67ffd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 21:04:47 2018 +0430 d2d1: Return bitmap options. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 47 ++++++++++++++------- dlls/d2d1/d2d1_private.h | 7 +-- dlls/d2d1/device.c | 40 +++++++++++++++--- dlls/d2d1/tests/d2d1.c | 108 +++++++++++++++++++++++++---------------------- 4 files changed, 126 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bccd14f2f6c8758e14b6…

1 0

Henri Verbeet : wined3d: Use a table for colour fixups in apply_format_fixups().
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 39e19d2d217fe312ba32764c81621919c6d1dd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39e19d2d217fe312ba32764c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 21:04:46 2018 +0430 wined3d: Use a table for colour fixups in apply_format_fixups(). This ends up being slightly more code, but I think the table is much more readable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 200 ++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 14 --- 2 files changed, 109 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39e19d2d217fe312ba32…

1 0

Henri Verbeet : wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[].
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: cff217f9fcc01bd7b82ce2ba310ffddb0d1f94ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=cff217f9fcc01bd7b82ce2ba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 21:04:45 2018 +0430 wined3d: Handle lack of ARB_half_float_vertex in format_vertex_info[]. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c230da..3a74fc8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -624,8 +624,11 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, ARB_VERTEX_TYPE_2_10_10_10_REV}, - {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT}, - {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT}, + /* Without ARB_half_float_vertex we convert these on upload. */ + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_FLOAT}, + {WINED3DFMT_R16G16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_2, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_FLOAT}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R8G8B8A8_SINT, WINED3D_FFP_EMIT_INVALID, GL_BYTE}, {WINED3DFMT_R16G16B16A16_UINT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_SHORT}, @@ -3556,17 +3559,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. - * It is the job of the vertex buffer code to make sure that the vbos have the right format */ - format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - - format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); - format->gl_vtx_type = GL_FLOAT; - } - if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT);

1 0

Henri Verbeet : wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info().
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 05792f647622f02a9407d479c90fb32b03e42b95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05792f647622f02a9407d479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 13 21:04:44 2018 +0430 wined3d: Move ARB_vertex_array_bgra handling to init_format_vertex_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 54b7bce..0c230da 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3556,12 +3556,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } - if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) - { - format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); - format->gl_vtx_format = GL_BGRA; - } - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. @@ -3690,6 +3684,12 @@ static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, format->gl_vtx_format = format->component_count; } + if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + { + format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->gl_vtx_format = GL_BGRA; + } + return TRUE; }

1 0

Nikolay Sivov : include: Add ID2D1DrawingStateBlock1 definition.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 49647cb32cbf6980d6a0584cc71c01f6bbd56956 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49647cb32cbf6980d6a0584c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 13 11:07:57 2018 +0300 include: Add ID2D1DrawingStateBlock1 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_1.idl | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 1118226..ff283f8 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -21,7 +21,6 @@ import "d2d1.idl"; interface ID2D1DeviceContext; interface ID2D1StrokeStyle1; interface ID2D1PathGeometry1; -interface ID2D1DrawingStateBlock1; interface ID2D1GdiMetafile; interface ID2D1Properties; interface IPrintDocumentPackageTarget; @@ -253,6 +252,21 @@ typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); [ object, + uuid(689f1f85-c72e-4e33-8f19-85754efd5ace), + local, +] +interface ID2D1DrawingStateBlock1 : ID2D1DrawingStateBlock +{ + void GetDescription( + [out] D2D1_DRAWING_STATE_DESCRIPTION1 *desc + ); + void SetDescription( + [in] const D2D1_DRAWING_STATE_DESCRIPTION1 *desc + ); +} + +[ + object, uuid(a898a84c-3873-4588-b08b-ebbf978df041), local, ]

1 0

Alexandre Julliard : winex11: Make pixel format traces more compact.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 92434118375ae725c835d012751cf0e06565c950 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92434118375ae725c835d012… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 16:17:37 2018 +0200 winex11: Make pixel format traces more compact. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7aa6448..0b0fd51 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -297,8 +297,11 @@ static void init_pixel_formats( Display *display ); static BOOL glxRequireVersion(int requiredVersion); static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { - TRACE(" - size / version : %d / %d\n", ppfd->nSize, ppfd->nVersion); - TRACE(" - dwFlags : "); + TRACE( "size %u version %u flags %u type %u color %u %u,%u,%u,%u " + "accum %u depth %u stencil %u aux %u ", + ppfd->nSize, ppfd->nVersion, ppfd->dwFlags, ppfd->iPixelType, + ppfd->cColorBits, ppfd->cRedBits, ppfd->cGreenBits, ppfd->cBlueBits, ppfd->cAlphaBits, + ppfd->cAccumBits, ppfd->cDepthBits, ppfd->cStencilBits, ppfd->cAuxBuffers ); #define TEST_AND_DUMP(t,tv) if ((t) & (tv)) TRACE(#tv " ") TEST_AND_DUMP(ppfd->dwFlags, PFD_DEPTH_DONTCARE); TEST_AND_DUMP(ppfd->dwFlags, PFD_DOUBLEBUFFER); @@ -321,31 +324,6 @@ static void dump_PIXELFORMATDESCRIPTOR(const PIXELFORMATDESCRIPTOR *ppfd) { TEST_AND_DUMP(ppfd->dwFlags, PFD_SUPPORT_COMPOSITION); #undef TEST_AND_DUMP TRACE("\n"); - - TRACE(" - iPixelType : "); - switch (ppfd->iPixelType) { - case PFD_TYPE_RGBA: TRACE("PFD_TYPE_RGBA"); break; - case PFD_TYPE_COLORINDEX: TRACE("PFD_TYPE_COLORINDEX"); break; - } - TRACE("\n"); - - TRACE(" - Color : %d\n", ppfd->cColorBits); - TRACE(" - Red : %d\n", ppfd->cRedBits); - TRACE(" - Green : %d\n", ppfd->cGreenBits); - TRACE(" - Blue : %d\n", ppfd->cBlueBits); - TRACE(" - Alpha : %d\n", ppfd->cAlphaBits); - TRACE(" - Accum : %d\n", ppfd->cAccumBits); - TRACE(" - Depth : %d\n", ppfd->cDepthBits); - TRACE(" - Stencil : %d\n", ppfd->cStencilBits); - TRACE(" - Aux : %d\n", ppfd->cAuxBuffers); - - TRACE(" - iLayerType : "); - switch (ppfd->iLayerType) { - case PFD_MAIN_PLANE: TRACE("PFD_MAIN_PLANE"); break; - case PFD_OVERLAY_PLANE: TRACE("PFD_OVERLAY_PLANE"); break; - case (BYTE)PFD_UNDERLAY_PLANE: TRACE("PFD_UNDERLAY_PLANE"); break; - } - TRACE("\n"); } #define PUSH1(attribs,att) do { attribs[nAttribs++] = (att); } while (0)

1 0

Alexandre Julliard : server: Remove unnecessary structure names.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 3a5292eba7c99c0ae75d268d4ec35bf1a8b44f45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a5292eba7c99c0ae75d268d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 13 16:17:06 2018 +0200 server: Remove unnecessary structure names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 10 +++++----- server/protocol.def | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 52c6d1f..0b61b91 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1776,27 +1776,27 @@ struct console_renderer_event short event; union { - struct update + struct { short top; short bottom; } update; - struct resize + struct { short width; short height; } resize; - struct cursor_pos + struct { short x; short y; } cursor_pos; - struct cursor_geom + struct { short visible; short size; } cursor_geom; - struct display + struct { short left; short top; diff --git a/server/protocol.def b/server/protocol.def index 936eb36..8bff5d8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1413,27 +1413,27 @@ struct console_renderer_event short event; union { - struct update + struct { short top; short bottom; } update; - struct resize + struct { short width; short height; } resize; - struct cursor_pos + struct { short x; short y; } cursor_pos; - struct cursor_geom + struct { short visible; short size; } cursor_geom; - struct display + struct { short left; short top;

1 0

Huw Davies : ntoskrnl: Allow space for the '\0'.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 9f74c00e069ff0de4be96262f61b93839f8913cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f74c00e069ff0de4be96262… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 13 10:48:58 2018 +0100 ntoskrnl: Allow space for the '\0'. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 804a938..18524af 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1353,7 +1353,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) return STATUS_INVALID_PARAMETER; - len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Dynamically allocate hwndText so it can handle arbitrary sizes.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: cbbbb70cf2780f8981aff9cccbafcfa3adfb3732 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbbbb70cf2780f8981aff9cc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 12 22:42:15 2018 +0300 shell32/autocomplete: Dynamically allocate hwndText so it can handle arbitrary sizes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6f97665..9f35ff7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -134,10 +134,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, { IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; - WCHAR hwndText[255]; + WCHAR *hwndText; + UINT len, size, cpt; RECT r; BOOL displayall = FALSE; - int cpt, height, sel; + int height, sel; if (!This->enabled) return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); @@ -154,10 +155,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); case WM_KEYUP: - { - int len; - - GetWindowTextW(hwnd, hwndText, ARRAY_SIZE(hwndText)); + len = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); + size = len + 1; + if (!(hwndText = heap_alloc(size * sizeof(WCHAR)))) + return 0; + len = SendMessageW(hwnd, WM_GETTEXT, size, (LPARAM)hwndText); switch(wParam) { case VK_RETURN: @@ -165,7 +167,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (This->quickComplete && (GetKeyState(VK_CONTROL) & 0x8000)) { WCHAR *buf; - size_t len = strlenW(hwndText); size_t sz = strlenW(This->quickComplete) + 1 + len; if ((buf = heap_alloc(sz * sizeof(WCHAR)))) { @@ -178,9 +179,11 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, if (This->options & ACO_AUTOSUGGEST) ShowWindow(This->hwndListBox, SW_HIDE); + heap_free(hwndText); return 0; case VK_LEFT: case VK_RIGHT: + heap_free(hwndText); return 0; case VK_UP: case VK_DOWN: @@ -196,6 +199,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* We must display all the entries */ displayall = TRUE; } else { + heap_free(hwndText); if (IsWindowVisible(This->hwndListBox)) { int count; @@ -231,21 +235,23 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, case VK_BACK: case VK_DELETE: if ((! *hwndText) && (This->options & ACO_AUTOSUGGEST)) { + heap_free(hwndText); ShowWindow(This->hwndListBox, SW_HIDE); return CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); } break; } + if (len + 1 != size) + hwndText = heap_realloc(hwndText, (len + 1) * sizeof(WCHAR)); + SendMessageW(This->hwndListBox, LB_RESETCONTENT, 0, 0); + /* Set txtbackup to point to hwndText itself (which must not be released) */ heap_free(This->txtbackup); - len = strlenW(hwndText); - This->txtbackup = heap_alloc((len + 1)*sizeof(WCHAR)); - lstrcpyW(This->txtbackup, hwndText); + This->txtbackup = hwndText; - /* Returns if there is no text to search and we doesn't want to display all the entries */ - if ((!displayall) && (! *hwndText) ) + if (!displayall && !len) break; IEnumString_Reset(This->enumstr); @@ -297,7 +303,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, } break; - } case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc;

1 0

Aric Stewart : winebus.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: master Commit: 5815c7b520794c703037fefa9bdc0b796eb13493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5815c7b520794c703037fefa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 12 11:23:29 2018 -0500 winebus.sys: Implement IRP_MN_QUERY_DEVICE_RELATIONS. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index fd795f1..6b1949c 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -360,6 +360,57 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) HeapFree(GetProcessHeap(), 0, pnp_device); } +static NTSTATUS build_device_relations(DEVICE_RELATIONS **devices) +{ + int i; + struct pnp_device *ptr; + + EnterCriticalSection(&device_list_cs); + *devices = HeapAlloc(GetProcessHeap(), 0, sizeof(DEVICE_RELATIONS) + + list_count(&pnp_devset) * sizeof (void *)); + + if (!*devices) + { + LeaveCriticalSection(&device_list_cs); + return STATUS_INSUFFICIENT_RESOURCES; + } + + i = 0; + LIST_FOR_EACH_ENTRY(ptr, &pnp_devset, struct pnp_device, entry) + { + (*devices)->Objects[i] = (DEVICE_OBJECT*)ptr->device; + i++; + } + LeaveCriticalSection(&device_list_cs); + (*devices)->Count = i; + return STATUS_SUCCESS; +} + +static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) +{ + NTSTATUS status = irp->IoStatus.u.Status; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + TRACE("IRP_MN_QUERY_DEVICE_RELATIONS"); + switch (irpsp->Parameters.QueryDeviceRelations.Type) + { + case EjectionRelations: + case RemovalRelations: + case TargetDeviceRelation: + case PowerRelations: + FIXME("Unhandled Device Relation %x\n",irpsp->Parameters.QueryDeviceRelations.Type); + break; + case BusRelations: + status = build_device_relations((DEVICE_RELATIONS**)&irp->IoStatus.Information); + break; + default: + FIXME("Unknown Device Relation %x\n",irpsp->Parameters.QueryDeviceRelations.Type); + break; + } + + return status; +} + static NTSTATUS handle_IRP_MN_QUERY_ID(DEVICE_OBJECT *device, IRP *irp) { NTSTATUS status = irp->IoStatus.u.Status; @@ -404,6 +455,8 @@ NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { case IRP_MN_QUERY_DEVICE_RELATIONS: TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); + status = handle_IRP_MN_QUERY_DEVICE_RELATIONS(irp); + irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n");

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
67
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 September 2018