May 2011 - Wine-commits - list.winehq.org

Marcus Meissner : imagehlp: Mark internal variable as hidden visibility.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: 9d5db69f5080ff8f9b8828be3fb5c7c58ace3f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5db69f5080ff8f9b8828be3… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:15:20 2011 +0200 imagehlp: Mark internal variable as hidden visibility. --- dlls/imagehlp/access.c | 2 +- dlls/imagehlp/imagehlp_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index 009d6f7..cf19e6c 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -54,7 +54,7 @@ static LOADED_IMAGE IMAGEHLP_EmptyLoadedImage = { 148, /* SizeOfImage; */ }; -extern HANDLE IMAGEHLP_hHeap; +DECLSPEC_HIDDEN extern HANDLE IMAGEHLP_hHeap; /*********************************************************************** * GetImageConfigInformation (IMAGEHLP.@) diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index 91c76bd..3ddae7a 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -26,7 +26,7 @@ #include "wine/debug.h" /**********************************************************************/ -HANDLE IMAGEHLP_hHeap = NULL; +DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; /*********************************************************************** * DllMain (IMAGEHLP.init)

1 0

Marcus Meissner : infosoft: Mark internal symbol with hidden visibility.
by Alexandre Julliard 19 May '11

19 May '11

Module: wine Branch: master Commit: ac1550bdaa9c3068838e1d7114016ae976f4dbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1550bdaa9c3068838e1d711… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri May 13 17:16:53 2011 +0200 infosoft: Mark internal symbol with hidden visibility. --- dlls/infosoft/infosoft_main.c | 2 +- dlls/infosoft/wordbreaker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 619eca2..518e44c 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -56,7 +56,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return TRUE; } -extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); +DECLSPEC_HIDDEN extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 69e2eb8..1789766 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -183,7 +183,7 @@ static const IWordBreakerVtbl wordbreaker_vtbl = wb_GetLicenseToUse, }; -HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) +DECLSPEC_HIDDEN HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) { wordbreaker_impl *This; IWordBreaker *wb;

1 0

Andrew Nguyen : advapi32: Add stubs for GetNamedSecurityInfoExA/W.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: 4d154d007dbe643bc4c1408c3b1e59d96d75c5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d154d007dbe643bc4c1408c3… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:15:19 2011 -0500 advapi32: Add stubs for GetNamedSecurityInfoExA/W. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e01217f..d27db95 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -260,8 +260,8 @@ # @ stub GetMultipleTrusteeOperationW # @ stub GetMultipleTrusteeW @ stdcall GetNamedSecurityInfoA (str long long ptr ptr ptr ptr ptr) -# @ stub GetNamedSecurityInfoExA -# @ stub GetNamedSecurityInfoExW +@ stdcall GetNamedSecurityInfoExA(str long long str str ptr ptr ptr ptr) +@ stdcall GetNamedSecurityInfoExW(wstr long long wstr wstr ptr ptr ptr ptr) @ stdcall GetNamedSecurityInfoW (wstr long long ptr ptr ptr ptr ptr) @ stdcall GetNumberOfEventLogRecords (long ptr) @ stdcall GetOldestEventLogRecord (long ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2dcb8fa..c3454a8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5495,6 +5495,30 @@ DWORD WINAPI GetNamedSecurityInfoW( LPWSTR name, SE_OBJECT_TYPE type, } /****************************************************************************** + * GetNamedSecurityInfoExW [ADVAPI32.@] + */ +DWORD WINAPI GetNamedSecurityInfoExW( LPCWSTR object, SE_OBJECT_TYPE type, + SECURITY_INFORMATION info, LPCWSTR provider, LPCWSTR property, + PACTRL_ACCESSW* access_list, PACTRL_AUDITW* audit_list, LPWSTR* owner, LPWSTR* group ) +{ + FIXME("(%s, %d, %d, %s, %s, %p, %p, %p, %p) stub\n", debugstr_w(object), type, info, + debugstr_w(provider), debugstr_w(property), access_list, audit_list, owner, group); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * GetNamedSecurityInfoExA [ADVAPI32.@] + */ +DWORD WINAPI GetNamedSecurityInfoExA( LPCSTR object, SE_OBJECT_TYPE type, + SECURITY_INFORMATION info, LPCSTR provider, LPCSTR property, + PACTRL_ACCESSA* access_list, PACTRL_AUDITA* audit_list, LPSTR* owner, LPSTR* group ) +{ + FIXME("(%s, %d, %d, %s, %s, %p, %p, %p, %p) stub\n", debugstr_a(object), type, info, + debugstr_a(provider), debugstr_a(property), access_list, audit_list, owner, group); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** * DecryptFileW [ADVAPI32.@] */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved)

1 0

Andrew Nguyen : kernel32: Suppress constness warnings for tigetstr parameter.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: f5e555660dacb24781c78a563211c64cfab82690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5e555660dacb24781c78a563… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:44 2011 -0500 kernel32: Suppress constness warnings for tigetstr parameter. --- dlls/kernel32/term.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 18eb4b2..5123090 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -376,7 +376,7 @@ static BOOL TERM_BuildKeyDB(void) for (i = 0; i < sizeof(TERM_dbkey_init) / sizeof(TERM_dbkey_init[0]); i++) { - if (!TERM_AddKeyDescr(tigetstr(TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) + if (!TERM_AddKeyDescr(tigetstr((char *)TERM_dbkey_init[i].string_normal), &TERM_dbkey_init[i].descr)) return FALSE; if (TERM_dbkey_init[i].string_xterm) { @@ -421,7 +421,7 @@ BOOL TERM_Init(void) TERM_init_done = TRUE; TERM_BuildKeyDB(); /* set application key mode */ - putp(tigetstr("smkx")); + putp(tigetstr((char *)"smkx")); return TRUE; } @@ -430,7 +430,7 @@ BOOL TERM_Exit(void) if (TERM_init_done) { /* put back the cursor key mode */ - putp(tigetstr("rmkx")); + putp(tigetstr((char *)"rmkx")); } return TRUE; }

1 0

Andrew Nguyen : mmdevapi: Remove a stray semicolon in macro definition.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: a67941d3936ef9db9c56db816393ec8187c91274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a67941d3936ef9db9c56db816… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:48 2011 -0500 mmdevapi: Remove a stray semicolon in macro definition. --- dlls/mmdevapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index f87ad2e..ed0039a 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -72,7 +72,7 @@ static BOOL load_driver(const WCHAR *name) } #define LDFC(n) do { drvs.p##n = (void*)GetProcAddress(drvs.module, #n);\ - if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0); + if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0) LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); #undef LDFC

1 0

Andrew Nguyen : windowscodecs: Trace the correct expected value in some seek test failure strings.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: 9d5ef07178a661c39a758565584c45d454ca5ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5ef07178a661c39a7585655… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:53 2011 -0500 windowscodecs: Trace the correct expected value in some seek test failure strings. --- dlls/windowscodecs/tests/stream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index 5730995..0dbcddf 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -442,7 +442,7 @@ static void test_StreamOnStreamRange(void) /* Seek */ hr = IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_END, &uNewPos); - ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 20, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesWritten); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 20, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 20); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); hr = IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_SET, &uNewPos); @@ -712,7 +712,7 @@ static void test_StreamOnStreamRange(void) hr = IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_END, &uNewPos); ok(hr == S_OK, "Seek returned with %#x, expected %#x\n", hr, S_OK); - ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 16, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, uBytesWritten); + ok(uNewPos.u.HighPart == 0 && uNewPos.u.LowPart == 16, "Seek cursor moved to position (%u;%u), expected (%u;%u)\n", uNewPos.u.HighPart, uNewPos.u.LowPart, 0, 16); IWICStream_Seek(pSubStream, LargeNull, STREAM_SEEK_SET, NULL); hr = IWICStream_Read(pSubStream, Memory, 48, &uBytesRead);

1 0

Andrew Nguyen : advapi32/tests: Use a matching enumeration value for the trustee form member.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: 163dfad5a18c5a8598eef98893584d0c22b94934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163dfad5a18c5a8598eef9889… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:17:58 2011 -0500 advapi32/tests: Use a matching enumeration value for the trustee form member. --- dlls/advapi32/tests/security.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7040add..4b7473f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2782,7 +2782,7 @@ static void test_SetEntriesInAclW(void) } else { - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszEveryone; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); @@ -2798,7 +2798,7 @@ static void test_SetEntriesInAclW(void) broken(NewAcl != NULL), /* NT4 */ "returned acl wasn't NULL: %p\n", NewAcl); - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_INVALID_PARAMETER || @@ -2816,7 +2816,7 @@ static void test_SetEntriesInAclW(void) LocalFree(NewAcl); } - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPWSTR)wszCurrentUser; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); @@ -2913,7 +2913,7 @@ static void test_SetEntriesInAclA(void) } else { - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPSTR)szEveryone; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res); @@ -2929,7 +2929,7 @@ static void test_SetEntriesInAclA(void) broken(NewAcl != NULL), /* NT4 */ "returned acl wasn't NULL: %p\n", NewAcl); - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.MultipleTrusteeOperation = TRUSTEE_IS_IMPERSONATE; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_INVALID_PARAMETER || @@ -2947,7 +2947,7 @@ static void test_SetEntriesInAclA(void) LocalFree(NewAcl); } - ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_USER; + ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_NAME; ExplicitAccess.Trustee.ptstrName = (LPSTR)szCurrentUser; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res);

1 0

Andrew Nguyen : winedbg: Convert the CRLF newline to LF newline when reading interactive input.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: 9981938486ad131cc0badaca75bd25f45a7ed7bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9981938486ad131cc0badaca7… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:09:11 2011 -0500 winedbg: Convert the CRLF newline to LF newline when reading interactive input. --- programs/winedbg/debug.l | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 41db76c..dfb75b4 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -78,10 +78,19 @@ static int read_input(const char* pfx, char* buf, int size) lexeme_flush(); len = input_fetch_entire_line(pfx, &tmp); if (len < 0) return 0; /* eof */ + + /* remove carriage return in newline */ + if (len >= 2 && tmp[len - 2] == '\r') + { + tmp[len - 2] = '\n'; + tmp[len - 1] = '\0'; + len--; + } + /* FIXME: should have a pair of buffers, and switch between the two, instead of * reallocating a new one for each line */ - if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n') || (len == 2 && tmp[0] == '\r' && tmp[1] == '\n'))) + if (last_line && (len == 0 || (len == 1 && tmp[0] == '\n'))) { HeapFree(GetProcessHeap(), 0, tmp); }

1 0

Andrew Nguyen : winedbg: Eliminate a possible memory leak in input_fetch_entire_line.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: 218d970bddc398a07da31631e31f7314c5ca1cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218d970bddc398a07da31631e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Wed May 18 07:09:21 2011 -0500 winedbg: Eliminate a possible memory leak in input_fetch_entire_line. --- programs/winedbg/dbg.y | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 4f2da25..fa5e9a7 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -462,42 +462,39 @@ static HANDLE dbg_parser_output; int input_fetch_entire_line(const char* pfx, char** line) { + char* buffer; char ch; DWORD nread; size_t len, alloc; - + /* as of today, console handles can be file handles... so better use file APIs rather than * console's */ WriteFile(dbg_parser_output, pfx, strlen(pfx), &nread, NULL); - if (*line) - { - alloc = HeapSize(GetProcessHeap(), 0, *line); - assert(alloc); - } - else - { - *line = HeapAlloc(GetProcessHeap(), 0, alloc = 16); - assert(*line); - } + buffer = HeapAlloc(GetProcessHeap(), 0, alloc = 16); + assert(buffer != NULL); len = 0; do { if (!ReadFile(dbg_parser_input, &ch, 1, &nread, NULL) || nread == 0) + { + HeapFree(GetProcessHeap(), 0, buffer); return -1; + } if (len + 2 > alloc) { while (len + 2 > alloc) alloc *= 2; - *line = dbg_heap_realloc(*line, alloc); + buffer = dbg_heap_realloc(buffer, alloc); } - (*line)[len++] = ch; + buffer[len++] = ch; } while (ch != '\n'); - (*line)[len] = '\0'; + buffer[len] = '\0'; + *line = buffer; return len; }

1 0

Aric Stewart : usp10: Make use of MS_MAKE_TAG instead of numeric constants.
by Alexandre Julliard 18 May '11

18 May '11

Module: wine Branch: master Commit: 2587f702c5b7735e539e04590128e6c56f345b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2587f702c5b7735e539e04590… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 18 07:50:11 2011 -0500 usp10: Make use of MS_MAKE_TAG instead of numeric constants. --- dlls/usp10/shape.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c0050c9..fb6084e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -253,18 +253,18 @@ static const char* contextual_features[] = static OPENTYPE_FEATURE_RECORD standard_features[] = { - { 0x6167696c /*liga*/, 1}, - { 0x67696c63 /*clig*/, 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, + { MS_MAKE_TAG('c','l','i','g'), 1}, }; static OPENTYPE_FEATURE_RECORD arabic_features[] = { - { 0x67696c72 /*rlig*/, 1}, - { 0x746c6163 /*calt*/, 1}, - { 0x6167696c /*liga*/, 1}, - { 0x67696c64 /*dlig*/, 1}, - { 0x68777363 /*cswh*/, 1}, - { 0x7465736d /*mset*/, 1}, + { MS_MAKE_TAG('r','l','i','g'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, + { MS_MAKE_TAG('d','l','i','g'), 1}, + { MS_MAKE_TAG('c','s','w','h'), 1}, + { MS_MAKE_TAG('m','s','e','t'), 1}, }; static const char* required_arabic_features[] = @@ -278,15 +278,15 @@ static const char* required_arabic_features[] = static OPENTYPE_FEATURE_RECORD hebrew_features[] = { - { 0x67696c64 /*dlig*/, 1}, + { MS_MAKE_TAG('d','l','i','g'), 1}, }; static OPENTYPE_FEATURE_RECORD syriac_features[] = { - { 0x67696c72 /*rlig*/, 1}, - { 0x746c6163 /*calt*/, 1}, - { 0x6167696c /*liga*/, 1}, - { 0x67696c64 /*dlig*/, 1}, + { MS_MAKE_TAG('r','l','i','g'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, + { MS_MAKE_TAG('l','i','g','a'), 1}, + { MS_MAKE_TAG('d','l','i','g'), 1}, }; static const char* required_syriac_features[] = @@ -304,25 +304,25 @@ static const char* required_syriac_features[] = static OPENTYPE_FEATURE_RECORD sinhala_features[] = { /* Base forms */ - { 0x6e686b61 /*akhn*/, 1}, - { 0x66687072 /*rphf*/, 1}, - { 0x75746176 /*vatu*/, 1}, - { 0x66747370 /*pstf*/, 1}, + { MS_MAKE_TAG('a','k','h','n'), 1}, + { MS_MAKE_TAG('r','p','h','f'), 1}, + { MS_MAKE_TAG('v','a','t','u'), 1}, + { MS_MAKE_TAG('p','s','t','f'), 1}, /* Presentation forms */ - { 0x73776c62 /*blws*/, 1}, - { 0x73766261 /*abvs*/, 1}, - { 0x73747370 /*psts*/, 1}, + { MS_MAKE_TAG('b','l','w','s'), 1}, + { MS_MAKE_TAG('a','b','v','s'), 1}, + { MS_MAKE_TAG('p','s','t','s'), 1}, }; static OPENTYPE_FEATURE_RECORD tibetan_features[] = { - { 0x73766261 /*abvs*/, 1}, - { 0x73776c62 /*blws*/, 1}, + { MS_MAKE_TAG('a','b','v','s'), 1}, + { MS_MAKE_TAG('b','l','w','s'), 1}, }; static OPENTYPE_FEATURE_RECORD thai_features[] = { - { 0x706d6363 /*ccmp*/, 1}, + { MS_MAKE_TAG('c','c','m','p'), 1}, }; static const char* required_lao_features[] =

1 0