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

[PATCH v2 3/8] setupapi: Implement SetupDiOpenDeviceInfoW().
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 86 +++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 11 ------ 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 331db87d06..81b6e354a3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3316,6 +3316,92 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( return key; } +/*********************************************************************** + * SetupDiOpenDeviceInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hwnd_parent, DWORD flags, + PSP_DEVINFO_DATA device_data) +{ + struct DeviceInfoSet *set; + struct device *device = NULL, *enum_device; + WCHAR classW[40]; + GUID guid; + HKEY enumKey = NULL; + HKEY instanceKey = NULL; + DWORD phantom; + DWORD size; + DWORD error = ERROR_NO_SUCH_DEVINST; + + TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); + + if (!(set = get_device_set(devinfo))) + return FALSE; + + if (!instance_id) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (hwnd_parent) + FIXME("hwnd_parent unsupported\n"); + + if (flags) + FIXME("flags unsupported: 0x%08x\n", flags); + + RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL); + /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */ + if (RegOpenKeyExW(enumKey, instance_id, 0, KEY_READ, &instanceKey)) + goto done; + + /* If it's an unregistered instance, aka phantom instance, report ERROR_NO_SUCH_DEVINST */ + size = sizeof(phantom); + if (!RegQueryValueExW(instanceKey, Phantom, NULL, NULL, (BYTE *)&phantom, &size)) + goto done; + + /* Check class GUID */ + size = sizeof(classW); + if (RegQueryValueExW(instanceKey, ClassGUID, NULL, NULL, (BYTE *)classW, &size)) + goto done; + + classW[37] = 0; + UuidFromStringW(&classW[1], &guid); + + if (!IsEqualGUID(&set->ClassGuid, &GUID_NULL) && !IsEqualGUID(&guid, &set->ClassGuid)) + { + error = ERROR_CLASS_MISMATCH; + goto done; + } + + /* If current set already contains a same instance, don't create new ones */ + LIST_FOR_EACH_ENTRY(enum_device, &set->devices, struct device, entry) + { + if (!strcmpiW(instance_id, enum_device->instanceId)) + { + device = enum_device; + break; + } + } + + if (!device && !(device = SETUPDI_CreateDeviceInfo(set, &guid, instance_id, FALSE))) + goto done; + + if (!device_data || device_data->cbSize == sizeof(SP_DEVINFO_DATA)) + { + if (device_data) + copy_device_data(device_data, device); + error = NO_ERROR; + } + else + error = ERROR_INVALID_USER_BUFFER; + +done: + RegCloseKey(instanceKey); + RegCloseKey(enumKey); + SetLastError(error); + return !error; +} + /*********************************************************************** * SetupDiOpenDeviceInterfaceW (SETUPAPI.@) */ diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 4db32dd51c..b64c1a1316 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -322,17 +322,6 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceI return FALSE; } -/*********************************************************************** - * SetupDiOpenDeviceInfoW (SETUPAPI.@) - */ -BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, - HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData) -{ - FIXME("%p %s %p 0x%08x %p: stub\n", DeviceInfoSet, debugstr_w(DeviceInstanceId), - hwndParent, OpenFlags, DeviceInfoData); - return FALSE; -} - /*********************************************************************** * CM_Locate_DevNodeA (SETUPAPI.@) */ -- 2.19.2

1 0

[PATCH v2 2/8] setupapi: Set phantom value after device creation.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/setupapi/devinst.c | 4 ++++ dlls/setupapi/tests/devinst.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 2c95b5cfb9..331db87d06 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -723,6 +723,7 @@ static void delete_device(struct device *device) static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, const GUID *class, const WCHAR *instanceid, BOOL phantom) { + const DWORD one = 1; struct device *device; WCHAR guidstr[39]; @@ -752,6 +753,9 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + if (phantom) + RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); + SETUPDI_GuidToString(class, guidstr); SETUPDI_SetDeviceRegistryPropertyW(device, SPDRP_CLASSGUID, (const BYTE *)guidstr, sizeof(guidstr)); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 3add9b2502..75ac8fef5a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -778,9 +778,9 @@ static void test_register_device_info(void) RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); size = sizeof(phantom); ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); - todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); - todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); - todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); -- 2.19.2

1 0

[PATCH v2 1/8] setupapi/tests: Test phantom value after device creation.
by Zhiyi Zhang 15 Mar '19

15 Mar '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 160879~160886. Add handling device set with null GUID and tests. dlls/setupapi/tests/devinst.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 004a956401..3add9b2502 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -742,6 +742,11 @@ static void test_register_device_info(void) SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + HKEY hkey; + LSTATUS ls; + DWORD type = 0; + DWORD phantom = 0; + DWORD size; int i = 0; SetLastError(0xdeadbeef); @@ -770,8 +775,19 @@ static void test_register_device_info(void) ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Enum\\ROOT\\LEGACY_BOGUS\\0000", &hkey); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, &type, (BYTE *)&phantom, &size); + todo_wine ok(ls == ERROR_SUCCESS, "Got wrong error code %#x\n", ls); + todo_wine ok(phantom == 1, "Got wrong phantom value %d\n", phantom); + todo_wine ok(type == REG_DWORD, "Got wrong phantom type %#x\n", type); + ok(size == sizeof(phantom), "Got wrong phantom size %d\n", size); ret = SetupDiRegisterDeviceInfo(set, &device, 0, NULL, NULL, NULL); ok(ret, "Failed to register device, error %#x.\n", GetLastError()); + size = sizeof(phantom); + ls = RegQueryValueExA(hkey, "Phantom", NULL, NULL, (BYTE *)&phantom, &size); + ok(ls == ERROR_FILE_NOT_FOUND, "Got wrong error code %#x\n", ls); + RegCloseKey(hkey); ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0001", &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#x.\n", GetLastError()); -- 2.19.2

1 0

[PATCH] d3dx9: Merge the d3dx_effect_SetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 147 +++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 78 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d2a4804de2..6e2e453bc5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,83 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - unsigned int i; - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - switch (param->type) - { - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *old_texture = ((IUnknown **)param->data)[i]; - IUnknown *new_texture = ((IUnknown **)data)[i]; - - if (new_texture == old_texture) - continue; - - if (new_texture) - IUnknown_AddRef(new_texture); - if (old_texture) - IUnknown_Release(old_texture); - } - /* fallthrough */ - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - TRACE("Copy %u bytes.\n", param->bytes); - memcpy(param->data, data, param->bytes); - set_dirty(param); - break; - - case D3DXPT_STRING: - { - HRESULT hr; - - set_dirty(param); - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) - return hr; - } - break; - } - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); - break; - } - - return D3D_OK; - } - - WARN("Invalid argument specified\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2542,10 +2465,78 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame const void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + unsigned int i; 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); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *old_texture = ((IUnknown **)param->data)[i]; + IUnknown *new_texture = ((IUnknown **)data)[i]; + + if (new_texture == old_texture) + continue; + + if (new_texture) + IUnknown_AddRef(new_texture); + if (old_texture) + IUnknown_Release(old_texture); + } + /* fallthrough */ + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(param->data, data, param->bytes); + set_dirty(param); + break; + + case D3DXPT_STRING: + { + HRESULT hr; + + set_dirty(param); + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) -- 2.20.1

2 1

[PATCH 1/5] quartz/systemclock: Use the standard linked list implementation.
by Zebediah Figura 15 Mar '19

15 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/systemclock.c | 258 +++++++++++++++++++------------------- 1 file changed, 128 insertions(+), 130 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index e9f13b5130..d95bd3ab3a 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -26,14 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); -typedef struct SystemClockAdviseEntry SystemClockAdviseEntry; -struct SystemClockAdviseEntry { - SystemClockAdviseEntry* next; - SystemClockAdviseEntry* prev; - - HANDLE hEvent; - REFERENCE_TIME rtBaseTime; - REFERENCE_TIME rtIntervalTime; +struct advise_sink +{ + struct list entry; + HANDLE hEvent; + REFERENCE_TIME rtBaseTime, rtIntervalTime; }; typedef struct SystemClockImpl { @@ -47,8 +44,8 @@ typedef struct SystemClockImpl { REFERENCE_TIME last_time; CRITICAL_SECTION safe; - SystemClockAdviseEntry* pSingleShotAdvise; - SystemClockAdviseEntry* pPeriodicAdvise; + /* These lists are ordered by expiration time (soonest first). */ + struct list single_sinks, periodic_sinks; } SystemClockImpl; static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) @@ -56,34 +53,21 @@ static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) return CONTAINING_RECORD(iface, SystemClockImpl, IReferenceClock_iface); } +static void insert_advise_sink(struct advise_sink *sink, struct list *queue) +{ + REFERENCE_TIME due_time = sink->rtBaseTime + sink->rtIntervalTime; + struct advise_sink *cursor; -static void QUARTZ_RemoveAviseEntryFromQueue(SystemClockImpl* This, SystemClockAdviseEntry* pEntry) { - if (pEntry->prev) pEntry->prev->next = pEntry->next; - if (pEntry->next) pEntry->next->prev = pEntry->prev; - if (This->pSingleShotAdvise == pEntry) This->pSingleShotAdvise = pEntry->next; - if (This->pPeriodicAdvise == pEntry) This->pPeriodicAdvise = pEntry->next; -} + LIST_FOR_EACH_ENTRY(cursor, queue, struct advise_sink, entry) + { + if (cursor->rtBaseTime + cursor->rtIntervalTime > due_time) + { + list_add_before(&cursor->entry, &sink->entry); + return; + } + } -static void QUARTZ_InsertAviseEntryFromQueue(SystemClockImpl* This, SystemClockAdviseEntry* pEntry, SystemClockAdviseEntry** pQueue) { - SystemClockAdviseEntry* prev_it = NULL; - SystemClockAdviseEntry* it = NULL; - REFERENCE_TIME bornTime = pEntry->rtBaseTime + pEntry->rtIntervalTime; - - for (it = *pQueue; NULL != it && (it->rtBaseTime + it->rtIntervalTime) < bornTime; it = it->next) { - prev_it = it; - } - if (NULL == prev_it) { - pEntry->prev = NULL; - if (NULL != (*pQueue)) pEntry->next = (*pQueue)->next; - /*assert( NULL == pEntry->next->prev );*/ - if (NULL != pEntry->next) pEntry->next->prev = pEntry; - (*pQueue) = pEntry; - } else { - pEntry->prev = prev_it; - pEntry->next = prev_it->next; - prev_it->next = pEntry; - if (NULL != pEntry->next) pEntry->next->prev = pEntry; - } + list_add_tail(queue, &sink->entry); } #define MAX_REFTIME (REFERENCE_TIME)(0x7FFFFFFFFFFFFFFF) @@ -94,12 +78,12 @@ static void QUARTZ_InsertAviseEntryFromQueue(SystemClockImpl* This, SystemClockA static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { SystemClockImpl* This = lpParam; + struct advise_sink *sink, *cursor; + struct list *entry; DWORD timeOut = INFINITE; - DWORD tmpTimeOut; MSG msg; HRESULT hr; REFERENCE_TIME curTime; - SystemClockAdviseEntry* it = NULL; TRACE("(%p): Main Loop\n", This); @@ -115,31 +99,33 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { } /** First SingleShots Advice: sorted list */ - it = This->pSingleShotAdvise; - while ((NULL != it) && (it->rtBaseTime + it->rtIntervalTime) <= curTime) { - SystemClockAdviseEntry* nextit = it->next; - /** send event ... */ - SetEvent(it->hEvent); - /** ... and Release it */ - QUARTZ_RemoveAviseEntryFromQueue(This, it); - heap_free(it); - it = nextit; + LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &This->single_sinks, struct advise_sink, entry) + { + if (sink->rtBaseTime + sink->rtIntervalTime > curTime) + break; + + SetEvent(sink->hEvent); + list_remove(&sink->entry); + heap_free(sink); + } + + if ((entry = list_head(&This->single_sinks))) + { + sink = LIST_ENTRY(entry, struct advise_sink, entry); + timeOut = (sink->rtBaseTime + sink->rtIntervalTime - curTime) / 10000; } - if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; else timeOut = INFINITE; /** Now Periodics Advice: semi sorted list (sort cannot be used) */ - for (it = This->pPeriodicAdvise; NULL != it; it = it->next) { - if (it->rtBaseTime <= curTime) { - DWORD nPeriods = (DWORD) ((curTime - it->rtBaseTime) / it->rtIntervalTime); - /** Release the semaphore ... */ - ReleaseSemaphore(it->hEvent, nPeriods, NULL); - /** ... and refresh time */ - it->rtBaseTime += nPeriods * it->rtIntervalTime; - /*assert( it->rtBaseTime + it->rtIntervalTime < curTime );*/ + LIST_FOR_EACH_ENTRY(sink, &This->periodic_sinks, struct advise_sink, entry) + { + if (sink->rtBaseTime <= curTime) + { + DWORD periods = (curTime - sink->rtBaseTime) / sink->rtIntervalTime; + ReleaseSemaphore(sink->hEvent, periods, NULL); + sink->rtBaseTime += periods * sink->rtIntervalTime; } - tmpTimeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; - if (timeOut > tmpTimeOut) timeOut = tmpTimeOut; + timeOut = min(timeOut, ((sink->rtBaseTime + sink->rtIntervalTime) - curTime) / 10000); } outrefresh: @@ -263,101 +249,112 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock *iface, REFERENCE_ return hr; } -static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime, HEVENT hEvent, DWORD_PTR* pdwAdviseCookie) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - SystemClockAdviseEntry* pEntry = NULL; +static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, + REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct advise_sink *sink; - TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtBaseTime), - wine_dbgstr_longlong(rtStreamTime), hEvent, pdwAdviseCookie); + TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", + clock, wine_dbgstr_longlong(base), wine_dbgstr_longlong(offset), event, cookie); - if (!hEvent) { - return E_INVALIDARG; - } - if (0 >= rtBaseTime + rtStreamTime) { - return E_INVALIDARG; - } - if (NULL == pdwAdviseCookie) { - return E_POINTER; - } + if (!event) + return E_INVALIDARG; - if (!(pEntry = heap_alloc_zero(sizeof(*pEntry)))) - return E_OUTOFMEMORY; + if (base + offset <= 0) + return E_INVALIDARG; - pEntry->hEvent = (HANDLE) hEvent; - pEntry->rtBaseTime = rtBaseTime + rtStreamTime; - pEntry->rtIntervalTime = 0; + if (!cookie) + return E_POINTER; - EnterCriticalSection(&This->safe); - QUARTZ_InsertAviseEntryFromQueue(This, pEntry, &This->pSingleShotAdvise); - LeaveCriticalSection(&This->safe); + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; - SystemClockPostMessageToAdviseThread(This, ADVISE_ADD_SINGLESHOT); + sink->hEvent = (HANDLE)event; + sink->rtBaseTime = base + offset; + sink->rtIntervalTime = 0; - *pdwAdviseCookie = (DWORD_PTR) (pEntry); - return S_OK; + EnterCriticalSection(&clock->safe); + insert_advise_sink(sink, &clock->single_sinks); + LeaveCriticalSection(&clock->safe); + + SystemClockPostMessageToAdviseThread(clock, ADVISE_ADD_SINGLESHOT); + + *cookie = (DWORD_PTR)sink; + return S_OK; } -static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime, HSEMAPHORE hSemaphore, DWORD_PTR* pdwAdviseCookie) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - SystemClockAdviseEntry* pEntry = NULL; +static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, + REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct advise_sink *sink; - TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtStartTime), - wine_dbgstr_longlong(rtPeriodTime), hSemaphore, pdwAdviseCookie); + TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", + clock, wine_dbgstr_longlong(start), wine_dbgstr_longlong(period), semaphore, cookie); - if (!hSemaphore) { - return E_INVALIDARG; - } - if (0 >= rtStartTime || 0 >= rtPeriodTime) { - return E_INVALIDARG; - } - if (NULL == pdwAdviseCookie) { - return E_POINTER; - } + if (!semaphore) + return E_INVALIDARG; - if (!(pEntry = heap_alloc_zero(sizeof(*pEntry)))) - return E_OUTOFMEMORY; + if (start <= 0 || period <= 0) + return E_INVALIDARG; - pEntry->hEvent = (HANDLE) hSemaphore; - pEntry->rtBaseTime = rtStartTime; - pEntry->rtIntervalTime = rtPeriodTime; + if (!cookie) + return E_POINTER; - EnterCriticalSection(&This->safe); - QUARTZ_InsertAviseEntryFromQueue(This, pEntry, &This->pPeriodicAdvise); - LeaveCriticalSection(&This->safe); + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; - SystemClockPostMessageToAdviseThread(This, ADVISE_ADD_PERIODIC); + sink->hEvent = (HANDLE)semaphore; + sink->rtBaseTime = start; + sink->rtIntervalTime = period; - *pdwAdviseCookie = (DWORD_PTR) (pEntry); - return S_OK; + EnterCriticalSection(&clock->safe); + insert_advise_sink(sink, &clock->periodic_sinks); + LeaveCriticalSection(&clock->safe); + + SystemClockPostMessageToAdviseThread(clock, ADVISE_ADD_PERIODIC); + + *cookie = (DWORD_PTR)sink; + return S_OK; } -static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock* iface, DWORD_PTR dwAdviseCookie) { - SystemClockImpl *This = impl_from_IReferenceClock(iface); - SystemClockAdviseEntry* pEntry = NULL; - SystemClockAdviseEntry* it = NULL; - HRESULT ret = S_OK; - TRACE("(%p, %lu)\n", This, dwAdviseCookie); +static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie) +{ + SystemClockImpl *clock = impl_from_IReferenceClock(iface); + struct advise_sink *sink; - pEntry = (SystemClockAdviseEntry*) dwAdviseCookie; + TRACE("clock %p, cookie %#lx.\n", clock, cookie); - EnterCriticalSection(&This->safe); - for (it = This->pPeriodicAdvise; NULL != it && it != pEntry; it = it->next) ; - if (it != pEntry) { - for (it = This->pSingleShotAdvise; NULL != it && it != pEntry; it = it->next) ; - if (it != pEntry) { - ret = S_FALSE; - goto out; + EnterCriticalSection(&clock->safe); + + LIST_FOR_EACH_ENTRY(sink, &clock->single_sinks, struct advise_sink, entry) + { + if (sink == (struct advise_sink *)cookie) + { + list_remove(&sink->entry); + heap_free(sink); + SystemClockPostMessageToAdviseThread(clock, ADVISE_REMOVE); + LeaveCriticalSection(&clock->safe); + return S_OK; + } } - } - QUARTZ_RemoveAviseEntryFromQueue(This, pEntry); - heap_free(pEntry); + LIST_FOR_EACH_ENTRY(sink, &clock->periodic_sinks, struct advise_sink, entry) + { + if (sink == (struct advise_sink *)cookie) + { + list_remove(&sink->entry); + heap_free(sink); + SystemClockPostMessageToAdviseThread(clock, ADVISE_REMOVE); + LeaveCriticalSection(&clock->safe); + return S_OK; + } + } - SystemClockPostMessageToAdviseThread(This, ADVISE_REMOVE); + LeaveCriticalSection(&clock->safe); -out: - LeaveCriticalSection(&This->safe); - return ret; + return S_FALSE; } static const IReferenceClockVtbl SystemClock_Vtbl = @@ -384,7 +381,8 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown *outer, void **out) } object->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; - + list_init(&object->single_sinks); + list_init(&object->periodic_sinks); InitializeCriticalSection(&object->safe); object->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); -- 2.20.1

2 5

[PATCH 2/6] d3dx9: Merge the d3dx_effect_SetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 147 +++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 78 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d2a4804de2..6e2e453bc5 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,83 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - unsigned int i; - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - switch (param->type) - { - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *old_texture = ((IUnknown **)param->data)[i]; - IUnknown *new_texture = ((IUnknown **)data)[i]; - - if (new_texture == old_texture) - continue; - - if (new_texture) - IUnknown_AddRef(new_texture); - if (old_texture) - IUnknown_Release(old_texture); - } - /* fallthrough */ - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - TRACE("Copy %u bytes.\n", param->bytes); - memcpy(param->data, data, param->bytes); - set_dirty(param); - break; - - case D3DXPT_STRING: - { - HRESULT hr; - - set_dirty(param); - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) - return hr; - } - break; - } - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); - break; - } - - return D3D_OK; - } - - WARN("Invalid argument specified\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2542,10 +2465,78 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame const void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + unsigned int i; 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); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + switch (param->type) + { + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *old_texture = ((IUnknown **)param->data)[i]; + IUnknown *new_texture = ((IUnknown **)data)[i]; + + if (new_texture == old_texture) + continue; + + if (new_texture) + IUnknown_AddRef(new_texture); + if (old_texture) + IUnknown_Release(old_texture); + } + /* fallthrough */ + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(param->data, data, param->bytes); + set_dirty(param); + break; + + case D3DXPT_STRING: + { + HRESULT hr; + + set_dirty(param); + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + if (FAILED(hr = set_string(&((char **)param->data)[i], ((const char **)data)[i]))) + return hr; + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + return D3D_OK; + } + + WARN("Invalid argument specified.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) -- 2.20.1

1 0

[PATCH 1/6] d3dx9: Merge the d3dx_effect_GetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Resending as patch series dlls/d3dx9_36/effect.c | 124 ++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 65 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 68714f7ebb..d2a4804de2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1254,70 +1254,6 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); - - switch (param->type) - { - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - case D3DXPT_STRING: - break; - - case D3DXPT_VERTEXSHADER: - case D3DXPT_PIXELSHADER: - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - { - UINT i; - - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - } - break; - } - - default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - break; - } - - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2615,10 +2551,68 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + TRACE("Type %s.\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; + + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_AddRef(unk); + } + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) -- 2.20.1

1 0

[PATCH] d3dx9: Merge the d3dx_effect_GetVector() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 77 +++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6e2e453bc5..9e5da7fe98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1229,47 +1229,6 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_vector(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, D3DXVECTOR4 *vector) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (vector && param && !param->element_count) - { - TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); - - switch (param->class) - { - case D3DXPC_SCALAR: - case D3DXPC_VECTOR: - if (param->type == D3DXPT_INT && param->bytes == 4) - { - TRACE("INT fixup\n"); - vector->x = (((*(INT *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; - vector->y = (((*(INT *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; - vector->z = ((*(INT *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; - vector->w = (((*(INT *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; - return D3D_OK; - } - get_vector(param, vector); - return D3D_OK; - - case D3DXPC_MATRIX_ROWS: - case D3DXPC_OBJECT: - case D3DXPC_STRUCT: - break; - - default: - FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); - break; - } - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector, UINT count) { @@ -2970,10 +2929,44 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); - return d3dx9_base_effect_get_vector(&effect->base_effect, parameter, vector); + if (vector && param && !param->element_count) + { + TRACE("Class %s.\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + if (param->type == D3DXPT_INT && param->bytes == 4) + { + TRACE("INT fixup.\n"); + vector->x = (((*(int *)param->data) & 0xff0000) >> 16) * INT_FLOAT_MULTI_INVERSE; + vector->y = (((*(int *)param->data) & 0xff00) >> 8) * INT_FLOAT_MULTI_INVERSE; + vector->z = ((*(int *)param->data) & 0xff) * INT_FLOAT_MULTI_INVERSE; + vector->w = (((*(int *)param->data) & 0xff000000) >> 24) * INT_FLOAT_MULTI_INVERSE; + return D3D_OK; + } + get_vector(param, vector); + return D3D_OK; + + case D3DXPC_MATRIX_ROWS: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

1 0

[PATCH] d3dx9: Merge the d3dx_effect_GetValue() helper
by Michael Stefaniuc 15 Mar '19

15 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 124 ++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 65 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 68714f7ebb..d2a4804de2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1254,70 +1254,6 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, return D3DERR_INVALIDCALL; } -static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, void *data, UINT bytes) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - WARN("Invalid parameter %p specified\n", parameter); - return D3DERR_INVALIDCALL; - } - - /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) - { - TRACE("Sampler: returning E_FAIL\n"); - return E_FAIL; - } - - if (data && param->bytes <= bytes) - { - TRACE("Type %s\n", debug_d3dxparameter_type(param->type)); - - switch (param->type) - { - case D3DXPT_VOID: - case D3DXPT_BOOL: - case D3DXPT_INT: - case D3DXPT_FLOAT: - case D3DXPT_STRING: - break; - - case D3DXPT_VERTEXSHADER: - case D3DXPT_PIXELSHADER: - case D3DXPT_TEXTURE: - case D3DXPT_TEXTURE1D: - case D3DXPT_TEXTURE2D: - case D3DXPT_TEXTURE3D: - case D3DXPT_TEXTURECUBE: - { - UINT i; - - for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) - { - IUnknown *unk = ((IUnknown **)param->data)[i]; - if (unk) IUnknown_AddRef(unk); - } - break; - } - - default: - FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type)); - break; - } - - TRACE("Copy %u bytes\n", param->bytes); - memcpy(data, param->data, param->bytes); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { @@ -2615,10 +2551,68 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); 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); + if (!param) + { + WARN("Invalid parameter %p specified.\n", parameter); + return D3DERR_INVALIDCALL; + } + + /* samplers don't touch data */ + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) + { + TRACE("Sampler: returning E_FAIL.\n"); + return E_FAIL; + } + + if (data && param->bytes <= bytes) + { + TRACE("Type %s.\n", debug_d3dxparameter_type(param->type)); + + switch (param->type) + { + case D3DXPT_VOID: + case D3DXPT_BOOL: + case D3DXPT_INT: + case D3DXPT_FLOAT: + case D3DXPT_STRING: + break; + + case D3DXPT_VERTEXSHADER: + case D3DXPT_PIXELSHADER: + case D3DXPT_TEXTURE: + case D3DXPT_TEXTURE1D: + case D3DXPT_TEXTURE2D: + case D3DXPT_TEXTURE3D: + case D3DXPT_TEXTURECUBE: + { + unsigned int i; + + for (i = 0; i < (param->element_count ? param->element_count : 1); ++i) + { + IUnknown *unk = ((IUnknown **)param->data)[i]; + if (unk) + IUnknown_AddRef(unk); + } + break; + } + + default: + FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(param->type)); + break; + } + + TRACE("Copy %u bytes.\n", param->bytes); + memcpy(data, param->data, param->bytes); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) -- 2.20.1

1 0

[PATCH] cmd: Remove useless cast to self
by Michael Stefaniuc 14 Mar '19

14 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 435e0f36ed..1576ab7de5 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -337,7 +337,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Work out the number of columns */ WINE_TRACE("%d entries, maxwidth=%d, widest=%d\n", entry_count, max_width, widest); if (wide || orderByCol) { - numCols = max(1, (int)max_width / widest); + numCols = max(1, max_width / widest); numRows = entry_count / numCols; if (entry_count % numCols) numRows++; } else { -- 2.20.1

1 0