diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-05-27 21:30:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-05-27 21:30:30 +0000 |
| commit | 8549e48fbb8520027d4d8ba74b6f12f3042faebc (patch) | |
| tree | f4aa951f6c13d179ca711ae5977eb38698dcaf52 /src/core | |
| parent | d27904ad1988ba6f85228f3c0cb7de8379a3147b (diff) | |
ipv6 sync
git-svn-id: http://svn.miranda-ng.org/main/trunk@205 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/commonheaders.h | 2 | ||||
| -rw-r--r-- | src/core/miranda.cpp | 12 | ||||
| -rw-r--r-- | src/core/miranda.h | 9 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/core/commonheaders.h b/src/core/commonheaders.h index b70c0bab04..8603a42ffd 100644 --- a/src/core/commonheaders.h +++ b/src/core/commonheaders.h @@ -31,6 +31,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define _WIN32_WINNT 0x0700
#define _WIN32_IE 0x0601
+#define INCL_WINSOCK_API_TYPEDEFS 1
+
#include "m_stdhdr.h"
#include <winsock2.h>
diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index fe38d096e1..8ce9c0b0be 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -77,8 +77,10 @@ pfnGetBufferedPaintBits getBufferedPaintBits; pfnDwmExtendFrameIntoClientArea dwmExtendFrameIntoClientArea;
pfnDwmIsCompositionEnabled dwmIsCompositionEnabled;
-pfnGetaddrinfo MyGetaddrinfo;
-pfnFreeaddrinfo MyFreeaddrinfo;
+LPFN_GETADDRINFO MyGetaddrinfo;
+LPFN_FREEADDRINFO MyFreeaddrinfo;
+LPFN_WSASTRINGTOADDRESSA MyWSAStringToAddress;
+LPFN_WSAADDRESSTOSTRINGA MyWSAAddressToString;
ITaskbarList3 * pTaskbarInterface;
@@ -630,8 +632,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int ) }
HMODULE hWinSock = GetModuleHandleA("ws2_32");
- MyGetaddrinfo = (pfnGetaddrinfo)GetProcAddress(hWinSock, "getaddrinfo");
- MyFreeaddrinfo = (pfnFreeaddrinfo)GetProcAddress(hWinSock, "freeaddrinfo");
+ MyGetaddrinfo = (LPFN_GETADDRINFO)GetProcAddress(hWinSock, "getaddrinfo");
+ MyFreeaddrinfo = (LPFN_FREEADDRINFO)GetProcAddress(hWinSock, "freeaddrinfo");
+ MyWSAStringToAddress = (LPFN_WSASTRINGTOADDRESSA)GetProcAddress(hWinSock, "WSAStringToAddressA");
+ MyWSAAddressToString = (LPFN_WSAADDRESSTOSTRINGA)GetProcAddress(hWinSock, "WSAAddressToStringA");
if (bufferedPaintInit) bufferedPaintInit();
diff --git a/src/core/miranda.h b/src/core/miranda.h index 850e2a78c8..81c7c6d41f 100644 --- a/src/core/miranda.h +++ b/src/core/miranda.h @@ -108,11 +108,10 @@ typedef HRESULT ( STDAPICALLTYPE *pfnDwmIsCompositionEnabled )( BOOL * ); extern pfnDwmExtendFrameIntoClientArea dwmExtendFrameIntoClientArea;
extern pfnDwmIsCompositionEnabled dwmIsCompositionEnabled;
-typedef INT (STDAPICALLTYPE *pfnGetaddrinfo)(PCSTR pNodeName, PCSTR pServiceName, const ADDRINFOA * pHints, PADDRINFOA * ppResult);
-typedef INT (STDAPICALLTYPE *pfnFreeaddrinfo)(PADDRINFOA pAddrInfo);
-
-extern pfnGetaddrinfo MyGetaddrinfo;
-extern pfnFreeaddrinfo MyFreeaddrinfo;
+extern LPFN_GETADDRINFO MyGetaddrinfo;
+extern LPFN_FREEADDRINFO MyFreeaddrinfo;
+extern LPFN_WSASTRINGTOADDRESSA MyWSAStringToAddress;
+extern LPFN_WSAADDRESSTOSTRINGA MyWSAAddressToString;
/**** file.c ***************************************************************************/
|