Michael Stefaniuc : quartz: Use wide-char string literals.

Alexandre Julliard julliard at winehq.org
Wed Oct 7 16:04:09 CDT 2020


Module: wine
Branch: master
Commit: 1b9c43df16e97260e68eff3796c9d6b1a5850420
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1b9c43df16e97260e68eff3796c9d6b1a5850420

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Oct  7 00:51:59 2020 +0200

quartz: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/filesource.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c
index 79df639ab4..cc252c0e0e 100644
--- a/dlls/quartz/filesource.c
+++ b/dlls/quartz/filesource.c
@@ -183,9 +183,7 @@ static BOOL process_pattern_string(const WCHAR *pattern, HANDLE file)
 
 BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID *source_clsid)
 {
-    WCHAR extensions_path[278] = {'M','e','d','i','a',' ','T','y','p','e','\\','E','x','t','e','n','s','i','o','n','s','\\',0};
-    static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0};
-    static const WCHAR wszMediaType[] = {'M','e','d','i','a',' ','T','y','p','e',0};
+    WCHAR extensions_path[278] = L"Media Type\\Extensions\\";
     DWORD majortype_idx, size;
     const WCHAR *ext;
     HKEY parent_key;
@@ -223,7 +221,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID
         return FALSE;
     }
 
-    if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMediaType, 0, KEY_READ, &parent_key))
+    if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Media Type", 0, KEY_READ, &parent_key))
     {
         CloseHandle(file);
         return FALSE;
@@ -239,7 +237,7 @@ BOOL get_media_type(const WCHAR *filename, GUID *majortype, GUID *subtype, GUID
         if (RegEnumKeyExW(parent_key, majortype_idx, majortype_str, &size, NULL, NULL, NULL, NULL))
             break;
 
-        if (!wcscmp(majortype_str, wszExtensions))
+        if (!wcscmp(majortype_str, L"Extensions"))
             continue;
 
         if (RegOpenKeyExW(parent_key, majortype_str, 0, KEY_READ, &majortype_key))




More information about the wine-cvs mailing list