Nikolay Sivov : dwrite: Skip entries prefixed with '@' in system font file enumerator.
Alexandre Julliard
julliard at winehq.org
Fri Dec 2 17:00:09 CST 2016
Module: wine
Branch: master
Commit: 93ac04d6082f1f64eeaf61e17f5f664539ea1469
URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ac04d6082f1f64eeaf61e17f5f664539ea1469
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Dec 2 01:31:56 2016 +0300
dwrite: Skip entries prefixed with '@' in system font file enumerator.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/font.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index 2e1eab0..76a90bd 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -3808,10 +3808,12 @@ static HRESULT WINAPI systemfontfileenumerator_MoveNext(IDWriteFontFileEnumerato
/* iterate until we find next string value */
while (1) {
DWORD type = 0, count, val_count;
+
val_count = max_val_count;
+ value[0] = 0;
if (RegEnumValueW(enumerator->hkey, enumerator->index, value, &val_count, NULL, &type, NULL, &count))
break;
- if (type == REG_SZ) {
+ if (type == REG_SZ && *value && *value != '@') {
*current = TRUE;
break;
}
More information about the wine-cvs
mailing list