Nikolay Sivov : comctl32/syslink: Use wide string literals.
Alexandre Julliard
julliard at winehq.org
Fri May 1 16:17:51 CDT 2020
Module: wine
Branch: master
Commit: 1141a7df28acc5b5a86af110ef68932eeb823a58
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1141a7df28acc5b5a86af110ef68932eeb823a58
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri May 1 18:42:03 2020 +0300
comctl32/syslink: Use wide string literals.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/syslink.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 78d0fd0986..802a8803e8 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -165,10 +165,6 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr)
*/
static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text)
{
- static const WCHAR SL_LINKOPEN[] = { '<','a' };
- static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"' };
- static const WCHAR SL_ID[] = { 'i','d','=','\"' };
- static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>' };
LPCWSTR current, textstart = NULL, linktext = NULL, firsttag = NULL;
int taglen = 0, textlen = 0, linklen = 0, docitems = 0;
PDOC_ITEM Last = NULL;
@@ -182,7 +178,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text)
{
if(*current == '<')
{
- if(!wcsnicmp(current, SL_LINKOPEN, ARRAY_SIZE(SL_LINKOPEN)) && (CurrentType == slText))
+ if(!wcsnicmp(current, L"<a", 2) && (CurrentType == slText))
{
BOOL ValidParam = FALSE, ValidLink = FALSE;
@@ -210,14 +206,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text)
CheckParameter:
/* compare the current position with all known parameters */
- if(!wcsnicmp(tmp, SL_HREF, ARRAY_SIZE(SL_HREF)))
+ if(!wcsnicmp(tmp, L"href=\"", 6))
{
taglen += 6;
ValidParam = TRUE;
CurrentParameter = &lpUrl;
CurrentParameterLen = &lenUrl;
}
- else if(!wcsnicmp(tmp, SL_ID, ARRAY_SIZE(SL_ID)))
+ else if(!wcsnicmp(tmp, L"id=\"", 4))
{
taglen += 4;
ValidParam = TRUE;
@@ -291,7 +287,7 @@ CheckParameter:
}
}
}
- else if(!wcsnicmp(current, SL_LINKCLOSE, ARRAY_SIZE(SL_LINKCLOSE)) && (CurrentType == slLink) && firsttag)
+ else if (!wcsnicmp(current, L"</a>", 4) && (CurrentType == slLink) && firsttag)
{
/* there's a <a...> tag opened, first add the previous text, if present */
if(textstart != NULL && textlen > 0 && firsttag > textstart)
More information about the wine-cvs
mailing list