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

[PATCH] wshom.ocx: Fix string length returned from Check returned BSTR length.
by Nikolay Sivov March 4, 2019

March 4, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46754 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 14 ++++++++------ dlls/wshom.ocx/tests/wshom.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index ca4f7ff899..57f17464be 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -455,14 +455,16 @@ static HRESULT WINAPI WshEnvironment_get_Item(IWshEnvironment *iface, BSTR name, return E_POINTER; len = GetEnvironmentVariableW(name, NULL, 0); - *value = SysAllocStringLen(NULL, len); - if (!*value) - return E_OUTOFMEMORY; - if (len) - GetEnvironmentVariableW(name, *value, len+1); + { + *value = SysAllocStringLen(NULL, len - 1); + if (*value) + GetEnvironmentVariableW(name, *value, len); + } + else + *value = SysAllocStringLen(NULL, 0); - return S_OK; + return *value ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI WshEnvironment_put_Item(IWshEnvironment *iface, BSTR name, BSTR value) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index c1f9519ff8..c00f7abfa8 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -56,6 +56,13 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) ITypeInfo_Release(ti); } +#define CHECK_BSTR_LENGTH(str) check_bstr_length(str, __LINE__) +static void check_bstr_length(BSTR str, int line) +{ + ok_(__FILE__, line)(SysStringLen(str) == lstrlenW(str), "Unexpected string length %u vs %u.\n", + SysStringLen(str), lstrlenW(str)); +} + static void test_wshshell(void) { static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; @@ -156,6 +163,7 @@ static void test_wshshell(void) hr = IWshCollection_Item(coll, &arg, &res); EXPECT_HR(hr, S_OK); ok(V_VT(&res) == VT_BSTR, "got res type %d\n", V_VT(&res)); + CHECK_BSTR_LENGTH(V_BSTR(&res)); SysFreeString(str); VariantClear(&res); @@ -211,6 +219,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret == 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -219,6 +228,7 @@ static void test_wshshell(void) hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); + CHECK_BSTR_LENGTH(ret); SysFreeString(ret); SysFreeString(str); @@ -304,6 +314,7 @@ static void test_wshshell(void) hr = IWshShell3_get_CurrentDirectory(sh3, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(str && str[0] != 0, "got empty string\n"); + CHECK_BSTR_LENGTH(str); SysFreeString(str); hr = IWshShell3_put_CurrentDirectory(sh3, NULL); @@ -440,6 +451,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), foobarW), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -452,6 +464,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(SysStringLen(V_BSTR(&value)) == 6, "len %d\n", SysStringLen(V_BSTR(&value))); + CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); @@ -528,6 +541,7 @@ static void test_registry(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); ok(!lstrcmpW(V_BSTR(&v), fooW), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + CHECK_BSTR_LENGTH(V_BSTR(&v)); VariantClear(&v); VariantClear(&value); -- 2.20.1

1 0

[PATCH 1/9] mfplat: Implement periodic callbacks.
by Nikolay Sivov March 4, 2019

March 4, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/queue.c | 194 +++++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 48 +++++++++ include/mfapi.h | 4 + 4 files changed, 242 insertions(+), 10 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c6234b006e..116ec61289 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -15,7 +15,7 @@ @ stub GetAMSubtypeFromD3DFormat @ stub GetD3DFormatFromMFSubtype @ stub LFGetGlobalPool -@ stub MFAddPeriodicCallback +@ stdcall MFAddPeriodicCallback(ptr ptr ptr) @ stdcall MFAllocateWorkQueue(ptr) @ stdcall MFAllocateWorkQueueEx(long ptr) @ stub MFAppendCollection @@ -100,7 +100,7 @@ @ stub MFGetSockaddrFromNumericName @ stub MFGetStrideForBitmapInfoHeader @ stdcall MFGetSystemTime() -@ stub MFGetTimerPeriodicity +@ stdcall MFGetTimerPeriodicity(ptr) @ stub MFGetUncompressedVideoFormat @ stub MFGetWorkQueueMMCSSClass @ stub MFGetWorkQueueMMCSSTaskId @@ -125,7 +125,7 @@ @ stdcall MFPutWorkItem(long ptr ptr) @ stdcall MFPutWorkItemEx(long ptr) @ stub MFRecordError -@ stub MFRemovePeriodicCallback +@ stdcall MFRemovePeriodicCallback(long) @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) @ stdcall MFScheduleWorkItemEx(ptr int64 ptr) @ stub MFSerializeAttributesToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index f470cb44b5..e3b0687711 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -39,9 +39,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); static LONG next_item_key; +static MFWORKITEM_KEY get_item_key(DWORD mask, DWORD key) +{ + return ((MFWORKITEM_KEY)mask << 32) | key; +} + static MFWORKITEM_KEY generate_item_key(DWORD mask) { - return ((MFWORKITEM_KEY)mask << 32) | InterlockedIncrement(&next_item_key); + return get_item_key(mask, InterlockedIncrement(&next_item_key)); } struct work_item @@ -315,9 +320,10 @@ void shutdown_system_queues(void) LeaveCriticalSection(&queues_section); } -static void grab_work_item(struct work_item *item) +static struct work_item *grab_work_item(struct work_item *item) { InterlockedIncrement(&item->refcount); + return item; } static void CALLBACK standard_queue_worker(TP_CALLBACK_INSTANCE *instance, void *context, TP_WORK *work) @@ -442,6 +448,15 @@ static void CALLBACK scheduled_item_cancelable_callback(TP_CALLBACK_INSTANCE *in release_work_item(item); } +static void CALLBACK periodic_item_callback(TP_CALLBACK_INSTANCE *instance, void *context, TP_TIMER *timer) +{ + struct work_item *item = grab_work_item(context); + + invoke_async_callback(item->result); + + release_work_item(item); +} + static void queue_mark_item_pending(DWORD mask, struct work_item *item, MFWORKITEM_KEY *key) { *key = generate_item_key(mask); @@ -478,7 +493,8 @@ static HRESULT queue_submit_wait(struct queue *queue, HANDLE event, LONG priorit return S_OK; } -static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) +static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, INT64 timeout, DWORD period, + MFWORKITEM_KEY *key) { PTP_TIMER_CALLBACK callback; struct work_item *item; @@ -491,17 +507,19 @@ static HRESULT queue_submit_timer(struct queue *queue, IMFAsyncResult *result, I if (key) { queue_mark_item_pending(SCHEDULED_ITEM_KEY_MASK, item, key); - callback = scheduled_item_cancelable_callback; } + + if (period) + callback = periodic_item_callback; else - callback = scheduled_item_callback; + callback = key ? scheduled_item_cancelable_callback : scheduled_item_callback; t.QuadPart = timeout * 1000 * 10; filetime.dwLowDateTime = t.u.LowPart; filetime.dwHighDateTime = t.u.HighPart; item->u.timer_object = CreateThreadpoolTimer(callback, item, &queue->env); - SetThreadpoolTimer(item->u.timer_object, &filetime, 0, 0); + SetThreadpoolTimer(item->u.timer_object, &filetime, period, 0); TRACE("dispatched %p.\n", result); @@ -842,7 +860,7 @@ static HRESULT schedule_work_item(IMFAsyncResult *result, INT64 timeout, MFWORKI TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); - hr = queue_submit_timer(queue, result, timeout, key); + hr = queue_submit_timer(queue, result, timeout, 0, key); return hr; } @@ -912,3 +930,165 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key) return hr; } + +static DWORD get_timer_period(void) +{ + return 10; +} + +/*********************************************************************** + * MFGetTimerPeriodicity (mfplat.@) + */ +HRESULT WINAPI MFGetTimerPeriodicity(DWORD *period) +{ + TRACE("%p.\n", period); + + *period = get_timer_period(); + + return S_OK; +} + +struct periodic_callback +{ + IMFAsyncCallback IMFAsyncCallback_iface; + LONG refcount; + MFPERIODICCALLBACK callback; +}; + +static struct periodic_callback *impl_from_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct periodic_callback, IMFAsyncCallback_iface); +} + +static HRESULT WINAPI periodic_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI periodic_callback_AddRef(IMFAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + ULONG refcount = InterlockedIncrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI periodic_callback_Release(IMFAsyncCallback *iface) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + ULONG refcount = InterlockedDecrement(&callback->refcount); + + TRACE("%p, %u.\n", iface, refcount); + + if (!refcount) + heap_free(callback); + + return refcount; +} + +static HRESULT WINAPI periodic_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI periodic_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); + IUnknown *context = NULL; + + IMFAsyncResult_GetObject(result, &context); + + callback->callback(context); + + if (context) + IUnknown_Release(context); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl periodic_callback_vtbl = +{ + periodic_callback_QueryInterface, + periodic_callback_AddRef, + periodic_callback_Release, + periodic_callback_GetParameters, + periodic_callback_Invoke, +}; + +static HRESULT create_periodic_callback_obj(MFPERIODICCALLBACK callback, IMFAsyncCallback **out) +{ + struct periodic_callback *object; + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFAsyncCallback_iface.lpVtbl = &periodic_callback_vtbl; + object->refcount = 1; + object->callback = callback; + + *out = &object->IMFAsyncCallback_iface; + + return S_OK; +} + +/*********************************************************************** + * MFAddPeriodicCallback (mfplat.@) + */ +HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key) +{ + IMFAsyncCallback *periodic_callback; + MFWORKITEM_KEY workitem_key; + IMFAsyncResult *result; + struct queue *queue; + HRESULT hr; + + TRACE("%p, %p, %p.\n", callback, context, key); + + if (FAILED(hr = grab_queue(MFASYNC_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + if (FAILED(hr = create_periodic_callback_obj(callback, &periodic_callback))) + return hr; + + hr = create_async_result(context, periodic_callback, NULL, &result); + IMFAsyncCallback_Release(periodic_callback); + if (FAILED(hr)) + return hr; + + hr = queue_submit_timer(queue, result, 0, get_timer_period(), key ? &workitem_key : NULL); + + IMFAsyncResult_Release(result); + + if (key) + *key = workitem_key; + + return S_OK; +} + +/*********************************************************************** + * MFRemovePeriodicCallback (mfplat.@) + */ +HRESULT WINAPI MFRemovePeriodicCallback(DWORD key) +{ + struct queue *queue; + HRESULT hr; + + TRACE("%#x.\n", key); + + if (FAILED(hr = grab_queue(MFASYNC_CALLBACK_QUEUE_TIMER, &queue))) + return hr; + + return queue_cancel_item(queue, get_item_key(SCHEDULED_ITEM_KEY_MASK, key)); +} diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 2a2189b4d3..e413d61dfa 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -45,6 +45,8 @@ static void* (WINAPI *pMFHeapAlloc)(SIZE_T size, ULONG flags, char *file, int static void (WINAPI *pMFHeapFree)(void *p); static HRESULT (WINAPI *pMFPutWaitingWorkItem)(HANDLE event, LONG priority, IMFAsyncResult *result, MFWORKITEM_KEY *key); static HRESULT (WINAPI *pMFAllocateSerialWorkQueue)(DWORD queue, DWORD *serial_queue); +static HRESULT (WINAPI *pMFAddPeriodicCallback)(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); +static HRESULT (WINAPI *pMFRemovePeriodicCallback)(DWORD key); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -314,6 +316,7 @@ static void init_functions(void) HMODULE mod = GetModuleHandleA("mfplat.dll"); #define X(f) p##f = (void*)GetProcAddress(mod, #f) + X(MFAddPeriodicCallback); X(MFAllocateSerialWorkQueue); X(MFCopyImage); X(MFCreateSourceResolver); @@ -322,6 +325,7 @@ static void init_functions(void) X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); + X(MFRemovePeriodicCallback); #undef X } @@ -1199,6 +1203,49 @@ static void test_serial_queue(void) ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } +static LONG periodic_counter; +static void CALLBACK periodic_callback(IUnknown *context) +{ + InterlockedIncrement(&periodic_counter); +} + +static void test_periodic_callback(void) +{ + DWORD period, key; + HRESULT hr; + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + period = 0; + hr = MFGetTimerPeriodicity(&period); + ok(hr == S_OK, "Failed to get timer perdiod, hr %#x.\n", hr); + ok(period == 10, "Unexpected period %u.\n", period); + + if (!pMFAddPeriodicCallback) + { + win_skip("Periodic callbacks are not supported.\n"); + MFShutdown(); + return; + } + + ok(periodic_counter == 0, "Unexpected counter value %u.\n", periodic_counter); + + hr = pMFAddPeriodicCallback(periodic_callback, NULL, &key); + ok(hr == S_OK, "Failed to add periodic callback, hr %#x.\n", hr); + ok(key != 0, "Unexpected key %#x.\n", key); + + Sleep(10 * period); + + hr = pMFRemovePeriodicCallback(key); + ok(hr == S_OK, "Failed to remove callback, hr %#x.\n", hr); + + ok(periodic_counter > 0, "Unexpected counter value %u.\n", periodic_counter); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -1222,6 +1269,7 @@ START_TEST(mfplat) test_MFHeapAlloc(); test_scheduled_items(); test_serial_queue(); + test_periodic_callback(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index ee5cf4c069..129a19c883 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -95,6 +95,9 @@ typedef enum MF_MULTITHREADED_WORKQUEUE, } MFASYNC_WORKQUEUE_TYPE; +typedef void (*CALLBACK MFPERIODICCALLBACK)(IUnknown *context); + +HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); @@ -131,6 +134,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); +HRESULT WINAPI MFRemovePeriodicCallback(DWORD key); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 2.20.1

2 11

[PATCH] secur32: Stop memory leak (Coverity).
by Alistair Leslie-Hughes March 4, 2019

March 4, 2019

CID 1442946 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7c6bb96..8ac5bee 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -668,6 +668,7 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) heap_free(path); return NULL; } + heap_free(path); if (!RegQueryValueExW(hkey, keyexchangeW, 0, &type, NULL, &len)) spec = AT_KEYEXCHANGE; else if (!RegQueryValueExW(hkey, signatureW, 0, &type, NULL, &len)) spec = AT_SIGNATURE; @@ -699,7 +700,6 @@ static BYTE *get_key_blob(const CERT_CONTEXT *ctx, ULONG *size) else heap_free(buf); RegCloseKey(hkey); - heap_free(path); return ret; } -- 1.9.1

2 1

[PATCH 1/5] quartz/tests/mpegsplit: Add some tests for media types.
by Zebediah Figura March 4, 2019

March 4, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 294 ++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 9a63636337..fc47c50e0a 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "mmreg.h" #include "wine/test.h" static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; @@ -27,6 +28,8 @@ static const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; static const WCHAR inputW[] = {'I','n','p','u','t',0}; static const WCHAR audioW[] = {'A','u','d','i','o',0}; +static const GUID MEDIASUBTYPE_mp3 = {0x00000055,0x0000,0x0010,{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; + static IBaseFilter *create_mpeg_splitter(void) { IBaseFilter *filter = NULL; @@ -425,6 +428,296 @@ static void test_pin_info(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +static void test_media_types(void) +{ + MPEG1WAVEFORMAT expect_wfx = + { + {WAVE_FORMAT_MPEG, 1, 48000, 8000, 192, 0, sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + ACM_MPEG_LAYER3, 64000, ACM_MPEG_SINGLECHANNEL, 0, 1, ACM_MPEG_PROTECTIONBIT | ACM_MPEG_ID_MPEG1, 0, 0 + }; + static const MPEGLAYER3WAVEFORMAT expect_mp3_wfx = + { + {WAVE_FORMAT_MPEGLAYER3, 1, 48000, 8000, 1, 0, sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + MPEGLAYER3_ID_MPEG, 0, 192, 1, 0 + }; + + const WCHAR *filename = load_resource(mp3file); + AM_MEDIA_TYPE mt = {0}, *pmt, expect_mt = {0}; + IBaseFilter *filter = create_mpeg_splitter(); + IEnumMediaTypes *enummt; + IFilterGraph2 *graph; + HRESULT hr; + ULONG ref; + IPin *pin; + BOOL ret; + + IBaseFilter_FindPin(filter, inputW, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + expect_mt.majortype = MEDIATYPE_Stream; + expect_mt.bFixedSizeSamples = TRUE; + expect_mt.bTemporalCompression = TRUE; + expect_mt.lSampleSize = 1; + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1System; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1VideoCD; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1Video; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1Audio; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + 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_MPEG1Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1Video; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1VideoCD; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1System; + hr = IPin_QueryAccept(pin, &mt); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1AudioPayload; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1Payload; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.subtype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Audio; + mt.subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + mt.majortype = MEDIATYPE_Stream; + 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); + + graph = connect_input(filter, filename); + + /* Connecting input doesn't change the reported media types. */ + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + expect_mt.subtype = MEDIASUBTYPE_MPEG1System; + if (hr == S_OK) + { + ok(!memcmp(pmt, &expect_mt, sizeof(AM_MEDIA_TYPE)), "Media types didn't match.\n"); + CoTaskMemFree(pmt); + } + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); + + IBaseFilter_FindPin(filter, audioW, &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_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + todo_wine ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); + todo_wine ok(pmt->lSampleSize == 1, "Got sample size %u.\n", pmt->lSampleSize); + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + todo_wine ok(pmt->cbFormat == sizeof(MPEG1WAVEFORMAT), "Got format size %u.\n", pmt->cbFormat); + if (pmt->cbFormat == sizeof(MPEG1WAVEFORMAT)) + { + /* Native will sometimes leave junk in the joint stereo flags. */ + expect_wfx.fwHeadModeExt = ((MPEG1WAVEFORMAT *)pmt->pbFormat)->fwHeadModeExt; + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(MPEG1WAVEFORMAT)), "Format blocks didn't match.\n"); + } + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + + pmt->subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Video; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; + + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_WaveFormatEx; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + goto done; + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_MPEG1Payload), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + 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_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(MPEG1WAVEFORMAT), "Got format size %u.\n", pmt->cbFormat); + /* Native will sometimes leave junk in the joint stereo flags. */ + expect_wfx.fwHeadModeExt = ((MPEG1WAVEFORMAT *)pmt->pbFormat)->fwHeadModeExt; + ok(!memcmp(pmt->pbFormat, &expect_wfx, sizeof(MPEG1WAVEFORMAT)), "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", + wine_dbgstr_guid(&pmt->majortype)); + ok(IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_mp3), "Got subtype %s.\n", + wine_dbgstr_guid(&pmt->subtype)); + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); + 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_WaveFormatEx), "Got format type %s.\n", + wine_dbgstr_guid(&pmt->formattype)); + ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); + ok(pmt->cbFormat == sizeof(MPEGLAYER3WAVEFORMAT), "Got format size %u.\n", pmt->cbFormat); + ok(!memcmp(pmt->pbFormat, &expect_mp3_wfx, sizeof(MPEGLAYER3WAVEFORMAT)), + "Format blocks didn't match.\n"); + + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->bFixedSizeSamples = FALSE; + pmt->bTemporalCompression = TRUE; + pmt->lSampleSize = 123; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + pmt->majortype = MEDIATYPE_Video; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->majortype = MEDIATYPE_Audio; + + pmt->subtype = MEDIASUBTYPE_MPEG1Audio; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Packet; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1Video; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->subtype = MEDIASUBTYPE_MPEG1AudioPayload; + + pmt->formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, pmt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + pmt->formattype = FORMAT_WaveFormatEx; + + CoTaskMemFree(pmt->pbFormat); + CoTaskMemFree(pmt); + +done: + 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()); +} + START_TEST(mpegsplit) { CoInitialize(NULL); @@ -433,6 +726,7 @@ START_TEST(mpegsplit) test_enum_pins(); test_find_pin(); test_pin_info(); + test_media_types(); CoUninitialize(); } -- 2.20.1

1 4

Attn Packagers: Dependency addition for XAudio2 support
by Ethan Lee March 3, 2019

March 3, 2019

The new XAudio2 implementation that was just merged into master adds a new dependency, called FAudio. The source is available here: https://github.com/FNA-XNA/FAudio <https://github.com/FNA-XNA/FAudio> The README goes into detail, but the short version: It's a C99 library that builds with CMake and depends only on SDL2 (ideally 2.0.9). There are special build options available but the default is recommended for general use. One minor note for distributions with CMake versions older than 3.1.3 _and_ a compiler that defaults to pre-C99: You will need to set CMAKE_C_FLAGS="-std=c99" manually. If you have CMake 3.1.3+ _or_ a compiler that defaults to C99+, no extra flags should be necessary. XAudio2 is used by a large percentage of games made after the release of the Xbox 360, and Wine's built-in implementation is especially important because of bugs that ship in the official DirectX redistributable version for 64-bit: https://bugs.winehq.org/show_bug.cgi?id=38668#c58 <https://bugs.winehq.org/show_bug.cgi?id=38668#c58> Thanks everyone! -Ethan

5 6

Ubuntu disco Wine packages available for testing
by Rosanne DiMesio March 3, 2019

March 3, 2019

In preparation for the upcoming release of Ubuntu 19.04, I have enabled builds of the WineHQ development and staging branch packages on the OBS. The packages won't be distributed from the WineHQ download server until 19.04 is actually released in April, but anyone who wants to help with testing can get them directly from our OBS repository. The OBS repository key can be downloaded from https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Ubuntu_N…. After adding the release key, add the OBS repository with: sudo apt-add-repository 'deb https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/Ubuntu_N… ./' Hopefully we'll be able to catch any problems before the official release. -- Rosanne DiMesio dimesio(a)earthlink.net

1 0

[PATCH] kernel32: Fix several values in Sinhala NLS file.
by Isira Seneviratne March 3, 2019

March 3, 2019

1 0

[PATCH] oleaut32: Add missing return value checks (Coverity).
by Alistair Leslie-Hughes March 3, 2019

March 3, 2019

CID 1442938: Error handling issues (CHECKED_RETURN) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/oleaut32/variant.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fcbef53..77e48c0 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5138,7 +5138,9 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) { double dbl; - VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + hRet = VarR8FromDec(&V_DECIMAL(pVarIn), &dbl); + if (FAILED(hRet)) + break; if (dbl>0.0f) dbl = floor(dbl*pow(10,deci)+0.5); @@ -5146,7 +5148,7 @@ HRESULT WINAPI VarRound(LPVARIANT pVarIn, int deci, LPVARIANT pVarOut) dbl = ceil(dbl*pow(10,deci)-0.5); V_VT(pVarOut)=VT_DECIMAL; - VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); + hRet = VarDecFromR8(dbl, &V_DECIMAL(pVarOut)); break; } /* cases we don't know yet */ -- 1.9.1

1 0

[PATCH 6/7] d3dx9: Move parameter_count out of struct d3dx9_base_effect
by Michael Stefaniuc March 3, 2019

March 3, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 1703afa067..6e2cd4c6e9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,7 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - UINT parameter_count; UINT technique_count; UINT object_count; @@ -176,6 +175,7 @@ struct d3dx_effect LONG ref; struct d3dx9_base_effect base_effect; + UINT parameter_count; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -691,7 +691,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->parameters) { - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < base->effect->parameter_count; ++i) free_top_level_parameter(&base->parameters[i]); HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; @@ -3277,7 +3277,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d /* TODO: add creator and function count. */ desc->Creator = NULL; desc->Functions = 0; - desc->Parameters = effect->base_effect.parameter_count; + desc->Parameters = effect->parameter_count; desc->Techniques = effect->base_effect.technique_count; return D3D_OK; @@ -3329,7 +3329,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE if (!parameter) { - if (index < effect->base_effect.parameter_count) + if (index < effect->parameter_count) { TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); return get_parameter_handle(&effect->base_effect.parameters[index].param); @@ -3383,7 +3383,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, if (!parameter) { - for (i = 0; i < effect->base_effect.parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { temp_param = &effect->base_effect.parameters[i].param; @@ -3442,7 +3442,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3D if (!param) { - if (index < effect->base_effect.parameter_count) + if (index < effect->parameter_count) { TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); return get_parameter_handle(&effect->base_effect.parameters[index].param); @@ -4363,7 +4363,7 @@ static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) TRACE("iface %p.\n", iface); - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) walk_parameter_tree(&base->parameters[i].param, param_on_lost_device, NULL); return D3D_OK; @@ -6143,9 +6143,9 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, struct d3dx_parameter *parameter; struct d3dx_sampler *sampler; - if (index >= base->parameter_count) + if (index >= effect->parameter_count) { - FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, base->parameter_count); + FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, effect->parameter_count); return E_FAIL; } @@ -6308,8 +6308,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U HRESULT hr; UINT i; - read_dword(&ptr, &base->parameter_count); - TRACE("Parameter count: %u.\n", base->parameter_count); + read_dword(&ptr, &effect->parameter_count); + TRACE("Parameter count: %u.\n", effect->parameter_count); read_dword(&ptr, &base->technique_count); TRACE("Technique count: %u.\n", base->technique_count); @@ -6328,10 +6328,10 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } wine_rb_init(&base->param_tree, param_rb_compare); - if (base->parameter_count) + if (effect->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*base->parameters) * base->parameter_count); + sizeof(*base->parameters) * effect->parameter_count); if (!base->parameters) { ERR("Out of memory.\n"); @@ -6339,7 +6339,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { param_set_magic_number(&base->parameters[i].param); hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, base->objects); @@ -6412,7 +6412,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } } - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) goto err_out; @@ -6435,7 +6435,7 @@ err_out: if (base->parameters) { - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { free_top_level_parameter(&base->parameters[i]); } -- 2.20.1

2 1

[PATCH 4/7] d3dx9: Merge the d3dx_effect_GetParameterBySemantic() helper
by Michael Stefaniuc March 3, 2019

March 3, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 113 +++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 41636ed286..4af6f7f1b9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,65 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *semantic) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - struct d3dx_parameter *temp_param; - UINT i; - - if (!parameter) - { - for (i = 0; i < base->parameter_count; ++i) - { - temp_param = &base->parameters[i].param; - - if (!temp_param->semantic) - { - if (!semantic) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - continue; - } - - if (!strcasecmp(temp_param->semantic, semantic)) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - } - } - else if (param) - { - for (i = 0; i < param->member_count; ++i) - { - temp_param = &param->members[i]; - - if (!temp_param->semantic) - { - if (!semantic) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - continue; - } - - if (!strcasecmp(temp_param->semantic, semantic)) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -3461,10 +3402,62 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, const char *semantic) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *temp_param; + UINT i; 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); + if (!parameter) + { + for (i = 0; i < effect->base_effect.parameter_count; ++i) + { + temp_param = &effect->base_effect.parameters[i].param; + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + } + } + else if (param) + { + for (i = 0; i < param->member_count; ++i) + { + temp_param = &param->members[i]; + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) -- 2.20.1

2 1