Commit f75f4e43 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard

mlang: Silence some Win64 compile warnings.

If the flag TCI_SRCFONTSIG is not set then the first argument passed to TranslateCharsetInfo is just a DWORD that needs to be marshalled over a pointer.
parent 7b1c3260
...@@ -1954,7 +1954,7 @@ static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( ...@@ -1954,7 +1954,7 @@ static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages(
TRACE("(%p) Seeking %u\n",This, uCodePage); TRACE("(%p) Seeking %u\n",This, uCodePage);
rc = TranslateCharsetInfo((DWORD*)uCodePage, &cs, TCI_SRCCODEPAGE); rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uCodePage, &cs, TCI_SRCCODEPAGE);
if (rc) if (rc)
{ {
...@@ -1985,7 +1985,8 @@ static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( ...@@ -1985,7 +1985,8 @@ static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage(
*puCodePage = 0x00000000; *puCodePage = 0x00000000;
rc = TranslateCharsetInfo((DWORD*)uDefaultCodePage, &cs, TCI_SRCCODEPAGE); rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uDefaultCodePage, &cs,
TCI_SRCCODEPAGE);
if (rc && (dwCodePages & cs.fs.fsCsb[0])) if (rc && (dwCodePages & cs.fs.fsCsb[0]))
{ {
...@@ -2592,7 +2593,8 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF ...@@ -2592,7 +2593,8 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF
{ {
CHARSETINFO csi; CHARSETINFO csi;
if (TranslateCharsetInfo((DWORD *)ml_data->family_codepage, &csi, TCI_SRCCODEPAGE)) if (TranslateCharsetInfo((DWORD*)(DWORD_PTR)ml_data->family_codepage, &csi,
TCI_SRCCODEPAGE))
mime_cp_info->bGDICharset = csi.ciCharset; mime_cp_info->bGDICharset = csi.ciCharset;
else else
mime_cp_info->bGDICharset = DEFAULT_CHARSET; mime_cp_info->bGDICharset = DEFAULT_CHARSET;
......
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