September 2008 - Wine-commits

Andrew Talbot : crypt32: Sign-compare warnings fix.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 610dbbdae572bf75da8802d8901f5af2ed40a9a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610dbbdae572bf75da8802d89… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 23 22:38:33 2008 +0100 crypt32: Sign-compare warnings fix. --- dlls/crypt32/encode.c | 14 +++++++------- dlls/crypt32/oid.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 9e7ed44..e474ff7 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -900,7 +900,7 @@ static BOOL CRYPT_AsnEncodeStringCoerce(const CERT_NAME_VALUE *value, LPCSTR str = (LPCSTR)value->Value.pbData; DWORD bytesNeeded, lenBytes, encodedLen; - encodedLen = value->Value.cbData ? value->Value.cbData : lstrlenA(str); + encodedLen = value->Value.cbData ? value->Value.cbData : strlen(str); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -970,7 +970,7 @@ static BOOL CRYPT_AsnEncodeUTF8String(const CERT_NAME_VALUE *value, DWORD bytesNeeded, lenBytes, encodedLen, strLen; strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + strlenW(str); encodedLen = WideCharToMultiByte(CP_UTF8, 0, str, strLen, NULL, 0, NULL, NULL); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); @@ -1830,7 +1830,7 @@ static BOOL CRYPT_AsnEncodeUnicodeStringCoerce(const CERT_NAME_VALUE *value, DWORD bytesNeeded, lenBytes, encodedLen; encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + strlenW(str); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -1871,7 +1871,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, DWORD bytesNeeded, lenBytes, encodedLen; encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + strlenW(str); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -1925,7 +1925,7 @@ static BOOL CRYPT_AsnEncodePrintableString(const CERT_NAME_VALUE *value, DWORD bytesNeeded, lenBytes, encodedLen; encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + strlenW(str); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -1972,7 +1972,7 @@ static BOOL CRYPT_AsnEncodeIA5String(const CERT_NAME_VALUE *value, DWORD bytesNeeded, lenBytes, encodedLen; encodedLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + strlenW(str); CRYPT_EncodeLen(encodedLen, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + encodedLen; if (!pbEncoded) @@ -2020,7 +2020,7 @@ static BOOL CRYPT_AsnEncodeUniversalString(const CERT_NAME_VALUE *value, /* FIXME: doesn't handle composite characters */ strLen = value->Value.cbData ? value->Value.cbData / sizeof(WCHAR) : - lstrlenW(str); + strlenW(str); CRYPT_EncodeLen(strLen * 4, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + strLen * 4; if (!pbEncoded) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 5a71c74..69ea7a5 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -995,7 +995,7 @@ BOOL WINAPI CryptUnregisterDefaultOIDFunction(DWORD dwEncodingType, static void oid_init_localizednames(HINSTANCE hInstance) { - int i; + unsigned int i; for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++) { @@ -1008,7 +1008,7 @@ static void oid_init_localizednames(HINSTANCE hInstance) */ LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName) { - int i; + unsigned int i; for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++) {

1 0

Andrew Talbot : crypt32: Sign-compare warnings fix.
by Alexandre Julliard 24 Sep '08

24 Sep '08

Module: wine Branch: master Commit: 7a54be05f0ee971bd2e0d62c1fa8c0f263efa093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a54be05f0ee971bd2e0d62c1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Sep 23 22:38:38 2008 +0100 crypt32: Sign-compare warnings fix. --- dlls/crypt32/str.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 7a739a8..b1ccc91 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -167,7 +167,7 @@ static DWORD CRYPT_AddPrefixA(LPCSTR prefix, LPSTR psz, DWORD csz) if (psz) { - chars = min(lstrlenA(prefix), csz); + chars = min(strlen(prefix), csz); memcpy(psz, prefix, chars); *(psz + chars) = '='; chars++; @@ -304,7 +304,7 @@ static DWORD CRYPT_AddPrefixAToW(LPCSTR prefix, LPWSTR psz, DWORD csz) { DWORD i; - chars = min(lstrlenA(prefix), csz); + chars = min(strlen(prefix), csz); for (i = 0; i < chars; i++) *(psz + i) = prefix[i]; *(psz + chars) = '='; @@ -328,7 +328,7 @@ static DWORD CRYPT_AddPrefixW(LPCWSTR prefix, LPWSTR psz, DWORD csz) if (psz) { - chars = min(lstrlenW(prefix), csz); + chars = min(strlenW(prefix), csz); memcpy(psz, prefix, chars * sizeof(WCHAR)); *(psz + chars) = '='; chars++; @@ -478,7 +478,7 @@ BOOL WINAPI CertStrToNameA(DWORD dwCertEncodingType, LPCSTR pszX500, { if (!ret) { - DWORD i; + LONG i; *ppszError = pszX500; for (i = 0; i < errorStr - x500; i++) @@ -665,7 +665,7 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, { if (value->end > value->start) { - DWORD i; + LONG i; LPWSTR ptr = (LPWSTR)nameValue.Value.pbData; for (i = 0; i < value->end - value->start; i++)

1 0

Rob Shearman : msvcrt: Fix testing zero-valued expression with bitwise and in find_best_locale_proc .
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: d7ca73ce80cf8478f21323cce44e252d7dced849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ca73ce80cf8478f21323cce… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 23 13:31:47 2008 +0100 msvcrt: Fix testing zero-valued expression with bitwise and in find_best_locale_proc. The check should be for all of the flags being set instead. --- dlls/msvcrt/locale.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6447436..350e057 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -189,7 +189,8 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO res->match_flags = flags; res->found_lang_id = LangID; } - if (flags & (FOUND_LANGUAGE & FOUND_COUNTRY & FOUND_CODEPAGE)) + if ((flags & (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) == + (FOUND_LANGUAGE | FOUND_COUNTRY | FOUND_CODEPAGE)) { TRACE(":found exact locale match\n"); return STOP_LOOKING;

1 0

Rob Shearman : msvcrt: Fix mutual exclusion over logical or is always a non-zero constant.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: ed9cd3ede2931b148ddbe45645284da1026957e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9cd3ede2931b148ddbe4564… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 23 13:32:00 2008 +0100 msvcrt: Fix mutual exclusion over logical or is always a non-zero constant. Logical and should have been used instead. --- dlls/msvcrt/dir.c | 4 ++-- dlls/msvcrt/process.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 0a28c59..5859adf 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -990,7 +990,7 @@ void CDECL _searchenv(const char* file, const char* env, char *buf) return; } memcpy(curPath, penv, end - penv); - if (curPath[end - penv] != '/' || curPath[end - penv] != '\\') + if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') { curPath[end - penv] = '\\'; curPath[end - penv + 1] = '\0'; @@ -1053,7 +1053,7 @@ void CDECL _wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MS return; } memcpy(curPath, penv, (end - penv) * sizeof(MSVCRT_wchar_t)); - if (curPath[end - penv] != '/' || curPath[end - penv] != '\\') + if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') { curPath[end - penv] = '\\'; curPath[end - penv + 1] = '\0'; diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 87a29f4..9dbc43e 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -96,7 +96,7 @@ static void msvcrt_search_executable(const MSVCRT_wchar_t *name, MSVCRT_wchar_t if (path_len + name_len <= MAX_PATH - 2) { memcpy(buffer, env, path_len * sizeof(MSVCRT_wchar_t)); - if (buffer[path_len] != '/' || buffer[path_len] != '\\') + if (buffer[path_len] != '/' && buffer[path_len] != '\\') { buffer[path_len++] = '\\'; buffer[path_len] = '\0';

1 0

Rob Shearman : rpcrt4: Don' t call VirtualFree with MEM_RELEASE and non-zero size.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 62a1beebbf7165f947b7799ab53fbe0c56bd9d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a1beebbf7165f947b7799ab… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 23 13:31:54 2008 +0100 rpcrt4: Don't call VirtualFree with MEM_RELEASE and non-zero size. The calls fail with ERROR_INVALID_PARAMETER. Instead just call with a zero size which performs the intended function. --- dlls/rpcrt4/cstub.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index c790ad5..869265f 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -221,9 +221,7 @@ void create_delegating_vtbl(DWORD num_methods) if(current_vtbl.table && current_vtbl.table->ref == 0) { TRACE("freeing old table\n"); - VirtualFree(current_vtbl.table->methods, - (current_vtbl.table->size - 3) * sizeof(vtbl_method_t), - MEM_RELEASE); + VirtualFree(current_vtbl.table->methods, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, current_vtbl.table); } size = (num_methods - 3) * sizeof(vtbl_method_t); @@ -258,9 +256,7 @@ static void release_delegating_vtbl(IUnknownVtbl *vtbl) if(table->ref == 0 && table != current_vtbl.table) { TRACE("... and we're not current so free'ing\n"); - VirtualFree(current_vtbl.table->methods, - (current_vtbl.table->size - 3) * sizeof(vtbl_method_t), - MEM_RELEASE); + VirtualFree(current_vtbl.table->methods, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, table); } LeaveCriticalSection(&delegating_vtbl_section);

1 0

Rob Shearman : include: Add DShellFolderViewEvents to shldisp.idl.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 2f10cc5c2823bd9166ac83acb63a01c4b446de02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f10cc5c2823bd9166ac83acb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 23 13:31:23 2008 +0100 include: Add DShellFolderViewEvents to shldisp.idl. --- include/Makefile.in | 1 + include/shdispid.h | 30 ++++++++++++++++++++++++++++++ include/shldisp.idl | 25 +++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 415ac1b..f28cfab 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -373,6 +373,7 @@ SRCDIR_INCLUDES = \ sensapi.h \ setupapi.h \ sfc.h \ + shdispid.h \ shellapi.h \ shlguid.h \ shlobj.h \ diff --git a/include/shdispid.h b/include/shdispid.h new file mode 100644 index 0000000..5b3fc40 --- /dev/null +++ b/include/shdispid.h @@ -0,0 +1,30 @@ +/* + * DispIds for Shell Interfaces + * + * Copyright (C) 2008 Robert Shearman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _SHDISPID_H_ +#define _SHDISPID_H_ + +#define DISPID_SELECTIONCHANGED 200 +#define DISPID_FILELISTENUMDONE 201 +#define DISPID_VERBINVOKED 202 +#define DISPID_DEFAULTVERBINVOKED 203 +#define DISPID_BEGINDRAG 204 + +#endif /* defined _SHDISPID_H_ */ diff --git a/include/shldisp.idl b/include/shldisp.idl index ee72261..28c2357 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -25,6 +25,8 @@ import "shtypes.idl"; import "servprov.idl"; import "comcat.idl"; +#include <shdispid.h> + /***************************************************************************** * IAutoComplete interface */ @@ -85,6 +87,29 @@ interface IFolderViewOC : IDispatch } [ + uuid(62112aa2-ebe4-11cf-a5fb-0020afe7292d) +] +dispinterface DShellFolderViewEvents +{ + properties: + methods: + [id(DISPID_SELECTIONCHANGED)] + void SelectionChanged(); + + [id(DISPID_FILELISTENUMDONE)] + void EnumDone(); + + [id(DISPID_VERBINVOKED)] + VARIANT_BOOL VerbInvoked(); + + [id(DISPID_DEFAULTVERBINVOKED)] + VARIANT_BOOL DefaultVerbInvoked(); + + [id(DISPID_BEGINDRAG)] + VARIANT_BOOL BeginDrag(); +} + +[ uuid(9ba05971-f6a8-11cf-a442-00a0c90a8f39), hidden ]

1 0

Alexander Nicolaysen Sørnes : netapi32: Improve NetUserGetLocalGroups stub.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 39894c2423b34e27c27bd6ac098ca1ce676994f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39894c2423b34e27c27bd6ac0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Sep 12 00:05:47 2008 +0200 netapi32: Improve NetUserGetLocalGroups stub. Report the user as member of the admins group. --- dlls/netapi32/access.c | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 5da07a6..4244827 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -417,6 +417,10 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, LPDWORD entriesread, LPDWORD totalentries) { NET_API_STATUS status; + const WCHAR admins[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0}; + LPWSTR currentuser; + LOCALGROUP_USERS_INFO_0* info; + DWORD size; FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n", debugstr_w(servername), debugstr_w(username), level, flags, bufptr, @@ -426,12 +430,37 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, if (status != NERR_Success) return status; - if (!NETAPI_FindUser(username)) + size = UNLEN + 1; + NetApiBufferAllocate(size, (LPVOID*)&currentuser); + GetUserNameW(currentuser, &size); + + if (lstrcmpiW(username, currentuser) && NETAPI_FindUser(username)) + { + NetApiBufferFree(currentuser); return NERR_UserNotFound; + } + + NetApiBufferFree(currentuser); + *totalentries = 1; + size = sizeof(*info) + sizeof(admins); + + if(prefmaxlen < size) + status = ERROR_MORE_DATA; + else + status = NetApiBufferAllocate(size, (LPVOID*)&info); + + if(status != NERR_Success) + { + *bufptr = NULL; + *entriesread = 0; + return status; + } + + info->lgrui0_name = (LPWSTR)((LPBYTE)info + sizeof(*info)); + lstrcpyW(info->lgrui0_name, admins); - if (bufptr) *bufptr = NULL; - if (entriesread) *entriesread = 0; - if (totalentries) *totalentries = 0; + *bufptr = (LPBYTE)info; + *entriesread = 1; return NERR_Success; }

1 0

Hans Leidekker : winhttp: Implement WinHttpCreateUrl.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: bba66c99b6ea19ddb306919d13d8c2dbf167b338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bba66c99b6ea19ddb306919d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 23 13:32:26 2008 +0200 winhttp: Implement WinHttpCreateUrl. --- dlls/winhttp/Makefile.in | 3 +- dlls/winhttp/main.c | 38 ------ dlls/winhttp/url.c | 333 ++++++++++++++++++++++++++++++++++++++++++++++ include/winhttp.h | 2 + 4 files changed, 337 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bba66c99b6ea19ddb3069…

1 0

Hans Leidekker : winhttp: Add tests for WinHttpCreateUrl.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 5d687f40ec434e9b21b3cb05950cfcce2723224f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d687f40ec434e9b21b3cb059… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 23 13:32:50 2008 +0200 winhttp: Add tests for WinHttpCreateUrl. --- dlls/winhttp/tests/Makefile.in | 1 + dlls/winhttp/tests/url.c | 275 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 276 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d687f40ec434e9b21b3c…

1 0

Huw Davies : inetcomm: Add wrapper functions MimeOleFindCharset and MimeOleGetDefaultCharset.
by Alexandre Julliard 23 Sep '08

23 Sep '08

Module: wine Branch: master Commit: 3093023979f245e67d4123f79d273b5fb08e7b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3093023979f245e67d4123f79… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 23 12:07:43 2008 +0100 inetcomm: Add wrapper functions MimeOleFindCharset and MimeOleGetDefaultCharset. --- dlls/inetcomm/inetcomm.spec | 4 ++-- dlls/inetcomm/mimeintl.c | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index 4db2c7d..86669c8 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -59,7 +59,7 @@ @ stub MimeOleDecodeHeader @ stub MimeOleEncodeHeader @ stub MimeOleFileTimeToInetDate -@ stub MimeOleFindCharset +@ stdcall MimeOleFindCharset(str ptr) @ stub MimeOleGenerateCID @ stub MimeOleGenerateFileName @ stub MimeOleGenerateMID @@ -71,7 +71,7 @@ @ stub MimeOleGetCodePageCharset @ stub MimeOleGetCodePageInfo @ stub MimeOleGetContentTypeExt -@ stub MimeOleGetDefaultCharset +@ stdcall MimeOleGetDefaultCharset(ptr) @ stub MimeOleGetExtContentType @ stub MimeOleGetFileExtension @ stub MimeOleGetFileInfo diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 0029af8..6d37147 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -547,6 +547,22 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat) return S_OK; } +HRESULT WINAPI MimeOleFindCharset(LPCSTR name, LPHCHARSET charset) +{ + IMimeInternational *internat; + HRESULT hr; + + TRACE("(%s, %p)\n", debugstr_a(name), charset); + + hr = MimeOleGetInternat(&internat); + if(SUCCEEDED(hr)) + { + hr = IMimeInternational_FindCharset(internat, name, charset); + IMimeInternational_Release(internat); + } + return hr; +} + HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo) { IMimeInternational *internat; @@ -560,5 +576,21 @@ HRESULT WINAPI MimeOleGetCharsetInfo(HCHARSET hCharset, LPINETCSETINFO pCsetInfo hr = IMimeInternational_GetCharsetInfo(internat, hCharset, pCsetInfo); IMimeInternational_Release(internat); } - return S_OK; + return hr; +} + +HRESULT WINAPI MimeOleGetDefaultCharset(LPHCHARSET charset) +{ + IMimeInternational *internat; + HRESULT hr; + + TRACE("(%p)\n", charset); + + hr = MimeOleGetInternat(&internat); + if(SUCCEEDED(hr)) + { + hr = IMimeInternational_GetDefaultCharset(internat, charset); + IMimeInternational_Release(internat); + } + return hr; }

1 0