February 2019 - Wine-Devel - list.winehq.org

[PATCH v2 1/4] quartz/tests/avisplit: Add some tests for media types.
by Zebediah Figura Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f1647c0..a2c0fba70a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c4a4..d4547cd881 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] -- 2.20.1

2 5

[PATCH v3 1/4] quartz/tests/avisplit: Add some tests for media types.
by Zebediah Figura Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f1647c0..a2c0fba70a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c4a4..d4547cd881 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] -- 2.20.1

1 3

[PATCH] include: Add more DB_E_* defines
by Alistair Leslie-Hughes Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledberr.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/oledberr.h b/include/oledberr.h index 8af38ef..c3d0d29 100644 --- a/include/oledberr.h +++ b/include/oledberr.h @@ -21,6 +21,15 @@ #ifndef __WINE_OLEDBERR_H #define __WINE_OLEDBERR_H +#define DB_E_BADACCESSORHANDLE 0x80040e00 +#define DB_E_ROWLIMITEXCEEDED 0x80040e01 +#define DB_E_READONLYACCESSOR 0x80040e02 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_SCHEMAVIOLATION 0x80040e03 +#define DB_E_BADROWHANDLE 0x80040e04 +#define DB_E_OBJECTOPEN 0x80040e05 +#define DB_E_BADCHAPTER 0x80040e06 +#define DB_E_CANTCONVERTVALUE 0x80040e07 #define DB_E_BADBINDINFO 0x80040e08 #define DB_E_ERRORSINCOMMAND 0x80040e14 -- 1.9.1

2 1

[PATCH 1/4] quartz/tests/avisplit: Add some tests for media types.
by Zebediah Figura Feb. 28, 2019

Feb. 28, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/avisplit.c | 127 +++++++++++++++++++++++++++++++++++ include/wmcodecdsp.idl | 2 + 2 files changed, 129 insertions(+) diff --git a/dlls/quartz/tests/avisplit.c b/dlls/quartz/tests/avisplit.c index 633f1647c0..a2c0fba70a 100644 --- a/dlls/quartz/tests/avisplit.c +++ b/dlls/quartz/tests/avisplit.c @@ -21,6 +21,8 @@ #define COBJMACROS #include "dshow.h" +#include "initguid.h" +#include "wmcodecdsp.h" #include "wine/test.h" static const WCHAR sink_name[] = {'i','n','p','u','t',' ','p','i','n',0}; @@ -408,6 +410,130 @@ todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + static const VIDEOINFOHEADER expect_vih = + { + {0}, {0}, 0, 0, 1000 * 10000, + {sizeof(BITMAPINFOHEADER), 32, 24, 1, 12, mmioFOURCC('I','4','2','0'), 32*24*12/8} + }; + + const WCHAR *filename = load_resource(avifile); + IBaseFilter *filter = create_avi_splitter(); + AM_MEDIA_TYPE mt = {0}, *pmt; + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, sink_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Stream; + mt.subtype = MEDIASUBTYPE_Avi; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.formattype = FORMAT_WaveFormatEx; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Stream; + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_Avi; + + graph = connect_input(filter, filename); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source0_name, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video), "Got major type %s\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_I420), "Got subtype %s\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(!pmt->bFixedSizeSamples, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + todo_wine ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_VideoInfo), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(VIDEOINFOHEADER), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_vih, sizeof(VIDEOINFOHEADER)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = TRUE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Video; + + pmt->subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_I420; + + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_VideoInfo; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IFilterGraph2_Release(graph); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ret = DeleteFileW(filename); + ok(ret, "Failed to delete file, error %u.\n", GetLastError()); +} + static void test_filter_graph(void) { IFileSourceFilter *pfile = NULL; @@ -658,6 +784,7 @@ START_TEST(avisplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); test_filter_graph(); CoUninitialize(); diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 8ec303c4a4..d4547cd881 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -19,6 +19,8 @@ import "mediaobj.idl"; import "strmif.idl"; +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") + [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a) ] -- 2.20.1

2 5

[PATCH 1/3] d3dx9: Rename the ID3DXEffect object and methods
by Michael Stefaniuc Feb. 27, 2019

Feb. 27, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 536 ++++++++++++++++++++--------------------- 1 file changed, 264 insertions(+), 272 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b0dc366f6b..5bf66011ea 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,6 +148,8 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; +#define ID3DXEffectImpl d3dx9_effect + struct d3dx9_base_effect { struct ID3DXEffectImpl *effect; @@ -170,7 +172,7 @@ struct d3dx9_base_effect unsigned int full_name_tmp_size; }; -struct ID3DXEffectImpl +struct d3dx9_effect { ID3DXEffect ID3DXEffect_iface; LONG ref; @@ -3394,13 +3396,13 @@ static inline struct d3dx_effect_pool *impl_from_ID3DXEffectPool(ID3DXEffectPool return CONTAINING_RECORD(iface, struct d3dx_effect_pool, ID3DXEffectPool_iface); } -static inline struct ID3DXEffectImpl *impl_from_ID3DXEffect(ID3DXEffect *iface) +static inline struct d3dx9_effect *impl_from_ID3DXEffect(ID3DXEffect *iface) { - return CONTAINING_RECORD(iface, struct ID3DXEffectImpl, ID3DXEffect_iface); + return CONTAINING_RECORD(iface, struct d3dx9_effect, ID3DXEffect_iface); } /*** IUnknown methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) +static HRESULT WINAPI d3dx9_effect_QueryInterface(ID3DXEffect *iface, REFIID riid, void **object) { TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); @@ -3417,18 +3419,18 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI ID3DXEffectImpl_AddRef(ID3DXEffect *iface) +static ULONG WINAPI d3dx9_effect_AddRef(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) +static ULONG WINAPI d3dx9_effect_Release(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -3443,45 +3445,46 @@ static ULONG WINAPI ID3DXEffectImpl_Release(ID3DXEffect *iface) } /*** ID3DXBaseEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, desc %p.\n", iface, desc); return d3dx9_base_effect_get_desc(&effect->base_effect, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetParameterDesc(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXPARAMETER_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); return d3dx9_base_effect_get_parameter_desc(&effect->base_effect, parameter, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetTechniqueDesc(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXTECHNIQUE_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXTECHNIQUE_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, desc %p.\n", iface, technique, desc); return d3dx9_base_effect_get_technique_desc(&effect->base_effect, technique, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass, D3DXPASS_DESC *desc) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc); return d3dx9_base_effect_get_pass_desc(&effect->base_effect, pass, desc); } -static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, D3DXFUNCTION_DESC *desc) +static HRESULT WINAPI d3dx9_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE shader, + D3DXFUNCTION_DESC *desc) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3490,82 +3493,81 @@ static HRESULT WINAPI ID3DXEffectImpl_GetFunctionDesc(ID3DXEffect *iface, D3DXHA return d3dx9_base_effect_get_function_desc(&effect->base_effect, shader, desc); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterByName(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterBySemantic(ID3DXEffect *iface, - D3DXHANDLE parameter, const char *semantic) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, + const char *semantic) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, semantic %s.\n", iface, parameter, debugstr_a(semantic)); return d3dx9_base_effect_get_parameter_by_semantic(&effect->base_effect, parameter, semantic); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechnique(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetTechnique(ID3DXEffect *iface, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, index %u.\n", iface, index); return d3dx9_base_effect_get_technique(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetTechniqueByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetTechniqueByName(ID3DXEffect *iface, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); return d3dx9_base_effect_get_technique_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetPass(ID3DXEffect *iface, D3DXHANDLE technique, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, index %u.\n", iface, technique, index); return d3dx9_base_effect_get_pass(&effect->base_effect, technique, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetPassByName(ID3DXEffect *iface, - D3DXHANDLE technique, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetPassByName(ID3DXEffect *iface, D3DXHANDLE technique, const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, technique %p, name %s.\n", iface, technique, debugstr_a(name)); return d3dx9_base_effect_get_pass_by_name(&effect->base_effect, technique, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetFunction(ID3DXEffect *iface, UINT index) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3574,7 +3576,7 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunction(ID3DXEffect *iface, UINT in return d3dx9_base_effect_get_function(&effect->base_effect, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetFunctionByName(ID3DXEffect *iface, const char *name) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3583,378 +3585,368 @@ static D3DXHANDLE WINAPI ID3DXEffectImpl_GetFunctionByName(ID3DXEffect *iface, c return d3dx9_base_effect_get_function_by_name(&effect->base_effect, name); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) +static D3DXHANDLE WINAPI d3dx9_effect_GetAnnotation(ID3DXEffect *iface, D3DXHANDLE object, UINT index) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, index %u.\n", iface, object, index); return d3dx9_base_effect_get_annotation(&effect->base_effect, object, index); } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetAnnotationByName(ID3DXEffect *iface, - D3DXHANDLE object, const char *name) +static D3DXHANDLE WINAPI d3dx9_effect_GetAnnotationByName(ID3DXEffect *iface, D3DXHANDLE object, + const char *name) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, object %p, name %s.\n", iface, object, debugstr_a(name)); return d3dx9_base_effect_get_annotation_by_name(&effect->base_effect, object, name); } -static HRESULT WINAPI ID3DXEffectImpl_SetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT bytes) +static HRESULT WINAPI d3dx9_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parameter, + const void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_set_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_GetValue(ID3DXEffect *iface, - D3DXHANDLE parameter, void *data, UINT bytes) +static HRESULT WINAPI d3dx9_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); return d3dx9_base_effect_get_value(&effect->base_effect, parameter, data, bytes); } -static HRESULT WINAPI ID3DXEffectImpl_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) +static HRESULT WINAPI d3dx9_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); return d3dx9_base_effect_set_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) +static HRESULT WINAPI d3dx9_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); return d3dx9_base_effect_get_bool(&effect->base_effect, parameter, b); } -static HRESULT WINAPI ID3DXEffectImpl_SetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const BOOL *b, UINT count) +static HRESULT WINAPI d3dx9_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_set_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetBoolArray(ID3DXEffect *iface, - D3DXHANDLE parameter, BOOL *b, UINT count) +static HRESULT WINAPI d3dx9_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); return d3dx9_base_effect_get_bool_array(&effect->base_effect, parameter, b, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) +static HRESULT WINAPI d3dx9_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); return d3dx9_base_effect_set_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) +static HRESULT WINAPI d3dx9_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); return d3dx9_base_effect_get_int(&effect->base_effect, parameter, n); } -static HRESULT WINAPI ID3DXEffectImpl_SetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const INT *n, UINT count) +static HRESULT WINAPI d3dx9_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetIntArray(ID3DXEffect *iface, - D3DXHANDLE parameter, INT *n, UINT count) +static HRESULT WINAPI d3dx9_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); return d3dx9_base_effect_get_int_array(&effect->base_effect, parameter, n, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) +static HRESULT WINAPI d3dx9_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f); return d3dx9_base_effect_set_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) +static HRESULT WINAPI d3dx9_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f); return d3dx9_base_effect_get_float(&effect->base_effect, parameter, f); } -static HRESULT WINAPI ID3DXEffectImpl_SetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const float *f, UINT count) +static HRESULT WINAPI d3dx9_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_set_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetFloatArray(ID3DXEffect *iface, - D3DXHANDLE parameter, float *f, UINT count) +static HRESULT WINAPI d3dx9_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); return d3dx9_base_effect_get_float_array(&effect->base_effect, parameter, f, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx9_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_set_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_GetVector(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) +static HRESULT WINAPI d3dx9_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); } -static HRESULT WINAPI ID3DXEffectImpl_SetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx9_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_set_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetVectorArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXVECTOR4 *vector, UINT count) +static HRESULT WINAPI d3dx9_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXVECTOR4 *vector, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); return d3dx9_base_effect_get_vector_array(&effect->base_effect, parameter, vector, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrix(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixPointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_set_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTranspose(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix) +static HRESULT WINAPI d3dx9_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); return d3dx9_base_effect_get_matrix_transpose(&effect->base_effect, parameter, matrix); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposeArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX *matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, const D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_SetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + const D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_set_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_GetMatrixTransposePointerArray(ID3DXEffect *iface, - D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count) +static HRESULT WINAPI d3dx9_effect_GetMatrixTransposePointerArray(ID3DXEffect *iface, D3DXHANDLE parameter, + D3DXMATRIX **matrix, UINT count) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); return d3dx9_base_effect_get_matrix_transpose_pointer_array(&effect->base_effect, parameter, matrix, count); } -static HRESULT WINAPI ID3DXEffectImpl_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) +static HRESULT WINAPI d3dx9_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); return d3dx9_base_effect_set_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) +static HRESULT WINAPI d3dx9_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); return d3dx9_base_effect_get_string(&effect->base_effect, parameter, string); } -static HRESULT WINAPI ID3DXEffectImpl_SetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 *texture) +static HRESULT WINAPI d3dx9_effect_SetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 *texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_set_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetTexture(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DBaseTexture9 **texture) +static HRESULT WINAPI d3dx9_effect_GetTexture(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DBaseTexture9 **texture) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); return d3dx9_base_effect_get_texture(&effect->base_effect, parameter, texture); } -static HRESULT WINAPI ID3DXEffectImpl_GetPixelShader(ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DPixelShader9 **shader) +static HRESULT WINAPI d3dx9_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DPixelShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_pixel_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_GetVertexShader(struct ID3DXEffect *iface, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx9_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, + struct IDirect3DVertexShader9 **shader) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); } -static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) +static HRESULT WINAPI d3dx9_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) { struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); @@ -3964,9 +3956,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) +static HRESULT WINAPI d3dx9_effect_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, pool %p\n", This, pool); @@ -3988,9 +3980,9 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPoo return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx9_effect_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &This->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); @@ -4008,18 +4000,18 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDL return D3DERR_INVALIDCALL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) +static D3DXHANDLE WINAPI d3dx9_effect_GetCurrentTechnique(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); return get_technique_handle(This->active_technique); } -static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI d3dx9_effect_ValidateTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *tech = get_valid_technique(base, technique); HRESULT ret = D3D_OK; @@ -4065,10 +4057,10 @@ done: return ret; } -static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, - D3DXHANDLE technique, D3DXHANDLE *next_technique) +static HRESULT WINAPI d3dx9_effect_FindNextValidTechnique(ID3DXEffect *iface, D3DXHANDLE technique, + D3DXHANDLE *next_technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_technique *prev_tech, *tech; unsigned int i; @@ -4098,7 +4090,7 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect *iface, for (; i < base->technique_count; ++i) { tech = &base->techniques[i]; - if (SUCCEEDED(ID3DXEffectImpl_ValidateTechnique(iface, get_technique_handle(tech)))) + if (SUCCEEDED(d3dx9_effect_ValidateTechnique(iface, get_technique_handle(tech)))) { *next_technique = get_technique_handle(tech); return D3D_OK; @@ -4216,9 +4208,9 @@ static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_techniqu return FALSE; } -static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) +static BOOL WINAPI d3dx9_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXHANDLE technique) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); struct d3dx_technique *tech = get_valid_technique(&effect->base_effect, technique); BOOL ret; @@ -4231,9 +4223,9 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL return ret; } -static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) +static HRESULT WINAPI d3dx9_effect_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, passes %p, flags %#x.\n", iface, passes, flags); @@ -4283,9 +4275,9 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) +static HRESULT WINAPI d3dx9_effect_BeginPass(ID3DXEffect *iface, UINT pass) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p, pass %u\n", effect, pass); @@ -4307,9 +4299,9 @@ static HRESULT WINAPI ID3DXEffectImpl_BeginPass(ID3DXEffect *iface, UINT pass) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) +static HRESULT WINAPI d3dx9_effect_CommitChanges(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); TRACE("iface %p.\n", iface); @@ -4321,9 +4313,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect *iface) return d3dx9_apply_pass_states(effect, effect->active_pass, FALSE); } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) +static HRESULT WINAPI d3dx9_effect_EndPass(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p\n", This); @@ -4338,9 +4330,9 @@ static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) return D3DERR_INVALIDCALL; } -static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) +static HRESULT WINAPI d3dx9_effect_End(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx_technique *technique = effect->active_technique; TRACE("iface %p.\n", iface); @@ -4370,9 +4362,9 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) +static HRESULT WINAPI d3dx9_effect_GetDevice(ID3DXEffect *iface, struct IDirect3DDevice9 **device) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, device %p\n", This, device); @@ -4438,9 +4430,9 @@ static BOOL param_on_lost_device(void *data, struct d3dx_parameter *param) return FALSE; } -static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx9_effect_OnLostDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *effect = impl_from_ID3DXEffect(iface); struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; @@ -4452,18 +4444,18 @@ static HRESULT WINAPI ID3DXEffectImpl_OnLostDevice(ID3DXEffect* iface) return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) +static HRESULT WINAPI d3dx9_effect_OnResetDevice(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) +static HRESULT WINAPI d3dx9_effect_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4475,9 +4467,9 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) +static HRESULT WINAPI d3dx9_effect_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); TRACE("iface %p, manager %p\n", This, manager); @@ -4493,27 +4485,27 @@ static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXE return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_BeginParameterBlock(ID3DXEffect* iface) +static HRESULT WINAPI d3dx9_effect_BeginParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return E_NOTIMPL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_EndParameterBlock(ID3DXEffect* iface) +static D3DXHANDLE WINAPI d3dx9_effect_EndParameterBlock(ID3DXEffect *iface) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(): stub\n", This); return NULL; } -static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx9_effect_ApplyParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4521,9 +4513,9 @@ static HRESULT WINAPI ID3DXEffectImpl_ApplyParameterBlock(ID3DXEffect* iface, D3 } #if D3DX_SDK_VERSION >= 26 -static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D3DXHANDLE parameter_block) +static HRESULT WINAPI d3dx9_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXHANDLE parameter_block) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p): stub\n", This, parameter_block); @@ -4531,10 +4523,10 @@ static HRESULT WINAPI ID3DXEffectImpl_DeleteParameterBlock(ID3DXEffect* iface, D } #endif -static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, - struct IDirect3DDevice9 *device, struct ID3DXEffect **effect) +static HRESULT WINAPI d3dx9_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, + struct ID3DXEffect **effect) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct d3dx9_effect *This = impl_from_ID3DXEffect(iface); FIXME("(%p)->(%p, %p): stub\n", This, device, effect); @@ -4551,8 +4543,8 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, } #if D3DX_SDK_VERSION >= 27 -static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, - D3DXHANDLE parameter, const void *data, UINT byte_offset, UINT bytes) +static HRESULT WINAPI d3dx9_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data, + UINT byte_offset, UINT bytes) { FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n", iface, parameter, data, byte_offset, bytes); @@ -4564,90 +4556,90 @@ static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface, static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = { /*** IUnknown methods ***/ - ID3DXEffectImpl_QueryInterface, - ID3DXEffectImpl_AddRef, - ID3DXEffectImpl_Release, + d3dx9_effect_QueryInterface, + d3dx9_effect_AddRef, + d3dx9_effect_Release, /*** ID3DXBaseEffect methods ***/ - ID3DXEffectImpl_GetDesc, - ID3DXEffectImpl_GetParameterDesc, - ID3DXEffectImpl_GetTechniqueDesc, - ID3DXEffectImpl_GetPassDesc, - ID3DXEffectImpl_GetFunctionDesc, - ID3DXEffectImpl_GetParameter, - ID3DXEffectImpl_GetParameterByName, - ID3DXEffectImpl_GetParameterBySemantic, - ID3DXEffectImpl_GetParameterElement, - ID3DXEffectImpl_GetTechnique, - ID3DXEffectImpl_GetTechniqueByName, - ID3DXEffectImpl_GetPass, - ID3DXEffectImpl_GetPassByName, - ID3DXEffectImpl_GetFunction, - ID3DXEffectImpl_GetFunctionByName, - ID3DXEffectImpl_GetAnnotation, - ID3DXEffectImpl_GetAnnotationByName, - ID3DXEffectImpl_SetValue, - ID3DXEffectImpl_GetValue, - ID3DXEffectImpl_SetBool, - ID3DXEffectImpl_GetBool, - ID3DXEffectImpl_SetBoolArray, - ID3DXEffectImpl_GetBoolArray, - ID3DXEffectImpl_SetInt, - ID3DXEffectImpl_GetInt, - ID3DXEffectImpl_SetIntArray, - ID3DXEffectImpl_GetIntArray, - ID3DXEffectImpl_SetFloat, - ID3DXEffectImpl_GetFloat, - ID3DXEffectImpl_SetFloatArray, - ID3DXEffectImpl_GetFloatArray, - ID3DXEffectImpl_SetVector, - ID3DXEffectImpl_GetVector, - ID3DXEffectImpl_SetVectorArray, - ID3DXEffectImpl_GetVectorArray, - ID3DXEffectImpl_SetMatrix, - ID3DXEffectImpl_GetMatrix, - ID3DXEffectImpl_SetMatrixArray, - ID3DXEffectImpl_GetMatrixArray, - ID3DXEffectImpl_SetMatrixPointerArray, - ID3DXEffectImpl_GetMatrixPointerArray, - ID3DXEffectImpl_SetMatrixTranspose, - ID3DXEffectImpl_GetMatrixTranspose, - ID3DXEffectImpl_SetMatrixTransposeArray, - ID3DXEffectImpl_GetMatrixTransposeArray, - ID3DXEffectImpl_SetMatrixTransposePointerArray, - ID3DXEffectImpl_GetMatrixTransposePointerArray, - ID3DXEffectImpl_SetString, - ID3DXEffectImpl_GetString, - ID3DXEffectImpl_SetTexture, - ID3DXEffectImpl_GetTexture, - ID3DXEffectImpl_GetPixelShader, - ID3DXEffectImpl_GetVertexShader, - ID3DXEffectImpl_SetArrayRange, + d3dx9_effect_GetDesc, + d3dx9_effect_GetParameterDesc, + d3dx9_effect_GetTechniqueDesc, + d3dx9_effect_GetPassDesc, + d3dx9_effect_GetFunctionDesc, + d3dx9_effect_GetParameter, + d3dx9_effect_GetParameterByName, + d3dx9_effect_GetParameterBySemantic, + d3dx9_effect_GetParameterElement, + d3dx9_effect_GetTechnique, + d3dx9_effect_GetTechniqueByName, + d3dx9_effect_GetPass, + d3dx9_effect_GetPassByName, + d3dx9_effect_GetFunction, + d3dx9_effect_GetFunctionByName, + d3dx9_effect_GetAnnotation, + d3dx9_effect_GetAnnotationByName, + d3dx9_effect_SetValue, + d3dx9_effect_GetValue, + d3dx9_effect_SetBool, + d3dx9_effect_GetBool, + d3dx9_effect_SetBoolArray, + d3dx9_effect_GetBoolArray, + d3dx9_effect_SetInt, + d3dx9_effect_GetInt, + d3dx9_effect_SetIntArray, + d3dx9_effect_GetIntArray, + d3dx9_effect_SetFloat, + d3dx9_effect_GetFloat, + d3dx9_effect_SetFloatArray, + d3dx9_effect_GetFloatArray, + d3dx9_effect_SetVector, + d3dx9_effect_GetVector, + d3dx9_effect_SetVectorArray, + d3dx9_effect_GetVectorArray, + d3dx9_effect_SetMatrix, + d3dx9_effect_GetMatrix, + d3dx9_effect_SetMatrixArray, + d3dx9_effect_GetMatrixArray, + d3dx9_effect_SetMatrixPointerArray, + d3dx9_effect_GetMatrixPointerArray, + d3dx9_effect_SetMatrixTranspose, + d3dx9_effect_GetMatrixTranspose, + d3dx9_effect_SetMatrixTransposeArray, + d3dx9_effect_GetMatrixTransposeArray, + d3dx9_effect_SetMatrixTransposePointerArray, + d3dx9_effect_GetMatrixTransposePointerArray, + d3dx9_effect_SetString, + d3dx9_effect_GetString, + d3dx9_effect_SetTexture, + d3dx9_effect_GetTexture, + d3dx9_effect_GetPixelShader, + d3dx9_effect_GetVertexShader, + d3dx9_effect_SetArrayRange, /*** ID3DXEffect methods ***/ - ID3DXEffectImpl_GetPool, - ID3DXEffectImpl_SetTechnique, - ID3DXEffectImpl_GetCurrentTechnique, - ID3DXEffectImpl_ValidateTechnique, - ID3DXEffectImpl_FindNextValidTechnique, - ID3DXEffectImpl_IsParameterUsed, - ID3DXEffectImpl_Begin, - ID3DXEffectImpl_BeginPass, - ID3DXEffectImpl_CommitChanges, - ID3DXEffectImpl_EndPass, - ID3DXEffectImpl_End, - ID3DXEffectImpl_GetDevice, - ID3DXEffectImpl_OnLostDevice, - ID3DXEffectImpl_OnResetDevice, - ID3DXEffectImpl_SetStateManager, - ID3DXEffectImpl_GetStateManager, - ID3DXEffectImpl_BeginParameterBlock, - ID3DXEffectImpl_EndParameterBlock, - ID3DXEffectImpl_ApplyParameterBlock, + d3dx9_effect_GetPool, + d3dx9_effect_SetTechnique, + d3dx9_effect_GetCurrentTechnique, + d3dx9_effect_ValidateTechnique, + d3dx9_effect_FindNextValidTechnique, + d3dx9_effect_IsParameterUsed, + d3dx9_effect_Begin, + d3dx9_effect_BeginPass, + d3dx9_effect_CommitChanges, + d3dx9_effect_EndPass, + d3dx9_effect_End, + d3dx9_effect_GetDevice, + d3dx9_effect_OnLostDevice, + d3dx9_effect_OnResetDevice, + d3dx9_effect_SetStateManager, + d3dx9_effect_GetStateManager, + d3dx9_effect_BeginParameterBlock, + d3dx9_effect_EndParameterBlock, + d3dx9_effect_ApplyParameterBlock, #if D3DX_SDK_VERSION >= 26 - ID3DXEffectImpl_DeleteParameterBlock, + d3dx9_effect_DeleteParameterBlock, #endif - ID3DXEffectImpl_CloneEffect, + d3dx9_effect_CloneEffect, #if D3DX_SDK_VERSION >= 27 - ID3DXEffectImpl_SetRawValue + d3dx9_effect_SetRawValue #endif }; -- 2.20.1

2 4

[PATCH] pdh: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc Feb. 27, 2019

Feb. 27, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return PDH_INVALID_ARGUMENT if size is NULL. dlls/pdh/pdh_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index bc3674a28a..7ef91f1a7f 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -898,9 +898,9 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR { int required = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); - if (size && *size < required) ret = PDH_MORE_DATA; + if (*size < required) ret = PDH_MORE_DATA; else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); - if (size) *size = required; + *size = required; } heap_free( machineW ); return ret; -- 2.20.1

1 0

[PATCH] shlwapi: Remove redundant not-NULL check (coccinellery)
by Michael Stefaniuc Feb. 27, 2019

Feb. 27, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- return E_FAIL if dest is NULL. dlls/shlwapi/string.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index d400f8befe..7b8473a379 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -1527,8 +1527,7 @@ HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, if (!src) { WARN("Invalid lpStrRet would crash under Win32!\n"); - if (dest) - *dest = '\0'; + *dest = '\0'; return E_FAIL; } -- 2.20.1

1 0

Wine translation for ast locale
by Enol Puente Feb. 27, 2019

Feb. 27, 2019

Hi, My name is Enol and I am member of Softastur association which translates free as freedom software into Asturian. During these days I was translating Wine into Asturian and I have already completed 1000 of 3699 strings, now I would like to request their merge into Wine's code to review them. Asturian is an only 639-2 ISO language and currently is not an "official" language of Windows, but you can select it from Language settings on that OS (thanks to the work on CLDR) to set only date and time, and ask third-party apps to use it if they have Asturian translations. I hope this is not a problem. Thanks for reading me.

3 5

[PATCH 3/5] [wmvcore] add tests for WMCreateSyncReader
by Vijay Kiran Kamuju Feb. 27, 2019

Feb. 27, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wmvcore/tests/wmvcore.c | 87 ++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index af6d32a78e..ebeab3ff46 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + todo_wine ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -262,6 +348,7 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv(); -- 2.21.0

1 0

[PATCH 1/5] [include] add missing WMT_RIGHTS enum definition
by Vijay Kiran Kamuju Feb. 27, 2019

Feb. 27, 2019

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- include/drmexternals.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/drmexternals.idl b/include/drmexternals.idl index 88826ad561..b89039423d 100644 --- a/include/drmexternals.idl +++ b/include/drmexternals.idl @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,3 +18,16 @@ */ import "wmdrmsdk.idl"; + +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x00000001, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x00000002, + WMT_RIGHT_COPY_TO_CD = 0x00000008, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x00000010, + WMT_RIGHT_ONE_TIME = 0x00000020, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x00000040, + WMT_RIGHT_COPY = 0x00000080, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x00000100, + WMT_RIGHT_SDMI_TRIGGER = 0x00010000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x00020000 +} WMT_RIGHTS; -- 2.21.0

1 4