[PATCH v2 0/1] MR3630: msi: Use CreateFileW() for handling path from cabinet_open() instead.

[Jactry Zeng (＠jactry)]

This fixes an issue while the path includes non-ASCII characters.

--
  v2: msi: Use CreateFileW() for handling path from cabinet_open() instead.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3630

[PATCH v2 1/1] msi: Use CreateFileW() for handling path from cabinet_open() instead.

[Jactry Zeng]

From: Jactry Zeng <jzeng(a)codeweavers.com>

---
 dlls/msi/media.c   | 12 ++++++++----
 dlls/msi/msipriv.h | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index 50673f99cae..ecc51e60a4e 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -109,6 +109,8 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode)
     DWORD dwAccess = 0;
     DWORD dwShareMode = 0;
     DWORD dwCreateDisposition = OPEN_EXISTING;
+    HANDLE handle;
+    WCHAR *path;
 
     switch (oflag & _O_ACCMODE)
     {
@@ -131,8 +133,10 @@ static INT_PTR CDECL cabinet_open(char *pszFile, int oflag, int pmode)
     else if (oflag & _O_CREAT)
         dwCreateDisposition = CREATE_ALWAYS;
 
-    return (INT_PTR)CreateFileA(pszFile, dwAccess, dwShareMode, NULL,
-                                dwCreateDisposition, 0, NULL);
+    path = strdupUtoW(pszFile);
+    handle = CreateFileW(path, dwAccess, dwShareMode, NULL, dwCreateDisposition, 0, NULL);
+    free(path);
+    return (INT_PTR)handle;
 }
 
 static UINT CDECL cabinet_read(INT_PTR hf, void *pv, UINT cb)
@@ -577,11 +581,11 @@ static BOOL extract_cabinet( MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data
         return FALSE;
     }
 
-    cabinet = strdupWtoA( mi->cabinet );
+    cabinet = strdupWtoU( mi->cabinet );
     if (!cabinet)
         goto done;
 
-    cab_path = strdupWtoA( mi->sourcedir );
+    cab_path = strdupWtoU( mi->sourcedir );
     if (!cab_path)
         goto done;
 
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index 89495b5a6a5..85cc5e257a7 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -1168,4 +1168,30 @@ static inline LPWSTR strdupAtoW( LPCSTR str )
     return ret;
 }
 
+static inline char *strdupWtoU( LPCWSTR str )
+{
+    LPSTR ret = NULL;
+    DWORD len;
+
+    if (!str) return ret;
+    len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL);
+    ret = malloc( len );
+    if (ret)
+        WideCharToMultiByte( CP_UTF8, 0, str, -1, ret, len, NULL, NULL );
+    return ret;
+}
+
+static inline LPWSTR strdupUtoW( LPCSTR str )
+{
+    LPWSTR ret = NULL;
+    DWORD len;
+
+    if (!str) return ret;
+    len = MultiByteToWideChar( CP_UTF8, 0, str, -1, NULL, 0 );
+    ret = malloc( len * sizeof(WCHAR) );
+    if (ret)
+        MultiByteToWideChar( CP_UTF8, 0, str, -1, ret, len );
+    return ret;
+}
+
 #endif /* __WINE_MSI_PRIVATE__ */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3630