From 1fa82e51c2b1d05a0b095fbd05318fa06683aedd Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 18 Nov 2003 00:02:25 +0000 Subject: [PATCH] Apply same magic to LibAttr.lcid from MSFT to SLTG. --- dlls/oleaut32/typelib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 5059fa22fa3..493a48fb36a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2184,7 +2184,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) /* pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid;*/ /* Windows seems to have zero here, is this correct? */ if(SUBLANGID(tlbHeader.lcid) == SUBLANG_NEUTRAL) - pTypeLibImpl->LibAttr.lcid = PRIMARYLANGID(tlbHeader.lcid); + pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(tlbHeader.lcid),0),0); else pTypeLibImpl->LibAttr.lcid = 0; @@ -2429,7 +2429,10 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) pTypeLibImpl->LibAttr.syskind = *(WORD*)ptr; ptr += 2; - pTypeLibImpl->LibAttr.lcid = *(WORD*)ptr; + if(SUBLANGID(*(WORD*)ptr) == SUBLANG_NEUTRAL) + pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(*(WORD*)ptr),0),0); + else + pTypeLibImpl->LibAttr.lcid = 0; ptr += 2; ptr += 4; /* skip res12 */