Nikolay Sivov : ntdll: Use case-insensitive matching for typelib flags.
Alexandre Julliard
julliard at winehq.org
Mon Feb 24 15:42:30 CST 2014
Module: wine
Branch: master
Commit: 88fc9164422f48fc67fee58753753e60d09b5058
URL: http://source.winehq.org/git/wine.git/?a=commit;h=88fc9164422f48fc67fee58753753e60d09b5058
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Mon Feb 24 08:17:44 2014 +0400
ntdll: Use case-insensitive matching for typelib flags.
Spotted by Austin English.
---
dlls/kernel32/tests/actctx.c | 2 +-
dlls/ntdll/actctx.c | 8 ++++----
dlls/oleaut32/tests/typelib.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 06b5c9c..ae9674a 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -186,7 +186,7 @@ static const char manifest_wndcls2[] =
" <windowClass versioned=\"no\">wndClass3</windowClass>"
" <windowClass>wndClass4</windowClass>"
" <typelib tlbid=\"{99999999-8888-7777-6666-555555555555}\" version=\"1.0\" helpdir=\"help\" resourceid=\"409\""
-" flags=\"HIDDEN,CONTROL,RESTRICTED\" />"
+" flags=\"HiddeN,CoNTROL,rESTRICTED\" />"
" <typelib tlbid=\"{99999999-8888-7777-6666-555555555556}\" version=\"1.0\" helpdir=\"help1\" resourceid=\"409\" />"
" <typelib tlbid=\"{99999999-8888-7777-6666-555555555557}\" version=\"1.0\" helpdir=\"\" />"
"</file>"
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index bdbb330..5d88b9a 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -1646,13 +1646,13 @@ static BOOL parse_typelib_flags(const xmlstr_t *value, struct entity *entity)
start = str;
while (*str != ',' && (i++ < value->len)) str++;
- if (!strncmpW(start, restrictedW, str-start))
+ if (!strncmpiW(start, restrictedW, str-start))
*flags |= LIBFLAG_FRESTRICTED;
- else if (!strncmpW(start, controlW, str-start))
+ else if (!strncmpiW(start, controlW, str-start))
*flags |= LIBFLAG_FCONTROL;
- else if (!strncmpW(start, hiddenW, str-start))
+ else if (!strncmpiW(start, hiddenW, str-start))
*flags |= LIBFLAG_FHIDDEN;
- else if (!strncmpW(start, hasdiskimageW, str-start))
+ else if (!strncmpiW(start, hasdiskimageW, str-start))
*flags |= LIBFLAG_FHASDISKIMAGE;
else
{
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 73ec679..7adf064 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -4806,7 +4806,7 @@ static const char manifest_dep[] =
"<assemblyIdentity version=\"1.2.3.4\" name=\"testdep\" type=\"win32\" processorArchitecture=\"" ARCH "\"/>"
"<file name=\"test_actctx_tlb.tlb\">"
" <typelib tlbid=\"{d96d8a3e-78b6-4c8d-8f27-059db959be8a}\" version=\"2.7\" helpdir=\"\" resourceid=\"409\""
-" flags=\"RESTRICTED,CONTROL\""
+" flags=\"Restricted,cONTROL\""
" />"
"</file>"
"<file name=\"test_actctx_tlb2.tlb\">"
More information about the wine-cvs
mailing list