Changeset 1735 for trunk/src

Timestamp:

Nov 14, 1999, 2:09:59 PM (26 years ago)

Author:

achimha

Message:

implemented most missing undocumented string function

Location:

trunk/src/comctl32

Files:

• comctl32.def (modified) (2 diffs)
• comctl32undoc.c (modified) (8 diffs)

trunk/src/comctl32/comctl32.def

@@ -1 @@
-; $Id: comctl32.def,v 1.12 1999-11-02 21:44:01 achimha Exp $
+; $Id: comctl32.def,v 1.13 1999-11-14 13:09:58 achimha Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'COMCTL32 Common Controls Library'
@@ -132 +132 @@
   StrChrW             = _COMCTL32_StrChrW@8        @358
   StrCmpNA            = _COMCTL32_StrCmpNA@12      @352
+  StrCmpNIA           = _COMCTL32_StrCmpNIA@12     @353
   StrCmpNW            = _COMCTL32_StrCmpNW@12      @360
   StrRChrA            = _COMCTL32_StrRChrA@12      @351

trunk/src/comctl32/comctl32undoc.c

@@ -1 @@
-/* $Id: comctl32undoc.c,v 1.14 1999-11-05 13:01:32 achimha Exp $ */
+/* $Id: comctl32undoc.c,v 1.15 1999-11-14 13:09:59 achimha Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -1831 +1831 @@
  */
 LPWSTR WINAPI COMCTL32_StrChrW( LPCWSTR lpStart, WORD wMatch) {
-  dprintf(("COMCTL32: StrChrW - unimplemented stub\n"));
-//  return CRTDLL_wcschr(lpStart, wMatch);
-  return 0;
+  return (unsigned short*)wcschr(lpStart, wMatch);
 }
 
@@ -1845 +1843 @@
 
 /**************************************************************************
+ * StrCmpNIA [COMCTL32.353]
+ *
+ */
+INT WINAPI COMCTL32_StrCmpNIA( LPCSTR lpStr1, LPCSTR lpStr2, int nChar) {
+  //AH: Inline helper function from WINE
+    int res;
+    if (!nChar) return 0;
+    while ((--nChar > 0) && *lpStr1)
+      if ((res = toupper(*lpStr1++) - toupper(*lpStr2++))) return res;
+    return toupper(*lpStr1) - toupper(*lpStr2);
+}
+
+/**************************************************************************
  * StrCmpNW [COMCTL32.360]
  *
  */
 INT WINAPI COMCTL32_StrCmpNW( LPCWSTR lpStr1, LPCWSTR lpStr2, int nChar) {
-  dprintf(("COMCTL32: StrCmpNW - unimplemented stub\n"));
-//  return lstrncmpW(lpStr1, lpStr2, nChar);
-  return 0;
+  return wcsncmp(lpStr1, lpStr2, nChar);
 }
 
@@ -1864 +1873 @@
 }
 
+/***********************************************************************
+ *           ChrCmpA   
+ * This fuction returns FALSE if both words match, TRUE otherwise...
+ */
+static BOOL ChrCmpA( WORD word1, WORD word2) {
+  if (LOBYTE(word1) == LOBYTE(word2)) {
+    if (IsDBCSLeadByte(LOBYTE(word1))) {
+      return (word1 != word2);
+    }
+    return FALSE;
+  }
+  return TRUE;
+}
+
 /**************************************************************************
  * StrRChrA [COMCTL32.351]
@@ -1869 +1892 @@
  */
 LPSTR WINAPI COMCTL32_StrRChrA( LPCSTR lpStart, LPCSTR lpEnd, WORD wMatch) {
-  dprintf(("COMCTL32: lstrrchr - unimplemented stub\n"));
-//  return lstrrchr(lpStart, lpEnd, wMatch);
+  LPCSTR lpGotIt = NULL;
+
+  if (!lpEnd) lpEnd = lpStart + strlen(lpStart);
+
+  for(; lpStart < lpEnd; lpStart = CharNextA(lpStart)) 
+    if (!ChrCmpA( GET_WORD(lpStart), wMatch)) 
+      lpGotIt = lpStart;
+    
+  return ((LPSTR)lpGotIt);
+
   return 0;
 }
 
+/***********************************************************************
+ *           ChrCmpW   
+ * This fuction returns FALSE if both words match, TRUE otherwise...
+ */
+static BOOL ChrCmpW( WORD word1, WORD word2) {
+  return (word1 != word2);
+}
+
 /**************************************************************************
  * StrRChrW [COMCTL32.359]
  *
  */
-LPWSTR WINAPI COMCTL32_StrRChrW( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch) {
-  dprintf(("COMCTL32: StrRChrW - unimplemented stub\n"));
-//  return lstrrchrw(lpStart, lpEnd, wMatch);
-  return 0;
-}
+LPWSTR WINAPI COMCTL32_StrRChrW( LPCWSTR lpStart, LPCWSTR lpEnd, WORD wMatch)
+{
+  //AH: Inline Wine helper function
+  LPCWSTR lpGotIt = NULL;
+
+  if (!lpEnd) lpEnd = lpStart + lstrlenW(lpStart);
+
+  for(; lpStart < lpEnd; lpStart = CharNextW(lpStart)) 
+    if (!ChrCmpW( GET_WORD(lpStart), wMatch)) 
+      lpGotIt = lpStart;
+    
+  return (LPWSTR)lpGotIt;
+}
+
 
 /**************************************************************************
@@ -1897 +1945 @@
  */
 LPWSTR WINAPI COMCTL32_StrStrW( LPCWSTR lpFirst, LPCWSTR lpSrch) {
-  dprintf(("COMCTL32: StrStrW - unimplemented stub\n"));
-//  return strstrw(lpFirst, lpSrch);
-  return 0;
+  return (unsigned short*)wcsstr(lpFirst, lpSrch);
 }
 
@@ -1909 +1955 @@
   LPWSTR lpLoop = lpStr;
 
-  dprintf(("COMCTL32: StrSpnW - unimplemented stub\n"));
-  return 0;
-
   /* validate ptr */
   if ((lpStr == 0) || (lpSet == 0)) return 0;
@@ -1917 +1960 @@
 /* while(*lpLoop) { if lpLoop++; } */
 
-//  for(; (*lpLoop != 0); lpLoop++)
-//    if( CRTDLL_wcschr(lpSet, *(WORD*)lpLoop))
-//      return (INT)(lpLoop-lpStr);
-
-//  return (INT)(lpLoop-lpStr);
+  for(; (*lpLoop != 0); lpLoop++)
+    if (wcschr(lpSet, *(WORD*)lpLoop))
+      return (INT)(lpLoop-lpStr);
+
+  return (INT)(lpLoop-lpStr);
 }