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

Nikolay Sivov : include: Use regular header for d3dx10core.idl.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 3ea09b7986f87ba73e67228999b6965b5516e716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ea09b7986f87ba73e672289… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 5 14:04:22 2021 +0300 include: Use regular header for d3dx10core.idl. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/d3dx10core.h | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ include/d3dx10core.idl | 75 -------------------------------- 3 files changed, 117 insertions(+), 76 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 3dbfe6561f2..0163b9b0951 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -142,7 +142,7 @@ SOURCES = \ d3dvec.inl \ d3dx10.h \ d3dx10async.h \ - d3dx10core.idl \ + d3dx10core.h \ d3dx10math.h \ d3dx10tex.h \ d3dx11.h \ diff --git a/include/d3dx10core.h b/include/d3dx10core.h new file mode 100644 index 00000000000..053e3a9c072 --- /dev/null +++ b/include/d3dx10core.h @@ -0,0 +1,116 @@ +/* + * Copyright 2015 Alistair Leslie-Hughes + * + * 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_ID3DX10ThreadPump, 0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb); + +#define INTERFACE ID3DX10DataLoader +DECLARE_INTERFACE(ID3DX10DataLoader) +{ + STDMETHOD(Load)(THIS) PURE; + STDMETHOD(Decompress)(THIS_ void **data, SIZE_T *bytes) PURE; + STDMETHOD(Destroy)(THIS) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** ID3DX10DataLoader methods ***/ +#define ID3DX10DataLoader_Load(p) (p)->lpVtbl->Load(p) +#define ID3DX10DataLoader_Decompress(p,a,b) (p)->lpVtbl->Decompress(p,a,b) +#define ID3DX10DataLoader_Destroy(p) (p)->lpVtbl->Destroy(p) +#else +/*** ID3DX10DataLoader methods ***/ +#define ID3DX10DataLoader_Load(p) (p)->Load() +#define ID3DX10DataLoader_Decompress(p,a,b) (p)->Decompress(a,b) +#define ID3DX10DataLoader_Destroy(p) (p)->Destroy() +#endif + +#define INTERFACE ID3DX10DataProcessor +DECLARE_INTERFACE(ID3DX10DataProcessor) +{ + STDMETHOD(Process)(THIS_ void *data, SIZE_T bytes) PURE; + STDMETHOD(CreateDeviceObject)(THIS_ void **dataobject) PURE; + STDMETHOD(Destroy)(THIS) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** ID3DX10DataProcessor methods ***/ +#define ID3DX10DataProcessor_Process(p,a,b) (p)->lpVtbl->Process(p,a,b) +#define ID3DX10DataProcessor_CreateDeviceObject(p,a) (p)->lpVtbl->CreateDeviceObject(p,a) +#define ID3DX10DataProcessor_Destroy(p) (p)->lpVtbl->Destroy(p) +#else +/*** ID3DX10DataProcessor methods ***/ +#define ID3DX10DataProcessor_Process(p,a,b) (p)->Process(a,b) +#define ID3DX10DataProcessor_CreateDeviceObject(p,a) (p)->CreateDeviceObject(a) +#define ID3DX10DataProcessor_Destroy(p) (p)->Destroy() +#endif + +#define INTERFACE ID3DX10ThreadPump +DECLARE_INTERFACE_(ID3DX10ThreadPump, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10ThreadPump methods ***/ + STDMETHOD(AddWorkItem)(THIS_ ID3DX10DataLoader *loader, ID3DX10DataProcessor *processor, + HRESULT *result, void **object) PURE; + STDMETHOD_(UINT, GetWorkItemCount)(THIS) PURE; + STDMETHOD(WaitForAllItems)(THIS) PURE; + STDMETHOD(ProcessDeviceWorkItems)(THIS_ UINT count) PURE; + STDMETHOD(PurgeAllItems)(THIS) PURE; + STDMETHOD(GetQueueStatus)(THIS_ UINT *queue, UINT *processqueue, UINT *devicequeue) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define ID3DX10ThreadPump_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DX10ThreadPump_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DX10ThreadPump_Release(p) (p)->lpVtbl->Release(p) +/*** ID3DX10ThreadPump methods ***/ +#define ID3DX10ThreadPump_AddWorkItem(p,a,b,c,d) (p)->lpVtbl->AddWorkItem(p,a,b,c,d) +#define ID3DX10ThreadPump_GetWorkItemCount(p) (p)->lpVtbl->GetWorkItemCount(p) +#define ID3DX10ThreadPump_WaitForAllItems(p) (p)->lpVtbl->WaitForAllItems(p) +#define ID3DX10ThreadPump_ProcessDeviceWorkItems(p,a) (p)->lpVtbl->ProcessDeviceWorkItems(p,a) +#define ID3DX10ThreadPump_PurgeAllItems(p) (p)->lpVtbl->PurgeAllItems(p) +#define ID3DX10ThreadPump_GetQueueStatus(p,a,b,c) (p)->lpVtbl->GetQueueStatus(p,a,b,c) +#else +/*** IUnknown methods ***/ +#define ID3DX10ThreadPump_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define ID3DX10ThreadPump_AddRef(p) (p)->AddRef() +#define ID3DX10ThreadPump_Release(p) (p)->Release() +/*** ID3DX10ThreadPump methods ***/ +#define ID3DX10ThreadPump_AddWorkItem(p,a,b,c,d) (p)->AddWorkItem(a,b,c,d) +#define ID3DX10ThreadPump_GetWorkItemCount(p) (p)->GetWorkItemCount() +#define ID3DX10ThreadPump_WaitForAllItems(p) (p)->WaitForAllItems() +#define ID3DX10ThreadPump_ProcessDeviceWorkItems(p,a) (p)->ProcessDeviceWorkItems(a) +#define ID3DX10ThreadPump_PurgeAllItems(p) (p)->PurgeAllItems() +#define ID3DX10ThreadPump_GetQueueStatus(p,a,b,c) (p)->GetQueueStatus(a,b,c) +#endif + +HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device); +HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, unsigned int flags, ID3D10Device **device); +HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain, + ID3D10Device **device); +typedef interface ID3D10Device1 ID3D10Device1; +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl deleted file mode 100644 index 88f13d07650..00000000000 --- a/include/d3dx10core.idl +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2015 Alistair Leslie-Hughes - * - * 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 - */ - -import "oaidl.idl"; -import "ocidl.idl"; -import "dxgi.idl"; -import "d3dcommon.idl"; - -[ - object, - local, - pointer_default(unique) -] -interface ID3DX10DataLoader -{ - HRESULT Load(); - HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); - HRESULT Destroy(); -} - -[ - object, - local, - pointer_default(unique) -] -interface ID3DX10DataProcessor -{ - HRESULT Process([in] void *data, [in] SIZE_T bytes); - HRESULT CreateDeviceObject([out] void **dataobject); - HRESULT Destroy(); -} - - -[ - object, - local, - pointer_default(unique), - uuid(c93fecfa-6967-478a-abbc-402d90621fcb) -] -interface ID3DX10ThreadPump : IUnknown -{ - HRESULT AddWorkItem([in] ID3DX10DataLoader *loader, [in] ID3DX10DataProcessor *processor, - [in] HRESULT *result, [out] void **object); - UINT GetWorkItemCount(); - - HRESULT WaitForAllItems(); - HRESULT ProcessDeviceWorkItems([in] UINT count); - - HRESULT PurgeAllItems(); - HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); -} - -cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") -cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") -cpp_quote(" HMODULE swrast, unsigned int flags, ID3D10Device **device);") -cpp_quote("HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") -cpp_quote(" HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain,") -cpp_quote(" ID3D10Device **device);") -interface ID3D10Device1; -cpp_quote("HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1);")

1 0

Nikolay Sivov : include: Add ID3DX10Font/ID3DX10Sprite definitions.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 022d2df036b95bf593770a476a5f0bcff8b950fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=022d2df036b95bf593770a47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 5 14:04:23 2021 +0300 include: Add ID3DX10Font/ID3DX10Sprite definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10core.h | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/include/d3dx10core.h b/include/d3dx10core.h index 053e3a9c072..d794fa028d7 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -18,8 +18,60 @@ #include "d3dx10.h" +DEFINE_GUID(IID_ID3DX10Font, 0xd79dbb70, 0x5f21, 0x4d36, 0xbb, 0xc2, 0xff, 0x52, 0x5c, 0x21, 0x3c, 0xdc); +DEFINE_GUID(IID_ID3DX10Sprite, 0xba0b762d, 0x8d28, 0x43ec, 0xb9, 0xdc, 0x2f, 0x84, 0x44, 0x3b, 0x06, 0x14); DEFINE_GUID(IID_ID3DX10ThreadPump, 0xc93fecfa, 0x6967, 0x478a, 0xab, 0xbc, 0x40, 0x2d, 0x90, 0x62, 0x1f, 0xcb); +typedef enum _D3DX10_SPRITE_FLAG +{ + D3DX10_SPRITE_SORT_TEXTURE = 0x01, + D3DX10_SPRITE_SORT_DEPTH_BACK_TO_FRONT = 0x02, + D3DX10_SPRITE_SORT_DEPTH_FRONT_TO_BACK = 0x04, + D3DX10_SPRITE_SAVE_STATE = 0x08, + D3DX10_SPRITE_ADDREF_TEXTURES = 0x10, +} D3DX10_SPRITE_FLAG; + +typedef struct _D3DX10_SPRITE +{ + D3DXMATRIX matWorld; + D3DXVECTOR2 TexCoord; + D3DXVECTOR2 TexSize; + D3DXCOLOR ColorModulate; + ID3D10ShaderResourceView *pTexture; + UINT TextureIndex; +} D3DX10_SPRITE; + +typedef struct _D3DX10_FONT_DESCA +{ + INT Height; + UINT Width; + UINT Weight; + UINT MipLevels; + BOOL Italic; + BYTE CharSet; + BYTE OutputPrecision; + BYTE Quality; + BYTE PitchAndFamily; + CHAR FaceName[LF_FACESIZE]; +} D3DX10_FONT_DESCA, *LPD3DX10_FONT_DESCA; + +typedef struct _D3DX10_FONT_DESCW +{ + INT Height; + UINT Width; + UINT Weight; + UINT MipLevels; + BOOL Italic; + BYTE CharSet; + BYTE OutputPrecision; + BYTE Quality; + BYTE PitchAndFamily; + WCHAR FaceName[LF_FACESIZE]; +} D3DX10_FONT_DESCW, *LPD3DX10_FONT_DESCW; + +DECL_WINELIB_TYPE_AW(D3DX10_FONT_DESC) +DECL_WINELIB_TYPE_AW(LPD3DX10_FONT_DESC) + #define INTERFACE ID3DX10DataLoader DECLARE_INTERFACE(ID3DX10DataLoader) { @@ -106,6 +158,129 @@ DECLARE_INTERFACE_(ID3DX10ThreadPump, IUnknown) #define ID3DX10ThreadPump_GetQueueStatus(p,a,b,c) (p)->GetQueueStatus(a,b,c) #endif +#define INTERFACE ID3DX10Sprite +DECLARE_INTERFACE_(ID3DX10Sprite, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10Sprite methods ***/ + STDMETHOD(Begin)(THIS_ UINT flags) PURE; + STDMETHOD(DrawSpritesBuffered)(THIS_ D3DX10_SPRITE *sprites, UINT count) PURE; + STDMETHOD(Flush)(THIS) PURE; + STDMETHOD(DrawSpritesImmediate)(THIS_ D3DX10_SPRITE *sprites, + UINT count, UINT size, UINT flags) PURE; + STDMETHOD(End)(THIS) PURE; + STDMETHOD(GetViewTransform)(THIS_ D3DXMATRIX *transform) PURE; + STDMETHOD(SetViewTransform)(THIS_ D3DXMATRIX *transform) PURE; + STDMETHOD(GetProjectionTransform)(THIS_ D3DXMATRIX *transform) PURE; + STDMETHOD(SetProjectionTransform)(THIS_ D3DXMATRIX *transform) PURE; + STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define ID3DX10Sprite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DX10Sprite_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DX10Sprite_Release(p) (p)->lpVtbl->Release(p) +/*** ID3DX10Sprite methods ***/ +#define ID3DX10Sprite_Begin(p,a) (p)->lpVtbl->Begin(p,a) +#define ID3DX10Sprite_DrawSpritesBuffered(p,a,b) (p)->lpVtbl->DrawSpritesBuffered(p,a,b) +#define ID3DX10Sprite_Flush(p) (p)->lpVtbl->Flush(p) +#define ID3DX10Sprite_DrawSpritesImmediate(p,a,b,c,d) (p)->lpVtbl->DrawSpritesImmediate(p,a,b,c,d) +#define ID3DX10Sprite_End(p) (p)->lpVtbl->End(p) +#define ID3DX10Sprite_GetViewTransform(p,a) (p)->lpVtbl->GetViewTransform(p,a) +#define ID3DX10Sprite_SetViewTransform(p,a) (p)->lpVtbl->SetViewTransform(p,a) +#define ID3DX10Sprite_GetProjectionTransform(p,a) (p)->lpVtbl->GetProjectionTransform(p,a) +#define ID3DX10Sprite_SetProjectionTransform(p,a) (p)->lpVtbl->SetProjectionTransform(p,a) +#define ID3DX10Sprite_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#else +/*** IUnknown methods ***/ +#define ID3DX10Sprite_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define ID3DX10Sprite_AddRef(p) (p)->AddRef() +#define ID3DX10Sprite_Release(p) (p)->Release() +/*** ID3DX10Sprite methods ***/ +#define ID3DX10Sprite_Begin(p,a) (p)->Begin(a) +#define ID3DX10Sprite_DrawSpritesBuffered(p,a,b) (p)->DrawSpritesBuffered(a,b) +#define ID3DX10Sprite_Flush(p) (p)->Flush() +#define ID3DX10Sprite_DrawSpritesImmediate(p,a,b,c,d) (p)->DrawSpritesImmediate(a,b,c,d) +#define ID3DX10Sprite_End(p) (p)->End() +#define ID3DX10Sprite_GetViewTransform(p,a) (p)->GetViewTransform(a) +#define ID3DX10Sprite_SetViewTransform(p,a) (p)->SetViewTransform(a) +#define ID3DX10Sprite_GetProjectionTransform(p,a) (p)->GetProjectionTransform(a) +#define ID3DX10Sprite_SetProjectionTransform(p,a) (p)->SetProjectionTransform(a) +#define ID3DX10Sprite_GetDevice(p,a) (p)->GetDevice(a) +#endif + +#define INTERFACE ID3DX10Font +DECLARE_INTERFACE_(ID3DX10Font, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10Font methods ***/ + STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE; + STDMETHOD(GetDescA)(THIS_ D3DX10_FONT_DESCA *desc) PURE; + STDMETHOD(GetDescW)(THIS_ D3DX10_FONT_DESCW *desc) PURE; + STDMETHOD_(BOOL, GetTextMetricsA)(THIS_ TEXTMETRICA *metrics) PURE; + STDMETHOD_(BOOL, GetTextMetricsW)(THIS_ TEXTMETRICW *metrics) PURE; + STDMETHOD_(HDC, GetDC)(THIS) PURE; + STDMETHOD(GetGlyphData)(THIS_ UINT glyph, ID3D10ShaderResourceView **texture, + RECT *blackbox, POINT *cellinc) PURE; + STDMETHOD(PreloadCharacters)(THIS_ UINT first, UINT last) PURE; + STDMETHOD(PreloadGlyphs)(THIS_ UINT first, UINT last) PURE; + STDMETHOD(PreloadTextA)(THIS_ const char *text, INT count) PURE; + STDMETHOD(PreloadTextW)(THIS_ const WCHAR *text, INT count) PURE; + STDMETHOD_(INT, DrawTextA)(THIS_ ID3DX10Sprite *sprite, const char *text, + INT count, RECT *rect, UINT format, D3DXCOLOR color) PURE; + STDMETHOD_(INT, DrawTextW)(THIS_ ID3DX10Sprite *sprite, const WCHAR *text, + INT count, RECT *rect, UINT format, D3DXCOLOR color) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define ID3DX10Font_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DX10Font_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DX10Font_Release(p) (p)->lpVtbl->Release(p) +/*** ID3DX10Font methods ***/ +#define ID3DX10Font_GetDevice(p,a) (p)->lpVtbl->Begin(p,a) +#define ID3DX10Font_GetDescA(p,a) (p)->lpVtbl->GetDescA(p,a) +#define ID3DX10Font_GetDescW(p,a) (p)->lpVtbl->GetDescW(p,a) +#define ID3DX10Font_GetTextMetricsA(p,a) (p)->lpVtbl->GetTextMetricsA(p,a) +#define ID3DX10Font_GetTextMetricsW(p,a) (p)->lpVtbl->GetTextMetricsW(p,a) +#define ID3DX10Font_GetDC(p) (p)->lpVtbl->GetDC(p) +#define ID3DX10Font_GetGlyphData(p,a,b,c,d) (p)->lpVtbl->GetGlyphData(p,a,b,c,d) +#define ID3DX10Font_PreloadCharacters(p,a,b) (p)->lpVtbl->PreloadCharacters(p,a,b) +#define ID3DX10Font_PreloadGlyphs(p,a,b) (p)->lpVtbl->PreloadGlyphs(p,a,b) +#define ID3DX10Font_PreloadTextA(p,a,b) (p)->lpVtbl->PreloadTextA(p,a,b) +#define ID3DX10Font_PreloadTextW(p,a,b) (p)->lpVtbl->PreloadTextW(p,a,b) +#define ID3DX10Font_DrawTextA(p,a,b,c,d,e,f) (p)->lpVtbl->DrawTextA(p,a,b,c,d,e,f) +#define ID3DX10Font_DrawTextW(p,a,b,c,d,e,f) (p)->lpVtbl->DrawTextW(p,a,b,c,d,e,f) +#else +/*** IUnknown methods ***/ +#define ID3DX10Font_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define ID3DX10Font_AddRef(p) (p)->AddRef() +#define ID3DX10Font_Release(p) (p)->Release() +/*** ID3DX10Font methods ***/ +#define ID3DX10Font_GetDevice(p,a) (p)->Begin(a) +#define ID3DX10Font_GetDescA(p,a) (p)->GetDescA(a) +#define ID3DX10Font_GetDescW(p,a) (p)->GetDescW(a) +#define ID3DX10Font_GetTextMetricsA(p,a) (p)->GetTextMetricsA(a) +#define ID3DX10Font_GetTextMetricsW(p,a) (p)->GetTextMetricsW(a) +#define ID3DX10Font_GetDC(p) (p)->GetDC() +#define ID3DX10Font_GetGlyphData(p,a,b,c,d) (p)->GetGlyphData(a,b,c,d) +#define ID3DX10Font_PreloadCharacters(p,a,b) (p)->PreloadCharacters(a,b) +#define ID3DX10Font_PreloadGlyphs(p,a,b) (p)->PreloadGlyphs(a,b) +#define ID3DX10Font_PreloadTextA(p,a,b) (p)->PreloadTextA(a,b) +#define ID3DX10Font_PreloadTextW(p,a,b) (p)->PreloadTextW(a,b) +#define ID3DX10Font_DrawTextA(p,a,b,c,d,e,f) (p)->DrawTextA(a,b,c,d,e,f) +#define ID3DX10Font_DrawTextW(p,a,b,c,d,e,f) (p)->DrawTextW(a,b,c,d,e,f) +#endif + HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device); HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, unsigned int flags, ID3D10Device **device);

1 0

Francois Gouget : ws2_32: Add a trailing linefeed to a FIXME().
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: c909e69fe4e5465273b9d91ea046dfb208eeb15a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c909e69fe4e5465273b9d91e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 6 12:52:39 2021 +0200 ws2_32: Add a trailing linefeed to a FIXME(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index 21a6e4b27c2..eb5b3daf401 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -383,7 +383,7 @@ static unsigned int errno_from_unix( int err ) case EREMOTE: return WSAEREMOTE; #endif default: - FIXME( "unknown error: %s", strerror( err ) ); + FIXME( "unknown error: %s\n", strerror( err ) ); return WSAEFAULT; } }

1 0

Francois Gouget : oleaut32: The decimal point takes priority over the thousands separator.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: bf2e66cc3f5320c3901a58338d2c53862e43cee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf2e66cc3f5320c3901a5833… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 12:53:03 2021 +0200 oleaut32: The decimal point takes priority over the thousands separator. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 9 +++------ dlls/oleaut32/variant.c | 3 +++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 89859988f1f..ecc8e8b0f11 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2313,17 +2313,14 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"~"); hres = wconvert_str(L",1", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); - todo_wine EXPECTRGB(0,1); - EXPECTRGB(1,FAILDIG); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL,NUMPRS_DECIMAL,2,0,-1); + EXPECT2(1,FAILDIG); hres = wconvert_str(L"1,000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; hres = wconvert_str(L"1,", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_DECIMAL,2,0,0); - todo_wine ok(np.dwOutFlags == NUMPRS_DECIMAL, "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECT2(1,FAILDIG); /* But not for their monetary equivalents */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 14ba63b9b2e..264b9f6594b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1607,6 +1607,9 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla return DISP_E_TYPEMISMATCH; VARIANT_GetLocalisedNumberChars(&chars, lcid, dwFlags); + if (chars.cDigitSeparator == chars.cDecimalPoint) + /* The decimal point completely masks the digit separator */ + chars.cDigitSeparator = 0; /* Setting the thousands separator to a non-breaking space implies regular * spaces are allowed too. But the converse is not true. */

1 0

Francois Gouget : oleaut32: Fix VarParseNumFromStr()'s handling of currency thousands separators.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 9e4524ffb09be6bba828ea66b8fe1bb64b996b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e4524ffb09be6bba828ea66… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 12:53:09 2021 +0200 oleaut32: Fix VarParseNumFromStr()'s handling of currency thousands separators. They are have no default, are not allowed before the first digit, are unaffected by the presence / absence of a currency symbol, can be mixed with regular digit separators, are incompatible with hexadecimal and octal numbers (as are regular digit separators), and mask trailing spaces. Also they don't match regular spaces when set to a non-breaking space. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 19 +++++-------------- dlls/oleaut32/variant.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ecc8e8b0f11..fbcfba32c80 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1600,11 +1600,8 @@ static void test_VarParseNumFromStrEn(void) /* With flag, thousands sep. and following digits consumed */ CONVERT("&h1,000", NUMPRS_HEX_OCT|NUMPRS_THOUSANDS); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_THOUSANDS,NUMPRS_HEX_OCT,3,4,0); - todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,FAILDIG); + EXPECTRGB(1,FAILDIG); /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1,001.0", NUMPRS_THOUSANDS); @@ -2174,7 +2171,7 @@ static void test_VarParseNumFromStrMisc(void) SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHOUSANDSEP, L"~"); SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L""); hres = wconvert_str(L"1,000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, L"~"); /* But SMONTHOUSANDSEP defaults to ','! */ @@ -2236,9 +2233,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTRGB(4,FAILDIG); hres = wconvert_str(L"1 000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,5,0,3); - todo_wine ok(np.dwOutFlags == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -2249,15 +2244,13 @@ static void test_VarParseNumFromStrMisc(void) /* But trailing ones are allowed (same as sThousand) */ hres = wconvert_str(L"1 000 ", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); - todo_wine ok(np.dwOutFlags == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* And they break NUMPRS_TRAILING_WHITE (same as sThousand) */ hres = wconvert_str(L"1000 ", ARRAY_SIZE(rgb), NUMPRS_TRAILING_WHITE|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECTFAIL; + EXPECTFAIL; /* NUMPRS_CURRENCY is not enough for sMonThousandSep */ @@ -2272,13 +2265,13 @@ static void test_VarParseNumFromStrMisc(void) */ SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONDECIMALSEP, L"/"); hres = wconvert_str(L"$1|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,6,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* Mixing both thousands separators is allowed */ hres = wconvert_str(L"1 000|000", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,9,0,6); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,9,0,6); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(7,FAILDIG); @@ -2330,9 +2323,7 @@ static void test_VarParseNumFromStrMisc(void) EXPECTRGB(1,FAILDIG); hres = wconvert_str(L"1~", ARRAY_SIZE(rgb), NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL, &np, rgb, LOCALE_USER_DEFAULT, 0); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_THOUSANDS|NUMPRS_CURRENCY,2,0,0); - todo_wine ok(np.dwOutFlags == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY), "Got dwOutFlags=%08x\n", np.dwOutFlags); EXPECT2(1,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 264b9f6594b..2ec07817460 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1510,7 +1510,7 @@ HRESULT WINAPI VarUdateFromDate(DATE dateIn, ULONG dwFlags, UDATE *lpUdate) /* Get the valid number characters for an lcid */ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID lcid, DWORD dwFlags) { - static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',',','$',0,'.',',' }; + static const VARIANT_NUMBER_CHARS defaultChars = { '-','+','.',0,'$',0,'.',',' }; LCTYPE lctype = dwFlags & LOCALE_NOUSEROVERRIDE; WCHAR buff[4]; @@ -1633,6 +1633,11 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla { return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */ } + else if ((pNumprs->dwInFlags & (NUMPRS_THOUSANDS|NUMPRS_CURRENCY)) == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY) && + chars.cCurrencyDigitSeparator && *lpszStr == chars.cCurrencyDigitSeparator) + { + return DISP_E_TYPEMISMATCH; /* Not allowed before the first digit */ + } else if (pNumprs->dwInFlags & NUMPRS_LEADING_PLUS && *lpszStr == chars.cPositiveSymbol && !(pNumprs->dwOutFlags & NUMPRS_LEADING_PLUS)) @@ -1659,8 +1664,6 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla lpszStr += chars.cCurrencyLocal2 ? 2 : 1; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; - chars.cDigitSeparator = chars.cCurrencyDigitSeparator; - cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1677,7 +1680,6 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla { /* Only accept non-currency characters */ chars.cCurrencyDecimalPoint = chars.cDecimalPoint; - chars.cCurrencyDigitSeparator = chars.cDigitSeparator; } if ((*lpszStr == '&' && (*(lpszStr+1) == 'H' || *(lpszStr+1) == 'h')) && @@ -1769,12 +1771,20 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla } } else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT) && ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++; } + else if ((pNumprs->dwInFlags & (NUMPRS_THOUSANDS|NUMPRS_CURRENCY)) == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY) && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT) && + chars.cCurrencyDigitSeparator && *lpszStr == chars.cCurrencyDigitSeparator) + { + pNumprs->dwOutFlags |= NUMPRS_THOUSANDS|NUMPRS_CURRENCY; + cchUsed++; + } else if (*lpszStr == chars.cDecimalPoint && pNumprs->dwInFlags & NUMPRS_DECIMAL && !(pNumprs->dwOutFlags & (NUMPRS_DECIMAL|NUMPRS_EXPONENT))) @@ -1901,7 +1911,8 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla if ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || (cDigitSeparator2 && *lpszStr == cDigitSeparator2)) { - if (pNumprs->dwInFlags & NUMPRS_THOUSANDS) + if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT)) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++; @@ -1913,6 +1924,21 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla break; } } + else if (*lpszStr == chars.cCurrencyDigitSeparator) + { + if ((pNumprs->dwInFlags & (NUMPRS_THOUSANDS|NUMPRS_CURRENCY)) == (NUMPRS_THOUSANDS|NUMPRS_CURRENCY) && + !(pNumprs->dwOutFlags & NUMPRS_HEX_OCT)) + { + pNumprs->dwOutFlags |= NUMPRS_THOUSANDS|NUMPRS_CURRENCY; + cchUsed++; + lpszStr++; + } + else + { + /* Not allowed, even with NUMPRS_TRAILING_WHITE */ + break; + } + } else if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr)) { pNumprs->dwOutFlags |= NUMPRS_TRAILING_WHITE;

1 0

Dmitry Timoshkov : ole32/tests: Add more tests for CoIncrementMTAUsage/CoDecrementMTAUsage.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: wine Branch: master Commit: 251ab17af7d6162fed951afea417dd11b34d8a26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=251ab17af7d6162fed951afe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 28 16:43:49 2021 +0300 ole32/tests: Add more tests for CoIncrementMTAUsage/CoDecrementMTAUsage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index d1e947e393f..1d46a5b9c13 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4098,6 +4098,25 @@ static void test_mta_usage(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); + + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); + + cookie = 0; + hr = pCoIncrementMTAUsage(&cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(cookie != NULL, "Unexpected cookie %p.\n", cookie); + + test_apt_type(APTTYPE_MAINSTA, APTTYPEQUALIFIER_NONE); + + hr = pCoDecrementMTAUsage(cookie); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + CoUninitialize(); + + test_apt_type(APTTYPE_CURRENT, APTTYPEQUALIFIER_NONE); } static void test_CoCreateInstanceFromApp(void)

1 0

Francois Gouget : winetest/build-patterns: Allow hiding some reports on the patterns page.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: tools Branch: master Commit: c129867cc86bfcd63567456e8a459b07531021ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=c129867cc86bfcd63567456… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 13:09:43 2021 +0200 winetest/build-patterns: Allow hiding some reports on the patterns page. This allows zooming on the results of a specific machine or test configuration. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 31 ++++++++++++++- winetest/patterns.js | 100 ++++++++++++++++++++++++++++++++++++++++++++++++ winetest/report.css | 6 +++ 3 files changed, 135 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index d530ad2..fc6f7ed 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -20,6 +20,7 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); +use POSIX; # ceil() use Text::CSV::Encoded; use Time::Piece; @@ -980,7 +981,7 @@ sub write_pattern_line($$$) my ($html, $test, $reportdir) = @_; my $testreport = $test->{testreports}->{$reportdir}; - print $html "<div class='pattern'>"; + print $html "<div class='patline' data-id='$reportdir'><div class='pattern'>"; my $has_newmode; my ($range_symbol, $range_count) = ("", 0); @@ -1086,7 +1087,7 @@ sub write_pattern_line($$$) } my $label = $reportdir; $label = "<b>$label</b>" if ($has_newmode); - print $html "</div> $label\n"; + print $html "</div> $label\n</div>"; } sub index2symbol($) @@ -1288,6 +1289,7 @@ sub write_patterns_page($$$) <head> <title>$title</title> <link rel="stylesheet" href="/report.css" type="text/css"> + <script type="text/javascript" defer="true" src="/patterns.js"></script> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body> @@ -1462,6 +1464,31 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { + my @table = ("<details><summary>Page cutomization</summary> +<div class='detailsbox'><p>Uncheck the reports you do not want to see on this page.</p> +<table width='100%'>"); + my @reportmap; + for (my $i = 0; $i < @sortedreports; $i++) + { + my $reportdir = $sortedreports[$i]; + push @reportmap, $i if ($pagereports->{$reportdir}); + } + my $count = @reportmap; + for (my $i = 0; $i < ceil($count/4); $i++) + { + push @table, "<tr>"; + for (my $c = 0; $c < $count; $c += ceil($count/4)) + { + my $reportindex = $reportmap[$i + $c]; + last if (!defined $reportindex); + my $reportdir = $sortedreports[$reportindex] || ""; + push @table, "<td><label><input class='reportcb' type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + } + push @table, "</tr>"; + } + push @table, "</div></table></details>"; + $tests{0}->{desc} .= join("", @table); + $tests{0}->{desc} .= "<p>Unlike the other patterns on this page, the one below shows the number of failed test units for each configuration.</p>"; } diff --git a/winetest/patterns.js b/winetest/patterns.js new file mode 100644 index 0000000..a70df07 --- /dev/null +++ b/winetest/patterns.js @@ -0,0 +1,100 @@ +/* Hide / show reports on the patterns page + * + * Copyright 2021 Francois Gouget + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +"use strict"; + +var cbs; + +function refreshPage(changes) +{ + for (let key in changes) + { + const cb = cbs[key]; + if (cb.checked == changes[key]) continue; + + if (changes[key]) + { + cb.patlines.forEach(patline => { + patline.dom.style.display = patline.display; + const test = patline.test; + if (++test.linecount == 1 && test.id != "summary") + test.dom.style.display = test.display; + }); + } + else + { + cb.patlines.forEach(patline => { + patline.dom.style.display = "none"; + const test = patline.test; + if (--test.linecount == 0 && test.id != "summary") + test.dom.style.display = "none"; + }); + } + + cb.checked = changes[key]; + } +} + +function toggledReportCB(e) +{ + const cb = e.target; + const changes = {}; + changes[cb.id] = cb.checked; + refreshPage(changes); +} + +function init() +{ + const changes = {}; + cbs = {}; + document.querySelectorAll("input.reportcb").forEach(domcb => { + cbs[domcb.id] = { checked: true, /* all reports are shown by default */ + display: domcb.style.display, + patlines: [] + }; + changes[domcb.id] = domcb.checked; + domcb.addEventListener('click', toggledReportCB); + }); + + document.querySelectorAll("div.testfile").forEach(domtest => { + const test = { id: domtest.id, + dom: domtest, + display: domtest.style.display, + linecount: 0 + }; + + domtest.querySelectorAll("div.patline").forEach(domline => { + const cb = cbs[domline.getAttribute("data-id")]; + if (cb) + { + cb.patlines.push({ dom: domline, + display: domline.style.display, + test: test + }); + if (cb.checked) test.linecount++; + } + }); + }); + + /* When reloading a page the browser may preserve the checkbox state + * so reapply them to the rest of the page. + */ + refreshPage(changes); +} + +window.addEventListener('load', init); diff --git a/winetest/report.css b/winetest/report.css index 4594c5d..f193bc3 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -70,6 +70,12 @@ table.output td { float: right; } +.detailsbox { + margin: 5px 1em 0 1em; + padding: 0 5px 5px; + border: 1px solid #601919; +} + .pattern { display: inline-block; font-family: monospace;

1 0

Francois Gouget : winetest/build-patterns: Allow hiding groups of reports on the patterns pages.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: tools Branch: master Commit: 6af0cf682379549a8c5db45eb7585f91950d0054 URL: https://source.winehq.org/git/tools.git/?a=commit;h=6af0cf682379549a8c5db45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Aug 6 13:09:46 2021 +0200 winetest/build-patterns: Allow hiding groups of reports on the patterns pages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 22 +++++++++++++++++++--- winetest/patterns.js | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index fc6f7ed..a1691db 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1465,8 +1465,22 @@ EOF if (!$nolist) { my @table = ("<details><summary>Page cutomization</summary> -<div class='detailsbox'><p>Uncheck the reports you do not want to see on this page.</p> -<table width='100%'>"); +<div class='detailsbox'><p>This section lets you select the reports to show on this page.</p><p>"); + if (!$subpage or $subpage eq "-tb-win") + { + push @table, "<label><input id='tbwin' class='groupcb' type='checkbox' checked> Show the TestBot Windows reports</label><br>"; + } + if (!$subpage or $subpage eq "-tb-wine") + { + push @table, "<label><input id='tbwine' class='groupcb' type='checkbox' checked> Show the Testbot Wine reports</label><br>"; + } + if (!$subpage) + { + push @table, "<label><input id='win' class='groupcb' type='checkbox' checked> Show the other Windows reports</label><br> +<label><input id='wine' class='groupcb' type='checkbox' checked> Show the other Wine reports</label>"; + } + push @table, "</p><p>Use the table below to hide specific reports.</p><table width='100%'>"; + my @reportmap; for (my $i = 0; $i < @sortedreports; $i++) { @@ -1482,7 +1496,9 @@ EOF my $reportindex = $reportmap[$i + $c]; last if (!defined $reportindex); my $reportdir = $sortedreports[$reportindex] || ""; - push @table, "<td><label><input class='reportcb' type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; + my $report = $reports{$reportdir}; + my $group = " data-group='". ($report->{tag} =~ /^newtb-/ ? "tb" : "") . ($report->{is_wine} ? "wine" : "win") ."'"; + push @table, "<td><label><input class='reportcb'$group type='checkbox' id='$reportdir' checked> $reportdir</label></td>"; } push @table, "</tr>"; } diff --git a/winetest/patterns.js b/winetest/patterns.js index a70df07..80ac4b8 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -50,6 +50,24 @@ function refreshPage(changes) } } +function toggledGroupCB(e) +{ + const group = e.target.id; + const checked = e.target.checked; + + const changes = {}; + for (let key in cbs) + { + const cb = cbs[key]; + if (cb.group == group) + { + cb.dom.checked = checked; + changes[key] = checked; + } + } + refreshPage(changes); +} + function toggledReportCB(e) { const cb = e.target; @@ -60,11 +78,17 @@ function toggledReportCB(e) function init() { + document.querySelectorAll("input.groupcb").forEach(domcb => { + domcb.addEventListener('click', toggledGroupCB); + }); + const changes = {}; cbs = {}; document.querySelectorAll("input.reportcb").forEach(domcb => { - cbs[domcb.id] = { checked: true, /* all reports are shown by default */ + cbs[domcb.id] = { dom: domcb, + checked: true, /* all reports are shown by default */ display: domcb.style.display, + group: domcb.getAttribute("data-group"), patlines: [] }; changes[domcb.id] = domcb.checked;

1 0

Chip Davis : tests: Include <stddef.h> from "d3d12_crosstest.h". (Clang).
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: vkd3d Branch: master Commit: 25d79204e3fd5b058a1d4b788f3b3facc955c329 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=25d79204e3fd5b058a1d4b7… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Aug 4 14:18:38 2021 -0500 tests: Include <stddef.h> from "d3d12_crosstest.h". (Clang). Neither MinGW's nor Microsoft's <windows.h> includes <stddef.h>, either directly or indirectly. Also, unlike GCC, Clang's <inttypes.h> does not include <stddef.h>, either. "vkd3d_windows.h" does include <stddef.h>, and this is why building for the host works, even with Clang. Fixes cross compilation errors with Clang related to using offsetof(3). 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/d3d12_crosstest.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 43af375..0b77bde 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -52,6 +52,7 @@ typedef int HRESULT; #include <inttypes.h> #include <limits.h> #include <math.h> +#include <stddef.h> #include <time.h> #ifdef _WIN32

1 0

Chip Davis : configure: Also extract the cross target from Clang compilers.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: vkd3d Branch: master Commit: 73bc52c273bc92f4b86dd85823380aa75c68c05f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=73bc52c273bc92f4b86dd85… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Aug 4 14:19:08 2021 -0500 configure: Also extract the cross target from Clang compilers. 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> --- m4/check-mingw-prog.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/check-mingw-prog.m4 b/m4/check-mingw-prog.m4 index ac3e07d..94fe795 100644 --- a/m4/check-mingw-prog.m4 +++ b/m4/check-mingw-prog.m4 @@ -15,7 +15,7 @@ AS_VAR_IF([vkd3d_cross_cc], [$3], AC_MSG_CHECKING([whether $CC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '$.*$-gcc'`], + $2=`expr "$CC" : '$.*$-gcc' \| "$CC" : '$.*$-clang'`], [AC_MSG_RESULT([no])]) CC="$vkd3d_cc_saved"]) AS_VAR_POPDEF([vkd3d_cross_cc])dnl @@ -34,7 +34,7 @@ AS_VAR_IF([vkd3d_cross_cc], [$3], AC_MSG_CHECKING([whether $CC works]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]) - $2=`expr "$CC" : '$.*$-gcc'`], + $2=`expr "$CC" : '$.*$-gcc' \| "$CC" : '$.*$-clang'`], [AC_MSG_RESULT([no])]) CC="$vkd3d_cc_saved"]) AS_VAR_POPDEF([vkd3d_cross_cc])dnl

1 0