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

added implementation of Unicode conversion functions for POSIX, based on iconv

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3821 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-12-11 16:06:17 +00:00
parent ee1ffdd11e
commit a0920c7b1d
3 changed files with 100 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Platform.h
View file

@ -30,7 +30,7 @@ typedef long LONG;
typedef unsigned long ULONG;
typedef long long INT64, LARGE_INTEGER;
typedef unsigned long long UINT64, ULARGE_INTEGER;
typedef int BOOL;
typedef int BOOL, *LPBOOL;
typedef void VOID;
typedef void *LPVOID;
typedef char CHAR, *PCHAR, *LPCH, *PCH, *NPSTR, *LPSTR, *PSTR;

95
Source/util.cpp
View file

@ -12,6 +12,7 @@
# include <ctype.h>
# include <unistd.h> // for close(2)
# include <fcntl.h> // for open(2)
# include <iconv.h>
#endif
#include <cassert> // for assert
@ -368,8 +369,8 @@ int generate_unicons_offsets(unsigned char* exeHeader, unsigned char* uninstIcon
#endif // NSIS_CONFIG_UNINSTALL_SUPPORT
// returns the number of WCHARs in str including null charcter
int WCStrLen(const WCHAR* szwStr) {
int i;
size_t WCStrLen(const WCHAR* szwStr) {
size_t i;
for (i = 0; szwStr[i]; i++);
return i+1;
}
@ -402,6 +403,96 @@ int wsprintf(char *s, const char *format, ...) {
return res;
}
// iconv const inconsistency workaround by Alexandre Oliva
template <typename T>
inline size_t __iconv_adaptor
(size_t (*iconv_func)(iconv_t, T, size_t *, char**,size_t*),
iconv_t cd, char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
return iconv_func (cd, (T)inbuf, inbytesleft, outbuf, outbytesleft);
}
void static create_code_page_string(char *buf, size_t len, UINT code_page) {
if (code_page == CP_ACP)
code_page = 1252;
snprintf(buf, len, "CP%d", code_page);
}
int WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr,
int cchWideChar, LPSTR lpMultiByteStr, int cbMultiByte, LPCSTR lpDefaultChar,
LPBOOL lpUsedDefaultChar) {
static char buffer[4096];
char cp[128];
create_code_page_string(cp, sizeof(cp), CodePage);
iconv_t cd = iconv_open(cp, "UCS-2");
if (cd == (iconv_t) -1) {
return 0;
}
if (cchWideChar < 0) {
cchWideChar = (int) WCStrLen(lpWideCharStr); // including null char
}
if (cbMultiByte == 0) {
cbMultiByte = sizeof(buffer);
lpMultiByteStr = buffer;
}
char *in = (char *) lpWideCharStr;
char *out = lpMultiByteStr;
size_t inbytes = cchWideChar * sizeof(WCHAR);
size_t outbytes = cbMultiByte;
if (__iconv_adaptor(iconv, cd, &in, &inbytes, &out, &outbytes) == (size_t) -1) {
iconv_close(cd);
return 0;
}
iconv_close(cd);
return cbMultiByte - outbytes;
}
int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
int cbMultiByte, LPWSTR lpWideCharStr, int cchWideChar) {
static WCHAR buffer[4096];
char cp[128];
create_code_page_string(cp, sizeof(cp), CodePage);
iconv_t cd = iconv_open("UCS-2", cp);
if (cd == (iconv_t) -1) {
return 0;
}
if (cbMultiByte < 0) {
cbMultiByte = strlen(lpMultiByteStr) + 1;
}
if (cchWideChar == 0) {
cchWideChar = sizeof(buffer);
lpWideCharStr = buffer;
}
char *in = (char *) lpMultiByteStr;
char *out = (char *) lpWideCharStr;
size_t inbytes = cbMultiByte;
size_t outbytes = cchWideChar * sizeof(WCHAR);
if (__iconv_adaptor(iconv, cd, &in, &inbytes, &out, &outbytes) == (size_t) -1) {
iconv_close(cd);
return 0;
}
iconv_close(cd);
return cchWideChar - (outbytes / sizeof (WCHAR));
}
#define MY_ERROR_MSG(x) {if (g_display_errors) {fprintf(g_output,"%s", x);}}
char *my_convert(const char *path)

16
Source/util.h
View file

@ -31,7 +31,7 @@ int generate_unicons_offsets(unsigned char* exeHeader, unsigned char* uninstIcon
#endif//NSIS_CONFIG_UNINSTALL_SUPPORT
// returns the number of WCHARs in str including null charcter
int WCStrLen(const WCHAR* szwStr);
size_t WCStrLen(const WCHAR* szwStr);
size_t my_strftime(char *s, size_t max, const char *fmt, const struct tm *tm);
@ -55,15 +55,11 @@ std::string get_executable_dir(const char *argv0);
char *CharPrev(const char *s, const char *p);
char *CharNext(const char *s);
int wsprintf(char *s, const char *format, ...);
// iconv const inconsistency workaround by Alexandre Oliva
template <typename T>
inline size_t __iconv_adaptor
(size_t (*iconv_func)(iconv_t, T, size_t *, char**,size_t*),
iconv_t cd, char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft)
{
return iconv_func (cd, (T)inbuf, inbytesleft, outbuf, outbytesleft);
}
int WideCharToMultiByte(UINT CodePage, DWORD dwFlags, LPCWSTR lpWideCharStr,
int cchWideChar, LPSTR lpMultiByteStr, int cbMultiByte, LPCSTR lpDefaultChar,
LPBOOL lpUsedDefaultChar);
int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
int cbMultiByte, LPWSTR lpWideCharStr, int cchWideChar);
char *my_convert(const char *path);
void my_convert_free(char *converted_path);