gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

mingw32 unicode fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21955 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2005-11-05 16:20:19 +00:00
parent 44a6542243
commit e6fd4ca0d1
18 changed files with 314 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/NSLog.m
View file

@ -41,6 +41,9 @@
#include <syslog.h>
#endif
#define UNISTR(X) \
((const unichar*)[(X) cStringUsingEncoding: NSUnicodeStringEncoding])
#if defined(HAVE_SYSLOG)
# if defined(LOG_ERR)
# if defined(LOG_USER)
@ -105,8 +108,12 @@ _NSLog_standard_printf_handler (NSString* message)
NSData *d;
const char *buf;
unsigned len;
#if defined(__WIN32__) || defined(HAVE_SYSLOG)
char *null_terminated_buf;
#if defined(__WIN32__)
LPCWSTR null_terminated_buf;
#else
#if defined(HAVE_SYSLOG)
char *null_terminated_buf;
#endif
#endif
static NSStringEncoding enc = 0;
@ -133,11 +140,9 @@ _NSLog_standard_printf_handler (NSString* message)
}
#if defined(__WIN32__)
null_terminated_buf = objc_malloc (sizeof (char) * (len + 1));
strncpy (null_terminated_buf, buf, len);
null_terminated_buf[len] = '\0';
null_terminated_buf = UNISTR(message);
OutputDebugString(null_terminated_buf);
OutputDebugStringW(null_terminated_buf);
if ((GSUserDefaultsFlag(GSLogSyslog) == YES
|| write(_NSLogDescriptor, buf, len) != (int)len) && !IsDebuggerPresent())
@ -147,22 +152,21 @@ _NSLog_standard_printf_handler (NSString* message)
if (!eventloghandle)
{
eventloghandle = RegisterEventSource(NULL,
[[[NSProcessInfo processInfo] processName] cString]);
UNISTR([[NSProcessInfo processInfo] processName]));
}
if (eventloghandle)
{
ReportEvent(eventloghandle, // event log handle
ReportEventW(eventloghandle, // event log handle
EVENTLOG_WARNING_TYPE, // event type
0, // category zero
0, // event identifier
NULL, // no user security identifier
1, // one substitution string
0, // no data
(LPCSTR*)&null_terminated_buf, // pointer to string array
&null_terminated_buf, // pointer to string array
NULL); // pointer to data
}
}
objc_free (null_terminated_buf);
#else
#if defined(HAVE_SYSLOG)