MSVCRTD/tests: don't import MSVCRTD.DLL

Saulius Krasuckas saulius2 at ar.fi.lt
Fri Aug 12 03:47:19 CDT 2005


This DLL isn't to be found on most of modern Win platforms, according to 
[1][2].  So failure to LoadLibrary this DLL shouldn't be an object of a 
ok-testing.


[1] http://test.winehq.org/data/200506211000/
[2] http://test.winehq.org/data/200507221000/


Log message:
        Saulius Krasuckas <saulius.krasuckas at ieee.org>
        Don't import MSVCRTD.DLL and don't fail when it could not be loaded.


Index: dlls/msvcrtd/tests/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/msvcrtd/tests/Makefile.in,v
retrieving revision 1.2
diff -p -u -r1.2 Makefile.in
--- dlls/msvcrtd/tests/Makefile.in      11 Aug 2005 17:12:18 -0000      1.2
+++ dlls/msvcrtd/tests/Makefile.in      12 Aug 2005 08:27:08 -0000
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = msvcrtd.dll
-IMPORTS   = msvcrtd
+IMPORTS   = msvcrt
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
 
Index: dlls/msvcrtd/tests/debug.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrtd/tests/debug.c,v
retrieving revision 1.3
diff -p -u -r1.3 debug.c
--- dlls/msvcrtd/tests/debug.c  21 Jul 2005 10:34:09 -0000      1.3
+++ dlls/msvcrtd/tests/debug.c  12 Aug 2005 08:27:08 -0000
@@ -39,10 +39,11 @@ static void * (*pMSVCRTD_operator_new_db
 static int init_functions(void)
 {
   HMODULE hModule = LoadLibraryA("msvcrtd.dll");
-  ok(hModule != NULL, "LoadLibraryA failed\n");
 
-  if (!hModule) 
+  if (!hModule) {
+    trace("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", (int)GetLastError());
     return FALSE;
+  }
 
   SET(pMSVCRTD_operator_new_dbg, "??2 at YAPAXIHPBDH@Z");
   if (pMSVCRTD_operator_new_dbg == NULL)




More information about the wine-patches mailing list