dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

zip files created on Windows use the OEM code page - conversion to ANSI code page added

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3567 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-06-18 18:58:56 +00:00
parent d2ba6bd725
commit 6b7c67458d
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Contrib/zip2exe/main.cpp
View file

@ -164,7 +164,21 @@ int tempzip_make(HWND hwndDlg, char *fn)
g_extracting=1;
do {
char filename[MAX_PATH];
unzGetCurrentFileInfo(f,NULL,filename,sizeof(filename),NULL,0,NULL,0);
WCHAR filenameW[MAX_PATH];
unz_file_info info;
unzGetCurrentFileInfo(f,&info,filename,sizeof(filename),NULL,0,NULL,0);
// was zip created on MS-DOS/Windows?
if ((info.version & 0xFF00) == 0)
{
// convert from OEM codepage to ANSI codepage
if (MultiByteToWideChar(CP_OEMCP, 0, filename, -1, filenameW, MAX_PATH))
{
WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, MAX_PATH, "-", NULL);
}
}
if (filename[0] &&
filename[strlen(filename)-1] != '\\' &&
filename[strlen(filename)-1] != '/')