Changeset 9963 for trunk/src

Timestamp:

Mar 31, 2003, 1:54:29 PM (22 years ago)

Author:

sandervl

Message:

PF: Added vsnprintfW/snprintfW funcs for syncing with latest wine NTDLL + KDO: Made Pe2Lx dlls work again

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (2 diffs)
• kernel32dbg.def (modified) (2 diffs)
• unicode/string.c (modified) (2 diffs)
• windllpe2lx.cpp (modified) (2 diffs)
• windllpe2lx.h (modified) (2 diffs)
• winimagepeldr.cpp (modified) (7 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.153 2003-03-03 16:37:26 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.154 2003-03-31 11:54:27 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1208 +1208 @@
 
     OSLibDosDevIOCtl                                              @2026 NONAME
+    
+    vsnprintfW                                                    @2030 NONAME
+    snprintfW                                                     @2031 NONAME
 
 ; custom dll hook installer

trunk/src/kernel32/kernel32dbg.def

@@ -1 @@
-; $Id: kernel32dbg.def,v 1.28 2003-03-03 16:37:27 sandervl Exp $
+; $Id: kernel32dbg.def,v 1.29 2003-03-31 11:54:28 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1209 +1209 @@
     OSLibDosDevIOCtl                                              @2026 NONAME
 
+    vsnprintfW                                                    @2030 NONAME
+    snprintfW                                                     @2031 NONAME
+
 ; custom dll hook installer
     _ODIN_SetDllLoadCallback@4                                    @2100 NONAME

trunk/src/kernel32/unicode/string.c

@@ -7 +7 @@
 #include <windows.h>
 #include <limits.h>
+#include <stdio.h>
+#include <ctype.h>
 
 #include "wine/unicode.h"
@@ -273 +275 @@
   return 0L;
 }
+
+int vsnprintfW(WCHAR *str, unsigned int len, const WCHAR *format, va_list valist)
+{
+    unsigned int written = 0;
+    const WCHAR *iter = format;
+    char bufa[256], fmtbufa[64], *fmta;
+
+    while (*iter)
+    {
+        while (*iter && *iter != '%')
+        {
+            if (written++ >= len)
+                return -1;
+            *str++ = *iter++;
+        }
+        if (*iter == '%')
+        {
+            fmta = fmtbufa;
+            *fmta++ = *iter++;
+            while (*iter == '0' ||
+                   *iter == '+' ||
+                   *iter == '-' ||
+                   *iter == ' ' ||
+                   *iter == '0' ||
+                   *iter == '*' ||
+                   *iter == '#')
+            {
+                if (*iter == '*')
+                {
+                    char *buffiter = bufa;
+                    int fieldlen = va_arg(valist, int);
+                    sprintf(buffiter, "%d", fieldlen);
+                    while (*buffiter)
+                        *fmta++ = *buffiter++;
+                }
+                else
+                    *fmta++ = *iter;
+                iter++;
+            }
+
+            while (isdigit(*iter))
+                *fmta++ = *iter++;
+
+            if (*iter == '.')
+            {
+                *fmta++ = *iter++;
+                if (*iter == '*')
+                {
+                    char *buffiter = bufa;
+                    int fieldlen = va_arg(valist, int);
+                    sprintf(buffiter, "%d", fieldlen);
+                    while (*buffiter)
+                        *fmta++ = *buffiter++;
+                }
+                else
+                    while (isdigit(*iter))
+                        *fmta++ = *iter++;
+            }
+            if (*iter == 'h' || *iter == 'l')
+                *fmta++ = *iter++;
+
+            switch (*iter)
+            {
+            case 's':
+            {
+                static const WCHAR none[] = { '(','n','u','l','l',')',0 };
+                const WCHAR *wstr = va_arg(valist, const WCHAR *);
+                const WCHAR *striter = wstr ? wstr : none;
+                while (*striter)
+                {
+                    if (written++ >= len)
+                        return -1;
+                    *str++ = *striter++;
+                }
+                iter++;
+                break;
+            }
+
+            case 'c':
+                if (written++ >= len)
+                    return -1;
+                *str++ = (WCHAR)va_arg(valist, int);
+                iter++;
+                break;
+
+            default:
+            {
+                /* For non wc types, use system sprintf and append to wide char output */
+                /* FIXME: for unrecognised types, should ignore % when printing */
+                char *bufaiter = bufa;
+                if (*iter == 'p')
+                    sprintf(bufaiter, "%08lX", va_arg(valist, long));
+                else
+                {
+                    *fmta++ = *iter;
+                    *fmta = '\0';
+                    if (*iter == 'f')
+                        sprintf(bufaiter, fmtbufa, va_arg(valist, double));
+                    else
+                        sprintf(bufaiter, fmtbufa, va_arg(valist, void *));
+                }
+                while (*bufaiter)
+                {
+                    if (written++ >= len)
+                        return -1;
+                    *str++ = *bufaiter++;
+                }
+                iter++;
+                break;
+            }
+            }
+        }
+    }
+    if (written >= len)
+        return -1;
+    *str++ = 0;
+    return (int)written;
+}
+
+
+int snprintfW(WCHAR *str, unsigned int len, const WCHAR *format, ...)
+{
+    int retval;
+    va_list valist;
+    va_start(valist, format);
+    retval = vsnprintfW(str, len, format, valist);
+    va_end(valist);
+    return retval;
+}

trunk/src/kernel32/windllpe2lx.cpp

@@ -1 @@
-/* $Id: windllpe2lx.cpp,v 1.13 2002-12-20 12:40:43 sandervl Exp $ */
+/* $Id: windllpe2lx.cpp,v 1.14 2003-03-31 11:54:28 sandervl Exp $ */
 
 /*
@@ -167 +167 @@
  * Init object.
  * Must be called immedeately after objecte construction.
- * @returns   Success indicator. (TRUE == success)
- * @sketch    call init method of the parten class.
- *            set dllEntryPoint
- * @status    completely implemented.
- * @author    knut st. osmundsen
- */
-BOOL Win32Pe2LxDll::init()
-{
-    if (Win32Pe2LxImage::init())
+ * @returns LDRERROR_SUCCESS on success.
+ * @returns Apporpriate LDRERROR_* on failure.
+ * @sketch  call init method of the parten class.
+ *          set dllEntryPoint
+ * @status  completely implemented.
+ * @author  knut st. osmundsen
+ */
+DWORD Win32Pe2LxDll::init()
+{
+    DWORD rc = Win32Pe2LxImage::init();
+    if (rc == LDRERROR_SUCCESS)
     {
         /* set entry point. */
         dllEntryPoint = (WIN32DLLENTRY)entryPoint;
     }
-    else
-        return FALSE;
-    return TRUE;
+    return rc;
 }
 

trunk/src/kernel32/windllpe2lx.h

@@ -1 @@
-/* $Id: windllpe2lx.h,v 1.2 2001-06-15 09:42:48 bird Exp $ */
+/* $Id: windllpe2lx.h,v 1.3 2003-03-31 11:54:28 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
     Win32Pe2LxDll(HINSTANCE hinstance, BOOL fWin32k) throw(ULONG);
     virtual     ~Win32Pe2LxDll();
-    BOOL        init();
+    DWORD       init();
 
     /** @cat Query */

trunk/src/kernel32/winimagepeldr.cpp

@@ -1 @@
-/* $Id: winimagepeldr.cpp,v 1.105 2003-02-18 18:58:47 sandervl Exp $ */
+/* $Id: winimagepeldr.cpp,v 1.106 2003-03-31 11:54:28 sandervl Exp $ */
 
 /*
@@ -186 +186 @@
 
     hFile = OSLibDosOpen(szFileName, OSLIB_ACCESS_READONLY|OSLIB_ACCESS_SHAREDENYNONE);
-  
+
     dprintf((LOG, "KERNEL32-PELDR: Opening PE-image (%s) returned handle %08xh.\n",
              szFileName,
@@ -198 +198 @@
         }
     }
-  
+
     //default error:
     strcpy(szErrorModule, OSLibStripPath(szFileName));
@@ -702 +702 @@
             return rc;
         }
-      
+
       // PH 2001-11-15
       // For corrupt or misinterpreted PE headers,
@@ -1597 +1597 @@
         char   szModuleFailure[CCHMAXPATH] = "";
         ULONG  hInstanceNewDll;
-        Win32LxDll *lxdll;
 
         char *dot = strchr(modname, '.');
@@ -1610 +1609 @@
             return NULL;
         }
-        lxdll = Win32LxDll::findModuleByOS2Handle(hInstanceNewDll);
-        if(lxdll == NULL) {//shouldn't happen!
+        /* bird 2003-03-30: search pe2lx dlls too! */
+        WinDll = Win32DllBase::findModuleByOS2Handle(hInstanceNewDll);
+        if (WinDll == NULL) {//shouldn't happen!
             dprintf((LOG, "Just loaded the dll, but can't find it anywhere?!!?"));
             errorState = ERROR_INTERNAL;
             return NULL;
         }
-        lxdll->setDllHandleOS2(hInstanceNewDll);
-        if(lxdll->AddRef() == -1) {//-1 -> load failed (attachProcess)
-            dprintf((LOG, "Dll %s refused to be loaded; aborting", modname));
-            delete lxdll;
-            errorState = ERROR_INTERNAL;
-            return NULL;
-        }
-        WinDll = (Win32DllBase*)lxdll;
+        if (WinDll->isLxDll())
+        {
+            Win32LxDll *lxdll = (Win32LxDll *)WinDll;
+            lxdll->setDllHandleOS2(hInstanceNewDll);
+            if(lxdll->AddRef() == -1) {//-1 -> load failed (attachProcess)
+                dprintf((LOG, "Dll %s refused to be loaded; aborting", modname));
+                delete lxdll;
+                errorState = ERROR_INTERNAL;
+                return NULL;
+            }
+            WinDll = (Win32DllBase*)lxdll;
+        }
     }
     else {
@@ -2113 +2117 @@
     //Name exports also contain an ordinal, so check this
     nexport = nameexports;
-    for(int i=0;i<nrNameExports;i++) 
+    for(int i=0;i<nrNameExports;i++)
     {
         if(nexport->ordinal == ordinal) {