August 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Do not depend on libxml2 for DOM implementation object.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 2cc7180f3caafbab47f22fce72a4a3b6c0230696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc7180f3caafbab47f22fce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 17:29:01 2021 +0300 msxml3: Do not depend on libxml2 for DOM implementation object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domimpl.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 74223d5d54e..52f2e40dc9e 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -20,13 +20,7 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -#endif #include "windef.h" #include "winbase.h" @@ -34,12 +28,10 @@ #include "ole2.h" #include "msxml6.h" -#include "msxml_private.h" +#include "msxml_dispex.h" #include "wine/debug.h" -#ifdef HAVE_LIBXML2 - WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domimpl @@ -211,5 +203,3 @@ IUnknown* create_doc_Implementation(void) return (IUnknown*)&This->IXMLDOMImplementation_iface; } - -#endif

1 0

Nikolay Sivov : msxml3/domimpl: Cleanup object creation helper.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 24d81667dcd832dea5874680273d2caf0d45f67d URL: https://source.winehq.org/git/wine.git/?a=commit;h=24d81667dcd832dea5874680… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 17:29:02 2021 +0300 msxml3/domimpl: Cleanup object creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 4 +--- dlls/msxml3/domimpl.c | 19 ++++++++++--------- dlls/msxml3/msxml_private.h | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 10892d40757..e8b5445df19 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1642,9 +1642,7 @@ static HRESULT WINAPI domdoc_get_implementation( if(!impl) return E_INVALIDARG; - *impl = (IXMLDOMImplementation*)create_doc_Implementation(); - - return S_OK; + return create_dom_implementation(impl); } static HRESULT WINAPI domdoc_get_documentElement( diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 52f2e40dc9e..b7db00f4667 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -189,17 +189,18 @@ static dispex_static_data_t dimimpl_dispex = { dimimpl_iface_tids }; -IUnknown* create_doc_Implementation(void) +HRESULT create_dom_implementation(IXMLDOMImplementation **ret) { - domimpl *This; + domimpl *object; - This = heap_alloc( sizeof *This ); - if ( !This ) - return NULL; + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; - This->IXMLDOMImplementation_iface.lpVtbl = &dimimpl_vtbl; - This->ref = 1; - init_dispex(&This->dispex, (IUnknown*)&This->IXMLDOMImplementation_iface, &dimimpl_dispex); + object->IXMLDOMImplementation_iface.lpVtbl = &dimimpl_vtbl; + object->ref = 1; + init_dispex(&object->dispex, (IUnknown *)&object->IXMLDOMImplementation_iface, &dimimpl_dispex); - return (IUnknown*)&This->IXMLDOMImplementation_iface; + *ret = &object->IXMLDOMImplementation_iface; + + return S_OK; } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d578d5de560..29b1156775c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -180,12 +180,12 @@ extern IUnknown *create_comment( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_cdata( xmlNodePtr ) DECLSPEC_HIDDEN; extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ) DECLSPEC_HIDDEN; extern IXMLDOMNamedNodeMap *create_nodemap( xmlNodePtr, const struct nodemap_funcs* ) DECLSPEC_HIDDEN; -extern IUnknown *create_doc_Implementation(void) DECLSPEC_HIDDEN; extern IUnknown *create_doc_fragment( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_doc_entity_ref( xmlNodePtr ) DECLSPEC_HIDDEN; extern IUnknown *create_doc_type( xmlNodePtr ) DECLSPEC_HIDDEN; extern HRESULT create_selection( xmlNodePtr, xmlChar*, IXMLDOMNodeList** ) DECLSPEC_HIDDEN; extern HRESULT create_enumvariant( IUnknown*, BOOL, const struct enumvariant_funcs*, IEnumVARIANT**) DECLSPEC_HIDDEN; +extern HRESULT create_dom_implementation(IXMLDOMImplementation **obj) DECLSPEC_HIDDEN; /* data accessors */ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msxml3/domimpl: Fixup method functions names.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 43842041068770a1caac1812fc0fadcd0a0a1d12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43842041068770a1caac1812… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 17:29:03 2021 +0300 msxml3/domimpl: Fixup method functions names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domimpl.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index b7db00f4667..3e5b912efd2 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -46,7 +46,7 @@ static inline domimpl *impl_from_IXMLDOMImplementation( IXMLDOMImplementation *i return CONTAINING_RECORD(iface, domimpl, IXMLDOMImplementation_iface); } -static HRESULT WINAPI dimimpl_QueryInterface( +static HRESULT WINAPI domimpl_QueryInterface( IXMLDOMImplementation *iface, REFIID riid, void** ppvObject ) @@ -76,7 +76,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( return S_OK; } -static ULONG WINAPI dimimpl_AddRef( +static ULONG WINAPI domimpl_AddRef( IXMLDOMImplementation *iface ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); @@ -85,7 +85,7 @@ static ULONG WINAPI dimimpl_AddRef( return ref; } -static ULONG WINAPI dimimpl_Release( +static ULONG WINAPI domimpl_Release( IXMLDOMImplementation *iface ) { domimpl *This = impl_from_IXMLDOMImplementation( iface ); @@ -98,7 +98,7 @@ static ULONG WINAPI dimimpl_Release( return ref; } -static HRESULT WINAPI dimimpl_GetTypeInfoCount( +static HRESULT WINAPI domimpl_GetTypeInfoCount( IXMLDOMImplementation *iface, UINT* pctinfo ) { @@ -106,7 +106,7 @@ static HRESULT WINAPI dimimpl_GetTypeInfoCount( return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } -static HRESULT WINAPI dimimpl_GetTypeInfo( +static HRESULT WINAPI domimpl_GetTypeInfo( IXMLDOMImplementation *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo ) @@ -116,7 +116,7 @@ static HRESULT WINAPI dimimpl_GetTypeInfo( iTInfo, lcid, ppTInfo); } -static HRESULT WINAPI dimimpl_GetIDsOfNames( +static HRESULT WINAPI domimpl_GetIDsOfNames( IXMLDOMImplementation *iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId ) @@ -126,7 +126,7 @@ static HRESULT WINAPI dimimpl_GetIDsOfNames( riid, rgszNames, cNames, lcid, rgDispId); } -static HRESULT WINAPI dimimpl_Invoke( +static HRESULT WINAPI domimpl_Invoke( IXMLDOMImplementation *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, @@ -137,7 +137,7 @@ static HRESULT WINAPI dimimpl_Invoke( dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } -static HRESULT WINAPI dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR feature, BSTR version, VARIANT_BOOL *hasFeature) +static HRESULT WINAPI domimpl_hasFeature(IXMLDOMImplementation* This, BSTR feature, BSTR version, VARIANT_BOOL *hasFeature) { static const WCHAR bVersion[] = {'1','.','0',0}; static const WCHAR bXML[] = {'X','M','L',0}; @@ -165,28 +165,30 @@ static HRESULT WINAPI dimimpl_hasFeature(IXMLDOMImplementation* This, BSTR featu return S_OK; } -static const struct IXMLDOMImplementationVtbl dimimpl_vtbl = +static const struct IXMLDOMImplementationVtbl domimpl_vtbl = { - dimimpl_QueryInterface, - dimimpl_AddRef, - dimimpl_Release, - dimimpl_GetTypeInfoCount, - dimimpl_GetTypeInfo, - dimimpl_GetIDsOfNames, - dimimpl_Invoke, - dimimpl_hasFeature + domimpl_QueryInterface, + domimpl_AddRef, + domimpl_Release, + domimpl_GetTypeInfoCount, + domimpl_GetTypeInfo, + domimpl_GetIDsOfNames, + domimpl_Invoke, + domimpl_hasFeature }; -static const tid_t dimimpl_iface_tids[] = { +static const tid_t domimpl_iface_tids[] = +{ IXMLDOMImplementation_tid, 0 }; -static dispex_static_data_t dimimpl_dispex = { +static dispex_static_data_t domimpl_dispex = +{ NULL, IXMLDOMImplementation_tid, NULL, - dimimpl_iface_tids + domimpl_iface_tids }; HRESULT create_dom_implementation(IXMLDOMImplementation **ret) @@ -196,9 +198,9 @@ HRESULT create_dom_implementation(IXMLDOMImplementation **ret) if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; - object->IXMLDOMImplementation_iface.lpVtbl = &dimimpl_vtbl; + object->IXMLDOMImplementation_iface.lpVtbl = &domimpl_vtbl; object->ref = 1; - init_dispex(&object->dispex, (IUnknown *)&object->IXMLDOMImplementation_iface, &dimimpl_dispex); + init_dispex(&object->dispex, (IUnknown *)&object->IXMLDOMImplementation_iface, &domimpl_dispex); *ret = &object->IXMLDOMImplementation_iface;

1 0

Nikolay Sivov : msxml3: Do not depend on libxml2 for legacy IXMLParser object stub.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 141155e74cc940015f3ed107ea1e5793c0baaf9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=141155e74cc940015f3ed107… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 17:29:04 2021 +0300 msxml3: Do not depend on libxml2 for legacy IXMLParser object stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/xmlparser.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index 6fcdb82c56b..0fcb9e34340 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -19,27 +19,15 @@ */ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -# include <libxml/HTMLtree.h> -#endif - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" -#include "msxml6.h" -#include "msxml_private.h" +#include "ole2.h" #include "initguid.h" #include "xmlparser.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml);

1 0

Nikolay Sivov : msxml3: Do not depend on libxml2 for parser error object.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 0fece8d99e0b9ae8e4d43d205dd289ec522188b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fece8d99e0b9ae8e4d43d20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 17:29:05 2021 +0300 msxml3: Do not depend on libxml2 for parser error object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/parseerror.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 2ca0885708d..9fb3ceca9c3 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -21,22 +21,12 @@ #define COBJMACROS -#include "config.h" - #include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -# include <libxml/xmlerror.h> -#endif - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winuser.h" + #include "ole2.h" #include "msxml6.h" -#include "msxml_private.h" +#include "msxml_dispex.h" #include "wine/debug.h"

1 0

Nikolay Sivov : include: Add ID3DX10Mesh definition.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 197489cd0e63b1f5c9bb6d74465aeae6b591ab79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=197489cd0e63b1f5c9bb6d74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 19 20:07:02 2021 +0300 include: Add ID3DX10Mesh definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 ++ include/d3dx10.h | 1 + include/d3dx10mesh.h | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0163b9b0951..43a4fd98a42 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -144,6 +144,7 @@ SOURCES = \ d3dx10async.h \ d3dx10core.h \ d3dx10math.h \ + d3dx10mesh.h \ d3dx10tex.h \ d3dx11.h \ d3dx11async.h \ @@ -181,6 +182,7 @@ SOURCES = \ ddk/d3dkmthk.h \ ddk/fltkernel.h \ ddk/hidclass.h \ + ddk/hidpddi.h \ ddk/hidpi.h \ ddk/hidport.h \ ddk/hidsdi.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index 7062d24ea09..cb7b65c53cc 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -31,6 +31,7 @@ #include "d3dx10core.h" #include "d3dx10async.h" #include "d3dx10tex.h" +#include "d3dx10mesh.h" #define _FACDD 0x876 #define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) diff --git a/include/d3dx10mesh.h b/include/d3dx10mesh.h new file mode 100644 index 00000000000..d813ef68df2 --- /dev/null +++ b/include/d3dx10mesh.h @@ -0,0 +1,99 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx10.h" + +DEFINE_GUID(IID_ID3DX10Mesh, 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95); +DEFINE_GUID(IID_ID3DX10MeshBuffer, 0x4b0d117, 0x1041, 0x46b1, 0xaa, 0x8a, 0x39, 0x52, 0x84, 0x8b, 0xa2, 0x2e); + +typedef enum _D3DX10_MESH_DISCARD_FLAGS +{ + D3DX10_MESH_DISCARD_ATTRIBUTE_BUFFER = 0x01, + D3DX10_MESH_DISCARD_ATTRIBUTE_TABLE = 0x02, + D3DX10_MESH_DISCARD_POINTREPS = 0x04, + D3DX10_MESH_DISCARD_ADJACENCY = 0x08, + D3DX10_MESH_DISCARD_DEVICE_BUFFERS = 0x10, +} D3DX10_MESH_DISCARD_FLAGS; + +typedef struct _D3DX10_ATTRIBUTE_RANGE +{ + UINT AttribId; + UINT FaceStart; + UINT FaceCount; + UINT VertexStart; + UINT VertexCount; +} D3DX10_ATTRIBUTE_RANGE; +typedef D3DX10_ATTRIBUTE_RANGE* LPD3DX10_ATTRIBUTE_RANGE; + +#define INTERFACE ID3DX10MeshBuffer +DECLARE_INTERFACE_(ID3DX10MeshBuffer, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10MeshBuffer methods ***/ + STDMETHOD(Map)(THIS_ void **data, SIZE_T *size) PURE; + STDMETHOD(Unmap)(THIS) PURE; + STDMETHOD_(SIZE_T, GetSize)(THIS) PURE; +}; +#undef INTERFACE + +#define INTERFACE ID3DX10Mesh +DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10Mesh methods ***/ + STDMETHOD_(UINT, GetFaceCount)(THIS) PURE; + STDMETHOD_(UINT, GetVertexCount)(THIS) PURE; + STDMETHOD_(UINT, GetVertexBufferCount)(THIS) PURE; + STDMETHOD_(UINT, GetFlags)(THIS) PURE; + STDMETHOD(GetVertexDescription)(THIS_ const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) PURE; + STDMETHOD(SetVertexData)(THIS_ UINT index, const void *data) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ UINT index, ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetIndexData)(THIS_ const void *data, UINT count) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetAttributeData)(THIS_ const UINT *data) PURE; + STDMETHOD(GetAttributeBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetAttributeTable)(THIS_ const D3DX10_ATTRIBUTE_RANGE *table, UINT size) PURE; + STDMETHOD(GetAttributeTable)(THIS_ D3DX10_ATTRIBUTE_RANGE *table, UINT *size) PURE; + STDMETHOD(GenerateAdjacencyAndPointReps)(THIS_ float epsilon) PURE; + STDMETHOD(GenerateGSAdjacency)(THIS) PURE; + STDMETHOD(SetAdjacencyData)(THIS_ const UINT *adjacency) PURE; + STDMETHOD(GetAdjacenctBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetPointRepData)(THIS_ const UINT *pointreps) PURE; + STDMETHOD(GetPointRepBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(Discard)(THIS_ D3DX10_MESH_DISCARD_FLAGS flags) PURE; + STDMETHOD(CloneMesh)(THIS_ UINT flags, const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, + UINT decl_count, ID3DX10Mesh **cloned_mesh); + STDMETHOD(Optimize)(THIS_ UINT flags, UINT *face_remap, ID3D10Blob **vertex_remap) PURE; + STDMETHOD(GenerateAttributeBufferFromTable)(THIS) PURE; + STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, + float *u, float *v, float *dist, ID3D10Blob **all_hits) PURE; + STDMETHOD(IntersectSubset)(THIS_ UINT attr_id, D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, + float *u, float *v, float *dist, ID3D10Blob **all_hits) PURE; + STDMETHOD(CommitToDevice)(THIS) PURE; + STDMETHOD(DrawSubset)(THIS_ UINT attr_id) PURE; + STDMETHOD(DrawSubsetInstanced)(THIS_ UINT attr_id, UINT instance_count, UINT start_instance) PURE; + STDMETHOD(GetDeviceVertexBuffer)(THIS_ UINT index, ID3D10Buffer **buffer) PURE; + STDMETHOD(GetDeviceIndexBuffer)(THIS_ ID3D10Buffer **buffer) PURE; +}; +#undef INTERFACE

1 0

Gerald Pfeifer : nsiproxy: Include sys/param.h.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 20c4149e7241d413d16b70b6cf058d52145c15cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c4149e7241d413d16b70b6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 18 23:13:33 2021 +0200 nsiproxy: Include sys/param.h. This fixes In file included from dlls/nsiproxy.sys/tcp.c:70: /usr/include/libprocstat.h:130:36: error: 'SPECNAMELEN' undeclared here 130 | char vn_devname[SPECNAMELEN + 1]; on FreeBSD 11 and presumably other targets. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index 3d0f3a67dd7..eda438318f0 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -22,6 +22,10 @@ #include "config.h" #include <stdarg.h> +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif

1 0

Gerald Pfeifer : nsiproxy: Include netinet/in_pcb.h.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 823532bd3ae36c99c0c5befdd6ef3341ba26914a URL: https://source.winehq.org/git/wine.git/?a=commit;h=823532bd3ae36c99c0c5befd… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:18:01 2021 +0200 nsiproxy: Include netinet/in_pcb.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/tcp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c index eda438318f0..8567330be99 100644 --- a/dlls/nsiproxy.sys/tcp.c +++ b/dlls/nsiproxy.sys/tcp.c @@ -50,6 +50,10 @@ #include <netinet/in.h> #endif +#ifdef HAVE_NETINET_IN_PCB_H +#include <netinet/in_pcb.h> +#endif + #ifdef HAVE_NETINET_IP_VAR_H #include <netinet/ip_var.h> #endif

1 0

Gerald Pfeifer : nsiproxy: Include stddef.h.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: b13c024d64068a314d0cec80c84561a3f3b2bd03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13c024d64068a314d0cec80… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:28:54 2021 +0200 nsiproxy: Include stddef.h. This is needed for size_t, which on FreeBSD is used by sys/sysctl.h. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/udp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c index 49acedcf214..b6109ef9592 100644 --- a/dlls/nsiproxy.sys/udp.c +++ b/dlls/nsiproxy.sys/udp.c @@ -20,6 +20,7 @@ */ #include "config.h" #include <stdarg.h> +#include <stddef.h> #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h>

1 0

Gerald Pfeifer : ntdll: Always return a value in get_builtin_init_funcs.
by Alexandre Julliard 19 Aug '21

19 Aug '21

Module: wine Branch: master Commit: 6468e445bd29b4c2eb006cd64623e21127ed0151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6468e445bd29b4c2eb006cd6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 19 01:36:39 2021 +0200 ntdll: Always return a value in get_builtin_init_funcs. This only showed up in the #ifdef __FreeBSD__ case, so did not appear on other platforms during testing. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a8e145de16e..2dde2332a6a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1729,7 +1729,8 @@ NTSTATUS get_builtin_init_funcs( void *handle, void **funcs, SIZE_T len, SIZE_T #ifdef __FreeBSD__ /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ if (offsetof(struct link_map, l_addr) == 0) - if (!get_relocbase(map->l_addr, &relocbase)) return; + if (!get_relocbase(map->l_addr, &relocbase)) + return STATUS_NOT_SUPPORTED; #endif switch (dyn->d_tag) {

1 0