You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/07/16 09:44:32 UTC
svn commit: r556537 - in /xerces/c/trunk: samples/src/PSVIWriter/
src/xercesc/com/ tests/src/DOM/DOMMemTest/ tests/src/MemHandlerTest/
Author: amassari
Date: Mon Jul 16 00:44:31 2007
New Revision: 556537
URL: http://svn.apache.org/viewvc?view=rev&rev=556537
Log:
Fixed 64-bit issues in COM object and samples/tests (XERCESC-1531)
Modified:
xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp
xerces/c/trunk/src/xercesc/com/IXMLDOMCharacterDataImpl.h
xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp
xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp
xerces/c/trunk/src/xercesc/com/XMLHTTPRequest.cpp
xerces/c/trunk/src/xercesc/com/XMLHttpRequest.h
xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
xerces/c/trunk/tests/src/MemHandlerTest/SimpleHashPtr.cpp
Modified: xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp (original)
+++ xerces/c/trunk/samples/src/PSVIWriter/PSVIWriterHandlers.cpp Mon Jul 16 00:44:31 2007
@@ -1621,7 +1621,7 @@
const XMLCh* PSVIWriterHandlers::getIdName(XSObject* obj) {
XMLCh* objLoc = new XMLCh[9];
- XMLString::binToText((unsigned long)obj, objLoc, 8, 16);
+ XMLString::binToText((unsigned long)(XMLSize_t)obj, objLoc, 8, 16);
XMLCh* idName = fIdMap->get(objLoc);
if (!idName) {
idName = createID(obj);
Modified: xerces/c/trunk/src/xercesc/com/IXMLDOMCharacterDataImpl.h
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/IXMLDOMCharacterDataImpl.h?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/src/xercesc/com/IXMLDOMCharacterDataImpl.h (original)
+++ xerces/c/trunk/src/xercesc/com/IXMLDOMCharacterDataImpl.h Mon Jul 16 00:44:31 2007
@@ -85,7 +85,7 @@
try
{
- *pVal = get_DOMCharacterData()->getLength();
+ *pVal = (long)get_DOMCharacterData()->getLength();
}
catch(...)
{
Modified: xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp (original)
+++ xerces/c/trunk/src/xercesc/com/XMLDOMDocument.cpp Mon Jul 16 00:44:31 2007
@@ -179,7 +179,7 @@
bHandled = TRUE;
- m_lReadyState = wParam;
+ m_lReadyState = (long)wParam;
Fire_onreadystatechange();
if (NULL != m_pOnReadyStateChange) {
CComVariant varResult;
Modified: xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp (original)
+++ xerces/c/trunk/src/xercesc/com/XMLDOMUtil.cpp Mon Jul 16 00:44:31 2007
@@ -737,9 +737,9 @@
void outputContent(xmlstream& target, const XMLCh* toWrite)
{
- int length = XMLString::stringLen(toWrite);
+ XMLSize_t length = XMLString::stringLen(toWrite);
- int index;
+ XMLSize_t index;
for (index = 0; index < length; index++)
{
switch (toWrite[index])
Modified: xerces/c/trunk/src/xercesc/com/XMLHTTPRequest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/XMLHTTPRequest.cpp?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/src/xercesc/com/XMLHTTPRequest.cpp (original)
+++ xerces/c/trunk/src/xercesc/com/XMLHTTPRequest.cpp Mon Jul 16 00:44:31 2007
@@ -119,7 +119,7 @@
bHandled = TRUE;
- m_lReadyState = wParam;
+ m_lReadyState = (long)wParam;
if (NULL != m_pOnReadyStateChange) {
CComVariant varResult;
DISPPARAMS disp = { NULL, NULL, 0, 0 };
@@ -741,7 +741,7 @@
if (S_OK != hr)
return hWnd;
- long lWnd = 0;
+ SHANDLE_PTR lWnd = 0;
hr = pWB->get_HWND(&lWnd);
if (S_OK != hr)
return hWnd;
@@ -750,7 +750,7 @@
}
void CALLBACK CXMLHttpRequest::InternetStatusCallback(HINTERNET hInternet,
- DWORD dwContext,
+ DWORD_PTR dwContext,
DWORD dwInternetStatus,
LPVOID lpvStatusInformation,
DWORD dwStatusInformationLength)
Modified: xerces/c/trunk/src/xercesc/com/XMLHttpRequest.h
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/com/XMLHttpRequest.h?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/src/xercesc/com/XMLHttpRequest.h (original)
+++ xerces/c/trunk/src/xercesc/com/XMLHttpRequest.h Mon Jul 16 00:44:31 2007
@@ -115,7 +115,7 @@
static _bstr_t GetErrorMsg(DWORD rc);
static void CALLBACK InternetStatusCallback(HINTERNET hInternet,
- DWORD dwContext,
+ DWORD_PTR dwContext,
DWORD dwInternetStatus,
LPVOID lpvStatusInformation,
DWORD dwStatusInformationLength);
Modified: xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp (original)
+++ xerces/c/trunk/tests/src/DOM/DOMMemTest/DOMMemTest.cpp Mon Jul 16 00:44:31 2007
@@ -429,7 +429,7 @@
el->appendChild(tx);
- int textLength = tx->getLength();
+ XMLSize_t textLength = tx->getLength();
TASSERT(textLength == 5);
DOMNodeList* nl = tx->getChildNodes();
@@ -1434,8 +1434,8 @@
for(i=0;i<20000;i++)
{
sprintf(tempchar, "time is %lu\n",XMLPlatformUtils::getCurrentMillis());
- int len = strlen(tempchar);
- for (int j = len; j < 4000-len; j++)
+ XMLSize_t len = strlen(tempchar);
+ for (XMLSize_t j = len; j < 4000-len; j++)
tempchar[j] = 'a';
pAttr->setNodeValue(X(tempchar));
}
@@ -1444,8 +1444,8 @@
for(i=0;i<20000;i++)
{
sprintf(tempchar, "time is %lu\n",XMLPlatformUtils::getCurrentMillis());
- int len = strlen(tempchar);
- for (int j = len; j < 4000-len; j++)
+ XMLSize_t len = strlen(tempchar);
+ for (XMLSize_t j = len; j < 4000-len; j++)
tempchar[j] = 'a';
text->setNodeValue(X(tempchar));
}
Modified: xerces/c/trunk/tests/src/MemHandlerTest/SimpleHashPtr.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/MemHandlerTest/SimpleHashPtr.cpp?view=diff&rev=556537&r1=556536&r2=556537
==============================================================================
--- xerces/c/trunk/tests/src/MemHandlerTest/SimpleHashPtr.cpp (original)
+++ xerces/c/trunk/tests/src/MemHandlerTest/SimpleHashPtr.cpp Mon Jul 16 00:44:31 2007
@@ -16,6 +16,7 @@
*/
#include "SimpleHashPtr.hpp"
+#include <xercesc/util/XercesDefs.hpp>
// this is just a copy of HashPtr which is careful to rely on global new.
@@ -30,7 +31,7 @@
unsigned int SimpleHashPtr::getHashVal(const void *const key, unsigned int mod)
{
- return ((long)key % (unsigned long)mod);
+ return (unsigned int)((XMLSize_t)key % mod);
}
bool SimpleHashPtr::equals(const void *const key1, const void *const key2)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org