From d0f67860ecd249433504f0f2b2cc1c4908adc3a1 Mon Sep 17 00:00:00 2001 From: jacob Date: Sat, 13 Mar 2010 15:14:30 +0000 Subject: [PATCH] I think r8738 broke IPv6 in MSVC Windows builds due to conflict with the WspiapiGetAddrInfo wrapper for getaddrinfo() in MSVC. Split GET_WINDOWS_FUNCTION into two variants, one with the old behaviour (bypassing the preprocessor) and another with the new behaviour (for ANSI/Unicode, although it's not actually used anywhere currently). git-svn-id: svn://svn.tartarus.org/sgt/putty@8898 cda61777-01e9-0310-a592-d414129be87e --- windows/winstuff.h | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/windows/winstuff.h b/windows/winstuff.h index 29ab0b30..5e95a9df 100644 --- a/windows/winstuff.h +++ b/windows/winstuff.h @@ -74,17 +74,31 @@ struct FontSpec { #define DF_END 0x0001 /* - * Dynamically linked functions. - * This is somewhat circuitous to allow function-renaming macros to be - * expanded, principally the ANSI/Unicode DoSomethingA/DoSomethingW. + * Dynamically linked functions. These come in two flavours: + * + * - GET_WINDOWS_FUNCTION does not expose "name" to the preprocessor, + * so will always dynamically link against exactly what is specified + * in "name". If you're not sure, use this one. + * + * - GET_WINDOWS_FUNCTION_PP allows "name" to be redirected via + * preprocessor definitions like "#define foo bar"; this is principally + * intended for the ANSI/Unicode DoSomething/DoSomethingA/DoSomethingW. + * If your function has an argument of type "LPTSTR" or similar, this + * is the variant to use. + * (However, it can't always be used, as it trips over more complicated + * macro trickery such as the WspiapiGetAddrInfo wrapper for getaddrinfo.) + * + * (DECL_WINDOWS_FUNCTION works with both these variants.) */ #define DECL_WINDOWS_FUNCTION(linkage, rettype, name, params) \ typedef rettype (WINAPI *t_##name) params; \ linkage t_##name p_##name #define STR1(x) #x #define STR(x) STR1(x) -#define GET_WINDOWS_FUNCTION(module, name) \ +#define GET_WINDOWS_FUNCTION_PP(module, name) \ p_##name = module ? (t_##name) GetProcAddress(module, STR(name)) : NULL +#define GET_WINDOWS_FUNCTION(module, name) \ + p_##name = module ? (t_##name) GetProcAddress(module, #name) : NULL /* * Global variables. Most modules declare these `extern', but -- 2.11.0