June 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_material_uniform ().
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 7fc2b67228e2f91b1d1a9e57883f5f7d44a20a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fc2b67228e2f91b1d1a9e57… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_material_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8778c61..3da8961 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1341,10 +1341,10 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); } -static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (state->render_states[WINED3D_RS_SPECULARENABLE]) { @@ -1615,7 +1615,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context } if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) - shader_glsl_ffp_vertex_material_uniform(context, state, prog); + shader_glsl_ffp_vertex_material_uniform(context_gl, state, prog); if (update_mask & WINED3D_SHADER_CONST_FFP_LIGHTS) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_lightambient_uniform ().
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: e0ff34913e866eef93af184152c5945a4cae002d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ff34913e866eef93af1841… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_lightambient_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3da8961..ac4c167 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1363,10 +1363,10 @@ static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context checkGLcall("setting FFP material uniforms"); } -static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_color color; wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_AMBIENT]); @@ -1654,7 +1654,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context directional_idx = spot_idx + spot_count; parallel_point_idx = directional_idx + directional_count; - shader_glsl_ffp_vertex_lightambient_uniform(context, state, prog); + shader_glsl_ffp_vertex_lightambient_uniform(context_gl, state, prog); for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { const struct wined3d_light_info *light_info = state->light_state.lights[i];

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_light_uniform ().
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 68c665576bf95fd6333ee01158ad380e9ddff12e URL: https://source.winehq.org/git/wine.git/?a=commit;h=68c665576bf95fd6333ee011… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:22 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_light_uniform(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ac4c167..8faa421 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1374,12 +1374,12 @@ static void shader_glsl_ffp_vertex_lightambient_uniform(const struct wined3d_con checkGLcall("glUniform3fv"); } -static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_light_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, unsigned int light, const struct wined3d_light_info *light_info, struct glsl_shader_prog_link *prog) { const struct wined3d_matrix *view = &state->transforms[WINED3D_TS_VIEW]; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_vec4 vec4; GL_EXTCALL(glUniform4fv(prog->vs.light_location[light].diffuse, 1, &light_info->OriginalParms.diffuse.r)); @@ -1681,7 +1681,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context FIXME("Unhandled light type %#x.\n", light_info->OriginalParms.type); continue; } - shader_glsl_ffp_vertex_light_uniform(context, state, idx, light_info, prog); + shader_glsl_ffp_vertex_light_uniform(context_gl, state, idx, light_info, prog); } }

1 0

Henri Verbeet : wined3d: Handle Windows 8.1 in wined3d_driver_info_init().
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 0bcb2de66a3d98a291c1e432b1a9c88c17def4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bcb2de66a3d98a291c1e432… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 26 15:24:23 2019 +0430 wined3d: Handle Windows 8.1 in wined3d_driver_info_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 313e522..c052918 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -115,11 +115,13 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) * The driver version has the form "x.y.z.w". * * "x" is the Windows version the driver is meant for: - * 4 -> 95/98/NT4 - * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Win 7 + * 4 -> 95/98/NT4 + * 5 -> 2000 + * 6 -> 2000/XP + * 7 -> Vista + * 8 -> Windows 7 + * 9 -> Windows 8 + * 10 -> Windows 10 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -589,7 +591,7 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, } else { - if (os_version.dwMinorVersion > 2) + if (os_version.dwMinorVersion > 3) { FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", os_version.dwMajorVersion, os_version.dwMinorVersion);

1 0

Nikolay Sivov : mshtml: Add IDocumentRange stub.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 2451f06bf65b4188729611c72016b9c5615c0bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2451f06bf65b4188729611c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 25 21:49:20 2019 +0300 mshtml: Add IDocumentRange stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 ++ include/mshtmdid.h | 3 ++ include/mshtml.idl | 16 +++++++++ 5 files changed, 105 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 87ee8e6..7595ad8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5159,6 +5159,85 @@ static const IDisplayServicesVtbl DisplayServicesVtbl = { DisplayServices_HasFlowLayout }; +/********************************************************** + * IDocumentRange implementation + */ +static inline HTMLDocument *impl_from_IDocumentRange(IDocumentRange *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentRange_iface); +} + +static HRESULT WINAPI DocumentRange_QueryInterface(IDocumentRange *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentRange_AddRef(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentRange_Release(IDocumentRange *iface) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfoCount(IDocumentRange *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentRange_GetTypeInfo(IDocumentRange *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentRange_GetIDsOfNames(IDocumentRange *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentRange_Invoke(IDocumentRange *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentRange_createRange(IDocumentRange *iface, IHTMLDOMRange **p) +{ + HTMLDocument *This = impl_from_IDocumentRange(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IDocumentRangeVtbl DocumentRangeVtbl = { + DocumentRange_QueryInterface, + DocumentRange_AddRef, + DocumentRange_Release, + DocumentRange_GetTypeInfoCount, + DocumentRange_GetTypeInfo, + DocumentRange_GetIDsOfNames, + DocumentRange_Invoke, + DocumentRange_createRange, +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5243,6 +5322,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupContainer_iface; else if(IsEqualGUID(&IID_IDisplayServices, riid)) *ppv = &This->IDisplayServices_iface; + else if(IsEqualGUID(&IID_IDocumentRange, riid)) + *ppv = &This->IDocumentRange_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5294,6 +5375,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; + doc->IDocumentRange_iface.lpVtbl = &DocumentRangeVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6bfce89..ef56f1d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -144,6 +144,7 @@ typedef struct EventTarget EventTarget; XIID(IDOMMouseEvent) \ XIID(IDOMUIEvent) \ XIID(IDocumentEvent) \ + XIID(IDocumentRange) \ XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ @@ -626,6 +627,7 @@ struct HTMLDocument { IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; IDisplayServices IDisplayServices_iface; + IDocumentRange IDocumentRange_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f6eebbc..586df7d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -171,6 +171,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, @@ -190,6 +191,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument3, &IID_IHTMLDocument4, &IID_IHTMLDocument5, + &IID_IDocumentRange, &IID_IDocumentSelector, &IID_IDispatchEx, &IID_IDisplayServices, diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 82055f6..87b8877 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -4711,4 +4711,7 @@ #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTOR DISPID_OMDOCUMENT+105 #define DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL DISPID_OMDOCUMENT+106 +/* IDocumentRange */ +#define DISPID_IDOCUMENTRANGE_CREATERANGE DISPID_OMDOCUMENT+111 + #endif /* __MSHTMDID_H__ */ diff --git a/include/mshtml.idl b/include/mshtml.idl index f7ebd9e..aea888b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -23451,6 +23451,19 @@ interface IDocumentSelector : IDispatch [out, retval] IHTMLDOMChildrenCollection **pel); } +[ + odl, + oleautomation, + dual, + uuid(305104af-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDocumentRange : IDispatch +{ + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + HRESULT createRange( + [out, retval] IHTMLDOMRange **ppIHTMLDOMRange); +} + /***************************************************************************** * DispHTMLDocument dispinterface */ @@ -24058,6 +24071,9 @@ methods: [id(DISPID_IDOCUMENTSELECTOR_QUERYSELECTORALL)] IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); + + [id(DISPID_IDOCUMENTRANGE_CREATERANGE)] + IHTMLDOMRange *createRange(); } /*****************************************************************************

1 0

Hans Leidekker : include: Use WS_ prefix with struct timeval.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 943d91c8b50944a50e00ea161a047c56ad9792bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=943d91c8b50944a50e00ea16… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 26 18:26:45 2019 +0200 include: Use WS_ prefix with struct timeval. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- include/ws2tcpip.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a302612..3b78f0d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7098,7 +7098,7 @@ end: * GetAddrInfoExW (WS2_32.@) */ int WINAPI GetAddrInfoExW(const WCHAR *name, const WCHAR *servname, DWORD namespace, GUID *namespace_id, - const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct timeval *timeout, OVERLAPPED *overlapped, + const ADDRINFOEXW *hints, ADDRINFOEXW **result, struct WS_timeval *timeout, OVERLAPPED *overlapped, LPLOOKUPSERVICE_COMPLETION_ROUTINE completion_routine, HANDLE *handle) { int ret; diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index f12deec..ea19ee3 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -178,9 +178,9 @@ int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,s #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct timeval*, +int WINAPI GetAddrInfoExA(const char*,const char*,DWORD,GUID*,const ADDRINFOEXA*,ADDRINFOEXA**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); -int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct timeval*, +int WINAPI GetAddrInfoExW(const WCHAR*,const WCHAR*,DWORD,GUID*, const ADDRINFOEXW*,ADDRINFOEXW**,struct WS(timeval)*, OVERLAPPED*,LPLOOKUPSERVICE_COMPLETION_ROUTINE,HANDLE*); #define GetAddrInfoEx WINELIB_NAME_AW(GetAddrInfoExW) int WINAPI GetAddrInfoExOverlappedResult(OVERLAPPED*);

1 0

Zebediah Figura : quartz/parser: Store the source pins as an array of Parser_OutputPin pointers.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 8f4194f311ec38223349359fa73d8a4e5cfb1193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f4194f311ec38223349359f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:14 2019 -0500 quartz/parser: Store the source pins as an array of Parser_OutputPin pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avisplit.c | 18 ++++------- dlls/quartz/mpegsplit.c | 12 +++---- dlls/quartz/parser.c | 82 +++++++++++++++++++++--------------------------- dlls/quartz/parser.h | 24 +++++++------- dlls/quartz/waveparser.c | 20 +++++------- 5 files changed, 66 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f4194f311ec38223349…

1 0

Zebediah Figura : quartz/vmr9: Return S_OK when calling IVMRFilterConfig9: :SetNumberOfStreams(1).
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 46bb907d3a4b1670001ae00c5c0281d215488d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46bb907d3a4b1670001ae00c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 20:38:15 2019 -0500 quartz/vmr9: Return S_OK when calling IVMRFilterConfig9::SetNumberOfStreams(1). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47291 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 38c708b..e5efc16 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1354,11 +1354,11 @@ static HRESULT WINAPI VMR9FilterConfig_SetImageCompositor(IVMRFilterConfig9 *ifa return E_NOTIMPL; } -static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD max) +static HRESULT WINAPI VMR9FilterConfig_SetNumberOfStreams(IVMRFilterConfig9 *iface, DWORD count) { - struct quartz_vmr *This = impl_from_IVMRFilterConfig9(iface); - - FIXME("(%p/%p)->(%u) stub\n", iface, This, max); + FIXME("iface %p, count %u, stub!\n", iface, count); + if (count == 1) + return S_OK; return E_NOTIMPL; }

1 0

Zebediah Figura : ntoskrnl.exe: Handle some no-op PnP requests.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 13e9d4312786ef2a33bdd5ecdd98879057fb2bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13e9d4312786ef2a33bdd5ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 21:35:15 2019 -0500 ntoskrnl.exe: Handle some no-op PnP requests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 48430f3..90da2b7 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -785,6 +785,18 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); + switch (stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + case IRP_MN_SURPRISE_REMOVAL: + case IRP_MN_REMOVE_DEVICE: + /* Nothing to do. */ + irp->IoStatus.u.Status = STATUS_SUCCESS; + break; + default: + FIXME("Unhandled PnP request %#x.\n", stack->MinorFunction); + } + IoCompleteRequest( irp, IO_NO_INCREMENT ); return irp->IoStatus.u.Status; }

1 0

Zebediah Figura : ntoskrnl.exe: Handle IRP_MN_QUERY_ID for root PnP devices.
by Alexandre Julliard 26 Jun '19

26 Jun '19

Module: wine Branch: master Commit: 816e25c1949a6d0bc6c98e599923768eba9e91b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=816e25c1949a6d0bc6c98e59… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 25 21:35:16 2019 -0500 ntoskrnl.exe: Handle IRP_MN_QUERY_ID for root PnP devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 90da2b7..f531527 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -782,6 +782,7 @@ static struct wine_rb_tree root_pnp_devices = { root_pnp_devices_rb_compare }; static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); + struct root_pnp_device *root_device = device->DeviceExtension; TRACE("device %p, irp %p, minor function %#x.\n", device, irp, stack->MinorFunction); @@ -793,6 +794,49 @@ static NTSTATUS WINAPI pnp_manager_device_pnp( DEVICE_OBJECT *device, IRP *irp ) /* Nothing to do. */ irp->IoStatus.u.Status = STATUS_SUCCESS; break; + case IRP_MN_QUERY_ID: + { + BUS_QUERY_ID_TYPE type = stack->Parameters.QueryId.IdType; + WCHAR *id, *p; + + TRACE("Received IRP_MN_QUERY_ID, type %#x.\n", type); + + switch (type) + { + case BusQueryDeviceID: + p = wcsrchr( root_device->id, '\\' ); + if ((id = ExAllocatePool( NonPagedPool, (p - root_device->id + 1) * sizeof(WCHAR) ))) + { + memcpy( id, root_device->id, (p - root_device->id) * sizeof(WCHAR) ); + id[p - root_device->id] = 0; + irp->IoStatus.Information = (ULONG_PTR)id; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_NO_MEMORY; + } + break; + case BusQueryInstanceID: + p = wcsrchr( root_device->id, '\\' ); + if ((id = ExAllocatePool( NonPagedPool, (wcslen( p + 1 ) + 1) * sizeof(WCHAR) ))) + { + wcscpy( id, p + 1 ); + irp->IoStatus.Information = (ULONG_PTR)id; + irp->IoStatus.u.Status = STATUS_SUCCESS; + } + else + { + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = STATUS_NO_MEMORY; + } + break; + default: + FIXME("Unhandled IRP_MN_QUERY_ID type %#x.\n", type); + } + break; + } default: FIXME("Unhandled PnP request %#x.\n", stack->MinorFunction); }

1 0