msi: Convert 45 initializations of static const WCHAR towards towards using wide strings.

Gerald Pfeifer gerald at pfeifer.com
Fri Oct 23 18:25:50 CDT 2015


The u"string" format is easier to write, read, and maintain than
the {'s','t','r','i','n','g'} format.

Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
---
 dlls/msi/msipriv.h | 90 +++++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index d457a54..1efbf2f 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -1099,51 +1099,51 @@ extern void msi_ui_progress(MSIPACKAGE *, int, int, int, int) DECLSPEC_HIDDEN;
 extern void msi_ui_actiondata(MSIPACKAGE *, const WCHAR *, MSIRECORD *) DECLSPEC_HIDDEN;
 
 /* common strings */
-static const WCHAR szSourceDir[] = {'S','o','u','r','c','e','D','i','r',0};
-static const WCHAR szSOURCEDIR[] = {'S','O','U','R','C','E','D','I','R',0};
-static const WCHAR szRootDrive[] = {'R','O','O','T','D','R','I','V','E',0};
-static const WCHAR szTargetDir[] = {'T','A','R','G','E','T','D','I','R',0};
-static const WCHAR szLocalSid[] = {'S','-','1','-','5','-','1','8',0};
-static const WCHAR szAllSid[] = {'S','-','1','-','1','-','0',0};
-static const WCHAR szEmpty[] = {0};
-static const WCHAR szAll[] = {'A','L','L',0};
-static const WCHAR szOne[] = {'1',0};
-static const WCHAR szZero[] = {'0',0};
-static const WCHAR szSpace[] = {' ',0};
-static const WCHAR szBackSlash[] = {'\\',0};
-static const WCHAR szForwardSlash[] = {'/',0};
-static const WCHAR szDot[] = {'.',0};
-static const WCHAR szDotDot[] = {'.','.',0};
-static const WCHAR szSemiColon[] = {';',0};
-static const WCHAR szPreselected[] = {'P','r','e','s','e','l','e','c','t','e','d',0};
-static const WCHAR szPatches[] = {'P','a','t','c','h','e','s',0};
-static const WCHAR szState[] = {'S','t','a','t','e',0};
-static const WCHAR szMsi[] = {'m','s','i',0};
-static const WCHAR szPatch[] = {'P','A','T','C','H',0};
-static const WCHAR szSourceList[] = {'S','o','u','r','c','e','L','i','s','t',0};
-static const WCHAR szInstalled[] = {'I','n','s','t','a','l','l','e','d',0};
-static const WCHAR szReinstall[] = {'R','E','I','N','S','T','A','L','L',0};
-static const WCHAR szReinstallMode[] = {'R','E','I','N','S','T','A','L','L','M','O','D','E',0};
-static const WCHAR szRemove[] = {'R','E','M','O','V','E',0};
-static const WCHAR szUserSID[] = {'U','s','e','r','S','I','D',0};
-static const WCHAR szProductCode[] = {'P','r','o','d','u','c','t','C','o','d','e',0};
-static const WCHAR szRegisterClassInfo[] = {'R','e','g','i','s','t','e','r','C','l','a','s','s','I','n','f','o',0};
-static const WCHAR szRegisterProgIdInfo[] = {'R','e','g','i','s','t','e','r','P','r','o','g','I','d','I','n','f','o',0};
-static const WCHAR szRegisterExtensionInfo[] = {'R','e','g','i','s','t','e','r','E','x','t','e','n','s','i','o','n','I','n','f','o',0};
-static const WCHAR szRegisterMIMEInfo[] = {'R','e','g','i','s','t','e','r','M','I','M','E','I','n','f','o',0};
-static const WCHAR szDuplicateFiles[] = {'D','u','p','l','i','c','a','t','e','F','i','l','e','s',0};
-static const WCHAR szRemoveDuplicateFiles[] = {'R','e','m','o','v','e','D','u','p','l','i','c','a','t','e','F','i','l','e','s',0};
-static const WCHAR szInstallFiles[] = {'I','n','s','t','a','l','l','F','i','l','e','s',0};
-static const WCHAR szPatchFiles[] = {'P','a','t','c','h','F','i','l','e','s',0};
-static const WCHAR szRemoveFiles[] = {'R','e','m','o','v','e','F','i','l','e','s',0};
-static const WCHAR szFindRelatedProducts[] = {'F','i','n','d','R','e','l','a','t','e','d','P','r','o','d','u','c','t','s',0};
-static const WCHAR szAllUsers[] = {'A','L','L','U','S','E','R','S',0};
-static const WCHAR szCustomActionData[] = {'C','u','s','t','o','m','A','c','t','i','o','n','D','a','t','a',0};
-static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0};
-static const WCHAR szProductID[] = {'P','r','o','d','u','c','t','I','D',0};
-static const WCHAR szPIDTemplate[] = {'P','I','D','T','e','m','p','l','a','t','e',0};
-static const WCHAR szPIDKEY[] = {'P','I','D','K','E','Y',0};
-static const WCHAR szTYPELIB[] = {'T','Y','P','E','L','I','B',0};
+static const WCHAR szSourceDir[] = u"SourceDir";
+static const WCHAR szSOURCEDIR[] = u"SOURCEDIR";
+static const WCHAR szRootDrive[] = u"ROOTDRIVE";
+static const WCHAR szTargetDir[] = u"TARGETDIR";
+static const WCHAR szLocalSid[] = u"S-1-5-18";
+static const WCHAR szAllSid[] = u"S-1-1-0";
+static const WCHAR szEmpty[] = u"";
+static const WCHAR szAll[] = u"ALL";
+static const WCHAR szOne[] = u"1";
+static const WCHAR szZero[] = u"0";
+static const WCHAR szSpace[] = u" ";
+static const WCHAR szBackSlash[] = u"\\";
+static const WCHAR szForwardSlash[] = u"/";
+static const WCHAR szDot[] = u".";
+static const WCHAR szDotDot[] = u"..";
+static const WCHAR szSemiColon[] = u";";
+static const WCHAR szPreselected[] = u"Preselected";
+static const WCHAR szPatches[] = u"Patches";
+static const WCHAR szState[] = u"State";
+static const WCHAR szMsi[] = u"msi";
+static const WCHAR szPatch[] = u"PATCH";
+static const WCHAR szSourceList[] = u"SourceList";
+static const WCHAR szInstalled[] = u"Installed";
+static const WCHAR szReinstall[] = u"REINSTALL";
+static const WCHAR szReinstallMode[] = u"REINSTALLMODE";
+static const WCHAR szRemove[] = u"REMOVE";
+static const WCHAR szUserSID[] = u"UserSID";
+static const WCHAR szProductCode[] = u"ProductCode";
+static const WCHAR szRegisterClassInfo[] = u"RegisterClassInfo";
+static const WCHAR szRegisterProgIdInfo[] = u"RegisterProgIdInfo";
+static const WCHAR szRegisterExtensionInfo[] = u"RegisterExtensionInfo";
+static const WCHAR szRegisterMIMEInfo[] = u"RegisterMIMEInfo";
+static const WCHAR szDuplicateFiles[] = u"DuplicateFiles";
+static const WCHAR szRemoveDuplicateFiles[] = u"RemoveDuplicateFiles";
+static const WCHAR szInstallFiles[] = u"InstallFiles";
+static const WCHAR szPatchFiles[] = u"PatchFiles";
+static const WCHAR szRemoveFiles[] = u"RemoveFiles";
+static const WCHAR szFindRelatedProducts[] = u"FindRelatedProducts";
+static const WCHAR szAllUsers[] = u"ALLUSERS";
+static const WCHAR szCustomActionData[] = u"CustomActionData";
+static const WCHAR szUILevel[] = u"UILevel";
+static const WCHAR szProductID[] = u"ProductID";
+static const WCHAR szPIDTemplate[] = u"PIDTemplate";
+static const WCHAR szPIDKEY[] = u"PIDKEY";
+static const WCHAR szTYPELIB[] = u"TYPELIB";
 static const WCHAR szSumInfo[] = {5 ,'S','u','m','m','a','r','y','I','n','f','o','r','m','a','t','i','o','n',0};
 static const WCHAR szHCR[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T','\\',0};
 static const WCHAR szHCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\',0};
-- 
2.6.1



More information about the wine-patches mailing list