- Wine-Commits - list.winehq.org

Tim Clem : mountmgr.sys: Do not add drive letters or volumes for macOS volumes without mount paths.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 89481f43a547291bf060fdf0d3468a6673fd4ca3 URL: https://gitlab.winehq.org/wine/wine/-/commit/89481f43a547291bf060fdf0d3468a… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri May 10 12:29:27 2024 -0700 mountmgr.sys: Do not add drive letters or volumes for macOS volumes without mount paths. Mounted volumes that are not represented in the filesystem are system volumes that we should ignore (e.g. recovery and preboot). --- dlls/mountmgr.sys/diskarb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 63986c3df93..d33f6c60afb 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -91,9 +91,12 @@ static void appeared_callback( DADiskRef disk, void *context ) if ((volume_url = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) CFURLGetFileSystemRepresentation( volume_url, true, (UInt8 *)mount_point, sizeof(mount_point) ); else - mount_point[0] = 0; + { + TRACE( "ignoring volume %s, uuid %s: no macOS volume path\n", device, wine_dbgstr_guid(guid_ptr) ); + goto done; + } - if (volume_url && CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) + if (CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) { Boolean is_browsable = CFBooleanGetValue( ref ); CFRelease( ref );

1 0

Anton Baskanov : winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 08e13d197965d4978167f0dd541d32a8cec2bbf1 URL: https://gitlab.winehq.org/wine/wine/-/commit/08e13d197965d4978167f0dd541d32… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri May 10 10:44:07 2024 +0700 winegstreamer: Recognize MFAudioFormat_MPEG and MFAudioFormat_MP3. Fixes: cc82780c22db31fed4da8b84e85c01652a995490 --- dlls/winegstreamer/mfplat.c | 61 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 879ea0707fc..df3d95629c1 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -638,6 +638,61 @@ static void mf_media_type_to_wg_format_audio(IMFMediaType *type, const GUID *sub FIXME("Unrecognized audio subtype %s, depth %u.\n", debugstr_guid(subtype), depth); } +static void mf_media_type_to_wg_format_audio_mpeg(IMFMediaType *type, const GUID *subtype, struct wg_format *format) +{ + MPEG1WAVEFORMAT wfx = {0}; + UINT32 codec_data_size; + UINT32 rate, channels; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + FIXME("Sample rate is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + FIXME("Channel count is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_USER_DATA, (UINT8 *)(&wfx.wfx + 1), + sizeof(wfx) - sizeof(WAVEFORMATEX), &codec_data_size))) + { + FIXME("Codec data is not set.\n"); + return; + } + if (codec_data_size < sizeof(wfx) - sizeof(WAVEFORMATEX)) + { + FIXME("Codec data is incomplete.\n"); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + format->u.audio.layer = wfx.fwHeadLayer; +} + +static void mf_media_type_to_wg_format_audio_mpeg_layer3(IMFMediaType *type, const GUID *subtype, struct wg_format *format) +{ + UINT32 rate, channels; + + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &rate))) + { + FIXME("Sample rate is not set.\n"); + return; + } + if (FAILED(IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &channels))) + { + FIXME("Channel count is not set.\n"); + return; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO_MPEG1; + format->u.audio.channels = channels; + format->u.audio.rate = rate; + format->u.audio.layer = 3; +} + static void mf_media_type_to_wg_format_audio_mpeg4(IMFMediaType *type, const GUID *subtype, struct wg_format *format) { BYTE buffer[sizeof(HEAACWAVEFORMAT) + 64]; @@ -942,7 +997,11 @@ void mf_media_type_to_wg_format(IMFMediaType *type, struct wg_format *format) if (IsEqualGUID(&major_type, &MFMediaType_Audio)) { - if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) || + if (IsEqualGUID(&subtype, &MFAudioFormat_MPEG)) + mf_media_type_to_wg_format_audio_mpeg(type, &subtype, format); + else if (IsEqualGUID(&subtype, &MFAudioFormat_MP3)) + mf_media_type_to_wg_format_audio_mpeg_layer3(type, &subtype, format); + else if (IsEqualGUID(&subtype, &MEDIASUBTYPE_MSAUDIO1) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV8) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudioV9) || IsEqualGUID(&subtype, &MFAudioFormat_WMAudio_Lossless))

1 0

Elizabeth Figura : wined3d: Remove the GL FFP vertex pipeline.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 3e31a9742ce602c83a64a8f77b8e5910d997057a URL: https://gitlab.winehq.org/wine/wine/-/commit/3e31a9742ce602c83a64a8f77b8e59… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Mar 15 20:00:05 2024 -0500 wined3d: Remove the GL FFP vertex pipeline. --- dlls/wined3d/ffp_gl.c | 1409 ---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1410 deletions(-)

1 0

Jacek Caban : mshtml: Introduce DISPEX_IDISPATCH_IMPL.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 27fea2eefcf5dd99a8f26d0179d630e63bd29670 URL: https://gitlab.winehq.org/wine/wine/-/commit/27fea2eefcf5dd99a8f26d0179d630… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 13:52:06 2024 +0200 mshtml: Introduce DISPEX_IDISPATCH_IMPL. And use it for HTMLRect object implementation. --- dlls/mshtml/htmlelem.c | 100 +------------------------------------------ dlls/mshtml/mshtml_private.h | 35 +++++++++++++++ 2 files changed, 37 insertions(+), 98 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index aa635200f7f..b2d1c544d0a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -537,57 +537,7 @@ static inline HTMLRect *impl_from_IHTMLRect(IHTMLRect *iface) return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect_iface); } -static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, void **ppv) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; -} - -static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLRect_GetIDsOfNames(IHTMLRect *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLRect, IHTMLRect, impl_from_IHTMLRect(iface)->dispex) static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) { @@ -694,53 +644,7 @@ static inline HTMLRect *impl_from_IHTMLRect2(IHTMLRect2 *iface) return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect2_iface); } -static HRESULT WINAPI HTMLRect2_QueryInterface(IHTMLRect2 *iface, REFIID riid, void **ppv) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IHTMLRect_QueryInterface(&This->IHTMLRect_iface, riid, ppv); -} - -static ULONG WINAPI HTMLRect2_AddRef(IHTMLRect2 *iface) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IHTMLRect_AddRef(&This->IHTMLRect_iface); -} - -static ULONG WINAPI HTMLRect2_Release(IHTMLRect2 *iface) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IHTMLRect_Release(&This->IHTMLRect_iface); -} - -static HRESULT WINAPI HTMLRect2_GetTypeInfoCount(IHTMLRect2 *iface, UINT *pctinfo) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLRect2_GetTypeInfo(IHTMLRect2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLRect2_GetIDsOfNames(IHTMLRect2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLRect2_Invoke(IHTMLRect2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLRect2, IHTMLRect2, impl_from_IHTMLRect2(iface)->dispex) static HRESULT WINAPI HTMLRect2_get_width(IHTMLRect2 *iface, FLOAT *p) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36d6dfd646a..1d4f005ba11 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -412,6 +412,41 @@ struct DispatchEx { dispex_dynamic_data_t *dynamic_data; }; +#define DISPEX_IDISPATCH_IMPL(prefix, iface_name, dispex) \ + static HRESULT WINAPI prefix##_QueryInterface(iface_name *iface, REFIID riid, void **ppv) \ + { \ + return IDispatchEx_QueryInterface(&(dispex).IDispatchEx_iface, riid, ppv); \ + } \ + static ULONG WINAPI prefix##_AddRef(iface_name *iface) \ + { \ + return IDispatchEx_AddRef(&(dispex).IDispatchEx_iface); \ + } \ + static ULONG WINAPI prefix##_Release(iface_name *iface) \ + { \ + return IDispatchEx_Release(&(dispex).IDispatchEx_iface); \ + } \ + static HRESULT WINAPI prefix##_GetTypeInfoCount(iface_name *iface, UINT *count) \ + { \ + return IDispatchEx_GetTypeInfoCount(&(dispex).IDispatchEx_iface, count); \ + } \ + static HRESULT WINAPI prefix##_GetTypeInfo(iface_name *iface, \ + UINT index, LCID lcid, ITypeInfo **ret) \ + { \ + return IDispatchEx_GetTypeInfo(&(dispex).IDispatchEx_iface, index, lcid, ret); \ + } \ + static HRESULT WINAPI prefix##_GetIDsOfNames(iface_name *iface, REFIID riid, \ + LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) \ + { \ + return IDispatchEx_GetIDsOfNames(&(dispex).IDispatchEx_iface, \ + riid, names, count, lcid, dispid); \ + } \ + static HRESULT WINAPI prefix##_Invoke(iface_name *iface, DISPID dispid, REFIID riid, \ + LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, UINT *err) \ + { \ + return IDispatchEx_Invoke(&(dispex).IDispatchEx_iface, dispid, \ + riid, lcid, flags, params, res, ei, err); \ + } + typedef struct { void *vtbl; int ref_flags;

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlbody.c.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 87215839b0a1233f55a06d872b6735f398c561ca URL: https://gitlab.winehq.org/wine/wine/-/commit/87215839b0a1233f55a06d872b6735… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 14:39:51 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlbody.c. --- dlls/mshtml/htmlbody.c | 108 ++----------------------------------------------- 1 file changed, 4 insertions(+), 104 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fa4284da8cc..135712afcd2 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -195,60 +195,8 @@ static inline HTMLBodyElement *impl_from_IHTMLBodyElement(IHTMLBodyElement *ifac return CONTAINING_RECORD(iface, HTMLBodyElement, IHTMLBodyElement_iface); } -static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, - REFIID riid, void **ppv) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLBodyElement_GetTypeInfo(IHTMLBodyElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, - lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, - rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, - riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLBodyElement, IHTMLBodyElement, + impl_from_IHTMLBodyElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BSTR v) { @@ -739,56 +687,8 @@ static inline HTMLBodyElement *impl_from_IHTMLTextContainer(IHTMLTextContainer * return CONTAINING_RECORD(iface, HTMLBodyElement, IHTMLTextContainer_iface); } -static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface, - REFIID riid, void **ppv) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IHTMLElement_QueryInterface(&This->element.IHTMLElement_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IHTMLElement_AddRef(&This->element.IHTMLElement_iface); -} - -static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IHTMLElement_Release(&This->element.IHTMLElement_iface); -} - -static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTextContainer_GetTypeInfo(IHTMLTextContainer *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTextContainer, IHTMLTextContainer, + impl_from_IHTMLTextContainer(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *iface, IDispatch **range)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlnode.c.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 4819828683906501d7cd76515c4cab78f32c6440 URL: https://gitlab.winehq.org/wine/wine/-/commit/4819828683906501d7cd76515c4cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 14:37:39 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlnode.c. --- dlls/mshtml/htmlnode.c | 203 ++----------------------------------------------- 1 file changed, 5 insertions(+), 198 deletions(-)

1 0

Jacek Caban : d3dx9/tests: Remove xfile dumping functionality.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 7b15890fe8edd99d4345697fdb8f0303f8fb9261 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b15890fe8edd99d4345697fdb8f03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 11:30:26 2023 +0100 d3dx9/tests: Remove xfile dumping functionality. --- dlls/d3dx9_36/tests/xfile.c | 138 -------------------------------------------- 1 file changed, 138 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 0a40e4fbb60..0a04544a4bf 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - #include "wine/test.h" #include "d3dx9.h" #include "d3dx9xof.h" @@ -244,146 +242,10 @@ static void test_type_index_color(void) d3dxfile->lpVtbl->Release(d3dxfile); } -static void process_data(ID3DXFileData *xfile_data, int level) -{ - HRESULT ret; - char name[100]; - GUID clsid; - GUID clsid_type; - SIZE_T len = sizeof(name); - int i; - const BYTE *data; - SIZE_T size; - SIZE_T children; - - ret = xfile_data->lpVtbl->GetId(xfile_data, &clsid); - ok(ret == S_OK, "ID3DXFileData_GetId failed with %#lx\n", ret); - ret = xfile_data->lpVtbl->GetName(xfile_data, name, &len); - ok(ret == S_OK, "ID3DXFileData_GetName failed with %#lx\n", ret); - ret = xfile_data->lpVtbl->GetType(xfile_data, &clsid_type); - ok(ret == S_OK, "IDirectXFileData_GetType failed with %#lx\n", ret); - ret = xfile_data->lpVtbl->Lock(xfile_data, &size, (const void**)&data); - ok(ret == S_OK, "IDirectXFileData_Lock failed with %#lx\n", ret); - - for (i = 0; i < level; i++) - printf(" "); - - printf("Found object '%s' - %s - %s - %Iu\n", - len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&clsid_type), size); - - if (size) - { - int j; - for (j = 0; j < size; j++) - { - if (j && !(j%16)) - printf("\n"); - printf("%02x ", data[j]); - } - printf("\n"); - } - - ret = xfile_data->lpVtbl->Unlock(xfile_data); - ok(ret == S_OK, "ID3DXFileData_Unlock failed with %#lx\n", ret); - - ret = xfile_data->lpVtbl->GetChildren(xfile_data, &children); - ok(ret == S_OK, "ID3DXFileData_GetChildren failed with %#lx\n", ret); - - level++; - - for (i = 0; i < children; i++) - { - ID3DXFileData *child; - int j; - - ret = xfile_data->lpVtbl->GetChild(xfile_data, i, &child); - ok(ret == S_OK, "ID3DXFileData_GetChild failed with %#lx\n", ret); - for (j = 0; j < level; j++) - printf(" "); - if (child->lpVtbl->IsReference(child)) - printf("Found Data Reference (%d)\n", i + 1); - else - printf("Found Data (%d)\n", i + 1); - - process_data(child, level); - - child->lpVtbl->Release(child); - } -} - -/* Dump an X file 'objects.x' and its related templates file 'templates.x' if they are both presents - * Useful for debug by comparing outputs from native and builtin dlls */ -static void test_dump(void) -{ - HRESULT ret; - ULONG ref; - ID3DXFile *xfile = NULL; - ID3DXFileEnumObject *xfile_enum_object = NULL; - HANDLE file; - void *data; - DWORD size; - SIZE_T children; - int i; - - /* Dump data only if there is an object and a template */ - file = CreateFileA("objects.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - CloseHandle(file); - - file = CreateFileA("templates.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - - data = calloc(1, 10000); - - if (!ReadFile(file, data, 10000, &size, NULL)) - { - skip("Templates file is too big\n"); - goto exit; - } - - printf("Load templates file (%lu bytes)\n", size); - - ret = D3DXFileCreate(&xfile); - ok(ret == S_OK, "D3DXCreateFile failed with %#lx\n", ret); - - ret = xfile->lpVtbl->RegisterTemplates(xfile, data, size); - ok(ret == S_OK, "ID3DXFileImpl_RegisterTemplates failed with %#lx\n", ret); - - ret = xfile->lpVtbl->CreateEnumObject(xfile, (void*)"objects.x", D3DXF_FILELOAD_FROMFILE, &xfile_enum_object); - ok(ret == S_OK, "ID3DXFile_CreateEnumObject failed with %#lx\n", ret); - - ret = xfile_enum_object->lpVtbl->GetChildren(xfile_enum_object, &children); - ok(ret == S_OK, "ID3DXFileEnumObject_GetChildren failed with %#lx\n", ret); - - for (i = 0; i < children; i++) - { - ID3DXFileData *child; - ret = xfile_enum_object->lpVtbl->GetChild(xfile_enum_object, i, &child); - ok(ret == S_OK, "ID3DXFileEnumObject_GetChild failed with %#lx\n", ret); - printf("\n"); - process_data(child, 0); - child->lpVtbl->Release(child); - } - - ref = xfile_enum_object->lpVtbl->Release(xfile_enum_object); - ok(ref == 0, "Got refcount %lu, expected 0\n", ref); - - ref = xfile->lpVtbl->Release(xfile); - ok(ref == 0, "Got refcount %lu, expected 0\n", ref); - - -exit: - CloseHandle(file); - free(data); -} - START_TEST(xfile) { test_templates(); test_lock_unlock(); test_getname(); test_type_index_color(); - test_dump(); }

1 0

Alexandre Julliard : ntdll: Store the CPU vendor and id during detection.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: 7f9cad6979b43b4e538cf5786ecd7bde871680fe URL: https://gitlab.winehq.org/wine/wine/-/commit/7f9cad6979b43b4e538cf5786ecd7b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 13 11:53:10 2024 +0200 ntdll: Store the CPU vendor and id during detection. --- dlls/ntdll/unix/system.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 280d1b7323a..d5556c0d42a 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -188,6 +188,8 @@ enum smbios_type SYSTEM_CPU_INFORMATION cpu_info = { 0 }; static SYSTEM_PROCESSOR_FEATURES_INFORMATION cpu_features; static char cpu_name[49]; +static char cpu_vendor[13]; +static ULONGLONG cpu_id; static ULONG *performance_cores; static unsigned int performance_cores_capacity = 0; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION *logical_proc_info; @@ -265,14 +267,6 @@ void copy_xstate( XSAVE_AREA_HEADER *dst, XSAVE_AREA_HEADER *src, UINT64 mask ) } } -#define AUTH 0x68747541 /* "Auth" */ -#define ENTI 0x69746e65 /* "enti" */ -#define CAMD 0x444d4163 /* "cAMD" */ - -#define GENU 0x756e6547 /* "Genu" */ -#define INEI 0x49656e69 /* "ineI" */ -#define NTEL 0x6c65746e /* "ntel" */ - extern void do_cpuid( unsigned int ax, unsigned int cx, unsigned int *p ); #ifdef __i386__ __ASM_GLOBAL_FUNC( do_cpuid, @@ -396,6 +390,9 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if (!have_cpuid()) return; do_cpuid( 0x00000000, 0, regs ); /* get standard cpuid level and vendor name */ + memcpy( cpu_vendor, &regs[1], sizeof(unsigned int) ); + memcpy( cpu_vendor + 4, &regs[3], sizeof(unsigned int) ); + memcpy( cpu_vendor + 8, &regs[2], sizeof(unsigned int) ); if (regs[0]>=0x00000001) /* Check for supported cpuid version */ { do_cpuid( 0x00000001, 0, regs2 ); /* get cpu features */ @@ -421,6 +418,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24)) && have_sse_daz_mode()) /* has SSE2 and FXSAVE/FXRSTOR */ features |= CPU_FEATURE_DAZ; + cpu_id = regs2[0] | ((ULONGLONG)regs2[3] << 32); if (regs[0] >= 0x00000007) { do_cpuid( 0x00000007, 0, regs3 ); /* get extended features */ @@ -452,7 +450,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) TRACE("xstate_features_size %lld.\n", (long long)xstate_features_size); } - if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD) + if (!strcmp( cpu_vendor, "AuthenticAMD" )) { info->ProcessorLevel = (regs2[0] >> 8) & 0xf; /* family */ if (info->ProcessorLevel == 0xf) /* AMD says to add the extended family to the family if family is 0xf */ @@ -474,7 +472,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (regs[0] >= 0x80000004) get_cpuid_name( cpu_name ); } - else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL) + else if (!strcmp( cpu_vendor, "GenuineIntel" )) { info->ProcessorLevel = ((regs2[0] >> 8) & 0xf) + ((regs2[0] >> 20) & 0xff); /* family + extended family */ if(info->ProcessorLevel == 15) info->ProcessorLevel = 6;

1 0

Alexandre Julliard : ntdll: Add processor information to the SMBIOS data.
by Alexandre Julliard May 13, 2024

May 13, 2024

Module: wine Branch: master Commit: dd4514a26bb411aaf4391accc63c2d779835b1ef URL: https://gitlab.winehq.org/wine/wine/-/commit/dd4514a26bb411aaf4391accc63c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 13 11:54:17 2024 +0200 ntdll: Add processor information to the SMBIOS data. --- dlls/ntdll/unix/system.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index d5556c0d42a..dcfc2ebd980 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -158,6 +158,37 @@ struct smbios_chassis BYTE contained_element_rec_length; }; +struct smbios_processor +{ + struct smbios_header hdr; + BYTE socket; + BYTE type; + BYTE family; + BYTE vendor; + ULONGLONG id; + BYTE version; + BYTE voltage; + WORD clock; + WORD max_speed; + WORD cur_speed; + BYTE status; + BYTE upgrade; + WORD l1cache; + WORD l2cache; + WORD l3cache; + BYTE serial; + BYTE asset_tag; + BYTE part_number; + BYTE core_count; + BYTE core_enabled; + BYTE thread_count; + WORD characteristics; + WORD family2; + WORD core_count2; + WORD core_enabled2; + WORD thread_count2; +}; + struct smbios_boot_info { struct smbios_header hdr; @@ -173,6 +204,7 @@ enum smbios_type SMBIOS_TYPE_SYSTEM = 1, SMBIOS_TYPE_BASEBOARD = 2, SMBIOS_TYPE_CHASSIS = 3, + SMBIOS_TYPE_PROCESSOR = 4, SMBIOS_TYPE_BOOTINFO = 32, SMBIOS_TYPE_END = 127 }; @@ -1561,6 +1593,40 @@ static WORD append_smbios_board( struct smbios_buffer *buf, WORD chassis_handle, return append_smbios( buf, &board.hdr, strings, string_count ); } +static WORD append_smbios_processor( struct smbios_buffer *buf, WORD core_count, WORD thread_count, + WORD family, const char *socket, const char *vendor, + const char *version, const char *serial, const char *asset_tag ) +{ + const char *strings[5]; + unsigned int string_count = 0; + struct smbios_processor proc = { .hdr.type = SMBIOS_TYPE_PROCESSOR, .hdr.length = sizeof(proc) }; + + proc.socket = ADD_STR( socket ); + proc.type = 3; /* central processor */ + proc.family = family ? min( family, 0xfe ) : 2; /* unknown */ + proc.vendor = ADD_STR( vendor ); + proc.id = cpu_id; + proc.version = ADD_STR( version ); + proc.status = 0x41; /* cpu enabled */ + proc.upgrade = 2; /* unknown */ + proc.l1cache = 0xffff; /* unknown */ + proc.l2cache = 0xffff; /* unknown */ + proc.l3cache = 0xffff; /* unknown */ + proc.serial = ADD_STR( serial ); + proc.asset_tag = ADD_STR( asset_tag ); + proc.core_count = min( core_count, 0xff ); + proc.core_enabled = min( core_count, 0xff ); + proc.thread_count = min( thread_count, 0xff ); + proc.family2 = family ? family : 2; + proc.core_count2 = core_count; + proc.core_enabled2 = core_count; + proc.thread_count2 = thread_count; + if (sizeof(void *) > sizeof(int)) proc.characteristics |= 1 << 2; /* 64-bit */ + if (core_count > 1) proc.characteristics |= 1 << 3; /* multi-core */ + if (thread_count > core_count) proc.characteristics |= 1 << 4; /* multi-thread */ + return append_smbios( buf, &proc.hdr, strings, string_count ); +} + static WORD append_smbios_boot_info( struct smbios_buffer *buf ) { struct smbios_boot_info boot = { .hdr.type = SMBIOS_TYPE_BOOTINFO, .hdr.length = sizeof(boot) }; @@ -1575,6 +1641,41 @@ static void append_smbios_end( struct smbios_buffer *buf ) append_smbios( buf, &end, NULL, 0 ); } +static void create_smbios_processors( struct smbios_buffer *buf ) +{ + char socket[20], name[49]; + SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *p = logical_proc_info_ex; + UINT i, family = 0, core_count = 0, thread_count = 0, pkg_count = 0; + + strcpy( name, cpu_name ); + for (i = strlen(name); i > 0 && name[i - 1] == ' '; i--) name[i - 1] = 0; + + while ((char *)p != (char *)logical_proc_info_ex + logical_proc_info_ex_size) + { + switch (p->Relationship) + { + case RelationProcessorPackage: + if (!pkg_count++) break; + snprintf( socket, sizeof(socket), "Socket #%u", pkg_count - 1 ); + append_smbios_processor( buf, core_count, thread_count, family, + socket, cpu_vendor, name, "", "" ); + core_count = thread_count = 0; + break; + case RelationProcessorCore: + core_count++; + thread_count++; + if (p->Processor.Flags & LTP_PC_SMT) thread_count++; + break; + default: + break; + } + p = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((char *)p + p->Size); + } + snprintf( socket, sizeof(socket), "Socket #%u", pkg_count - 1 ); + append_smbios_processor( buf, core_count, thread_count, family, + socket, cpu_vendor, name, "", "" ); +} + #undef ADD_STR #ifdef linux @@ -1673,6 +1774,7 @@ static struct smbios_prologue *create_smbios_data(void) get_smbios_string( "/sys/class/dmi/id/board_asset_tag", S(asset_tag) )); #undef S + create_smbios_processors( &buf ); append_smbios_boot_info( &buf ); append_smbios_end( &buf ); return buf.prologue; @@ -1807,6 +1909,7 @@ static struct smbios_prologue *create_smbios_data(void) append_smbios_system( &buf, manufacturer, model, "1.0", serial_number, "", model, &system_uuid ); chassis = append_smbios_chassis( &buf, 0, manufacturer, "", serial_number, "" ); append_smbios_board( &buf, chassis, manufacturer, model, model, serial_number, "" ); + create_smbios_processors( &buf ); append_smbios_boot_info( &buf ); append_smbios_end( &buf ); return buf.prologue; @@ -1828,6 +1931,7 @@ static struct smbios_prologue *create_smbios_data(void) append_smbios_system( &buf, vendor, product, version, serial, "", "", &uuid ); chassis = append_smbios_chassis( &buf, 0, vendor, version, serial, "" ); append_smbios_board( &buf, chassis, vendor, product, version, serial, "" ); + create_smbios_processors( &buf ); append_smbios_boot_info( &buf ); append_smbios_end( &buf ); return buf.prologue;

1 0

Elizabeth Figura : d3d9/tests: Add some tests for default diffuse values.
by Alexandre Julliard May 12, 2024

May 12, 2024

Module: wine Branch: master Commit: fe94c844fa06f4a6d367add031cb8cf047726f10 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe94c844fa06f4a6d367add031cb8c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Sat May 4 13:21:39 2024 -0500 d3d9/tests: Add some tests for default diffuse values. --- dlls/d3d9/tests/visual.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b670c4f49d6..ef6d831aef3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -28336,6 +28336,205 @@ static void test_mipmap_upload(void) release_test_context(&context); } +static void test_default_diffuse(void) +{ + IDirect3DVertexDeclaration9 *vertex_declaration; + struct d3d9_test_context context; + IDirect3DVertexBuffer9 *vb; + IDirect3DDevice9 *device; + HRESULT hr; + void *data; + + static const D3DVERTEXELEMENT9 decl_elements_with_diffuse[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; + + static const D3DVERTEXELEMENT9 decl_elements_no_diffuse[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; + + static const D3DVERTEXELEMENT9 decl_elements_missing_diffuse[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 0, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, + D3DDECL_END() + }; + + static const DWORD vs_code[] = + { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0200001f, 0x8000000a, 0x900f0001, /* dcl_color0 v1 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x02000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x0000ffff /* end */ + }; + + static const DWORD vs_no_diffuse_code[] = + { + 0xfffe0200, /* vs_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x02000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x0000ffff /* end */ + }; + + static const DWORD ps_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ + 0x0000ffff /* end */ + }; + + static const struct + { + struct vec3 position; + unsigned int diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xff0000ff}, + {{-1.0f, 1.0f, 0.1f}, 0xff0000ff}, + {{ 1.0f, -1.0f, 0.1f}, 0xff0000ff}, + {{ 1.0f, 1.0f, 0.1f}, 0xff0000ff}, + }; + + static const struct + { + const DWORD *ps; + DWORD texture_source; + } + ps_tests[] = + { + {ps_code, 0}, + {NULL, D3DTA_CURRENT}, + {NULL, D3DTA_DIFFUSE}, + }; + + static const struct + { + const DWORD *vs; + const D3DVERTEXELEMENT9 *decl_elements; + unsigned int expect_colour; + } + vs_tests[] = + { + {NULL, decl_elements_with_diffuse, 0x000000ff}, + {NULL, decl_elements_no_diffuse, 0x00ffffff}, + {NULL, decl_elements_missing_diffuse, 0x00000000}, + {vs_code, decl_elements_with_diffuse, 0x000000ff}, + {vs_code, decl_elements_no_diffuse, 0x00000000}, + {vs_code, decl_elements_missing_diffuse, 0x00000000}, + {vs_no_diffuse_code, decl_elements_with_diffuse, 0x00ffffff}, + {vs_no_diffuse_code, decl_elements_no_diffuse, 0x00ffffff}, + {vs_no_diffuse_code, decl_elements_missing_diffuse, 0x00ffffff}, + }; + + if (!init_test_context(&context)) + return; + device = context.device; + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), + D3DUSAGE_DYNAMIC | D3DUSAGE_WRITEONLY, 0, D3DPOOL_DEFAULT, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, 0, &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); + + for (unsigned int i = 0; i < ARRAY_SIZE(ps_tests); ++i) + { + winetest_push_context("PS test %u", i); + + if (ps_tests[i].ps) + { + IDirect3DPixelShader9 *ps; + + hr = IDirect3DDevice9_CreatePixelShader(device, ps_tests[i].ps, &ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IDirect3DPixelShader9_Release(ps); + } + else + { + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, ps_tests[i].texture_source); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, ps_tests[i].texture_source); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + + for (unsigned int j = 0; j < ARRAY_SIZE(vs_tests); ++j) + { + unsigned int colour; + + winetest_push_context("VS test %u", j); + + if (vs_tests[j].vs) + { + IDirect3DVertexShader9 *vs; + + hr = IDirect3DDevice9_CreateVertexShader(device, vs_tests[j].vs, &vs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IDirect3DVertexShader9_Release(vs); + } + else + { + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + + hr = IDirect3DDevice9_CreateVertexDeclaration(device, vs_tests[j].decl_elements, &vertex_declaration); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + IDirect3DVertexDeclaration9_Release(vertex_declaration); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 0, 2); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + colour = getPixelColor(device, 320, 240); + todo_wine_if (j == 2) + ok(colour == vs_tests[j].expect_colour, "Got unexpected colour %08x.\n", colour); + + winetest_pop_context(); + } + + winetest_pop_context(); + } + + IDirect3DVertexShader9_Release(vb); + release_test_context(&context); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -28490,4 +28689,5 @@ START_TEST(visual) test_managed_reset(); test_managed_generate_mipmap(); test_mipmap_upload(); + test_default_diffuse(); }

1 0