Skip to content

W
wine-winehq
Commit d817bbd6 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

msvcrt: Use the CSTR_XXX macros instead of numeric literals.

parent ac323a20
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/msvcrt/string.c
View file @ d817bbd6
...@@ -543,7 +543,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t ...@@ -543,7 +543,7 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t
else else
locinfo = locale->locinfo; locinfo = locale->locinfo;
return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-2; return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, -1, str2, -1)-CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
...@@ -567,7 +567,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale ...@@ -567,7 +567,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, MSVCRT__locale
locinfo = locale->locinfo; locinfo = locale->locinfo;
return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE,
str1, -1, str2, -1)-2; str1, -1, str2, -1)-CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
...@@ -590,7 +590,7 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c ...@@ -590,7 +590,7 @@ int CDECL MSVCRT_strncoll_l( const char* str1, const char* str2, MSVCRT_size_t c
else else
locinfo = locale->locinfo; locinfo = locale->locinfo;
return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-2; return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], 0, str1, count, str2, count)-CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
...@@ -614,7 +614,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t ...@@ -614,7 +614,7 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, MSVCRT_size_t
locinfo = locale->locinfo; locinfo = locale->locinfo;
return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE, return CompareStringA(locinfo->lc_handle[MSVCRT_LC_CTYPE], NORM_IGNORECASE,
str1, count, str2, count)-2; str1, count, str2, count)-CSTR_EQUAL;
} }
/********************************************************************* /*********************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment