rik/jlibcom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SF1793346 Replace deprecated wcstombs and remove unused variables

Browse Source
This commit is contained in:
clay_shooter
2007-09-13 01:07:36 +00:00
parent 8f36ecc309
commit 97b1a279cc
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/ReleaseNotes.html
View File

@@ -53,6 +53,10 @@
backwards compatible by default. backwards compatible by default.
</td> </td>
</tr> </tr>
<tr>
<td width="13%" valign="top">1793346</td>
<td width="87%" valign="top">(M5) Replaced use of deprecated API and removed unused variables.</td>
</tr>
<tr> <tr>
<td width="13%" valign="top">&nbsp;</td> <td width="13%" valign="top">&nbsp;</td>
<td width="87%" valign="top">&nbsp;</td> <td width="87%" valign="top">&nbsp;</td>

3
jni/Dispatch.cpp
View File

@@ -319,7 +319,8 @@ static char* BasicToCharString(const BSTR inBasicString)
if (charStrSize > 1) if (charStrSize > 1)
{ {
charString = new char[charStrSize]; charString = new char[charStrSize];
size_t len = ::wcstombs(charString, inBasicString, charStrSize); size_t convertedSize;
::wcstombs_s(&convertedSize, charString, charStrSize, inBasicString, charStrSize);
} }
else else
charString = ::_strdup(""); charString = ::_strdup("");

3
jni/SafeArray.cpp
View File

@@ -1778,7 +1778,6 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_getStrings
long lb, ub; long lb, ub;
SafeArrayGetLBound(sa, 1, &lb); SafeArrayGetLBound(sa, 1, &lb);
SafeArrayGetUBound(sa, 1, &ub); SafeArrayGetUBound(sa, 1, &ub);
int num = ub - lb + 1;
VARTYPE vt; VARTYPE vt;
SafeArrayGetVartype(sa, &vt); SafeArrayGetVartype(sa, &vt);
if (vt == VT_VARIANT) if (vt == VT_VARIANT)
@@ -2162,7 +2161,6 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_getBooleans
long lb, ub; long lb, ub;
SafeArrayGetLBound(sa, 1, &lb); SafeArrayGetLBound(sa, 1, &lb);
SafeArrayGetUBound(sa, 1, &ub); SafeArrayGetUBound(sa, 1, &ub);
int num = ub - lb + 1;
VARTYPE vt; VARTYPE vt;
SafeArrayGetVartype(sa, &vt); SafeArrayGetVartype(sa, &vt);
if (vt == VT_BOOL) { if (vt == VT_BOOL) {
@@ -2397,7 +2395,6 @@ JNIEXPORT void JNICALL Java_com_jacob_com_SafeArray_getVariants
long lb, ub; long lb, ub;
SafeArrayGetLBound(sa, 1, &lb); SafeArrayGetLBound(sa, 1, &lb);
SafeArrayGetUBound(sa, 1, &ub); SafeArrayGetUBound(sa, 1, &ub);
int num = ub - lb + 1;
VARTYPE vt; VARTYPE vt;
SafeArrayGetVartype(sa, &vt); SafeArrayGetVartype(sa, &vt);
if (vt == VT_VARIANT) if (vt == VT_VARIANT)