From 7fe26a95158aa7a4b669be01a657fca6aaadd8fb Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Thu, 27 Sep 2012 22:24:31 +0400 Subject: [PATCH] mlang: Forward GetLcidFromRfc1766() to IMultiLanguage3 implementation. --- dlls/mlang/mlang.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 67c318b7ddf..a0aae65326a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2195,25 +2195,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766( IMultiLanguage* iface, - LCID* pLocale, - BSTR bstrRfc1766) + LCID* locale, + BSTR rfc1766) { - HRESULT hr; - IEnumRfc1766 *rfc1766; - - TRACE("%p %p %s\n", iface, pLocale, debugstr_w(bstrRfc1766)); - - if (!pLocale || !bstrRfc1766) - return E_INVALIDARG; - - hr = IMultiLanguage_EnumRfc1766(iface, &rfc1766); - if (FAILED(hr)) - return hr; - - hr = lcid_from_rfc1766(rfc1766, pLocale, bstrRfc1766); - - IEnumRfc1766_Release(rfc1766); - return hr; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_GetLcidFromRfc1766(&This->IMultiLanguage3_iface, locale, rfc1766); } /******************************************************************************/