wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to implement shlwapi.AssocGetPerceivedType.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-05-12 03:36:39 +02:00
parent c3c9472eb4
commit 134b99fbb2
5 changed files with 295 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -39,8 +39,9 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [9]:**
**Bug fixes and features included in the next upcoming release [10]:**
* Add implementation for shlwapi.AssocGetPerceivedType
* Add stub for atl80.AtlIPersistPropertyBag_Save ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888))
* Add stub for fltlib.FilterLoad ([Wine Bug #38435](https://bugs.winehq.org/show_bug.cgi?id=38435))
* Add stub for winsta.WinStationEnumerateW ([Wine Bug #38102](https://bugs.winehq.org/show_bug.cgi?id=38102))

1
debian/changelog vendored
View File

@ -23,6 +23,7 @@ wine-staging (1.7.43) UNRELEASED; urgency=low
* Added patch to use POSIX implementation to enumerate directory content on
FreeBSD.
* Added patch for stub of fltlib.FilterLoad.
* Added patch to implement shlwapi.AssocGetPerceivedType.
* Removed patch to use lockfree implementation for FD cache (accepted
upstream).
* Removed patch to properly handle closing sockets during a select call

2
patches/patchinstall.sh
View File

@ -4783,8 +4783,10 @@ fi
# |
if test "$enable_shlwapi_AssocGetPerceivedType" -eq 1; then
patch_apply shlwapi-AssocGetPerceivedType/0001-shlwapi-tests-Add-tests-for-AssocGetPerceivedType.patch
patch_apply shlwapi-AssocGetPerceivedType/0002-shlwapi-Implement-AssocGetPerceivedType.patch
(
echo '+ { "Mark Jansen", "shlwapi/tests: Add tests for AssocGetPerceivedType.", 1 },';
echo '+ { "Mark Jansen", "shlwapi: Implement AssocGetPerceivedType.", 1 },';
) >> "$patchlist"
fi

289
patches/shlwapi-AssocGetPerceivedType/0002-shlwapi-Implement-AssocGetPerceivedType.patch Normal file
View File

@ -0,0 +1,289 @@
From a1f22f7261c4da3fd7aaf4012583e8ab82808be7 Mon Sep 17 00:00:00 2001
From: Mark Jansen <learn0more@gmail.com>
Date: Sun, 10 May 2015 03:38:01 +0200
Subject: shlwapi: Implement AssocGetPerceivedType.
---
dlls/shlwapi/assoc.c | 228 +++++++++++++++++++++++++++++++++++++++++++--
dlls/shlwapi/tests/assoc.c | 7 +-
2 files changed, 225 insertions(+), 10 deletions(-)
diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c
index 62c101d..38385dd 100644
--- a/dlls/shlwapi/assoc.c
+++ b/dlls/shlwapi/assoc.c
@@ -102,6 +102,174 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface)
return SHCoCreateInstance( NULL, &clsid, NULL, refiid, lpInterface );
}
+
+struct AssocPerceivedInfo
+{
+ PCWSTR Type;
+ PERCEIVED Perceived;
+ INT FlagHardcoded;
+ INT FlagSoftcoded;
+ PCWSTR Extensions;
+};
+
+static const WCHAR unspecified_exts[] = {
+ '.','l','n','k',0,
+ '.','s','e','a','r','c','h','-','m','s',0,
+ 0
+};
+
+static const WCHAR image_exts[] = {
+ '.','b','m','p',0,
+ '.','d','i','b',0,
+ '.','e','m','f',0,
+ '.','g','i','f',0,
+ '.','i','c','o',0,
+ '.','j','f','i','f',0,
+ '.','j','p','e',0,
+ '.','j','p','e','g',0,
+ '.','j','p','g',0,
+ '.','p','n','g',0,
+ '.','r','l','e',0,
+ '.','t','i','f',0,
+ '.','t','i','f','f',0,
+ '.','w','m','f',0,
+ 0
+};
+
+static const WCHAR audio_exts[] = {
+ '.','a','i','f',0,
+ '.','a','i','f','c',0,
+ '.','a','i','f','f',0,
+ '.','a','u',0,
+ '.','m','3','u',0,
+ '.','m','i','d',0,
+ '.','m','i','d','i',0,
+#if _WIN32_WINNT > 0x602
+ '.','m','p','2',0,
+#endif
+ '.','m','p','3',0,
+ '.','r','m','i',0,
+ '.','s','n','d',0,
+ '.','w','a','v',0,
+ '.','w','a','x',0,
+ '.','w','m','a',0,
+ 0
+};
+
+static const WCHAR video_exts[] = {
+ '.','a','s','f',0,
+ '.','a','s','x',0,
+ '.','a','v','i',0,
+ '.','d','v','r','-','m','s',0,
+ '.','I','V','F',0,
+ '.','m','1','v',0,
+#if _WIN32_WINNT <= 0x602
+ '.','m','p','2',0,
+#endif
+ '.','m','p','2','v',0,
+ '.','m','p','a',0,
+ '.','m','p','e',0,
+ '.','m','p','e','g',0,
+ '.','m','p','g',0,
+ '.','m','p','v','2',0,
+ '.','w','m',0,
+ '.','w','m','v',0,
+ '.','w','m','x',0,
+ '.','w','v','x',0,
+ 0
+};
+
+static const WCHAR compressed_exts[] = {
+ '.','z','i','p',0,
+ 0
+};
+
+static const WCHAR document_exts[] = {
+#if _WIN32_WINNT >= 0x600
+ '.','h','t','m',0,
+ '.','h','t','m','l',0,
+#endif
+ '.','m','h','t',0,
+ 0
+};
+
+static const WCHAR system_exts[] = {
+ '.','c','p','l',0,
+ 0
+};
+
+static const WCHAR application_exts[] = {
+ '.','b','a','s',0,
+ '.','b','a','t',0,
+ '.','c','m','d',0,
+ '.','c','o','m',0,
+ '.','e','x','e',0,
+ '.','h','t','a',0,
+ '.','m','s','i',0,
+ '.','p','i','f',0,
+ '.','r','e','g',0,
+ '.','s','c','r',0,
+ '.','v','b',0,
+ 0
+};
+
+const WCHAR type_text[] = {'t','e','x','t',0};
+const WCHAR type_image[] = {'i','m','a','g','e',0};
+const WCHAR type_audio[] = {'a','u','d','i','o',0};
+const WCHAR type_video[] = {'v','i','d','e','o',0};
+const WCHAR type_compressed[] = {'c','o','m','p','r','e','s','s','e','d',0};
+const WCHAR type_document[] = {'d','o','c','u','m','e','n','t',0};
+const WCHAR type_system[] = {'s','y','s','t','e','m',0};
+const WCHAR type_application[] = {'a','p','p','l','i','c','a','t','i','o','n',0};
+
+#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK)
+#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS)
+#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER)
+#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT)
+
+static const struct AssocPerceivedInfo known_types[] = {
+ { NULL, PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, unspecified_exts },
+ { type_text, PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_HARDCODED, SOFTCODED_NATIVESUPPORT, NULL },
+ { type_image, PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, PERCEIVEDFLAG_SOFTCODED, image_exts },
+ { type_audio, PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, audio_exts },
+ { type_video, PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, video_exts },
+ { type_compressed, PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, PERCEIVEDFLAG_SOFTCODED, compressed_exts },
+ { type_document, PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, document_exts },
+ { type_system, PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, system_exts },
+ { type_application, PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, application_exts },
+};
+
+static const struct AssocPerceivedInfo* AssocFindByBuiltinExtension(LPCWSTR pszExt)
+{
+ UINT n;
+ for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n)
+ {
+ PCWSTR Ext = known_types[n].Extensions;
+ while (Ext && *Ext)
+ {
+ if (!StrCmpIW(Ext, pszExt))
+ return &known_types[n];
+ Ext += (strlenW(Ext) + 1);
+ }
+ }
+ return NULL;
+}
+
+static const struct AssocPerceivedInfo* AssocFindByType(LPCWSTR pszType)
+{
+ UINT n;
+ for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n)
+ {
+ if (known_types[n].Type)
+ {
+ if (!StrCmpIW(known_types[n].Type, pszType))
+ return &known_types[n];
+ }
+ }
+ return NULL;
+}
+
+
/*************************************************************************
* AssocGetPerceivedType [SHLWAPI.@]
*
@@ -123,18 +291,64 @@ HRESULT WINAPI AssocCreate(CLSID clsid, REFIID refiid, void **lpInterface)
* lppszType is optional and it can be NULL.
* if lpType or lpFlag are NULL, the function will crash.
* if lpszExt is NULL, an error is returned.
- *
- * BUGS
- * Unimplemented.
*/
HRESULT WINAPI AssocGetPerceivedType(LPCWSTR lpszExt, PERCEIVED *lpType,
INT *lpFlag, LPWSTR *lppszType)
{
- FIXME("(%s, %p, %p, %p) not supported\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType);
+ static const WCHAR PerceivedTypeKey[] = {'P','e','r','c','e','i','v','e','d','T','y','p','e',0};
+ static const WCHAR SystemFileAssociationsKey[] = {'S','y','s','t','e','m','F','i','l','e',
+ 'A','s','s','o','c','i','a','t','i','o','n','s','\\','%','s',0};
+ const struct AssocPerceivedInfo *Info;
+
+ TRACE("(%s,%p,%p,%p)\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType);
- if (lpType) *lpType = PERCEIVED_TYPE_UNSPECIFIED;
- if (lpFlag) *lpFlag = PERCEIVEDFLAG_UNDEFINED;
- return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
+ Info = AssocFindByBuiltinExtension(lpszExt);
+ if (Info)
+ {
+ *lpType = Info->Perceived;
+ *lpFlag = Info->FlagHardcoded;
+ }
+ else
+ {
+ WCHAR Buffer[100] = { 0 };
+ DWORD Size = sizeof(Buffer);
+ if (SUCCEEDED(RegGetValueW(HKEY_CLASSES_ROOT, lpszExt, PerceivedTypeKey,
+ RRF_RT_REG_SZ, NULL, Buffer, &Size)))
+ {
+ Info = AssocFindByType(Buffer);
+ }
+ if (!Info)
+ {
+ WCHAR KeyName[MAX_PATH] = { 0 };
+ snprintfW(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt);
+ Size = sizeof(Buffer);
+ if (SUCCEEDED(RegGetValueW(HKEY_CLASSES_ROOT, KeyName, PerceivedTypeKey,
+ RRF_RT_REG_SZ, NULL, Buffer, &Size)))
+ {
+ Info = AssocFindByType(Buffer);
+ }
+ }
+ if (Info)
+ {
+ *lpType = Info->Perceived;
+ *lpFlag = Info->FlagSoftcoded;
+ }
+ }
+
+ if (Info)
+ {
+ if (lppszType && Info->Type)
+ {
+ return SHStrDupW(Info->Type, lppszType);
+ }
+ return Info->Type ? S_OK : E_FAIL;
+ }
+ else
+ {
+ *lpType = PERCEIVED_TYPE_UNSPECIFIED;
+ *lpFlag = 0;
+ }
+ return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
}
/*************************************************************************
diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c
index 2b4e0ad..b4576d9 100644
--- a/dlls/shlwapi/tests/assoc.c
+++ b/dlls/shlwapi/tests/assoc.c
@@ -560,8 +560,10 @@ static void test_assoc_perceived(void)
{
if (assoc_perceived_types[i].minversion && assoc_perceived_types[i].minversion > version)
continue;
- todo_wine
- test_assoc_one(&assoc_perceived_types[i]);
+ if (!(assoc_perceived_types[i].flags & PERCEIVEDFLAG_HARDCODED))
+ todo_wine test_assoc_one(&assoc_perceived_types[i]);
+ else
+ test_assoc_one(&assoc_perceived_types[i]);
}
/* below Vista */
@@ -576,7 +578,6 @@ static void test_assoc_perceived(void)
/* below Win8 */
if (version < 0x602)
{
- todo_wine
test_assoc_one(&mp2);
}
}
--
2.4.0

1
patches/shlwapi-AssocGetPerceivedType/definition Normal file
View File

@ -0,0 +1 @@
Fixes: Add implementation for shlwapi.AssocGetPerceivedType