bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

code cleanup: utfconv library had some quite confusing formatting, also cleared som warnings.

Browse Source
This commit is contained in:
Campbell Barton 2012-04-12 02:15:33 +00:00
parent 5aaf3ede76
commit cc1259178b
12 changed files with 270 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/CMakeLists.txt
View File

@ -66,8 +66,7 @@ if(WITH_CYCLES)
add_subdirectory(cycles) add_subdirectory(cycles)
endif() endif()
# only windows needs utf16 converter
#Only Windows needs utf16 converter
if(WIN32) if(WIN32)
add_subdirectory(utfconv) add_subdirectory(utfconv)
endif() endif()

2
intern/SConscript
View File

@ -3,7 +3,7 @@ Import ('env')
SConscript(['audaspace/SConscript', SConscript(['audaspace/SConscript',
'string/SConscript', 'string/SConscript',
'utfconv/SConscript', 'utfconv/SConscript', # XXX - why use this on UNIX?
'ghost/SConscript', 'ghost/SConscript',
'guardedalloc/SConscript', 'guardedalloc/SConscript',
'moto/SConscript', 'moto/SConscript',

8
intern/ghost/intern/GHOST_SystemPathsWin32.cpp
View File

@ -114,10 +114,10 @@ const GHOST_TUns8* GHOST_SystemPathsWin32::getBinaryDir() const
return NULL; return NULL;
} }
void GHOST_SystemPathsWin32::addToSystemRecentFiles(const char* filename) const void GHOST_SystemPathsWin32::addToSystemRecentFiles(const char *filename) const
{ {
/* SHARD_PATH resolves to SHARD_PATHA for non-UNICODE build */ /* SHARD_PATH resolves to SHARD_PATHA for non-UNICODE build */
UTF16_ENCODE(filename) UTF16_ENCODE(filename);
SHAddToRecentDocs(SHARD_PATHW,filename_16); SHAddToRecentDocs(SHARD_PATHW, filename_16);
UTF16_UN_ENCODE(filename) UTF16_UN_ENCODE(filename);
} }

2
intern/ghost/intern/GHOST_SystemPathsWin32.h
View File

@ -85,7 +85,7 @@ public:
/** /**
* Add the file to the operating system most recently used files * Add the file to the operating system most recently used files
*/ */
void addToSystemRecentFiles(const char* filename) const; void addToSystemRecentFiles(const char *filename) const;
}; };
#endif // __GHOST_SYSTEMPATHSWIN32_H__ #endif // __GHOST_SYSTEMPATHSWIN32_H__

27
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@ -726,17 +726,23 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, RAWINP
int r; int r;
GetKeyboardState((PBYTE)state); GetKeyboardState((PBYTE)state);
if(r = ToUnicodeEx(vk, 0, state, utf16, 2, 0, system->m_keylayout)) if(r = ToUnicodeEx(vk, 0, state, utf16, 2, 0, system->m_keylayout)) {
if((r>0 && r<3)){
utf16[r]=0;
conv_utf_16_to_8(utf16,utf8_char,6);
}
else if (r==-1) {
utf8_char[0] = '\0';
}
}
if((r>0 && r<3)){utf16[r]=0; if(!keyDown) {
utf8_char[0] = '\0';
conv_utf_16_to_8(utf16,utf8_char,6);} ascii='\0';
else if (r==-1) utf8_char[0] = '\0'; }
else {
ascii = utf8_char[0]& 0x80?'?' : utf8_char[0];
}
if(!keyDown) {utf8_char[0] = '\0'; ascii='\0';}
else ascii = utf8_char[0]& 0x80?'?':utf8_char[0];
if(0x80&state[VK_MENU]) utf8_char[0]='\0'; if(0x80&state[VK_MENU]) utf8_char[0]='\0';
@ -1253,7 +1259,6 @@ GHOST_TUns8* GHOST_SystemWin32::getClipboard(bool selection) const
if ( IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL) ) { if ( IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL) ) {
wchar_t *buffer; wchar_t *buffer;
size_t len = 0;
HANDLE hData = GetClipboardData( CF_UNICODETEXT ); HANDLE hData = GetClipboardData( CF_UNICODETEXT );
if (hData == NULL) { if (hData == NULL) {
CloseClipboard(); CloseClipboard();

18
intern/utfconv/CMakeLists.txt
View File

@ -1,3 +1,21 @@
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ***** END GPL LICENSE BLOCK *****
set(INC set(INC
. .
) )

51
intern/utfconv/utf_winfunc.c
View File

@ -37,20 +37,22 @@
FILE * ufopen(const char * filename, const char * mode) FILE * ufopen(const char * filename, const char * mode)
{ {
FILE * f = NULL; FILE *f = NULL;
UTF16_ENCODE(filename); UTF16_ENCODE(filename);
UTF16_ENCODE (mode); UTF16_ENCODE (mode);
if(filename_16 && mode_16) f = _wfopen(filename_16, mode_16); if(filename_16 && mode_16) {
f = _wfopen(filename_16, mode_16);
}
UTF16_UN_ENCODE(mode); UTF16_UN_ENCODE(mode);
UTF16_UN_ENCODE(filename); UTF16_UN_ENCODE(filename);
if(!f) if (!f) {
{ if ((f = fopen(filename, mode))) {
if(f=fopen(filename,mode))
printf("WARNING: %s is not utf path. Please update it.\n",filename); printf("WARNING: %s is not utf path. Please update it.\n",filename);
} }
}
return f; return f;
} }
@ -60,15 +62,17 @@ int uopen(const char *filename, int oflag, int pmode)
int f = -1; int f = -1;
UTF16_ENCODE(filename); UTF16_ENCODE(filename);
if(filename_16) f = _wopen(filename_16, oflag, pmode); if (filename_16) {
f = _wopen(filename_16, oflag, pmode);
}
UTF16_UN_ENCODE(filename); UTF16_UN_ENCODE(filename);
if(f==-1) if (f == -1) {
{ if ((f=open(filename,oflag, pmode)) != -1) {
if((f=open(filename,oflag, pmode))!=-1)
printf("WARNING: %s is not utf path. Please update it.\n",filename); printf("WARNING: %s is not utf path. Please update it.\n",filename);
} }
}
return f; return f;
} }
@ -96,7 +100,7 @@ int umkdir(const char *pathname)
UTF16_UN_ENCODE(pathname); UTF16_UN_ENCODE(pathname);
return r?0:-1; return r ? 0 : -1;
} }
char * u_alloc_getenv(const char *varname) char * u_alloc_getenv(const char *varname)
@ -104,8 +108,10 @@ char * u_alloc_getenv(const char *varname)
char * r = 0; char * r = 0;
wchar_t * str; wchar_t * str;
UTF16_ENCODE(varname); UTF16_ENCODE(varname);
if(varname_16){ str = _wgetenv(varname_16); if (varname_16) {
r = alloc_utf_8_from_16(str,0);} str = _wgetenv(varname_16);
r = alloc_utf_8_from_16(str, 0);
}
UTF16_UN_ENCODE(varname); UTF16_UN_ENCODE(varname);
return r; return r;
@ -122,35 +128,30 @@ int uput_getenv(const char *varname, char * value, size_t buffsize)
if(!buffsize) return r; if(!buffsize) return r;
UTF16_ENCODE(varname); UTF16_ENCODE(varname);
if(varname_16) if(varname_16) {
{
str = _wgetenv(varname_16); str = _wgetenv(varname_16);
conv_utf_16_to_8(str, value, buffsize); conv_utf_16_to_8(str, value, buffsize);
r = 1; r = 1;
} }
UTF16_UN_ENCODE(varname); UTF16_UN_ENCODE(varname);
if(!r) value[0] = 0; if (!r) value[0] = 0;
return r; return r;
} }
int uputenv(const char *name, const char *value) int uputenv(const char *name, const char *value)
{ {
int r = -1; int r = -1;
UTF16_ENCODE(name) UTF16_ENCODE(name);
UTF16_ENCODE(value) UTF16_ENCODE(value);
if(name_16 && value_16) { if(name_16 && value_16) {
if(SetEnvironmentVariableW(name_16,value_16)!=0) r = (SetEnvironmentVariableW(name_16,value_16)!= 0) ? 0 : -1;
r =0;
else r = -1;
} }
UTF16_UN_ENCODE(value) UTF16_UN_ENCODE(value);
UTF16_UN_ENCODE(name) UTF16_UN_ENCODE(name);
return r; return r;
} }
#endif #endif /* WIN32 */

257
intern/utfconv/utfconv.c
View File

@ -25,208 +25,235 @@
#include "utfconv.h" #include "utfconv.h"
size_t count_utf_8_from_16(const wchar_t * string16) size_t count_utf_8_from_16(const wchar_t *string16)
{ {
int i; int i;
size_t count = 0; size_t count = 0;
wchar_t u = 0; wchar_t u = 0;
if(!string16) return 0; if (!string16) {
return 0;
}
for(i=0;u = string16[i];i++) for (i = 0; u = string16[i]; i++) {
{ if (u < 0x0080) {
if(u < 0x0080) count+=1; else count += 1;
if(u < 0x0800) count+=2; else }
if(u < 0xD800) count+=3; else else {
if(u < 0xDC00) { if (u < 0x0800) {
count += 2;
}
else {
if (u < 0xD800) {
count += 3;
}
else {
if (u < 0xDC00) {
i++; i++;
if((u = string16[i])==0) break; if ((u = string16[i]) == 0) {
if(u >= 0xDC00 && u < 0xE000)count+=4; break;
} else }
if(u < 0xE000) /*illigal*/; else if (u >= 0xDC00 && u < 0xE000) {
count+=3; count += 4;
}
}
else {
if (u < 0xE000) {
/*illigal*/;
}
else {
count += 3;
}
}
}
}
}
} }
return ++count; return ++count;
} }
size_t count_utf_16_from_8(const char * string8) size_t count_utf_16_from_8(const char *string8)
{ {
size_t count = 0; size_t count = 0;
char u; char u;
char type = 0; char type = 0;
unsigned int u32 = 0; unsigned int u32 = 0;
if(!string8) return 0; if (!string8) return 0;
for(;(u = *string8);string8++) for (; (u = *string8); string8++) {
{ if (type == 0) {
if(type==0) if ((u & 0x01 << 7) == 0) { count++; u32 = 0; continue; } //1 utf-8 char
{ if ((u & 0x07 << 5) == 0xC0) { type = 1; u32 = u & 0x1F; continue; } //2 utf-8 char
if((u&0x01<<7) == 0) {count++; u32 = 0; continue;} //1 utf-8 char if ((u & 0x0F << 4) == 0xE0) { type = 2; u32 = u & 0x0F; continue; } //3 utf-8 char
if((u&0x07<<5) == 0xC0) {type=1; u32 = u & 0x1F; continue;} //2 utf-8 char if ((u & 0x1F << 3) == 0xF0) { type = 3; u32 = u & 0x07; continue; } //4 utf-8 char
if((u&0x0F<<4) == 0xE0) {type=2; u32 = u & 0x0F; continue;} //3 utf-8 char
if((u&0x1F<<3) == 0xF0) {type=3; u32 = u & 0x07; continue;} //4 utf-8 char
continue; continue;
} else
{
if((u & 0xC0) == 0x80) {u32=(u32<<6) | (u&0x3F); type--;} else
{u32 = 0; type = 0;};
} }
if(type==0) else {
{ if ((u & 0xC0) == 0x80) {
if((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) count++; else u32 = (u32 << 6) | (u & 0x3F);
if(0x10000 <= u32 && u32 < 0x110000) count+=2; type--;
}
else {
u32 = 0;
type = 0;
}
}
if (type == 0) {
if ((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) count++;
else if (0x10000 <= u32 && u32 < 0x110000) count += 2;
u32 = 0; u32 = 0;
} }
} }
return ++count; return ++count;
} }
int conv_utf_16_to_8(const wchar_t *in16, char *out8, size_t size8)
int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8)
{ {
char * out8end = out8+size8; char *out8end = out8 + size8;
wchar_t u = 0; wchar_t u = 0;
int err = 0; int err = 0;
if(!size8 || !in16 || !out8) return UTF_ERROR_NULL_IN; if (!size8 || !in16 || !out8) return UTF_ERROR_NULL_IN;
out8end--; out8end--;
for(; out8 < out8end && (u=*in16); in16++, out8++) for (; out8 < out8end && (u = *in16); in16++, out8++) {
{ if (u < 0x0080) {
if(u < 0x0080) *out8 = u; else *out8 = u;
if(u < 0x0800) { }
if(out8 + 1 >= out8end) break; else if (u < 0x0800) {
*out8++=(0x3<<6) | (0x1F & (u>>6)); if (out8 + 1 >= out8end) break;
*out8 =(0x1<<7) | (0x3F & (u)); *out8++ = (0x3 << 6) | (0x1F & (u >> 6));
}else *out8 = (0x1 << 7) | (0x3F & (u));
if(u < 0xD800 || u >= 0xE000) { }
if(out8 + 2 >= out8end) break; else if (u < 0xD800 || u >= 0xE000) {
*out8++=(0x7<<5) | (0xF & (u>>12)); if (out8 + 2 >= out8end) break;
*out8++=(0x1<<7) | (0x3F & (u>>6));; *out8++ = (0x7 << 5) | (0xF & (u >> 12));
*out8 =(0x1<<7) | (0x3F & (u)); *out8++ = (0x1 << 7) | (0x3F & (u >> 6));;
}else *out8 = (0x1 << 7) | (0x3F & (u));
if(u < 0xDC00) { }
else if (u < 0xDC00) {
wchar_t u2 = *++in16; wchar_t u2 = *++in16;
if(!u2) break; if (!u2) break;
if(u2 >= 0xDC00 && u2 < 0xE000) if (u2 >= 0xDC00 && u2 < 0xE000) {
{ if (out8 + 3 >= out8end) break; else {
if(out8 + 3 >= out8end) break; else { unsigned int uc = 0x10000 + (u2 - 0xDC00) + ((u - 0xD800) << 10);
unsigned int uc = 0x10000 + (u2 - 0xDC00) + ((u - 0xD800)<<10);
*out8++=(0xF<<4) | (0x7 & (uc>>18)); *out8++ = (0xF << 4) | (0x7 & (uc >> 18));
*out8++=(0x1<<7) | (0x3F & (uc>>12)); *out8++ = (0x1 << 7) | (0x3F & (uc >> 12));
*out8++=(0x1<<7) | (0x3F & (uc>>6)); *out8++ = (0x1 << 7) | (0x3F & (uc >> 6));
*out8 =(0x1<<7) | (0x3F & (uc)); *out8 = (0x1 << 7) | (0x3F & (uc));
}
}
else {
out8--; err |= UTF_ERROR_ILLCHAR;
}
}
else if (u < 0xE000) {
out8--; err |= UTF_ERROR_ILLCHAR;
} }
} else {out8--; err|=UTF_ERROR_ILLCHAR;};
} else
if(u < 0xE000) {out8--; err|=UTF_ERROR_ILLCHAR;}
} }
*out8=*out8end=0; *out8 = *out8end = 0;
if(*in16) err|=UTF_ERROR_SMALL; if (*in16) err |= UTF_ERROR_SMALL;
return err; return err;
} }
int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16) int conv_utf_8_to_16(const char *in8, wchar_t *out16, size_t size16)
{ {
char u; char u;
char type = 0; char type = 0;
wchar_t u32 = 0; wchar_t u32 = 0;
wchar_t * out16end = out16+size16; wchar_t *out16end = out16 + size16;
int err = 0; int err = 0;
if(!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN; if (!size16 || !in8 || !out16) return UTF_ERROR_NULL_IN;
out16end--; out16end--;
for(;out16<out16end && (u = *in8);in8++) for (; out16 < out16end && (u = *in8); in8++) {
{ if (type == 0) {
if(type==0) if ((u & 0x01 << 7) == 0) { *out16 = u; out16++; u32 = 0; continue; } //1 utf-8 char
{ if ((u & 0x07 << 5) == 0xC0) { type = 1; u32 = u & 0x1F; continue; } //2 utf-8 char
if((u&0x01<<7) == 0) {*out16=u; out16++; u32 = 0; continue;} //1 utf-8 char if ((u & 0x0F << 4) == 0xE0) { type = 2; u32 = u & 0x0F; continue; } //3 utf-8 char
if((u&0x07<<5) == 0xC0) {type=1; u32 = u & 0x1F; continue;} //2 utf-8 char if ((u & 0x1F << 3) == 0xF0) { type = 3; u32 = u & 0x07; continue; } //4 utf-8 char
if((u&0x0F<<4) == 0xE0) {type=2; u32 = u & 0x0F; continue;} //3 utf-8 char err |= UTF_ERROR_ILLCHAR;
if((u&0x1F<<3) == 0xF0) {type=3; u32 = u & 0x07; continue;} //4 utf-8 char continue;
err|=UTF_ERROR_ILLCHAR; continue;
} else
{
if((u & 0xC0) == 0x80) {u32=(u32<<6) | (u&0x3F); type--;} else
{u32 = 0; type = 0; err|=UTF_ERROR_ILLSEQ;};
} }
if(type==0) else {
{ if ((u & 0xC0) == 0x80) {
if((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) {*out16=u32; out16++;}else u32 = (u32 << 6) | (u & 0x3F);
if(0x10000 <= u32 && u32 < 0x110000) { type--;
if(out16 + 1 >= out16end) break; }
u32-=0x10000; else {
u32 = 0; type = 0; err |= UTF_ERROR_ILLSEQ;
}
}
if (type == 0) {
if ((0 < u32 && u32 < 0xD800) || (0xE000 <= u32 && u32 < 0x10000)) {
*out16 = u32;
out16++;
}
else if (0x10000 <= u32 && u32 < 0x110000) {
if (out16 + 1 >= out16end) break;
u32 -= 0x10000;
*out16 = 0xD800 + (u32 >> 10); *out16 = 0xD800 + (u32 >> 10);
out16++; out16++;
*out16 = 0xDC00 + (u32 & 0x3FF); *out16 = 0xDC00 + (u32 & 0x3FF);
out16++; out16++;
}; }
u32 = 0; u32 = 0;
} }
} }
*out16=*out16end=0; *out16 = *out16end = 0;
if(*in8) err|=UTF_ERROR_SMALL; if (*in8) err |= UTF_ERROR_SMALL;
return err; return err;
} }
int is_ascii(const char * in8) int is_ascii(const char *in8)
{ {
for(in8; *in8; in8++) for (; *in8; in8++)
if(0x80 & *in8) return 0; if (0x80 & *in8) return 0;
return 1; return 1;
} }
void utf_8_cut_end(char * inout8, size_t maxcutpoint) void utf_8_cut_end(char *inout8, size_t maxcutpoint)
{ {
const char * start = inout8; char *cur = inout8 + maxcutpoint;
char * cur = inout8 + maxcutpoint;
char cc; char cc;
if(!inout8) return; if (!inout8) return;
cc = *cur; cc = *cur;
} }
char * alloc_utf_8_from_16(const wchar_t * in16, size_t add) char *alloc_utf_8_from_16(const wchar_t *in16, size_t add)
{ {
size_t bsize = count_utf_8_from_16(in16); size_t bsize = count_utf_8_from_16(in16);
char * out8 = NULL; char *out8 = NULL;
if(!bsize) return NULL; if (!bsize) return NULL;
out8 = (char*)malloc(sizeof(char) * (bsize + add)); out8 = (char *)malloc(sizeof(char) * (bsize + add));
conv_utf_16_to_8(in16,out8, bsize); conv_utf_16_to_8(in16, out8, bsize);
return out8; return out8;
} }
wchar_t * alloc_utf16_from_8(const char * in8, size_t add) wchar_t *alloc_utf16_from_8(const char *in8, size_t add)
{ {
size_t bsize = count_utf_16_from_8(in8); size_t bsize = count_utf_16_from_8(in8);
wchar_t * out16 = NULL; wchar_t *out16 = NULL;
if(!bsize) return NULL; if (!bsize) return NULL;
out16 =(wchar_t*) malloc(sizeof(wchar_t) * (bsize + add)); out16 = (wchar_t *) malloc(sizeof(wchar_t) * (bsize + add));
conv_utf_8_to_16(in8,out16, bsize); conv_utf_8_to_16(in8, out16, bsize);
return out16; return out16;
} }

26
intern/utfconv/utfconv.h
View File

@ -38,22 +38,22 @@ extern "C" {
* @param string-16 pointer to working utf-16 string * @param string-16 pointer to working utf-16 string
* @return How many bytes must be allocated includeng NULL. * @return How many bytes must be allocated includeng NULL.
*/ */
size_t count_utf_8_from_16(const wchar_t * string16); size_t count_utf_8_from_16(const wchar_t *string16);
/** /**
* Counts how many wchar_t (two byte) is requered for for future utf-16 string using utf-8 * Counts how many wchar_t (two byte) is requered for for future utf-16 string using utf-8
* @param string-8 pointer to working utf-8 string * @param string-8 pointer to working utf-8 string
* @return How many bytes must be allocated includeng NULL. * @return How many bytes must be allocated includeng NULL.
*/ */
size_t count_utf_16_from_8(const char * string8); size_t count_utf_16_from_8(const char *string8);
/** /**
* conv_utf_*** errors * conv_utf_*** errors
*/ */
#define UTF_ERROR_NULL_IN 1<<0 /* Error occures when requered parameter is missing*/ #define UTF_ERROR_NULL_IN 1 << 0 /* Error occures when requered parameter is missing*/
#define UTF_ERROR_ILLCHAR 1<<1 /* Error if character is in illigal UTF rage*/ #define UTF_ERROR_ILLCHAR 1 << 1 /* Error if character is in illigal UTF rage*/
#define UTF_ERROR_SMALL 1<<2 /* Passed size is to small. It gives legal string with character missing at the end*/ #define UTF_ERROR_SMALL 1 << 2 /* Passed size is to small. It gives legal string with character missing at the end*/
#define UTF_ERROR_ILLSEQ 1<<3 /* Error if sequence is broken and doesn't finish*/ #define UTF_ERROR_ILLSEQ 1 << 3 /* Error if sequence is broken and doesn't finish*/
/** /**
* Converts utf-16 string to allocated utf-8 string * Converts utf-16 string to allocated utf-8 string
@ -62,7 +62,7 @@ size_t count_utf_16_from_8(const char * string8);
* @params size8 the allocated size in bytes of out8 * @params size8 the allocated size in bytes of out8
* @return Returns any errors occured during conversion. See the block above, * @return Returns any errors occured during conversion. See the block above,
*/ */
int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8); int conv_utf_16_to_8(const wchar_t *in16, char *out8, size_t size8);
/** /**
* Converts utf-8 string to allocated utf-16 string * Converts utf-8 string to allocated utf-16 string
@ -71,7 +71,7 @@ int conv_utf_16_to_8(const wchar_t * in16, char * out8, size_t size8);
* @params size16 the allocated size in wchar_t (two byte) of out16 * @params size16 the allocated size in wchar_t (two byte) of out16
* @return Returns any errors occured during conversion. See the block above, * @return Returns any errors occured during conversion. See the block above,
*/ */
int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16); int conv_utf_8_to_16(const char *in8, wchar_t *out16, size_t size16);
/** /**
@ -80,7 +80,7 @@ int conv_utf_8_to_16(const char * in8, wchar_t * out16, size_t size16);
* @params add any additional size which will be allocated for new utf-8 string in bytes * @params add any additional size which will be allocated for new utf-8 string in bytes
* @return New allocated and converted utf-8 string or NULL if in16 is 0. * @return New allocated and converted utf-8 string or NULL if in16 is 0.
*/ */
char * alloc_utf_8_from_16(const wchar_t * in16, size_t add); char *alloc_utf_8_from_16(const wchar_t *in16, size_t add);
/** /**
* Allocates and converts the utf-16 string from utf-8 * Allocates and converts the utf-16 string from utf-8
@ -88,14 +88,14 @@ char * alloc_utf_8_from_16(const wchar_t * in16, size_t add);
* @params add any additional size which will be allocated for new utf-16 string in wchar_t (two bytes) * @params add any additional size which will be allocated for new utf-16 string in wchar_t (two bytes)
* @return New allocated and converted utf-16 string or NULL if in8 is 0. * @return New allocated and converted utf-16 string or NULL if in8 is 0.
*/ */
wchar_t * alloc_utf16_from_8(const char * in8, size_t add); wchar_t *alloc_utf16_from_8(const char *in8, size_t add);
/* Easy allocation and conversion of new utf-16 string. New string has _16 suffix. Must be deallocated with UTF16_UN_ENCODE in right order*/ /* Easy allocation and conversion of new utf-16 string. New string has _16 suffix. Must be deallocated with UTF16_UN_ENCODE in right order*/
#define UTF16_ENCODE(in8str) if(1){\ #define UTF16_ENCODE(in8str) if (1) { \
wchar_t * in8str ## _16 = alloc_utf16_from_8((char*)in8str, 0); wchar_t *in8str ## _16 = alloc_utf16_from_8((char *)in8str, 0)
#define UTF16_UN_ENCODE(in8str) \ #define UTF16_UN_ENCODE(in8str) \
free(in8str ## _16 ); }; free(in8str ## _16); } (void)0
#ifdef __cplusplus #ifdef __cplusplus
} }

36
source/blender/blenlib/intern/fileops.c
View File

@ -184,14 +184,14 @@ int BLI_file_is_writable(const char *filename)
int BLI_file_touch(const char *file) int BLI_file_touch(const char *file)
{ {
FILE *f = BLI_fopen(file,"r+b"); FILE *f = BLI_fopen(file, "r+b");
if (f != NULL) { if (f != NULL) {
char c = getc(f); char c = getc(f);
rewind(f); rewind(f);
putc(c,f); putc(c, f);
} }
else { else {
f = BLI_fopen(file,"wb"); f = BLI_fopen(file, "wb");
} }
if (f) { if (f) {
fclose(f); fclose(f);
@ -250,7 +250,7 @@ int BLI_delete(const char *file, int dir, int recursive)
{ {
int err; int err;
UTF16_ENCODE(file) UTF16_ENCODE(file);
if (recursive) { if (recursive) {
callLocalErrorCallBack("Recursive delete is unsupported on Windows"); callLocalErrorCallBack("Recursive delete is unsupported on Windows");
@ -265,7 +265,7 @@ int BLI_delete(const char *file, int dir, int recursive)
if (err) callLocalErrorCallBack("Unable to delete file"); if (err) callLocalErrorCallBack("Unable to delete file");
} }
UTF16_UN_ENCODE(file) UTF16_UN_ENCODE(file);
return err; return err;
} }
@ -286,11 +286,11 @@ int BLI_move(const char *file, const char *to)
} }
} }
UTF16_ENCODE(file) UTF16_ENCODE(file);
UTF16_ENCODE(str) UTF16_ENCODE(str);
err= !MoveFileW(file_16, str_16); err= !MoveFileW(file_16, str_16);
UTF16_UN_ENCODE(str) UTF16_UN_ENCODE(str);
UTF16_UN_ENCODE(file) UTF16_UN_ENCODE(file);
if (err) { if (err) {
callLocalErrorCallBack("Unable to move file"); callLocalErrorCallBack("Unable to move file");
@ -317,11 +317,11 @@ int BLI_copy(const char *file, const char *to)
} }
} }
UTF16_ENCODE(file) UTF16_ENCODE(file);
UTF16_ENCODE(str) UTF16_ENCODE(str);
err= !CopyFileW(file_16,str_16,FALSE); err = !CopyFileW(file_16, str_16, FALSE);
UTF16_UN_ENCODE(str) UTF16_UN_ENCODE(str);
UTF16_UN_ENCODE(file) UTF16_UN_ENCODE(file);
if (err) { if (err) {
callLocalErrorCallBack("Unable to copy file!"); callLocalErrorCallBack("Unable to copy file!");
@ -344,10 +344,10 @@ void BLI_dir_create_recursive(const char *dirname)
char *lslash; char *lslash;
char tmp[MAXPATHLEN]; char tmp[MAXPATHLEN];
// First remove possible slash at the end of the dirname. /* First remove possible slash at the end of the dirname.
// This routine otherwise tries to create * This routine otherwise tries to create
// blah1/blah2/ (with slash) after creating * blah1/blah2/ (with slash) after creating
// blah1/blah2 (without slash) * blah1/blah2 (without slash) */
BLI_strncpy(tmp, dirname, sizeof(tmp)); BLI_strncpy(tmp, dirname, sizeof(tmp));
lslash= BLI_last_slash(tmp); lslash= BLI_last_slash(tmp);

22
source/blender/blenlib/intern/storage.c
View File

@ -224,16 +224,16 @@ static void bli_builddir(const char *dirname, const char *relname)
return; return;
} }
#else #else
UTF16_ENCODE(dirname) UTF16_ENCODE(dirname);
if (!SetCurrentDirectoryW(dirname_16)) { if (!SetCurrentDirectoryW(dirname_16)) {
perror(dirname); perror(dirname);
free(dirname_16); free(dirname_16);
return; return;
} }
UTF16_UN_ENCODE(dirname) UTF16_UN_ENCODE(dirname);
#endif #endif
if ( (dir = (DIR *)opendir(".")) ) { if ((dir = (DIR *)opendir("."))) {
while ((fname = (struct dirent*) readdir(dir)) != NULL) { while ((fname = (struct dirent*) readdir(dir)) != NULL) {
dlink = (struct dirlink *)malloc(sizeof(struct dirlink)); dlink = (struct dirlink *)malloc(sizeof(struct dirlink));
if (dlink) { if (dlink) {
@ -247,13 +247,13 @@ static void bli_builddir(const char *dirname, const char *relname)
if (newnum) { if (newnum) {
if (files) { if (files) {
void *tmp= realloc(files, (totnum+newnum) * sizeof(struct direntry)); void *tmp = realloc(files, (totnum+newnum) * sizeof(struct direntry));
if (tmp) { if (tmp) {
files= (struct direntry *)tmp; files = (struct direntry *)tmp;
} }
else { /* realloc fail */ else { /* realloc fail */
free(files); free(files);
files= NULL; files = NULL;
} }
} }
@ -556,17 +556,17 @@ void BLI_file_free_lines(LinkNode *lines)
int BLI_file_older(const char *file1, const char *file2) int BLI_file_older(const char *file1, const char *file2)
{ {
#if WIN32 #ifdef WIN32
struct _stat st1, st2; struct _stat st1, st2;
UTF16_ENCODE(file1) UTF16_ENCODE(file1);
UTF16_ENCODE(file2) UTF16_ENCODE(file2);
if (_wstat(file1_16, &st1)) return 0; if (_wstat(file1_16, &st1)) return 0;
if (_wstat(file2_16, &st2)) return 0; if (_wstat(file2_16, &st2)) return 0;
UTF16_UN_ENCODE(file2) UTF16_UN_ENCODE(file2);
UTF16_UN_ENCODE(file1) UTF16_UN_ENCODE(file1);
#else #else
struct stat st1, st2; struct stat st1, st2;

5
source/creator/creator.c
View File

@ -1169,7 +1169,7 @@ char **environ = NULL;
#ifdef WIN32 #ifdef WIN32
int main(int argc, const char **argv_c) /*Do not mess with const*/ int main(int argc, const char **UNUSED(argv_c)) /* Do not mess with const */
#else #else
int main(int argc, const char **argv) int main(int argc, const char **argv)
#endif #endif
@ -1182,8 +1182,7 @@ int main(int argc, const char **argv)
wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc); wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc);
int argci = 0; int argci = 0;
char **argv = MEM_mallocN(argc * sizeof(char *), "argv array"); char **argv = MEM_mallocN(argc * sizeof(char *), "argv array");
for (argci = 0; argci < argc; argci++) for (argci = 0; argci < argc; argci++) {
{
argv[argci] = alloc_utf_8_from_16(argv_16[argci], 0); argv[argci] = alloc_utf_8_from_16(argv_16[argci], 0);
} }
LocalFree(argv_16); LocalFree(argv_16);