amassari 2003/12/02 06:12:20
Modified: c/src/xercesc/util/NetAccessors/WinSock
BinHTTPURLInputStream.cpp
c/src/xercesc/util/MsgLoaders/Win32 Win32MsgLoader.cpp
Log:
Make the code compilable on Windows when UNICODE is defined (bug#16055)
Revision Changes Path
1.5 +15 -15
xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp
Index: BinHTTPURLInputStream.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BinHTTPURLInputStream.cpp 17 May 2003 05:54:18 -0000 1.4
+++ BinHTTPURLInputStream.cpp 2 Dec 2003 14:12:20 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/12/02 14:12:20 amassari
+ * Make the code compilable on Windows when UNICODE is defined (bug#16055)
+ *
* Revision 1.4 2003/05/17 05:54:18 knoaman
* Update NetAccessors to use the memory manager.
*
@@ -119,8 +122,6 @@
*/
-#define _WINSOCKAPI_
-
#define INCL_WINSOCK_API_TYPEDEFS 1
#include <winsock2.h>
#include <windows.h>
@@ -130,7 +131,6 @@
#include <string.h>
#include <stdlib.h>
-
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLNetAccessor.hpp>
#include <xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp>
@@ -171,18 +171,18 @@
ThrowXML(NetAccessorException, XMLExcepts::NetAcc_InitFailed);
}
else {
- startup = (LPFN_WSASTARTUP)
GetProcAddress(gWinsockLib,_T("WSAStartup"));
- gWSACleanup = (LPFN_WSACLEANUP)
GetProcAddress(gWinsockLib,_T("WSACleanup"));
- gWSgethostbyname = (LPFN_GETHOSTBYNAME)
GetProcAddress(gWinsockLib,_T("gethostbyname"));
- gWSinet_addr = (LPFN_INET_ADDR)
GetProcAddress(gWinsockLib,_T("inet_addr"));
- gWSgethostbyaddr = (LPFN_GETHOSTBYADDR)
GetProcAddress(gWinsockLib,_T("gethostbyaddr"));
- gWShtons = (LPFN_HTONS)
GetProcAddress(gWinsockLib,_T("htons"));
- gWSsocket = (LPFN_SOCKET)
GetProcAddress(gWinsockLib,_T("socket"));
- gWSconnect = (LPFN_CONNECT)
GetProcAddress(gWinsockLib,_T("connect"));
- gWSsend = (LPFN_SEND) GetProcAddress(gWinsockLib,_T("send"));
- gWSrecv = (LPFN_RECV) GetProcAddress(gWinsockLib,_T("recv"));
- gWSshutdown = (LPFN_SHUTDOWN)
GetProcAddress(gWinsockLib,_T("shutdown"));
- gWSclosesocket = (LPFN_CLOSESOCKET)
GetProcAddress(gWinsockLib,_T("closesocket"));
+ startup = (LPFN_WSASTARTUP)
GetProcAddress(gWinsockLib,"WSAStartup");
+ gWSACleanup = (LPFN_WSACLEANUP)
GetProcAddress(gWinsockLib,"WSACleanup");
+ gWSgethostbyname = (LPFN_GETHOSTBYNAME)
GetProcAddress(gWinsockLib,"gethostbyname");
+ gWSinet_addr = (LPFN_INET_ADDR)
GetProcAddress(gWinsockLib,"inet_addr");
+ gWSgethostbyaddr = (LPFN_GETHOSTBYADDR)
GetProcAddress(gWinsockLib,"gethostbyaddr");
+ gWShtons = (LPFN_HTONS) GetProcAddress(gWinsockLib,"htons");
+ gWSsocket = (LPFN_SOCKET) GetProcAddress(gWinsockLib,"socket");
+ gWSconnect = (LPFN_CONNECT)
GetProcAddress(gWinsockLib,"connect");
+ gWSsend = (LPFN_SEND) GetProcAddress(gWinsockLib,"send");
+ gWSrecv = (LPFN_RECV) GetProcAddress(gWinsockLib,"recv");
+ gWSshutdown = (LPFN_SHUTDOWN)
GetProcAddress(gWinsockLib,"shutdown");
+ gWSclosesocket = (LPFN_CLOSESOCKET)
GetProcAddress(gWinsockLib,"closesocket");
if(startup == NULL ||
gWSACleanup == NULL ||
1.9 +2 -2
xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
Index: Win32MsgLoader.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Win32MsgLoader.cpp 15 May 2003 18:29:49 -0000 1.8
+++ Win32MsgLoader.cpp 2 Dec 2003 14:12:20 -0000 1.9
@@ -181,7 +181,7 @@
const unsigned int theOfs = theMsgId & 0x000F;
// Try to find this resource. If we fail to find it, return false
- HRSRC hMsgRsc = ::FindResourceExA
+ HRSRC hMsgRsc = ::FindResourceEx
(
fModHandle
, RT_STRING
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
