April 2018 - Wine-commits - list.winehq.org

Jacek Caban : windowscodecs: Store metadata container patterns in meatadata reader info object.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 8be7a1057e6579bacfc83f62e89f34ac30d94eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be7a1057e6579bacfc83f62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 20:49:33 2018 +0200 windowscodecs: Store metadata container patterns in meatadata reader info object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 262 ++++++++++++++++++++++++++++------------------ 1 file changed, 162 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8be7a1057e6579bacfc8…

1 0

Jacek Caban : windowscodecs: Directly use patterns stored in component info object in IWICMetadataReaderInfo ::MatchesPattern implementation.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: ca9d03a7ac6bb599e50aa05ea5ec99d5cf096e2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9d03a7ac6bb599e50aa05e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 2 20:49:40 2018 +0200 windowscodecs: Directly use patterns stored in component info object in IWICMetadataReaderInfo::MatchesPattern implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 4d7c7b9..6652ee3 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -1758,11 +1758,11 @@ static HRESULT WINAPI MetadataReaderInfo_GetPatterns(IWICMetadataReaderInfo *ifa } static HRESULT WINAPI MetadataReaderInfo_MatchesPattern(IWICMetadataReaderInfo *iface, - REFGUID container, IStream *stream, BOOL *matches) + REFGUID container_guid, IStream *stream, BOOL *matches) { + MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface); + struct metadata_container *container; HRESULT hr; - WICMetadataPattern *patterns; - UINT pattern_count=0, patterns_size=0; ULONG datasize=0; BYTE *data=NULL; ULONG bytesread; @@ -1770,24 +1770,18 @@ static HRESULT WINAPI MetadataReaderInfo_MatchesPattern(IWICMetadataReaderInfo * LARGE_INTEGER seekpos; ULONG pos; - TRACE("(%p,%s,%p,%p)\n", iface, debugstr_guid(container), stream, matches); + TRACE("(%p,%s,%p,%p)\n", iface, debugstr_guid(container_guid), stream, matches); - hr = MetadataReaderInfo_GetPatterns(iface, container, 0, NULL, &pattern_count, &patterns_size); - if (FAILED(hr)) return hr; - - patterns = HeapAlloc(GetProcessHeap(), 0, patterns_size); - if (!patterns) return E_OUTOFMEMORY; - - hr = MetadataReaderInfo_GetPatterns(iface, container, patterns_size, patterns, &pattern_count, &patterns_size); - if (FAILED(hr)) goto end; + if (!(container = get_metadata_container(This, container_guid))) + return WINCODEC_ERR_COMPONENTNOTFOUND; - for (i=0; i<pattern_count; i++) + for (i=0; i < container->pattern_count; i++) { - if (datasize < patterns[i].Length) + if (datasize < container->patterns[i].Length) { HeapFree(GetProcessHeap(), 0, data); - datasize = patterns[i].Length; - data = HeapAlloc(GetProcessHeap(), 0, patterns[i].Length); + datasize = container->patterns[i].Length; + data = HeapAlloc(GetProcessHeap(), 0, container->patterns[i].Length); if (!data) { hr = E_OUTOFMEMORY; @@ -1795,21 +1789,21 @@ static HRESULT WINAPI MetadataReaderInfo_MatchesPattern(IWICMetadataReaderInfo * } } - seekpos.QuadPart = patterns[i].Position.QuadPart; + seekpos.QuadPart = container->patterns[i].Position.QuadPart; hr = IStream_Seek(stream, seekpos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) break; - hr = IStream_Read(stream, data, patterns[i].Length, &bytesread); - if (hr == S_FALSE || (hr == S_OK && bytesread != patterns[i].Length)) /* past end of stream */ + hr = IStream_Read(stream, data, container->patterns[i].Length, &bytesread); + if (hr == S_FALSE || (hr == S_OK && bytesread != container->patterns[i].Length)) /* past end of stream */ continue; if (FAILED(hr)) break; - for (pos=0; pos<patterns[i].Length; pos++) + for (pos=0; pos < container->patterns[i].Length; pos++) { - if ((data[pos] & patterns[i].Mask[pos]) != patterns[i].Pattern[pos]) + if ((data[pos] & container->patterns[i].Mask[pos]) != container->patterns[i].Pattern[pos]) break; } - if (pos == patterns[i].Length) /* matches pattern */ + if (pos == container->patterns[i].Length) /* matches pattern */ { hr = S_OK; *matches = TRUE; @@ -1817,14 +1811,12 @@ static HRESULT WINAPI MetadataReaderInfo_MatchesPattern(IWICMetadataReaderInfo * } } - if (i == pattern_count) /* does not match any pattern */ + if (i == container->pattern_count) /* does not match any pattern */ { hr = S_OK; *matches = FALSE; } -end: - HeapFree(GetProcessHeap(), 0, patterns); HeapFree(GetProcessHeap(), 0, data); return hr;

1 0

Zebediah Figura : devenum: Register VFW codecs as codec devices.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: d63e560e6bea1461dcecec32b1beb7ae53522ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d63e560e6bea1461dcecec32… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 31 16:25:18 2018 -0500 devenum: Register VFW codecs as codec devices. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 153 ++++++++++++++++++++++++----------------- dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 72 +++++++++++++++++++ 3 files changed, 164 insertions(+), 63 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 0355933..06c264c 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -106,28 +106,6 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface) return 1; /* non-heap based object */ } -static HKEY open_special_category_key(const CLSID *clsid, BOOL create) -{ - WCHAR key_name[sizeof(wszActiveMovieKey)/sizeof(WCHAR) + CHARS_IN_GUID-1]; - HKEY ret; - LONG res; - - strcpyW(key_name, wszActiveMovieKey); - if (!StringFromGUID2(clsid, key_name + sizeof(wszActiveMovieKey)/sizeof(WCHAR)-1, CHARS_IN_GUID)) - return NULL; - - if(create) - res = RegCreateKeyW(HKEY_CURRENT_USER, key_name, &ret); - else - res = RegOpenKeyExW(HKEY_CURRENT_USER, key_name, 0, KEY_READ, &ret); - if (res != ERROR_SUCCESS) { - WARN("Could not open %s\n", debugstr_w(key_name)); - return NULL; - } - - return ret; -} - static HRESULT register_codec(const CLSID *class, const WCHAR *name, IMoniker **ret) { static const WCHAR deviceW[] = {'@','d','e','v','i','c','e',':','c','m',':',0}; @@ -817,6 +795,96 @@ cleanup: } } +static void register_vfw_codecs(void) +{ + static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; + REGFILTERPINS2 rgpins[2] = {}; + IPropertyBag *prop_bag = NULL; + REGPINTYPES rgtypes[2]; + REGFILTER2 rgf; + WCHAR clsid[CHARS_IN_GUID]; + IMoniker *mon = NULL; + GUID typeguid; + ICINFO info; + VARIANT var; + HRESULT hr; + int i = 0; + HIC hic; + + hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); + if (FAILED(hr)) return; + + while (ICInfo(ICTYPE_VIDEO, i++, &info)) + { + WCHAR name[5] = {LOBYTE(LOWORD(info.fccHandler)), HIBYTE(LOWORD(info.fccHandler)), + LOBYTE(HIWORD(info.fccHandler)), HIBYTE(HIWORD(info.fccHandler))}; + + hic = ICOpen(ICTYPE_VIDEO, info.fccHandler, ICMODE_QUERY); + ICGetInfo(hic, &info, sizeof(info)); + ICClose(hic); + + V_VT(&var) = VT_BSTR; + + V_BSTR(&var) = SysAllocString(name); + if (!(V_BSTR(&var))) + goto cleanup; + + hr = register_codec(&CLSID_VideoCompressorCategory, V_BSTR(&var), &mon); + if (FAILED(hr)) goto cleanup; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + if (FAILED(hr)) goto cleanup; + + /* write WaveInId */ + hr = IPropertyBag_Write(prop_bag, fcchandlerW, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write friendly name */ + V_VT(&var) = VT_BSTR; + if (!(V_BSTR(&var) = SysAllocString(info.szDescription))) + goto cleanup; + + hr = IPropertyBag_Write(prop_bag, wszFriendlyName, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write clsid */ + V_VT(&var) = VT_BSTR; + StringFromGUID2(&CLSID_AVICo, clsid, CHARS_IN_GUID); + if (!(V_BSTR(&var) = SysAllocString(clsid))) + goto cleanup; + hr = IPropertyBag_Write(prop_bag, clsid_keyname, &var); + if (FAILED(hr)) goto cleanup; + VariantClear(&var); + + /* write filter data */ + rgf.dwVersion = 2; + rgf.dwMerit = MERIT_DO_NOT_USE; + rgf.u.s2.cPins2 = 2; + rgf.u.s2.rgPins2 = rgpins; + rgpins[0].dwFlags = 0; + rgpins[0].nMediaTypes = 1; + rgpins[0].lpMediaType = &rgtypes[0]; + rgtypes[0].clsMajorType = &MEDIATYPE_Video; + typeguid = MEDIASUBTYPE_PCM; + typeguid.Data1 = info.fccHandler; + rgtypes[0].clsMinorType = &typeguid; + rgpins[1].dwFlags = REG_PINFLAG_B_OUTPUT; + rgpins[1].nMediaTypes = 1; + rgpins[1].lpMediaType = &rgtypes[1]; + rgtypes[1].clsMajorType = &MEDIATYPE_Video; + rgtypes[1].clsMinorType = &GUID_NULL; + + write_filter_data(prop_bag, &rgf); + +cleanup: + VariantClear(&var); + if (prop_bag) IPropertyBag_Release(prop_bag); + if (mon) IMoniker_Release(mon); + } +} + /********************************************************************** * DEVENUM_ICreateDevEnum_CreateClassEnumerator */ @@ -842,6 +910,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( register_waveout_devices(); register_wavein_devices(); register_midiout_devices(); + register_vfw_codecs(); return create_EnumMoniker(clsidDeviceClass, ppEnumMoniker); } @@ -894,44 +963,6 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) return res; } -static void register_vfw_codecs(void) -{ - WCHAR avico_clsid_str[CHARS_IN_GUID]; - HKEY basekey, key; - ICINFO icinfo; - DWORD i, res; - - static const WCHAR CLSIDW[] = {'C','L','S','I','D',0}; - static const WCHAR FccHandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; - static const WCHAR FriendlyNameW[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; - - StringFromGUID2(&CLSID_AVICo, avico_clsid_str, sizeof(avico_clsid_str)/sizeof(WCHAR)); - - basekey = open_special_category_key(&CLSID_VideoCompressorCategory, TRUE); - if(!basekey) { - ERR("Could not create key\n"); - return; - } - - for(i=0; ICInfo(FCC('v','i','d','c'), i, &icinfo); i++) { - WCHAR fcc_str[5] = {LOBYTE(LOWORD(icinfo.fccHandler)), HIBYTE(LOWORD(icinfo.fccHandler)), - LOBYTE(HIWORD(icinfo.fccHandler)), HIBYTE(HIWORD(icinfo.fccHandler))}; - - res = RegCreateKeyW(basekey, fcc_str, &key); - if(res != ERROR_SUCCESS) - continue; - - RegSetValueExW(key, CLSIDW, 0, REG_SZ, (const BYTE*)avico_clsid_str, sizeof(avico_clsid_str)); - RegSetValueExW(key, FccHandlerW, 0, REG_SZ, (const BYTE*)fcc_str, sizeof(fcc_str)); - RegSetValueExW(key, FriendlyNameW, 0, REG_SZ, (const BYTE*)icinfo.szName, (strlenW(icinfo.szName)+1)*sizeof(WCHAR)); - /* FIXME: Set ClassManagerFlags and FilterData values */ - - RegCloseKey(key); - } - - RegCloseKey(basekey); -} - static HRESULT register_codecs(void) { HRESULT res; @@ -1037,7 +1068,5 @@ static HRESULT register_codecs(void) if (pMapper) IFilterMapper2_Release(pMapper); - register_vfw_codecs(); - return res; } diff --git a/dlls/devenum/tests/Makefile.in b/dlls/devenum/tests/Makefile.in index a673f20..b268adf 100644 --- a/dlls/devenum/tests/Makefile.in +++ b/dlls/devenum/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = devenum.dll -IMPORTS = advapi32 dsound oleaut32 ole32 winmm +IMPORTS = advapi32 dsound msvfw32 oleaut32 ole32 winmm C_SRCS = \ devenum.c diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index d9ea5e9..293ba8d 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -31,6 +31,7 @@ #include "mmsystem.h" #include "dsound.h" #include "mmddk.h" +#include "vfw.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -879,6 +880,76 @@ static void test_midiout(void) IParseDisplayName_Release(parser); } +static void test_vfw(void) +{ + static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; + IParseDisplayName *parser; + IPropertyBag *prop_bag; + IMoniker *mon; + WCHAR buffer[200]; + ICINFO info; + VARIANT var; + HRESULT hr; + int i = 0; + HIC hic; + + if (broken(sizeof(void *) == 8)) + { + win_skip("VFW codecs are not enumerated on 64-bit Windows\n"); + return; + } + + hr = CoCreateInstance(&CLSID_CDeviceMoniker, NULL, CLSCTX_INPROC, &IID_IParseDisplayName, (void **)&parser); + ok(hr == S_OK, "Failed to create ParseDisplayName: %#x\n", hr); + + while (ICInfo(ICTYPE_VIDEO, i++, &info)) + { + WCHAR name[5] = {LOBYTE(LOWORD(info.fccHandler)), HIBYTE(LOWORD(info.fccHandler)), + LOBYTE(HIWORD(info.fccHandler)), HIBYTE(HIWORD(info.fccHandler))}; + + hic = ICOpen(ICTYPE_VIDEO, info.fccHandler, ICMODE_QUERY); + ICGetInfo(hic, &info, sizeof(info)); + ICClose(hic); + + lstrcpyW(buffer, deviceW); + lstrcatW(buffer, cmW); + StringFromGUID2(&CLSID_VideoCompressorCategory, buffer + lstrlenW(buffer), CHARS_IN_GUID); + lstrcatW(buffer, backslashW); + lstrcatW(buffer, name); + + mon = check_display_name(parser, buffer); + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag); + ok(hr == S_OK, "BindToStorage failed: %#x\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + ok(!lstrcmpW(info.szDescription, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(info.szDescription), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, clsidW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + + StringFromGUID2(&CLSID_AVICo, buffer, CHARS_IN_GUID); + ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + + VariantClear(&var); + hr = IPropertyBag_Read(prop_bag, fcchandlerW, &var, NULL); + ok(hr == S_OK, "Read failed: %#x\n", hr); + ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + + IPropertyBag_Release(prop_bag); + IMoniker_Release(mon); + } + + IParseDisplayName_Release(parser); +} + START_TEST(devenum) { IBindCtx *bind_ctx = NULL; @@ -907,6 +978,7 @@ START_TEST(devenum) test_waveout(); test_wavein(); test_midiout(); + test_vfw(); CoUninitialize(); }

1 0

Nikolay Sivov : comdlg32: Add some traces for custom Places (Coverity).
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 855d7b0fd8e0fc298c7df93ee6bcfc92002b8921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=855d7b0fd8e0fc298c7df93e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 1 11:32:23 2018 +0300 comdlg32: Add some traces for custom Places (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 43d5f41..7bed515 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -312,14 +312,21 @@ static void filedlg_collect_places_pidls(FileOpenDlgInfos *fodInfos) static const WCHAR placeW[] = {'P','l','a','c','e','%','d',0}; WCHAR nameW[8]; DWORD value; + HRESULT hr; WCHAR *str; sprintfW(nameW, placeW, i); if (get_config_key_dword(hkey, nameW, &value)) - SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + { + hr = SHGetSpecialFolderLocation(NULL, value, &fodInfos->places[i]); + if (FAILED(hr)) + WARN("Unrecognized special folder %u.\n", value); + } else if (get_config_key_string(hkey, nameW, &str)) { - SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + hr = SHParseDisplayName(str, NULL, &fodInfos->places[i], 0, NULL); + if (FAILED(hr)) + WARN("Failed to parse custom places location, %s.\n", debugstr_w(str)); heap_free(str); } }

1 0

Nikolay Sivov : comdlg32: Fix some leaks on error paths (Coverity).
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: ffd84dc4295b4f0c37870f64712c44ce403419b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffd84dc4295b4f0c37870f64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 1 11:32:24 2018 +0300 comdlg32: Fix some leaks on error paths (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlgbrowser.c | 46 ++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c index 1b119f6..5b5323f 100644 --- a/dlls/comdlg32/filedlgbrowser.c +++ b/dlls/comdlg32/filedlgbrowser.c @@ -334,7 +334,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, UINT wFlags) { HRESULT hRes; - IShellFolder *psfTmp; + IShellFolder *folder; IShellView *psvTmp; FileOpenDlgInfos *fodInfos; LPITEMIDLIST pidlTmp; @@ -355,8 +355,8 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, { /* SBSP_RELATIVE A relative pidl (relative from the current folder) */ - if(FAILED(hRes = IShellFolder_BindToObject(fodInfos->Shell.FOIShellFolder, - pidl, NULL, &IID_IShellFolder, (LPVOID *)&psfTmp))) + if (FAILED(hRes = IShellFolder_BindToObject(fodInfos->Shell.FOIShellFolder, + pidl, NULL, &IID_IShellFolder, (void **)&folder))) { ERR("bind to object failed\n"); return hRes; @@ -368,30 +368,30 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, { /* Browse the parent folder (ignores the pidl) */ pidlTmp = GetParentPidl(fodInfos->ShellInfos.pidlAbsCurrent); - psfTmp = GetShellFolderFromPidl(pidlTmp); - + folder = GetShellFolderFromPidl(pidlTmp); } else /* SBSP_ABSOLUTE is 0x0000 */ { /* An absolute pidl (relative from the desktop) */ pidlTmp = ILClone(pidl); - psfTmp = GetShellFolderFromPidl(pidlTmp); + folder = GetShellFolderFromPidl(pidlTmp); } - if(!psfTmp) + if (!folder) { - ERR("could not browse to folder\n"); - return E_FAIL; + ERR("could not browse to folder\n"); + ILFree(pidlTmp); + return E_FAIL; } /* If the pidl to browse to is equal to the actual pidl ... do nothing and pretend you did it*/ if (ILIsEqual(pidlTmp, fodInfos->ShellInfos.pidlAbsCurrent)) { - IShellFolder_Release(psfTmp); + IShellFolder_Release(folder); ILFree(pidlTmp); TRACE("keep current folder\n"); - return NOERROR; + return S_OK; } /* Release the current DataObject */ @@ -403,8 +403,13 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, /* Create the associated view */ TRACE("create view object\n"); - if(FAILED(hRes = IShellFolder_CreateViewObject(psfTmp, fodInfos->ShellInfos.hwndOwner, - &IID_IShellView, (LPVOID *)&psvTmp))) goto error; + if (FAILED(hRes = IShellFolder_CreateViewObject(folder, fodInfos->ShellInfos.hwndOwner, + &IID_IShellView, (void **)&psvTmp))) + { + IShellFolder_Release(folder); + ILFree(pidlTmp); + return hRes; + } /* Check if listview has focus */ bViewHasFocus = IsChild(fodInfos->ShellInfos.hwndView,GetFocus()); @@ -426,7 +431,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, /* Release old FOIShellFolder and update its value */ if (fodInfos->Shell.FOIShellFolder) IShellFolder_Release(fodInfos->Shell.FOIShellFolder); - fodInfos->Shell.FOIShellFolder = psfTmp; + fodInfos->Shell.FOIShellFolder = folder; /* Release old pidlAbsCurrent and update its value */ ILFree(fodInfos->ShellInfos.pidlAbsCurrent); @@ -439,9 +444,13 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, /* Create the window */ TRACE("create view window\n"); - if(FAILED(hRes = IShellView_CreateViewWindow(psvTmp, NULL, - &fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser, - &rectView, &hwndView))) goto error; + if (FAILED(hRes = IShellView_CreateViewWindow(psvTmp, NULL, + &fodInfos->ShellInfos.folderSettings, fodInfos->Shell.FOIShellBrowser, + &rectView, &hwndView))) + { + WARN("Failed to create view window, hr %#x.\n", hRes); + return hRes; + } fodInfos->ShellInfos.hwndView = hwndView; @@ -461,9 +470,6 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface, SetFocus(fodInfos->ShellInfos.hwndView); return hRes; -error: - ERR("Failed with error 0x%08x\n", hRes); - return hRes; } /**************************************************************************

1 0

Nikolay Sivov : comctl32/button: Keep control style.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: b442a5c0f02817e005a6a90c184487d1ec255b9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b442a5c0f02817e005a6a90c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 1 11:33:38 2018 +0300 comctl32/button: Keep control style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 8 +++++++- dlls/comctl32/tests/button.c | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7d48fe7..1e339ef 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -91,6 +91,7 @@ typedef struct _BUTTON_INFO { HWND hwnd; HWND parent; + LONG style; LONG state; HFONT font; WCHAR *note; @@ -340,11 +341,16 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; + infoPtr = heap_alloc_zero( sizeof(*infoPtr) ); SetWindowLongPtrW( hWnd, 0, (LONG_PTR)infoPtr ); infoPtr->hwnd = hWnd; - infoPtr->parent = GetParent(hWnd); + infoPtr->parent = cs->hwndParent; + infoPtr->style = cs->style; return DefWindowProcW(hWnd, uMsg, wParam, lParam); + } case WM_NCDESTROY: SetWindowLongPtrW( hWnd, 0, 0 ); diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 0aacfa5..7bd73de 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1004,6 +1004,7 @@ static void test_button_data(void) { HWND self; HWND parent; + LONG style; }; unsigned int i; HWND parent; @@ -1027,6 +1028,7 @@ static void test_button_data(void) { ok(desc->self == hwnd, "Unexpected 'self' field.\n"); ok(desc->parent == parent, "Unexpected 'parent' field.\n"); + ok(desc->style == (WS_CHILD | BS_NOTIFY | styles[i]), "Unexpected 'style' field.\n"); } DestroyWindow(hwnd);

1 0

Michael Stefaniuc : wsdapi/tests: Remove redundant NULL checks before heap_free().
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: c15bbce2e559ed4111ba5ceed4d65570b43758d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c15bbce2e559ed4111ba5cee… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:46 2018 +0200 wsdapi/tests: Remove redundant NULL checks before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/discovery.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 1c7619d..73fe22c 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -260,7 +260,7 @@ static void start_listening(messageStorage *msgStorage, const char *multicastAdd cleanup: closesocket(s); - if (parameter != NULL) heap_free(parameter); + heap_free(parameter); cleanup_addresses: freeaddrinfo(multicastAddr); @@ -309,7 +309,7 @@ static BOOL start_listening_on_all_addresses(messageStorage *msgStorage, ULONG f ret = TRUE; cleanup: - if (adapterAddresses != NULL) heap_free(adapterAddresses); + heap_free(adapterAddresses); return ret; } @@ -626,8 +626,8 @@ static void Publish_tests(void) after_publish_test: - if (publisherIdW != NULL) heap_free(publisherIdW); - if (sequenceIdW != NULL) heap_free(sequenceIdW); + heap_free(publisherIdW); + heap_free(sequenceIdW); ref = IWSDiscoveryPublisher_Release(publisher); ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref);

1 0

Michael Stefaniuc : wsdapi: Remove redundant NULL checks before heap_free( ).
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: aae4f1142f81e7964f64859267cfe945cc9a29c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae4f1142f81e7964f648592… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:47 2018 +0200 wsdapi: Remove redundant NULL checks before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/network.c | 2 +- dlls/wsdapi/soap.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index cfcae6b..bea63fb 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -215,7 +215,7 @@ BOOL send_udp_multicast_of_type(char *data, int length, int max_initial_delay, U ret = TRUE; cleanup: - if (adapter_addresses != NULL) heap_free(adapter_addresses); + heap_free(adapter_addresses); return ret; } diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 7779317..970bc4f 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -127,8 +127,7 @@ static inline void free_xml_string(WS_XML_STRING *value) if (value == NULL) return; - if (value->bytes != NULL) - heap_free(value->bytes); + heap_free(value->bytes); heap_free(value); }

1 0

Michael Stefaniuc : user32: Remove an ARRAY_SIZE()-like macro.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: 6e7f28d934d5675b1154fab818a0215bb8d9b603 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7f28d934d5675b1154fab8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:48 2018 +0200 user32: Remove an ARRAY_SIZE()-like macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 2c4ff5e..2fcf2fb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1300,7 +1300,6 @@ static struct sysparam_rgb_entry system_colors[] = RGB_ENTRY( COLOR_MENUBAR, RGB(212, 208, 200) ) #undef RGB_ENTRY }; -#define NUM_SYS_COLORS (sizeof(system_colors) / sizeof(system_colors[0])) /* entries that are initialized by default in the registry */ static union sysparam_all_entry * const default_entries[] = @@ -2690,7 +2689,8 @@ COLORREF WINAPI DECLSPEC_HOTPATCH GetSysColor( INT nIndex ) { COLORREF ret = 0; - if (nIndex >= 0 && nIndex < NUM_SYS_COLORS) get_entry( &system_colors[nIndex], 0, &ret ); + if (nIndex >= 0 && nIndex < ARRAY_SIZE( system_colors )) + get_entry( &system_colors[nIndex], 0, &ret ); return ret; } @@ -2705,7 +2705,7 @@ BOOL WINAPI SetSysColors( INT count, const INT *colors, const COLORREF *values ) if (IS_INTRESOURCE(colors)) return FALSE; /* stupid app passes a color instead of an array */ for (i = 0; i < count; i++) - if (colors[i] >= 0 && colors[i] <= NUM_SYS_COLORS) + if (colors[i] >= 0 && colors[i] <= ARRAY_SIZE( system_colors )) set_entry( &system_colors[colors[i]], values[i], 0, 0 ); /* Send WM_SYSCOLORCHANGE message to all windows */ @@ -2735,7 +2735,7 @@ DWORD_PTR WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes */ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) { - if (index < 0 || index >= NUM_SYS_COLORS) return 0; + if (index < 0 || index >= ARRAY_SIZE( system_colors )) return 0; if (!system_colors[index].brush) { @@ -2757,7 +2757,7 @@ HBRUSH WINAPI DECLSPEC_HOTPATCH GetSysColorBrush( INT index ) HPEN SYSCOLOR_GetPen( INT index ) { /* We can assert here, because this function is internal to Wine */ - assert (0 <= index && index < NUM_SYS_COLORS); + assert (0 <= index && index < ARRAY_SIZE( system_colors )); if (!system_colors[index].pen) {

1 0

Michael Stefaniuc : user32: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 02 Apr '18

02 Apr '18

Module: wine Branch: master Commit: e8411d22d5399a1fd76270f78ef70300555842c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8411d22d5399a1fd76270f7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 1 22:20:49 2018 +0200 user32: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 12 ++++++------ dlls/user32/dialog.c | 4 ++-- dlls/user32/exticon.c | 4 ++-- dlls/user32/mdi.c | 8 ++++---- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 4 ++-- dlls/user32/msgbox.c | 2 +- dlls/user32/nonclient.c | 4 ++-- dlls/user32/spy.c | 11 +++++------ dlls/user32/sysparams.c | 7 +++---- dlls/user32/text.c | 2 +- dlls/user32/win.c | 4 ++-- 12 files changed, 31 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8411d22d5399a1fd762…

1 0