wine-commits December 2014

wine-commits@winehq.org

2 participants
319 discussions

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

23 Dec '14

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: Skip query and hash part in find_mime_from_url.
by Alexandre Julliard 23 Dec '14

23 Dec '14

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

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 23 Dec '14

23 Dec '14

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: Store URLs as const char* in mime_tests.
by Alexandre Julliard 22 Dec '14

22 Dec '14

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

Austin English : version: Add stubs for GetFileVersionInfoSizeExA/W.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: caaf6aafa96d1f8ac72f5e019c4c97ef3d1958e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caaf6aafa96d1f8ac72f5e019… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Dec 20 13:39:54 2014 -0600 version: Add stubs for GetFileVersionInfoSizeExA/W. --- .../api-ms-win-downlevel-version-l1-1-0.spec | 2 +- dlls/version/version.c | 20 ++++++++++++++++++++ dlls/version/version.spec | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec index e99d8a0..46eac31 100644 --- a/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-version-l1-1-0/api-ms-win-downlevel-version-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub GetFileVersionInfoExW -@ stub GetFileVersionInfoSizeExW +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) version.GetFileVersionInfoSizeExW @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) version.VerFindFileA @ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr) version.VerFindFileW @ stdcall VerQueryValueA(ptr str ptr ptr) version.VerQueryValueA diff --git a/dlls/version/version.c b/dlls/version/version.c index 58fd029..121ed8f 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1613,3 +1613,23 @@ DWORD WINAPI VerInstallFileW( HeapFree( GetProcessHeap(), 0, wcurd ); return ret; } + +/****************************************************************************** + * GetFileVersionInfoSizeExA [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExA(DWORD flags, LPCSTR filename, LPDWORD handle) +{ + FIXME("stub: %u %s %p\n", flags, wine_dbgstr_a(filename), handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/****************************************************************************** + * GetFileVersionInfoSizeExW [VERSION.@] + */ +DWORD WINAPI GetFileVersionInfoSizeExW(DWORD flags, LPCWSTR filename, LPDWORD handle) +{ + FIXME("stub: %u %s %p\n", flags, wine_dbgstr_w(filename), handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/version/version.spec b/dlls/version/version.spec index 0bd9427..b512e48 100644 --- a/dlls/version/version.spec +++ b/dlls/version/version.spec @@ -1,6 +1,8 @@ @ stdcall GetFileVersionInfoA(str long long ptr) @ stdcall GetFileVersionInfoSizeA(str ptr) @ stdcall GetFileVersionInfoSizeW(wstr ptr) +@ stdcall GetFileVersionInfoSizeExA(long str ptr) +@ stdcall GetFileVersionInfoSizeExW(long wstr ptr) @ stdcall GetFileVersionInfoW(wstr long long ptr) @ stdcall VerFindFileA(long str str str ptr ptr ptr ptr) @ stdcall VerFindFileW(long wstr wstr wstr ptr ptr ptr ptr)

1 0

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

22 Dec '14

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

Hugh McMaster : msvcrt: Fix a spelling error.
by Alexandre Julliard 22 Dec '14

22 Dec '14

Module: wine Branch: master Commit: 828a46898d7e684748ffbd1f3aaddb6e6ac7b5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828a46898d7e684748ffbd1f3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Dec 22 12:16:59 2014 +1100 msvcrt: Fix a spelling error. --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 8a41d3e..80133d6 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -398,7 +398,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API p++; } - /* parse the widh */ + /* parse the width */ if(*p == '*') { p++; if(positional_params && (q = FUNC_NAME(pf_parse_int)(p, &i)) && *q=='$')

1 0

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

22 Dec '14

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 22 Dec '14

22 Dec '14

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 22 Dec '14

22 Dec '14

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

← Newer
1
2
3
4
5
6
7
8
9
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2014