[PATCH v2 0/1] MR7447: oleaut32: Implement (S|G)etVarConversionLocaleSetting()
Partial, as per documentation, implement fixing as the default locale. Signed-off-by: Edward O'Callaghan <edward(a)antitrust.cc> -- v2: oleaut32: Implement (S|G)etVarConversionLocaleSetting() https://gitlab.winehq.org/wine/wine/-/merge_requests/7447
From: Edward O'Callaghan <edward(a)antitrust.cc> Partial, as per documentation, implement fixing as the default locale. Signed-off-by: Edward O'Callaghan <edward(a)antitrust.cc> --- dlls/oleaut32/oleaut32.spec | 4 ++-- dlls/oleaut32/vartype.c | 35 +++++++++++++++++++++++++++++++++++ include/oleauto.h | 3 +++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 21b52f1f06e..25d126fb1a3 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -313,8 +313,8 @@ 319 stdcall VarDateFromUdateEx(ptr long long ptr) 322 stdcall GetRecordInfoFromGuids(ptr long long long ptr ptr) 323 stdcall GetRecordInfoFromTypeInfo(ptr ptr) -325 stub SetVarConversionLocaleSetting -326 stub GetVarConversionLocaleSetting +325 stdcall SetVarConversionLocaleSetting(long) +326 stdcall GetVarConversionLocaleSetting(ptr) 327 stdcall SetOaNoCache() 329 stdcall VarCyMulI8(int64 int64 ptr) 330 stdcall VarDateFromUdate(ptr long ptr) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 747705f94e2..fec278bd49d 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4050,6 +4050,41 @@ HRESULT WINAPI VarCyCmpR8(CY cyLeft, double dblRight) return hRet; } +/************************************************************************ + * SetVarConversionLocaleSetting (OLEAUT32.325) + * + * Sets Automation specific National Language Support (NLS) flags. + * + * PARAMS + * dwFlags [I] Flag + * + * RETURNS + * Success: S_OK. + */ +HRESULT SetVarConversionLocaleSetting(/* in */ ULONG dwFlags) +{ + FIXME("%d, partial stub!\n", dwFlags); + return S_OK; +} + +/************************************************************************ + * GetVarConversionLocaleSetting (OLEAUT32.326) + * + * Gets Automation specific National Language Support (NLS) flags. + * + * PARAMS + * dwFlags [O] Flag + * + * RETURNS + * Success: S_OK. + */ +HRESULT GetVarConversionLocaleSetting(/* out */ ULONG *dwFlags) +{ + FIXME("partial stub!\n"); + if (dwFlags) *dwFlags = 0; + return S_OK; +} + /************************************************************************ * VarCyMulI8 (OLEAUT32.329) * diff --git a/include/oleauto.h b/include/oleauto.h index 5d5b8bbd371..6cdebe12733 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -609,6 +609,9 @@ WINOLEAUTAPI HRESULT WINAPI VarCmp(LPVARIANT,LPVARIANT,LCID,ULONG); WINOLEAUTAPI HRESULT WINAPI VarBstrCmp(BSTR,BSTR,LCID,ULONG); WINOLEAUTAPI HRESULT WINAPI VarBstrCat(BSTR,BSTR,BSTR*); +WINOLEAUTAPI HRESULT SetVarConversionLocaleSetting(ULONG); +WINOLEAUTAPI HRESULT GetVarConversionLocaleSetting(ULONG*); + typedef struct { SYSTEMTIME st; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7447
participants (2)
-
Edward O'Callaghan -
Edward OC (@funfunctor)