suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust to newer devstudio

Browse Source 
svn: r2997
This commit is contained in:
Eli Barzilay 2006-05-21 10:07:01 +00:00
parent 9382e21ede
commit 9960d6f270
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mysterx/array.cxx
View File

@ -93,7 +93,7 @@ Scheme_Object *safeArrayElementToSchemeObject(SAFEARRAY *theArray,
case VT_BSTR : case VT_BSTR :
BSTR bArg; BSTR bArg;
SafeArrayGetElement(theArray,allIndices,&bArg); SafeArrayGetElement(theArray,allIndices,&bArg);
return unmarshalBSTR((unsigned short *)bArg); return unmarshalBSTR(bArg);
case VT_ERROR : case VT_ERROR :
SCODE scodeArg; SCODE scodeArg;

4
src/mysterx/dotnet/utils.cpp
View File

@ -38,11 +38,9 @@ int show_trace (char * str, va_list marker)
CQuickBytes buffer; CQuickBytes buffer;
int count = -1; int count = -1;
int i = 1; int i = 1;
HRESULT hr;
while (count < 0) { while (count < 0) {
if (FAILED (hr = buffer.ReSize (STRING_BUFFER_LEN * i))) buffer.ReSizeThrows (STRING_BUFFER_LEN * i);
die ("Resize failed.", hr);
count = _vsnprintf ((char *) buffer.Ptr(), STRING_BUFFER_LEN * i, str, marker); count = _vsnprintf ((char *) buffer.Ptr(), STRING_BUFFER_LEN * i, str, marker);
i *= 2; i *= 2;
} }

14
src/mysterx/mysc/bstr.cxx
View File

@ -7,6 +7,8 @@
/* This indirection lets us delayload libmzsch.dll: */ /* This indirection lets us delayload libmzsch.dll: */
#define scheme_false (scheme_make_false()) #define scheme_false (scheme_make_false())
typedef unsigned short *pushort;
// fwd ref // fwd ref
BSTR schemeToBSTR (Scheme_Object * obj); BSTR schemeToBSTR (Scheme_Object * obj);
@ -14,7 +16,7 @@ static
LPWSTR schemeUCS4ToUTF16 (const mzchar * buffer, int nchars, long * result_length) LPWSTR schemeUCS4ToUTF16 (const mzchar * buffer, int nchars, long * result_length)
{ {
LPWSTR s; LPWSTR s;
s = scheme_ucs4_to_utf16 (buffer, 0, nchars, NULL, 0, result_length, 1); s = (LPWSTR) scheme_ucs4_to_utf16 (buffer, 0, nchars, NULL, 0, result_length, 1);
s[*result_length] = 0; s[*result_length] = 0;
return s; return s;
} }
@ -122,7 +124,7 @@ Scheme_Object * multiByteToSchemeCharString (const char * mbstr)
scheme_signal_error("Error translating string parameter to Unicode"); scheme_signal_error("Error translating string parameter to Unicode");
long nchars; long nchars;
mzchar * ucs4 = scheme_utf16_to_ucs4 (wide, 0, len, NULL, 0, &nchars, 0); mzchar * ucs4 = scheme_utf16_to_ucs4 ((pushort)wide, 0, len, NULL, 0, &nchars, 0);
return scheme_make_sized_char_string (ucs4, nchars, 0); return scheme_make_sized_char_string (ucs4, nchars, 0);
} }
@ -154,7 +156,7 @@ Scheme_Object * BSTRToSchemeString (BSTR bstr)
{ {
UINT length = SysStringLen (bstr); UINT length = SysStringLen (bstr);
long nchars; long nchars;
mzchar * string = scheme_utf16_to_ucs4 (bstr, 0, length, mzchar * string = scheme_utf16_to_ucs4 ((pushort)bstr, 0, length,
NULL, 0, NULL, 0,
&nchars, 0); &nchars, 0);
return scheme_make_sized_char_string (string, nchars, 0); return scheme_make_sized_char_string (string, nchars, 0);
@ -164,7 +166,7 @@ Scheme_Object * BSTRToSchemeSymbol (BSTR bstr)
{ {
UINT length = SysStringLen (bstr); UINT length = SysStringLen (bstr);
long nchars; long nchars;
mzchar * string = scheme_utf16_to_ucs4 (bstr, 0, length, mzchar * string = scheme_utf16_to_ucs4 ((pushort)bstr, 0, length,
NULL, 0, NULL, 0,
&nchars, 0); &nchars, 0);
return scheme_intern_exact_char_symbol (string, nchars); return scheme_intern_exact_char_symbol (string, nchars);
@ -187,7 +189,7 @@ void updateSchemeByteStringFromBSTR (Scheme_Object * obj, BSTR bstr)
{ {
UINT len = SysStringLen (bstr); UINT len = SysStringLen (bstr);
long nchars; long nchars;
mzchar * string = scheme_utf16_to_ucs4 (bstr, 0, len, mzchar * string = scheme_utf16_to_ucs4 ((pushort)bstr, 0, len,
NULL, 0, NULL, 0,
&nchars, 0); &nchars, 0);
if (nchars > SCHEME_BYTE_STRLEN_VAL(obj)) if (nchars > SCHEME_BYTE_STRLEN_VAL(obj))
@ -209,7 +211,7 @@ void updateSchemeCharStringFromBSTR (Scheme_Object * obj, BSTR bstr)
if (len > (unsigned int)SCHEME_CHAR_STRLEN_VAL(obj)) if (len > (unsigned int)SCHEME_CHAR_STRLEN_VAL(obj))
scheme_signal_error("String updated with longer string"); scheme_signal_error("String updated with longer string");
scheme_utf16_to_ucs4 (bstr, 0, len, scheme_utf16_to_ucs4 ((pushort)bstr, 0, len,
SCHEME_CHAR_STR_VAL(obj), SCHEME_CHAR_STRLEN_VAL(obj), SCHEME_CHAR_STR_VAL(obj), SCHEME_CHAR_STRLEN_VAL(obj),
&ulen, 0); &ulen, 0);