Changeset 7820 for trunk/src/shlwapi/string_odin.cpp

Timestamp:

Feb 6, 2002, 9:18:30 PM (24 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/shlwapi/string_odin.cpp (modified) (15 diffs)

trunk/src/shlwapi/string_odin.cpp

@@ -1 @@
-/* $Id: string_odin.cpp,v 1.5 2001-09-05 13:48:39 bird Exp $ */
+ /* $Id: string_odin.cpp,v 1.6 2002-02-06 20:18:30 sandervl Exp $ */
+
 /*
  * Win32 Lightweight SHELL32 for OS/2
@@ -69 +70 @@
 
 
-/*****************************************************************************
- * Name      : ChrCmpIA
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    : PARTIALLY IMPLEMENTED UNTESTED
- *
- * Author    : Patrick Haller [Wed, 1999/12/29 09:00]
- *****************************************************************************/
-
-ODINFUNCTION2(INT,    ChrCmpIA,
-              INT,    ch1,
-              INT,    ch2)
-{
-  // Note: IsDBCSLeadByte ignored !
-
-  if ( (ch1 >= 'A') && (ch1 <= 'Z') ) ch1 |= 0x20;
-  if ( (ch2 >= 'A') && (ch2 <= 'Z') ) ch2 |= 0x20;
-
-  return ch1 - ch2;
-}
-
-
-#if 0
-/*************************************************************************
- * OleStrToStrN                                 [SHELL32.78]
- */
-BOOL WINAPI OleStrToStrNA (LPSTR lpStr, INT nStr, LPCWSTR lpOle, INT nOle)
-{
-        TRACE("%p %x %s %x\n", lpStr, nStr, debugstr_w(lpOle), nOle);
-        return WideCharToMultiByte (0, 0, lpOle, nOle, lpStr, nStr, NULL, NULL);
-}
-
-BOOL WINAPI OleStrToStrNW (LPWSTR lpwStr, INT nwStr, LPCWSTR lpOle, INT nOle)
-{
-        TRACE("%p %x %s %x\n", lpwStr, nwStr, debugstr_w(lpOle), nOle);
-
-        if (lstrcpynW ( lpwStr, lpOle, nwStr))
-        { return lstrlenW (lpwStr);
-        }
-        return 0;
-}
-
-BOOL WINAPI OleStrToStrNAW (LPVOID lpOut, INT nOut, LPCVOID lpIn, INT nIn)
-{
-        if (VERSION_OsIsUnicode())
-          return OleStrToStrNW ((LPWSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
-        return OleStrToStrNA ((LPSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
-}
-
-/*************************************************************************
- * StrToOleStrN                                 [SHELL32.79]
- *  lpMulti, nMulti, nWide [IN]
- *  lpWide [OUT]
- */
-BOOL WINAPI StrToOleStrNA (LPWSTR lpWide, INT nWide, LPCSTR lpStrA, INT nStr)
-{
-        TRACE("%p %x %s %x\n", lpWide, nWide, lpStrA, nStr);
-        return MultiByteToWideChar (0, 0, lpStrA, nStr, lpWide, nWide);
-}
-BOOL WINAPI StrToOleStrNW (LPWSTR lpWide, INT nWide, LPCWSTR lpStrW, INT nStr)
-{
-        TRACE("%p %x %s %x\n", lpWide, nWide, debugstr_w(lpStrW), nStr);
-
-        if (lstrcpynW (lpWide, lpStrW, nWide))
-        { return lstrlenW (lpWide);
-        }
-        return 0;
-}
-
-BOOL WINAPI StrToOleStrNAW (LPWSTR lpWide, INT nWide, LPCVOID lpStr, INT nStr)
-{
-        if (VERSION_OsIsUnicode())
-          return StrToOleStrNW (lpWide, nWide, (LPWSTR)lpStr, nStr);
-        return StrToOleStrNA (lpWide, nWide, (LPSTR)lpStr, nStr);
-}
-
-
-
-
-/************************************************************************
- *      StrToOleStr                     [SHELL32.163]
- *
- */
-int WINAPI StrToOleStrA (LPWSTR lpWideCharStr, LPCSTR lpMultiByteString)
-{
-        TRACE("%p %p(%s)\n",
-        lpWideCharStr, lpMultiByteString, lpMultiByteString);
-
-        return MultiByteToWideChar(0, 0, lpMultiByteString, -1, lpWideCharStr, MAX_PATH);
-
-}
-int WINAPI StrToOleStrW (LPWSTR lpWideCharStr, LPCWSTR lpWString)
-{
-        TRACE("%p %p(%s)\n",
-        lpWideCharStr, lpWString, debugstr_w(lpWString));
-
-        if (lstrcpyW (lpWideCharStr, lpWString ))
-        { return lstrlenW (lpWideCharStr);
-        }
-        return 0;
-}
-
-BOOL WINAPI StrToOleStrAW (LPWSTR lpWideCharStr, LPCVOID lpString)
-{
-        if (VERSION_OsIsUnicode())
-          return StrToOleStrW (lpWideCharStr, (LPCWSTR)lpString);
-        return StrToOleStrA (lpWideCharStr, (LPCSTR)lpString);
-}
-#endif
 
 
@@ -200 +89 @@
 ODINFUNCTION2(LPSTR,  StrChrIA,
               LPCSTR, lpStart,
-              WORD,   wMatch)
+              char,   cMatch)
 {
   LPSTR lpRes;
 
-  wMatch = tolower(wMatch);
-  lpRes = strchr(lpStart, wMatch);    // lower case comparsion
+  cMatch = tolower(cMatch);
+  lpRes = strchr(lpStart, cMatch);    // lower case comparsion
   if (NULL == lpRes)
   {
-    wMatch = toupper(wMatch);
-    lpRes = strchr(lpStart, wMatch);  // upper case comparsion
+    cMatch = toupper(cMatch);
+    lpRes = strchr(lpStart, cMatch);  // upper case comparsion
   }
 
@@ -293 +182 @@
        (lpString2 == NULL) )
     return 0;
-
+  
   LPSTR lpLoop = (LPSTR)lpString1;
-
+  
   for (; (*lpLoop != 0); lpLoop++ )
     if ( StrChrA( lpString2, *lpLoop ) )
       return (INT) (lpLoop - lpString1);
-
+  
   return (INT) (lpLoop - lpString1);
 }
@@ -327 +216 @@
        (lpString2 == NULL) )
     return 0;
-
+  
   LPWSTR lpLoop = (LPWSTR)lpString1;
-
+  
   for (; (*lpLoop != 0); lpLoop++ )
     if ( StrChrW( lpString2, *lpLoop ) )
       return (INT) (lpLoop - lpString1);
-
+  
   return (INT) (lpLoop - lpString1);
 }
@@ -344 +233 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : 
  * Status    : UNTESTED
  *
@@ -355 +244 @@
 {
   register LPSTR s1;
-
+  
   while (*lpString1)
   {
@@ -369 +258 @@
     lpString1++;
   }
-
+  
   return (LPSTR)NULL;
 }
@@ -380 +269 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : 
  * Status    : UNTESTED
  *
@@ -391 +280 @@
 {
   register LPWSTR s1;
-
+  
   while (*lpString1)
   {
@@ -405 +294 @@
     lpString1++;
   }
-
+  
   return (LPWSTR)NULL;
 }
@@ -411 +300 @@
 
 /*************************************************************************
- * StrRStrIA                    [SHLWAPI]
+ * StrRStrIA                                    [SHLWAPI]
  */
-LPSTR WINAPI StrRStrIA(LPCSTR lpFirst, LPCSTR lpSrch)
+LPSTR WINAPI StrRStrIA(LPCSTR lpFirst, LPCSTR lpSrch, LPCSTR unknown)
 {
   INT   iLen = lstrlenA(lpFirst) - lstrlenA(lpSrch);
 
+  dprintf(("StrRStrIA %x %x %x NOT IMPLEMENTED correctly", lpFirst, lpSrch, unknown));
+  
   // lpSrch cannot fit into lpFirst
   if (iLen < 0)
     return (LPSTR)NULL;
-
+  
   LPSTR lpThis = (LPSTR)lpFirst + iLen;
-
+  
   while (lpThis >= lpFirst)
   {
@@ -430 +321 @@
     lpThis--;
   }
-
+  
   return NULL;
 }
@@ -436 +327 @@
 
 /*************************************************************************
- * StrRStrIW                    [SHLWAPI]
+ * StrRStrIW                                    [SHLWAPI]
  */
-LPWSTR WINAPI StrRStrIW(LPCWSTR lpFirst, LPCWSTR lpSrch)
+LPWSTR WINAPI StrRStrIW(LPCWSTR lpFirst, LPCWSTR lpSrch, LPCWSTR unknown)
 {
   INT   iLen = lstrlenW(lpFirst) - lstrlenW(lpSrch);
 
+  dprintf(("StrRStrIA %x %x %x NOT IMPLEMENTED correctly", lpFirst, lpSrch, unknown));
+  
   // lpSrch cannot fit into lpFirst
   if (iLen < 0)
     return (LPWSTR)NULL;
-
+  
   LPWSTR lpThis = (LPWSTR)lpFirst + iLen;
-
+  
   while (lpThis >= lpFirst)
   {
@@ -455 +348 @@
     lpThis--;
   }
-
+  
   return NULL;
 }