December 2014 - Wine-Commits

Ken Thomases : shell32: Don' t append a trailing space to the arguments in a shell link if the command info has an empty parameters string.
by Alexandre Julliard Dec. 23, 2014

Dec. 23, 2014

Module: wine Branch: master Commit: 14490909856e6bea715e215625d7461082a146d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14490909856e6bea715e21562… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 22 20:05:43 2014 -0600 shell32: Don't append a trailing space to the arguments in a shell link if the command info has an empty parameters string. --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index ebcaa25..bd3507e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2449,7 +2449,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) args[0] = 0; if ( This->sArgs ) lstrcatW( args, This->sArgs ); - if ( iciex->lpParametersW ) + if ( iciex->lpParametersW && iciex->lpParametersW[0] ) { static const WCHAR space[] = { ' ', 0 }; lstrcatW( args, space );

1 0

Jacek Caban : urlmon: Skip query and hash part in find_mime_from_url.
by Alexandre Julliard Dec. 23, 2014

Dec. 23, 2014

Module: wine Branch: master Commit: 9351e225bb6d08908f83dd7e491a49a0b0b5b7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9351e225bb6d08908f83dd7e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 23 12:02:03 2014 +0100 urlmon: Skip query and hash part in find_mime_from_url. --- dlls/urlmon/mimefilter.c | 44 +++++++++++++++++++++++++++++++++++++------- dlls/urlmon/tests/misc.c | 15 ++++++++++++--- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 55cd200..1e06fc3 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -422,20 +422,15 @@ static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) return TRUE; } -static HRESULT find_mime_from_url(const WCHAR *url, WCHAR **ret) +static HRESULT find_mime_from_ext(const WCHAR *ext, WCHAR **ret) { - const WCHAR *ptr; DWORD res, size; WCHAR mime[64]; HKEY hkey; static const WCHAR content_typeW[] = {'C','o','n','t','e','n','t',' ','T','y','p','e','\0'}; - ptr = strrchrW(url, '.'); - if(!ptr) - return E_FAIL; - - res = RegOpenKeyW(HKEY_CLASSES_ROOT, ptr, &hkey); + res = RegOpenKeyW(HKEY_CLASSES_ROOT, ext, &hkey); if(res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); @@ -452,6 +447,41 @@ static HRESULT find_mime_from_url(const WCHAR *url, WCHAR **ret) return S_OK; } +static HRESULT find_mime_from_url(const WCHAR *url, WCHAR **ret) +{ + const WCHAR *ptr, *end_ptr; + WCHAR *ext = NULL; + HRESULT hres; + + for(end_ptr = url; *end_ptr; end_ptr++) { + if(*end_ptr == '?' || *end_ptr == '#') + break; + } + + for(ptr = end_ptr; ptr >= url; ptr--) { + if(*ptr == '.') + break; + } + + if(ptr < url) + return E_FAIL; + + if(*end_ptr) { + unsigned len = end_ptr-ptr; + + ext = heap_alloc((len+1)*sizeof(WCHAR)); + if(!ext) + return E_OUTOFMEMORY; + + memcpy(ext, ptr, len*sizeof(WCHAR)); + ext[len] = 0; + } + + hres = find_mime_from_ext(ext ? ext : ptr, ret); + heap_free(ext); + return hres; +} + static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; static const WCHAR text_richtextW[] = {'t','e','x','t','/','r','i','c','h','t','e','x','t',0}; static const WCHAR text_xmlW[] = {'t','e','x','t','/','x','m','l',0}; diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index b0849a0..ebfef2b 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -466,10 +466,15 @@ static const struct { const char *url; const char *mime; HRESULT hres; + BOOL broken_failure; + const char *broken_mime; } mime_tests[] = { {"res://mshtml.dll/blank.htm", "text/html", S_OK}, {"index.htm", "text/html", S_OK}, {"file://c:\\Index.htm", "text/html", S_OK}, + {"file://c:\\Index.htm?q=test", "text/html", S_OK, TRUE}, + {"file://c:\\Index.htm#hash_part", "text/html", S_OK, TRUE}, + {"file://c:\\Index.htm#hash_part.txt", "text/html", S_OK, FALSE, "text/plain"}, {"file://some%20file%2ejpg", NULL, E_FAIL}, {"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, {"about:blank", NULL, E_FAIL}, @@ -713,9 +718,13 @@ static void test_FindMimeFromData(void) url = a2w(mime_tests[i].url); hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { - ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); - ok(!strcmp_wa(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); - CoTaskMemFree(mime); + ok(hres == S_OK || broken(mime_tests[i].broken_failure), "[%d] FindMimeFromData failed: %08x\n", i, hres); + if(hres == S_OK) { + ok(!strcmp_wa(mime, mime_tests[i].mime) + || broken(mime_tests[i].broken_mime && !strcmp_wa(mime, mime_tests[i].broken_mime)), + "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); + CoTaskMemFree(mime); + } }else { ok(hres == E_FAIL || hres == mime_tests[i].hres, "[%d] FindMimeFromData failed: %08x, expected %08x\n",

1 0

Jacek Caban : urlmon: Use find_mime_from_ext directly in file protocol handler.
by Alexandre Julliard Dec. 23, 2014

Dec. 23, 2014

Module: wine Branch: master Commit: 0029290e3e769880f2e357cf9608ac26535c29fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0029290e3e769880f2e357cf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 23 12:02:12 2014 +0100 urlmon: Use find_mime_from_ext directly in file protocol handler. --- dlls/urlmon/file.c | 24 +++++++++++++----------- dlls/urlmon/mimefilter.c | 2 +- dlls/urlmon/urlmon_main.h | 2 ++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index d426f19..80d9dd6 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -251,7 +251,7 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr DWORD scheme, size; LPWSTR mime = NULL; WCHAR null_char = 0; - BSTR url; + BSTR ext; HRESULT hres; TRACE("(%p)->(%p %p %p %08x %p)\n", This, pUri, pOIProtSink, @@ -300,17 +300,19 @@ static HRESULT WINAPI FileProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr if(FAILED(hres)) return hres; - hres = IUri_GetDisplayUri(pUri, &url); - if(hres == S_OK) { - hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); - SysFreeString(url); - if(SUCCEEDED(hres)) { - IInternetProtocolSink_ReportProgress(pOIProtSink, - (grfBINDF & BINDF_FROMURLMON) ? - BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, - mime); - CoTaskMemFree(mime); + hres = IUri_GetExtension(pUri, &ext); + if(SUCCEEDED(hres)) { + if(hres == S_OK && *ext) { + hres = find_mime_from_ext(ext, &mime); + if(SUCCEEDED(hres)) { + IInternetProtocolSink_ReportProgress(pOIProtSink, + (grfBINDF & BINDF_FROMURLMON) ? + BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, + mime); + CoTaskMemFree(mime); + } } + SysFreeString(ext); } IInternetProtocolSink_ReportData(pOIProtSink, diff --git a/dlls/urlmon/mimefilter.c b/dlls/urlmon/mimefilter.c index 1e06fc3..cee1a19 100644 --- a/dlls/urlmon/mimefilter.c +++ b/dlls/urlmon/mimefilter.c @@ -422,7 +422,7 @@ static BOOL application_octet_stream_filter(const BYTE *b, DWORD size) return TRUE; } -static HRESULT find_mime_from_ext(const WCHAR *ext, WCHAR **ret) +HRESULT find_mime_from_ext(const WCHAR *ext, WCHAR **ret) { DWORD res, size; WCHAR mime[64]; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index e134761..12be0ed 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -76,6 +76,8 @@ WCHAR *get_useragent(void) DECLSPEC_HIDDEN; void update_user_agent(WCHAR*) DECLSPEC_HIDDEN; void free_session(void) DECLSPEC_HIDDEN; +HRESULT find_mime_from_ext(const WCHAR*,WCHAR**) DECLSPEC_HIDDEN; + HRESULT bind_to_storage(IUri*,IBindCtx*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT bind_to_object(IMoniker*,IUri*,IBindCtx*,REFIID,void**ppv) DECLSPEC_HIDDEN;

1 0

Jacek Caban : urlmon: Store URLs as const char* in mime_tests.
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: 299a48075dd54a5ab8620c22c177d426aae1e99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=299a48075dd54a5ab8620c22c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 22 19:10:19 2014 +0100 urlmon: Store URLs as const char* in mime_tests. --- dlls/urlmon/tests/misc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 287fce0..b0849a0 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -284,7 +284,6 @@ static void test_RegisterFormatEnumerator(void) IEnumFORMATETC_Release(format); IBindCtx_Release(bctx); } - static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; @@ -464,17 +463,17 @@ static void test_CoInternetQueryInfo(void) } static const struct { - const WCHAR *url; + const char *url; const char *mime; HRESULT hres; } mime_tests[] = { - {url1, "text/html", S_OK}, - {url2, "text/html", S_OK}, - {url3, "text/html", S_OK}, - {url4, NULL, E_FAIL}, - {url5, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, - {url6, NULL, E_FAIL}, - {url7, NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} + {"res://mshtml.dll/blank.htm", "text/html", S_OK}, + {"index.htm", "text/html", S_OK}, + {"file://c:\\Index.htm", "text/html", S_OK}, + {"file://some%20file%2ejpg", NULL, E_FAIL}, + {"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {"about:blank", NULL, E_FAIL}, + {"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; @@ -711,7 +710,8 @@ static void test_FindMimeFromData(void) for(i=0; i<sizeof(mime_tests)/sizeof(mime_tests[0]); i++) { mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); + url = a2w(mime_tests[i].url); + hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!strcmp_wa(mime, mime_tests[i].mime), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); @@ -724,16 +724,17 @@ static void test_FindMimeFromData(void) } mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, text_plainW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!strcmp_wa(mime, "text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, app_octet_streamW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, url, NULL, 0, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!strcmp_wa(mime, "application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); + heap_free(url); } for(i=0; i < sizeof(mime_tests2)/sizeof(mime_tests2[0]); i++) {

1 0

Michael Stefaniuc : mscms: Remove always false if subexpression ( PVS-Studio).
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: be90236fab6f3489dc1ebc35d5dae4c0113cad36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90236fab6f3489dc1ebc35d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 22 11:28:58 2014 +0100 mscms: Remove always false if subexpression (PVS-Studio). --- dlls/mscms/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index d6ee715..eb9b4d0 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -649,7 +649,7 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi lstrcatW( rgbprofile, rgbprofilefile ); len = lstrlenW( rgbprofile ) * sizeof(WCHAR); - if (*size < len || !profile) + if (*size < len) { *size = len; SetLastError( ERROR_MORE_DATA );

1 0

Michael Stefaniuc : mlang/tests: Avoid always true ok() checks (PVS-Studio ).
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: ef8db24b9c77bdc110c4c2b6acb4581b9fd6d193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8db24b9c77bdc110c4c2b6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 22 15:09:15 2014 +0100 mlang/tests: Avoid always true ok() checks (PVS-Studio). --- dlls/mlang/tests/mlang.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index a24dbbf..0078f6e 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -487,15 +487,15 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags) ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret); n = 65536; ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n); + ok(ret == S_FALSE || ret == E_FAIL, + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); if (ret == S_FALSE) - ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); + ok(n == 0, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret); else if (ret == E_FAIL) - ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(n == 65536, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL); - if (ret == S_FALSE) - ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret); - else if (ret == E_FAIL) - ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret); + ok(ret == S_FALSE || ret == E_FAIL, + "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret); cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2);

1 0

Nikolay Sivov : shell32: Added stub IPropertyStore for a shell link object.
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: aeda103769fa677bbbf8793b3dd2cab617cb32bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeda103769fa677bbbf8793b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 22 15:18:20 2014 +0300 shell32: Added stub IPropertyStore for a shell link object. --- dlls/shell32/shelllink.c | 164 ++++++++++++++++++++++++++++------------- dlls/shell32/tests/shelllink.c | 36 +++++++++ 2 files changed, 149 insertions(+), 51 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index b9c9e75..ebcaa25 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -115,15 +115,6 @@ typedef struct volume_info_t #include "poppack.h" -static const IShellLinkAVtbl slvt; -static const IShellLinkWVtbl slvtw; -static const IPersistFileVtbl pfvt; -static const IPersistStreamVtbl psvt; -static const IShellLinkDataListVtbl dlvt; -static const IShellExtInitVtbl eivt; -static const IContextMenuVtbl cmvt; -static const IObjectWithSiteVtbl owsvt; - /* IShellLink Implementation */ typedef struct @@ -136,6 +127,7 @@ typedef struct IShellExtInit IShellExtInit_iface; IContextMenu IContextMenu_iface; IObjectWithSite IObjectWithSite_iface; + IPropertyStore IPropertyStore_iface; LONG ref; @@ -205,6 +197,11 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) return CONTAINING_RECORD(iface, IShellLinkImpl, IObjectWithSite_iface); } +static inline IShellLinkImpl *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, IShellLinkImpl, IPropertyStore_iface); +} + static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ @@ -1140,48 +1137,6 @@ static const IPersistStreamVtbl psvt = IPersistStream_fnGetSizeMax }; -/************************************************************************** - * IShellLink_Constructor - */ -HRESULT WINAPI IShellLink_Constructor( IUnknown *pUnkOuter, - REFIID riid, LPVOID *ppv ) -{ - IShellLinkImpl * sl; - HRESULT r; - - TRACE("unkOut=%p riid=%s\n",pUnkOuter, debugstr_guid(riid)); - - *ppv = NULL; - - if (pUnkOuter) - return CLASS_E_NOAGGREGATION; - sl = LocalAlloc(LMEM_ZEROINIT,sizeof(IShellLinkImpl)); - if (!sl) - return E_OUTOFMEMORY; - - sl->ref = 1; - sl->IShellLinkA_iface.lpVtbl = &slvt; - sl->IShellLinkW_iface.lpVtbl = &slvtw; - sl->IPersistFile_iface.lpVtbl = &pfvt; - sl->IPersistStream_iface.lpVtbl = &psvt; - sl->IShellLinkDataList_iface.lpVtbl = &dlvt; - sl->IShellExtInit_iface.lpVtbl = &eivt; - sl->IContextMenu_iface.lpVtbl = &cmvt; - sl->IObjectWithSite_iface.lpVtbl = &owsvt; - sl->iShowCmd = SW_SHOWNORMAL; - sl->bDirty = FALSE; - sl->iIdOpen = -1; - sl->site = NULL; - sl->filepath = NULL; - - TRACE("(%p)->()\n",sl); - - r = IShellLinkW_QueryInterface( &sl->IShellLinkW_iface, riid, ppv ); - IShellLinkW_Release( &sl->IShellLinkW_iface ); - return r; -} - - static BOOL SHELL_ExistsFileW(LPCWSTR path) { if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(path)) @@ -1627,6 +1582,10 @@ static HRESULT WINAPI IShellLinkW_fnQueryInterface( { *ppvObj = &This->IObjectWithSite_iface; } + else if(IsEqualIID(riid, &IID_IPropertyStore)) + { + *ppvObj = &This->IPropertyStore_iface; + } if(*ppvObj) { @@ -2600,3 +2559,106 @@ static const IObjectWithSiteVtbl owsvt = ShellLink_SetSite, ShellLink_GetSite, }; + +static HRESULT WINAPI propertystore_QueryInterface(IPropertyStore *iface, REFIID riid, void **obj) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + return IShellLinkW_QueryInterface(&This->IShellLinkW_iface, riid, obj); +} + +static ULONG WINAPI propertystore_AddRef(IPropertyStore *iface) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + return IShellLinkW_AddRef(&This->IShellLinkW_iface); +} + +static ULONG WINAPI propertystore_Release(IPropertyStore *iface) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + return IShellLinkW_Release(&This->IShellLinkW_iface); +} + +static HRESULT WINAPI propertystore_GetCount(IPropertyStore *iface, DWORD *props) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + FIXME("(%p)->(%p): stub\n", This, props); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertystore_GetAt(IPropertyStore *iface, DWORD propid, PROPERTYKEY *key) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + FIXME("(%p)->(%d %p): stub\n", This, propid, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertystore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *value) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + FIXME("(%p)->(%p %p): stub\n", This, key, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertystore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT value) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + FIXME("(%p)->(%p %p): stub\n", This, key, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI propertystore_Commit(IPropertyStore *iface) +{ + IShellLinkImpl *This = impl_from_IPropertyStore(iface); + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +static const IPropertyStoreVtbl propertystorevtbl = { + propertystore_QueryInterface, + propertystore_AddRef, + propertystore_Release, + propertystore_GetCount, + propertystore_GetAt, + propertystore_GetValue, + propertystore_SetValue, + propertystore_Commit +}; + +HRESULT WINAPI IShellLink_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + IShellLinkImpl * sl; + HRESULT r; + + TRACE("outer=%p riid=%s\n", outer, debugstr_guid(riid)); + + *obj = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + sl = LocalAlloc(LMEM_ZEROINIT,sizeof(IShellLinkImpl)); + if (!sl) + return E_OUTOFMEMORY; + + sl->ref = 1; + sl->IShellLinkA_iface.lpVtbl = &slvt; + sl->IShellLinkW_iface.lpVtbl = &slvtw; + sl->IPersistFile_iface.lpVtbl = &pfvt; + sl->IPersistStream_iface.lpVtbl = &psvt; + sl->IShellLinkDataList_iface.lpVtbl = &dlvt; + sl->IShellExtInit_iface.lpVtbl = &eivt; + sl->IContextMenu_iface.lpVtbl = &cmvt; + sl->IObjectWithSite_iface.lpVtbl = &owsvt; + sl->IPropertyStore_iface.lpVtbl = &propertystorevtbl; + sl->iShowCmd = SW_SHOWNORMAL; + sl->bDirty = FALSE; + sl->iIdOpen = -1; + sl->site = NULL; + sl->filepath = NULL; + + TRACE("(%p)\n", sl); + + r = IShellLinkW_QueryInterface( &sl->IShellLinkW_iface, riid, obj ); + IShellLinkW_Release( &sl->IShellLinkW_iface ); + return r; +} diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index ba9d1eb..b258052 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1151,6 +1151,41 @@ static void test_SHExtractIcons(void) for (i = 0; i < ret; i++) DestroyIcon(icons[i]); } +static void test_propertystore(void) +{ + IShellLinkA *linkA; + IShellLinkW *linkW; + IPropertyStore *ps; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkA, (void**)&linkA); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellLinkA_QueryInterface(linkA, &IID_IShellLinkW, (void**)&linkW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IShellLinkA_QueryInterface(linkA, &IID_IPropertyStore, (void**)&ps); + if (hr == S_OK) { + IPropertyStoreCache *pscache; + + IPropertyStore_Release(ps); + + hr = IShellLinkW_QueryInterface(linkW, &IID_IPropertyStore, (void**)&ps); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IPropertyStore_QueryInterface(ps, &IID_IPropertyStoreCache, (void**)&pscache); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + IPropertyStore_Release(ps); + } + else + win_skip("IShellLink doesn't support IPropertyStore.\n"); + + IShellLinkA_Release(linkA); + IShellLinkW_Release(linkW); +} + START_TEST(shelllink) { HRESULT r; @@ -1178,6 +1213,7 @@ START_TEST(shelllink) test_GetIconLocation(); test_SHGetStockIconInfo(); test_SHExtractIcons(); + test_propertystore(); CoUninitialize(); }

1 0

André Hentschel : loader: Treat BSDs architecture independent for wine64.
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: 4b708fc325753f1bb1c8210bb67757ebbf9f60dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b708fc325753f1bb1c8210bb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 22 12:50:01 2014 +0100 loader: Treat BSDs architecture independent for wine64. --- loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/main.c b/loader/main.c index ac67290..ce21173 100644 --- a/loader/main.c +++ b/loader/main.c @@ -181,7 +181,7 @@ static int pre_exec(void) return 1; /* we have a preloader on x86-64 */ } -#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(__i386__) +#elif (defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)) static int pre_exec(void) {

1 0

Michael Stefaniuc : msvfw32: Remove always false if subexpression ( PVS-Studio).
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: 036670810c7e8bf55a5ee0e71e32fa4a097dac02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=036670810c7e8bf55a5ee0e71… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 22 11:30:48 2014 +0100 msvfw32: Remove always false if subexpression (PVS-Studio). --- dlls/msvfw32/drawdib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvfw32/drawdib.c b/dlls/msvfw32/drawdib.c index c4e5c40..a6af90f 100644 --- a/dlls/msvfw32/drawdib.c +++ b/dlls/msvfw32/drawdib.c @@ -472,7 +472,7 @@ UINT VFWAPI DrawDibRealize(HDRAWDIB hdd, HDC hdc, BOOL fBackground) whdd = MSVIDEO_GetHddPtr(hdd); if (!whdd) return FALSE; - if (!whdd || !(whdd->begun)) + if (!whdd->begun) { ret = 0; goto out;

1 0

Jacek Caban : mshtml: Added IHTMLElement::get_isTextEdit implementation.
by Alexandre Julliard Dec. 22, 2014

Dec. 22, 2014

Module: wine Branch: master Commit: c1afef340ccde247a6106764e541b7fba755feb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1afef340ccde247a6106764e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Dec 21 19:29:46 2014 +0100 mshtml: Added IHTMLElement::get_isTextEdit implementation. --- dlls/mshtml/htmlbody.c | 8 +++++++- dlls/mshtml/htmlelem.c | 8 ++++++-- dlls/mshtml/htmlinput.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/mshtml/htmltextarea.c | 8 +++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 6 files changed, 79 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 748302e..0c8691a 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -833,6 +833,11 @@ static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) : &This->textcont.element.node.event_target; } +static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) +{ + return TRUE; +} + static const cpc_entry_t HTMLBodyElement_cpc[] = { {&DIID_HTMLTextContainerEvents}, {&IID_IPropertyNotifySink}, @@ -857,7 +862,8 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { NULL, NULL, HTMLBodyElement_traverse, - HTMLBodyElement_unlink + HTMLBodyElement_unlink, + HTMLBodyElement_is_text_edit }; static const tid_t HTMLBodyElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d6cb18f..da7c0f7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1665,8 +1665,12 @@ static HRESULT WINAPI HTMLElement_get_parentTextEdit(IHTMLElement *iface, IHTMLE static HRESULT WINAPI HTMLElement_get_isTextEdit(IHTMLElement *iface, VARIANT_BOOL *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = This->node.vtbl->is_text_edit && This->node.vtbl->is_text_edit(&This->node) + ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLElement_click(IHTMLElement *iface) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 4ce01b5..42e5796 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1260,6 +1260,32 @@ static HRESULT HTMLInputElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOO return IHTMLInputElement_get_disabled(&This->IHTMLInputElement_iface, p); } +static BOOL HTMLInputElement_is_text_edit(HTMLDOMNode *iface) +{ + HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + const PRUnichar *type; + nsAString nsstr; + nsresult nsres; + BOOL ret = FALSE; + + static const WCHAR buttonW[] = {'b','u','t','t','o','n',0}; + static const WCHAR hiddenW[] = {'h','i','d','d','e','n',0}; + static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; + static const WCHAR resetW[] = {'r','e','s','e','t',0}; + static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; + static const WCHAR textW[] = {'t','e','x','t',0}; + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLInputElement_GetType(This->nsinput, &nsstr); + if(NS_SUCCEEDED(nsres)) { + nsAString_GetData(&nsstr, &type); + ret = !strcmpW(type, buttonW) || !strcmpW(type, hiddenW) || !strcmpW(type, passwordW) + || !strcmpW(type, resetW) || !strcmpW(type, submitW) || !strcmpW(type, textW); + } + nsAString_Finish(&nsstr); + return ret; +} + static void HTMLInputElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLInputElement *This = impl_from_HTMLDOMNode(iface); @@ -1297,7 +1323,8 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { NULL, NULL, HTMLInputElement_traverse, - HTMLInputElement_unlink + HTMLInputElement_unlink, + HTMLInputElement_is_text_edit }; static const tid_t HTMLInputElement_iface_tids[] = { @@ -1764,6 +1791,11 @@ static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BO return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); } +static BOOL HTMLButtonElement_is_text_edit(HTMLDOMNode *iface) +{ + return TRUE; +} + static void HTMLButtonElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLButtonElement *This = button_from_HTMLDOMNode(iface); @@ -1801,7 +1833,8 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { NULL, NULL, HTMLButtonElement_traverse, - HTMLButtonElement_unlink + HTMLButtonElement_unlink, + HTMLButtonElement_is_text_edit }; static const tid_t HTMLButtonElement_iface_tids[] = { diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index f756e08..43086f9 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -437,6 +437,11 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ return IHTMLTextAreaElement_get_disabled(&This->IHTMLTextAreaElement_iface, p); } +static BOOL HTMLTextAreaElement_is_text_edit(HTMLDOMNode *iface) +{ + return TRUE; +} + static void HTMLTextAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) { HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -474,7 +479,8 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { NULL, NULL, HTMLTextAreaElement_traverse, - HTMLTextAreaElement_unlink + HTMLTextAreaElement_unlink, + HTMLTextAreaElement_is_text_edit }; static const tid_t HTMLTextAreaElement_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 497a9e1..8529231 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -646,6 +646,7 @@ typedef struct { HRESULT (*bind_to_tree)(HTMLDOMNode*); void (*traverse)(HTMLDOMNode*,nsCycleCollectionTraversalCallback*); void (*unlink)(HTMLDOMNode*); + BOOL (*is_text_edit)(HTMLDOMNode*); } NodeImplVtbl; struct HTMLDOMNode { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8a47207..d164f1b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2538,6 +2538,18 @@ static void _test_elem_contains(unsigned line, IHTMLElement *elem, IHTMLElement ok_(__FILE__,line)(b == exval, "contains returned %x, expected %x\n", b, exval); } +#define test_elem_istextedit(a,b) _test_elem_istextedit(__LINE__,a,b) +static void _test_elem_istextedit(unsigned line, IHTMLElement *elem, VARIANT_BOOL exval) +{ + VARIANT_BOOL b; + HRESULT hres; + + b = 100; + hres = IHTMLElement_get_isTextEdit(elem, &b); + ok_(__FILE__,line)(hres == S_OK, "isTextEdit failed: %08x\n", hres); + ok_(__FILE__,line)(b == exval, "isTextEdit = %x\n", b); +} + #define get_first_child(n) _get_first_child(__LINE__,n) static IHTMLDOMNode *_get_first_child(unsigned line, IUnknown *unk) { @@ -6122,6 +6134,8 @@ static void test_defaults(IHTMLDocument2 *doc) test_body_funs(body); IHTMLBodyElement_Release(body); + test_elem_istextedit(elem, VARIANT_TRUE); + hres = IHTMLElement_get_style(elem, &style); ok(hres == S_OK, "get_style failed: %08x\n", hres); @@ -6264,6 +6278,8 @@ static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); set_button_name(elem, "button name"); + + test_elem_istextedit(elem, VARIANT_TRUE); } #define test_tr_possess(e,r,l,i) _test_tr_possess(__LINE__,e,r,l,i) @@ -7351,6 +7367,7 @@ static void test_elems(IHTMLDocument2 *doc) test_plugins_col(doc); elem = get_doc_elem(doc); + test_elem_istextedit(elem, VARIANT_FALSE); test_elem_all((IUnknown*)elem, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); IHTMLElement_Release(elem); @@ -7370,6 +7387,7 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_tabindex((IUnknown*)elem, 0); test_elem_set_tabindex((IUnknown*)elem, 1); test_elem_filters((IUnknown*)elem); + test_elem_istextedit(elem, VARIANT_FALSE); node = test_node_get_parent((IUnknown*)elem); ok(node != NULL, "node == NULL\n"); @@ -7430,6 +7448,7 @@ static void test_elems(IHTMLDocument2 *doc) test_select_elem(select); + test_elem_istextedit(elem, VARIANT_FALSE); test_elem_title((IUnknown*)select, NULL); test_elem_set_title((IUnknown*)select, "Title"); test_elem_title((IUnknown*)select, "Title"); @@ -7467,6 +7486,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); test_elem_language(elem, NULL); + test_elem_istextedit(elem, VARIANT_FALSE); if(hres == S_OK) { @@ -7530,6 +7550,7 @@ static void test_elems(IHTMLDocument2 *doc) test_input_get_disabled(input, VARIANT_FALSE); test_elem_client_size((IUnknown*)elem); test_input_type(input, "text"); + test_elem_istextedit(elem, VARIANT_TRUE); test_node_get_value_str((IUnknown*)elem, NULL); test_node_put_value_str((IUnknown*)elem, "test"); @@ -8122,6 +8143,8 @@ static void test_elems2(IHTMLDocument2 *doc) form = get_textarea_form((IUnknown*)elem); ok(!form, "form = %p\n", form); + test_elem_istextedit(elem, VARIANT_TRUE); + IHTMLElement_Release(elem); }

1 0