Changeset 1593 for trunk/src/user32/user32.cpp

Timestamp:

Nov 4, 1999, 7:36:15 PM (26 years ago)

Author:

phaller

Message:

Fix: wvsprintfAW fixed

File:

• trunk/src/user32/user32.cpp (modified) (2 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.49 1999-10-30 10:55:15 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.50 1999-11-04 18:35:42 phaller Exp $ */
 
 /*
@@ -336 +336 @@
 }
 
-/* String Manipulation Functions */
-
-int __cdecl wsprintfA(char *lpOut, LPCSTR lpFmt, ...)
-{
- int     rc;
- va_list argptr;
-
-#ifdef DEBUG
-  WriteLog("USER32:  wsprintfA\n");
-  WriteLog("USER32:  %s\n", lpFmt);
-#endif
-  va_start(argptr, lpFmt);
-  rc = O32_wvsprintf(lpOut, (char *)lpFmt, argptr);
-  va_end(argptr);
-#ifdef DEBUG
-  WriteLog("USER32:  %s\n", lpOut);
-#endif
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-int __cdecl wsprintfW(LPWSTR lpOut, LPCWSTR lpFmt, ...)
-{
-  int     rc;
-  char   *lpFmtA;
-  char    szOut[512];
-  va_list argptr;
-
-  dprintf(("USER32: wsprintfW(%08xh,%08xh).\n",
-           lpOut,
-           lpFmt));
-
-  lpFmtA  = UnicodeToAsciiString((LPWSTR)lpFmt);
-
-  /* @@@PH 98/07/13 transform "%s" to "%ls" does the unicode magic */
-  {
-    PCHAR   pszTemp;
-    PCHAR   pszTemp1;
-    ULONG   ulStrings;
-    ULONG   ulIndex;                             /* temporary string counter */
-
-    for (ulStrings = 0,                  /* determine number of placeholders */
-         pszTemp   = lpFmtA;
-
-         (pszTemp != NULL) &&
-         (*pszTemp != 0);
-
-         ulStrings++)
-    {
-      pszTemp = strstr(pszTemp,
-                       "%s");
-      if (pszTemp != NULL)                              /* skip 2 characters */
-      {
-        pszTemp++;
-        pszTemp++;
-      }
-      else
-        break;                                     /* leave loop immediately */
-    }
-
-    if (ulStrings != 0)                         /* transformation required ? */
-    {
-                                                     /* now reallocate lpFmt */
-      ulStrings += strlen(lpFmtA);           /* calculate total string length */
-      pszTemp   = lpFmtA;                              /* save string pointer */
-      pszTemp1  = lpFmtA;                              /* save string pointer */
-
-             /* @@@PH allocation has to be compatible to FreeAsciiString !!! */
-      lpFmtA     = (char *)malloc(ulStrings + 1);
-      if (lpFmtA == NULL)                          /* check proper allocation */
-        return (0);                                 /* raise error condition */
-
-      for (ulIndex = 0;
-           ulIndex <= ulStrings;
-           ulIndex++,
-           pszTemp++)
-      {
-        if ((pszTemp[0] == '%') &&
-            (pszTemp[1] == 's') )
-        {
-          /* replace %s by %ls */
-          lpFmtA[ulIndex++] = '%';
-          lpFmtA[ulIndex  ] = 'l';
-          lpFmtA[ulIndex+1] = 's';
-        }
-        else
-          lpFmtA[ulIndex] = *pszTemp;         /* just copy over the character */
-      }
-
-      lpFmtA[ulStrings] = 0;                            /* string termination */
-
-      FreeAsciiString(pszTemp1);          /* the original string is obsolete */
-    }
-  }
-
-  dprintf(("USER32:  wsprintfW (%s).\n",
-           lpFmt));
-
-  va_start(argptr,
-           lpFmt);
-
-  rc = O32_wvsprintf(szOut,
-                 lpFmtA,
-                 argptr);
-
-  AsciiToUnicode(szOut,
-                 lpOut);
-
-  FreeAsciiString(lpFmtA);
-  return(rc);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API wvsprintfA( LPSTR lpOutput, LPCSTR lpFormat, va_list arglist)
-{
-#ifdef DEBUG
-    WriteLog("USER32:  wvsprintfA\n");
-#endif
-    return O32_wvsprintf(lpOutput,lpFormat,(LPCVOID*)arglist);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API wvsprintfW(LPWSTR lpOutput, LPCWSTR lpFormat, va_list arglist)
-{
- int     rc;
- char    szOut[256];
- char   *lpFmtA;
-
-  lpFmtA  = UnicodeToAsciiString((LPWSTR)lpFormat);
-#ifdef DEBUG
-  WriteLog("USER32:  wvsprintfW, DOES NOT HANDLE UNICODE STRINGS!\n");
-  WriteLog("USER32:  %s\n", lpFormat);
-#endif
-  rc = O32_wvsprintf(szOut, lpFmtA, (LPCVOID)arglist);
-
-  AsciiToUnicode(szOut, lpOutput);
-#ifdef DEBUG
-  WriteLog("USER32:  %s\n", lpOutput);
-#endif
-  FreeAsciiString(lpFmtA);
-  return(rc);
-}
-
 /* Cursor Functions */