[PATCH v2 0/1] MR1533: include: Add inline versions of the isw* functions.

[Alex Henrie (＠alexhenrie)]

I want to replace is_ascii with iswascii in urlmon without hurting performance. I added inline versions of the rest of the isw* functions because they may also be useful to us in the future.

--
  v2: include: Add inline versions of the isw* functions.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1533

[PATCH v2 1/1] include: Add inline versions of the isw* functions.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

---
 dlls/msvcrt/ctype.c             |  1 +
 dlls/msvcrt/wcs.c               |  1 +
 dlls/ntdll/wcstring.c           |  1 +
 include/msvcrt/corecrt_wctype.h | 15 +++++++++++++++
 4 files changed, 18 insertions(+)

diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 5a7d3450eda..b749052cec5 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define _CTYPE_DISABLE_MACROS
 #include <locale.h>
 #include "msvcrt.h"
 #include "winnls.h"
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 60a15dfc29c..6a3d90d9cc5 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define _CTYPE_DISABLE_MACROS
 #define _NO_CRT_STDIO_INLINE
 #include <limits.h>
 #include <locale.h>
diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c
index aa43c3de16b..cc6e53699d5 100644
--- a/dlls/ntdll/wcstring.c
+++ b/dlls/ntdll/wcstring.c
@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define _CTYPE_DISABLE_MACROS
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h
index 9661ab5e596..d68daf4fa57 100644
--- a/include/msvcrt/corecrt_wctype.h
+++ b/include/msvcrt/corecrt_wctype.h
@@ -57,6 +57,21 @@ _ACRTIMP int     __cdecl iswxdigit(wint_t);
 _ACRTIMP wint_t  __cdecl towlower(wint_t);
 _ACRTIMP wint_t  __cdecl towupper(wint_t);
 
+#if !defined(__cplusplus) && !defined(_CTYPE_DISABLE_MACROS)
+# define iswalnum(wc)   _iswctype_l(wc, _ALPHA | _DIGIT, NULL)
+# define iswalpha(wc)   _iswctype_l(wc, _ALPHA, NULL)
+# define iswascii(wc)   ((unsigned)wc < 0x80)
+# define iswblank(wc)   (wc == '\t' || _iswctype_l(wc, _BLANK, NULL))
+# define iswcntrl(wc)   _iswctype_l(wc, _CONTROL, NULL)
+# define iswgraph(wc)   _iswctype_l(wc, _ALPHA | _DIGIT | _PUNCT, NULL)
+# define iswlower(wc)   _iswctype_l(wc, _LOWER, NULL)
+# define iswprint(wc)   _iswctype_l(wc, _ALPHA | _BLANK | _DIGIT | _PUNCT, NULL)
+# define iswpunct(wc)   _iswctype_l(wc, _PUNCT, NULL)
+# define iswspace(wc)   _iswctype_l(wc, _SPACE, NULL)
+# define iswupper(wc)   _iswctype_l(wc, _UPPER, NULL)
+# define iswxdigit(wc)  _iswctype_l(wc, _HEX, NULL)
+#endif
+
 #ifdef __cplusplus
 }
 #endif
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1533

[Alexandre Julliard (＠julliard)]

It's still a function call for all of them except iswascii so it shouldn't make any difference. And I don't think replacing is_ascii in urlmon is worth it.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1533#note_17305

[PATCH v2 0/1] MR1533: include: Add inline versions of the isw* functions. - closed

[Alexandre Julliard (＠julliard)]

This merge request was closed by Alexandre Julliard.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1533