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

Jacek Caban : gdi32: Use NtGdiDoPalette for AnimatePalette.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 44313dcb49327fe166a4b298b0a2fb133e27ea47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44313dcb49327fe166a4b298… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:27:50 2021 +0200 gdi32: Use NtGdiDoPalette for AnimatePalette. 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/objects.c | 8 ++++++++ dlls/gdi32/palette.c | 22 +++++----------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index b1723b20085..4f7932be329 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -542,3 +542,11 @@ UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, { return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiSetPaletteEntries, FALSE ); } + +/*********************************************************************** + * AnimatePalette (GDI32.@) + */ +BOOL WINAPI AnimatePalette( HPALETTE palette, UINT start, UINT count, const PALETTEENTRY *entries ) +{ + return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiAnimatePalette, FALSE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a46d75e9970..cd4fac217be 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -248,23 +248,9 @@ BOOL WINAPI NtGdiResizePalette( HPALETTE hPal, UINT cEntries ) } -/*********************************************************************** - * AnimatePalette [GDI32.@] - * - * Replaces entries in logical palette. - * - * RETURNS - * Success: TRUE - * Failure: FALSE - * - * FIXME - * Should use existing mapping when animating a primary palette - */ -BOOL WINAPI AnimatePalette( - HPALETTE hPal, /* [in] Handle to logical palette */ - UINT StartIndex, /* [in] First entry in palette */ - UINT NumEntries, /* [in] Count of entries in palette */ - const PALETTEENTRY* PaletteColors) /* [in] Pointer to first replacement */ +/* Replaces entries in logical palette. */ +static BOOL animate_palette( HPALETTE hPal, UINT StartIndex, UINT NumEntries, + const PALETTEENTRY *PaletteColors ) { TRACE("%p (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); @@ -679,6 +665,8 @@ LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entrie { switch (func) { + case NtGdiAnimatePalette: + return animate_palette( handle, start, count, entries ); case NtGdiSetPaletteEntries: return set_palette_entries( handle, start, count, entries ); case NtGdiGetPaletteEntries:

1 0

Jacek Caban : gdi32: Use NtGdiDoPalette for GetPaletteEntries.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: ad00037c279de5ee0e795cf46e6fd1018e8ae1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad00037c279de5ee0e795cf4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 16 10:27:30 2021 +0200 gdi32: Use NtGdiDoPalette for GetPaletteEntries. 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/bitblt.c | 4 ++-- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/objects.c | 4 ++-- dlls/gdi32/ntgdi_private.h | 2 ++ dlls/gdi32/objects.c | 8 ++++++++ dlls/gdi32/palette.c | 35 +++++++++++++++++++---------------- include/ntgdi.h | 10 ++++++++++ 7 files changed, 45 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 0024234ac2d..09bb7a4c683 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -236,8 +236,8 @@ static RGBQUAD get_dc_rgb_color( DC *dc, int color_table_size, COLORREF color ) { PALETTEENTRY pal; - if (!GetPaletteEntries( dc->hPalette, LOWORD(color), 1, &pal )) - GetPaletteEntries( dc->hPalette, 0, 1, &pal ); + if (!get_palette_entries( dc->hPalette, LOWORD(color), 1, &pal )) + get_palette_entries( dc->hPalette, 0, 1, &pal ); ret.rgbRed = pal.peRed; ret.rgbGreen = pal.peGreen; ret.rgbBlue = pal.peBlue; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 59725537bbd..738151aa14d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -261,7 +261,7 @@ static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) if (!palette) return 0; memset( palEntry, 0, sizeof(palEntry) ); - if (!GetPaletteEntries( palette, 0, colors, palEntry )) + if (!get_palette_entries( palette, 0, colors, palEntry )) return 0; for (i = 0; i < colors; i++) @@ -285,7 +285,7 @@ BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) if (!colors) return TRUE; if (!(palette = GetCurrentObject( hdc, OBJ_PAL ))) return FALSE; - if (!(count = GetPaletteEntries( palette, 0, colors, entries ))) return FALSE; + if (!(count = get_palette_entries( palette, 0, colors, entries ))) return FALSE; for (i = 0; i < colors; i++, index++) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c5c805ff77e..4e24de0b3aa 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -145,8 +145,8 @@ static COLORREF make_rgb_colorref( DC *dc, const dib_info *dib, COLORREF color, { PALETTEENTRY pal_ent; - if (!GetPaletteEntries( dc->hPalette, LOWORD(color), 1, &pal_ent )) - GetPaletteEntries( dc->hPalette, 0, 1, &pal_ent ); + if (!get_palette_entries( dc->hPalette, LOWORD(color), 1, &pal_ent )) + get_palette_entries( dc->hPalette, 0, 1, &pal_ent ); return RGB( pal_ent.peRed, pal_ent.peGreen, pal_ent.peBlue ); } diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index ad4872da5ec..d9b016c213f 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -482,6 +482,8 @@ extern POINT *GDI_Bezier( const POINT *Points, INT count, INT *nPtsOut ) DECLSPE /* palette.c */ extern HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) DECLSPEC_HIDDEN; extern HPALETTE PALETTE_Init(void) DECLSPEC_HIDDEN; +extern UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, + PALETTEENTRY *entries ) DECLSPEC_HIDDEN; /* region.c */ extern BOOL add_rect_to_region( HRGN rgn, const RECT *rect ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 6516ac533f5..cce783d8cfe 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -525,3 +525,11 @@ HPALETTE WINAPI CreatePalette( const LOGPALETTE *palette ) if (!palette) return 0; return NtGdiCreatePaletteInternal( palette, palette->palNumEntries ); } + +/*********************************************************************** + * GetPaletteEntries (GDI32.@) + */ +UINT WINAPI GetPaletteEntries( HPALETTE palette, UINT start, UINT count, PALETTEENTRY *entries ) +{ + return NtGdiDoPalette( palette, start, count, entries, NtGdiGetPaletteEntries, TRUE ); +} diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index c92b4dfb9d5..804d2ecbf92 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -162,20 +162,7 @@ HPALETTE WINAPI NtGdiCreateHalftonePalette( HDC hdc ) } -/*********************************************************************** - * GetPaletteEntries [GDI32.@] - * - * Retrieves palette entries. - * - * RETURNS - * Success: Number of entries from logical palette - * Failure: 0 - */ -UINT WINAPI GetPaletteEntries( - HPALETTE hpalette, /* [in] Handle of logical palette */ - UINT start, /* [in] First entry to receive */ - UINT count, /* [in] Number of entries to receive */ - LPPALETTEENTRY entries) /* [out] Address of array receiving entries */ +UINT get_palette_entries( HPALETTE hpalette, UINT start, UINT count, PALETTEENTRY *entries ) { PALETTEOBJ * palPtr; UINT numEntries; @@ -495,10 +482,10 @@ COLORREF CDECL nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) else /* PALETTEINDEX */ index = LOWORD(color); - if (!GetPaletteEntries( hpal, index, 1, &entry )) + if (!get_palette_entries( hpal, index, 1, &entry )) { WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index ); - if (!GetPaletteEntries( hpal, 0, 1, &entry )) return CLR_INVALID; + if (!get_palette_entries( hpal, 0, 1, &entry )) return CLR_INVALID; } color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); } @@ -695,3 +682,19 @@ BOOL WINAPI NtGdiSetMagicColors( HDC hdc, DWORD magic, ULONG index ) FIXME( "(%p 0x%08x 0x%08x): stub\n", hdc, magic, index ); return TRUE; } + +/********************************************************************* + * NtGdiDoPalette (win32u.@) + */ +LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries, + DWORD func, BOOL inbound ) +{ + switch (func) + { + case NtGdiGetPaletteEntries: + return get_palette_entries( handle, start, count, entries ); + default: + WARN( "invalid func %u\n", func ); + return 0; + } +} diff --git a/include/ntgdi.h b/include/ntgdi.h index 0e9d5cce59a..9da053e10a8 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -105,6 +105,16 @@ enum NtGdiSetMapMode = 8, }; +enum +{ + NtGdiAnimatePalette, + NtGdiSetPaletteEntries, + NtGdiGetPaletteEntries, + NtGdiGetSystemPaletteEntries, + NtGdiGetDIBColorTable, + NtGdiSetDIBColorTable, +}; + #define MWT_SET 4 /* structs not compatible with native Windows */

1 0

Esdras Tarsis : bthprops.cpl: Add BluetoothFindNextDevice stub.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 43a9783585eb4ce747eebe3dbb611fcd147310d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a9783585eb4ce747eebe3d… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Sat Aug 14 19:34:16 2021 -0300 bthprops.cpl: Add BluetoothFindNextDevice stub. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index d57eb9136e6..30b5bfa0040 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -23,7 +23,7 @@ @ stub BluetoothFindFirstServiceEx @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stub BluetoothFindNextDevice +@ stdcall BluetoothFindNextDevice(ptr ptr) @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 672b682a29d..2dcb18458b7 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -89,3 +89,13 @@ DWORD WINAPI BluetoothGetRadioInfo(HANDLE radio, PBLUETOOTH_RADIO_INFO info) FIXME("(%p, %p): stub!\n", radio, info); return ERROR_CALL_NOT_IMPLEMENTED; } + +/********************************************************************* + * BluetoothFindNextDevice + */ +BOOL WINAPI BluetoothFindNextDevice(HBLUETOOTH_DEVICE_FIND find, BLUETOOTH_DEVICE_INFO *info) +{ + FIXME("(%p, %p): stub!\n", find, info); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index a3e5faa7076..252410f589f 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -19,7 +19,7 @@ @ stub BluetoothFindFirstService @ stub BluetoothFindNextBrowseGroup @ stub BluetoothFindNextClassId -@ stub BluetoothFindNextDevice +@ stdcall BluetoothFindNextDevice(ptr ptr) bthprops.cpl.BluetoothFindNextDevice @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry

1 0

Nikolay Sivov : msxml3: Move IDispatchEx support definitions to a separate header.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: e78fba0e15be86d4f64505aaf836fb9cb93712c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78fba0e15be86d4f64505aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 16 11:52:19 2021 +0300 msxml3: Move IDispatchEx support definitions to a separate header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/dispex.c | 33 ++++--------- dlls/msxml3/msxml_dispex.h | 116 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 86 +------------------------------- 3 files changed, 127 insertions(+), 108 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index b1fb72847e7..2ee03241946 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -18,30 +18,16 @@ #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 "winuser.h" -#include "winnls.h" -#include "ole2.h" -#include "msxml6.h" -#include "msxml6did.h" -#include "wininet.h" -#include "urlmon.h" -#include "winreg.h" -#include "shlwapi.h" + +#include "msxml2.h" +#include "msxml2did.h" +#include "dispex.h" #include "wine/debug.h" -#include "wine/unicode.h" +#include "wine/heap.h" -#include "msxml_private.h" +#include "msxml_dispex.h" WINE_DEFAULT_DEBUG_CHANNEL(msxml); @@ -54,7 +40,6 @@ static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = }; static CRITICAL_SECTION cs_dispex_static_data = { &cs_dispex_static_data_dbg, -1, 0, 0, 0, 0 }; - enum lib_version_t { LibXml = 0, @@ -258,7 +243,7 @@ static int dispid_cmp(const void *p1, const void *p2) static int func_name_cmp(const void *p1, const void *p2) { - return strcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); + return lstrcmpiW((*(func_info_t* const*)p1)->name, (*(func_info_t* const*)p2)->name); } static dispex_data_t *preprocess_dispex_data(DispatchEx *This) @@ -439,9 +424,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW while(min <= max) { n = (min+max)/2; - c = strcmpiW(data->name_table[n]->name, bstrName); + c = lstrcmpiW(data->name_table[n]->name, bstrName); if(!c) { - if((grfdex & fdexNameCaseSensitive) && strcmpW(data->name_table[n]->name, bstrName)) + if((grfdex & fdexNameCaseSensitive) && lstrcmpW(data->name_table[n]->name, bstrName)) break; *pid = data->name_table[n]->id; diff --git a/dlls/msxml3/msxml_dispex.h b/dlls/msxml3/msxml_dispex.h new file mode 100644 index 00000000000..c9dbc29ddc5 --- /dev/null +++ b/dlls/msxml3/msxml_dispex.h @@ -0,0 +1,116 @@ +/* + * Copyright 2005 Mike McCormack + * + * 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 + */ + +#ifndef __MSXML_DISPEX__ +#define __MSXML_DISPEX__ + +#include "dispex.h" + +#include "wine/heap.h" +#include "wine/list.h" + +typedef enum +{ + MSXML_DEFAULT = 0, + MSXML2 = 20, + MSXML26 = 26, + MSXML3 = 30, + MSXML4 = 40, + MSXML6 = 60 +} MSXML_VERSION; + +typedef enum tid_t +{ + NULL_tid, + IXMLDOMAttribute_tid, + IXMLDOMCDATASection_tid, + IXMLDOMComment_tid, + IXMLDOMDocument_tid, + IXMLDOMDocument2_tid, + IXMLDOMDocument3_tid, + IXMLDOMDocumentFragment_tid, + IXMLDOMDocumentType_tid, + IXMLDOMElement_tid, + IXMLDOMEntityReference_tid, + IXMLDOMImplementation_tid, + IXMLDOMNamedNodeMap_tid, + IXMLDOMNode_tid, + IXMLDOMNodeList_tid, + IXMLDOMParseError2_tid, + IXMLDOMProcessingInstruction_tid, + IXMLDOMSchemaCollection_tid, + IXMLDOMSchemaCollection2_tid, + IXMLDOMSelection_tid, + IXMLDOMText_tid, + IXMLElement_tid, + IXMLDocument_tid, + IXMLHTTPRequest_tid, + IXSLProcessor_tid, + IXSLTemplate_tid, + IVBSAXAttributes_tid, + IVBSAXContentHandler_tid, + IVBSAXDeclHandler_tid, + IVBSAXDTDHandler_tid, + IVBSAXEntityResolver_tid, + IVBSAXErrorHandler_tid, + IVBSAXLexicalHandler_tid, + IVBSAXLocator_tid, + IVBSAXXMLFilter_tid, + IVBSAXXMLReader_tid, + IMXAttributes_tid, + IMXReaderControl_tid, + IMXWriter_tid, + IVBMXNamespaceManager_tid, + IServerXMLHTTPRequest_tid, + LAST_tid +} tid_t; + +extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +extern void release_typelib(void) DECLSPEC_HIDDEN; + +typedef struct dispex_data_t dispex_data_t; + +typedef struct +{ + HRESULT (*get_dispid)(IUnknown*,BSTR,DWORD,DISPID*); + HRESULT (*invoke)(IUnknown*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*); +} dispex_static_data_vtbl_t; + +typedef struct +{ + const dispex_static_data_vtbl_t *vtbl; + const tid_t disp_tid; + dispex_data_t *data; + const tid_t* const iface_tids; +} dispex_static_data_t; + +typedef struct +{ + IDispatchEx IDispatchEx_iface; + + IUnknown *outer; + + dispex_static_data_t *data; +} DispatchEx; + +void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; +BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; +const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; + +#endif /* __MSXML_DISPEX__ */ diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index a59e00bf2b3..41e16e4406c 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -27,67 +27,15 @@ #include "wine/heap.h" #include "wine/list.h" +#include "msxml_dispex.h" + #ifndef __WINE_CONFIG_H # error You must include config.h to use this header #endif -typedef enum { - MSXML_DEFAULT = 0, - MSXML2 = 20, - MSXML26 = 26, - MSXML3 = 30, - MSXML4 = 40, - MSXML6 = 60 -} MSXML_VERSION; - extern const CLSID * DOMDocument_version(MSXML_VERSION v) DECLSPEC_HIDDEN; extern const CLSID * SchemaCache_version(MSXML_VERSION v) DECLSPEC_HIDDEN; -/* typelibs */ -typedef enum tid_t { - NULL_tid, - IXMLDOMAttribute_tid, - IXMLDOMCDATASection_tid, - IXMLDOMComment_tid, - IXMLDOMDocument_tid, - IXMLDOMDocument2_tid, - IXMLDOMDocument3_tid, - IXMLDOMDocumentFragment_tid, - IXMLDOMDocumentType_tid, - IXMLDOMElement_tid, - IXMLDOMEntityReference_tid, - IXMLDOMImplementation_tid, - IXMLDOMNamedNodeMap_tid, - IXMLDOMNode_tid, - IXMLDOMNodeList_tid, - IXMLDOMParseError2_tid, - IXMLDOMProcessingInstruction_tid, - IXMLDOMSchemaCollection_tid, - IXMLDOMSchemaCollection2_tid, - IXMLDOMSelection_tid, - IXMLDOMText_tid, - IXMLElement_tid, - IXMLDocument_tid, - IXMLHTTPRequest_tid, - IXSLProcessor_tid, - IXSLTemplate_tid, - IVBSAXAttributes_tid, - IVBSAXContentHandler_tid, - IVBSAXDeclHandler_tid, - IVBSAXDTDHandler_tid, - IVBSAXEntityResolver_tid, - IVBSAXErrorHandler_tid, - IVBSAXLexicalHandler_tid, - IVBSAXLocator_tid, - IVBSAXXMLFilter_tid, - IVBSAXXMLReader_tid, - IMXAttributes_tid, - IMXReaderControl_tid, - IMXWriter_tid, - IVBMXNamespaceManager_tid, - IServerXMLHTTPRequest_tid, - LAST_tid -} tid_t; /* The XDR datatypes (urn:schemas-microsoft-com:datatypes) * These are actually valid for XSD schemas as well @@ -134,38 +82,8 @@ typedef enum _XDR_DT { LAST_DT } XDR_DT; -extern HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; -extern void release_typelib(void) DECLSPEC_HIDDEN; - -typedef struct dispex_data_t dispex_data_t; - -typedef struct { - HRESULT (*get_dispid)(IUnknown*,BSTR,DWORD,DISPID*); - HRESULT (*invoke)(IUnknown*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*); -} dispex_static_data_vtbl_t; - -typedef struct { - const dispex_static_data_vtbl_t *vtbl; - const tid_t disp_tid; - dispex_data_t *data; - const tid_t* const iface_tids; -} dispex_static_data_t; - -typedef struct { - IDispatchEx IDispatchEx_iface; - - IUnknown *outer; - - dispex_static_data_t *data; -} DispatchEx; - extern HINSTANCE MSXML_hInstance DECLSPEC_HIDDEN; -void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; -void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; -BOOL dispex_query_interface(DispatchEx*,REFIID,void**) DECLSPEC_HIDDEN; -const IID *get_riid_from_tid(enum tid_t tid) DECLSPEC_HIDDEN; - /* memory allocation functions */ static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size)

1 0

Nikolay Sivov : msxml3/tests: Add some supported interfaces checks.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 37bba6e6479f53cc981732bb25b30438aaa6d1c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37bba6e6479f53cc981732bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 16 11:52:18 2021 +0300 msxml3/tests: Add some supported interfaces checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 44 +++++++++++++++++++++++++++--------- dlls/msxml3/tests/httpreq.c | 19 ++++++++++++++++ dlls/msxml3/tests/saxreader.c | 52 +++++++++++++++++++++---------------------- dlls/msxml3/tests/schema.c | 22 +++++++++++++++++- 4 files changed, 99 insertions(+), 38 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a7890d56f71..d2a4d867bae 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -54,6 +54,21 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(IID_transformdest_unknown,0xf5078f3a,0xc551,0x11d3,0x89,0xb9,0x00,0x00,0xf8,0x1f,0xe2,0x21); +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static int g_unexpectedcall, g_expectedcall; struct msxmlsupported_data_t @@ -1480,6 +1495,14 @@ static void test_domdoc( void ) doc = create_document(&IID_IXMLDOMDocument); if (!doc) return; + check_interface(doc, &IID_IXMLDOMDocument, TRUE); + check_interface(doc, &IID_IPersistStreamInit, TRUE); + check_interface(doc, &IID_IObjectWithSite, TRUE); + check_interface(doc, &IID_IObjectSafety, TRUE); + check_interface(doc, &IID_IConnectionPointContainer, TRUE); + check_interface(doc, &IID_IDispatch, TRUE); + check_interface(doc, &IID_IDispatchEx, TRUE); + if (0) { /* crashes on native */ @@ -2110,7 +2133,6 @@ static void test_persiststream(void) IPersistStream *stream; IXMLDOMDocument *doc; ULARGE_INTEGER size; - IPersist *persist; IStream *istream; HRESULT hr; CLSID clsid; @@ -2130,11 +2152,8 @@ static void test_persiststream(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok((IUnknown *)stream == (IUnknown *)streaminit, "got %p, %p\n", stream, streaminit); - hr = IPersistStream_QueryInterface(stream, &IID_IPersist, (void **)&persist); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); - - hr = IXMLDOMDocument_QueryInterface(doc, &IID_IPersist, (void **)&persist); - ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + check_interface(stream, &IID_IPersist, FALSE); + check_interface(doc, &IID_IPersist, FALSE); hr = IPersistStreamInit_GetClassID(streaminit, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -9039,6 +9058,10 @@ static void test_xsltemplate(void) if (!is_clsid_supported(&CLSID_XSLTemplate, &IID_IXSLTemplate)) return; template = create_xsltemplate(&IID_IXSLTemplate); + check_interface(template, &IID_IXSLTemplate, TRUE); + check_interface(template, &IID_IDispatch, TRUE); + check_interface(template, &IID_IDispatchEx, TRUE); + /* works as reset */ hr = IXSLTemplate_putref_stylesheet(template, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -10790,7 +10813,6 @@ static void test_mxnamespacemanager(void) IMXNamespaceManager *nsmgr; IUnknown *unk1, *unk2; WCHAR buffW[250]; - IDispatch *disp; IUnknown *unk; HRESULT hr; INT len; @@ -10799,10 +10821,10 @@ static void test_mxnamespacemanager(void) &IID_IMXNamespaceManager, (void**)&nsmgr); EXPECT_HR(hr, S_OK); - /* IMXNamespaceManager inherits from IUnknown */ - hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IDispatch, (void**)&disp); - EXPECT_HR(hr, S_OK); - IDispatch_Release(disp); + check_interface(nsmgr, &IID_IDispatch, TRUE); + check_interface(nsmgr, &IID_IDispatchEx, TRUE); + check_interface(nsmgr, &IID_IMXNamespaceManager, TRUE); + check_interface(nsmgr, &IID_IVBMXNamespaceManager, TRUE); hr = IMXNamespaceManager_QueryInterface(nsmgr, &IID_IVBMXNamespaceManager, (void**)&mgr2); EXPECT_HR(hr, S_OK); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 4a23f1d82a8..2491e499638 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -50,6 +50,21 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static const char xmltestA[] = "http://test.winehq.org/tests/xmltest.xml"; static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; @@ -1457,6 +1472,10 @@ static void test_XMLHTTP(void) xhr = create_xhr(); + check_interface(xhr, &IID_IXMLHttpRequest, TRUE); + check_interface(xhr, &IID_IDispatch, TRUE); + check_interface(xhr, &IID_IDispatchEx, FALSE); + VariantInit(&dummy); V_VT(&dummy) = VT_ERROR; V_ERROR(&dummy) = DISP_E_MEMBERNOTFOUND; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e401aafc87d..ad093af6a12 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -48,6 +48,21 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static LONG get_refcount(void *iface) { IUnknown *unk = iface; @@ -4861,6 +4876,11 @@ static void test_saxreader_dispex(void) &IID_ISAXXMLReader, (void**)&reader); EXPECT_HR(hr, S_OK); + check_interface(reader, &IID_ISAXXMLReader, TRUE); + check_interface(reader, &IID_IVBSAXXMLReader, TRUE); + check_interface(reader, &IID_IDispatch, TRUE); + check_interface(reader, &IID_IDispatchEx, TRUE); + hr = ISAXXMLReader_QueryInterface(reader, &IID_IUnknown, (void**)&unk); EXPECT_HR(hr, S_OK); test_obj_dispex(unk); @@ -5811,40 +5831,20 @@ static void test_mxattr_dispex(void) static void test_mxattr_qi(void) { - IVBSAXAttributes *vbsaxattr, *vbsaxattr2; - ISAXAttributes *saxattr; IMXAttributes *mxattr; HRESULT hr; hr = CoCreateInstance(&CLSID_SAXAttributes, NULL, CLSCTX_INPROC_SERVER, - &IID_IMXAttributes, (void**)&mxattr); + &IID_IMXAttributes, (void **)&mxattr); EXPECT_HR(hr, S_OK); - EXPECT_REF(mxattr, 1); - hr = IMXAttributes_QueryInterface(mxattr, &IID_ISAXAttributes, (void**)&saxattr); - EXPECT_HR(hr, S_OK); - - EXPECT_REF(mxattr, 2); - EXPECT_REF(saxattr, 2); - - hr = IMXAttributes_QueryInterface(mxattr, &IID_IVBSAXAttributes, (void**)&vbsaxattr); - EXPECT_HR(hr, S_OK); - - EXPECT_REF(vbsaxattr, 3); - EXPECT_REF(mxattr, 3); - EXPECT_REF(saxattr, 3); - - hr = ISAXAttributes_QueryInterface(saxattr, &IID_IVBSAXAttributes, (void**)&vbsaxattr2); - EXPECT_HR(hr, S_OK); - - EXPECT_REF(vbsaxattr, 4); - EXPECT_REF(mxattr, 4); - EXPECT_REF(saxattr, 4); + check_interface(mxattr, &IID_IMXAttributes, TRUE); + check_interface(mxattr, &IID_ISAXAttributes, TRUE); + check_interface(mxattr, &IID_IVBSAXAttributes, TRUE); + check_interface(mxattr, &IID_IDispatch, TRUE); + check_interface(mxattr, &IID_IDispatchEx, TRUE); IMXAttributes_Release(mxattr); - ISAXAttributes_Release(saxattr); - IVBSAXAttributes_Release(vbsaxattr); - IVBSAXAttributes_Release(vbsaxattr2); } static struct msxmlsupported_data_t saxattr_support_data[] = diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 8dc9dcd7e22..4cdfedf9c29 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -37,6 +37,21 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static const CHAR xdr_schema1_uri[] = "x-schema:test1.xdr"; static const CHAR xdr_schema1_xml[] = "<?xml version='1.0'?>" @@ -1808,8 +1823,13 @@ static void test_ifaces(void) hr = IXMLDOMSchemaCollection2_QueryInterface(cache, &CLSID_XMLSchemaCache60, (void**)&unk); ok (hr == S_OK, "Could not get CLSID_XMLSchemaCache60 iface: %08x\n", hr); ok (unk == (IUnknown*)cache, "unk != cache\n"); - IUnknown_Release(unk); + + check_interface(cache, &IID_IXMLDOMSchemaCollection, TRUE); + check_interface(cache, &IID_IXMLDOMSchemaCollection2, TRUE); + check_interface(cache, &IID_IDispatch, TRUE); + check_interface(cache, &IID_IDispatchEx, TRUE); + IXMLDOMSchemaCollection2_Release(cache); }

1 0

Nikolay Sivov : msxml3: Add a helper for XMLHTTP response encoding detection.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: c2b797cf658691bc65f8d2f28b2f926657922a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b797cf658691bc65f8d2f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 16 11:52:22 2021 +0300 msxml3: Add a helper for XMLHTTP response encoding detection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/httprequest.c | 76 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 7286eb97bb7..20ec389739e 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -1127,6 +1127,58 @@ static HRESULT httprequest_get_statusText(httprequest *This, BSTR *status) return S_OK; } +enum response_encoding +{ + RESPONSE_ENCODING_NONE, + RESPONSE_ENCODING_UCS4BE, + RESPONSE_ENCODING_UCS4LE, + RESPONSE_ENCODING_UCS4_2143, + RESPONSE_ENCODING_UCS4_3412, + RESPONSE_ENCODING_EBCDIC, + RESPONSE_ENCODING_UTF8, + RESPONSE_ENCODING_UTF16LE, + RESPONSE_ENCODING_UTF16BE, +}; + +static unsigned int detect_response_encoding(const BYTE *in, unsigned int len) +{ + if (len >= 4) + { + if (in[0] == 0 && in[1] == 0 && in[2] == 0 && in[3] == 0x3c) + return RESPONSE_ENCODING_UCS4BE; + if (in[0] == 0x3c && in[1] == 0 && in[2] == 0 && in[3] == 0) + return RESPONSE_ENCODING_UCS4LE; + if (in[0] == 0 && in[1] == 0 && in[2] == 0x3c && in[3] == 0) + return RESPONSE_ENCODING_UCS4_2143; + if (in[0] == 0 && in[1] == 0x3c && in[2] == 0 && in[3] == 0) + return RESPONSE_ENCODING_UCS4_3412; + if (in[0] == 0x4c && in[1] == 0x6f && in[2] == 0xa7 && in[3] == 0x94) + return RESPONSE_ENCODING_EBCDIC; + if (in[0] == 0x3c && in[1] == 0x3f && in[2] == 0x78 && in[3] == 0x6d) + return RESPONSE_ENCODING_UTF8; + if (in[0] == 0x3c && in[1] == 0 && in[2] == 0x3f && in[3] == 0) + return RESPONSE_ENCODING_UTF16LE; + if (in[0] == 0 && in[1] == 0x3c && in[2] == 0 && in[3] == 0x3f) + return RESPONSE_ENCODING_UTF16BE; + } + + if (len >= 3) + { + if (in[0] == 0xef && in[1] == 0xbb && in[2] == 0xbf) + return RESPONSE_ENCODING_UTF8; + } + + if (len >= 2) + { + if (in[0] == 0xfe && in[1] == 0xff) + return RESPONSE_ENCODING_UTF16BE; + if (in[0] == 0xff && in[1] == 0xfe) + return RESPONSE_ENCODING_UTF16LE; + } + + return RESPONSE_ENCODING_NONE; +} + static HRESULT httprequest_get_responseText(httprequest *This, BSTR *body) { HGLOBAL hglobal; @@ -1138,34 +1190,34 @@ static HRESULT httprequest_get_responseText(httprequest *This, BSTR *body) hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); if (hr == S_OK) { - xmlChar *ptr = GlobalLock(hglobal); + const char *ptr = GlobalLock(hglobal); DWORD size = GlobalSize(hglobal); - xmlCharEncoding encoding = XML_CHAR_ENCODING_UTF8; + unsigned int encoding = RESPONSE_ENCODING_NONE; /* try to determine data encoding */ if (size >= 4) { - encoding = xmlDetectCharEncoding(ptr, 4); - TRACE("detected encoding: %s\n", debugstr_a(xmlGetCharEncodingName(encoding))); - if ( encoding != XML_CHAR_ENCODING_UTF8 && - encoding != XML_CHAR_ENCODING_UTF16LE && - encoding != XML_CHAR_ENCODING_NONE ) + encoding = detect_response_encoding((const BYTE *)ptr, 4); + TRACE("detected encoding: %u.\n", encoding); + + if (encoding != RESPONSE_ENCODING_UTF8 && + encoding != RESPONSE_ENCODING_UTF16LE && + encoding != RESPONSE_ENCODING_NONE ) { - FIXME("unsupported encoding: %s\n", debugstr_a(xmlGetCharEncodingName(encoding))); + FIXME("unsupported response encoding: %u.\n", encoding); GlobalUnlock(hglobal); return E_FAIL; } } /* without BOM assume UTF-8 */ - if (encoding == XML_CHAR_ENCODING_UTF8 || - encoding == XML_CHAR_ENCODING_NONE ) + if (encoding == RESPONSE_ENCODING_UTF8 || encoding == RESPONSE_ENCODING_NONE) { - DWORD length = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)ptr, size, NULL, 0); + DWORD length = MultiByteToWideChar(CP_UTF8, 0, ptr, size, NULL, 0); *body = SysAllocStringLen(NULL, length); if (*body) - MultiByteToWideChar( CP_UTF8, 0, (LPCSTR)ptr, size, *body, length); + MultiByteToWideChar( CP_UTF8, 0, ptr, size, *body, length); } else *body = SysAllocStringByteLen((LPCSTR)ptr, size);

1 0

Francois Gouget : msv1_0: Fix the call to ntlm_cleanup().
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: wine Branch: master Commit: 655fd2b267ac6ed79bb8b043b9643f454f18378d URL: https://source.winehq.org/git/wine.git/?a=commit;h=655fd2b267ac6ed79bb8b043… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Aug 16 09:59:11 2021 +0200 msv1_0: Fix the call to ntlm_cleanup(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msv1_0/unixlib.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index cada3febedf..789dfbbe8cb 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -199,6 +199,7 @@ static NTSTATUS ntlm_check_version( void *args ) char *argv[3], buf[80]; NTSTATUS status = STATUS_DLL_NOT_FOUND; struct fork_params params = { &ctx, argv }; + struct cleanup_params cleanup_params = { &ctx }; int len; argv[0] = (char *)"ntlm_auth"; @@ -231,7 +232,7 @@ static NTSTATUS ntlm_check_version( void *args ) "Make sure that ntlm_auth >= %d.%d.%d is in your path. " "Usually, you can find it in the winbind package of your distribution.\n", NTLM_AUTH_MAJOR_VERSION, NTLM_AUTH_MINOR_VERSION, NTLM_AUTH_MICRO_VERSION ); - ntlm_cleanup( &ctx ); + ntlm_cleanup( &cleanup_params ); return status; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op().
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: b65789e74ad255e06b950f67718b67bac9233dba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b65789e74ad255e06b950f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:12 2021 -0500 vkd3d-shader/hlsl: Use a designated initializer in debug_expr_op(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 103 +++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 57 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e407057..9f50d2f 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1033,64 +1033,53 @@ static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hl static const char *debug_expr_op(const struct hlsl_ir_expr *expr) { - static const char * const op_names[] = + static const char *const op_names[] = { - "~", - "!", - "-", - "abs", - "sign", - "rcp", - "rsq", - "sqrt", - "nrm", - "exp2", - "log2", - - "cast", - - "fract", - - "sin", - "cos", - "sin_reduced", - "cos_reduced", - - "dsx", - "dsy", - - "sat", - - "+", - "*", - "/", - - "%", - - "<", - ">", - "<=", - ">=", - "==", - "!=", - - "&&", - "||", - - "<<", - ">>", - "&", - "|", - "^", - - "dot", - "crs", - "min", - "max", - - "pow", - - "lerp", + [HLSL_IR_UNOP_ABS] = "abs", + [HLSL_IR_UNOP_BIT_NOT] = "~", + [HLSL_IR_UNOP_CAST] = "cast", + [HLSL_IR_UNOP_COS] = "cos", + [HLSL_IR_UNOP_COS_REDUCED] = "cos_reduced", + [HLSL_IR_UNOP_DSX] = "dsx", + [HLSL_IR_UNOP_DSY] = "dsy", + [HLSL_IR_UNOP_EXP2] = "exp2", + [HLSL_IR_UNOP_FRACT] = "fract", + [HLSL_IR_UNOP_LOG2] = "log2", + [HLSL_IR_UNOP_LOGIC_NOT] = "!", + [HLSL_IR_UNOP_NEG] = "-", + [HLSL_IR_UNOP_NRM] = "nrm", + [HLSL_IR_UNOP_RCP] = "rcp", + [HLSL_IR_UNOP_RSQ] = "rsq", + [HLSL_IR_UNOP_SAT] = "sat", + [HLSL_IR_UNOP_SIGN] = "sign", + [HLSL_IR_UNOP_SIN] = "sin", + [HLSL_IR_UNOP_SIN_REDUCED] = "sin_reduced", + [HLSL_IR_UNOP_SQRT] = "sqrt", + + [HLSL_IR_BINOP_ADD] = "+", + [HLSL_IR_BINOP_BIT_AND] = "&", + [HLSL_IR_BINOP_BIT_OR] = "|", + [HLSL_IR_BINOP_BIT_XOR] = "^", + [HLSL_IR_BINOP_CRS] = "crs", + [HLSL_IR_BINOP_DIV] = "/", + [HLSL_IR_BINOP_DOT] = "dot", + [HLSL_IR_BINOP_EQUAL] = "==", + [HLSL_IR_BINOP_GEQUAL] = ">=", + [HLSL_IR_BINOP_GREATER] = ">", + [HLSL_IR_BINOP_LEQUAL] = "<=", + [HLSL_IR_BINOP_LESS] = "<", + [HLSL_IR_BINOP_LOGIC_AND] = "&&", + [HLSL_IR_BINOP_LOGIC_OR] = "||", + [HLSL_IR_BINOP_LSHIFT] = "<<", + [HLSL_IR_BINOP_MAX] = "max", + [HLSL_IR_BINOP_MIN] = "min", + [HLSL_IR_BINOP_MOD] = "%", + [HLSL_IR_BINOP_MUL] = "*", + [HLSL_IR_BINOP_NEQUAL] = "!=", + [HLSL_IR_BINOP_POW] = "pow", + [HLSL_IR_BINOP_RSHIFT] = ">>", + + [HLSL_IR_TEROP_LERP] = "lerp", }; return op_names[expr->op];

1 0

Zebediah Figura : vkd3d-shader/hlsl: Rename hlsl_ir_expr_op members.
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: 7960f9e37382a06c7d1e00b99c38916b85b53a9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7960f9e37382a06c7d1e00b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 12 19:36:13 2021 -0500 vkd3d-shader/hlsl: Rename hlsl_ir_expr_op members. For the sake of simplicity and clarity, especially in the interest of allowing us to have expressions with larger numbers of terms. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 92 +++++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 101 +++++++++++++++++---------------------- libs/vkd3d-shader/hlsl.y | 55 +++++++++++---------- libs/vkd3d-shader/hlsl_codegen.c | 20 ++++---- libs/vkd3d-shader/hlsl_sm1.c | 20 ++++---- 5 files changed, 138 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=7960f9e37382a06c7d1…

1 0

Chip Davis : tests: Parse max ulps in the "probe rect rgba" case. (Clang).
by Alexandre Julliard Aug. 16, 2021

Aug. 16, 2021

Module: vkd3d Branch: master Commit: 34edc44b6f47e28ed06dca2d92f711fc9cae4810 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=34edc44b6f47e28ed06dca2… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Aug 15 13:37:15 2021 -0500 tests: Parse max ulps in the "probe rect rgba" case. (Clang). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner_d3d12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 4221804..353e42c 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -178,7 +178,8 @@ static void parse_test_directive(struct shader_context *context, const char *lin RECT rect; int ret; - ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f )", &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w); + ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f ) %u", + &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w, &ulps); if (ret < 8) goto err; if (ret < 9)

1 0