Changeset 5618 for trunk/src/shlwapi/string.c

Timestamp:

Apr 28, 2001, 3:33:49 PM (24 years ago)

Author:

sandervl

Message:

resync with latest wine

File:

• trunk/src/shlwapi/string.c (modified) (14 diffs)

trunk/src/shlwapi/string.c

@@ -14 +14 @@
 #include <winnls.h>
 #endif
-
 #include <ctype.h>
 #include <stdlib.h> 
@@ -21 +20 @@
 
 #include "winerror.h"
-#include "wine/undocshell.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "shlwapi.h"
+#include "shlobj.h"
 #include "wine/unicode.h"
-#include "heap.h"
 #include "debugtools.h"
 
@@ -46 +49 @@
         return strchrW(str, x);
 }
+#ifndef __WIN32OS2__
+/*************************************************************************
+ * StrCmpIW                                     [SHLWAPI]
+ */
+int WINAPI StrCmpIW ( LPCWSTR wstr1, LPCWSTR wstr2 )
+{
+    TRACE("%s %s\n", debugstr_w(wstr1),debugstr_w(wstr2));
+    return strcmpiW( wstr1, wstr2 );
+}
+#endif
 
 /*************************************************************************
@@ -84 +97 @@
 
 /*************************************************************************
+ * StrCmpW                                      [SHLWAPI]
+ */
+int WINAPI StrCmpW ( LPCWSTR wstr1, LPCWSTR wstr2 )
+{
+    TRACE("%s %s\n", debugstr_w(wstr1),debugstr_w(wstr2));
+    return strcmpW( wstr1, wstr2 );
+}
+
+/*************************************************************************
  * StrCatW                                      [SHLWAPI]
  */
@@ -98 +120 @@
 {
     return strcpyW( wstr1, wstr2 );
+}
+
+
+/*************************************************************************
+ * StrCpyNW                                     [SHLWAPI]
+ */
+LPWSTR WINAPI StrCpyNW( LPWSTR wstr1, LPCWSTR wstr2, int n )
+{
+    return lstrcpynW( wstr1, wstr2, n );
 }
 
@@ -131 +162 @@
 }
 
-#ifndef __WIN32OS2__
 /*************************************************************************
  * StrStrIA                                     [SHLWAPI]
@@ -161 +191 @@
     return NULL;
 }
-#endif
 
 /*************************************************************************
@@ -177 +206 @@
 int WINAPI StrToIntW(LPCWSTR lpSrc)
 {
-        int ret;
-        LPSTR lpStr =  HEAP_strdupWtoA(GetProcessHeap(),0,lpSrc);
-
-        TRACE("%s\n", debugstr_w(lpSrc));
-
-        ret = atol(lpStr);
-        HeapFree(GetProcessHeap(),0,lpStr);
-        return ret;
+    char buffer[32];
+
+    TRACE("%s\n", debugstr_w(lpSrc));
+    WideCharToMultiByte( CP_ACP, 0, lpSrc, -1, buffer, sizeof(buffer), NULL, NULL );
+    buffer[sizeof(buffer)-1] = 0;
+    return atol(buffer);
+}
+
+/*************************************************************************
+ *      StrToIntExA                     [SHLWAPI]
+ */
+BOOL WINAPI StrToIntExA( LPCSTR pszString, DWORD dwFlags, LPINT piRet)
+{
+        TRACE("%s %ld stub !\n", debugstr_a(pszString), dwFlags);
+        piRet = (LPINT) StrToIntA(pszString);
+        return TRUE;
+}
+
+/*************************************************************************
+ *      StrToIntExW                     [SHLWAPI]
+ */
+BOOL WINAPI StrToIntExW( LPCWSTR pszString, DWORD dwFlags, LPINT piRet)
+{
+        TRACE("%s %ld stub !\n", debugstr_w(pszString), dwFlags);
+        piRet = (LPINT) StrToIntW(pszString);
+        return TRUE;
 }
 
@@ -348 +395 @@
  *  the pidl is for STRRET OFFSET
  */
-HRESULT WINAPI StrRetToBufA (LPSTRRET src, LPITEMIDLIST pidl, LPSTR dest, DWORD len)
+HRESULT WINAPI StrRetToBufA (LPSTRRET src, const ITEMIDLIST *pidl, LPSTR dest, DWORD len)
 {
         TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
@@ -386 +433 @@
  *  the pidl is for STRRET OFFSET
  */
-HRESULT WINAPI StrRetToBufW (LPSTRRET src, LPITEMIDLIST pidl, LPWSTR dest, DWORD len)
+HRESULT WINAPI StrRetToBufW (LPSTRRET src, const ITEMIDLIST *pidl, LPWSTR dest, DWORD len)
 {
         TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl);
@@ -398 +445 @@
 
           case STRRET_CSTRA:
-            lstrcpynAtoW((LPWSTR)dest, src->u.cStr, len);
+              if (!MultiByteToWideChar( CP_ACP, 0, src->u.cStr, -1, dest, len ) && len)
+                  dest[len-1] = 0;
             break;
 
@@ -404 +452 @@
             if (pidl)
             {
-              lstrcpynAtoW((LPWSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+              if (!MultiByteToWideChar( CP_ACP, 0, ((LPCSTR)&pidl->mkid)+src->u.uOffset, -1,
+                                        dest, len ) && len)
+                  dest[len-1] = 0;
             }
             break;
@@ -425 +475 @@
         TRACE("%lx %p %i\n", dw, pszBuf, cchBuf);
         if ( dw<1024L )
-        { sprintf (buf,"%3.1f bytes", (FLOAT)dw);
+        { sprintf (buf,"%ld bytes", dw);
         }
         else if ( dw<1048576L)
@@ -444 +494 @@
  */
 LPWSTR WINAPI StrFormatByteSizeW ( DWORD dw, LPWSTR pszBuf, UINT cchBuf )
-{       char buf[64];
-        TRACE("%lx %p %i\n", dw, pszBuf, cchBuf);
-        if ( dw<1024L )
-        { sprintf (buf,"%3.1f bytes", (FLOAT)dw);
-        }
-        else if ( dw<1048576L)
-        { sprintf (buf,"%3.1f KB", (FLOAT)dw/1024);
-        }
-        else if ( dw < 1073741824L)
-        { sprintf (buf,"%3.1f MB", (FLOAT)dw/1048576L);
-        }
-        else
-        { sprintf (buf,"%3.1f GB", (FLOAT)dw/1073741824L);
-        }
-        lstrcpynAtoW (pszBuf, buf, cchBuf);
-        return pszBuf;  
+{
+        char buf[64];
+        StrFormatByteSizeA( dw, buf, sizeof(buf) );
+        if (!MultiByteToWideChar( CP_ACP, 0, buf, -1, pszBuf, cchBuf ) && cchBuf)
+            pszBuf[cchBuf-1] = 0;
+        return pszBuf;
+}
+
+/*************************************************************************
+ *      StrNCatA        [SHLWAPI]
+ */
+LPSTR WINAPI StrNCatA(LPSTR front, LPCSTR back, INT cchMax)
+{
+        TRACE("%s %s %i stub\n", debugstr_a(front),debugstr_a(back),cchMax);
+        return (front);
+}
+
+/*************************************************************************
+ *      StrNCatW        [SHLWAPI]
+ */
+LPWSTR WINAPI StrNCatW(LPWSTR front, LPCWSTR back, INT cchMax)
+{
+        TRACE("%s %s %i stub\n", debugstr_w(front),debugstr_w(back),cchMax);
+        return (front);
 }