Michael Stefaniuc : riched20: Use wide-char string literals in a struct initialization.
Alexandre Julliard
julliard at winehq.org
Thu Nov 19 16:10:22 CST 2020
Module: wine
Branch: master
Commit: d08852d835702f8d61b598d4274e6e4bb5421120
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08852d835702f8d61b598d4274e6e4bb5421120
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Sun Nov 15 23:11:15 2020 +0100
riched20: Use wide-char string literals in a struct initialization.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/editor.c | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 985bcc3d573..ee392f6fa6a 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -5433,23 +5433,25 @@ done:
static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, int nChars)
{
#define MAX_PREFIX_LEN 9
+#define X(str) str, ARRAY_SIZE(str) - 1
struct prefix_s {
const WCHAR text[MAX_PREFIX_LEN];
int length;
}prefixes[] = {
- {{'p','r','o','s','p','e','r','o',':'}, 9},
- {{'t','e','l','n','e','t',':'}, 7},
- {{'g','o','p','h','e','r',':'}, 7},
- {{'m','a','i','l','t','o',':'}, 7},
- {{'h','t','t','p','s',':'}, 6},
- {{'f','i','l','e',':'}, 5},
- {{'n','e','w','s',':'}, 5},
- {{'w','a','i','s',':'}, 5},
- {{'n','n','t','p',':'}, 5},
- {{'h','t','t','p',':'}, 5},
- {{'w','w','w','.'}, 4},
- {{'f','t','p',':'}, 4},
+ {X(L"prospero:")},
+ {X(L"telnet:")},
+ {X(L"gopher:")},
+ {X(L"mailto:")},
+ {X(L"https:")},
+ {X(L"file:")},
+ {X(L"news:")},
+ {X(L"wais:")},
+ {X(L"nntp:")},
+ {X(L"http:")},
+ {X(L"www.")},
+ {X(L"ftp:")},
};
+#undef X
WCHAR bufferW[MAX_PREFIX_LEN + 1];
unsigned int i;
More information about the wine-cvs
mailing list