Skip to content

W
wine-winehq
Commit 1fa82e51 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

Apply same magic to LibAttr.lcid from MSFT to SLTG.

parent d8685497
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/oleaut32/typelib.c
View file @ 1fa82e51
...@@ -2184,7 +2184,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength) ...@@ -2184,7 +2184,7 @@ static ITypeLib2* ITypeLib2_Constructor_MSFT(LPVOID pLib, DWORD dwTLBLength)
/* pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid;*/ /* pTypeLibImpl->LibAttr.lcid = tlbHeader.lcid;*/
/* Windows seems to have zero here, is this correct? */ /* Windows seems to have zero here, is this correct? */
if(SUBLANGID(tlbHeader.lcid) == SUBLANG_NEUTRAL) if(SUBLANGID(tlbHeader.lcid) == SUBLANG_NEUTRAL)
pTypeLibImpl->LibAttr.lcid = PRIMARYLANGID(tlbHeader.lcid); pTypeLibImpl->LibAttr.lcid = MAKELCID(MAKELANGID(PRIMARYLANGID(tlbHeader.lcid),0),0);
else else
pTypeLibImpl->LibAttr.lcid = 0; pTypeLibImpl->LibAttr.lcid = 0;
...@@ -2429,7 +2429,10 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl) ...@@ -2429,7 +2429,10 @@ static DWORD SLTG_ReadLibBlk(LPVOID pLibBlk, ITypeLibImpl *pTypeLibImpl)
pTypeLibImpl->LibAttr.syskind = *(WORD*)ptr; pTypeLibImpl->LibAttr.syskind = *(WORD*)ptr;
ptr += 2; 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 += 2;
ptr += 4; /* skip res12 */ ptr += 4; /* skip res12 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment