Eliminate dependency on UNICODE macro.
This commit is contained in:
parent
53bb3bee34
commit
83e68987b3
@ -68,6 +68,25 @@ DSO_METHOD *DSO_METHOD_win32(void)
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|
||||||
|
#ifdef _WIN32_WCE
|
||||||
|
# if _WIN32_WCE < 300
|
||||||
|
static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)
|
||||||
|
{
|
||||||
|
WCHAR lpProcNameW[64];
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i=0;lpProcName[i] && i<64;i++)
|
||||||
|
lpProcNameW[i] = (WCHAR)lpProcName[i];
|
||||||
|
if (i==64) return NULL;
|
||||||
|
lpProcNameW[i] = 0;
|
||||||
|
|
||||||
|
return GetProcAddressW(hModule,lpProcNameW);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
# undef GetProcAddress
|
||||||
|
# define GetProcAddress GetProcAddressA
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Part of the hack in "win32_load" ... */
|
/* Part of the hack in "win32_load" ... */
|
||||||
#define DSO_MAX_TRANSLATED_SIZE 256
|
#define DSO_MAX_TRANSLATED_SIZE 256
|
||||||
|
|
||||||
@ -597,22 +616,6 @@ static const char *openssl_strnchr(const char *string, int c, size_t len)
|
|||||||
|
|
||||||
#include <tlhelp32.h>
|
#include <tlhelp32.h>
|
||||||
#ifdef _WIN32_WCE
|
#ifdef _WIN32_WCE
|
||||||
# if _WIN32_WCE < 300
|
|
||||||
static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)
|
|
||||||
{
|
|
||||||
WCHAR lpProcNameW[64];
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i=0;lpProcName[i] && i<64;i++)
|
|
||||||
lpProcNameW[i] = (WCHAR)lpProcName[i];
|
|
||||||
if (i==64) return NULL;
|
|
||||||
lpProcNameW[i] = 0;
|
|
||||||
|
|
||||||
return GetProcAddressW(hModule,lpProcNameW);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# undef GetProcAddress
|
|
||||||
# define GetProcAddress GetProcAddressA
|
|
||||||
# define DLLNAME "TOOLHELP.DLL"
|
# define DLLNAME "TOOLHELP.DLL"
|
||||||
#else
|
#else
|
||||||
# ifdef MODULEENTRY32
|
# ifdef MODULEENTRY32
|
||||||
|
@ -297,7 +297,7 @@ load_krb5_dll(void)
|
|||||||
HANDLE hKRB5_32;
|
HANDLE hKRB5_32;
|
||||||
|
|
||||||
krb5_loaded++;
|
krb5_loaded++;
|
||||||
hKRB5_32 = LoadLibrary("KRB5_32");
|
hKRB5_32 = LoadLibrary(TEXT("KRB5_32"));
|
||||||
if (!hKRB5_32)
|
if (!hKRB5_32)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user