ole32: Use wide-char string literals.

dlls/ole32/classmoniker.c

@@ -519,7 +519,7 @@ static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface,
                                               LPOLESTR *ppszDisplayName)
 {
     ClassMoniker *This = impl_from_IMoniker(iface);
-    static const WCHAR wszClsidPrefix[] = {'c','l','s','i','d',':',0};
+    static const WCHAR wszClsidPrefix[] = L"clsid:";
 
     TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName);
 

dlls/ole32/clipboard.c

@@ -198,7 +198,7 @@ static inline HRESULT get_ole_clipbrd(ole_clipbrd **clipbrd)
 /*
  * Name of our registered OLE clipboard window class
  */
-static const WCHAR clipbrd_wndclass[] = {'C','L','I','P','B','R','D','W','N','D','C','L','A','S','S',0};
+static const WCHAR clipbrd_wndclass[] = L"CLIPBRDWNDCLASS";
 
 UINT ownerlink_clipboard_format = 0;
 UINT filename_clipboard_format = 0;
@@ -619,7 +619,6 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt)
 
         if (mfp)
         {
-            OLECHAR name[]={ 2, 'O', 'l', 'e', 'P', 'r', 'e', 's', '0', '0', '0', 0};
             IStream *pStream = 0;
             void *mfBits;
             PresentationDataHeader pdh;
@@ -644,7 +643,8 @@ static HRESULT render_embed_source_hack(IDataObject *data, LPFORMATETC fmt)
             pdh.dwObjectExtentY = mfp->yExt;
             pdh.dwSize = nSize;
 
-            hr = IStorage_CreateStream(std.u.pstg, name, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &pStream);
+            hr = IStorage_CreateStream(std.u.pstg, L"\2OlePres000",
+                    STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, 0, &pStream);
 
             hr = IStream_Write(pStream, &pdh, sizeof(PresentationDataHeader), NULL);
 

dlls/ole32/comcat.c

@@ -129,7 +129,7 @@ static HRESULT COMCAT_UnRegisterClassCategories(
     ULONG cCategories,
     const CATID *rgcatid)
 {
-    WCHAR keyname[68] = { 'C', 'L', 'S', 'I', 'D', '\\' };
+    WCHAR keyname[68] = L"CLSID\\";
     HRESULT res;
     HKEY type_key;
 
@@ -501,9 +501,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc(
     LCID lcid,
     PWCHAR *ppszDesc)
 {
-    WCHAR keyname[60] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n',
-			  't', ' ', 'C', 'a', 't', 'e', 'g', 'o',
-			  'r', 'i', 'e', 's', '\\', 0 };
+    WCHAR keyname[60] = L"Component Categories\\";
     HKEY key;
     HRESULT res;
 
@@ -584,7 +582,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories(
     ULONG cRequired,
     CATID *rgcatidReq)
 {
-    WCHAR keyname[45] = { 'C', 'L', 'S', 'I', 'D', '\\', 0 };
+    WCHAR keyname[45] = L"CLSID\\";
     HRESULT res;
     struct class_categories *categories;
     HKEY key;

dlls/ole32/compobj.c

@@ -245,10 +245,6 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES
     return status;
 }
 
-static const WCHAR classes_rootW[] =
-    {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e',
-     '\\','S','o','f','t','w','a','r','e','\\','C','l','a','s','s','e','s',0};
-
 static HKEY classes_root_hkey;
 
 /* create the special HKEY_CLASSES_ROOT key */
@@ -264,7 +260,7 @@ static HKEY create_classes_root_hkey(DWORD access)
     attr.Attributes = 0;
     attr.SecurityDescriptor = NULL;
     attr.SecurityQualityOfService = NULL;
-    RtlInitUnicodeString( &name, classes_rootW );
+    RtlInitUnicodeString( &name, L"\\Registry\\Machine\\Software\\Classes" );
     if (create_key( &hkey, access, &attr )) return 0;
     TRACE( "%s -> %p\n", debugstr_w(attr.ObjectName->Buffer), hkey );
 
@@ -292,9 +288,8 @@ static inline HKEY get_classes_root_hkey( HKEY hkey, REGSAM access )
         ret = create_classes_root_hkey(MAXIMUM_ALLOWED | (access & KEY_WOW64_64KEY));
     if (force_wow32 && ret && ret == classes_root_hkey)
     {
-        static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e',0};
         access &= ~KEY_WOW64_32KEY;
-        if (create_classes_key(classes_root_hkey, wow6432nodeW, access, &hkey))
+        if (create_classes_key(classes_root_hkey, L"Wow6432Node", access, &hkey))
             return 0;
         ret = hkey;
     }
@@ -530,13 +525,12 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved)
 /* open HKCR\\CLSID\\{string form of clsid}\\{keyname} key */
 HRESULT COM_OpenKeyForCLSID(REFCLSID clsid, LPCWSTR keyname, REGSAM access, HKEY *subkey)
 {
-    static const WCHAR wszCLSIDSlash[] = {'C','L','S','I','D','\\',0};
-    WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(wszCLSIDSlash) - 1];
+    WCHAR path[CHARS_IN_GUID + ARRAY_SIZE(L"CLSID\\") - 1];
     LONG res;
     HKEY key;
 
-    lstrcpyW(path, wszCLSIDSlash);
-    StringFromGUID2(clsid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID);
+    lstrcpyW(path, L"CLSID\\");
+    StringFromGUID2(clsid, path + lstrlenW(L"CLSID\\"), CHARS_IN_GUID);
     res = open_classes_key(HKEY_CLASSES_ROOT, path, keyname ? KEY_READ : access, &key);
     if (res == ERROR_FILE_NOT_FOUND)
         return REGDB_E_CLASSNOTREG;
@@ -707,8 +701,6 @@ HRESULT WINAPI CoSetState(IUnknown * pv)
  */
 HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
 {
-    static const WCHAR wszAutoTreatAs[] = {'A','u','t','o','T','r','e','a','t','A','s',0};
-    static const WCHAR wszTreatAs[] = {'T','r','e','a','t','A','s',0};
     HKEY hkey = NULL;
     WCHAR szClsidNew[CHARS_IN_GUID];
     HRESULT res = S_OK;
@@ -722,10 +714,10 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
 
     if (IsEqualGUID( clsidOld, clsidNew ))
     {
-       if (!RegQueryValueW(hkey, wszAutoTreatAs, auto_treat_as, &auto_treat_as_size) &&
+       if (!RegQueryValueW(hkey, L"AutoTreatAs", auto_treat_as, &auto_treat_as_size) &&
            CLSIDFromString(auto_treat_as, &id) == S_OK)
        {
-           if (RegSetValueW(hkey, wszTreatAs, REG_SZ, auto_treat_as, sizeof(auto_treat_as)))
+           if (RegSetValueW(hkey, L"TreatAs", REG_SZ, auto_treat_as, sizeof(auto_treat_as)))
            {
                res = REGDB_E_WRITEREGDB;
                goto done;
@@ -733,7 +725,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
        }
        else
        {
-           if(RegDeleteKeyW(hkey, wszTreatAs))
+           if (RegDeleteKeyW(hkey, L"TreatAs"))
                res = REGDB_E_WRITEREGDB;
            goto done;
        }
@@ -741,7 +733,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
     else
     {
         if(IsEqualGUID(clsidNew, &CLSID_NULL)){
-           RegDeleteKeyW(hkey, wszTreatAs);
+           RegDeleteKeyW(hkey, L"TreatAs");
         }else{
             if(!StringFromGUID2(clsidNew, szClsidNew, ARRAY_SIZE(szClsidNew))){
                 WARN("StringFromGUID2 failed\n");
@@ -749,7 +741,7 @@ HRESULT WINAPI CoTreatAsClass(REFCLSID clsidOld, REFCLSID clsidNew)
                 goto done;
             }
 
-            if(RegSetValueW(hkey, wszTreatAs, REG_SZ, szClsidNew, sizeof(szClsidNew)) != ERROR_SUCCESS){
+            if (RegSetValueW(hkey, L"TreatAs", REG_SZ, szClsidNew, sizeof(szClsidNew)) != ERROR_SUCCESS){
                 WARN("RegSetValue failed\n");
                 res = REGDB_E_WRITEREGDB;
                 goto done;
@@ -892,12 +884,11 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst
     }
     else
     {
-        static const WCHAR dllW[] = {'.','d','l','l',0};
         ULONG_PTR cookie;
 
         *dst = 0;
         ActivateActCtx(regdata->u.actctx.hactctx, &cookie);
-        ret = SearchPathW(NULL, regdata->u.actctx.module_name, dllW, dstlen, dst, NULL);
+        ret = SearchPathW(NULL, regdata->u.actctx.module_name, L".dll", dstlen, dst, NULL);
         DeactivateActCtx(0, cookie);
         return *dst != 0;
     }
@@ -905,11 +896,10 @@ static BOOL get_object_dll_path(const struct class_reg_data *regdata, WCHAR *dst
 
 HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
-    static const WCHAR wszInprocHandler32[] = {'I','n','p','r','o','c','H','a','n','d','l','e','r','3','2',0};
     HKEY hkey;
     HRESULT hres;
 
-    hres = COM_OpenKeyForCLSID(rclsid, wszInprocHandler32, KEY_READ, &hkey);
+    hres = COM_OpenKeyForCLSID(rclsid, L"InprocHandler32", KEY_READ, &hkey);
     if (SUCCEEDED(hres))
     {
         struct class_reg_data regdata;
@@ -920,8 +910,7 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 
         if (get_object_dll_path(&regdata, dllpath, ARRAY_SIZE(dllpath)))
         {
-            static const WCHAR wszOle32[] = {'o','l','e','3','2','.','d','l','l',0};
-            if (!wcsicmp(dllpath, wszOle32))
+            if (!wcsicmp(dllpath, L"ole32.dll"))
             {
                 RegCloseKey(hkey);
                 return HandlerCF_Create(rclsid, riid, ppv);

dlls/ole32/datacache.c

@@ -530,8 +530,6 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat)
     return hr;
 }
 
-static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0};
-
 static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm )
 {
     WCHAR pres[] = {2,'O','l','e','P','r','e','s',
@@ -541,7 +539,7 @@ static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm
     const WCHAR *name = pres;
 
     if (stream_number == STREAM_NUMBER_NOT_SET) return E_FAIL;
-    if (stream_number == STREAM_NUMBER_CONTENTS) name = CONTENTS;
+    if (stream_number == STREAM_NUMBER_CONTENTS) name = L"CONTENTS";
 
     return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm );
 }
@@ -1089,7 +1087,7 @@ static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage,
     const WCHAR *name;
 
     if (contents)
-        name = CONTENTS;
+        name = L"CONTENTS";
     else
         name = pres;
 

dlls/ole32/defaulthandler.c

@@ -1758,7 +1758,6 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_IsDirty(
  * BYTE  data[] - moniker data for a link
  */
 
-static const WCHAR OleStream[] = {1,'O','l','e',0};
 typedef struct
 {
     DWORD version;
@@ -1774,7 +1773,7 @@ static HRESULT load_ole_stream(DefaultHandler *This, IStorage *storage)
     IStream *stream;
     HRESULT hr;
 
-    hr = IStorage_OpenStream(storage, OleStream, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream);
+    hr = IStorage_OpenStream(storage, L"\1Ole", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream);
 
     if(SUCCEEDED(hr))
     {

dlls/ole32/itemmoniker.c

@@ -1055,7 +1055,6 @@ failed:
 
 HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv)
 {
-    static const WCHAR emptyW[] = { 0 };
     IMoniker *moniker;
     HRESULT hr;
 
@@ -1066,7 +1065,7 @@ HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *outer,
     if (outer)
         return CLASS_E_NOAGGREGATION;
 
-    if (FAILED(hr = CreateItemMoniker(emptyW, emptyW, &moniker)))
+    if (FAILED(hr = CreateItemMoniker(L"", L"", &moniker)))
         return hr;
 
     hr = IMoniker_QueryInterface(moniker, riid, ppv);

dlls/ole32/moniker.c

@@ -915,8 +915,6 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid)
     LONG sizeProgId, ret;
     LPOLESTR *pathDec=0,absFile=0,progId=0;
     LPWSTR extension;
-    static const WCHAR bkslashW[] = {'\\',0};
-    static const WCHAR dotW[] = {'.',0};
 
     TRACE("%s, %p\n", debugstr_w(filePathName), pclsid);
 
@@ -962,7 +960,7 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid)
     absFile=pathDec[nbElm-1];
 
     /* failed if the path represents a directory and not an absolute file name*/
-    if (!wcscmp(absFile, bkslashW)) {
+    if (!wcscmp(absFile, L"\\")) {
         CoTaskMemFree(pathDec);
         return MK_E_INVALIDEXTENSION;
     }
@@ -973,7 +971,7 @@ HRESULT WINAPI GetClassFile(LPCOLESTR filePathName,CLSID *pclsid)
     for(i = length-1; (i >= 0) && *(extension = &absFile[i]) != '.'; i--)
         /* nothing */;
 
-    if (!extension || !wcscmp(extension, dotW)) {
+    if (!extension || !wcscmp(extension, L".")) {
         CoTaskMemFree(pathDec);
         return MK_E_INVALIDEXTENSION;
     }

dlls/ole32/ole2.c

@@ -101,24 +101,18 @@ static LONG OLE_moduleLockCount = 0;
 /*
  * Name of our registered window class.
  */
-static const WCHAR OLEDD_DRAGTRACKERCLASS[] =
-  {'W','i','n','e','D','r','a','g','D','r','o','p','T','r','a','c','k','e','r','3','2',0};
+static const WCHAR OLEDD_DRAGTRACKERCLASS[] = L"WineDragDropTracker32";
 
 /*
  * Name of menu descriptor property.
  */
-static const WCHAR prop_olemenuW[] =
-  {'P','R','O','P','_','O','L','E','M','e','n','u','D','e','s','c','r','i','p','t','o','r',0};
+static const WCHAR prop_olemenuW[] = L"PROP_OLEMenuDescriptor";
 
 /* property to store IDropTarget pointer */
-static const WCHAR prop_oledroptarget[] =
-  {'O','l','e','D','r','o','p','T','a','r','g','e','t','I','n','t','e','r','f','a','c','e',0};
+static const WCHAR prop_oledroptarget[] = L"OleDropTargetInterface";
 
 /* property to store Marshalled IDropTarget pointer */
-static const WCHAR prop_marshalleddroptarget[] =
-  {'W','i','n','e','M','a','r','s','h','a','l','l','e','d','D','r','o','p','T','a','r','g','e','t',0};
-
-static const WCHAR emptyW[] = { 0 };
+static const WCHAR prop_marshalleddroptarget[] = L"WineMarshalledDropTarget";
 
 /******************************************************************************
  * These are the prototypes of miscellaneous utility methods
@@ -669,7 +663,6 @@ HRESULT WINAPI RevokeDragDrop(HWND hwnd)
  */
 HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype)
 {
-  static const WCHAR auxusertypeW[] = {'A','u','x','U','s','e','r','T','y','p','e','\\','%','d',0};
   DWORD valuetype, valuelen;
   WCHAR auxkeynameW[16];
   HKEY    usertypekey;
@@ -695,10 +688,10 @@ HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype)
   {
     HKEY auxkey;
 
-    swprintf(auxkeynameW, ARRAY_SIZE(auxkeynameW), auxusertypeW, form);
+    swprintf(auxkeynameW, ARRAY_SIZE(auxkeynameW), L"AuxUserType\\%d", form);
     if (COM_OpenKeyForCLSID(clsid, auxkeynameW, KEY_READ, &auxkey) == S_OK)
     {
-      if (!RegQueryValueExW(auxkey, emptyW, NULL, &valuetype, NULL, &valuelen) && valuelen)
+      if (!RegQueryValueExW(auxkey, L"", NULL, &valuetype, NULL, &valuelen) && valuelen)
       {
         RegCloseKey(usertypekey);
         usertypekey = auxkey;
@@ -709,7 +702,7 @@ HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype)
   }
 
   valuelen = 0;
-  if (RegQueryValueExW(usertypekey, emptyW, NULL, &valuetype, NULL, &valuelen))
+  if (RegQueryValueExW(usertypekey, L"", NULL, &valuetype, NULL, &valuelen))
   {
     RegCloseKey(usertypekey);
     return REGDB_E_READREGDB;
@@ -722,12 +715,7 @@ HRESULT WINAPI OleRegGetUserType(REFCLSID clsid, DWORD form, LPOLESTR *usertype)
     return E_OUTOFMEMORY;
   }
 
-  ret = RegQueryValueExW(usertypekey,
-			  emptyW,
-			  NULL,
-			  &valuetype,
-			  (LPBYTE)*usertype,
-			  &valuelen);
+  ret = RegQueryValueExW(usertypekey, L"", NULL, &valuetype, (BYTE *)*usertype, &valuelen);
   RegCloseKey(usertypekey);
   if (ret != ERROR_SUCCESS)
   {
@@ -748,7 +736,6 @@ HRESULT WINAPI DoDragDrop (
   DWORD       dwOKEffect,    /* [in] effects allowed by the source */
   DWORD       *pdwEffect)    /* [out] ptr to effects of the source */
 {
-  static const WCHAR trackerW[] = {'T','r','a','c','k','e','r','W','i','n','d','o','w',0};
   TrackerWindowInfo trackerInfo;
   HWND            hwndTrackWindow;
   MSG             msg;
@@ -772,7 +759,7 @@ HRESULT WINAPI DoDragDrop (
   trackerInfo.curTargetHWND     = 0;
   trackerInfo.curDragTarget     = 0;
 
-  hwndTrackWindow = CreateWindowW(OLEDD_DRAGTRACKERCLASS, trackerW,
+  hwndTrackWindow = CreateWindowW(OLEDD_DRAGTRACKERCLASS, L"TrackerWindow",
                                   WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT,
                                   CW_USEDEFAULT, CW_USEDEFAULT, 0, 0, 0,
                                   &trackerInfo);
@@ -856,8 +843,6 @@ HRESULT WINAPI OleRegGetMiscStatus(
   DWORD    dwAspect,
   DWORD*   pdwStatus)
 {
-  static const WCHAR miscstatusW[] = {'M','i','s','c','S','t','a','t','u','s',0};
-  static const WCHAR dfmtW[] = {'%','d',0};
   WCHAR   keyName[16];
   HKEY    miscStatusKey;
   HKEY    aspectKey;
@@ -872,7 +857,7 @@ HRESULT WINAPI OleRegGetMiscStatus(
 
   if (actctx_get_miscstatus(clsid, dwAspect, pdwStatus)) return S_OK;
 
-  hr = COM_OpenKeyForCLSID(clsid, miscstatusW, KEY_READ, &miscStatusKey);
+  hr = COM_OpenKeyForCLSID(clsid, L"MiscStatus", KEY_READ, &miscStatusKey);
   if (FAILED(hr))
     /* missing key is not a failure */
     return hr == REGDB_E_KEYMISSING ? S_OK : hr;
@@ -882,7 +867,7 @@ HRESULT WINAPI OleRegGetMiscStatus(
   /*
    * Open the key specific to the requested aspect.
    */
-  swprintf(keyName, ARRAY_SIZE(keyName), dfmtW, dwAspect);
+  swprintf(keyName, ARRAY_SIZE(keyName), L"%d", dwAspect);
 
   result = open_classes_key(miscStatusKey, keyName, KEY_READ, &aspectKey);
   if (result == ERROR_SUCCESS)
@@ -1117,11 +1102,10 @@ HRESULT WINAPI OleRegEnumVerbs (REFCLSID clsid, LPENUMOLEVERB* ppenum)
     LONG res;
     HKEY hkeyVerb;
     DWORD dwSubKeys;
-    static const WCHAR wszVerb[] = {'V','e','r','b',0};
 
     TRACE("(%s, %p)\n", debugstr_guid(clsid), ppenum);
 
-    res = COM_OpenKeyForCLSID(clsid, wszVerb, KEY_READ, &hkeyVerb);
+    res = COM_OpenKeyForCLSID(clsid, L"Verb", KEY_READ, &hkeyVerb);
     if (FAILED(res))
     {
         if (res == REGDB_E_CLASSNOTREG)
@@ -2402,12 +2386,7 @@ static void OLEUTL_ReadRegistryDWORDValue(
   DWORD dwKeyType;
   LONG  lres;
 
-  lres = RegQueryValueExW(regKey,
-			  emptyW,
-			  NULL,
-			  &dwKeyType,
-			  (LPBYTE)buffer,
-			  &cbData);
+  lres = RegQueryValueExW(regKey, L"", NULL, &dwKeyType, (BYTE *)buffer, &cbData);
 
   if (lres==ERROR_SUCCESS)
   {
@@ -2573,13 +2552,12 @@ HRESULT WINAPI OleCreate(
  */
 HRESULT WINAPI OleGetAutoConvert(REFCLSID clsidOld, LPCLSID pClsidNew)
 {
-    static const WCHAR wszAutoConvertTo[] = {'A','u','t','o','C','o','n','v','e','r','t','T','o',0};
     HKEY hkey = NULL;
     WCHAR buf[CHARS_IN_GUID];
     LONG len;
     HRESULT res = S_OK;
 
-    res = COM_OpenKeyForCLSID(clsidOld, wszAutoConvertTo, KEY_READ, &hkey);
+    res = COM_OpenKeyForCLSID(clsidOld, L"AutoConvertTo", KEY_READ, &hkey);
     if (FAILED(res))
         goto done;
 
@@ -2600,7 +2578,6 @@ done:
  */
 HRESULT WINAPI OleSetAutoConvert(REFCLSID clsidOld, REFCLSID clsidNew)
 {
-    static const WCHAR wszAutoConvertTo[] = {'A','u','t','o','C','o','n','v','e','r','t','T','o',0};
     HKEY hkey = NULL;
     WCHAR szClsidNew[CHARS_IN_GUID];
     HRESULT res = S_OK;
@@ -2611,7 +2588,7 @@ HRESULT WINAPI OleSetAutoConvert(REFCLSID clsidOld, REFCLSID clsidNew)
     if (FAILED(res))
         goto done;
     StringFromGUID2(clsidNew, szClsidNew, CHARS_IN_GUID);
-    if (RegSetValueW(hkey, wszAutoConvertTo, REG_SZ, szClsidNew, (lstrlenW(szClsidNew)+1) * sizeof(WCHAR)))
+    if (RegSetValueW(hkey, L"AutoConvertTo", REG_SZ, szClsidNew, (lstrlenW(szClsidNew)+1) * sizeof(WCHAR)))
     {
         res = REGDB_E_WRITEREGDB;
 	goto done;

dlls/ole32/stg_prop.c

@@ -2991,10 +2991,8 @@ static const IPropertyStorageVtbl IPropertyStorage_Vtbl =
 /***********************************************************************
  * Format ID <-> name conversion
  */
-static const WCHAR szSummaryInfo[] = { 5,'S','u','m','m','a','r','y',
- 'I','n','f','o','r','m','a','t','i','o','n',0 };
-static const WCHAR szDocSummaryInfo[] = { 5,'D','o','c','u','m','e','n','t',
- 'S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0 };
+static const WCHAR szSummaryInfo[] = L"\5SummaryInformation";
+static const WCHAR szDocSummaryInfo[] = L"\5DocumentSummaryInformation";
 
 #define BITS_PER_BYTE    8
 #define CHARMASK         0x1f