September 2008 - Wine-Commits

Huw Davies : inetcomm/tests: Add tests for IMimeInternational_GetCodePageCharset.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 3fe7ea127cf812beef496551d9887f951e420d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe7ea127cf812beef496551d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:34:30 2008 +0100 inetcomm/tests: Add tests for IMimeInternational_GetCodePageCharset. --- dlls/inetcomm/tests/mimeintl.c | 59 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index eae871e..029798a 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -82,6 +82,53 @@ static HRESULT mlang_getcsetinfo(const char *charset, MIMECSETINFO *mlang_info) return hr; } +static HRESULT mlang_getcodepageinfo(UINT cp, MIMECPINFO *mlang_cp_info) +{ + HRESULT hr; + IMultiLanguage *ml; + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCodePageInfo(ml, cp, mlang_cp_info); + IMultiLanguage_Release(ml); + } + return hr; +} + +static HRESULT mlang_getcsetinfo_from_cp(UINT cp, CHARSETTYPE charset_type, MIMECSETINFO *mlang_info) +{ + MIMECPINFO mlang_cp_info; + WCHAR *charset_name; + HRESULT hr; + IMultiLanguage *ml; + + hr = mlang_getcodepageinfo(cp, &mlang_cp_info); + if(FAILED(hr)) return hr; + + switch(charset_type) + { + case CHARSET_BODY: + charset_name = mlang_cp_info.wszBodyCharset; + break; + case CHARSET_HEADER: + charset_name = mlang_cp_info.wszHeaderCharset; + break; + case CHARSET_WEB: + charset_name = mlang_cp_info.wszWebCharset; + break; + } + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCharsetInfo(ml, charset_name, mlang_info); + IMultiLanguage_Release(ml); + } + return hr; +} static void test_charset(void) { @@ -119,6 +166,18 @@ static void test_charset(void) ok(cs_info.hCharset == hcs_windows_1252, "hCharset doesn't match requested\n"); ok(!strcmp(cs_info.szName, "windows-1252"), "szName doesn't match requested\n"); + hr = IMimeInternational_GetCodePageCharset(internat, 1252, CHARSET_BODY, &hcs); + ok(hr == S_OK, "got %08x\n", hr); + hr = IMimeInternational_GetCharsetInfo(internat, hcs, &cs_info); + ok(hr == S_OK, "got %08x\n", hr); + + hr = mlang_getcsetinfo_from_cp(1252, CHARSET_BODY, &mlang_cs_info); + ok(hr == S_OK, "got %08x\n", hr); + ok(cs_info.cpiWindows == mlang_cs_info.uiCodePage, "cpiWindows %d while mlang uiCodePage %d\n", + cs_info.cpiWindows, mlang_cs_info.uiCodePage); + ok(cs_info.cpiInternet == mlang_cs_info.uiInternetEncoding, "cpiInternet %d while mlang uiInternetEncoding %d\n", + cs_info.cpiInternet, mlang_cs_info.uiInternetEncoding); + IMimeInternational_Release(internat); }

1 0

Huw Davies : inetcomm: Implement IMimeInternational_GetDefaultCharset.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 8b68a6296c56b8df5bad7a3736f268c8920ddb6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b68a6296c56b8df5bad7a373… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:38:11 2008 +0100 inetcomm: Implement IMimeInternational_GetDefaultCharset. --- dlls/inetcomm/mimeintl.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 5258e50..f314740 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -54,6 +54,7 @@ typedef struct struct list charsets; LONG next_charset_handle; + HCHARSET default_charset; } internat; static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) @@ -116,8 +117,21 @@ static HRESULT WINAPI MimeInternat_SetDefaultCharset(IMimeInternational *iface, static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, LPHCHARSET phCharset) { - FIXME("stub\n"); - return E_NOTIMPL; + internat *This = impl_from_IMimeInternational( iface ); + HRESULT hr = S_OK; + + TRACE("(%p)->(%p)\n", iface, phCharset); + + if(This->default_charset == NULL) + { + HCHARSET hcs; + hr = IMimeInternational_GetCodePageCharset(iface, GetACP(), CHARSET_BODY, &hcs); + if(SUCCEEDED(hr)) + InterlockedCompareExchangePointer(&This->default_charset, hcs, NULL); + } + *phCharset = This->default_charset; + + return hr; } static HRESULT mlang_getcodepageinfo(UINT cp, MIMECPINFO *mlang_cp_info) @@ -389,6 +403,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) list_init(&global_internat->charsets); global_internat->next_charset_handle = 0; + global_internat->default_charset = NULL; *internat = (IMimeInternational*)&global_internat->lpVtbl;

1 0

Huw Davies : inetcomm: Implement IMimeInternational_GetCodePageCharset.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: f3a6b7a81d7839bbbeafed1b2ed8e7739eab5f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3a6b7a81d7839bbbeafed1b2… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:17:35 2008 +0100 inetcomm: Implement IMimeInternational_GetCodePageCharset. --- dlls/inetcomm/mimeintl.c | 53 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 2db5917..5258e50 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -120,12 +120,61 @@ static HRESULT WINAPI MimeInternat_GetDefaultCharset(IMimeInternational *iface, return E_NOTIMPL; } +static HRESULT mlang_getcodepageinfo(UINT cp, MIMECPINFO *mlang_cp_info) +{ + HRESULT hr; + IMultiLanguage *ml; + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCodePageInfo(ml, cp, mlang_cp_info); + IMultiLanguage_Release(ml); + } + return hr; +} + static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface, CODEPAGEID cpiCodePage, CHARSETTYPE ctCsetType, LPHCHARSET phCharset) { - FIXME("stub\n"); - return E_NOTIMPL; + HRESULT hr; + MIMECPINFO mlang_cp_info; + + TRACE("(%p)->(%d, %d, %p)\n", iface, cpiCodePage, ctCsetType, phCharset); + + *phCharset = NULL; + + if(ctCsetType < CHARSET_BODY || ctCsetType > CHARSET_WEB) + return MIME_E_INVALID_CHARSET_TYPE; + + hr = mlang_getcodepageinfo(cpiCodePage, &mlang_cp_info); + if(SUCCEEDED(hr)) + { + const WCHAR *charset_nameW = NULL; + char *charset_name; + DWORD len; + + switch(ctCsetType) + { + case CHARSET_BODY: + charset_nameW = mlang_cp_info.wszBodyCharset; + break; + case CHARSET_HEADER: + charset_nameW = mlang_cp_info.wszHeaderCharset; + break; + case CHARSET_WEB: + charset_nameW = mlang_cp_info.wszWebCharset; + break; + } + len = WideCharToMultiByte(CP_ACP, 0, charset_nameW, -1, NULL, 0, NULL, NULL); + charset_name = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, charset_nameW, -1, charset_name, len, NULL, NULL); + hr = IMimeInternational_FindCharset(iface, charset_name, phCharset); + HeapFree(GetProcessHeap(), 0, charset_name); + } + return hr; } static HRESULT mlang_getcsetinfo(const char *charset, MIMECSETINFO *mlang_info)

1 0

Huw Davies : inetcomm/tests: Add tests for IMimeInternational_GetCharsetInfo.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 3dd46c3606a9cc4a2dee298e54c5639bd42eb373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd46c3606a9cc4a2dee298e5… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:12:07 2008 +0100 inetcomm/tests: Add tests for IMimeInternational_GetCharsetInfo. --- dlls/inetcomm/tests/Makefile.in | 2 +- dlls/inetcomm/tests/mimeintl.c | 45 +++++++++++++++++++++++++++++++++++++++ dlls/inetcomm/tests/mimeole.c | 1 - 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in index 8e302db..83b0b77 100644 --- a/dlls/inetcomm/tests/Makefile.in +++ b/dlls/inetcomm/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = inetcomm.dll -IMPORTS = inetcomm ole32 kernel32 +IMPORTS = inetcomm oleaut32 ole32 kernel32 CTESTS = \ mimeintl.c \ diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index 0075cb5..eae871e 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -27,6 +27,9 @@ #include "mimeole.h" +#include "initguid.h" +#include "mlang.h" + #include <stdio.h> #include <assert.h> @@ -52,11 +55,41 @@ static void test_create(void) IMimeInternational_Release(internat); } +static inline HRESULT get_mlang(IMultiLanguage **ml) +{ + return CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IMultiLanguage, (void **)ml); +} + +static HRESULT mlang_getcsetinfo(const char *charset, MIMECSETINFO *mlang_info) +{ + DWORD len = MultiByteToWideChar(CP_ACP, 0, charset, -1, NULL, 0); + BSTR bstr = SysAllocStringLen(NULL, len - 1); + HRESULT hr; + IMultiLanguage *ml; + + MultiByteToWideChar(CP_ACP, 0, charset, -1, bstr, len); + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCharsetInfo(ml, bstr, mlang_info); + IMultiLanguage_Release(ml); + } + SysFreeString(bstr); + if(FAILED(hr)) hr = MIME_E_NOT_FOUND; + return hr; +} + + static void test_charset(void) { IMimeInternational *internat; HRESULT hr; HCHARSET hcs, hcs_windows_1252, hcs_windows_1251; + INETCSETINFO cs_info; + MIMECSETINFO mlang_cs_info; hr = MimeOleGetInternat(&internat); ok(hr == S_OK, "ret %08x\n", hr); @@ -74,6 +107,18 @@ static void test_charset(void) ok(hr == S_OK, "got %08x\n", hr); ok(hcs_windows_1252 != hcs_windows_1251, "got the same hcharset for the different names\n"); + hr = IMimeInternational_GetCharsetInfo(internat, hcs_windows_1252, &cs_info); + ok(hr == S_OK, "got %08x\n", hr); + + hr = mlang_getcsetinfo("windows-1252", &mlang_cs_info); + ok(hr == S_OK, "got %08x\n", hr); + ok(cs_info.cpiWindows == mlang_cs_info.uiCodePage, "cpiWindows %d while mlang uiCodePage %d\n", + cs_info.cpiWindows, mlang_cs_info.uiCodePage); + ok(cs_info.cpiInternet == mlang_cs_info.uiInternetEncoding, "cpiInternet %d while mlang uiInternetEncoding %d\n", + cs_info.cpiInternet, mlang_cs_info.uiInternetEncoding); + ok(cs_info.hCharset == hcs_windows_1252, "hCharset doesn't match requested\n"); + ok(!strcmp(cs_info.szName, "windows-1252"), "szName doesn't match requested\n"); + IMimeInternational_Release(internat); } diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index eaba225..8200400 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -26,7 +26,6 @@ #include "ole2.h" #include "ocidl.h" -#include "initguid.h" #include "mimeole.h" #include <stdio.h>

1 0

Huw Davies : inetcomm: Implement IMimeInternational_GetCharsetInfo.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 12bb6e481f98ec74267a6673fa3e460158d16a2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bb6e481f98ec74267a6673f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 14:11:29 2008 +0100 inetcomm: Implement IMimeInternational_GetCharsetInfo. --- dlls/inetcomm/mimeintl.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index a7a8313..2db5917 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -207,8 +207,27 @@ static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, LPINETCSETINFO pCsetInfo) { - FIXME("stub\n"); - return E_NOTIMPL; + internat *This = impl_from_IMimeInternational( iface ); + HRESULT hr = MIME_E_INVALID_HANDLE; + charset_entry *charset; + + TRACE("(%p)->(%p, %p)\n", iface, hCharset, pCsetInfo); + + EnterCriticalSection(&This->cs); + + LIST_FOR_EACH_ENTRY(charset, &This->charsets, charset_entry, entry) + { + if(charset->cs_info.hCharset == hCharset) + { + *pCsetInfo = charset->cs_info; + hr = S_OK; + break; + } + } + + LeaveCriticalSection(&This->cs); + + return hr; } static HRESULT WINAPI MimeInternat_GetCodePageInfo(IMimeInternational *iface, CODEPAGEID cpiCodePage,

1 0

Huw Davies : inetcomm/tests: Tests for IMimeInternational_FindCharset.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 9229c19d01cb4011d58b5f4deb791951e668e4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9229c19d01cb4011d58b5f4de… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 12:38:41 2008 +0100 inetcomm/tests: Tests for IMimeInternational_FindCharset. --- dlls/inetcomm/tests/mimeintl.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c index defe3f9..0075cb5 100644 --- a/dlls/inetcomm/tests/mimeintl.c +++ b/dlls/inetcomm/tests/mimeintl.c @@ -52,9 +52,35 @@ static void test_create(void) IMimeInternational_Release(internat); } +static void test_charset(void) +{ + IMimeInternational *internat; + HRESULT hr; + HCHARSET hcs, hcs_windows_1252, hcs_windows_1251; + + hr = MimeOleGetInternat(&internat); + ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeInternational_FindCharset(internat, "non-existent", &hcs); + ok(hr == MIME_E_NOT_FOUND, "got %08x\n", hr); + + hr = IMimeInternational_FindCharset(internat, "windows-1252", &hcs_windows_1252); + ok(hr == S_OK, "got %08x\n", hr); + hr = IMimeInternational_FindCharset(internat, "windows-1252", &hcs); + ok(hr == S_OK, "got %08x\n", hr); + ok(hcs_windows_1252 == hcs, "got different hcharsets for the same name\n"); + + hr = IMimeInternational_FindCharset(internat, "windows-1251", &hcs_windows_1251); + ok(hr == S_OK, "got %08x\n", hr); + ok(hcs_windows_1252 != hcs_windows_1251, "got the same hcharset for the different names\n"); + + IMimeInternational_Release(internat); +} + START_TEST(mimeintl) { OleInitialize(NULL); test_create(); + test_charset(); OleUninitialize(); }

1 0

Huw Davies : inetcomm: Implement IMimeInternational_FindCharset.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: ed3ca13613cbf794fd10cdc7451df9ca61dd0839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3ca13613cbf794fd10cdc74… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 12:37:40 2008 +0100 inetcomm: Implement IMimeInternational_FindCharset. --- dlls/inetcomm/Makefile.in | 2 +- dlls/inetcomm/mimeintl.c | 101 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 100 insertions(+), 3 deletions(-) diff --git a/dlls/inetcomm/Makefile.in b/dlls/inetcomm/Makefile.in index ee03db0..171b98d 100644 --- a/dlls/inetcomm/Makefile.in +++ b/dlls/inetcomm/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = inetcomm.dll IMPORTLIB = inetcomm -IMPORTS = uuid ole32 ws2_32 user32 advapi32 kernel32 +IMPORTS = uuid oleaut32 ole32 ws2_32 user32 advapi32 kernel32 C_SRCS = \ inetcomm_main.c \ diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 6cc1d96..a7a8313 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -31,6 +31,7 @@ #include "objbase.h" #include "ole2.h" #include "mimeole.h" +#include "mlang.h" #include "wine/list.h" #include "wine/debug.h" @@ -41,8 +42,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct { + struct list entry; + INETCSETINFO cs_info; +} charset_entry; + +typedef struct +{ const IMimeInternationalVtbl *lpVtbl; LONG refs; + CRITICAL_SECTION cs; + + struct list charsets; + LONG next_charset_handle; } internat; static inline internat *impl_from_IMimeInternational( IMimeInternational *iface ) @@ -50,6 +61,12 @@ static inline internat *impl_from_IMimeInternational( IMimeInternational *iface return (internat *)((char*)iface - FIELD_OFFSET(internat, lpVtbl)); } +static inline HRESULT get_mlang(IMultiLanguage **ml) +{ + return CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IMultiLanguage, (void **)ml); +} + static HRESULT WINAPI MimeInternat_QueryInterface( IMimeInternational *iface, REFIID riid, LPVOID *ppobj ) { if (IsEqualGUID(riid, &IID_IUnknown) || @@ -78,6 +95,13 @@ static ULONG WINAPI MimeInternat_Release( IMimeInternational *iface ) refs = InterlockedDecrement(&This->refs); if (!refs) { + charset_entry *charset, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(charset, cursor2, &This->charsets, charset_entry, entry) + { + list_remove(&charset->entry); + HeapFree(GetProcessHeap(), 0, charset); + } HeapFree(GetProcessHeap(), 0, This); } @@ -104,11 +128,80 @@ static HRESULT WINAPI MimeInternat_GetCodePageCharset(IMimeInternational *iface, return E_NOTIMPL; } +static HRESULT mlang_getcsetinfo(const char *charset, MIMECSETINFO *mlang_info) +{ + DWORD len = MultiByteToWideChar(CP_ACP, 0, charset, -1, NULL, 0); + BSTR bstr = SysAllocStringLen(NULL, len - 1); + HRESULT hr; + IMultiLanguage *ml; + + MultiByteToWideChar(CP_ACP, 0, charset, -1, bstr, len); + + hr = get_mlang(&ml); + + if(SUCCEEDED(hr)) + { + hr = IMultiLanguage_GetCharsetInfo(ml, bstr, mlang_info); + IMultiLanguage_Release(ml); + } + SysFreeString(bstr); + if(FAILED(hr)) hr = MIME_E_NOT_FOUND; + return hr; +} + +static HCHARSET add_charset(struct list *list, MIMECSETINFO *mlang_info, HCHARSET handle) +{ + charset_entry *charset = HeapAlloc(GetProcessHeap(), 0, sizeof(*charset)); + + WideCharToMultiByte(CP_ACP, 0, mlang_info->wszCharset, -1, + charset->cs_info.szName, sizeof(charset->cs_info.szName), NULL, NULL); + charset->cs_info.cpiWindows = mlang_info->uiCodePage; + charset->cs_info.cpiInternet = mlang_info->uiInternetEncoding; + charset->cs_info.hCharset = handle; + charset->cs_info.dwReserved1 = 0; + list_add_head(list, &charset->entry); + + return charset->cs_info.hCharset; +} + static HRESULT WINAPI MimeInternat_FindCharset(IMimeInternational *iface, LPCSTR pszCharset, LPHCHARSET phCharset) { - FIXME("stub\n"); - return E_NOTIMPL; + internat *This = impl_from_IMimeInternational( iface ); + HRESULT hr = MIME_E_NOT_FOUND; + charset_entry *charset; + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_a(pszCharset), phCharset); + + *phCharset = NULL; + + EnterCriticalSection(&This->cs); + + LIST_FOR_EACH_ENTRY(charset, &This->charsets, charset_entry, entry) + { + if(!strcmp(charset->cs_info.szName, pszCharset)) + { + *phCharset = charset->cs_info.hCharset; + hr = S_OK; + break; + } + } + + if(hr == MIME_E_NOT_FOUND) + { + MIMECSETINFO mlang_info; + + LeaveCriticalSection(&This->cs); + hr = mlang_getcsetinfo(pszCharset, &mlang_info); + EnterCriticalSection(&This->cs); + + if(SUCCEEDED(hr)) + *phCharset = add_charset(&This->charsets, &mlang_info, + (HCHARSET)InterlockedIncrement(&This->next_charset_handle)); + } + + LeaveCriticalSection(&This->cs); + return hr; } static HRESULT WINAPI MimeInternat_GetCharsetInfo(IMimeInternational *iface, HCHARSET hCharset, @@ -224,6 +317,10 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); global_internat->lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; + InitializeCriticalSection(&global_internat->cs); + + list_init(&global_internat->charsets); + global_internat->next_charset_handle = 0; *internat = (IMimeInternational*)&global_internat->lpVtbl;

1 0

Huw Davies : mlang: Forward IMultiLanguage_GetCharsetInfo to IMultiLanguage3_GetCharsetInfo.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 0c590201d8be31af29ed6c0b06513d0b53cc23e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c590201d8be31af29ed6c0b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 12:36:41 2008 +0100 mlang: Forward IMultiLanguage_GetCharsetInfo to IMultiLanguage3_GetCharsetInfo. --- dlls/mlang/mlang.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e2f0970..9686e9a 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2093,8 +2093,8 @@ static HRESULT WINAPI fnIMultiLanguage_GetCharsetInfo( BSTR Charset, PMIMECSETINFO pCharsetInfo) { - FIXME("\n"); - return E_NOTIMPL; + ICOM_THIS_MULTI(MLang_impl, vtbl_IMultiLanguage, iface); + return IMultiLanguage3_GetCharsetInfo((IMultiLanguage3*)&This->vtbl_IMultiLanguage3, Charset, pCharsetInfo); } static HRESULT WINAPI fnIMultiLanguage_IsConvertible(

1 0

Huw Davies : inetcomm/tests: Start of IMimeInternational tests.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: 913f17e2905e3a675df9c20b09255160b0703135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=913f17e2905e3a675df9c20b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 12:06:46 2008 +0100 inetcomm/tests: Start of IMimeInternational tests. --- dlls/inetcomm/tests/Makefile.in | 1 + dlls/inetcomm/tests/mimeintl.c | 60 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/inetcomm/tests/Makefile.in b/dlls/inetcomm/tests/Makefile.in index e35636f..8e302db 100644 --- a/dlls/inetcomm/tests/Makefile.in +++ b/dlls/inetcomm/tests/Makefile.in @@ -6,6 +6,7 @@ TESTDLL = inetcomm.dll IMPORTS = inetcomm ole32 kernel32 CTESTS = \ + mimeintl.c \ mimeole.c @MAKE_TEST_RULES@ diff --git a/dlls/inetcomm/tests/mimeintl.c b/dlls/inetcomm/tests/mimeintl.c new file mode 100644 index 0000000..defe3f9 --- /dev/null +++ b/dlls/inetcomm/tests/mimeintl.c @@ -0,0 +1,60 @@ +/* + * MimeInternational tests + * + * Copyright 2008 Huw Davies + * + * 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 + */ + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windows.h" +#include "ole2.h" +#include "ocidl.h" + +#include "mimeole.h" + +#include <stdio.h> +#include <assert.h> + +#include "wine/test.h" + +static void test_create(void) +{ + IMimeInternational *internat, *internat2; + HRESULT hr; + ULONG ref; + + hr = MimeOleGetInternat(&internat); + ok(hr == S_OK, "ret %08x\n", hr); + hr = MimeOleGetInternat(&internat2); + ok(hr == S_OK, "ret %08x\n", hr); + + /* test to show that the object is a singleton with + a reference held by the dll. */ + ok(internat == internat2, "instances differ\n"); + ref = IMimeInternational_Release(internat2); + ok(ref == 2, "got %d\n", ref); + + IMimeInternational_Release(internat); +} + +START_TEST(mimeintl) +{ + OleInitialize(NULL); + test_create(); + OleUninitialize(); +}

1 0

Huw Davies : inetcomm: Add a stub MimeInternational object.
by Alexandre Julliard Sept. 11, 2008

Sept. 11, 2008

Module: wine Branch: master Commit: d1601eeeac52d7bf4030edb945d67a7d545f1386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1601eeeac52d7bf4030edb94… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Sep 10 12:05:37 2008 +0100 inetcomm: Add a stub MimeInternational object. --- dlls/inetcomm/Makefile.in | 1 + dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/inetcomm_main.c | 4 + dlls/inetcomm/inetcomm_private.h | 2 + dlls/inetcomm/internettransport.c | 4 + dlls/inetcomm/mimeintl.c | 241 +++++++++++++++++++++++++++++++++++++ dlls/inetcomm/regsvr.c | 2 +- 7 files changed, 254 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1601eeeac52d7bf4030e…

1 0