Nikolay Sivov : mlang: Move CodePageToCodePages() to IMLangFontLink2 and forward to it.
Alexandre Julliard
julliard at winehq.org
Mon Oct 1 13:35:01 CDT 2012
Module: wine
Branch: master
Commit: 233fb7b3b59bb71f382b9ba88e01db7e9ecda025
URL: http://source.winehq.org/git/wine.git/?a=commit;h=233fb7b3b59bb71f382b9ba88e01db7e9ecda025
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun Sep 30 09:25:50 2012 +0400
mlang: Move CodePageToCodePages() to IMLangFontLink2 and forward to it.
---
dlls/mlang/mlang.c | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c
index 325828a..bcd3b11 100644
--- a/dlls/mlang/mlang.c
+++ b/dlls/mlang/mlang.c
@@ -1895,27 +1895,11 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages(
static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages(
IMLangFontLink* iface,
- UINT uCodePage,
- DWORD* pdwCodePages)
+ UINT codepage,
+ DWORD* codepages)
{
MLang_impl *This = impl_from_IMLangFontLink( iface );
- CHARSETINFO cs;
- BOOL rc;
-
- TRACE("(%p) Seeking %u\n",This, uCodePage);
-
- rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uCodePage, &cs, TCI_SRCCODEPAGE);
-
- if (rc)
- {
- *pdwCodePages = cs.fs.fsCsb[0];
- TRACE("resulting CodePages 0x%x\n",*pdwCodePages);
- return S_OK;
- }
-
- TRACE("CodePage Not Found\n");
- *pdwCodePages = 0;
- return E_FAIL;
+ return IMLangFontLink2_CodePageToCodePages(&This->IMLangFontLink2_iface, codepage, codepages);
}
static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage(
@@ -3211,12 +3195,27 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This,
pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages);
}
-static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This,
- UINT uCodePage,
- DWORD *pdwCodePages)
+static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* iface,
+ UINT codepage,
+ DWORD *codepages)
{
- FIXME("(%p)->%i %p\n",This, uCodePage, pdwCodePages);
- return E_NOTIMPL;
+ MLang_impl *This = impl_from_IMLangFontLink2(iface);
+ CHARSETINFO cs;
+ BOOL rc;
+
+ TRACE("(%p)->(%u %p)\n", This, codepage, codepages);
+
+ rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)codepage, &cs, TCI_SRCCODEPAGE);
+ if (rc)
+ {
+ *codepages = cs.fs.fsCsb[0];
+ TRACE("resulting codepages 0x%x\n", *codepages);
+ return S_OK;
+ }
+
+ TRACE("codepage not found\n");
+ *codepages = 0;
+ return E_FAIL;
}
static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* iface,
More information about the wine-cvs
mailing list