wine/dlls/comctl32 string.c

[Alexandre Julliard]

ChangeSet ID:	21105
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/04 05:14:53

Modified files:
    dlls/comctl32  : string.c

Log message:
    Vincent Béron 
    Move functions in comctl32/string.c to remove function declaration.

Patch: http://cvs.winehq.org/patch.py?id=21105

Old revision  New revision  Changes     Path
 1.8           1.9           +39 -44     wine/dlls/comctl32/string.c

Index: wine/dlls/comctl32/string.c
diff -u -p wine/dlls/comctl32/string.c:1.8 wine/dlls/comctl32/string.c:1.9
--- wine/dlls/comctl32/string.c:1.8	4 Nov 2005 11:14:53 -0000
+++ wine/dlls/comctl32/string.c	4 Nov 2005 11:14:53 -0000
@@ -40,11 +40,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(commctrl);

-INT WINAPI StrCmpNA(LPCSTR, LPCSTR, INT);
-INT WINAPI StrCmpNW(LPCWSTR, LPCWSTR, INT);
-INT WINAPI StrCmpNIA(LPCSTR, LPCSTR, INT);
-INT WINAPI StrCmpNIW(LPCWSTR, LPCWSTR, INT);
-
 /*************************************************************************
  * COMCTL32_ChrCmpHelperA
  *
@@ -179,6 +174,45 @@ LPSTR WINAPI StrChrA(LPCSTR lpszStr, WOR
   return NULL;
 }

+/**************************************************************************
+ * StrCmpNIA [COMCTL32.353]
+ *
+ * Compare two strings, up to a maximum length, ignoring case.
+ *
+ * PARAMS
+ *  lpszStr  [I] First string to compare
+ *  lpszComp [I] Second string to compare
+ *  iLen     [I] Maximum number of chars to compare.
+ *
+ * RETURNS
+ *  An integer less than, equal to or greater than 0, indicating that
+ *  lpszStr is less than, the same, or greater than lpszComp.
+ */
+INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen)
+{
+  INT iRet;
+
+  TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen);
+
+  iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen);
+  return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0;
+}
+
+/*************************************************************************
+ * StrCmpNIW	[COMCTL32.361]
+ *
+ * See StrCmpNIA.
+ */
+INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen)
+{
+  INT iRet;
+
+  TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen);
+
+  iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen);
+  return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0;
+}
+
 /*************************************************************************
  * COMCTL32_StrStrHelperA
  *
@@ -373,45 +407,6 @@ INT WINAPI StrCmpNA(LPCSTR lpszStr, LPCS
 }

/**************************************************************************
- * StrCmpNIA [COMCTL32.353]
- *
- * Compare two strings, up to a maximum length, ignoring case.
- *
- * PARAMS
- *  lpszStr  [I] First string to compare
- *  lpszComp [I] Second string to compare
- *  iLen     [I] Maximum number of chars to compare.
- *
- * RETURNS
- *  An integer less than, equal to or greater than 0, indicating that
- *  lpszStr is less than, the same, or greater than lpszComp.
- */
-INT WINAPI StrCmpNIA(LPCSTR lpszStr, LPCSTR lpszComp, INT iLen)
-{
-  INT iRet;
-
-  TRACE("(%s,%s,%i)\n", debugstr_a(lpszStr), debugstr_a(lpszComp), iLen);
-
-  iRet = CompareStringA(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen);
-  return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0;
-}
-
-/*************************************************************************
- * StrCmpNIW	[COMCTL32.361]
- *
- * See StrCmpNIA.
- */
-INT WINAPI StrCmpNIW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen)
-{
-  INT iRet;
-
-  TRACE("(%s,%s,%i)\n", debugstr_w(lpszStr), debugstr_w(lpszComp), iLen);
-
-  iRet = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, lpszStr, iLen, lpszComp, iLen);
-  return iRet == CSTR_LESS_THAN ? -1 : iRet == CSTR_GREATER_THAN ? 1 : 0;
-}
-
-/**************************************************************************
  * StrCmpNW [COMCTL32.360]
  *
  * See StrCmpNA.