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

Timestamp:

Jun 7, 2002, 10:02:20 AM (23 years ago)

Author:

sandervl

Message:

resynced with latest Wine

File:

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

trunk/src/shlwapi/string.c

@@ +1 @@
+/*
+ * Shlwapi string functions
+ *
+ * Copyright 1998 Juergen Schmied
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <ctype.h>
-#include <stdlib.h> 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -10 +30 @@
 #include "winuser.h"
 #include "winreg.h"
-#ifdef __WIN32OS2__
-#include "shlobj.h"
-#define NO_SHLWAPI_STREAM
-#include "shlwapi.h"
-#else
 #define NO_SHLWAPI_STREAM
 #include "shlwapi.h"
 #include "shlobj.h"
-#endif
 #include "wine/unicode.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(shell);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);
 
 /*************************************************************************
@@ -255 +269 @@
         int len = strlen(lpSrc);
         LPSTR lpDest = (LPSTR) LocalAlloc(LMEM_FIXED, len+1);
-        
+
         TRACE("%s\n", lpSrc);
 
@@ -269 +283 @@
         int len = strlenW(lpSrc);
         LPWSTR lpDest = (LPWSTR) LocalAlloc(LMEM_FIXED, sizeof(WCHAR) * (len+1));
-        
+
         TRACE("%s\n", debugstr_w(lpSrc));
 
@@ -295 +309 @@
             }
           }
-        }      
+        }
         TRACE("-- %u\n", pos);
-        return pos;     
+        return pos;
 }
 
@@ -319 +333 @@
             }
           }
-        }      
+        }
         TRACE("-- %u\n", pos);
-        return pos;     
+        return pos;
 }
 
@@ -342 +356 @@
         if (dbcs && lpStart[1] != HIBYTE(wMatch)) continue;
         lpGotIt = lpStart;
-    }    
+    }
     return (LPSTR)lpGotIt;
 }
@@ -390 +404 @@
             if (toupper(*lpStart) == toupper(wMatch)) lpGotIt = lpStart;
         }
-    }    
+    }
     return (LPSTR)lpGotIt;
 }
@@ -452 +466 @@
 /*************************************************************************
  * StrRetToBufA                                 [SHLWAPI.@]
- * 
+ *
  * converts a STRRET to a normal string
  *
@@ -497 +511 @@
 /*************************************************************************
  * StrRetToBufW                                 [SHLWAPI.@]
- * 
+ *
  * converts a STRRET to a normal string
  *
@@ -564 +578 @@
         }
         lstrcpynA (pszBuf, buf, cchBuf);
-        return pszBuf;  
+        return pszBuf;
 }
 
@@ -621 +635 @@
     return trimmed;
 }
-
-/*************************************************************************
- *      wnsprintfA      [SHLWAPI.@]
- */
-int WINAPIV wnsprintfA(LPSTR lpOut, int cchLimitIn, LPCSTR lpFmt, ...)
-{
-    va_list valist;
-    INT res;
-
-    va_start( valist, lpFmt );
-    res = wvsnprintfA( lpOut, cchLimitIn, lpFmt, valist );
-    va_end( valist );
-    return res;
-}
-
-/*************************************************************************
- *      wnsprintfW      [SHLWAPI.@]
- */
-int WINAPIV wnsprintfW(LPWSTR lpOut, int cchLimitIn, LPCWSTR lpFmt, ...)
-{
-    va_list valist;
-    INT res;
-
-    va_start( valist, lpFmt );
-    res = wvsnprintfW( lpOut, cchLimitIn, lpFmt, valist );
-    va_end( valist );
-    return res;
-}