January 2020 - Wine-Commits

Zebediah Figura : quartz: Simplify FilterMapper3_RegisterFilter().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 5a0429e5d799639a534ec215557786adf39985c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a0429e5d799639a534ec215… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 00:08:59 2020 -0600 quartz: Simplify FilterMapper3_RegisterFilter(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 230 +++++++++++++-------------------------------- 1 file changed, 66 insertions(+), 164 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 4bbc96f774..763e378b21 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -314,39 +314,6 @@ static HRESULT WINAPI FilterMapper3_UnregisterFilter(IFilterMapper3 *iface, return HRESULT_FROM_WIN32(RegDeleteKeyW(HKEY_CLASSES_ROOT, keypath)); } -static HRESULT FM2_WriteFriendlyName(IPropertyBag * pPropBag, LPCWSTR szName) -{ - VARIANT var; - HRESULT ret; - BSTR value; - - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = value = SysAllocString(szName); - - ret = IPropertyBag_Write(pPropBag, wszFriendlyName, &var); - SysFreeString(value); - - return ret; -} - -static HRESULT FM2_WriteClsid(IPropertyBag * pPropBag, REFCLSID clsid) -{ - LPWSTR wszClsid = NULL; - VARIANT var; - HRESULT hr; - - hr = StringFromCLSID(clsid, &wszClsid); - - if (SUCCEEDED(hr)) - { - V_VT(&var) = VT_BSTR; - V_BSTR(&var) = wszClsid; - hr = IPropertyBag_Write(pPropBag, wszClsidName, &var); - } - CoTaskMemFree(wszClsid); - return hr; -} - static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG *pcbData) { int size = sizeof(struct REG_RF); @@ -577,36 +544,26 @@ static void FM2_DeleteRegFilter(REGFILTER2 * prf2) CoTaskMemFree((LPVOID)prf2->u.s2.rgPins2); } -static HRESULT WINAPI FilterMapper3_RegisterFilter( - IFilterMapper3 * iface, - REFCLSID clsidFilter, - LPCWSTR szName, - IMoniker **ppMoniker, - const CLSID *pclsidCategory, - const OLECHAR *szInstance, - const REGFILTER2 *prf2) +static HRESULT WINAPI FilterMapper3_RegisterFilter(IFilterMapper3 *iface, + REFCLSID clsid, const WCHAR *name, IMoniker **ret_moniker, + const CLSID *category, const WCHAR *instance, const REGFILTER2 *prf2) { - IParseDisplayName * pParser = NULL; - IBindCtx * pBindCtx = NULL; - IMoniker * pMoniker = NULL; - IPropertyBag * pPropBag = NULL; + WCHAR *display_name, clsid_string[39]; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + ULONG filter_data_len; + IMoniker *moniker; + BYTE *filter_data; + VARIANT var; + ULONG eaten; HRESULT hr; - LPWSTR pwszParseName = NULL; - LPWSTR pCurrent; - static const WCHAR wszDevice[] = {'@','d','e','v','i','c','e',':','s','w',':',0}; - int nameLen; - ULONG ulEaten; - LPWSTR szClsidTemp = NULL; + size_t len; REGFILTER2 regfilter2; REGFILTERPINS2* pregfp2 = NULL; - TRACE("(%s, %s, %p, %s, %s, %p)\n", - debugstr_guid(clsidFilter), - debugstr_w(szName), - ppMoniker, - debugstr_guid(pclsidCategory), - debugstr_w(szInstance), - prf2); + TRACE("iface %p, clsid %s, name %s, ret_moniker %p, category %s, instance %s, prf2 %p.\n", + iface, debugstr_guid(clsid), debugstr_w(name), ret_moniker, + debugstr_guid(category), debugstr_w(instance), prf2); if (prf2->dwVersion == 2) { @@ -648,135 +605,80 @@ static HRESULT WINAPI FilterMapper3_RegisterFilter( return E_NOTIMPL; } - if (ppMoniker) - *ppMoniker = NULL; + if (ret_moniker) + *ret_moniker = NULL; - if (!pclsidCategory) - /* MSDN mentions the inexistent CLSID_ActiveMovieFilters GUID. - * In fact this is the CLSID_LegacyAmFilterCategory one */ - pclsidCategory = &CLSID_LegacyAmFilterCategory; - - /* sizeof... will include the null terminator and - * the + 1 is for the separator ('\\'). The -1 is - * because CHARS_IN_GUID includes the null terminator - */ - nameLen = ARRAY_SIZE(wszDevice) + CHARS_IN_GUID - 1 + 1; + if (!category) + category = &CLSID_LegacyAmFilterCategory; - if (szInstance) - nameLen += lstrlenW(szInstance); - else - nameLen += CHARS_IN_GUID - 1; /* CHARS_IN_GUID includes null terminator */ + StringFromGUID2(clsid, clsid_string, ARRAY_SIZE(clsid_string)); - pCurrent = pwszParseName = CoTaskMemAlloc(nameLen*sizeof(WCHAR)); - if (!pwszParseName) + len = 50 + (instance ? wcslen(instance) : 38) + 1; + if (!(display_name = malloc(len * sizeof(WCHAR)))) return E_OUTOFMEMORY; - lstrcpyW(pwszParseName, wszDevice); - pCurrent += lstrlenW(wszDevice); + wcscpy(display_name, L"@device:sw:"); + StringFromGUID2(category, display_name + wcslen(display_name), len - wcslen(display_name)); + wcscat(display_name, L"\\"); + wcscat(display_name, instance ? instance : clsid_string); - hr = StringFromCLSID(pclsidCategory, &szClsidTemp); + if (FAILED(hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, + &IID_IParseDisplayName, (void **)&parser))) + return hr; - if (SUCCEEDED(hr)) + if (FAILED(hr = IParseDisplayName_ParseDisplayName(parser, NULL, display_name, &eaten, &moniker))) { - memcpy(pCurrent, szClsidTemp, CHARS_IN_GUID * sizeof(WCHAR)); - pCurrent += CHARS_IN_GUID - 1; - pCurrent[0] = '\\'; - - if (szInstance) - lstrcpyW(pCurrent+1, szInstance); - else - { - CoTaskMemFree(szClsidTemp); - szClsidTemp = NULL; - - hr = StringFromCLSID(clsidFilter, &szClsidTemp); - if (SUCCEEDED(hr)) - lstrcpyW(pCurrent+1, szClsidTemp); - } + ERR("Failed to parse display name, hr %#x.\n", hr); + IParseDisplayName_Release(parser); + return hr; } - if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (LPVOID *)&pParser); + IParseDisplayName_Release(parser); - if (SUCCEEDED(hr)) - hr = CreateBindCtx(0, &pBindCtx); - - if (SUCCEEDED(hr)) - hr = IParseDisplayName_ParseDisplayName(pParser, pBindCtx, pwszParseName, &ulEaten, &pMoniker); - - if (pBindCtx) - IBindCtx_Release(pBindCtx); - if (pParser) - IParseDisplayName_Release(pParser); - - if (SUCCEEDED(hr)) - hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (LPVOID)&pPropBag); + if (FAILED(hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) + { + ERR("Failed to get property bag, hr %#x.\n", hr); + IMoniker_Release(moniker); + return hr; + } - if (SUCCEEDED(hr)) - hr = FM2_WriteFriendlyName(pPropBag, szName); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(name); + if (FAILED(hr = IPropertyBag_Write(prop_bag, L"FriendlyName", &var))) + ERR("Failed to write friendly name, hr %#x.\n", hr); + VariantClear(&var); - if (SUCCEEDED(hr)) - hr = FM2_WriteClsid(pPropBag, clsidFilter); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(clsid_string); + if (FAILED(hr = IPropertyBag_Write(prop_bag, L"CLSID", &var))) + ERR("Failed to write class ID, hr %#x.\n", hr); + VariantClear(&var); - if (SUCCEEDED(hr)) + if (SUCCEEDED(FM2_WriteFilterData(&regfilter2, &filter_data, &filter_data_len))) { - BYTE *pData; - ULONG cbData; - - hr = FM2_WriteFilterData(&regfilter2, &pData, &cbData); - if (SUCCEEDED(hr)) + V_VT(&var) = VT_ARRAY | VT_UI1; + if ((V_ARRAY(&var) = SafeArrayCreateVector(VT_UI1, 0, filter_data_len))) { - VARIANT var; - SAFEARRAY *psa; - SAFEARRAYBOUND saBound; - - saBound.lLbound = 0; - saBound.cElements = cbData; - psa = SafeArrayCreate(VT_UI1, 1, &saBound); - if (!psa) - { - ERR("Couldn't create SAFEARRAY\n"); - hr = E_FAIL; - } - - if (SUCCEEDED(hr)) - { - LPBYTE pbSAData; - hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); - if (SUCCEEDED(hr)) - { - memcpy(pbSAData, pData, cbData); - hr = SafeArrayUnaccessData(psa); - } - } - - V_VT(&var) = VT_ARRAY | VT_UI1; - V_ARRAY(&var) = psa; - - if (SUCCEEDED(hr)) - hr = IPropertyBag_Write(pPropBag, wszFilterDataName, &var); - - if (psa) - SafeArrayDestroy(psa); - CoTaskMemFree(pData); + memcpy(V_ARRAY(&var)->pvData, filter_data, filter_data_len); + if (FAILED(hr = IPropertyBag_Write(prop_bag, L"FilterData", &var))) + ERR("Failed to write filter data, hr %#x.\n", hr); + VariantClear(&var); } + + CoTaskMemFree(filter_data); } - if (pPropBag) - IPropertyBag_Release(pPropBag); - CoTaskMemFree(szClsidTemp); - CoTaskMemFree(pwszParseName); + IPropertyBag_Release(prop_bag); + free(display_name); - if (SUCCEEDED(hr) && ppMoniker) - *ppMoniker = pMoniker; - else if (pMoniker) - IMoniker_Release(pMoniker); + if (ret_moniker) + *ret_moniker = moniker; + else + IMoniker_Release(moniker); CoTaskMemFree(pregfp2); - TRACE("-- returning %x\n", hr); - - return hr; + return S_OK; } /* internal helper function */

1 0

Zebediah Figura : quartz: Simplify FilterMapper_RegisterFilter().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: efb5c108d635e443b5a3ffbb736903b7cafedc3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=efb5c108d635e443b5a3ffbb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 00:09:00 2020 -0600 quartz: Simplify FilterMapper_RegisterFilter(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 63 ++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 763e378b21..bb718ed1ce 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -84,7 +84,6 @@ static const WCHAR wszMeritName[] = {'M','e','r','i','t',0}; /* FilterData property in media category Moniker (not CLSID_ActiveMovieCategories) */ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; /* For filters registered with IFilterMapper */ -static const WCHAR wszFilterSlash[] = {'F','i','l','t','e','r','\\',0}; static const WCHAR wszFilter[] = {'F','i','l','t','e','r',0}; /* For pins registered with IFilterMapper */ static const WCHAR wszPins[] = {'P','i','n','s',0}; @@ -1119,53 +1118,39 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( } -static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, CLSID clsid, LPCWSTR szName, DWORD dwMerit) +static HRESULT WINAPI FilterMapper_RegisterFilter(IFilterMapper * iface, + CLSID clsid, const WCHAR *name, DWORD merit) { - HRESULT hr; - LPWSTR wszClsid = NULL; - HKEY hKey; - LONG lRet; - WCHAR wszKeyName[ARRAY_SIZE(wszFilterSlash)-1 + (CHARS_IN_GUID-1) + 1]; - - TRACE("(%p)->(%s, %s, %x)\n", iface, debugstr_guid(&clsid), debugstr_w(szName), dwMerit); + WCHAR keypath[46], guidstr[39]; + HKEY key; + LONG ret; - hr = StringFromCLSID(&clsid, &wszClsid); + TRACE("iface %p, clsid %s, name %s, merit %#x.\n", + iface, debugstr_guid(&clsid), debugstr_w(name), merit); - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszFilterSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - hr = HRESULT_FROM_WIN32(lRet); - } + StringFromGUID2(&clsid, guidstr, ARRAY_SIZE(guidstr)); - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hKey, NULL, 0, REG_SZ, (const BYTE*)szName, (lstrlenW(szName) + 1) * sizeof(WCHAR)); - hr = HRESULT_FROM_WIN32(lRet); - RegCloseKey(hKey); - } + wcscpy(keypath, L"Filter\\"); + wcscat(keypath, guidstr); + if ((ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL))) + return HRESULT_FROM_WIN32(ret); - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - hr = HRESULT_FROM_WIN32(lRet); - } + if ((ret = RegSetValueExW(key, NULL, 0, REG_SZ, (const BYTE *)name, (wcslen(name) + 1) * sizeof(WCHAR)))) + ERR("Failed to set filter name, error %u.\n", ret); + RegCloseKey(key); - if (SUCCEEDED(hr)) + wcscpy(keypath, L"CLSID\\"); + wcscat(keypath, guidstr); + if (!(ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL))) { - lRet = RegSetValueExW(hKey, wszMeritName, 0, REG_DWORD, (LPBYTE)&dwMerit, sizeof(dwMerit)); - hr = HRESULT_FROM_WIN32(lRet); - RegCloseKey(hKey); + if ((ret = RegSetValueExW(key, L"Merit", 0, REG_DWORD, (const BYTE *)&merit, sizeof(DWORD)))) + ERR("Failed to set merit, error %u.\n", ret); + RegCloseKey(key); } - - CoTaskMemFree(wszClsid); + else + ERR("Failed to create CLSID key, error %u.\n", ret); - return hr; + return S_OK; } static HRESULT WINAPI FilterMapper_RegisterFilterInstance(IFilterMapper * iface, CLSID clsid, LPCWSTR szName, CLSID *MRId)

1 0

Nikolay Sivov : mshtml: Implement IHTMLWindow7::get_pageXOffset/pageYOffset.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 67eb74922526c3b2b9be62c9596ad2de052a3b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67eb74922526c3b2b9be62c9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 21 23:26:44 2020 +0300 mshtml: Implement IHTMLWindow7::get_pageXOffset/pageYOffset. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 30 ++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 13 +++++++++++-- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ace727246f..c6ec26de55 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2444,15 +2444,37 @@ static HRESULT WINAPI HTMLWindow7_get_innerHeight(IHTMLWindow7 *iface, LONG *p) static HRESULT WINAPI HTMLWindow7_get_pageXOffset(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + INT32 ret; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetPageXOffset(This->outer_window->nswindow, &ret); + if(NS_FAILED(nsres)) { + ERR("GetPageXOffset failed: %08x\n", nsres); + return E_FAIL; + } + + *p = ret; + return S_OK; } static HRESULT WINAPI HTMLWindow7_get_pageYOffset(IHTMLWindow7 *iface, LONG *p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + INT32 ret; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMWindow_GetPageYOffset(This->outer_window->nswindow, &ret); + if(NS_FAILED(nsres)) { + ERR("GetPageYOffset failed: %08x\n", nsres); + return E_FAIL; + } + + *p = ret; + return S_OK; } static HRESULT WINAPI HTMLWindow7_get_screenX(IHTMLWindow7 *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 23b3a57282..f77a1ddf80 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6974,6 +6974,7 @@ static void test_window(IHTMLDocument2 *doc) IHTMLPerformance *performance; IHTMLDOMNode *node; IHTMLElement *elem; + LONG offset; ok(window7 != NULL, "window7 == NULL\n"); @@ -6998,10 +6999,16 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "get_performance failed: %08x\n", hres); ok(V_VT(&v) == VT_I2, "V_VT(performance) = %u\n", V_VT(&v)); ok(V_I2(&v) == 2, "V_I2(performance) = %d\n", V_I2(&v)); - - IHTMLWindow7_Release(window7); } + hres = IHTMLWindow7_get_pageXOffset(window7, &offset); + ok(hres == S_OK, "get_pageXOffset failed: %08x\n", hres); + ok(!offset, "Unexpected offset %d.\n", offset); + + hres = IHTMLWindow7_get_pageYOffset(window7, &offset); + ok(hres == S_OK, "get_pageYOffset failed: %08x\n", hres); + ok(!offset, "Unexpected offset %d.\n", offset); + hres = IHTMLDocument2_get_body(doc, &elem); ok(hres == S_OK, "get_body failed: %08x\n", hres); @@ -7020,6 +7027,8 @@ static void test_window(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); IHTMLElement_Release(elem); + + IHTMLWindow7_Release(window7); }else { win_skip("IHTMLWindow7 not supported\n"); }

1 0

Nikolay Sivov : mshtml: Implement IHTMLScriptElement::get_htmlFor().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 98fc7db10aad678de2b09420964a8b2b143e739b URL: https://source.winehq.org/git/wine.git/?a=commit;h=98fc7db10aad678de2b09420… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 21 23:26:43 2020 +0300 mshtml: Implement IHTMLScriptElement::get_htmlFor(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscript.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 18a652e0df..60fd94e3d4 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -157,8 +157,14 @@ static HRESULT WINAPI HTMLScriptElement_put_htmlFor(IHTMLScriptElement *iface, B static HRESULT WINAPI HTMLScriptElement_get_htmlFor(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString html_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&html_str, NULL); + nsres = nsIDOMHTMLScriptElement_GetHtmlFor(This->nsscript, &html_str); + return return_nsstr(nsres, &html_str, p); } static HRESULT WINAPI HTMLScriptElement_put_event(IHTMLScriptElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 13de60ff4d..23b3a57282 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8834,6 +8834,11 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLScriptElement_get_src(script, &str); ok(hres == S_OK, "get_src failed: %08x\n", hres); ok(!str, "src = %s\n", wine_dbgstr_w(str)); + + str = (BSTR)0xdeadbeef; + hres = IHTMLScriptElement_get_htmlFor(script, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!str, "htmlFor = %s\n", wine_dbgstr_w(str)); } IHTMLScriptElement_Release(script);

1 0

Zebediah Figura : quartz: Simplify FilterMapper3_UnregisterFilter().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 071a58e847e6b72611a247bf00de31e3fde57562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=071a58e847e6b72611a247bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 00:08:58 2020 -0600 quartz: Simplify FilterMapper3_UnregisterFilter(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 54 +++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 96faa163ae..4bbc96f774 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -73,7 +73,6 @@ static inline FilterMapper3Impl *impl_from_IUnknown( IUnknown *iface ) } static const WCHAR wszClsidSlash[] = {'C','L','S','I','D','\\',0}; -static const WCHAR wszSlashInstance[] = {'\\','I','n','s','t','a','n','c','e','\\',0}; static const WCHAR wszSlash[] = {'\\',0}; /* CLSID property in media category Moniker */ @@ -293,49 +292,26 @@ static HRESULT WINAPI FilterMapper3_CreateCategory(IFilterMapper3 *iface, return S_OK; } -static HRESULT WINAPI FilterMapper3_UnregisterFilter( - IFilterMapper3 * iface, - const CLSID *pclsidCategory, - const OLECHAR *szInstance, - REFCLSID Filter) +static HRESULT WINAPI FilterMapper3_UnregisterFilter(IFilterMapper3 *iface, + const CLSID *category, const WCHAR *instance, REFCLSID clsid) { - WCHAR wszKeyName[MAX_PATH]; - LPWSTR wClsidCategory = NULL; - LPWSTR wFilter = NULL; - HRESULT hr; + WCHAR keypath[93]; - TRACE("(%p, %s, %s)\n", pclsidCategory, debugstr_w(szInstance), debugstr_guid(Filter)); + TRACE("iface %p, category %s, instance %s, clsid %s.\n", + iface, debugstr_guid(category), debugstr_w(instance), debugstr_guid(clsid)); - if (!pclsidCategory) - pclsidCategory = &CLSID_LegacyAmFilterCategory; + if (!category) + category = &CLSID_LegacyAmFilterCategory; - hr = StringFromCLSID(pclsidCategory, &wClsidCategory); - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wClsidCategory); - lstrcatW(wszKeyName, wszSlashInstance); - if (szInstance) - lstrcatW(wszKeyName, szInstance); - else - { - hr = StringFromCLSID(Filter, &wFilter); - if (SUCCEEDED(hr)) - lstrcatW(wszKeyName, wFilter); - } - } - - if (SUCCEEDED(hr)) - { - LONG lRet = RegDeleteKeyW(HKEY_CLASSES_ROOT, wszKeyName); - hr = HRESULT_FROM_WIN32(lRet); - } - - CoTaskMemFree(wClsidCategory); - CoTaskMemFree(wFilter); + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(category, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); + wcscat(keypath, L"\\Instance\\"); + if (instance) + wcscat(keypath, instance); + else + StringFromGUID2(clsid, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); - return hr; + return HRESULT_FROM_WIN32(RegDeleteKeyW(HKEY_CLASSES_ROOT, keypath)); } static HRESULT FM2_WriteFriendlyName(IPropertyBag * pPropBag, LPCWSTR szName)

1 0

Zebediah Figura : quartz: Simplify FilterMapper3_CreateCategory().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 82abd7435165a1d53f9640bf5fb122d4d1c62542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82abd7435165a1d53f9640bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 00:08:57 2020 -0600 quartz: Simplify FilterMapper3_CreateCategory(). Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 66 +++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index f0a52c4411..96faa163ae 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -253,62 +253,44 @@ static ULONG WINAPI FilterMapper3_Release(IFilterMapper3 * iface) /*** IFilterMapper3 methods ***/ -static HRESULT WINAPI FilterMapper3_CreateCategory( - IFilterMapper3 * iface, - REFCLSID clsidCategory, - DWORD dwCategoryMerit, - LPCWSTR szDescription) +static HRESULT WINAPI FilterMapper3_CreateCategory(IFilterMapper3 *iface, + REFCLSID category, DWORD merit, const WCHAR *description) { - LPWSTR wClsidAMCat = NULL; - LPWSTR wClsidCategory = NULL; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + ARRAY_SIZE(wszSlashInstance)-1 + (CHARS_IN_GUID-1) * 2 + 1]; - HKEY hKey = NULL; - LONG lRet; - HRESULT hr; - - TRACE("(%s, %x, %s)\n", debugstr_guid(clsidCategory), dwCategoryMerit, debugstr_w(szDescription)); - - hr = StringFromCLSID(&CLSID_ActiveMovieCategories, &wClsidAMCat); + WCHAR guidstr[39], keypath[93]; + HKEY key; + LONG ret; - if (SUCCEEDED(hr)) - { - hr = StringFromCLSID(clsidCategory, &wClsidCategory); - } + TRACE("iface %p, category %s, merit %#x, description %s.\n", iface, + debugstr_guid(category), merit, debugstr_w(description)); - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wClsidAMCat); - lstrcatW(wszKeyName, wszSlashInstance); - lstrcatW(wszKeyName, wClsidCategory); + StringFromGUID2(category, guidstr, ARRAY_SIZE(guidstr)); + wcscpy(keypath, L"CLSID\\{da4e3da0-d07d-11d0-bd50-00a0c911ce86}\\Instance\\"); + wcscat(keypath, guidstr); - lRet = RegCreateKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hKey, NULL); - hr = HRESULT_FROM_WIN32(lRet); - } + if ((ret = RegCreateKeyExW(HKEY_CLASSES_ROOT, keypath, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL))) + return HRESULT_FROM_WIN32(ret); - if (SUCCEEDED(hr)) + if ((ret = RegSetValueExW(key, L"FriendlyName", 0, REG_SZ, + (const BYTE *)description, (wcslen(description) + 1) * sizeof(WCHAR)))) { - lRet = RegSetValueExW(hKey, wszFriendlyName, 0, REG_SZ, (const BYTE*)szDescription, (lstrlenW(szDescription) + 1) * sizeof(WCHAR)); - hr = HRESULT_FROM_WIN32(lRet); + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } - if (SUCCEEDED(hr)) + if ((ret = RegSetValueExW(key, L"CLSID", 0, REG_SZ, (const BYTE *)guidstr, sizeof(guidstr)))) { - lRet = RegSetValueExW(hKey, wszClsidName, 0, REG_SZ, (LPBYTE)wClsidCategory, (lstrlenW(wClsidCategory) + 1) * sizeof(WCHAR)); - hr = HRESULT_FROM_WIN32(lRet); + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } - if (SUCCEEDED(hr)) + if ((ret = RegSetValueExW(key, L"Merit", 0, REG_DWORD, (const BYTE *)&merit, sizeof(DWORD)))) { - lRet = RegSetValueExW(hKey, wszMeritName, 0, REG_DWORD, (LPBYTE)&dwCategoryMerit, sizeof(dwCategoryMerit)); - hr = HRESULT_FROM_WIN32(lRet); + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } - RegCloseKey(hKey); - CoTaskMemFree(wClsidCategory); - CoTaskMemFree(wClsidAMCat); - - return hr; + RegCloseKey(key); + return S_OK; } static HRESULT WINAPI FilterMapper3_UnregisterFilter(

1 0

Zebediah Figura : quartz: Simplify FilterGraph2_AddFilter().
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 228b8b984bd47c9e8e7e3257de140661c19d62ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=228b8b984bd47c9e8e7e3257… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 22 00:08:56 2020 -0600 quartz: Simplify FilterGraph2_AddFilter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 94 +++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1ed41bdcec..1ef9c6e3af 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -184,7 +184,9 @@ typedef struct _IFilterGraphImpl { LONG ref; IUnknown *punkFilterMapper2; struct list filters; - LONG nameIndex; + + unsigned int name_index; + IReferenceClock *refClock; IBaseFilter *refClockProvider; EventsQueue evqueue; @@ -554,74 +556,68 @@ static IBaseFilter *find_filter_by_name(IFilterGraphImpl *graph, const WCHAR *na } /*** IFilterGraph methods ***/ -static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter *pFilter, - LPCWSTR pName) +static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, + IBaseFilter *filter, const WCHAR *name) { - IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); + IFilterGraphImpl *graph = impl_from_IFilterGraph2(iface); + BOOL duplicate_name = FALSE; struct filter *entry; + unsigned int i; HRESULT hr; - int j; - WCHAR* wszFilterName = NULL; - BOOL duplicate_name = FALSE; - TRACE("(%p/%p)->(%p, %s (%p))\n", This, iface, pFilter, debugstr_w(pName), pName); + TRACE("graph %p, filter %p, name %s.\n", graph, filter, debugstr_w(name)); - if (!pFilter) + if (!filter) return E_POINTER; - wszFilterName = CoTaskMemAlloc( (pName ? lstrlenW(pName) + 6 : 5) * sizeof(WCHAR) ); + if (!(entry = heap_alloc(sizeof(*entry)))) + return E_OUTOFMEMORY; - if (pName && find_filter_by_name(This, pName)) + if (!(entry->name = CoTaskMemAlloc((name ? wcslen(name) + 6 : 5) * sizeof(WCHAR)))) + { + heap_free(entry); + return E_OUTOFMEMORY; + } + + if (name && find_filter_by_name(graph, name)) duplicate_name = TRUE; - /* If no name given or name already existing, generate one */ - if (!pName || duplicate_name) + if (!name || duplicate_name) { - static const WCHAR wszFmt1[] = {'%','s',' ','%','0','4','d',0}; - static const WCHAR wszFmt2[] = {'%','0','4','d',0}; - - for (j = 0; j < 10000 ; j++) - { - /* Create name */ - if (pName) - swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt1, pName, This->nameIndex); - else - swprintf(wszFilterName, pName ? lstrlenW(pName) + 6 : 5, wszFmt2, This->nameIndex); - TRACE("Generated name %s\n", debugstr_w(wszFilterName)); + for (i = 0; i < 10000 ; ++i) + { + if (name) + swprintf(entry->name, name ? wcslen(name) + 6 : 5, L"%s %04u", name, graph->name_index); + else + swprintf(entry->name, name ? wcslen(name) + 6 : 5, L"%04u", graph->name_index); - if (This->nameIndex++ == 10000) - This->nameIndex = 1; + graph->name_index = (graph->name_index + 1) % 10000; - if (!find_filter_by_name(This, wszFilterName)) + if (!find_filter_by_name(graph, entry->name)) break; - } - /* Unable to find a suitable name */ - if (j == 10000) - { - CoTaskMemFree(wszFilterName); - return VFW_E_DUPLICATE_NAME; - } + } + + if (i == 10000) + { + CoTaskMemFree(entry->name); + heap_free(entry); + return VFW_E_DUPLICATE_NAME; + } } else - memcpy(wszFilterName, pName, (lstrlenW(pName) + 1) * sizeof(WCHAR)); + wcscpy(entry->name, name); - hr = IBaseFilter_JoinFilterGraph(pFilter, (IFilterGraph *)&This->IFilterGraph2_iface, wszFilterName); - if (FAILED(hr)) + if (FAILED(hr = IBaseFilter_JoinFilterGraph(filter, + (IFilterGraph *)&graph->IFilterGraph2_iface, entry->name))) { - CoTaskMemFree(wszFilterName); + CoTaskMemFree(entry->name); + heap_free(entry); return hr; } - if (!(entry = heap_alloc(sizeof(*entry)))) - { - CoTaskMemFree(wszFilterName); - return E_OUTOFMEMORY; - } - - IBaseFilter_AddRef(entry->filter = pFilter); - entry->name = wszFilterName; - list_add_head(&This->filters, &entry->entry); - This->version++; + IBaseFilter_AddRef(entry->filter = filter); + list_add_head(&graph->filters, &entry->entry); + ++graph->version; return duplicate_name ? VFW_S_DUPLICATE_NAME : hr; } @@ -5706,7 +5702,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL thre fimpl->IGraphVersion_iface.lpVtbl = &IGraphVersion_VTable; fimpl->ref = 1; list_init(&fimpl->filters); - fimpl->nameIndex = 1; + fimpl->name_index = 1; fimpl->refClock = NULL; fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); fimpl->HandleEcComplete = TRUE;

1 0

Liam Middlebrook : winevulkan: Support functions with basic_c return types.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 9058f5e08b03ab1f2565b82711568e25fda37128 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9058f5e08b03ab1f2565b827… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Jan 7 13:54:05 2020 -0800 winevulkan: Support functions with basic_c return types. Needed for VK_KHR_buffer_device_address which uses uint64_t as a return type. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f9b1e1cf96..6c5753eda5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2845,6 +2845,7 @@ class VkRegistry(object): for t in types: type_info = {} type_info["category"] = t.attrib.get("category", None) + type_info["requires"] = t.attrib.get("requires", None) # We parse aliases in a second pass when we know more. alias = t.attrib.get("alias") @@ -2863,13 +2864,19 @@ class VkRegistry(object): base_types.append(basetype) type_info["data"] = basetype + # Basic C types don't need us to define them, but we do need data for them + if type_info["requires"] == "vk_platform": + requires = type_info["requires"] + basic_c = VkBaseType(name, _type, requires=requires) + type_info["data"] = basic_c + if type_info["category"] == "bitmask": name = t.find("name").text _type = t.find("type").text # Most bitmasks have a requires attribute used to pull in # required '*FlagBits" enum. - requires = t.attrib.get("requires") + requires = type_info["requires"] bitmask = VkBaseType(name, _type, requires=requires) bitmasks.append(bitmask) type_info["data"] = bitmask

1 0

Andrew Eikum : dinput: Add missing ASPECT flags for c_dfDIJoystick2.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: e2e100272ffede3c720da7bbd11b53ac0bcee8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2e100272ffede3c720da7bb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 21 13:03:04 2020 -0600 dinput: Add missing ASPECT flags for c_dfDIJoystick2. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/data_formats.c | 64 +++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index b5e0efc3cc..b67ac080e5 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -82,14 +82,14 @@ const DIDATAFORMAT c_dfDIJoystick = { }; static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { - { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_ZAxis,DIJOFS_Z,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RxAxis,DIJOFS_RX,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RyAxis,DIJOFS_RY,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_RzAxis,DIJOFS_RZ,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTPOSITION}, { &GUID_POV,DIJOFS_POV(0),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, { &GUID_POV,DIJOFS_POV(1),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, { &GUID_POV,DIJOFS_POV(2),DIDFT_OPTIONAL|DIDFT_POV|DIDFT_ANYINSTANCE,0}, @@ -222,33 +222,33 @@ static const DIOBJECTDATAFORMAT dfDIJoystick2[] = { { NULL,DIJOFS_BUTTON(125),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, { NULL,DIJOFS_BUTTON(126),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, { NULL,DIJOFS_BUTTON(127),DIDFT_OPTIONAL|DIDFT_BUTTON|DIDFT_ANYINSTANCE,0}, - { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lVX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lVY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lVZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lVRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lVRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lVRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, /* note: dwOfs value matches Windows */ - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTVELOCITY}, + { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lAX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lAY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lAZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lARx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lARy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lARz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, /* note: dwOfs value matches Windows */ - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTACCEL}, + { &GUID_XAxis,FIELD_OFFSET(DIJOYSTATE2,lFX),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_YAxis,FIELD_OFFSET(DIJOYSTATE2,lFY),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_ZAxis,FIELD_OFFSET(DIJOYSTATE2,lFZ),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_RxAxis,FIELD_OFFSET(DIJOYSTATE2,lFRx),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_RyAxis,FIELD_OFFSET(DIJOYSTATE2,lFRy),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_RzAxis,FIELD_OFFSET(DIJOYSTATE2,lFRz),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, /* note: dwOfs value matches Windows */ - { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, - { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, + { &GUID_Slider,DIJOFS_SLIDER(0),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, + { &GUID_Slider,DIJOFS_SLIDER(1),DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,DIDOI_ASPECTFORCE}, }; const DIDATAFORMAT c_dfDIJoystick2 = {

1 0

Alexandre Julliard : configure: Allow out-of-tree builds from an unclean source tree.
by Alexandre Julliard Jan. 22, 2020

Jan. 22, 2020

Module: wine Branch: master Commit: 4ebb7293dc41e476522f5b202f8a74cbc216b8e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ebb7293dc41e476522f5b20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 21 20:59:15 2020 +0100 configure: Allow out-of-tree builds from an unclean source tree. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 -------- configure.ac | 9 --------- 2 files changed, 17 deletions(-) diff --git a/configure b/configure index 3125c4444d..7ff3737bda 100755 --- a/configure +++ b/configure @@ -4288,14 +4288,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -case "$srcdir" in - .) ;; - *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then - as_fn_error $? "you are building out of the source tree, but the source tree contains object files. -You need to run 'make distclean' in the source tree first." "$LINENO" 5 - fi ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } diff --git a/configure.ac b/configure.ac index 5e36331596..681d315eed 100644 --- a/configure.ac +++ b/configure.ac @@ -117,15 +117,6 @@ AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i AC_CANONICAL_HOST -dnl check for out of tree build with unclean source tree -case "$srcdir" in - .) ;; - *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then - AC_MSG_ERROR([you are building out of the source tree, but the source tree contains object files. -You need to run 'make distclean' in the source tree first.]) - fi ;; -esac - dnl **** Check for some programs **** AC_PROG_MAKE_SET

1 0