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

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

Aug. 19, 2021

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

Jacek Caban : gdi32: Move GetCharacterPlacementW to text.c.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 6616da70be81daf7d5fb70bb7e4567073dbf5e5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6616da70be81daf7d5fb70bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:25:57 2021 +0200 gdi32: Move GetCharacterPlacementW to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 181 -------------------------------------- dlls/gdi32/ntgdi_private.h | 17 ---- dlls/gdi32/text.c | 212 ++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 198 insertions(+), 212 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6616da70be81daf7d5fb…

1 0

Jacek Caban : gdi32: Use NtGdiStrokePath for StrokePath.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: b048e4e0df7fe546c76a617dfdc2e2b3b18b5834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b048e4e0df7fe546c76a617d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:23:24 2021 +0200 gdi32: Use NtGdiStrokePath for StrokePath. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 11 ++++++++++- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 12 ++++++++++++ dlls/gdi32/path.c | 6 ++---- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index e567808016b..691a53ce98f 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -1214,5 +1214,14 @@ BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) */ BOOL CDECL EMFDRV_StrokePath( PHYSDEV dev ) { - return emfdrv_stroke_and_fill_path( dev, EMR_STROKEPATH ); + /* FIXME: update bound rect */ + return TRUE; +} + +/********************************************************************** + * EMFDC_StrokePath + */ +BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) +{ + return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_STROKEPATH ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a159aa875a6..7a7fc2b6fce 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -218,5 +218,6 @@ extern BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT wid INT height_src, const void *bits, const BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 0e7c0574024..ac33893dfc7 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1543,6 +1543,18 @@ BOOL WINAPI StrokeAndFillPath( HDC hdc ) return NtGdiStrokeAndFillPath( hdc ); } +/******************************************************************* + * StrokePath (GDI32.@) + */ +BOOL WINAPI StrokePath( HDC hdc ) +{ + DC_ATTR *dc_attr; + + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_StrokePath( dc_attr )) return FALSE; + return NtGdiStrokePath( hdc ); +} + /*********************************************************************** * FlattenPath (GDI32.@) */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index f08592598b9..e59c02951ff 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1919,11 +1919,9 @@ BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc ) /******************************************************************* - * StrokePath [GDI32.@] - * - * + * NtGdiStrokePath (win32u.@) */ -BOOL WINAPI StrokePath(HDC hdc) +BOOL WINAPI NtGdiStrokePath( HDC hdc ) { BOOL ret = FALSE; DC *dc = get_dc_ptr( hdc );

1 0

Zebediah Figura : ws2_32: Use realloc() in get_{host, proto, serv}ent_buffer().
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 4af902eb4eacc33b9cf89a9093362115d9ebf6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=4af902eb4eacc33b9cf89a90… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 18 23:25:49 2021 -0500 ws2_32: Use realloc() in get_{host, proto, serv}ent_buffer(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 93464232d32..492400b17a7 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -591,13 +591,18 @@ int WINAPI GetNameInfoW( const SOCKADDR *addr, socklen_t addr_len, WCHAR *host, static struct hostent *get_hostent_buffer( unsigned int size ) { struct per_thread_data *data = get_per_thread_data(); - if (data->he_buffer) + struct hostent *new_buffer; + + if (data->he_len < size) { - if (data->he_len >= size) return data->he_buffer; - free( data->he_buffer ); + if (!(new_buffer = realloc( data->he_buffer, size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + data->he_buffer = new_buffer; + data->he_len = size; } - data->he_buffer = malloc( (data->he_len = size) ); - if (!data->he_buffer) SetLastError(WSAENOBUFS); return data->he_buffer; } @@ -1004,15 +1009,18 @@ static char *next_non_space( const char *p, const char *end ) static struct protoent *get_protoent_buffer( unsigned int size ) { struct per_thread_data *data = get_per_thread_data(); + struct protoent *new_buffer; - if (data->pe_buffer) + if (data->pe_len < size) { - if (data->pe_len >= size) return data->pe_buffer; - free( data->pe_buffer ); + if (!(new_buffer = realloc( data->pe_buffer, size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + data->pe_buffer = new_buffer; + data->pe_len = size; } - data->pe_len = size; - data->pe_buffer = malloc( size ); - if (!data->pe_buffer) SetLastError( WSAENOBUFS ); return data->pe_buffer; } @@ -1187,14 +1195,18 @@ struct protoent * WINAPI getprotobynumber( int number ) static struct servent *get_servent_buffer( int size ) { struct per_thread_data *data = get_per_thread_data(); - if (data->se_buffer) + struct servent *new_buffer; + + if (data->se_len < size) { - if (data->se_len >= size) return data->se_buffer; - free( data->se_buffer ); + if (!(new_buffer = realloc( data->se_buffer, size ))) + { + SetLastError( WSAENOBUFS ); + return NULL; + } + data->se_buffer = new_buffer; + data->se_len = size; } - data->se_len = size; - data->se_buffer = malloc( size ); - if (!data->se_buffer) SetLastError( WSAENOBUFS ); return data->se_buffer; }

1 0

Jacek Caban : gdi32: Rename bidi.c to text.c.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: 64df8e975b5937921e60601bb75716a15ff053e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64df8e975b5937921e60601b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:25:04 2021 +0200 gdi32: Rename bidi.c to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{bidi.c => text.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 509bb0c72db..e4eb248a888 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -9,7 +9,6 @@ DELAYIMPORTS = setupapi EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ - bidi.c \ bitblt.c \ bitmap.c \ brush.c \ @@ -46,6 +45,7 @@ C_SRCS = \ pen.c \ printdrv.c \ region.c \ + text.c \ uniscribe/bidi.c \ uniscribe/bracket.c \ uniscribe/breaking.c \ diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/text.c similarity index 99% rename from dlls/gdi32/bidi.c rename to dlls/gdi32/text.c index f3fc1dd1d44..7e2d5d6a90e 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/text.c @@ -1,5 +1,5 @@ /* - * GDI BiDirectional handling + * GDI text handling * * Copyright 2003 Shachar Shemesh * Copyright 2007 Maarten Lankhorst

1 0

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

Aug. 19, 2021

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 : include: Add ID3DX10Mesh definition.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

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

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

Aug. 19, 2021

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 : msxml3/domimpl: Fixup method functions names.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

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

Jacek Caban : gdi32: Move bidi text reordering to ExtTextOutW.
by Alexandre Julliard Aug. 19, 2021

Aug. 19, 2021

Module: wine Branch: master Commit: bf4084b49c008d43a60f64881cfbd0a3cd17565b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4084b49c008d43a60f6488… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 19 10:25:33 2021 +0200 gdi32: Move bidi text reordering to ExtTextOutW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 36 +++++------------------------------- dlls/gdi32/gdidc.c | 15 --------------- dlls/gdi32/text.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 46 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 8be802af450..526b236ac71 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5855,8 +5855,6 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr const WCHAR *str, UINT count, const INT *lpDx, DWORD cp ) { BOOL ret = FALSE; - LPWSTR reordered_str = (LPWSTR)str; - WORD *glyphs = NULL; UINT align; DWORD layout; POINT pt; @@ -5903,26 +5901,6 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr align ^= TA_RTLREADING; } - if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) - { - INT cGlyphs; - reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); - - BIDI_Reorder( hdc, str, count, GCP_REORDER, - (align & TA_RTLREADING) ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs, &cGlyphs); - - flags |= ETO_IGNORELANGUAGE; - if (glyphs) - { - flags |= ETO_GLYPH_INDEX; - if (cGlyphs != count) - count = cGlyphs; - } - } - else if(flags & ETO_GLYPH_INDEX) - glyphs = reordered_str; - TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags, wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx); TRACE("align = %x bkmode = %x mapmode = %x\n", align, dc->attr->background_mode, @@ -6014,9 +5992,9 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr INT *dx = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*dx) ); if (flags & ETO_GLYPH_INDEX) - GetTextExtentExPointI( hdc, glyphs, count, -1, NULL, dx, &sz ); + GetTextExtentExPointI( hdc, str, count, -1, NULL, dx, &sz ); else - GetTextExtentExPointW( hdc, reordered_str, count, -1, NULL, dx, &sz ); + GetTextExtentExPointW( hdc, str, count, -1, NULL, dx, &sz ); deltas[0].x = dx[0]; deltas[0].y = 0; @@ -6062,9 +6040,9 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr POINT desired[2]; if(flags & ETO_GLYPH_INDEX) - GetTextExtentPointI(hdc, glyphs, count, &sz); + GetTextExtentPointI(hdc, str, count, &sz); else - GetTextExtentPointW(hdc, reordered_str, count, &sz); + GetTextExtentPointW(hdc, str, count, &sz); desired[0].x = desired[0].y = 0; desired[1].x = sz.cx; desired[1].y = 0; @@ -6152,14 +6130,10 @@ BOOL WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *lpr } ret = physdev->funcs->pExtTextOut( physdev, x, y, (flags & ~ETO_OPAQUE), &rc, - glyphs ? glyphs : reordered_str, count, (INT*)deltas ); + str, count, (INT*)deltas ); done: HeapFree(GetProcessHeap(), 0, deltas); - if(glyphs != reordered_str) - HeapFree(GetProcessHeap(), 0, glyphs); - if(reordered_str != str) - HeapFree(GetProcessHeap(), 0, reordered_str); if (ret && (lf.lfUnderline || lf.lfStrikeOut)) { diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 87cfe7d99f4..68bffdfbac3 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1350,21 +1350,6 @@ BOOL WINAPI GdiGradientFill( HDC hdc, TRIVERTEX *vert_array, ULONG nvert, return NtGdiGradientFill( hdc, vert_array, nvert, grad_array, ngrad, mode ); } -/*********************************************************************** - * ExtTextOutW (GDI32.@) - */ -BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, - const WCHAR *str, UINT count, const INT *dx ) -{ - DC_ATTR *dc_attr; - - if (is_meta_dc( hdc )) return METADC_ExtTextOut( hdc, x, y, flags, rect, str, count, dx ); - if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; - if (dc_attr->emf && !EMFDC_ExtTextOut( dc_attr, x, y, flags, rect, str, count, dx )) - return FALSE; - return NtGdiExtTextOutW( hdc, x, y, flags, rect, str, count, dx, 0 ); -} - /*********************************************************************** * SetTextJustification (GDI32.@) */ diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 7e2d5d6a90e..f6188713ee3 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -48,6 +48,7 @@ #include "winnls.h" #include "usp10.h" #include "wine/debug.h" +#include "gdi_private.h" #include "ntgdi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -654,3 +655,45 @@ cleanup: ScriptFreeCache(&psc); return ret; } + +/*********************************************************************** + * ExtTextOutW (GDI32.@) + */ +BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, + const WCHAR *str, UINT count, const INT *dx ) +{ + WORD *glyphs = NULL; + DC_ATTR *dc_attr; + BOOL ret; + + if (count > INT_MAX) return FALSE; + if (is_meta_dc( hdc )) return METADC_ExtTextOut( hdc, x, y, flags, rect, str, count, dx ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_ExtTextOut( dc_attr, x, y, flags, rect, str, count, dx )) + return FALSE; + + if (!(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0) + { + UINT bidi_flags; + int glyphs_count; + + bidi_flags = (dc_attr->text_align & TA_RTLREADING) || (flags & ETO_RTLREADING) + ? WINE_GCPW_FORCE_RTL : WINE_GCPW_FORCE_LTR; + + BIDI_Reorder( hdc, str, count, GCP_REORDER, bidi_flags, NULL, 0, NULL, + &glyphs, &glyphs_count ); + + flags |= ETO_IGNORELANGUAGE; + if (glyphs) + { + flags |= ETO_GLYPH_INDEX; + count = glyphs_count; + str = glyphs; + } + } + + ret = NtGdiExtTextOutW( hdc, x, y, flags, rect, str, count, dx, 0 ); + + HeapFree( GetProcessHeap(), 0, glyphs ); + return ret; +}

1 0