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

Alexandre Julliard julliard at winehq.org
Thu Oct 15 15:41:09 CDT 2020


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

Author: Michael Stefaniuc <mstefani at winehq.org>
Date:   Wed Oct 14 23:21:59 2020 +0200

msisip: Use wide-char string literals.

Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msisip/main.c | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/dlls/msisip/main.c b/dlls/msisip/main.c
index aabea78ae62..11893f149c3 100644
--- a/dlls/msisip/main.c
+++ b/dlls/msisip/main.c
@@ -52,21 +52,13 @@ static GUID mySubject = { 0x000c10f1, 0x0000, 0x0000,
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
-    static WCHAR msisip[] = { 'M','S','I','S','I','P','.','D','L','L',0 };
-    static WCHAR getSignedDataMsg[] = { 'M','s','i','S','I','P','G','e','t',
-     'S','i','g','n','e','d','D','a','t','a','M','s','g',0 };
-    static WCHAR putSignedDataMsg[] = { 'M','s','i','S','I','P','P','u','t',
-     'S','i','g','n','e','d','D','a','t','a','M','s','g',0 };
-    static WCHAR createIndirectData[] = { 'M','s','i','S','I','P',
-     'C','r','e','a','t','e','I','n','d','i','r','e','c','t','D','a','t','a',
-     0 };
-    static WCHAR verifyIndirectData[] = { 'M','s','i','S','I','P',
-     'V','e','r','i','f','y','I','n','d','i','r','e','c','t','D','a','t','a',
-     0 };
-    static WCHAR removeSignedDataMsg[] = { 'M','s','i','S','I','P','R','e','m',
-     'o','v','e','S','i','g','n','e','d','D','a','t','a','M','s','g', 0 };
-    static WCHAR isMyTypeOfFile[] = { 'M','s','i','S','I','P',
-     'I','s','M','y','T','y','p','e','O','f','F','i','l','e',0 };
+    static WCHAR msisip[] = L"MSISIP.DLL";
+    static WCHAR getSignedDataMsg[] = L"MsiSIPGetSignedDataMsg";
+    static WCHAR putSignedDataMsg[] = L"MsiSIPPutSignedDataMsg";
+    static WCHAR createIndirectData[] = L"MsiSIPCreateIndirectData";
+    static WCHAR verifyIndirectData[] = L"MsiSIPVerifyIndirectData";
+    static WCHAR removeSignedDataMsg[] = L"MsiSIPRemoveSignedDataMsg";
+    static WCHAR isMyTypeOfFile[] = L"MsiSIPIsMyTypeOfFile";
 
     SIP_ADD_NEWPROVIDER prov;
 
@@ -100,8 +92,6 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo,
  DWORD *pdwEncodingType, DWORD dwIndex, DWORD *pcbSignedDataMsg,
  BYTE *pbSignedDataMsg)
 {
-    static const WCHAR digitalSig[] = { 5,'D','i','g','i','t','a','l',
-     'S','i','g','n','a','t','u','r','e',0 };
     BOOL ret = FALSE;
     IStorage *stg = NULL;
     HRESULT r;
@@ -120,7 +110,7 @@ BOOL WINAPI MsiSIPGetSignedDataMsg(SIP_SUBJECTINFO *pSubjectInfo,
         goto end;
     }
 
-    r = IStorage_OpenStream(stg, digitalSig, 0,
+    r = IStorage_OpenStream(stg, L"\5DigitalSignature", 0,
      STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stm);
     if (FAILED(r))
     {




More information about the wine-cvs mailing list