Changeset 2198 for trunk/src

Timestamp:

Dec 24, 1999, 7:40:41 PM (26 years ago)

Author:

sandervl

Message:

removed some logging (dprintf -> dprintf2)

Location:

trunk/src/crtdll

Files:

• crt.cpp (modified) (80 diffs)
• crtdll.cpp (modified) (362 diffs)

trunk/src/crtdll/crt.cpp

@@ -1 @@
-/* $Id: crt.cpp,v 1.2 1999-12-21 13:46:24 sandervl Exp $ */
+/* $Id: crt.cpp,v 1.3 1999-12-24 18:40:41 sandervl Exp $ */
 
 /*
@@ -55 +55 @@
 int CDECL CRTDLL__wcsicmp(LPWSTR str1, LPWSTR str2)
 {
-  dprintf(("CRTDLL: _wcsicmp(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: _wcsicmp(%08xh,%08xh)\n",
            str1,
            str2));
@@ -81 +81 @@
   DWORD dwIndex;
 
-  dprintf(("CRTDLL: _wcslwr(%08xh)\n",
+  dprintf2(("CRTDLL: _wcslwr(%08xh)\n",
            str));
 
@@ -112 +112 @@
   LPWSTR w2;
 
-  dprintf(("CRTDLL: _wcsnicmp(%08xh,%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: _wcsnicmp(%08xh,%08xh,%08xh)\n",
            str1,
            str2,
@@ -144 +144 @@
   DWORD dwIndex;
 
-  dprintf(("CRTDLL: _wcsupr(%08xh)\n",
+  dprintf2(("CRTDLL: _wcsupr(%08xh)\n",
            str));
 
@@ -173 +173 @@
 double CDECL CRTDLL_abs(double d)
 {
-  dprintf(("CRTDLL: abs(%f)\n",
+  dprintf2(("CRTDLL: abs(%f)\n",
            d));
 
@@ -194 +194 @@
 double CDECL CRTDLL_atan(double d)
 {
-  dprintf(("CRTDLL: atan(%f)\n",
+  dprintf2(("CRTDLL: atan(%f)\n",
            d));
 
@@ -215 +215 @@
 int CDECL CRTDLL_atoi(LPSTR str)
 {
-  dprintf(("CRTDLL: atoi(%s)\n",
+  dprintf2(("CRTDLL: atoi(%s)\n",
            str));
 
@@ -236 +236 @@
 long CDECL CRTDLL_atol(LPSTR str)
 {
-  dprintf(("CRTDLL: atol(%s)\n",
+  dprintf2(("CRTDLL: atol(%s)\n",
            str));
 
@@ -257 +257 @@
 double CDECL CRTDLL_ceil(double d)
 {
-  dprintf(("CRTDLL: ceil(%f)\n",
+  dprintf2(("CRTDLL: ceil(%f)\n",
            d));
 
@@ -278 +278 @@
 double CDECL CRTDLL_cos(double d)
 {
-  dprintf(("CRTDLL: cos(%f)\n",
+  dprintf2(("CRTDLL: cos(%f)\n",
            d));
 
@@ -299 +299 @@
 double CDECL CRTDLL_fabs(double d)
 {
-  dprintf(("CRTDLL: fabs(%f)\n",
+  dprintf2(("CRTDLL: fabs(%f)\n",
            d));
 
@@ -320 +320 @@
 double CDECL CRTDLL_floor(double d)
 {
-  dprintf(("CRTDLL: floor(%f)\n",
+  dprintf2(("CRTDLL: floor(%f)\n",
            d));
 
@@ -341 +341 @@
 int CDECL CRTDLL_isalpha(int i)
 {
-  dprintf(("CRTDLL: isalpha(%08xh)\n",
+  dprintf2(("CRTDLL: isalpha(%08xh)\n",
            i));
 
@@ -362 +362 @@
 int CDECL CRTDLL_isdigit(int i)
 {
-  dprintf(("CRTDLL: isdigit(%08xh)\n",
+  dprintf2(("CRTDLL: isdigit(%08xh)\n",
            i));
 
@@ -383 +383 @@
 int CDECL CRTDLL_islower(int i)
 {
-  dprintf(("CRTDLL: islower(%08xh)\n",
+  dprintf2(("CRTDLL: islower(%08xh)\n",
            i));
 
@@ -404 +404 @@
 int CDECL CRTDLL_isprint(int i)
 {
-  dprintf(("CRTDLL: isprint(%08xh)\n",
+  dprintf2(("CRTDLL: isprint(%08xh)\n",
            i));
 
@@ -425 +425 @@
 int CDECL CRTDLL_isspace(int i)
 {
-  dprintf(("CRTDLL: isspace(%08xh)\n",
+  dprintf2(("CRTDLL: isspace(%08xh)\n",
            i));
 
@@ -446 +446 @@
 int CDECL CRTDLL_isupper(int i)
 {
-  dprintf(("CRTDLL: isupper(%08xh)\n",
+  dprintf2(("CRTDLL: isupper(%08xh)\n",
            i));
 
@@ -471 +471 @@
   va_list argptr;                          /* -> variable argument list */
 
-//  dprintf(("CRTDLL: sprintf(%08xh,%s)\n",
-//           lpstrBuffer,
-//          lpstrFormat));
+  dprintf2(("CRTDLL: sprintf(%08xh,%s)\n",
+           lpstrBuffer,
+           lpstrFormat));
 
   va_start(argptr,
@@ -502 +502 @@
                       const LPSTR str2)
 {
-  dprintf(("CRTDLL: strcat\n"));
+  dprintf2(("CRTDLL: strcat\n"));
 
   return (strcat(str1, str2));
@@ -523 +523 @@
                        int         i)
 {
-  dprintf(("CRTDLL: strchr(%s,%08xh)\n",
+  dprintf2(("CRTDLL: strchr(%s,%08xh)\n",
            str,
            i));
@@ -546 +546 @@
                       const LPSTR str2)
 {
-  dprintf(("CRTDLL: strcmp(%s,%s)\n",
+  dprintf2(("CRTDLL: strcmp(%s,%s)\n",
            str1,
            str2));
@@ -569 +569 @@
                       const LPSTR str2)
 {
-//  dprintf(("CRTDLL: _stricmp(%s,%s)\n",
-//           str1,
-//           str2));
+  dprintf2(("CRTDLL: _stricmp(%s,%s)\n",
+           str1,
+           str2));
 
   return (stricmp(str1, str2));
@@ -592 +592 @@
                        const LPSTR str2)
 {
-//  dprintf(("CRTDLL: strcpy\n"));
+  dprintf2(("CRTDLL: strcpy\n"));
 
   return (strcpy(str1, str2));
@@ -613 +613 @@
                                 LPSTR str2)
 {
-//  dprintf(("CRTDLL: strcspn(%s,%s)\n",
-//           str1,
-//           str2));
+  dprintf2(("CRTDLL: strcspn(%s,%s)\n",
+           str1,
+           str2));
 
   return (strcspn(str1, str2));
@@ -635 +635 @@
 size_t CDECL CRTDLL_strlen(const LPSTR str)
 {
-//  dprintf(("CRTDLL: strlen(%s)\n",
-//           str));
+  dprintf2(("CRTDLL: strlen(%s)\n",
+           str));
 
   return (strlen(str));
@@ -658 +658 @@
                         size_t      i)
 {
-//  dprintf(("CRTDLL: strncat(%s,%s,%08xh)\n",
-//           str1,
-//           str2,
-//           i));
+  dprintf2(("CRTDLL: strncat(%s,%s,%08xh)\n",
+           str1,
+           str2,
+           i));
 
   return (strncat(str1, str2, i));
@@ -683 +683 @@
                        size_t      i)
 {
-//  dprintf(("CRTDLL: strncmp(%s,%s,%08xh)\n",
-//           str1,
-//           str2,
-//           i));
+  dprintf2(("CRTDLL: strncmp(%s,%s,%08xh)\n",
+           str1,
+           str2,
+           i));
 
   return (strncmp(str1, str2, i));
@@ -708 +708 @@
                         size_t      i)
 {
-//  dprintf(("CRTDLL: strncpy(%s,%s,%08xh)\n",
-//           str1,
-//           str2,
-//           i));
+  dprintf2(("CRTDLL: strncpy(%s,%s,%08xh)\n",
+           str1,
+           str2,
+           i));
 
   return (strncpy(str1, str2, i));
@@ -732 +732 @@
                       const LPSTR str2)
 {
-  dprintf(("CRTDLL: strpbrk(%s,%s)\n",
+  dprintf2(("CRTDLL: strpbrk(%s,%s)\n",
            str1,
            str2));
@@ -755 +755 @@
                         size_t      i)
 {
-  dprintf(("CRTDLL: strrchr(%s,%08xh)\n",
+  dprintf2(("CRTDLL: strrchr(%s,%08xh)\n",
            str,
            i));
@@ -778 +778 @@
                        const LPSTR str2)
 {
-  dprintf(("CRTDLL: strspn(%s,%s)\n",
+  dprintf2(("CRTDLL: strspn(%s,%s)\n",
            str1,
            str2));
@@ -801 +801 @@
                        const LPSTR str2)
 {
-//  dprintf(("CRTDLL: strstr(%s,%s)\n",
-//           str1,
-//           str2));
+  dprintf2(("CRTDLL: strstr(%s,%s)\n",
+           str1,
+           str2));
 
   return (strstr(str1, str2));
@@ -829 +829 @@
   int     rc;
 
-//  dprintf(("CRTDLL: swprintf(%s,%d,%s)\n",
-//           str,
-//           i,
-//           format));
+  dprintf2(("CRTDLL: swprintf(%s,%d,%s)\n",
+           str,
+           i,
+           format));
 
   va_start( valist, format );
@@ -858 +858 @@
 double CDECL CRTDLL_tan(double d)
 {
-  dprintf(("CRTDLL: tan(%f)\n",
+  dprintf2(("CRTDLL: tan(%f)\n",
            d));
 
@@ -879 +879 @@
 int CDECL CRTDLL_toupper(int c)
 {
-  dprintf(("CRTDLL: toupper(%c)\n",
+  dprintf2(("CRTDLL: toupper(%c)\n",
            c));
 
@@ -900 +900 @@
 int CDECL CRTDLL_tolower(int c)
 {
-  dprintf(("CRTDLL: tolower(%c)\n",
+  dprintf2(("CRTDLL: tolower(%c)\n",
            c));
 
@@ -921 +921 @@
 int CDECL CRTDLL_towupper(int c)
 {
-  dprintf(("CRTDLL: towupper(%c)\n",
+  dprintf2(("CRTDLL: towupper(%c)\n",
            c));
 
@@ -942 +942 @@
 int CDECL CRTDLL_towlower(int c)
 {
-  dprintf(("CRTDLL: towlower(%c)\n",
+  dprintf2(("CRTDLL: towlower(%c)\n",
            c));
 
@@ -965 +965 @@
                        const wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcscat(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcscat(%08xh,%08xh)\n",
            str1,
            str2));
@@ -988 +988 @@
                        int          i)
 {
-  dprintf(("CRTDLL: wcschr(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcschr(%08xh,%08xh)\n",
            str,
            i));
@@ -1011 +1011 @@
                     const wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcscmp(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcscmp(%08xh,%08xh)\n",
            str1,
            str2));
@@ -1034 +1034 @@
                        const wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcscpy(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcscpy(%08xh,%08xh)\n",
            str1,
            str2));
@@ -1057 +1057 @@
                               wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcscspn(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcscspn(%08xh,%08xh)\n",
            str1,
            str2));
@@ -1079 +1079 @@
 size_t CDECL CRTDLL_wcslen(const wchar_t* str)
 {
-  dprintf(("CRTDLL: wcslen(%08xh)\n",
+  dprintf2(("CRTDLL: wcslen(%08xh)\n",
            str));
 
@@ -1102 +1102 @@
                         size_t      i)
 {
-  dprintf(("CRTDLL: wcsncat(%08xh,%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcsncat(%08xh,%08xh,%08xh)\n",
            str1,
            str2,
@@ -1127 +1127 @@
                      size_t      i)
 {
-  dprintf(("CRTDLL: wcsncmp(%08xh,%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcsncmp(%08xh,%08xh,%08xh)\n",
            str1,
            str2,
@@ -1152 +1152 @@
                           size_t       i)
 {
-  dprintf(("CRTDLL: wcsncpy(%s,%s,%08xh)\n",
+  dprintf2(("CRTDLL: wcsncpy(%s,%s,%08xh)\n",
            str1,
            str2,
@@ -1176 +1176 @@
                         const wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcspbrk(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcspbrk(%08xh,%08xh)\n",
            str1,
            str2));
@@ -1199 +1199 @@
                         size_t       i)
 {
-  dprintf(("CRTDLL: wcsrchr(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcsrchr(%08xh,%08xh)\n",
            str,
            i));
@@ -1222 +1222 @@
                        const wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcsspn(%08xh,%08xh)\n",
+  dprintf2(("CRTDLL: wcsspn(%08xh,%08xh)\n",
            str1,
            str2));
@@ -1245 +1245 @@
                          const wchar_t* str2)
 {
-  dprintf(("CRTDLL: wcsstr(%s,%s)\n",
+  dprintf2(("CRTDLL: wcsstr(%s,%s)\n",
            str1,
            str2));
@@ -1267 +1267 @@
 char * CDECL CRTDLL__itoa(int i, char *s, int r)
 {
-  dprintf(("CRTDLL: _itoa(%08xh, %08xh, %08xh)\n",
+  dprintf2(("CRTDLL: _itoa(%08xh, %08xh, %08xh)\n",
            i,
            s,
@@ -1377 +1377 @@
         DWORD len       /* [in] length to compare */ )
 {
-        dprintf(("CRTDLL: memicmp(%08xh, %08xh, %08xh)\n",s1,s2,len));
+        dprintf2(("CRTDLL: memicmp(%08xh, %08xh, %08xh)\n",s1,s2,len));
         int     i;
 
@@ -1450 +1450 @@
 void CDECL CRTDLL__splitpath( const char *path, char *drive, char *dir, char *fname, char *ext )
 {
-        dprintf(("CRTDLL: _splitpath"));
+        dprintf2(("CRTDLL: _splitpath"));
 
         char *tmp_drive;
@@ -1504 +1504 @@
 void CDECL CRTDLL__strcmpi( LPCSTR s1, LPCSTR s2 )
 {
-  dprintf(("CRTDLL: _strcmpi(%08xh, %08xh)\n",
+  dprintf2(("CRTDLL: _strcmpi(%08xh, %08xh)\n",
            s1,
            s2));
@@ -1528 +1528 @@
   char *y =x;
 
-  dprintf(("CRTDLL: _strlwr got %s\n", x));
+  dprintf2(("CRTDLL: _strlwr got %s\n", x));
   while (*y) {
     if ((*y > 0x40) && (*y< 0x5b))
@@ -1534 +1534 @@
     y++;
   }
-  dprintf(("   returned %s\n", x));
+  dprintf2(("   returned %s\n", x));
                 
   return x;
@@ -1554 +1554 @@
 int  CDECL CRTDLL__strnicmp( LPCSTR s1, LPCSTR s2, INT n )
 {
-  dprintf(("CRTDLL: _strnicmp (%s,%s,%d)\n",
+  dprintf2(("CRTDLL: _strnicmp (%s,%s,%d)\n",
            s1,
            s2,
@@ -1590 +1590 @@
 LPSTR CDECL CRTDLL__strupr(LPSTR x)
 {
-  dprintf(("CRTDLL: _strupr(%s)\n",
+  dprintf2(("CRTDLL: _strupr(%s)\n",
            x));
 
@@ -1636 +1636 @@
 int CDECL CRTDLL__vsnprintf( char *s, size_t bufsize, const char *format, va_list arg )
 {
-  dprintf(("CRTDLL: _vsnprintf(%08xh, %08xh, %08xh)\n",
+  dprintf2(("CRTDLL: _vsnprintf(%08xh, %08xh, %08xh)\n",
            s,
            bufsize,
@@ -1659 +1659 @@
 int CDECL CRTDLL_iswalpha(wint_t i)
 {
-  dprintf(("CRTDLL: iswalpha(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswalpha(%08xh)\n", i));
 
   return (iswalpha(i));
@@ -1679 +1679 @@
 int CDECL CRTDLL_iswctype(wint_t i, wctype_t wct)
 {
-  dprintf(("CRTDLL: iswctype(%08xh, %08xh)\n", i, wct));
+  dprintf2(("CRTDLL: iswctype(%08xh, %08xh)\n", i, wct));
 
   return (iswctype(i, wct));
@@ -1699 +1699 @@
 int CDECL CRTDLL_isxdigit(int i)
 {
-  dprintf(("CRTDLL: isxdigit(%08xh)\n", i));
+  dprintf2(("CRTDLL: isxdigit(%08xh)\n", i));
 
   return (isxdigit(i));
@@ -1719 +1719 @@
 long int CDECL CRTDLL_labs( long int j )
 {
-  dprintf(("CRTDLL: labs(%08xh)\n", j));
+  dprintf2(("CRTDLL: labs(%08xh)\n", j));
 
   return (labs(j));
@@ -1739 +1739 @@
 double CDECL CRTDLL_log( double x )
 {
-  dprintf(("CRTDLL: log(%08xh)\n", x));
+  dprintf2(("CRTDLL: log(%08xh)\n", x));
   return (log(x));
 }
@@ -1758 +1758 @@
 size_t CDECL CRTDLL_mbstowcs( wchar_t *pwcs, const char *s, size_t n )
 {
-      dprintf(("CRTDLL: mbstowcs(%08xh, %08xh, %08xh)\n", pwcs, s, n));
+      dprintf2(("CRTDLL: mbstowcs(%08xh, %08xh, %08xh)\n", pwcs, s, n));
       return (mbstowcs(pwcs, s, n));
 }
@@ -1777 +1777 @@
 void * CDECL CRTDLL_memchr( const void *s, int c, size_t n )
 {
-    dprintf(("CRTDLL: memchr(%08xh, %08xh, %08xh)\n", s, c, n));
+    dprintf2(("CRTDLL: memchr(%08xh, %08xh, %08xh)\n", s, c, n));
     return memchr( s, c, n );
 }
@@ -1796 +1796 @@
 int CDECL CRTDLL_memcmp( const void * c1, const void * c2, size_t n )
 {
-    dprintf(("CRTDLL: memcmp(%08xh, %08xh, %08xh)\n", c1, c2, n));
+    dprintf2(("CRTDLL: memcmp(%08xh, %08xh, %08xh)\n", c1, c2, n));
     return memcmp( c1, c2, n );
 }
@@ -1814 +1814 @@
 void * CDECL CRTDLL_memcpy( void *s1, const void *s2, size_t n )
 {
-    dprintf(("CRTDLL: memcpy(%08xh, %08xh, %08xh)\n", s1, s2, n));
+    dprintf2(("CRTDLL: memcpy(%08xh, %08xh, %08xh)\n", s1, s2, n));
     return memcpy( s1, s2, n );
 }
@@ -1833 +1833 @@
 void * CDECL CRTDLL_memset( void *s, int i, size_t n )
 {
-    dprintf(("CRTDLL: memset(%08xh, %08xh, %08xh)\n", s, i, n));
+    dprintf2(("CRTDLL: memset(%08xh, %08xh, %08xh)\n", s, i, n));
     return memset( s, i, n );
 }
@@ -1857 +1857 @@
 double CDECL CRTDLL_pow( double x, double y )   
 {
-    dprintf(("CRTDLL: pow(%08xh, %08xh)\n",x, y));
+    dprintf2(("CRTDLL: pow(%08xh, %08xh)\n",x, y));
     return pow( x, y );
 }
@@ -1877 +1877 @@
 double CDECL CRTDLL_sin( double x )
 {
-  dprintf(("CRTDLL: sin(%08xh)\n", x));
+  dprintf2(("CRTDLL: sin(%08xh)\n", x));
   return (sin(x));
 }
@@ -1896 +1896 @@
 double CDECL CRTDLL_sqrt( double x )
 {
-  dprintf(("CRTDLL: sqrt(%08xh)\n", x));
+  dprintf2(("CRTDLL: sqrt(%08xh)\n", x));
   return (sqrt(x));
 }
@@ -1935 +1935 @@
 int CDECL CRTDLL_vsprintf( char *s, const char *format, va_list arg )
 {
-  dprintf(("CRTDLL: vsprintf(%08xh, %08xh)\n", s, format));
+  dprintf2(("CRTDLL: vsprintf(%08xh, %08xh)\n", s, format));
   return (vsprintf(s, format, arg));
 }
@@ -1954 +1954 @@
 wchar_t * CDECL CRTDLL_wcstok( wchar_t *s1, const wchar_t *s2, wchar_t **ptr )
 {
-  dprintf(("CRTDLL: wcstok(%08xh, %08xh, %08xh)\n",s1,s2,ptr));
+  dprintf2(("CRTDLL: wcstok(%08xh, %08xh, %08xh)\n",s1,s2,ptr));
   return (wcstok(s1, s2, ptr));
 }
@@ -1972 +1972 @@
 long int CDECL CRTDLL_wcstol( const wchar_t *s1, wchar_t **s2, int i )
 {
-  dprintf(("CRTDLL: wcstol(%08xh, %08xh, %08xh)\n",s1,s2,i));
+  dprintf2(("CRTDLL: wcstol(%08xh, %08xh, %08xh)\n",s1,s2,i));
   return (wcstol(s1, s2, i));
 }
@@ -1991 +1991 @@
 size_t CDECL CRTDLL_wcstombs( char *s, const wchar_t *pwcs, size_t n )
 {
-  dprintf(("CRTDLL: wcstombs(%08xh, %08xh, %08xh)\n",s,pwcs,n));
+  dprintf2(("CRTDLL: wcstombs(%08xh, %08xh, %08xh)\n",s,pwcs,n));
   return (wcstombs(s, pwcs, n));
 }
@@ -2010 +2010 @@
 unsigned long int CDECL CRTDLL_wcstoul( const wchar_t *s1, wchar_t **s2, int i )
 {
-  dprintf(("CRTDLL: wcstoul(%08xh, %08xh, %08xh)\n",s1,s2,i));
+  dprintf2(("CRTDLL: wcstoul(%08xh, %08xh, %08xh)\n",s1,s2,i));
   return (wcstoul(s1, s2, i));
 }

trunk/src/crtdll/crtdll.cpp

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.18 1999-12-21 13:46:24 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.19 1999-12-24 18:40:41 sandervl Exp $ */
 
 /*
@@ -5 +5 @@
  * 
  * Implements C run-time functionality as known from UNIX.
+ *
+ * TODO: Check setjmp(3) 
  *
  * Partialy based on Wine and ReactOS
@@ -82 +84 @@
 VOID* CDECL CRTDLL_new(DWORD size)
 {
-    dprintf(("CRTDLL: ??2@YAPAXI@Z\n"));
+    dprintf2(("CRTDLL: ??2@YAPAXI@Z\n"));
     VOID* result;
     if(!(result = Heap_Alloc(size)) && new_handler)
@@ -95 +97 @@
 VOID CDECL CRTDLL_delete(VOID* ptr)
 {
-    dprintf(("CRTDLL: ??3@YAXPAX@Z\n"));
+    dprintf2(("CRTDLL: ??3@YAXPAX@Z\n"));
     Heap_Free(ptr);
 }
@@ -105 +107 @@
 new_handler_type CDECL CRTDLL_set_new_handler(new_handler_type func)
 {
-    dprintf(("CRTDLL: ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z\n"));
+    dprintf2(("CRTDLL: ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z\n"));
     new_handler_type old_handler = new_handler;
     new_handler = func;
@@ -115 +117 @@
  *                  _CIacos    (CRTDLL.004)
  */
-double CDECL CRTDLL__CIacos( double x )
-{
-  dprintf(("CRTDLL: _CIacos\n"));
-  dprintf(("should be register function\n"));
+double CDECL CRTDLL__CIacos(double x)
+{
+  dprintf2(("CRTDLL: _CIacos\n"));
+  dprintf2(("should be register function\n"));
   return acos(x);
 }
@@ -128 +130 @@
 double CDECL CRTDLL__CIasin( double x )
 {
-  dprintf(("CRTDLL: _CIasin\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIasin\n"));
+  dprintf2(("should be register function\n"));
   return asin(x);
 }
@@ -139 +141 @@
 double CDECL CRTDLL__CIatan( double x )
 {
-  dprintf(("CRTDLL: _CIatan\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIatan\n"));
+  dprintf2(("should be register function\n"));
   return atan(x);
 }
@@ -150 +152 @@
 double CDECL CRTDLL__CIatan2( double x, double y )
 {
-  dprintf(("CRTDLL: _CIatan2\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIatan2\n"));
+  dprintf2(("should be register function\n"));
   return atan2(x,y);
 }
@@ -161 +163 @@
 double CDECL CRTDLL__CIcos( double x )
 {
-  dprintf(("CRTDLL: _CIcos\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIcos\n"));
+  dprintf2(("should be register function\n"));
   return cos(x);
 }
@@ -172 +174 @@
 double CDECL CRTDLL__CIcosh( double x )
 {
-  dprintf(("CRTDLL: _CIcosh\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIcosh\n"));
+  dprintf2(("should be register function\n"));
   return cosh(x);
 }
@@ -183 +185 @@
 double CDECL CRTDLL__CIexp( double x )
 {
-  dprintf(("CRTDLL: _CIexp\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIexp\n"));
+  dprintf2(("should be register function\n"));
   return exp(x);
 }
@@ -194 +196 @@
 double CDECL CRTDLL__CIfmod( double x, double y )
 {
-  dprintf(("CRTDLL: _CIfmod\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIfmod\n"));
+  dprintf2(("should be register function\n"));
   return fmod(x,y);
 }
@@ -205 +207 @@
 double CDECL CRTDLL__CIlog( double x )
 {
-  dprintf(("CRTDLL: _CIlog\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIlog\n"));
+  dprintf2(("should be register function\n"));
   return log(x);
 }
@@ -216 +218 @@
 double CDECL CRTDLL__CIlog10( double x )
 {
-  dprintf(("CRTDLL: _CIlog10\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIlog10\n"));
+  dprintf2(("should be register function\n"));
   return log10(x);
 }
@@ -227 +229 @@
 double CDECL CRTDLL__CIsin( double x )
 {
-  dprintf(("CRTDLL: _CIsin\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIsin\n"));
+  dprintf2(("should be register function\n"));
   return sin(x);
 }
@@ -238 +240 @@
 double CDECL CRTDLL__CIsinh( double x )
 {
-  dprintf(("CRTDLL: _CIsinh\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIsinh\n"));
+  dprintf2(("should be register function\n"));
   return sinh(x);
 }
@@ -249 +251 @@
 double CDECL CRTDLL__CIsqrt( double x )
 {
-  dprintf(("CRTDLL: _CIsqrt\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CIsqrt\n"));
+  dprintf2(("should be register function\n"));
   return acos(x);
 }
@@ -260 +262 @@
 double CDECL CRTDLL__CItan( double x )
 {
-  dprintf(("CRTDLL: _CItan\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CItan\n"));
+  dprintf2(("should be register function\n"));
   return tan(x);
 }
@@ -271 +273 @@
 double CDECL CRTDLL__CItanh( double x )
 {
-  dprintf(("CRTDLL: _CItanh\n"));
-  dprintf(("should be register function\n"));
+  dprintf2(("CRTDLL: _CItanh\n"));
+  dprintf2(("should be register function\n"));
   return tanh(x);
 }
@@ -282 +284 @@
 INT CDECL CRTDLL__XcptFilter(DWORD ret, struct _EXCEPTION_POINTERS *  ExceptionInfo )
 {
-  dprintf(("CRTDLL: _XcptFilter\n"));
+  dprintf2(("CRTDLL: _XcptFilter\n"));
   return UnhandledExceptionFilter(ExceptionInfo);
 }
@@ -298 +300 @@
         DWORD   version;
 
-        dprintf(("CRTDLL: GetMainArgs\n"));
+        dprintf2(("CRTDLL: GetMainArgs\n"));
 
         CRTDLL_acmdln_dll = cmdline = HEAP_strdupA( GetProcessHeap(), 0,
@@ -348 +350 @@
         *argv           = xargv;
         CRTDLL_environ_dll = *environ = GetEnvironmentStringsA();
-        dprintf(("CRTDLL: GetMainArgs end\n"));
+        dprintf2(("CRTDLL: GetMainArgs end\n"));
         return 0;
 }
@@ -367 +369 @@
 int * CDECL CRTDLL___doserrno()
 {       
-        dprintf(("__doserrno\n"));
+        dprintf2(("__doserrno\n"));
         _doserrno = GetLastError();
         return &_doserrno;
@@ -380 +382 @@
 int * CDECL CRTDLL___fpecode ( void )
 {       
-        dprintf(("__fpecode\n"));
+        dprintf2(("__fpecode\n"));
         return &fpecode;
 }
@@ -390 +392 @@
 int CDECL CRTDLL___isascii(int i)
 {
-  dprintf(("CRTDLL: __isascii\n"));
+  dprintf2(("CRTDLL: __isascii\n"));
   return  (!((i)&(~0x7f)));
 }
@@ -400 +402 @@
 int CDECL CRTDLL___iscsym(int c)
 {
-  dprintf(("CRTDLL: __iscsym\n"));
+  dprintf2(("CRTDLL: __iscsym\n"));
   return (CRTDLL_isalnum(c) || ( c == '_' )) ;
 }
@@ -410 +412 @@
 int CDECL CRTDLL___iscsymf(int c)
 {
-  dprintf(("CRTDLL: __iscsymf\n"));
+  dprintf2(("CRTDLL: __iscsymf\n"));
   return (isalpha(c) || ( c == '_' )) ;
 }
@@ -431 +433 @@
 unsigned long CDECL CRTDLL___threadhandle( void )
 {
-  dprintf(("CRTDLL: __threadhandle\n"));
+  dprintf2(("CRTDLL: __threadhandle\n"));
   return GetCurrentThread();
 }
@@ -441 +443 @@
 unsigned long CDECL CRTDLL___threadid(void)
 {
-  dprintf(("CRTDLL: __threadid\n"));
+  dprintf2(("CRTDLL: __threadid\n"));
   return GetCurrentThreadId();
 }
@@ -462 +464 @@
 int CDECL CRTDLL__access(const char *path,int mode)
 {
-  dprintf(("CRTDLL: _access\n"));
+  dprintf2(("CRTDLL: _access\n"));
   return (_access(path, mode));
 }
@@ -472 +474 @@
 int CDECL CRTDLL___toascii(int c)
 {
-  dprintf(("CRTDLL: __toascii\n"));
+  dprintf2(("CRTDLL: __toascii\n"));
   return ((unsigned)(c) & 0x7F );
 }
@@ -482 +484 @@
 VOID CDECL CRTDLL__aexit_rtn_dll(int exitcode)
 {
-  dprintf(("CRTDLL: _aexit_rtn_dll\n"));
+  dprintf2(("CRTDLL: _aexit_rtn_dll\n"));
   ExitProcess(exitcode);
 }
@@ -492 +494 @@
 VOID CDECL CRTDLL__amsg_exit(int errnum)
 {
-  dprintf(("CRTDLL: _amsg_exit\n"));
+  dprintf2(("CRTDLL: _amsg_exit\n"));
   fprintf(stderr,strerror(errnum));
   ExitProcess(-1);
@@ -503 +505 @@
 void CDECL CRTDLL__assert( char *s1, char *s2, int i)
 {
-  dprintf(("CRTDLL: _assert\n"));
+  dprintf2(("CRTDLL: _assert\n"));
   _assert(s1, s2, i);
 }
@@ -513 +515 @@
 void CDECL CRTDLL__beep(unsigned nFreq, unsigned nDur)
 {       
-        dprintf(("_beep\n"));
+        dprintf2(("_beep\n"));
         Beep(nFreq,nDur);
 }
@@ -544 +546 @@
 void CDECL CRTDLL__c_exit(INT ret)
 {
-        dprintf(("_c_exit(%d)\n",ret));
+        dprintf2(("_c_exit(%d)\n",ret));
         ExitProcess(ret);
 }
@@ -554 +556 @@
 double CDECL CRTDLL__cabs(struct _complex z)
 {
-  dprintf(("CRTDLL: _cabs\n"));
+  dprintf2(("CRTDLL: _cabs\n"));
   return sqrt( z.x*z.x + z.y*z.y );
 }
@@ -564 +566 @@
 void CDECL CRTDLL__cexit(INT ret)
 {
-        dprintf(("_cexit(%d)\n",ret));
+        dprintf2(("_cexit(%d)\n",ret));
         ExitProcess(ret);
 }
@@ -574 +576 @@
 char * CDECL CRTDLL__cgets( char *s )
 {
-  dprintf(("CRTDLL: _cgets\n"));
+  dprintf2(("CRTDLL: _cgets\n"));
   return (_cgets(s));
 }
@@ -584 +586 @@
 INT CDECL CRTDLL__chdir(LPCSTR newdir)
 {
-        dprintf(("CRTDLL: chdir\n"));
+        dprintf2(("CRTDLL: chdir\n"));
         if (!SetCurrentDirectoryA(newdir))
                 return 1;
@@ -600 +602 @@
 {
         /* FIXME: generates errnos */
-        dprintf(("CRTDLL: _chdrive\n"));
+        dprintf2(("CRTDLL: _chdrive\n"));
         return DRIVE_SetCurrentDrive(newdrive-1);
 }
@@ -610 +612 @@
 double CDECL CRTDLL__chgsign(double __x)
 {
-  dprintf(("CRTDLL: _chgsign\n"));
+  dprintf2(("CRTDLL: _chgsign\n"));
   double_t *x = (double_t *)&x;
   if ( x->sign == 1 )
@@ -626 +628 @@
 int CDECL CRTDLL__chmod( const char *s, int i)
 {
-  dprintf(("CRTDLL: _chmod\n"));
+  dprintf2(("CRTDLL: _chmod\n"));
   return (_chmod(s, i));
 }
@@ -636 +638 @@
 int CDECL CRTDLL__chsize( int i, long l )
 {
-  dprintf(("CRTDLL: _chsize\n"));
+  dprintf2(("CRTDLL: _chsize\n"));
   return (_chsize(i, l));
 }
@@ -646 +648 @@
 unsigned int CDECL CRTDLL__clearfp( void )
 {
-  dprintf(("CRTDLL: _clearfp\n"));
+  dprintf2(("CRTDLL: _clearfp\n"));
   return (_clear87());
 }
@@ -656 +658 @@
 int CDECL CRTDLL__close(int handle)
 {
-  dprintf(("CRTDLL: _close\n"));
+  dprintf2(("CRTDLL: _close\n"));
   return (_close(handle));
 }
@@ -666 +668 @@
 int CDECL CRTDLL__commit( int _fd )
 {
-  dprintf(("CRTDLL: _commit\n"));
+  dprintf2(("CRTDLL: _commit\n"));
   if (! FlushFileBuffers((HFILE)CRTDLL__get_osfhandle(_fd)) ) {
         __set_errno(EBADF);
@@ -680 +682 @@
 unsigned CDECL CRTDLL__control87(unsigned i1,unsigned i2)
 {
-  dprintf(("CRTDLL: _control87\n"));
+  dprintf2(("CRTDLL: _control87\n"));
   return (_control87(i1, i2));
 }
@@ -690 +692 @@
 unsigned CDECL CRTDLL__controlfp(unsigned i1,unsigned i2)
 {
-  dprintf(("CRTDLL: _controlfp\n"));
+  dprintf2(("CRTDLL: _controlfp\n"));
   return (_control87(i1, i2));
 }
@@ -700 +702 @@
 double CDECL CRTDLL__copysign( double __d, double __s )
 {
-  dprintf(("CRTDLL: _copysign\n"));
+  dprintf2(("CRTDLL: _copysign\n"));
   double_t *d = (double_t *)&__d;
   double_t *s = (double_t *)&__s;
@@ -715 +717 @@
 INT CDECL CRTDLL__cprintf( char *fmt, ... )
 {
-  dprintf(("CRTDLL: _cprintf.\n"));
+  dprintf2(("CRTDLL: _cprintf.\n"));
 
   int     cnt;
@@ -735 +737 @@
 INT CDECL CRTDLL__cputs( char * s )
 {
-  dprintf(("CRTDLL: _cputs\n"));
+  dprintf2(("CRTDLL: _cputs\n"));
   return (_cputs(s));
 }
@@ -745 +747 @@
 INT CDECL CRTDLL__creat( const char *s, int i )
 {
-  dprintf(("CRTDLL: _creat\n"));
+  dprintf2(("CRTDLL: _creat\n"));
   return (_creat(s, i));
 }
@@ -766 +768 @@
 int CDECL CRTDLL__cwait( int *status, int process_id, int action_code )
 {
-  dprintf(("CRTDLL: _cwait\n"));
+  dprintf2(("CRTDLL: _cwait\n"));
   return (_cwait(status, process_id, action_code));
 }
@@ -776 +778 @@
 int CDECL CRTDLL__dup(int handle)
 {
-  dprintf(("CRTDLL: _dup\n"));
+  dprintf2(("CRTDLL: _dup\n"));
   return (_dup(handle));
 }
@@ -786 +788 @@
 int CDECL CRTDLL__dup2(int handle1,int handle2)
 {
-  dprintf(("CRTDLL: _dup2\n"));
+  dprintf2(("CRTDLL: _dup2\n"));
   return (_dup2(handle1, handle2));
 }
@@ -796 +798 @@
 char * CDECL CRTDLL__ecvt( double val, int ndig, int *dec, int *sign )
 {
-  dprintf(("CRTDLL: _ecvt\n"));
+  dprintf2(("CRTDLL: _ecvt\n"));
   return (_ecvt(val, ndig, dec, sign));
 }
@@ -806 +808 @@
 void CDECL CRTDLL__endthread(void)
 {
-  dprintf(("CRTDLL: _endthread\n"));
+  dprintf2(("CRTDLL: _endthread\n"));
   _endthread ();
 }
@@ -816 +818 @@
 int CDECL CRTDLL__eof( int _fd )
 {
-  dprintf(("CRTDLL: _eof\n"));
+  dprintf2(("CRTDLL: _eof\n"));
   int cur_pos = CRTDLL__lseek(_fd, 0, SEEK_CUR);
   int end_pos = CRTDLL__filelength( _fd );
@@ -834 +836 @@
 int * CDECL CRTDLL__errno(void)
 {
-  dprintf(("CRTDLL: _errno\n"));
+  dprintf2(("CRTDLL: _errno\n"));
   return (_errno());
 }
@@ -846 +848 @@
         PEXCEPTION_FRAME  *dispatcher)
 {
-        dprintf(("CRTDLL: _except_handler2\n"));
+        dprintf2(("CRTDLL: _except_handler2\n"));
         return 1;
 }
@@ -856 +858 @@
 int CDECL CRTDLL__execl(const char* szPath, const char* szArgv0, ...)
 {
-  dprintf(("CRTDLL: _execl\n"));
+  dprintf2(("CRTDLL: _execl\n"));
 
   char *szArg[100];
@@ -877 +879 @@
 int CDECL CRTDLL__execle(char *path, char *szArgv0, ...)
 {
-  dprintf(("CRTDLL: _execle not correct implemented.\n"));
+  dprintf2(("CRTDLL: _execle not correct implemented.\n"));
   char *szArg[100];
   const char *a;
@@ -908 +910 @@
 int CDECL CRTDLL__execlp( char *szPath, char *szArgv0, ...)
 {
-  dprintf(("CRTDLL: _execlp\n"));
+  dprintf2(("CRTDLL: _execlp\n"));
   char *szArg[100];
   const char *a;
@@ -927 +929 @@
 int CDECL CRTDLL__execlpe( char *path, char *szArgv0, ...)
 {
-  dprintf(("CRTDLL: _execlpe not correct implemented.\n"));
+  dprintf2(("CRTDLL: _execlpe not correct implemented.\n"));
   char *szArg[100];
   const char *a;
@@ -957 +959 @@
 int CDECL CRTDLL__execv( char *s1, char **s2)
 {
-  dprintf(("CRTDLL: _execv\n"));
+  dprintf2(("CRTDLL: _execv\n"));
   return (_execv(s1, s2));
 }
@@ -967 +969 @@
 int CDECL CRTDLL__execve( char *s1, char **s2, char **s3)
 {
-  dprintf(("CRTDLL: _execve\n"));
+  dprintf2(("CRTDLL: _execve\n"));
   return (_execve(s1, s2, s3));
 }
@@ -977 +979 @@
 int CDECL CRTDLL__execvp( char *s1, char **s2)
 {
-  dprintf(("CRTDLL: _execvp\n"));
+  dprintf2(("CRTDLL: _execvp\n"));
   return (_execvp(s1, s2));
 }
@@ -987 +989 @@
 int CDECL CRTDLL__execvpe( char *s1, char **s2, char **s3)
 {
-  dprintf(("CRTDLL: _execvpe\n"));
+  dprintf2(("CRTDLL: _execvpe\n"));
   return (_execvpe(s1, s2, s3));
 }
@@ -997 +999 @@
 VOID CDECL CRTDLL__exit(DWORD ret)
 {
-        dprintf(("CRTDLL: _exit\n"));
+        dprintf2(("CRTDLL: _exit\n"));
         ExitProcess(ret);
 }
@@ -1018 +1020 @@
 int CDECL CRTDLL__fcloseall( void )
 {
-  dprintf(("CRTDLL: _fcloseall\n"));
+  dprintf2(("CRTDLL: _fcloseall\n"));
   return (_fcloseall());
 }
@@ -1028 +1030 @@
 char * CDECL CRTDLL__fcvt( double val, int ndig, int *dec, int *sign )
 {
-  dprintf(("CRTDLL: _fcvt\n"));
+  dprintf2(("CRTDLL: _fcvt\n"));
   return (_fcvt(val, ndig, dec, sign));
 }
@@ -1038 +1040 @@
 CRTDLL_FILE * CDECL CRTDLL__fdopen(INT handle, LPCSTR mode)
 {
-    dprintf(("CRTDLL: fdopen\n"));
+    dprintf2(("CRTDLL: fdopen\n"));
     CRTDLL_FILE *file;
 
@@ -1069 +1071 @@
 int CDECL CRTDLL__fgetchar( void )
 {
-  dprintf(("CRTDLL: _fgetchar\n"));
+  dprintf2(("CRTDLL: _fgetchar\n"));
   return (_fgetchar());
 }
@@ -1079 +1081 @@
 wint_t CDECL CRTDLL__fgetwchar( void *i )
 {
-  dprintf(("CRTDLL: _fgetwchar\n"));
+  dprintf2(("CRTDLL: _fgetwchar\n"));
   return CRTDLL__getch();
 }
@@ -1100 +1102 @@
 long CDECL CRTDLL__filelength( int i )
 {
-  dprintf(("CRTDLL: _filelength\n"));
+  dprintf2(("CRTDLL: _filelength\n"));
   return (_filelength(i));
 }
@@ -1110 +1112 @@
 int CDECL CRTDLL__fileno(FILE * f)
 {
-  dprintf(("CRTDLL: _fileno\n"));
+  dprintf2(("CRTDLL: _fileno\n"));
   return (_fileno(f));
 }
@@ -1120 +1122 @@
 int CDECL CRTDLL__findclose( long handle )
 {
-  dprintf(("CRTDLL: _findclose\n"));
+  dprintf2(("CRTDLL: _findclose\n"));
   // check no wildcards or invalid handle
   if ( handle == 0 || handle == -1)
@@ -1155 +1157 @@
 INT CDECL CRTDLL__finite(double x)
 {
-  dprintf(("CRTDLL: _finite\n"));
+  dprintf2(("CRTDLL: _finite\n"));
   return !_isinf(x);
 }
@@ -1176 +1178 @@
 INT CDECL CRTDLL__flushall(void)
 {
-  dprintf(("CRTDLL: _flushall\n"));
+  dprintf2(("CRTDLL: _flushall\n"));
   return (_flushall());
 }
@@ -1186 +1188 @@
 INT CDECL CRTDLL__fpclass( double __d )
 {
-  dprintf(("CRTDLL: _fpclass\n"));
+  dprintf2(("CRTDLL: _fpclass\n"));
         double_t *d = (double_t *)&__d;
 
@@ -1249 +1251 @@
 INT CDECL CRTDLL__fputchar( int c )
 {
-  dprintf(("CRTDLL: _fputchar\n"));
+  dprintf2(("CRTDLL: _fputchar\n"));
   return(_fputchar(c));
 }
@@ -1303 +1305 @@
 char * CDECL CRTDLL__fullpath( char *buf, char *path, size_t size )
 {
-  dprintf(("CRTDLL: _fullpath\n"));
+  dprintf2(("CRTDLL: _fullpath\n"));
   return (_fullpath(buf, path, size));
 }
@@ -1324 +1326 @@
 char * CDECL CRTDLL__gcvt( double val, int ndig, char *buf )
 {
-  dprintf(("CRTDLL: _gcvt\n"));
+  dprintf2(("CRTDLL: _gcvt\n"));
   return (_gcvt(val, ndig, buf));
 }
@@ -1334 +1336 @@
 void* CDECL CRTDLL__get_osfhandle( int fileno )
 {
-  dprintf(("CRTDLL: _get_osfhandle\n"));
+  dprintf2(("CRTDLL: _get_osfhandle\n"));
   return filehnd(fileno);
 }
@@ -1344 +1346 @@
 int CDECL CRTDLL__getch(void)
 {
-  dprintf(("CRTDLL: _getch\n"));
+  dprintf2(("CRTDLL: _getch\n"));
   return (_getch());
 }
@@ -1354 +1356 @@
 int CDECL CRTDLL__getche(void)
 {
-  dprintf(("CRTDLL: _getche\n"));
+  dprintf2(("CRTDLL: _getche\n"));
   return (_getche());
 }
@@ -1364 +1366 @@
 char * CDECL CRTDLL__getcwd( char *buf, size_t size )
 {
-  dprintf(("CRTDLL: _getcwd\n"));
+  dprintf2(("CRTDLL: _getcwd\n"));
   return (_getcwd(buf, size));
 }
@@ -1374 +1376 @@
 char * CDECL CRTDLL__getdcwd( int drive, char *buffer, size_t maxlen )
 {
-  dprintf(("CRTDLL: _getdcwd\n"));
+  dprintf2(("CRTDLL: _getdcwd\n"));
   return (_getdcwd(drive, buffer, maxlen));
 }
@@ -1384 +1386 @@
 unsigned int CDECL CRTDLL__getdiskfree( unsigned int drive, struct _diskfree_t *diskspace)
 {
-  dprintf(("CRTDLL: _getdiskfree\n"));
+  dprintf2(("CRTDLL: _getdiskfree\n"));
   char RootPathName[10];
   RootPathName[0] = toupper(drive +'@');
@@ -1405 +1407 @@
 FARPROC CDECL  CRTDLL__getdllprocaddr(HMODULE hModule,char * lpProcName, int iOrdinal)
 {
-  dprintf(("CRTDLL: _getdllprocaddr\n"));   
+  dprintf2(("CRTDLL: _getdllprocaddr\n"));   
   if ( lpProcName != NULL ) 
         return GetProcAddress(hModule, lpProcName);
@@ -1419 +1421 @@
 unsigned CDECL CRTDLL__getdrive( void )
 {
-  dprintf(("CRTDLL: _getdrive\n"));
+  dprintf2(("CRTDLL: _getdrive\n"));
   return DRIVE_GetCurrentDrive() + 1;
 }
@@ -1429 +1431 @@
 unsigned long CDECL CRTDLL__getdrives(void)
 {
-  dprintf(("CRTDLL: _getdrives\n"));
+  dprintf2(("CRTDLL: _getdrives\n"));
   return GetLogicalDrives();
 }
@@ -1439 +1441 @@
 int CDECL CRTDLL__getpid( void )
 {
-  dprintf(("CRTDLL: _getpid\n"));
+  dprintf2(("CRTDLL: _getpid\n"));
   return (_getpid());
 }
@@ -1460 +1462 @@
 int CDECL CRTDLL__getw( FILE *stream )
 {
-  dprintf(("CRTDLL: _getw\n"));
+  dprintf2(("CRTDLL: _getw\n"));
   int w;
 
@@ -1475 +1477 @@
 void CDECL CRTDLL__global_unwind2( PEXCEPTION_FRAME frame )
 {
-    dprintf(("CRTDLL: global_undwind2\n"));
+    dprintf2(("CRTDLL: global_undwind2\n"));
     RtlUnwind( frame, 0, NULL, 0 );
 }
@@ -1485 +1487 @@
 int CDECL CRTDLL__heapchk( void )
 {
-  dprintf(("CRTDLL: _heapchk\n"));
+  dprintf2(("CRTDLL: _heapchk\n"));
   return (_heapchk());
 }
@@ -1495 +1497 @@
 int CDECL CRTDLL__heapmin( void )
 {
-  dprintf(("CRTDLL: _heapmin\n"));
+  dprintf2(("CRTDLL: _heapmin\n"));
   return (_heapmin());
 }
@@ -1505 +1507 @@
 int CDECL CRTDLL__heapset( unsigned int fill )
 {
-  dprintf(("CRTDLL: _heapset\n"));
+  dprintf2(("CRTDLL: _heapset\n"));
   return (_heapset(fill));
 }
@@ -1526 +1528 @@
 double CDECL CRTDLL__hypot(double x1, double x2)
 {
-  dprintf(("CRTDLL: _hypot\n"));
+  dprintf2(("CRTDLL: _hypot\n"));
   return (_hypot(x1, x2));
 }
@@ -1536 +1538 @@
 DWORD CDECL CRTDLL__initterm(_INITTERMFUN *start,_INITTERMFUN *end)
 {
-        dprintf(("CRTDLL: initterm\n"));
+        dprintf2(("CRTDLL: initterm\n"));
         _INITTERMFUN    *current;
 
@@ -1553 +1555 @@
 BOOL CDECL CRTDLL__isatty(DWORD x)
 {
-   dprintf(("(%ld)\n",x));
+   dprintf2(("(%ld)\n",x));
    return TRUE;
 }
@@ -1563 +1565 @@
 BOOL CDECL CRTDLL__isctype(CHAR x,CHAR type)
 {
-        dprintf(("CRTDLL: isctype\n"));
+        dprintf2(("CRTDLL: isctype\n"));
         if ((type & CRTDLL_SPACE) && isspace(x))
                 return TRUE;
@@ -1588 +1590 @@
 int CDECL CRTDLL__ismbbalnum( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbalnum\n"));
+  dprintf2(("CRTDLL: _ismbbalnum\n"));
   return (CRTDLL_isalnum(c) || CRTDLL__ismbbkalnum(c));
 }
@@ -1598 +1600 @@
 int CDECL CRTDLL__ismbbalpha( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbalpha\n"));
+  dprintf2(("CRTDLL: _ismbbalpha\n"));
   return (isalpha(c) || CRTDLL__ismbbkalnum(c));
 }
@@ -1608 +1610 @@
 int CDECL CRTDLL__ismbbgraph( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbgraph\n"));
+  dprintf2(("CRTDLL: _ismbbgraph\n"));
   return (CRTDLL_isgraph(c) || CRTDLL__ismbbkana(c));
 }
@@ -1618 +1620 @@
 int CDECL CRTDLL__ismbbkalnum( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbkalnum\n"));
+  dprintf2(("CRTDLL: _ismbbkalnum\n"));
   return  ((_jctype+1)[(unsigned char)(c)] & (_KNJ_P));
 }
@@ -1628 +1630 @@
 int CDECL CRTDLL__ismbbkana( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbkana\n"));
+  dprintf2(("CRTDLL: _ismbbkana\n"));
   return ((_jctype+1)[(unsigned char)(c)] & (_KNJ_M|_KNJ_P));
 }
@@ -1638 +1640 @@
 int CDECL CRTDLL__ismbbkpunct( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbkpunct\n"));
+  dprintf2(("CRTDLL: _ismbbkpunct\n"));
   return  ((_jctype+1)[(unsigned char)(c)] & (_KNJ_P));
 }
@@ -1648 +1650 @@
 int CDECL CRTDLL__ismbblead( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbblead\n"));
+  dprintf2(("CRTDLL: _ismbblead\n"));
   return ((_jctype+1)[(unsigned char)(c)] & _KNJ_1);
 }
@@ -1658 +1660 @@
 int CDECL CRTDLL__ismbbprint( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbprint\n"));
+  dprintf2(("CRTDLL: _ismbbprint\n"));
   return (isprint(c) || CRTDLL__ismbbkana(c));
 }
@@ -1668 +1670 @@
 int CDECL CRTDLL__ismbbpunct( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbpunct\n"));
+  dprintf2(("CRTDLL: _ismbbpunct\n"));
   return (ispunct(c) ||  CRTDLL__ismbbkana(c));
 }
@@ -1678 +1680 @@
 int CDECL CRTDLL__ismbbtrail( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbbtrail\n"));
+  dprintf2(("CRTDLL: _ismbbtrail\n"));
   return ((_jctype+1)[(unsigned char)(c)] & _KNJ_2);
 }
@@ -1688 +1690 @@
 int CDECL CRTDLL__ismbcalpha( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbcalpha\n"));
+  dprintf2(("CRTDLL: _ismbcalpha\n"));
   if ((c & 0xFF00) != 0) {
         // true multibyte character
@@ -1705 +1707 @@
 int CDECL CRTDLL__ismbcdigit( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbcdigit\n"));
+  dprintf2(("CRTDLL: _ismbcdigit\n"));
   if ((c & 0xFF00) != 0) {
         // true multibyte character
@@ -1723 +1725 @@
 int CDECL CRTDLL__ismbchira( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbchira\n"));
+  dprintf2(("CRTDLL: _ismbchira\n"));
   return ((c>=0x829F) && (c<=0x82F1));
 }
@@ -1733 +1735 @@
 int CDECL CRTDLL__ismbckata( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbckata\n"));
+  dprintf2(("CRTDLL: _ismbckata\n"));
   return ((c>=0x8340) && (c<=0x8396));
 }
@@ -1775 +1777 @@
 int CDECL CRTDLL__ismbclegal( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbclegal\n"));
+  dprintf2(("CRTDLL: _ismbclegal\n"));
   if ((c & 0xFF00) != 0) {
         return CRTDLL__ismbblead(c>>8) && CRTDLL__ismbbtrail(c&0xFF);
@@ -1791 +1793 @@
 int CDECL CRTDLL__ismbclower( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbclower\n"));
+  dprintf2(("CRTDLL: _ismbclower\n"));
   if ((c & 0xFF00) != 0) {
         if ( c >= 0x829A && c<= 0x829A )
@@ -1806 +1808 @@
 int CDECL CRTDLL__ismbcprint( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbcprint\n"));
+  dprintf2(("CRTDLL: _ismbcprint\n"));
   if ((c & 0xFF00) != 0) {
         // true multibyte character
@@ -1860 +1862 @@
 int CDECL CRTDLL__ismbcupper( unsigned int c )
 {
-  dprintf(("CRTDLL: _ismbcupper\n"));
+  dprintf2(("CRTDLL: _ismbcupper\n"));
   if ((c & 0xFF00) != 0) {
         if ( c >= 0x8260 && c<= 0x8279 )
@@ -1875 +1877 @@
 int CDECL CRTDLL__ismbslead(const unsigned char *str, const unsigned char *t)
 {
-  dprintf(("CRTDLL: _ismbslead\n"));
+  dprintf2(("CRTDLL: _ismbslead\n"));
   unsigned char *s = (unsigned char *)str;
   while(*s != 0 && s != t) 
@@ -1890 +1892 @@
 int CDECL CRTDLL__ismbstrail(const unsigned char *str, const unsigned char *t)
 {
-  dprintf(("CRTDLL: _ismbstrail\n"));
+  dprintf2(("CRTDLL: _ismbstrail\n"));
   unsigned char *s = (unsigned char *)str;
   while(*s != 0 && s != t) 
@@ -1907 +1909 @@
 int CDECL CRTDLL__isnan( double __x )
 {
-  dprintf(("CRTDLL: _isnan\n"));
+  dprintf2(("CRTDLL: _isnan\n"));
   double_t * x = (double_t *)&__x;
   return ( x->exponent == 0x7ff  && ( x->mantissah != 0 || x->mantissal != 0 ));
@@ -1918 +1920 @@
 double CDECL CRTDLL__j0(double x)
 {
-  dprintf(("CRTDLL: _j0\n"));
+  dprintf2(("CRTDLL: _j0\n"));
   return (_j0(x));
 }
@@ -1928 +1930 @@
 double CDECL CRTDLL__j1(double x)
 {
-  dprintf(("CRTDLL: _j1\n"));
+  dprintf2(("CRTDLL: _j1\n"));
   return (_j1(x));}
 
@@ -1937 +1939 @@
 double CDECL CRTDLL__jn(int i, double x)
 {
-  dprintf(("CRTDLL: _jn\n"));
+  dprintf2(("CRTDLL: _jn\n"));
   return (_jn(i, x));
 }
@@ -1947 +1949 @@
 int CDECL CRTDLL__kbhit( void )
 {
-  dprintf(("CRTDLL: _kbhit\n"));
+  dprintf2(("CRTDLL: _kbhit\n"));
   return (_kbhit());
 }
@@ -1958 +1960 @@
          size_t width, int (*compar)(const void *, const void *))
 {
-  dprintf(("CRTDLL: _lfind\n"));
+  dprintf2(("CRTDLL: _lfind\n"));
   char *char_base = (char *)base;
   int i;
@@ -1975 +1977 @@
 void * CDECL CRTDLL__loaddll (char *name)
 {
-  dprintf(("CRTDLL: _loaddll\n"));
+  dprintf2(("CRTDLL: _loaddll\n"));
   return (void*)LoadLibraryA(name);
 }
@@ -1985 +1987 @@
 void CDECL CRTDLL__local_unwind2( PEXCEPTION_FRAME endframe, DWORD nr )
 {
-        dprintf(("CRTDLL: local_undwind2\n"));
+        dprintf2(("CRTDLL: local_undwind2\n"));
 }
 
@@ -2016 +2018 @@
 unsigned long CDECL CRTDLL__lrotl( unsigned long value, unsigned int shift )
 {
-  dprintf(("CRTDLL: _lrotl\n"));
+  dprintf2(("CRTDLL: _lrotl\n"));
   return (_lrotl(value, shift));
 }
@@ -2026 +2028 @@
 unsigned long CDECL CRTDLL__lrotr( unsigned long value, unsigned int shift )
 {
-  dprintf(("CRTDLL: _lrotr\n"));
+  dprintf2(("CRTDLL: _lrotr\n"));
   return (_lrotr(value, shift));
 }
@@ -2048 +2050 @@
 long CDECL CRTDLL__lseek(int handle,long offset,int origin)
 {
-  dprintf(("CRTDLL: _lssek\n"));
+  dprintf2(("CRTDLL: _lssek\n"));
   return (_lseek(handle, offset, origin));
 }
@@ -2059 +2061 @@
                     char *dir, char *fname, char *ext )
 {
-  dprintf(("CRTDLL: _makepath\n"));
+  dprintf2(("CRTDLL: _makepath\n"));
   _makepath(path, drive, dir, fname, ext);
 }
@@ -2069 +2071 @@
 double CDECL CRTDLL__matherr( struct exception * excep )
 {
-  dprintf(("CRTDLL: _matherr\n"));
+  dprintf2(("CRTDLL: _matherr\n"));
   return (_matherr(excep));
 }
@@ -2079 +2081 @@
 unsigned int CDECL CRTDLL__mbbtombc( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbbtombc\n"));
+  dprintf2(("CRTDLL: _mbbtombc\n"));
   if (c >= 0x20 && c <= 0x7e) {
     return han_to_zen_ascii_table[c - 0x20];
@@ -2094 +2096 @@
 int CDECL CRTDLL__mbbtype( unsigned char c, int type )
 {
-  dprintf(("CRTDLL: _mbbtype\n"));
+  dprintf2(("CRTDLL: _mbbtype\n"));
         if ( type == 1 ) {
                 if ((c >= 0x40 && c <= 0x7e ) || (c >= 0x80 && c <= 0xfc ) )
@@ -2131 +2133 @@
 void CDECL CRTDLL__mbccpy( unsigned char *dst, const unsigned char *src )
 {
-  dprintf(("CRTDLL: _mbccpy\n"));
+  dprintf2(("CRTDLL: _mbccpy\n"));
 
   if (!CRTDLL__ismbblead(*src) )
@@ -2145 +2147 @@
 int CDECL CRTDLL__mbcjistojms( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbcjistojms\n"));
+  dprintf2(("CRTDLL: _mbcjistojms\n"));
   int c1, c2;
 
@@ -2173 +2175 @@
 int CDECL CRTDLL__mbcjmstojis( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbcjmstojis\n"));
+  dprintf2(("CRTDLL: _mbcjmstojis\n"));
   int c1, c2;
 
@@ -2202 +2204 @@
 size_t CDECL CRTDLL__mbclen( const unsigned char *s )
 {
-  dprintf(("CRTDLL: _mbclen\n"));
+  dprintf2(("CRTDLL: _mbclen\n"));
   return (CRTDLL__ismbblead(*s>>8) && CRTDLL__ismbbtrail(*s&0x00FF)) ? 2 : 1;
 }
@@ -2212 +2214 @@
 int CDECL CRTDLL__mbctohira( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbctohira\n"));
+  dprintf2(("CRTDLL: _mbctohira\n"));
   return c;
 }
@@ -2222 +2224 @@
 int CDECL CRTDLL__mbctokata( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbctokata\n"));
+  dprintf2(("CRTDLL: _mbctokata\n"));
   return c;
 }
@@ -2232 +2234 @@
 unsigned int CDECL CRTDLL__mbctolower( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbctolower\n"));
+  dprintf2(("CRTDLL: _mbctolower\n"));
         if ((c & 0xFF00) != 0) {
 // true multibyte case conversion needed
@@ -2250 +2252 @@
 unsigned int CDECL CRTDLL__mbctombb( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbctombb\n"));
+  dprintf2(("CRTDLL: _mbctombb\n"));
   int i;
   unsigned short *p;
@@ -2280 +2282 @@
 unsigned int CDECL CRTDLL__mbctoupper( unsigned int c )
 {
-  dprintf(("CRTDLL: _mbctoupper\n"));
+  dprintf2(("CRTDLL: _mbctoupper\n"));
   if ((c & 0xFF00) != 0) {
 // true multibyte case conversion needed
@@ -2298 +2300 @@
 int CDECL CRTDLL__mbsbtype( const unsigned char *str, int n )
 {
-  dprintf(("CRTDLL: _mbsbtype\n"));
+  dprintf2(("CRTDLL: _mbsbtype\n"));
   if ( str == NULL )
         return -1;
@@ -2310 +2312 @@
 unsigned char * CDECL CRTDLL__mbscat( unsigned char *dst, const unsigned char *src )
 {
-  dprintf(("CRTDLL: _mbscat\n"));
+  dprintf2(("CRTDLL: _mbscat\n"));
   return (unsigned char*)strcat((char*)dst,(char*)src);
 }
@@ -2320 +2322 @@
 unsigned char * CDECL CRTDLL__mbschr( const unsigned char *str, unsigned int c )
 {
-  dprintf(("CRTDLL: _mbschr\n"));
+  dprintf2(("CRTDLL: _mbschr\n"));
   return (unsigned char*)strchr((char*)str,c);
 }
@@ -2330 +2332 @@
 int CDECL CRTDLL__mbscmp( const unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbscmp\n"));
+  dprintf2(("CRTDLL: _mbscmp\n"));
   return strcmp((char*)s1,(char*)s2);
 }
@@ -2340 +2342 @@
 unsigned char * CDECL CRTDLL__mbscpy( unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbscpy\n"));
+  dprintf2(("CRTDLL: _mbscpy\n"));
   return (unsigned char*)strcpy((char*)s1,(char*)s2);
 }
@@ -2350 +2352 @@
 size_t CDECL CRTDLL__mbscspn( const unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbscspn\n"));
+  dprintf2(("CRTDLL: _mbscspn\n"));
   const char *p, *spanp;
   char c, sc;
@@ -2372 +2374 @@
 unsigned char * CDECL CRTDLL__mbsdec( const unsigned char *str, const unsigned char *cur )
 {
-  dprintf(("CRTDLL: _mbsdec\n"));
+  dprintf2(("CRTDLL: _mbsdec\n"));
   unsigned char *s = (unsigned char *)cur;
   if ( str >= cur )
@@ -2389 +2391 @@
 unsigned char * CDECL CRTDLL__mbsdup( unsigned char *_s )
 {
-  dprintf(("CRTDLL: _mbsdup\n"));
+  dprintf2(("CRTDLL: _mbsdup\n"));
   char *rv;
   if (_s == 0)
@@ -2406 +2408 @@
 int CDECL CRTDLL__mbsicmp( const unsigned char *x, const unsigned char *y )
 {
-  dprintf(("CRTDLL: _mbsicmp\n"));
+  dprintf2(("CRTDLL: _mbsicmp\n"));
     do {
         if (!*x)
@@ -2426 +2428 @@
 LPSTR CDECL CRTDLL__mbsinc( LPCSTR str )
 {
-    dprintf(("CRTDLL: _mbsinc\n"));
+    dprintf2(("CRTDLL: _mbsinc\n"));
     int len = mblen( str, MB_LEN_MAX );
     if (len < 1) len = 1;
@@ -2438 +2440 @@
 INT CDECL CRTDLL__mbslen( LPCSTR str )
 {
-    dprintf(("CRTDLL: _mbslen\n"));
+    dprintf2(("CRTDLL: _mbslen\n"));
     INT len, total = 0;
     while ((len = mblen( str, MB_LEN_MAX )) > 0)
@@ -2454 +2456 @@
 unsigned char * CDECL CRTDLL__mbslwr( unsigned char *x )
 {
-  dprintf(("CRTDLL: _mbslwr\n"));
+  dprintf2(("CRTDLL: _mbslwr\n"));
   unsigned char  *y=x;
 
@@ -2474 +2476 @@
 unsigned char * CDECL CRTDLL__mbsnbcat( unsigned char *dst, const unsigned char *src, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnbcat\n"));
+  dprintf2(("CRTDLL: _mbsnbcat\n"));
         char *d; 
         char *s = (char *)src;  
@@ -2501 +2503 @@
 int CDECL CRTDLL__mbsnbcmp( const unsigned char *str1, const unsigned char *str2, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnbcmp\n"));
+  dprintf2(("CRTDLL: _mbsnbcmp\n"));
         unsigned char *s1 = (unsigned char *)str1;
         unsigned char *s2 = (unsigned char *)str2;
@@ -2552 +2554 @@
 size_t CDECL CRTDLL__mbsnbcnt( const unsigned char *str, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnbcnt\n"));
+  dprintf2(("CRTDLL: _mbsnbcnt\n"));
         unsigned char *s = (unsigned char *)str;
         while(*s != 0 && n > 0) {
@@ -2569 +2571 @@
 unsigned char * CDECL CRTDLL__mbsnbcpy( unsigned char *str1, const unsigned char *str2, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnbcpy\n"));
+  dprintf2(("CRTDLL: _mbsnbcpy\n"));
         unsigned char *s1 = (unsigned char *)str1;
         unsigned char *s2 = (unsigned char *)str2;
@@ -2607 +2609 @@
 int CDECL CRTDLL__mbsnbicmp( const unsigned char *s1, const unsigned char *s2, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnbicmp\n"));
+  dprintf2(("CRTDLL: _mbsnbicmp\n"));
   if (n == 0)
     return 0;
@@ -2630 +2632 @@
 unsigned char * CDECL CRTDLL__mbsnbset( unsigned char *src, unsigned int val, size_t count )
 {
-  dprintf(("CRTDLL: _mbsnbset\n"));
+  dprintf2(("CRTDLL: _mbsnbset\n"));
         unsigned char *char_src = (unsigned char *)src;
         unsigned short *short_src = (unsigned short *)src;
@@ -2661 +2663 @@
 unsigned char * CDECL CRTDLL__mbsncat( unsigned char *dst, const unsigned char *src, size_t n )
 {
-  dprintf(("CRTDLL: _mbsncat\n"));
+  dprintf2(("CRTDLL: _mbsncat\n"));
         char *d = (char *)dst; 
         char *s = (char *)src;  
@@ -2688 +2690 @@
 size_t CDECL CRTDLL__mbsnccnt( const unsigned char *str, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnccnt\n"));
+  dprintf2(("CRTDLL: _mbsnccnt\n"));
         unsigned char *s = (unsigned char *)str;
         size_t cnt = 0;
@@ -2709 +2711 @@
 int CDECL CRTDLL__mbsncmp( const unsigned char *str1, const unsigned char *str2, size_t n )
 {
-  dprintf(("CRTDLL: _mbsncmp\n"));
+  dprintf2(("CRTDLL: _mbsncmp\n"));
         unsigned char *s1 = (unsigned char *)str1;
         unsigned char *s2 = (unsigned char *)str2;
@@ -2760 +2762 @@
 unsigned char * CDECL CRTDLL__mbsncpy( unsigned char *str1, const unsigned char *str2, size_t n )
 {
-  dprintf(("CRTDLL: _mbsncpy\n"));
+  dprintf2(("CRTDLL: _mbsncpy\n"));
         unsigned char *s1 = (unsigned char *)str1;
         unsigned char *s2 = (unsigned char *)str2;
@@ -2798 +2800 @@
 unsigned int CDECL CRTDLL__mbsnextc( const unsigned char *src )
 {
-  dprintf(("CRTDLL: _mbsnextc\n"));
+  dprintf2(("CRTDLL: _mbsnextc\n"));
         unsigned char *char_src = (unsigned char *)src;
         unsigned short *short_src = (unsigned short *)src;
@@ -2819 +2821 @@
 int CDECL CRTDLL__mbsnicmp( const unsigned char *s1, const unsigned char *s2, size_t n )
 {
-  dprintf(("CRTDLL: _mbsnicmp\n"));
+  dprintf2(("CRTDLL: _mbsnicmp\n"));
   if (n == 0)
     return 0;
@@ -2845 +2847 @@
 unsigned char * CDECL CRTDLL__mbsninc( const unsigned char *str, size_t n )
 {
-  dprintf(("CRTDLL: _mbsninc\n"));
+  dprintf2(("CRTDLL: _mbsninc\n"));
         unsigned char *s = (unsigned char *)str;
         while(*s != 0 && n > 0) {
@@ -2862 +2864 @@
 unsigned char * CDECL CRTDLL__mbsnset( unsigned char *src, unsigned int val, size_t count )
 {
-  dprintf(("CRTDLL: _mbsnset\n"));
+  dprintf2(("CRTDLL: _mbsnset\n"));
         unsigned char *char_src = (unsigned char *)src;
         unsigned short *short_src = (unsigned short *)src;
@@ -2894 +2896 @@
 unsigned char * CDECL CRTDLL__mbspbrk( const unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbspbrk\n"));
+  dprintf2(("CRTDLL: _mbspbrk\n"));
   const char *scanp;
   int c, sc;
@@ -2913 +2915 @@
 LPSTR CDECL CRTDLL__mbsrchr(LPSTR s,CHAR x)
 {
-  dprintf(("CRTDLL: _mbsrchr\n"));
+  dprintf2(("CRTDLL: _mbsrchr\n"));
         /* FIXME: handle multibyte strings */
         return strrchr(s,x);
@@ -2924 +2926 @@
 unsigned char * CDECL CRTDLL__mbsrev( unsigned char *s )
 {
-  dprintf(("CRTDLL: _mbsrev\n"));
+  dprintf2(("CRTDLL: _mbsrev\n"));
         unsigned char  *e;
         unsigned char  a;
@@ -2956 +2958 @@
 unsigned char * CDECL CRTDLL__mbsset( unsigned char *src, unsigned int c )
 {
-  dprintf(("CRTDLL: _mbsset\n"));
+  dprintf2(("CRTDLL: _mbsset\n"));
         unsigned char *char_src = src;
         unsigned short *short_src = (unsigned short*)src;
@@ -2985 +2987 @@
 size_t CDECL CRTDLL__mbsspn( const unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbsspn\n"));
+  dprintf2(("CRTDLL: _mbsspn\n"));
   const char *p = (char*)s1, *spanp;
   char c, sc;
@@ -3003 +3005 @@
 unsigned char * CDECL CRTDLL__mbsspnp( const unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbsspnp\n"));
+  dprintf2(("CRTDLL: _mbsspnp\n"));
   const char *p = (char*)s1, *spanp;
   char c, sc;
@@ -3021 +3023 @@
 unsigned char * CDECL CRTDLL__mbsstr( const unsigned char *s1, const unsigned char *s2 )
 {
-  dprintf(("CRTDLL: _mbsstr\n"));
+  dprintf2(("CRTDLL: _mbsstr\n"));
   return (unsigned char*)strstr((const char*)s1,(const char*)s2);
 }
@@ -3031 +3033 @@
 unsigned char * CDECL CRTDLL__mbstok( unsigned char *s, const unsigned char *delim )
 {
-  dprintf(("CRTDLL: _mbstok\n"));
+  dprintf2(("CRTDLL: _mbstok\n"));
   const char *spanp;
   int c, sc;
@@ -3088 +3090 @@
 size_t CDECL CRTDLL__mbstrlen(const char *string)
 {
-  dprintf(("CRTDLL: _mbstrlen\n"));
+  dprintf2(("CRTDLL: _mbstrlen\n"));
         char *s = (char *)string;
         size_t i;
@@ -3106 +3108 @@
 unsigned char * CDECL CRTDLL__mbsupr( unsigned char *x )
 {
-  dprintf(("CRTDLL: _mbsupr\n"));
+  dprintf2(("CRTDLL: _mbsupr\n"));
         unsigned char  *y=x;
         while (*y) {
@@ -3125 +3127 @@
 void * CDECL CRTDLL__memccpy(void *to, const void *from,int c,size_t count)
 {
-  dprintf(("CRTDLL: _memccpy\n"));
+  dprintf2(("CRTDLL: _memccpy\n"));
   memcpy(to,from,count);
   return memchr(to,c,count);
@@ -3136 +3138 @@
 INT CDECL CRTDLL__mkdir(LPCSTR newdir)
 {
-        dprintf(("CRTDLL: mkdir\n"));
+        dprintf2(("CRTDLL: mkdir\n"));
         if (!CreateDirectoryA(newdir,NULL))
                 return -1;
@@ -3148 +3150 @@
 char * CDECL CRTDLL__mktemp( char * _template )
 {
-  dprintf(("CRTDLL: _mktemp\n"));
+  dprintf2(("CRTDLL: _mktemp\n"));
   static int count = 0;
   char *cp, *dp;
@@ -3205 +3207 @@
 size_t CDECL CRTDLL__msize( void *ptr )
 {
-  dprintf(("CRTDLL: _msize\n"));
+  dprintf2(("CRTDLL: _msize\n"));
   return (_msize(ptr));
 }
@@ -3215 +3217 @@
 double CDECL CRTDLL__nextafter( double x, double y )
 {
-  dprintf(("CRTDLL: _nextafter\n"));
+  dprintf2(("CRTDLL: _nextafter\n"));
   if ( x == y)
         return x;
@@ -3230 +3232 @@
 onexit_t CDECL CRTDLL__onexit(onexit_t t)
 {
-  dprintf(("CRTDLL: _onexit\n"));
+  dprintf2(("CRTDLL: _onexit\n"));
   return (_onexit(t));
 }
@@ -3240 +3242 @@
 HFILE CDECL CRTDLL__open(LPCSTR path,INT flags)
 {
-    dprintf(("CRTDLL: _open\n"));
+    dprintf2(("CRTDLL: _open\n"));
     DWORD access = 0, creation = 0;
     HFILE ret;
@@ -3268 +3270 @@
     }
     if (flags & 0x0008) /* O_APPEND */
-        dprintf(("O_APPEND not supported\n" ));
+        dprintf2(("O_APPEND not supported\n" ));
     if (flags & 0xf0f4) 
-      dprintf(("CRTDLL_open file unsupported flags 0x%04x\n",flags));
+      dprintf2(("CRTDLL_open file unsupported flags 0x%04x\n",flags));
     /* End Fixme */
 
     ret = CreateFileA( path, access, FILE_SHARE_READ | FILE_SHARE_WRITE,
                          NULL, creation, FILE_ATTRIBUTE_NORMAL, -1 );
-    dprintf(("CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret));
+    dprintf2(("CRTDLL_open file %s mode 0x%04x got handle %d\n", path,flags,ret));
     return ret;
 }
@@ -3285 +3287 @@
 INT CDECL CRTDLL__open_osfhandle( long osfhandle, int flags )
 {
-  dprintf(("CRTDLL: _open_osfhandle\n"));
+  dprintf2(("CRTDLL: _open_osfhandle\n"));
 HFILE handle;
  
@@ -3304 +3306 @@
           return (-1);
         }
-        dprintf(("(handle %08lx,flags %d) return %d\n",
+        dprintf2(("(handle %08lx,flags %d) return %d\n",
                      osfhandle,flags,handle));
         return handle;
@@ -3348 +3350 @@
 void CDECL CRTDLL__purecall(void)
 {
-  dprintf(("CRTDLL: _purecall\n"));
+  dprintf2(("CRTDLL: _purecall\n"));
 }
 
@@ -3357 +3359 @@
 INT CDECL CRTDLL__putch( int i )
 {
-  dprintf(("CRTDLL: _putch\n"));
+  dprintf2(("CRTDLL: _putch\n"));
   return (_putch(i));
 }
@@ -3367 +3369 @@
 INT CDECL CRTDLL__putenv(const char *s)
 {
-  dprintf(("CRTDLL: _putenv\n"));
+  dprintf2(("CRTDLL: _putenv\n"));
   return (_putenv(s));
 }
@@ -3377 +3379 @@
 INT CDECL CRTDLL__putw( int w, FILE *stream )
 {
-  dprintf(("CRTDLL: _putw\n"));
+  dprintf2(("CRTDLL: _putw\n"));
   if (fwrite( &w, sizeof(w), 1, stream) < 1)
     return(EOF);
@@ -3400 +3402 @@
 INT CDECL CRTDLL__rmdir(const char *path)
 {
-  dprintf(("CRTDLL: _rmdir\n"));
+  dprintf2(("CRTDLL: _rmdir\n"));
   if (!RemoveDirectoryA(path))
         return -1;
@@ -3412 +3414 @@
 INT CDECL CRTDLL__rmtmp(void)
 {
-  dprintf(("CRTDLL: _rmtmp\n"));
+  dprintf2(("CRTDLL: _rmtmp\n"));
   return(_rmtmp());
 }
@@ -3422 +3424 @@
 unsigned int CDECL CRTDLL__rotl( unsigned int value, unsigned int shift )
 {
-  dprintf(("CRTDLL: _rotl\n"));
+  dprintf2(("CRTDLL: _rotl\n"));
   return (_rotl(value, shift));
 }
@@ -3432 +3434 @@
 unsigned int CDECL CRTDLL__rotr( unsigned int value, unsigned int shift )
 {
-  dprintf(("CRTDLL: _rotr\n"));
+  dprintf2(("CRTDLL: _rotr\n"));
   return (_rotr(value, shift));
 }
@@ -3442 +3444 @@
 double CDECL CRTDLL__scalb( double __x, long e )
 {
-  dprintf(("CRTDLL: _scalb\n"));
+  dprintf2(("CRTDLL: _scalb\n"));
   double_t *x = (double_t *)&__x;
         
@@ -3456 +3458 @@
 void CDECL CRTDLL__searchenv(const char *file,const char *var,char *path )
 {
-  dprintf(("CRTDLL: _searchenv\n"));
+  dprintf2(("CRTDLL: _searchenv\n"));
   char *env = CRTDLL_getenv(var);
 
@@ -3485 +3487 @@
 void CDECL CRTDLL__seterrormode(int i)
 {
-  dprintf(("CRTDLL: _seterrormode\n"));
+  dprintf2(("CRTDLL: _seterrormode\n"));
   SetErrorMode(i);
   return;
@@ -3496 +3498 @@
 int CDECL CRTDLL__setjmp( jmp_buf env )
 {
-  dprintf(("CRTDLL: _setjmp -> setjmp (NOT IDENTICAL!!!)\n"));
+  //TODO:
+  dprintf2(("CRTDLL: _setjmp -> setjmp (NOT IDENTICAL!!!)\n"));
   return(setjmp( env));
 }
@@ -3505 +3508 @@
 int CDECL CRTDLL__setjmp3( jmp_buf env )
 {
-  dprintf(("CRTDLL: _setjmp3 -> setjmp (NOT IDENTICAL!!!)\n"));
+  //TODO:
+  dprintf2(("CRTDLL: _setjmp3 -> setjmp (NOT IDENTICAL!!!)\n"));
   return(setjmp( env));
 }
@@ -3515 +3519 @@
 INT CDECL CRTDLL__setmode( INT fh,INT mode)
 {
-        dprintf(("CRTDLL: _setmode\n"));
+        dprintf2(("CRTDLL: _setmode\n"));
         return (_setmode(fh, mode));
 }
@@ -3536 +3540 @@
 VOID CDECL CRTDLL__sleep(unsigned long timeout) 
 {
-  dprintf(("CRTDLL__sleep for %ld milliseconds\n",timeout));
+  dprintf2(("CRTDLL__sleep for %ld milliseconds\n",timeout));
   Sleep((timeout)?timeout:1);
 }
@@ -3557 +3561 @@
 int CDECL CRTDLL__spawnl(int nMode, const char* szPath, const char* szArgv0,...)
 {
-  dprintf(("CRTDLL: _spawnl\n"));
+  dprintf2(("CRTDLL: _spawnl\n"));
   char *szArg[100];
   const char *a;
@@ -3577 +3581 @@
 int CDECL CRTDLL__spawnle( int mode, char *path, char **szArgv0, ... )
 {
-  dprintf(("CRTDLL: _spawnle not correct implemented.\n"));
+  dprintf2(("CRTDLL: _spawnle not correct implemented.\n"));
   char *szArg[100];
   char *a;
@@ -3608 +3612 @@
 int CDECL CRTDLL__spawnlp(int nMode, const char* szPath, const char* szArgv0, ...)
 {
-  dprintf(("CRTDLL: _spawnlp\n"));
+  dprintf2(("CRTDLL: _spawnlp\n"));
   char *szArg[100];
   const char *a;
@@ -3627 +3631 @@
 int CDECL CRTDLL__spawnlpe( int mode, char *path, char *szArgv0, ... )
 {
-  dprintf(("CRTDLL: _spawnlpe not correct implemented.\n"));
+  dprintf2(("CRTDLL: _spawnlpe not correct implemented.\n"));
   char *szArg[100];
   const char *a;
@@ -3658 +3662 @@
 int CDECL CRTDLL__spawnv( int i, char *s1, char ** s2 )
 {
-  dprintf(("CRTDLL: _spawnv\n"));
+  dprintf2(("CRTDLL: _spawnv\n"));
   return (_spawnv(i, s1, s2));
 }
@@ -3668 +3672 @@
 int CDECL CRTDLL__spawnve( int i, char *s1, char ** s2, char ** s3 )
 {
-  dprintf(("CRTDLL: _spawnve\n"));
+  dprintf2(("CRTDLL: _spawnve\n"));
   return (_spawnve(i, s1, s2, s3));
 }
@@ -3678 +3682 @@
 int CDECL CRTDLL__spawnvp( int i, char *s1, char ** s2 )
 {
-  dprintf(("CRTDLL: _spawnvp\n"));
+  dprintf2(("CRTDLL: _spawnvp\n"));
   return (_spawnvp(i, s1, s2));
 }
@@ -3687 +3691 @@
 int CDECL CRTDLL__spawnvpe( int i, char *s1, char ** s2, char ** s3 )
 {
-  dprintf(("CRTDLL: _spawnvpe\n"));
+  dprintf2(("CRTDLL: _spawnvpe\n"));
   return (_spawnvpe(i, s1, s2, s3));
 }
@@ -3697 +3701 @@
 int CDECL CRTDLL__stat( const char *s1, struct stat * n )
 {
-  dprintf(("CRTDLL: _stat\n"));
+  dprintf2(("CRTDLL: _stat\n"));
   return(_stat(s1, n));
 }
@@ -3707 +3711 @@
 unsigned int CDECL CRTDLL__statusfp( void )
 {
-  dprintf(("CRTDLL: _statusfp\n"));
+  dprintf2(("CRTDLL: _statusfp\n"));
   return (_status87());
 }
@@ -3717 +3721 @@
 char * CDECL CRTDLL__strdate( char *buf )
 {
-  dprintf(("CRTDLL: _strdate\n"));
+  dprintf2(("CRTDLL: _strdate\n"));
   return(_strdate(buf));
 }
@@ -3727 +3731 @@
 char * CDECL CRTDLL__strdec( const char *, const char *p ) 
 {
-  dprintf(("CRTDLL: _strdec\n"));
+  dprintf2(("CRTDLL: _strdec\n"));
   return( (char *)(p-1) );
 }
@@ -3737 +3741 @@
 LPSTR CDECL CRTDLL__strdup(LPCSTR ptr)
 {
-  dprintf(("CRTDLL: _strdup\n"));
+  dprintf2(("CRTDLL: _strdup\n"));
   return HEAP_strdupA(GetProcessHeap(),0,ptr);
 }
@@ -3759 +3763 @@
 int CDECL CRTDLL__stricoll( const char *s1, const char *s2 )
 {
-  dprintf(("CRTDLL: _stricoll\n"));
+  dprintf2(("CRTDLL: _stricoll\n"));
   return stricmp(s1,s2);
 }
@@ -3769 +3773 @@
 char * CDECL CRTDLL__strinc( const char *p )
 {
-    dprintf(("CRTDLL: _strinc\n"));
+    dprintf2(("CRTDLL: _strinc\n"));
     return( (char *)(p+1) );
 }
@@ -3779 +3783 @@
 size_t CDECL CRTDLL__strncnt( const char *p, size_t l ) 
 {
-    dprintf(("CRTDLL: _strncnt\n"));
+    dprintf2(("CRTDLL: _strncnt\n"));
     size_t i;
     i = strlen(p);
@@ -3790 +3794 @@
 unsigned int CDECL CRTDLL__strnextc( const char *p )
 {
-    dprintf(("CRTDLL: _strnextc\n"));
+    dprintf2(("CRTDLL: _strnextc\n"));
     return( (unsigned int)*p );
 }
@@ -3800 +3804 @@
 char * CDECL CRTDLL__strninc( const char *p, size_t l )
 {
-    dprintf(("CRTDLL: _strninc\n"));
+    dprintf2(("CRTDLL: _strninc\n"));
     return( (char *)(p+l) );
 }
@@ -3810 +3814 @@
 char * CDECL CRTDLL__strnset(char* szToFill, int szFill, size_t sizeMaxFill)
 {
-  dprintf(("CRTDLL: _strnset\n"));
+  dprintf2(("CRTDLL: _strnset\n"));
   char *t = szToFill;
   int i = 0;
@@ -3828 +3832 @@
 char * CDECL CRTDLL__strrev( char *s )
 {
-  dprintf(("CRTDLL: _strrev\n"));
+  dprintf2(("CRTDLL: _strrev\n"));
   char  *e;
   char   a;
@@ -3850 +3854 @@
 char * CDECL CRTDLL__strset(char* szToFill, int szFill)
 {
-  dprintf(("CRTDLL: _strset\n"));
+  dprintf2(("CRTDLL: _strset\n"));
   char *t = szToFill;
   while( *szToFill != 0 )
@@ -3866 +3870 @@
 char * CDECL CRTDLL__strspnp( const char *p1, const char *p2 ) 
 {
-    dprintf(("CRTDLL: _strspnp\n"));
+    dprintf2(("CRTDLL: _strspnp\n"));
     return( (*(p1 += strspn(p1,p2))!='\0') ? (char*)p1 : NULL );
 }
@@ -3876 +3880 @@
 char * CDECL CRTDLL__strtime( char *buf )
 {
-  dprintf(("CRTDLL: _strtime\n"));
+  dprintf2(("CRTDLL: _strtime\n"));
   return (_strtime(buf));
 }
@@ -3886 +3890 @@
 void CDECL CRTDLL__swab(char *s1, char *s2, int i)
 {
-  dprintf(("CRTDLL: _swab\n"));
+  dprintf2(("CRTDLL: _swab\n"));
   _swab(s1, s2, i);
 }
@@ -3896 +3900 @@
 long CDECL CRTDLL__tell( int i )
 {
-  dprintf(("CRTDLL: _tell\n"));
+  dprintf2(("CRTDLL: _tell\n"));
   return (_tell(i));
 }
@@ -3906 +3910 @@
 char * CDECL CRTDLL__tempnam( char *dir, char *prefix )
 {
-  dprintf(("CRTDLL: _tempnam\n"));
+  dprintf2(("CRTDLL: _tempnam\n"));
   return (_tempnam(dir, prefix));
 }
@@ -3916 +3920 @@
 int CDECL CRTDLL__tolower(int n)
 {
-  dprintf(("CRTDLL: _tolower\n"));
+  dprintf2(("CRTDLL: _tolower\n"));
   return (_tolower(n));
 }
@@ -3926 +3930 @@
 int CDECL CRTDLL__toupper(int n)
 {
-  dprintf(("CRTDLL: _toupper\n"));
+  dprintf2(("CRTDLL: _toupper\n"));
   return (_toupper(n));
 }
@@ -3946 +3950 @@
 int CDECL CRTDLL__umask( int i )
 {
-  dprintf(("CRTDLL: _umask\n"));
+  dprintf2(("CRTDLL: _umask\n"));
   return (_umask(i));
 }
@@ -3956 +3960 @@
 int CDECL CRTDLL__ungetch( int i )
 {
-  dprintf(("CRTDLL: _ungetch\n"));
+  dprintf2(("CRTDLL: _ungetch\n"));
   return (_ungetch(i));
 }
@@ -3966 +3970 @@
 INT CDECL CRTDLL__unlink(LPCSTR pathname)
 {
-    dprintf(("CRTDLL: _unlink\n"));
+    dprintf2(("CRTDLL: _unlink\n"));
     int ret=0;
     DOS_FULL_NAME full_name;
 
     if (!DOSFS_GetFullName( pathname, FALSE, (CHAR*)&full_name )) {
-      dprintf(("CRTDLL_unlink file %s bad name\n",pathname));
+      dprintf2(("CRTDLL_unlink file %s bad name\n",pathname));
       return EOF;
     }
   
     ret=unlink(full_name.long_name);
-    dprintf(("(%s unix %s)\n",
+    dprintf2(("(%s unix %s)\n",
                    pathname,full_name.long_name));
     if(ret)
-      dprintf((" Failed!\n"));
+      dprintf2((" Failed!\n"));
 
     return ret;
@@ -3990 +3994 @@
 int CDECL CRTDLL__unloaddll(void *handle)
 {
-  dprintf(("CRTDLL: _unloaddll\n"));
+  dprintf2(("CRTDLL: _unloaddll\n"));
   return FreeLibrary((HMODULE)handle);
 }
@@ -4000 +4004 @@
 int CDECL CRTDLL__utime( char *path, struct utimbuf * times )
 {
-  dprintf(("CRTDLL: _utime\n"));
+  dprintf2(("CRTDLL: _utime\n"));
   return (_utime(path, times));
 }
@@ -4021 +4025 @@
 LPWSTR CDECL CRTDLL__wcsdup( LPCWSTR str )
 {
-  dprintf(("CRTDLL: _wcsdup\n"));
+  dprintf2(("CRTDLL: _wcsdup\n"));
   LPWSTR ret = NULL;
   if (str)
@@ -4038 +4042 @@
 int CDECL CRTDLL__wcsicoll( LPCWSTR str1, LPCWSTR str2 )
 {
-  dprintf(("CRTDLL: _wcsicoll\n"));
+  dprintf2(("CRTDLL: _wcsicoll\n"));
   return CRTDLL__wcsicmp( str1, str2 );
 }
@@ -4048 +4052 @@
 LPWSTR CDECL CRTDLL__wcsnset( LPWSTR str, WCHAR c, INT n )
 {
-    dprintf(("CRTDLL: _wcsnset\n"));
+    dprintf2(("CRTDLL: _wcsnset\n"));
     LPWSTR ret = str;
     while ((n-- > 0) && *str) *str++ = c;
@@ -4060 +4064 @@
 LPWSTR CDECL CRTDLL__wcsrev( LPWSTR str )
 {
-  dprintf(("CRTDLL: _wcsrev\n"));
+  dprintf2(("CRTDLL: _wcsrev\n"));
   LPWSTR ret = str;
   LPWSTR end = str + wcslen((const wchar_t*)str) - 1;
@@ -4078 +4082 @@
 LPWSTR CDECL CRTDLL__wcsset( LPWSTR str, WCHAR c )
 {
-    dprintf(("CRTDLL: _wcsset\n"));
+    dprintf2(("CRTDLL: _wcsset\n"));
     LPWSTR ret = str;
     while (*str) *str++ = c;
@@ -4090 +4094 @@
 INT CDECL CRTDLL__write(INT fd,LPCVOID buf,UINT count)
 {
-        dprintf(("CRTDLL: _write\n"));
+        dprintf2(("CRTDLL: _write\n"));
         INT len=0;
 
@@ -4099 +4103 @@
         else
           len = _lwrite(fd,(LPCSTR)buf,count);
-        dprintf(("%d/%d byte to dfh %d from %p,\n",
+        dprintf2(("%d/%d byte to dfh %d from %p,\n",
                        len,count,fd,buf));
         return len;
@@ -4110 +4114 @@
 double CDECL CRTDLL__y0(double x)
 {
-  dprintf(("CRTDLL: _y0\n"));
+  dprintf2(("CRTDLL: _y0\n"));
   return (_y0(x));
 }
@@ -4120 +4124 @@
 double CDECL CRTDLL__y1(double x)
 {
-  dprintf(("CRTDLL: _y1\n"));
+  dprintf2(("CRTDLL: _y1\n"));
   return (_y1(x));
 }
@@ -4130 +4134 @@
 double CDECL CRTDLL__yn(int i, double x)
 {
-  dprintf(("CRTDLL: _yn\n"));
+  dprintf2(("CRTDLL: _yn\n"));
   return (_yn(i, x));
 }
@@ -4140 +4144 @@
 void CDECL CRTDLL_abort( void )
 {
-  dprintf(("CRTDLL: abort\n"));
+  dprintf2(("CRTDLL: abort\n"));
   abort();
 }
@@ -4150 +4154 @@
 double CDECL CRTDLL_acos( double x )
 {
-  dprintf(("CRTDLL: acos\n"));
+  dprintf2(("CRTDLL: acos\n"));
   return (acos(x));
 }
@@ -4160 +4164 @@
 char * CDECL CRTDLL_asctime( const struct tm *timeptr )
 {
-  dprintf(("CRTDLL: asctime\n"));
+  dprintf2(("CRTDLL: asctime\n"));
   return (asctime(timeptr));
 }
@@ -4170 +4174 @@
 double CDECL CRTDLL_asin( double x )
 {
-  dprintf(("CRTDLL: asin\n"));
+  dprintf2(("CRTDLL: asin\n"));
   return (asin(x));
 }
@@ -4180 +4184 @@
 double CDECL CRTDLL_atan2( double y, double x )
 {
-  dprintf(("CRTDLL: atan2\n"));
+  dprintf2(("CRTDLL: atan2\n"));
   return (atan2(y, x));
 }
@@ -4201 +4205 @@
 double CDECL CRTDLL_atof( const char *nptr )
 {
-  dprintf(("CRTDLL: atof\n"));
+  dprintf2(("CRTDLL: atof\n"));
   return (atof(nptr));
 }
@@ -4210 +4214 @@
 void * CDECL CRTDLL_calloc( size_t n, size_t size )
 {
-//  dprintf(("CRTDLL: calloc\n"));
+//  dprintf2(("CRTDLL: calloc\n"));
   return Heap_Alloc(size*n);
 }
@@ -4220 +4224 @@
 void CDECL CRTDLL_clearerr( FILE *fp )
 {
-  dprintf(("CRTDLL: clearerr\n"));
+  dprintf2(("CRTDLL: clearerr\n"));
   clearerr(fp);
 }
@@ -4230 +4234 @@
 clock_t CDECL CRTDLL_clock( void )
 {
-  dprintf(("CRTDLL: clock\n"));
+  dprintf2(("CRTDLL: clock\n"));
   return (clock());
 }
@@ -4240 +4244 @@
 double CDECL CRTDLL_cosh( double x )
 {
-  dprintf(("CRTDLL: cosh\n"));
+  dprintf2(("CRTDLL: cosh\n"));
   return (cosh(x));
 }
@@ -4250 +4254 @@
 char * CDECL CRTDLL_ctime( const time_t *timer )
 {
-  dprintf(("CRTDLL: ctime\n"));
+  dprintf2(("CRTDLL: ctime\n"));
   return (ctime(timer));
 }
@@ -4260 +4264 @@
 double CDECL CRTDLL_difftime( time_t t1, time_t t0 )
 {
-  dprintf(("CRTDLL: difftime\n"));
+  dprintf2(("CRTDLL: difftime\n"));
   return (difftime(t1, t0));
 }
@@ -4270 +4274 @@
 div_t CDECL CRTDLL_div( int numer, int denom )
 {
-  dprintf(("CRTDLL: div\n"));
+  dprintf2(("CRTDLL: div\n"));
   return (div(numer, denom));
 }
@@ -4280 +4284 @@
 void CDECL CRTDLL_exit(DWORD ret)
 {
-        dprintf(("CRTDLL: exit\n"));
+        dprintf2(("CRTDLL: exit\n"));
         ExitProcess(ret);
 }
@@ -4290 +4294 @@
 double CDECL CRTDLL_exp( double x )
 {
-  dprintf(("CRTDLL: exp\n"));
+  dprintf2(("CRTDLL: exp\n"));
   return (exp(x));
 }
@@ -4300 +4304 @@
 int CDECL CRTDLL_fclose( FILE *fp )
 {
-  dprintf(("CRTDLL: fclose\n"));
+  dprintf2(("CRTDLL: fclose\n"));
   return (fclose(fp));
 }
@@ -4310 +4314 @@
 int CDECL CRTDLL_feof( FILE *fp )
 {
-  dprintf(("CRTDLL: feof\n"));
+  dprintf2(("CRTDLL: feof\n"));
   return (feof(fp));
 }
@@ -4320 +4324 @@
 int CDECL CRTDLL_ferror( FILE *fp )
 {
-  dprintf(("CRTDLL: ferror\n"));
+  dprintf2(("CRTDLL: ferror\n"));
   return (ferror(fp));
 }
@@ -4330 +4334 @@
 int CDECL CRTDLL_fflush( FILE *fp )
 {
-  dprintf(("CRTDLL: fflush\n"));
+  dprintf2(("CRTDLL: fflush\n"));
   return (fflush(fp));
 }
@@ -4340 +4344 @@
 int CDECL CRTDLL_fgetc( FILE *fp )
 {
-  dprintf(("CRTDLL: fgetc\n"));
+  dprintf2(("CRTDLL: fgetc\n"));
   return (fgetc(fp));
 }
@@ -4350 +4354 @@
 int CDECL CRTDLL_fgetpos( FILE *fp, fpos_t *pos )
 {
-  dprintf(("CRTDLL: fgetpos\n"));
+  dprintf2(("CRTDLL: fgetpos\n"));
   return (fgetpos(fp, pos));
 }
@@ -4360 +4364 @@
 char * CDECL CRTDLL_fgets( char *s, int n, FILE *fp )
 {
-  dprintf(("CRTDLL: fgets\n"));
+  dprintf2(("CRTDLL: fgets\n"));
   return (fgets(s, n, fp));
 }
@@ -4370 +4374 @@
 wint_t CDECL CRTDLL_fgetwc( FILE *f )
 {
-  dprintf(("CRTDLL: fgetwc\n"));
+  dprintf2(("CRTDLL: fgetwc\n"));
   return (fgetwc(f));
 }
@@ -4380 +4384 @@
 double CDECL CRTDLL_fmod(double x, double y )
 {
-  dprintf(("CRTDLL: fmod\n"));
+  dprintf2(("CRTDLL: fmod\n"));
   return (fmod(x,y));
 }
@@ -4390 +4394 @@
 FILE * CDECL CRTDLL_fopen( const char *filename, const char *mode )
 {
-  dprintf(("CRTDLL: fopen\n"));
+  dprintf2(("CRTDLL: fopen\n"));
   return (fopen( filename, mode));
 }
@@ -4400 +4404 @@
 INT CDECL CRTDLL_fprintf( CRTDLL_FILE *file, LPSTR format, ... )
 {
-    dprintf(("CRTDLL: fprintf\n"));
+    dprintf2(("CRTDLL: fprintf\n"));
     va_list valist;
     INT res;
@@ -4416 +4420 @@
 int CDECL CRTDLL_fputc( int c, FILE *fp )
 {
-  dprintf(("CRTDLL: fputc\n"));
+  dprintf2(("CRTDLL: fputc\n"));
   return (fputc(c, fp));
 }
@@ -4426 +4430 @@
 int CDECL CRTDLL_fputs( const char *s, FILE *fp )
 {
-  dprintf(("CRTDLL: fputs\n"));
+  dprintf2(("CRTDLL: fputs\n"));
   return (fputs(s, fp));
 }
@@ -4436 +4440 @@
 wint_t CDECL CRTDLL_fputwc( wint_t wc, FILE *strm )
 {
-  dprintf(("CRTDLL: fputwc\n"));
+  dprintf2(("CRTDLL: fputwc\n"));
   return (fputwc(wc, strm));
 }
@@ -4446 +4450 @@
 size_t CDECL CRTDLL_fread( void *ptr, size_t size, size_t n, FILE *fp )
 {
-//  dprintf(("CRTDLL: fread\n"));
+//  dprintf2(("CRTDLL: fread\n"));
   return (fread(ptr, size, n, fp));
 }
@@ -4456 +4460 @@
 VOID CDECL CRTDLL_free(LPVOID ptr)
 {
-//    dprintf(("CRTDLL: free\n"));
+//    dprintf2(("CRTDLL: free\n"));
     Heap_Free(ptr);
 }
@@ -4466 +4470 @@
 FILE * CDECL CRTDLL_freopen( const char *filename, const char *mode, FILE *fp )
 {
-  dprintf(("CRTDLL: freopen\n"));
+  dprintf2(("CRTDLL: freopen\n"));
   return (freopen(filename, mode, fp));
 }
@@ -4476 +4480 @@
 double CDECL CRTDLL_frexp( double value, int *exp )
 {
-  dprintf(("CRTDLL: frexp\n"));
+  dprintf2(("CRTDLL: frexp\n"));
   return (frexp(value, exp));
 }
@@ -4486 +4490 @@
 int CDECL CRTDLL_fscanf( FILE*fp, const char *format, ... )
 {
-  dprintf(("CRTDLL: fscanf\n"));
+  dprintf2(("CRTDLL: fscanf\n"));
 #if 0
     va_list valist;
@@ -4498 +4502 @@
     return res;
 #endif
-    dprintf(("broken\n"));
+    dprintf2(("broken\n"));
     return 0;
 }
@@ -4508 +4512 @@
 int CDECL CRTDLL_fseek( FILE *file, long int offset, int whence )
 {
-  dprintf(("CRTDLL: fseek\n"));
-  dprintf(("file %p to 0x%08lx pos %s\n",
+  dprintf2(("CRTDLL: fseek\n"));
+  dprintf2(("file %p to 0x%08lx pos %s\n",
         file,offset,(whence==SEEK_SET)?"SEEK_SET":
         (whence==SEEK_CUR)?"SEEK_CUR":
@@ -4515 +4519 @@
 // FIXME if (SetFilePointer( file->handle, offset, NULL, whence ) != 0xffffffff)
 // FIXME     return 0;
-  dprintf((" failed!\n"));
+  dprintf2((" failed!\n"));
   return -1;
 }
@@ -4525 +4529 @@
 int CDECL CRTDLL_fsetpos( FILE *fp, const fpos_t *pos )
 {
-  dprintf(("CRTDLL: fsetpos\n"));
+  dprintf2(("CRTDLL: fsetpos\n"));
   return (fsetpos(fp, pos));
 }
@@ -4535 +4539 @@
 long int CDECL CRTDLL_ftell( FILE *fp )
 {
-  dprintf(("CRTDLL: ftell\n"));
+  dprintf2(("CRTDLL: ftell\n"));
   return (ftell(fp));
 }
@@ -4558 +4562 @@
     DWORD ret;
 
-    dprintf(("CRTDLL: fwrite\n"));
+    dprintf2(("CRTDLL: fwrite\n"));
     if (!WriteFile( file->handle, ptr, size * nmemb, &ret, NULL ))
-        dprintf((" failed!\n"));
+        dprintf2((" failed!\n"));
 
     return ret / size;
@@ -4582 +4586 @@
 int CDECL CRTDLL_getc( FILE *fp )
 {
-  dprintf(("CRTDLL: getc\n"));
+  dprintf2(("CRTDLL: getc\n"));
   return (getc(fp));
 }
@@ -4592 +4596 @@
 int CDECL CRTDLL_getchar( void )
 {
-  dprintf(("CRTDLL: getchar\n"));
+  dprintf2(("CRTDLL: getchar\n"));
   return (getchar());
 }
@@ -4602 +4606 @@
 char * CDECL CRTDLL_getenv( const char *name )
 {
-  dprintf(("CRTDLL: getenv\n"));
+  dprintf2(("CRTDLL: getenv\n"));
   return (getenv(name));
 }
@@ -4612 +4616 @@
 char * CDECL CRTDLL_gets( char *s )
 {
-  dprintf(("CRTDLL: gets\n"));
+  dprintf2(("CRTDLL: gets\n"));
   return (gets(s));
 }
@@ -4622 +4626 @@
 struct tm * CDECL CRTDLL_gmtime( const time_t *timer )
 {
-  dprintf(("CRTDLL: gmtime\n"));
+  dprintf2(("CRTDLL: gmtime\n"));
   return (gmtime(timer));
 }
@@ -4632 +4636 @@
 INT CDECL CRTDLL_is_wctype(wint_t wc, wctype_t wctypeFlags)
 {
-        dprintf(("CRTDLL: is_wctype\n"));
+        dprintf2(("CRTDLL: is_wctype\n"));
         return ((CRTDLL_pwctype_dll[(unsigned char)(wc & 0xFF)]&wctypeFlags) == wctypeFlags );
 }
@@ -4642 +4646 @@
 int CDECL CRTDLL_isalnum(int i)
 {
-  dprintf(("CRTDLL: isalnum(%08xh)\n", i));
+  dprintf2(("CRTDLL: isalnum(%08xh)\n", i));
   return (isalnum(i));
 }
@@ -4652 +4656 @@
 int CDECL CRTDLL_iscntrl(int i)
 {
-  dprintf(("CRTDLL: iscntrl(%08xh)\n", i));
+  dprintf2(("CRTDLL: iscntrl(%08xh)\n", i));
   return (iscntrl(i));
 }
@@ -4662 +4666 @@
 int CDECL CRTDLL_isgraph(int i)
 {
-  dprintf(("CRTDLL: isgraph(%08xh)\n", i));
+  dprintf2(("CRTDLL: isgraph(%08xh)\n", i));
   return (isgraph(i));
 }
@@ -4683 +4687 @@
 int CDECL CRTDLL_ispunct(int i)
 {
-  dprintf(("CRTDLL: ispunct(%08xh)\n", i));
+  dprintf2(("CRTDLL: ispunct(%08xh)\n", i));
   return (ispunct(i));
 }
@@ -4693 +4697 @@
 int CDECL CRTDLL_iswalnum(wint_t i)
 {
-  dprintf(("CRTDLL: iswalnum(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswalnum(%08xh)\n", i));
   return (iswalnum(i));
 }
@@ -4703 +4707 @@
 int CDECL CRTDLL_iswascii(wint_t c)
 {
-  dprintf(("CRTDLL: iswascii\n", c));
+  dprintf2(("CRTDLL: iswascii\n", c));
   return  (!((c)&(~0x7f)));
 }
@@ -4713 +4717 @@
 int CDECL CRTDLL_iswcntrl(wint_t i)
 {
-  dprintf(("CRTDLL: iswcntrl(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswcntrl(%08xh)\n", i));
   return (iswcntrl(i));
 }
@@ -4723 +4727 @@
 int CDECL CRTDLL_iswdigit(wint_t i)
 {
-  dprintf(("CRTDLL: iswdigit(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswdigit(%08xh)\n", i));
   return (iswdigit(i));
 }
@@ -4733 +4737 @@
 int CDECL CRTDLL_iswgraph(wint_t i)
 {
-  dprintf(("CRTDLL: iswgraph(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswgraph(%08xh)\n", i));
   return (iswgraph(i));
 }
@@ -4743 +4747 @@
 int CDECL CRTDLL_iswlower(wint_t i)
 {
-  dprintf(("CRTDLL: iswlower(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswlower(%08xh)\n", i));
   return (iswlower(i));
 }
@@ -4753 +4757 @@
 int CDECL CRTDLL_iswprint(wint_t i)
 {
-  dprintf(("CRTDLL: iswprint(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswprint(%08xh)\n", i));
   return (iswprint(i));
 }
@@ -4763 +4767 @@
 int CDECL CRTDLL_iswpunct(wint_t i)
 {
-  dprintf(("CRTDLL: iswpunct(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswpunct(%08xh)\n", i));
   return (iswpunct(i));
 }
@@ -4773 +4777 @@
 int CDECL CRTDLL_iswspace(wint_t i)
 {
-  dprintf(("CRTDLL: iswspace(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswspace(%08xh)\n", i));
   return (iswspace(i));
 }
@@ -4783 +4787 @@
 int CDECL CRTDLL_iswupper(wint_t i)
 {
-  dprintf(("CRTDLL: iswupper(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswupper(%08xh)\n", i));
   return (iswupper(i));
 }
@@ -4793 +4797 @@
 int CDECL CRTDLL_iswxdigit(wint_t i)
 {
-  dprintf(("CRTDLL: iswxdigit(%08xh)\n", i));
+  dprintf2(("CRTDLL: iswxdigit(%08xh)\n", i));
   return (iswxdigit(i));
 }
@@ -4803 +4807 @@
 double CDECL CRTDLL_ldexp( double x, int exp ) 
 {
-  dprintf(("CRTDLL: ldexp\n"));
+  dprintf2(("CRTDLL: ldexp\n"));
   return (ldexp(x, exp));
 }
@@ -4813 +4817 @@
 ldiv_t CDECL CRTDLL_ldiv( long int numer, long int denom ) 
 {
-  dprintf(("CRTDLL: ldiv\n"));
+  dprintf2(("CRTDLL: ldiv\n"));
   return (ldiv(numer, denom));
 }
@@ -4823 +4827 @@
 struct lconv * CDECL CRTDLL_localeconv(void)
 {
-  dprintf(("CRTDLL: localeconv\n"));
+  dprintf2(("CRTDLL: localeconv\n"));
   return (localeconv());
 }
@@ -4833 +4837 @@
 struct tm * CDECL CRTDLL_localtime( const time_t *timer )
 {
-  dprintf(("CRTDLL: localtime\n"));
+  dprintf2(("CRTDLL: localtime\n"));
   return (localtime(timer));
 }
@@ -4843 +4847 @@
 double CDECL CRTDLL_log10( double x )
 {
-  dprintf(("CRTDLL: log10\n"));
+  dprintf2(("CRTDLL: log10\n"));
   return (log10(x));
 }
@@ -4853 +4857 @@
 VOID CDECL CRTDLL_longjmp(jmp_buf env, int val)
 {
-    dprintf(("CRTDLL: longjmp\n"));
+    dprintf2(("CRTDLL: longjmp\n"));
     longjmp(env, val);
 }
@@ -4863 +4867 @@
 VOID* CDECL CRTDLL_malloc(DWORD size)
 {
-//      dprintf(("CRTDLL: malloc\n"));
+//      dprintf2(("CRTDLL: malloc\n"));
       return Heap_Alloc(size);
 }
@@ -4873 +4877 @@
 INT CDECL CRTDLL_mblen( const char *s, size_t n )
 {
-      dprintf(("CRTDLL: mblen\n"));
+      dprintf2(("CRTDLL: mblen\n"));
       return (mblen(s, n));
 }
@@ -4883 +4887 @@
 INT CDECL CRTDLL_mbtowc( WCHAR *dst, LPCSTR str, INT n )
 {
-    dprintf(("CRTDLL: _mbtowc\n"));
+    dprintf2(("CRTDLL: _mbtowc\n"));
     wchar_t res;
     int ret = mbtowc( &res, str, n );
@@ -4896 +4900 @@
 time_t CDECL CRTDLL_mktime( struct tm *timeptr )
 {
-    dprintf(("CRTDLL: mktime\n"));
+    dprintf2(("CRTDLL: mktime\n"));
     return mktime( timeptr );
 }
@@ -4906 +4910 @@
 double CDECL CRTDLL_modf( double value, double *iptr )
 {
-    dprintf(("CRTDLL: modf\n"));
+    dprintf2(("CRTDLL: modf\n"));
     return modf( value, iptr );
 }
@@ -4916 +4920 @@
 void CDECL CRTDLL_perror( const char *s )
 {
-    dprintf(("CRTDLL: perror\n"));
+    dprintf2(("CRTDLL: perror\n"));
     perror( s );
 }
@@ -4926 +4930 @@
 int CDECL CRTDLL_printf( const char *format, ... )
 {
-  dprintf(("CRTDLL: printf\n"));
+  dprintf2(("CRTDLL: printf\n"));
   va_list arg;
   int done;
@@ -4942 +4946 @@
 int CDECL CRTDLL_putc( int c, FILE *fp )
 {
-    dprintf(("CRTDLL: putc\n"));
+    dprintf2(("CRTDLL: putc\n"));
     return putc( c, fp );
 }
@@ -4952 +4956 @@
 int CDECL CRTDLL_putchar( int c )
 {
-    dprintf(("CRTDLL: putchar\n"));
+    dprintf2(("CRTDLL: putchar\n"));
     return putchar( c );
 }
@@ -4962 +4966 @@
 int CDECL CRTDLL_puts( const char *s )
 {
-    dprintf(("CRTDLL: puts\n"));
+    dprintf2(("CRTDLL: puts\n"));
     return puts( s );
 }
@@ -4972 +4976 @@
 int CDECL CRTDLL_raise( int sig )
 {
-    dprintf(("CRTDLL: raise\n"));
+    dprintf2(("CRTDLL: raise\n"));
     return raise( sig );
 }
@@ -4982 +4986 @@
 int CDECL CRTDLL_rand( void )
 {
-//    dprintf(("CRTDLL: rand\n"));
+//    dprintf2(("CRTDLL: rand\n"));
     return (rand());
 }
@@ -4992 +4996 @@
 void * CDECL CRTDLL_realloc( void *ptr, size_t size )
 {
-    dprintf(("CRTDLL: realloc\n"));
+    dprintf2(("CRTDLL: realloc\n"));
     return HeapReAlloc( GetProcessHeap(), 0, ptr, size );
 }
@@ -5002 +5006 @@
 INT CDECL CRTDLL_remove(LPCSTR file)
 {
-        dprintf(("CRTDLL: remove\n"));
+        dprintf2(("CRTDLL: remove\n"));
         if (!DeleteFileA(file))
                 return -1;
@@ -5014 +5018 @@
 int CDECL CRTDLL_rename (const char *old, const char *new2)
 {
-  dprintf(("CRTDLL: rename\n"));
+  dprintf2(("CRTDLL: rename\n"));
   return (rename(old, new2));
 }
@@ -5024 +5028 @@
 void CDECL CRTDLL_rewind( FILE *fp )
 {
-  dprintf(("CRTDLL: rewind\n"));
+  dprintf2(("CRTDLL: rewind\n"));
   rewind(fp);
 }
@@ -5045 +5049 @@
 void CDECL CRTDLL_setbuf( FILE *fp, char *buf ) 
 {
-  dprintf(("CRTDLL: setbuf\n"));
+  dprintf2(("CRTDLL: setbuf\n"));
   setbuf(fp, buf);
 }
@@ -5055 +5059 @@
 char * CDECL CRTDLL_setlocale(int category,const char *locale)
 {
-  dprintf(("CRTDLL: setlocale\n"));
+  dprintf2(("CRTDLL: setlocale\n"));
   return (setlocale(category, locale));
 }
@@ -5065 +5069 @@
 int CDECL CRTDLL_setvbuf( FILE *fp, char *buf, int mode, size_t size )
 {
-  dprintf(("CRTDLL: setvbuf\n"));
+  dprintf2(("CRTDLL: setvbuf\n"));
   return (setvbuf(fp, buf, mode, size));
 }
@@ -5085 +5089 @@
 double CDECL CRTDLL_sinh( double x )
 {
-  dprintf(("CRTDLL: sinh\n"));
+  dprintf2(("CRTDLL: sinh\n"));
   return (sinh(x));
 }
@@ -5095 +5099 @@
 void CDECL CRTDLL_srand( unsigned int seed )
 {
-  dprintf(("CRTDLL: srand\n"));
+  dprintf2(("CRTDLL: srand\n"));
   srand(seed);
 }
@@ -5105 +5109 @@
 int CDECL CRTDLL_strcoll( const char *s1, const char *s2 )
 {
-  dprintf(("CRTDLL: strcoll\n"));
+  dprintf2(("CRTDLL: strcoll\n"));
   return strcoll(s1, s2);
 }
@@ -5115 +5119 @@
 char * CDECL CRTDLL_strerror( int errnum )
 {
-  dprintf(("CRTDLL: strerror\n"));
+  dprintf2(("CRTDLL: strerror\n"));
   return strerror(errnum);
 }
@@ -5125 +5129 @@
 size_t CDECL CRTDLL_strftime( char *s, size_t maxsiz, const char *fmt, const struct tm *tp )
 {
-  dprintf(("CRTDLL: strftime\n"));
+  dprintf2(("CRTDLL: strftime\n"));
   return strftime(s, maxsiz, fmt, tp);
 }
@@ -5135 +5139 @@
 double CDECL CRTDLL_strtod( const char *nptr, char **endptr )
 {
-  dprintf(("CRTDLL: strtod\n"));
+  dprintf2(("CRTDLL: strtod\n"));
   return strtod(nptr, endptr);
 }
@@ -5145 +5149 @@
 char * CDECL CRTDLL_strtok( char *s1, const char *s2 )
 {
-  dprintf(("CRTDLL: strtok\n"));
+  dprintf2(("CRTDLL: strtok\n"));
   return strtok(s1, s2);
 }
@@ -5155 +5159 @@
 long int CDECL CRTDLL_strtol( const char *nptr, char **endptr, int base )
 {
-  dprintf(("CRTDLL: strtol\n"));
+  dprintf2(("CRTDLL: strtol\n"));
   return strtol(nptr, endptr, base);
 }
@@ -5165 +5169 @@
 unsigned long CDECL CRTDLL_strtoul( const char *nptr, char **endptr, int base )
 {
-  dprintf(("CRTDLL: strtoul\n"));
+  dprintf2(("CRTDLL: strtoul\n"));
   return strtoul(nptr, endptr, base);
 }
@@ -5175 +5179 @@
 size_t CDECL CRTDLL_strxfrm( char *s1, const char *s2, size_t n )
 {
-  dprintf(("CRTDLL: strxfrm\n"));
+  dprintf2(("CRTDLL: strxfrm\n"));
   return strxfrm(s1, s2, n);
 }
@@ -5196 +5200 @@
 int CDECL CRTDLL_system( const char *string )
 {
-  dprintf(("CRTDLL: system\n"));
+  dprintf2(("CRTDLL: system\n"));
   return system(string);
 }
@@ -5206 +5210 @@
 double CDECL CRTDLL_tanh( double x )
 {
-  dprintf(("CRTDLL: tanh\n"));
+  dprintf2(("CRTDLL: tanh\n"));
   return tanh(x);
 }
@@ -5216 +5220 @@
 time_t CDECL CRTDLL_time( time_t *timer )
 {
-  dprintf(("CRTDLL: time\n"));
+  dprintf2(("CRTDLL: time\n"));
 
   return time(timer);
@@ -5227 +5231 @@
 FILE * CDECL CRTDLL_tmpfile( void )
 {
-  dprintf(("CRTDLL: tmpfile\n"));
+  dprintf2(("CRTDLL: tmpfile\n"));
   return (tmpfile());
 }
@@ -5237 +5241 @@
 char * CDECL CRTDLL_tmpnam( char *s )
 {
-  dprintf(("CRTDLL: tmpnam\n"));
+  dprintf2(("CRTDLL: tmpnam\n"));
   return (tmpnam(s));
 }
@@ -5258 +5262 @@
 wint_t CDECL CRTDLL_ungetwc( wint_t wc, FILE *strm )
 {
-  dprintf(("CRTDLL: ungetwc\n"));
+  dprintf2(("CRTDLL: ungetwc\n"));
   return (ungetwc(wc, strm));
 }
@@ -5267 +5271 @@
 INT CDECL CRTDLL_vfprintf( CRTDLL_FILE *file, LPSTR format, va_list args )
 {
-    dprintf(("CRTDLL: vprintf\n"));
+    dprintf2(("CRTDLL: vprintf\n"));
     char buffer[2048];  /* FIXME... */
     vsprintf( buffer, format, args );
@@ -5290 +5294 @@
 int CDECL CRTDLL_vprintf( const char *format, __va_list arg )
 {
-  dprintf(("CRTDLL: vprintf\n"));
+  dprintf2(("CRTDLL: vprintf\n"));
   return (vprintf(format, arg));
 }
@@ -5300 +5304 @@
 int CDECL CRTDLL_vswprintf( wchar_t *s , size_t t, const wchar_t *format, va_list arg )
 {
-  dprintf(("CRTDLL: vswprintf\n"));
+  dprintf2(("CRTDLL: vswprintf\n"));
   return (vswprintf(s, t, format, arg));
 }
@@ -5321 +5325 @@
 int CDECL CRTDLL_wcscoll(const wchar_t *s1, const wchar_t *s2)
 {
-  dprintf(("CRTDLL: wcscoll\n"));
+  dprintf2(("CRTDLL: wcscoll\n"));
   return (wcscoll(s1, s2));
 }
@@ -5332 +5336 @@
                 const wchar_t *format, const struct tm *timeptr )
 {
-  dprintf(("CRTDLL: wcsftime\n"));
+  dprintf2(("CRTDLL: wcsftime\n"));
   return (wcsftime(s, maxsize, format, timeptr));
 }
@@ -5342 +5346 @@
 double CDECL CRTDLL_wcstod( const wchar_t *nptr, wchar_t **endptr )
 {
-  dprintf(("CRTDLL: wcstod\n"));
+  dprintf2(("CRTDLL: wcstod\n"));
   return (wcstod(nptr, endptr));
 }
@@ -5352 +5356 @@
 size_t CDECL CRTDLL_wcsxfrm( wchar_t *s1, const wchar_t *s2, size_t n )
 {
-  dprintf(("CRTDLL: wcsxfrm\n"));
+  dprintf2(("CRTDLL: wcsxfrm\n"));
   return (wcsxfrm(s1, s2, n));
 }
@@ -5362 +5366 @@
 int CDECL CRTDLL_wctomb( char *s, wchar_t wchar )
 {
-  dprintf(("CRTDLL: wctomb\n"));
+  dprintf2(("CRTDLL: wctomb\n"));
   return (wctomb(s,wchar));
 }