Don't import MSVCRTD.DLL and don't fail when it could not be loaded.

This commit is contained in:
Saulius Krasuckas 2005-08-12 10:33:50 +00:00 committed by Alexandre Julliard
parent 68d4ca1f6a
commit 56171eea2d
2 changed files with 4 additions and 3 deletions

View File

@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
TESTDLL = msvcrtd.dll TESTDLL = msvcrtd.dll
IMPORTS = msvcrtd IMPORTS = msvcrt
EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
MODCFLAGS = @BUILTINFLAG@ MODCFLAGS = @BUILTINFLAG@

View File

@ -39,10 +39,11 @@ static void * (*pMSVCRTD_operator_new_dbg)(unsigned long, int, const char *, int
static int init_functions(void) static int init_functions(void)
{ {
HMODULE hModule = LoadLibraryA("msvcrtd.dll"); HMODULE hModule = LoadLibraryA("msvcrtd.dll");
ok(hModule != NULL, "LoadLibraryA failed\n");
if (!hModule) if (!hModule) {
trace("LoadLibraryA failed to load msvcrtd.dll with GLE=%ld\n", GetLastError());
return FALSE; return FALSE;
}
SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z"); SET(pMSVCRTD_operator_new_dbg, "??2@YAPAXIHPBDH@Z");
if (pMSVCRTD_operator_new_dbg == NULL) if (pMSVCRTD_operator_new_dbg == NULL)