Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] Fix CAB codepage handling (#7165)

Browse source 
- MultiByteToWide parameter bug.
- Use CP_UTF8 to convert cab filenames if the UTF attribute is set.
This commit is contained in:
Whindmar Saksit 2024-07-22 16:20:31 +02:00 committed by GitHub
parent 7f0e8a3697
commit a45d375f60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/applications/rapps/cabinet.cpp
View file

@ -47,7 +47,7 @@ MultiByteToWide(const CStringA &szSource, CStringW &szDest, UINT Codepage)
return FALSE;
// do the actual conversion
sz = MultiByteToWideChar(CP_UTF8, 0, szSource, -1, szDest.GetBuffer(sz), sz);
sz = MultiByteToWideChar(Codepage, 0, szSource, -1, szDest.GetBuffer(sz), sz);
szDest.ReleaseBuffer();
return sz != 0;
@ -160,7 +160,8 @@ FNFDINOTIFY(fnNotify)
// Append the destination directory to the file name.
MultiByteToWide(pND->OutputDir, szExtractDir, CP_UTF8);
MultiByteToWide(pfdin->psz1, szCabFileName, CP_ACP);
UINT codepage = (pfdin->attribs & _A_NAME_IS_UTF) ? CP_UTF8 : CP_ACP;
MultiByteToWide(pfdin->psz1, szCabFileName, codepage);
if (!NotifyFileExtractCallback(szCabFileName, pfdin->cb, pfdin->attribs,
pND->Callback, pND->CallerCookie))