Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60276: [MPR] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:12:58 2013 New Revision: 60276 URL: http://svn.reactos.org/svn/reactos?rev=60276&view=rev Log: [MPR] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/dll/win32/mpr/mpr_main.c trunk/reactos/dll/win32/mpr/pwcache.c trunk/reactos/dll/win32/mpr/wnet.c trunk/reactos/dll/win32/mpr/wnetpriv.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/CMakeLists.t… ============================================================================== --- trunk/reactos/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -13,11 +13,10 @@ nps.c pwcache.c wnet.c - mpr.rc ${CMAKE_CURRENT_BINARY_DIR}/mpr_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mpr.def) -add_library(mpr SHARED ${SOURCE}) +add_library(mpr SHARED ${SOURCE} mpr.rc) set_module_type(mpr win32dll) target_link_libraries(mpr wine) add_importlibs(mpr advapi32 user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -23,8 +23,6 @@ 24 stdcall @(ptr) MPR_Free 25 stdcall @(ptr long) _MPR_25 -@ stdcall -private DllCanUnloadNow() -@ stub -private DllGetClassObject @ stdcall MultinetGetConnectionPerformanceA(ptr ptr) @ stdcall MultinetGetConnectionPerformanceW(ptr ptr) @ stdcall MultinetGetErrorTextA(long ptr long) Modified: trunk/reactos/dll/win32/mpr/mpr_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr_main.c [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -76,14 +76,6 @@ } /***************************************************************** - * DllCanUnloadNow [MPR.@] - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_OK; -} - -/***************************************************************** * DllMain [MPR.init] */ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -95,6 +87,7 @@ break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; wnetFree(); break; } Modified: trunk/reactos/dll/win32/mpr/pwcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/pwcache.c?re… ============================================================================== --- trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/pwcache.c [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -262,7 +262,6 @@ sprintf(prefix, "X-%02X-", nType ); - i = 0; for( i=0; ; i++ ) { val_sz = sizeof val; @@ -301,8 +300,8 @@ continue; /* read the value data */ - size = sizeof *entry - sizeof entry->abResource[0] + val_sz + data_sz; - entry = HeapAlloc( GetProcessHeap(), 0, sizeof *entry + val_sz + data_sz ); + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[val_sz + data_sz] ); + entry = HeapAlloc( GetProcessHeap(), 0, size ); memcpy( entry->abResource, val, val_sz ); entry->cbEntry = size; entry->cbResource = val_sz; Modified: trunk/reactos/dll/win32/mpr/wnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnet.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnet.c [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -640,7 +640,7 @@ ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) { - lphEnum = NULL; + *lphEnum = NULL; ret = WN_NO_NETWORK; } else @@ -732,7 +732,7 @@ ret = WN_BAD_POINTER; else if (!providerTable || providerTable->numProviders == 0) { - lphEnum = NULL; + *lphEnum = NULL; ret = WN_NO_NETWORK; } else @@ -1175,7 +1175,7 @@ if (ret == WN_SUCCESS) { /* reflect the fact that we already enumerated "Entire Network" */ - lpcCount++; + (*lpcCount)++; *lpBufferSize = bufferSize + bytesNeeded; } else @@ -1894,6 +1894,12 @@ { LPUNIVERSAL_NAME_INFOA info = lpBuffer; + if (GetDriveTypeA(lpLocalPath) != DRIVE_REMOTE) + { + err = ERROR_NOT_CONNECTED; + break; + } + size = sizeof(*info) + lstrlenA(lpLocalPath) + 1; if (*lpBufferSize < size) { @@ -1902,7 +1908,6 @@ } info->lpUniversalName = (char *)info + sizeof(*info); lstrcpyA(info->lpUniversalName, lpLocalPath); - *lpBufferSize = size; err = WN_NO_ERROR; break; } @@ -1936,6 +1941,12 @@ { LPUNIVERSAL_NAME_INFOW info = lpBuffer; + if (GetDriveTypeW(lpLocalPath) != DRIVE_REMOTE) + { + err = ERROR_NOT_CONNECTED; + break; + } + size = sizeof(*info) + (lstrlenW(lpLocalPath) + 1) * sizeof(WCHAR); if (*lpBufferSize < size) { @@ -1944,7 +1955,6 @@ } info->lpUniversalName = (LPWSTR)((char *)info + sizeof(*info)); lstrcpyW(info->lpUniversalName, lpLocalPath); - *lpBufferSize = size; err = WN_NO_ERROR; break; } Modified: trunk/reactos/dll/win32/mpr/wnetpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/wnetpriv.h?r… ============================================================================== --- trunk/reactos/dll/win32/mpr/wnetpriv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/wnetpriv.h [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -21,7 +21,7 @@ #ifndef __WNET_PRIV_H__ #define __WNET_PRIV_H__ -void wnetInit(HINSTANCE hInstDll); -void wnetFree(void); +void wnetInit(HINSTANCE hInstDll) DECLSPEC_HIDDEN; +void wnetFree(void) DECLSPEC_HIDDEN; #endif /* ndef __WNET_PRIV_H__ */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 13:12:58 2013 @@ -103,7 +103,7 @@ reactos/dll/win32/mciseq # Synced to Wine-1.7.1 reactos/dll/win32/mciwave # Synced to Wine-1.5.19 reactos/dll/win32/mlang # Synced to Wine-1.7.1 -reactos/dll/win32/mpr # Autosync +reactos/dll/win32/mpr # Synced to Wine-1.7.1 reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/msacm32 # Autosync reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.19

1 0

[akhaldi] 60275: [MLANG_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:09:05 2013 New Revision: 60275 URL: http://svn.reactos.org/svn/reactos?rev=60275&view=rev Log: [MLANG_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/mlang/CMakeLists.txt trunk/rostests/winetests/mlang/mlang.c trunk/rostests/winetests/mlang/testlist.c Modified: trunk/rostests/winetests/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/CMakeList… ============================================================================== --- trunk/rostests/winetests/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/CMakeLists.txt [iso-8859-1] Sat Sep 21 13:09:05 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(mlang_winetest mlang.c testlist.c) -target_link_libraries(mlang_winetest wine uuid) set_module_type(mlang_winetest win32cui) -add_importlibs(mlang_winetest mlang oleaut32 ole32 gdi32 msvcrt kernel32 ntdll) +add_importlibs(mlang_winetest mlang oleaut32 ole32 gdi32 msvcrt kernel32) add_cd_file(TARGET mlang_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/mlang.c?r… ============================================================================== --- trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/mlang.c [iso-8859-1] Sat Sep 21 13:09:05 2013 @@ -121,6 +121,9 @@ 'K',0xF6,'n','i','g','r','e','i','c',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; +static const WCHAR de_enus2[] ={'E','n','g','l','i','s','c','h',' ', + '(','V','e','r','e','i','n','i','g','t','e',' ', + 'S','t','a','a','t','e','n',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ', '(','D','e','u','t','s','c','h','l','a','n','d',')',0}; static const WCHAR de_deat[] = {'D','e','u','t','s','c','h',' ', @@ -184,11 +187,11 @@ {MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en", de_en}, {MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), - TODO_NAME, "en-us", de_enus}, + TODO_NAME, "en-us", de_enus, de_enus2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_UK), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en-gb", de_engb, de_engb2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), - TODO_NAME, "en-us", de_enus}, + TODO_NAME, "en-us", de_enus, de_enus2}, {MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_CAN), MAKELANGID(LANG_GERMAN, SUBLANG_DEFAULT), TODO_NAME, "en-ca", de_enca}, @@ -227,13 +230,7 @@ { HMODULE hMlang; - hMlang = LoadLibraryA("mlang.dll"); - if (!hMlang) - { - skip("mlang not available\n"); - return FALSE; - } - + hMlang = GetModuleHandleA("mlang.dll"); pConvertINetMultiByteToUnicode = (void *)GetProcAddress(hMlang, "ConvertINetMultiByteToUnicode"); pConvertINetUnicodeToMultiByte = (void *)GetProcAddress(hMlang, "ConvertINetUnicodeToMultiByte"); pRfc1766ToLcidA = (void *)GetProcAddress(hMlang, "Rfc1766ToLcidA"); @@ -677,7 +674,7 @@ n = 0; ret = IEnumCodePage_Next(iEnumCP, 1, &cpinfo2, &n); ok(n == 1 && ret == S_OK, "IEnumCodePage_Next: expected 1/S_OK, got %u/%08x\n", n, ret); - cpinfo_cmp(&cpinfo[0], &cpinfo2); + cpinfo_cmp(cpinfo, &cpinfo2); if (0) { @@ -782,7 +779,7 @@ n = 0; ret = IEnumScript_Next(iEnumScript, 1, &sinfo2, &n); ok(n == 1 && ret == S_OK, "IEnumScript_Next: expected 1/S_OK, got %u/%08x\n", n, ret); - scriptinfo_cmp(&sinfo[0], &sinfo2); + scriptinfo_cmp(sinfo, &sinfo2); if (0) { @@ -861,7 +858,7 @@ dwCodePages = 0; processed = 0; - ret = IMLangFontLink_GetStrCodePages(iMLFL, &str[0], 1, 0, &dwCodePages, &processed); + ret = IMLangFontLink_GetStrCodePages(iMLFL, str, 1, 0, &dwCodePages, &processed); ok(ret == S_OK, "IMLangFontLink_GetStrCodePages error %x\n", ret); ok(dwCodePages == dwCmpCodePages, "expected %x, got %x\n", dwCmpCodePages, dwCodePages); ok(processed == 1, "expected 1, got %d\n", processed); @@ -1914,6 +1911,68 @@ } } +static void test_IMLangConvertCharset(IMultiLanguage *ml) +{ + IMLangConvertCharset *convert; + WCHAR strW[] = {'a','b','c','d',0}; + UINT cp, src_size, dst_size; + char strA[] = "abcd"; + WCHAR buffW[20]; + HRESULT hr; + + hr = IMultiLanguage_CreateConvertCharset(ml, CP_ACP, CP_UTF8, 0, &convert); +todo_wine + ok(hr == S_FALSE, "expected S_FALSE got 0x%08x\n", hr); + + hr = IMLangConvertCharset_GetSourceCodePage(convert, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cp = CP_UTF8; + hr = IMLangConvertCharset_GetSourceCodePage(convert, &cp); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(cp == CP_ACP, "got %d\n", cp); + + hr = IMLangConvertCharset_GetDestinationCodePage(convert, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + cp = CP_ACP; + hr = IMLangConvertCharset_GetDestinationCodePage(convert, &cp); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + ok(cp == CP_UTF8, "got %d\n", cp); + + /* DoConversionToUnicode */ + hr = IMLangConvertCharset_Initialize(convert, CP_UTF8, CP_UNICODE, 0); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + + hr = IMLangConvertCharset_DoConversionToUnicode(convert, NULL, NULL, NULL, NULL); + ok(hr == E_FAIL || broken(hr == S_OK) /* win2k */, "got 0x%08x\n", hr); + + src_size = -1; + dst_size = 20; + buffW[0] = 0; + buffW[4] = 4; + hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!memcmp(buffW, strW, 4*sizeof(WCHAR)), "got converted string %s\n", wine_dbgstr_wn(buffW, dst_size)); + ok(dst_size == 4, "got %d\n", dst_size); + ok(buffW[4] == 4, "got %d\n", buffW[4]); + ok(src_size == 4, "got %d\n", src_size); + + src_size = -1; + dst_size = 0; + buffW[0] = 1; + hr = IMLangConvertCharset_DoConversionToUnicode(convert, strA, &src_size, buffW, &dst_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(buffW[0] == 1, "got %d\n", buffW[0]); + ok(dst_size == 4, "got %d\n", dst_size); + ok(src_size == 4, "got %d\n", src_size); + + hr = IMLangConvertCharset_Initialize(convert, CP_UNICODE, CP_UNICODE, 0); + ok(hr == S_OK, "expected S_OK got 0x%08x\n", hr); + + IMLangConvertCharset_Release(convert); +} + START_TEST(mlang) { IMultiLanguage *iML = NULL; @@ -1940,6 +1999,7 @@ if (ret != S_OK || !iML) return; test_GetNumberOfCodePageInfo((IMultiLanguage2 *)iML); + test_IMLangConvertCharset(iML); IMultiLanguage_Release(iML); Modified: trunk/rostests/winetests/mlang/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mlang/testlist.… ============================================================================== --- trunk/rostests/winetests/mlang/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mlang/testlist.c [iso-8859-1] Sat Sep 21 13:09:05 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_mlang(void);

1 0

[akhaldi] 60274: [MLANG] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:08:12 2013 New Revision: 60274 URL: http://svn.reactos.org/svn/reactos?rev=60274&view=rev Log: [MLANG] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/mlang/mlang.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Sat Sep 21 13:08:12 2013 @@ -3,32 +3,17 @@ -D__WINESRC__ -DCOM_NO_WINDOWS_H) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mlang.dll mlang.spec ADD_IMPORTLIB) list(APPEND SOURCE mlang.c - mlang.rc ${CMAKE_CURRENT_BINARY_DIR}/mlang_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mlang.def) -add_library(mlang SHARED ${SOURCE}) +add_library(mlang SHARED ${SOURCE} mlang.rc) set_module_type(mlang win32dll UNICODE) target_link_libraries(mlang uuid wine) add_delay_importlibs(mlang oleaut32) - -add_importlibs(mlang - ole32 - gdi32 - advapi32 - msvcrt - kernel32 - ntdll) - - -add_dependencies(mlang psdk) +add_importlibs(mlang gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mlang DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mlang/mlang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/mlang.c?re… ============================================================================== --- trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mlang/mlang.c [iso-8859-1] Sat Sep 21 13:08:12 2013 @@ -50,6 +50,7 @@ #define CP_UNICODE 1200 static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj); +static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj); static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum); static HINSTANCE instance; @@ -890,6 +891,7 @@ DisableThreadLibraryCalls(hInstDLL); break; case DLL_PROCESS_DETACH: + if (lpv) break; TlsFree(MLANG_tls_index); break; } @@ -1280,11 +1282,15 @@ * MLANG ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; + +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} struct object_creation_info { @@ -1296,37 +1302,35 @@ static const struct object_creation_info object_creation[] = { { &CLSID_CMultiLanguage, "CLSID_CMultiLanguage", MultiLanguage_create }, + { &CLSID_CMLangConvertCharset, "CLSID_CMLangConvertCharset", MLangConvertCharset_create } }; -static HRESULT WINAPI -MLANGCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - +static HRESULT WINAPI MLANGCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ TRACE("%s\n", debugstr_guid(riid) ); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI MLANGCF_AddRef(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; +static ULONG WINAPI MLANGCF_AddRef(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI MLANGCF_Release(LPCLASSFACTORY iface) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - +static ULONG WINAPI MLANGCF_Release(IClassFactory *iface) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -1338,10 +1342,10 @@ return ref; } -static HRESULT WINAPI MLANGCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) -{ - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; +static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) +{ + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -1357,7 +1361,7 @@ return hres; } -static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI MLANGCF_LockServer(IClassFactory *iface, BOOL dolock) { if (dolock) LockModule(); @@ -1407,14 +1411,14 @@ factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &MLANGCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &MLANGCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); - - TRACE("(%p) <- %p\n", ppv, &(factory->ITF_IClassFactory) ); + *ppv = &factory->IClassFactory_iface; + + TRACE("(%p) <- %p\n", ppv, &factory->IClassFactory_iface); return S_OK; } @@ -1432,88 +1436,6 @@ LONG ref; DWORD total_cp, total_scripts; } MLang_impl; - -static ULONG MLang_AddRef( MLang_impl* This) -{ - return InterlockedIncrement(&This->ref); -} - -static ULONG MLang_Release( MLang_impl* This ) -{ - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("%p ref = %d\n", This, ref); - if (ref == 0) - { - TRACE("Destroying %p\n", This); - HeapFree(GetProcessHeap(), 0, This); - UnlockModule(); - } - - return ref; -} - -static HRESULT MLang_QueryInterface( - MLang_impl* This, - REFIID riid, - void** ppvObject) -{ - TRACE("%p -> %s\n", This, debugstr_guid(riid) ); - - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IMLangCodePages) - || IsEqualGUID(riid, &IID_IMLangFontLink)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangFontLink %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangFontLink_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMLangFontLink2)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangFontLink2 %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangFontLink2_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage) ) - { - MLang_AddRef(This); - TRACE("Returning IID_IMultiLanguage %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMultiLanguage_iface; - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage2) ) - { - MLang_AddRef(This); - *ppvObject = &This->IMultiLanguage3_iface; - TRACE("Returning IID_IMultiLanguage2 %p ref = %d\n", This, This->ref); - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMultiLanguage3) ) - { - MLang_AddRef(This); - *ppvObject = &This->IMultiLanguage3_iface; - TRACE("Returning IID_IMultiLanguage3 %p ref = %d\n", This, This->ref); - return S_OK; - } - - if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) - { - MLang_AddRef(This); - TRACE("Returning IID_IMLangLineBreakConsole %p ref = %d\n", This, This->ref); - *ppvObject = &This->IMLangLineBreakConsole_iface; - return S_OK; - } - - - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); - return E_NOINTERFACE; -} /******************************************************************************/ @@ -1846,7 +1768,7 @@ EnumScript_impl *es; UINT i; - TRACE("%p, %08x, %04x, %p: stub!\n", mlang, dwFlags, LangId, ppEnumScript); + TRACE("%p, %08x, %04x, %p\n", mlang, dwFlags, LangId, ppEnumScript); if (!dwFlags) /* enumerate all available scripts */ dwFlags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM; @@ -1891,187 +1813,73 @@ void** ppvObject) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangFontLink_AddRef( IMLangFontLink* iface) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangFontLink_Release( IMLangFontLink* iface) { MLang_impl *This = impl_from_IMLangFontLink( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangFontLink_GetCharCodePages( IMLangFontLink* iface, - WCHAR chSrc, - DWORD* pdwCodePages) -{ - int i; - CHAR buf; - BOOL used_dc; - DWORD codePages; - - *pdwCodePages = 0; - - for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) - { - WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, - &chSrc, 1, &buf, 1, NULL, &used_dc); - - /* If default char is not used, current codepage include the given symbol */ - if (!used_dc) - { - IMLangFontLink_CodePageToCodePages(iface, - mlang_data[i].family_codepage, &codePages); - *pdwCodePages |= codePages; - } - } - return S_OK; + WCHAR ch_src, + DWORD* codepages) +{ + MLang_impl *This = impl_from_IMLangFontLink( iface ); + return IMLangFontLink2_GetCharCodePages(&This->IMLangFontLink2_iface, ch_src, codepages); } static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( IMLangFontLink* iface, - const WCHAR* pszSrc, - LONG cchSrc, - DWORD dwPriorityCodePages, - DWORD* pdwCodePages, - LONG* pcchCodePages) -{ - LONG i; - DWORD cps = 0; - - TRACE("(%p)->%s %d %x %p %p\n", iface, debugstr_wn(pszSrc, cchSrc), cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); - - if (pdwCodePages) *pdwCodePages = 0; - if (pcchCodePages) *pcchCodePages = 0; - - if (!pszSrc || !cchSrc || cchSrc < 0) - return E_INVALIDARG; - - for (i = 0; i < cchSrc; i++) - { - DWORD cp; - HRESULT ret; - - ret = fnIMLangFontLink_GetCharCodePages(iface, pszSrc[i], &cp); - if (ret != S_OK) return E_FAIL; - - if (!cps) cps = cp; - else cps &= cp; - - /* FIXME: not tested */ - if (dwPriorityCodePages & cps) break; - } - - if (pdwCodePages) *pdwCodePages = cps; - if (pcchCodePages) *pcchCodePages = min( i + 1, cchSrc ); - return S_OK; + const WCHAR* src, + LONG src_len, + DWORD priority_cp, + DWORD* codepages, + LONG* ret_len) +{ + MLang_impl *This = impl_from_IMLangFontLink( iface ); + return IMLangFontLink2_GetStrCodePages(&This->IMLangFontLink2_iface, src, src_len, priority_cp, + codepages, ret_len); } 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( IMLangFontLink* iface, - DWORD dwCodePages, - UINT uDefaultCodePage, - UINT* puCodePage) -{ - MLang_impl *This = impl_from_IMLangFontLink( iface ); - DWORD mask = 0x00000000; - UINT i; - CHARSETINFO cs; - BOOL rc; - - TRACE("(%p) scanning 0x%x default page %u\n",This, dwCodePages, - uDefaultCodePage); - - *puCodePage = 0x00000000; - - rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uDefaultCodePage, &cs, - TCI_SRCCODEPAGE); - - if (rc && (dwCodePages & cs.fs.fsCsb[0])) - { - TRACE("Found Default Codepage\n"); - *puCodePage = uDefaultCodePage; - return S_OK; - } - - - for (i = 0; i < 32; i++) - { - - mask = 1 << i; - if (dwCodePages & mask) - { - DWORD Csb[2]; - Csb[0] = mask; - Csb[1] = 0x0; - rc = TranslateCharsetInfo(Csb, &cs, TCI_SRCFONTSIG); - if (!rc) - continue; - - TRACE("Falling back to least significant found CodePage %u\n", - cs.ciACP); - *puCodePage = cs.ciACP; - return S_OK; - } - } - - TRACE("no codepage found\n"); - return E_FAIL; + DWORD codepages, + UINT def_codepage, + UINT* codepage) +{ + MLang_impl *This = impl_from_IMLangFontLink(iface); + return IMLangFontLink2_CodePagesToCodePage(&This->IMLangFontLink2_iface, codepages, + def_codepage, codepage); } static HRESULT WINAPI fnIMLangFontLink_GetFontCodePages( IMLangFontLink* iface, - HDC hDC, - HFONT hFont, - DWORD* pdwCodePages) -{ - HFONT old_font; - FONTSIGNATURE fontsig; - MLang_impl *This = impl_from_IMLangFontLink( iface ); - - TRACE("(%p)\n",This); - - old_font = SelectObject(hDC,hFont); - GetTextCharsetInfo(hDC,&fontsig, 0); - SelectObject(hDC,old_font); - - *pdwCodePages = fontsig.fsCsb[0]; - TRACE("CodePages is 0x%x\n",fontsig.fsCsb[0]); - - return S_OK; + HDC hdc, + HFONT hfont, + DWORD* codepages) +{ + MLang_impl *This = impl_from_IMLangFontLink(iface); + return IMLangFontLink2_GetFontCodePages(&This->IMLangFontLink2_iface, hdc, hfont, codepages); } static HRESULT WINAPI fnIMLangFontLink_MapFont( @@ -2126,36 +1934,31 @@ static HRESULT WINAPI fnIMultiLanguage_QueryInterface( IMultiLanguage* iface, REFIID riid, - void** ppvObject) + void** obj) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface(&This->IMultiLanguage3_iface, riid, obj); } static ULONG WINAPI fnIMultiLanguage_AddRef( IMultiLanguage* iface ) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return IMLangFontLink_AddRef( &This->IMLangFontLink_iface ); + return IMultiLanguage3_AddRef(&This->IMultiLanguage3_iface); } static ULONG WINAPI fnIMultiLanguage_Release( IMultiLanguage* iface ) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - return IMLangFontLink_Release( &This->IMLangFontLink_iface ); + return IMultiLanguage3_Release(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetNumberOfCodePageInfo( IMultiLanguage* iface, - UINT* pcCodePage) + UINT* cp) { MLang_impl *This = impl_from_IMultiLanguage( iface ); - - TRACE("(%p, %p)\n", This, pcCodePage); - - if (!pcCodePage) return E_INVALIDARG; - - *pcCodePage = This->total_cp; - return S_OK; + TRACE("(%p, %p)\n", This, cp); + return IMultiLanguage3_GetNumberOfCodePageInfo(&This->IMultiLanguage3_iface, cp); } static HRESULT WINAPI fnIMultiLanguage_GetCodePageInfo( @@ -2185,10 +1988,11 @@ static HRESULT WINAPI fnIMultiLanguage_GetFamilyCodePage( IMultiLanguage* iface, - UINT uiCodePage, - UINT* puiFamilyCodePage) -{ - return GetFamilyCodePage(uiCodePage, puiFamilyCodePage); + UINT cp, + UINT* family_cp) +{ + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_GetFamilyCodePage(&This->IMultiLanguage3_iface, cp, family_cp); } static HRESULT WINAPI fnIMultiLanguage_EnumCodePages( @@ -2214,57 +2018,61 @@ static HRESULT WINAPI fnIMultiLanguage_IsConvertible( IMultiLanguage* iface, - DWORD dwSrcEncoding, - DWORD dwDstEncoding) -{ - return IsConvertINetStringAvailable(dwSrcEncoding, dwDstEncoding); + DWORD src_enc, + DWORD dst_enc) +{ + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_IsConvertible(&This->IMultiLanguage3_iface, src_enc, dst_enc); } static HRESULT WINAPI fnIMultiLanguage_ConvertString( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwSrcEncoding, - DWORD dwDstEncoding, - BYTE* pSrcStr, - UINT* pcSrcSize, - BYTE* pDstStr, - UINT* pcDstSize) -{ - return ConvertINetString(pdwMode, dwSrcEncoding, dwDstEncoding, - (LPCSTR)pSrcStr, (LPINT)pcSrcSize, (LPSTR)pDstStr, (LPINT)pcDstSize); + DWORD* mode, + DWORD src_enc, + DWORD dst_enc, + BYTE* src, + UINT* src_size, + BYTE* dest, + UINT* dest_size) +{ + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertString(&This->IMultiLanguage3_iface, mode, src_enc, + dst_enc, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringToUnicode( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwEncoding, - CHAR* pSrcStr, - UINT* pcSrcSize, - WCHAR* pDstStr, - UINT* pcDstSize) -{ - return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding, - (LPCSTR)pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); + DWORD* mode, + DWORD src_enc, + CHAR* src, + UINT* src_size, + WCHAR* dest, + UINT* dest_size) +{ + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringToUnicode(&This->IMultiLanguage3_iface, + mode, src_enc, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringFromUnicode( IMultiLanguage* iface, - DWORD* pdwMode, - DWORD dwEncoding, - WCHAR* pSrcStr, - UINT* pcSrcSize, - CHAR* pDstStr, - UINT* pcDstSize) -{ - return ConvertINetUnicodeToMultiByte(pdwMode, dwEncoding, - pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); + DWORD* mode, + DWORD encoding, + WCHAR* src, + UINT* src_size, + CHAR* dest, + UINT* dest_size) +{ + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_ConvertStringFromUnicode(&This->IMultiLanguage3_iface, + mode, encoding, src, src_size, dest, dest_size); } static HRESULT WINAPI fnIMultiLanguage_ConvertStringReset( IMultiLanguage* iface) { - FIXME("\n"); - return E_NOTIMPL; + MLang_impl *This = impl_from_IMultiLanguage( iface ); + return IMultiLanguage3_ConvertStringReset(&This->IMultiLanguage3_iface); } static HRESULT WINAPI fnIMultiLanguage_GetRfc1766FromLcid( @@ -2272,41 +2080,17 @@ LCID lcid, BSTR* pbstrRfc1766) { - WCHAR buf[MAX_RFC1766_NAME]; - - TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); - if (!pbstrRfc1766) - return E_INVALIDARG; - - if (!lcid_to_rfc1766W( lcid, buf, MAX_RFC1766_NAME )) - { - *pbstrRfc1766 = SysAllocString( buf ); - return S_OK; - } - return E_FAIL; + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_GetRfc1766FromLcid(&This->IMultiLanguage3_iface, lcid, pbstrRfc1766); } static HRESULT WINAPI fnIMultiLanguage_GetLcidFromRfc1766( IMultiLanguage* iface, - LCID* pLocale, - BSTR bstrRfc1766) -{ - 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; + LCID* locale, + BSTR rfc1766) +{ + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_GetLcidFromRfc1766(&This->IMultiLanguage3_iface, locale, rfc1766); } /******************************************************************************/ @@ -2585,13 +2369,13 @@ static HRESULT WINAPI fnIMultiLanguage_CreateConvertCharset( IMultiLanguage* iface, - UINT uiSrcCodePage, - UINT uiDstCodePage, - DWORD dwProperty, - IMLangConvertCharset** ppMLangConvertCharset) -{ - FIXME("\n"); - return E_NOTIMPL; + UINT src_cp, + UINT dst_cp, + DWORD prop, + IMLangConvertCharset** convert_charset) +{ + MLang_impl *This = impl_from_IMultiLanguage(iface); + return IMultiLanguage3_CreateConvertCharset(&This->IMultiLanguage3_iface, src_cp, dst_cp, prop, convert_charset); } static const IMultiLanguageVtbl IMultiLanguage_vtbl = @@ -2624,28 +2408,71 @@ return CONTAINING_RECORD( iface, MLang_impl, IMultiLanguage3_iface ); } -static HRESULT WINAPI fnIMultiLanguage2_QueryInterface( +static HRESULT WINAPI fnIMultiLanguage3_QueryInterface( IMultiLanguage3* iface, REFIID riid, - void** ppvObject) + void** obj) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); -} - -static ULONG WINAPI fnIMultiLanguage2_AddRef( IMultiLanguage3* iface ) + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMultiLanguage)) + { + *obj = &This->IMultiLanguage_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangCodePages) || + IsEqualGUID(riid, &IID_IMLangFontLink)) + { + *obj = &This->IMLangFontLink_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangFontLink2)) + { + *obj = &This->IMLangFontLink2_iface; + } + else if (IsEqualGUID(riid, &IID_IMultiLanguage2) || + IsEqualGUID(riid, &IID_IMultiLanguage3)) + { + *obj = &This->IMultiLanguage3_iface; + } + else if (IsEqualGUID(riid, &IID_IMLangLineBreakConsole)) + { + *obj = &This->IMLangLineBreakConsole_iface; + } + else + { + WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), obj); + *obj = NULL; + return E_NOINTERFACE; + } + + IMultiLanguage3_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI fnIMultiLanguage3_AddRef( IMultiLanguage3* iface ) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_AddRef( This ); -} - -static ULONG WINAPI fnIMultiLanguage2_Release( IMultiLanguage3* iface ) + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI fnIMultiLanguage3_Release( IMultiLanguage3* iface ) { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - return MLang_Release( This ); -} - -static HRESULT WINAPI fnIMultiLanguage2_GetNumberOfCodePageInfo( + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI fnIMultiLanguage3_GetNumberOfCodePageInfo( IMultiLanguage3* iface, UINT* pcCodePage) { @@ -2698,7 +2525,7 @@ mime_cp_info->bGDICharset); } -static HRESULT WINAPI fnIMultiLanguage2_GetCodePageInfo( +static HRESULT WINAPI fnIMultiLanguage3_GetCodePageInfo( IMultiLanguage3* iface, UINT uiCodePage, LANGID LangId, @@ -2724,7 +2551,7 @@ return S_FALSE; } -static HRESULT WINAPI fnIMultiLanguage2_GetFamilyCodePage( +static HRESULT WINAPI fnIMultiLanguage3_GetFamilyCodePage( IMultiLanguage3* iface, UINT uiCodePage, UINT* puiFamilyCodePage) @@ -2732,7 +2559,7 @@ return GetFamilyCodePage(uiCodePage, puiFamilyCodePage); } -static HRESULT WINAPI fnIMultiLanguage2_EnumCodePages( +static HRESULT WINAPI fnIMultiLanguage3_EnumCodePages( IMultiLanguage3* iface, DWORD grfFlags, LANGID LangId, @@ -2745,7 +2572,7 @@ return EnumCodePage_create( This, grfFlags, LangId, ppEnumCodePage ); } -static HRESULT WINAPI fnIMultiLanguage2_GetCharsetInfo( +static HRESULT WINAPI fnIMultiLanguage3_GetCharsetInfo( IMultiLanguage3* iface, BSTR Charset, PMIMECSETINFO pCharsetInfo) @@ -2799,7 +2626,7 @@ return E_FAIL; } -static HRESULT WINAPI fnIMultiLanguage2_IsConvertible( +static HRESULT WINAPI fnIMultiLanguage3_IsConvertible( IMultiLanguage3* iface, DWORD dwSrcEncoding, DWORD dwDstEncoding) @@ -2807,7 +2634,7 @@ return IsConvertINetStringAvailable(dwSrcEncoding, dwDstEncoding); } -static HRESULT WINAPI fnIMultiLanguage2_ConvertString( +static HRESULT WINAPI fnIMultiLanguage3_ConvertString( IMultiLanguage3* iface, DWORD* pdwMode, DWORD dwSrcEncoding, @@ -2821,7 +2648,7 @@ (LPCSTR)pSrcStr, (LPINT)pcSrcSize, (LPSTR)pDstStr, (LPINT)pcDstSize); } -static HRESULT WINAPI fnIMultiLanguage2_ConvertStringToUnicode( +static HRESULT WINAPI fnIMultiLanguage3_ConvertStringToUnicode( IMultiLanguage3* iface, DWORD* pdwMode, DWORD dwEncoding, @@ -2834,7 +2661,7 @@ pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); } -static HRESULT WINAPI fnIMultiLanguage2_ConvertStringFromUnicode( +static HRESULT WINAPI fnIMultiLanguage3_ConvertStringFromUnicode( IMultiLanguage3* iface, DWORD* pdwMode, DWORD dwEncoding, @@ -2847,14 +2674,14 @@ pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); } -static HRESULT WINAPI fnIMultiLanguage2_ConvertStringReset( +static HRESULT WINAPI fnIMultiLanguage3_ConvertStringReset( IMultiLanguage3* iface) { FIXME("\n"); return E_NOTIMPL; } -static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766FromLcid( +static HRESULT WINAPI fnIMultiLanguage3_GetRfc1766FromLcid( IMultiLanguage3* iface, LCID lcid, BSTR* pbstrRfc1766) @@ -2873,7 +2700,7 @@ return E_FAIL; } -static HRESULT WINAPI fnIMultiLanguage2_GetLcidFromRfc1766( +static HRESULT WINAPI fnIMultiLanguage3_GetLcidFromRfc1766( IMultiLanguage3* iface, LCID* pLocale, BSTR bstrRfc1766) @@ -2886,7 +2713,7 @@ if (!pLocale || !bstrRfc1766) return E_INVALIDARG; - hr = IMultiLanguage2_EnumRfc1766(iface, 0, &rfc1766); + hr = IMultiLanguage3_EnumRfc1766(iface, 0, &rfc1766); if (FAILED(hr)) return hr; @@ -2896,7 +2723,7 @@ return hr; } -static HRESULT WINAPI fnIMultiLanguage2_EnumRfc1766( +static HRESULT WINAPI fnIMultiLanguage3_EnumRfc1766( IMultiLanguage3* iface, LANGID LangId, IEnumRfc1766** ppEnumRfc1766) @@ -2908,7 +2735,7 @@ return EnumRfc1766_create(LangId, ppEnumRfc1766); } -static HRESULT WINAPI fnIMultiLanguage2_GetRfc1766Info( +static HRESULT WINAPI fnIMultiLanguage3_GetRfc1766Info( IMultiLanguage3* iface, LCID Locale, LANGID LangId, @@ -2955,18 +2782,24 @@ return E_INVALIDARG; } -static HRESULT WINAPI fnIMultiLanguage2_CreateConvertCharset( +static HRESULT WINAPI fnIMultiLanguage3_CreateConvertCharset( IMultiLanguage3* iface, - UINT uiSrcCodePage, - UINT uiDstCodePage, - DWORD dwProperty, - IMLangConvertCharset** ppMLangConvertCharset) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT WINAPI fnIMultiLanguage2_ConvertStringInIStream( + UINT src_cp, + UINT dst_cp, + DWORD prop, + IMLangConvertCharset** convert_charset) +{ + HRESULT hr; + + TRACE("(%u %u 0x%08x %p)\n", src_cp, dst_cp, prop, convert_charset); + + hr = MLangConvertCharset_create(NULL, (void**)convert_charset); + if (FAILED(hr)) return hr; + + return IMLangConvertCharset_Initialize(*convert_charset, src_cp, dst_cp, prop); +} + +static HRESULT WINAPI fnIMultiLanguage3_ConvertStringInIStream( IMultiLanguage3* iface, DWORD* pdwMode, DWORD dwFlag, @@ -3014,7 +2847,7 @@ return hr; } -static HRESULT WINAPI fnIMultiLanguage2_ConvertStringToUnicodeEx( +static HRESULT WINAPI fnIMultiLanguage3_ConvertStringToUnicodeEx( IMultiLanguage3* iface, DWORD* pdwMode, DWORD dwEncoding, @@ -3051,7 +2884,7 @@ * * TODO: handle dwFlag and lpFallBack */ -static HRESULT WINAPI fnIMultiLanguage2_ConvertStringFromUnicodeEx( +static HRESULT WINAPI fnIMultiLanguage3_ConvertStringFromUnicodeEx( IMultiLanguage3* This, DWORD* pdwMode, DWORD dwEncoding, @@ -3067,7 +2900,7 @@ pSrcStr, (LPINT)pcSrcSize, pDstStr, (LPINT)pcDstSize); } -static HRESULT WINAPI fnIMultiLanguage2_DetectCodepageInIStream( +static HRESULT WINAPI fnIMultiLanguage3_DetectCodepageInIStream( IMultiLanguage3* iface, DWORD dwFlag, DWORD dwPrefWinCodePage, @@ -3079,7 +2912,7 @@ return E_NOTIMPL; } -static HRESULT WINAPI fnIMultiLanguage2_DetectInputCodepage( +static HRESULT WINAPI fnIMultiLanguage3_DetectInputCodepage( IMultiLanguage3* iface, DWORD dwFlag, DWORD dwPrefWinCodePage, @@ -3092,15 +2925,15 @@ return E_NOTIMPL; } -static HRESULT WINAPI fnIMultiLanguage2_ValidateCodePage( +static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePage( IMultiLanguage3* iface, UINT uiCodePage, HWND hwnd) { - return IMultiLanguage2_ValidateCodePageEx(iface,uiCodePage,hwnd,0); -} - -static HRESULT WINAPI fnIMultiLanguage2_GetCodePageDescription( + return IMultiLanguage3_ValidateCodePageEx(iface,uiCodePage,hwnd,0); +} + +static HRESULT WINAPI fnIMultiLanguage3_GetCodePageDescription( IMultiLanguage3* iface, UINT uiCodePage, LCID lcid, @@ -3128,17 +2961,17 @@ return S_FALSE; } -static HRESULT WINAPI fnIMultiLanguage2_IsCodePageInstallable( +static HRESULT WINAPI fnIMultiLanguage3_IsCodePageInstallable( IMultiLanguage3* iface, UINT uiCodePage) { TRACE("%u\n", uiCodePage); /* FIXME: the installable set is usually larger than the set of valid codepages */ - return IMultiLanguage2_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); -} - -static HRESULT WINAPI fnIMultiLanguage2_SetMimeDBSource( + return IMultiLanguage3_ValidateCodePageEx(iface, uiCodePage, NULL, CPIOD_PEEK); +} + +static HRESULT WINAPI fnIMultiLanguage3_SetMimeDBSource( IMultiLanguage3* iface, MIMECONTF dwSource) { @@ -3146,7 +2979,7 @@ return S_OK; } -static HRESULT WINAPI fnIMultiLanguage2_GetNumberOfScripts( +static HRESULT WINAPI fnIMultiLanguage3_GetNumberOfScripts( IMultiLanguage3* iface, UINT* pnScripts) { @@ -3160,7 +2993,7 @@ return S_OK; } -static HRESULT WINAPI fnIMultiLanguage2_EnumScripts( +static HRESULT WINAPI fnIMultiLanguage3_EnumScripts( IMultiLanguage3* iface, DWORD dwFlags, LANGID LangId, @@ -3173,13 +3006,13 @@ return EnumScript_create( This, dwFlags, LangId, ppEnumScript ); } -static HRESULT WINAPI fnIMultiLanguage2_ValidateCodePageEx( +static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePageEx( IMultiLanguage3* iface, UINT uiCodePage, HWND hwnd, DWORD dwfIODControl) { - int i; + unsigned int i; MLang_impl *This = impl_from_IMultiLanguage3( iface ); TRACE("%p %u %p %08x\n", This, uiCodePage, hwnd, dwfIODControl); @@ -3191,7 +3024,7 @@ /* check for mlang supported code pages */ for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) { - int n; + UINT n; for (n = 0; n < mlang_data[i].number_of_cp; n++) { if (mlang_data[i].mime_cp_info[n].cp == uiCodePage) @@ -3244,36 +3077,36 @@ static const IMultiLanguage3Vtbl IMultiLanguage3_vtbl = { - fnIMultiLanguage2_QueryInterface, - fnIMultiLanguage2_AddRef, - fnIMultiLanguage2_Release, - fnIMultiLanguage2_GetNumberOfCodePageInfo, - fnIMultiLanguage2_GetCodePageInfo, - fnIMultiLanguage2_GetFamilyCodePage, - fnIMultiLanguage2_EnumCodePages, - fnIMultiLanguage2_GetCharsetInfo, - fnIMultiLanguage2_IsConvertible, - fnIMultiLanguage2_ConvertString, - fnIMultiLanguage2_ConvertStringToUnicode, - fnIMultiLanguage2_ConvertStringFromUnicode, - fnIMultiLanguage2_ConvertStringReset, - fnIMultiLanguage2_GetRfc1766FromLcid, - fnIMultiLanguage2_GetLcidFromRfc1766, - fnIMultiLanguage2_EnumRfc1766, - fnIMultiLanguage2_GetRfc1766Info, - fnIMultiLanguage2_CreateConvertCharset, - fnIMultiLanguage2_ConvertStringInIStream, - fnIMultiLanguage2_ConvertStringToUnicodeEx, - fnIMultiLanguage2_ConvertStringFromUnicodeEx, - fnIMultiLanguage2_DetectCodepageInIStream, - fnIMultiLanguage2_DetectInputCodepage, - fnIMultiLanguage2_ValidateCodePage, - fnIMultiLanguage2_GetCodePageDescription, - fnIMultiLanguage2_IsCodePageInstallable, - fnIMultiLanguage2_SetMimeDBSource, - fnIMultiLanguage2_GetNumberOfScripts, - fnIMultiLanguage2_EnumScripts, - fnIMultiLanguage2_ValidateCodePageEx, + fnIMultiLanguage3_QueryInterface, + fnIMultiLanguage3_AddRef, + fnIMultiLanguage3_Release, + fnIMultiLanguage3_GetNumberOfCodePageInfo, + fnIMultiLanguage3_GetCodePageInfo, + fnIMultiLanguage3_GetFamilyCodePage, + fnIMultiLanguage3_EnumCodePages, + fnIMultiLanguage3_GetCharsetInfo, + fnIMultiLanguage3_IsConvertible, + fnIMultiLanguage3_ConvertString, + fnIMultiLanguage3_ConvertStringToUnicode, + fnIMultiLanguage3_ConvertStringFromUnicode, + fnIMultiLanguage3_ConvertStringReset, + fnIMultiLanguage3_GetRfc1766FromLcid, + fnIMultiLanguage3_GetLcidFromRfc1766, + fnIMultiLanguage3_EnumRfc1766, + fnIMultiLanguage3_GetRfc1766Info, + fnIMultiLanguage3_CreateConvertCharset, + fnIMultiLanguage3_ConvertStringInIStream, + fnIMultiLanguage3_ConvertStringToUnicodeEx, + fnIMultiLanguage3_ConvertStringFromUnicodeEx, + fnIMultiLanguage3_DetectCodepageInIStream, + fnIMultiLanguage3_DetectInputCodepage, + fnIMultiLanguage3_ValidateCodePage, + fnIMultiLanguage3_GetCodePageDescription, + fnIMultiLanguage3_IsCodePageInstallable, + fnIMultiLanguage3_SetMimeDBSource, + fnIMultiLanguage3_GetNumberOfScripts, + fnIMultiLanguage3_EnumScripts, + fnIMultiLanguage3_ValidateCodePageEx, fnIMultiLanguage3_DetectOutboundCodePage, fnIMultiLanguage3_DetectOutboundCodePageInIStream }; @@ -3291,56 +3124,173 @@ void** ppvObject) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangFontLink2_AddRef( IMLangFontLink2* iface ) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangFontLink2_Release( IMLangFontLink2* iface ) { MLang_impl *This = impl_from_IMLangFontLink2( iface ); - return MLang_Release( This ); -} - -static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, - WCHAR chSrc, DWORD *pdwCodePages) -{ - FIXME("(%p)->%s %p\n",This, debugstr_wn(&chSrc,1),pdwCodePages); - return E_NOTIMPL; -} - -static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, - const WCHAR *pszSrc, LONG cchSrc, DWORD dwPriorityCodePages, - DWORD *pdwCodePages, LONG *pcchCodePages) -{ - return fnIMLangFontLink_GetStrCodePages((IMLangFontLink *)This, - pszSrc, cchSrc, dwPriorityCodePages, pdwCodePages, pcchCodePages); -} - -static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This, - UINT uCodePage, - DWORD *pdwCodePages) -{ - FIXME("(%p)->%i %p\n",This, uCodePage, pdwCodePages); - return E_NOTIMPL; -} - -static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* This, - DWORD dwCodePages, UINT uDefaultCodePage, UINT *puCodePage) -{ - FIXME("(%p)->%i %i %p\n",This, dwCodePages, uDefaultCodePage, puCodePage); - return E_NOTIMPL; -} - -static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2* This, - HDC hDC, HFONT hFont, DWORD *pdwCodePages) -{ - FIXME("(%p)->%p %p %p\n",This, hDC, hFont, pdwCodePages); - return E_NOTIMPL; + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); +} + +static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* iface, + WCHAR ch_src, DWORD *ret_codepages) +{ + MLang_impl *This = impl_from_IMLangFontLink2(iface); + unsigned int i; + + TRACE("(%p)->(%s %p)\n", This, debugstr_wn(&ch_src, 1), ret_codepages); + + *ret_codepages = 0; + + for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + BOOL used_dc; + CHAR buf; + + WideCharToMultiByte(mlang_data[i].family_codepage, WC_NO_BEST_FIT_CHARS, + &ch_src, 1, &buf, 1, NULL, &used_dc); + + /* If default char is not used, current codepage include the given symbol */ + if (!used_dc) + { + DWORD codepages; + + IMLangFontLink2_CodePageToCodePages(iface, + mlang_data[i].family_codepage, &codepages); + *ret_codepages |= codepages; + } + } + return S_OK; +} + +static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, + const WCHAR *src, LONG src_len, DWORD priority_cp, + DWORD *codepages, LONG *ret_len) +{ + MLang_impl *This = impl_from_IMLangFontLink2(iface); + LONG i; + DWORD cps = 0; + + TRACE("(%p)->(%s:%d %x %p %p)\n", This, debugstr_wn(src, src_len), src_len, priority_cp, + codepages, ret_len); + + if (codepages) *codepages = 0; + if (ret_len) *ret_len = 0; + + if (!src || !src_len || src_len < 0) + return E_INVALIDARG; + + for (i = 0; i < src_len; i++) + { + DWORD cp; + HRESULT ret; + + ret = IMLangFontLink2_GetCharCodePages(iface, src[i], &cp); + if (ret != S_OK) return E_FAIL; + + if (!cps) cps = cp; + else cps &= cp; + + /* FIXME: not tested */ + if (priority_cp & cps) break; + } + + if (codepages) *codepages = cps; + if (ret_len) *ret_len = min( i + 1, src_len ); + return S_OK; +} + +static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* iface, + UINT codepage, + DWORD *codepages) +{ + 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, + DWORD codepages, UINT def_codepage, UINT *codepage) +{ + MLang_impl *This = impl_from_IMLangFontLink2(iface); + DWORD mask = 0; + CHARSETINFO cs; + BOOL rc; + UINT i; + + TRACE("(%p)->(0x%x %u %p)\n", This, codepages, def_codepage, codepage); + + *codepage = 0; + + rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)def_codepage, &cs, TCI_SRCCODEPAGE); + if (rc && (codepages & cs.fs.fsCsb[0])) + { + TRACE("Found Default Codepage\n"); + *codepage = def_codepage; + return S_OK; + } + + for (i = 0; i < 32; i++) + { + mask = 1 << i; + if (codepages & mask) + { + DWORD Csb[2]; + Csb[0] = mask; + Csb[1] = 0x0; + rc = TranslateCharsetInfo(Csb, &cs, TCI_SRCFONTSIG); + if (!rc) + continue; + + TRACE("Falling back to least significant found CodePage %u\n", + cs.ciACP); + *codepage = cs.ciACP; + return S_OK; + } + } + + TRACE("no codepage found\n"); + return E_FAIL; +} + +static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface, + HDC hdc, HFONT hfont, DWORD *codepages) +{ + MLang_impl *This = impl_from_IMLangFontLink2(iface); + FONTSIGNATURE fontsig; + HFONT old_font; + + TRACE("(%p)->(%p %p %p)\n", This, hdc, hfont, codepages); + + old_font = SelectObject(hdc, hfont); + GetTextCharsetInfo(hdc, &fontsig, 0); + SelectObject(hdc, old_font); + + *codepages = fontsig.fsCsb[0]; + TRACE("ret 0x%x\n", fontsig.fsCsb[0]); + + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_ReleaseFont(IMLangFontLink2* This, @@ -3480,21 +3430,21 @@ void** ppvObject) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_QueryInterface( This, riid, ppvObject ); + return IMultiLanguage3_QueryInterface( &This->IMultiLanguage3_iface, riid, ppvObject ); } static ULONG WINAPI fnIMLangLineBreakConsole_AddRef( IMLangLineBreakConsole* iface ) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_AddRef( This ); + return IMultiLanguage3_AddRef( &This->IMultiLanguage3_iface ); } static ULONG WINAPI fnIMLangLineBreakConsole_Release( IMLangLineBreakConsole* iface ) { MLang_impl *This = impl_from_IMLangLineBreakConsole( iface ); - return MLang_Release( This ); + return IMultiLanguage3_Release( &This->IMultiLanguage3_iface ); } static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( @@ -3554,6 +3504,143 @@ fnIMLangLineBreakConsole_BreakLineA }; +struct convert_charset { + IMLangConvertCharset IMLangConvertCharset_iface; + LONG ref; + + UINT src_cp; + UINT dst_cp; +}; + +static inline struct convert_charset *impl_from_IMLangConvertCharset(IMLangConvertCharset *iface) +{ + return CONTAINING_RECORD(iface, struct convert_charset, IMLangConvertCharset_iface); +} + +static HRESULT WINAPI MLangConvertCharset_QueryInterface(IMLangConvertCharset *iface, REFIID riid, void **obj) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMLangConvertCharset)) + { + *obj = &This->IMLangConvertCharset_iface; + IMLangConvertCharset_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI MLangConvertCharset_AddRef(IMLangConvertCharset *iface) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI MLangConvertCharset_Release(IMLangConvertCharset *iface) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + UnlockModule(); + } + + return ref; +} + +static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface, + UINT src_cp, UINT dst_cp, DWORD prop) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + + TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + + prop &= ~MLCONVCHARF_USEDEFCHAR; + if (prop) + FIXME("property 0x%08x not supported\n", prop); + + This->src_cp = src_cp; + This->dst_cp = dst_cp; + + return S_OK; +} + +static HRESULT WINAPI MLangConvertCharset_GetSourceCodePage(IMLangConvertCharset *iface, UINT *src_cp) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + + TRACE("(%p)->(%p)\n", This, src_cp); + + if (!src_cp) return E_INVALIDARG; + *src_cp = This->src_cp; + return S_OK; +} + +static HRESULT WINAPI MLangConvertCharset_GetDestinationCodePage(IMLangConvertCharset *iface, UINT *dst_cp) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + + TRACE("(%p)->(%p)\n", This, dst_cp); + + if (!dst_cp) return E_INVALIDARG; + *dst_cp = This->dst_cp; + return S_OK; +} + +static HRESULT WINAPI MLangConvertCharset_GetProperty(IMLangConvertCharset *iface, DWORD *prop) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p): stub\n", This, prop); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversion(IMLangConvertCharset *iface, BYTE *src, + UINT *src_size, BYTE *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + FIXME("(%p)->(%p %p %p %p): stub\n", This, src, src_size, dest, dest_size); + return E_NOTIMPL; +} + +static HRESULT WINAPI MLangConvertCharset_DoConversionToUnicode(IMLangConvertCharset *iface, CHAR *src, + UINT *src_size, WCHAR *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + TRACE("(%p)->(%p %p %p %p)\n", This, src, src_size, dest, dest_size); + return ConvertINetMultiByteToUnicode(NULL, This->src_cp, src, (INT*)src_size, dest, (INT*)dest_size); +} + +static HRESULT WINAPI MLangConvertCharset_DoConversionFromUnicode(IMLangConvertCharset *iface, + WCHAR *src, UINT *src_size, CHAR *dest, UINT *dest_size) +{ + struct convert_charset *This = impl_from_IMLangConvertCharset(iface); + TRACE("(%p)->(%p %p %p %p)\n", This, src, src_size, dest, dest_size); + return ConvertINetUnicodeToMultiByte(NULL, This->dst_cp, src, (INT*)src_size, dest, (INT*)dest_size); +} + +static const IMLangConvertCharsetVtbl MLangConvertCharsetVtbl = +{ + MLangConvertCharset_QueryInterface, + MLangConvertCharset_AddRef, + MLangConvertCharset_Release, + MLangConvertCharset_Initialize, + MLangConvertCharset_GetSourceCodePage, + MLangConvertCharset_GetDestinationCodePage, + MLangConvertCharset_GetProperty, + MLangConvertCharset_DoConversion, + MLangConvertCharset_DoConversionToUnicode, + MLangConvertCharset_DoConversionFromUnicode +}; + static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) { MLang_impl *mlang; @@ -3579,8 +3666,30 @@ mlang->total_scripts = sizeof(mlang_data)/sizeof(mlang_data[0]) - 1; mlang->ref = 1; - *ppObj = mlang; + *ppObj = &mlang->IMultiLanguage_iface; TRACE("returning %p\n", mlang); + + LockModule(); + + return S_OK; +} + +static HRESULT MLangConvertCharset_create(IUnknown *outer, void **obj) +{ + struct convert_charset *convert; + + if (outer) + return CLASS_E_NOAGGREGATION; + + *obj = NULL; + + convert = HeapAlloc(GetProcessHeap(), 0, sizeof(struct convert_charset)); + if (!convert) return E_OUTOFMEMORY; + + convert->IMLangConvertCharset_iface.lpVtbl = &MLangConvertCharsetVtbl; + convert->ref = 1; + + *obj = &convert->IMLangConvertCharset_iface; LockModule(); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 13:08:12 2013 @@ -102,7 +102,7 @@ reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.1 reactos/dll/win32/mciseq # Synced to Wine-1.7.1 reactos/dll/win32/mciwave # Synced to Wine-1.5.19 -reactos/dll/win32/mlang # Synced to Wine-1.5.4 +reactos/dll/win32/mlang # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Autosync reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/msacm32 # Autosync

1 0

[akhaldi] 60273: [MCISEQ] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:01:56 2013 New Revision: 60273 URL: http://svn.reactos.org/svn/reactos?rev=60273&view=rev Log: [MCISEQ] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mciseq/CMakeLists.txt trunk/reactos/dll/win32/mciseq/mcimidi.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciseq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciseq/CMakeLists.txt [iso-8859-1] Sat Sep 21 13:01:56 2013 @@ -9,12 +9,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/mciseq.def) add_library(mciseq SHARED ${SOURCE}) - set_module_type(mciseq win32dll) - target_link_libraries(mciseq wine) -add_importlibs(mciseq msvcrt winmm user32 kernel32 ntdll) -add_dependencies(mciseq psdk) +add_importlibs(mciseq winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET mciseq DESTINATION reactos/system32 FOR all) if(NOT MSVC) Modified: trunk/reactos/dll/win32/mciseq/mcimidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciseq/mcimidi.c… ============================================================================== --- trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciseq/mcimidi.c [iso-8859-1] Sat Sep 21 13:01:56 2013 @@ -64,6 +64,7 @@ HMIDI hMidi; int nUseCount; /* Incremented for each shared open */ HANDLE hCallback; /* Callback handle for pending notification */ + HANDLE hThread; /* Player thread */ HMMIO hFile; /* mmio file handle open as Element */ LPWSTR lpstrElementName; /* Name of file (if any) */ LPWSTR lpstrCopyright; @@ -79,82 +80,29 @@ MCI_MIDITRACK* tracks; /* Content of each track */ DWORD dwPulse; DWORD dwPositionMS; + DWORD dwEndMS; DWORD dwStartTicks; } WINE_MCIMIDI; - -/* =================================================================== - * =================================================================== - * FIXME: should be using the new mmThreadXXXX functions from WINMM - * instead of those - * it would require to add a wine internal flag to mmThreadCreate - * in order to pass a 32 bit function instead of a 16 bit - * =================================================================== - * =================================================================== */ - -struct SCA { - UINT wDevID; - UINT wMsg; - DWORD_PTR dwParam1; - DWORD_PTR dwParam2; -}; - -/* EPP DWORD WINAPI mciSendCommandA(UINT wDevID, UINT wMsg, DWORD dwParam1, DWORD dwParam2); */ - -/************************************************************************** - * MCI_SCAStarter [internal] - */ -static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) -{ - struct SCA* sca = arg; - DWORD ret; - - TRACE("In thread before async command (%08x,%u,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - ret = mciSendCommandA(sca->wDevID, sca->wMsg, sca->dwParam1 | MCI_WAIT, sca->dwParam2); - TRACE("In thread after async command (%08x,%u,%08lx,%08lx)\n", - sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); - HeapFree(GetProcessHeap(), 0, sca); - return ret; -} - -/************************************************************************** - * MCI_SendCommandAsync [internal] - */ -static DWORD MCI_SendCommandAsync(UINT wDevID, UINT wMsg, DWORD_PTR dwParam1, - DWORD_PTR dwParam2, UINT size) -{ - HANDLE handle; - struct SCA* sca = HeapAlloc(GetProcessHeap(), 0, sizeof(struct SCA) + size); - - if (sca == 0) - return MCIERR_OUT_OF_MEMORY; - - sca->wDevID = wDevID; - sca->wMsg = wMsg; - sca->dwParam1 = dwParam1; - - if (size && dwParam2) { - sca->dwParam2 = (DWORD_PTR)sca + sizeof(struct SCA); - /* copy structure passed by program in dwParam2 to be sure - * we can still use it whatever the program does - */ - memcpy((LPVOID)sca->dwParam2, (LPVOID)dwParam2, size); - } else { - sca->dwParam2 = dwParam2; - } - - if ((handle = CreateThread(NULL, 0, MCI_SCAStarter, sca, 0, NULL)) == 0) { - WARN("Couldn't allocate thread for async command handling, sending synchronously\n"); - return MCI_SCAStarter(sca); - } - SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); - CloseHandle(handle); - return 0; -} /*======================================================================* * MCI MIDI implementation * *======================================================================*/ + +static DWORD mmr2mci(DWORD ret) +{ + switch (ret) { + case MMSYSERR_ALLOCATED: + return MCIERR_SEQ_PORT_INUSE; + case MMSYSERR_NOMEM: + return MCIERR_OUT_OF_MEMORY; + case MMSYSERR_BADDEVICEID: /* wine*.drv disabled */ + return MCIERR_SEQ_PORT_NONEXISTENT; + case MIDIERR_INVALIDSETUP: /* from midimap.dll without snd-seq module */ + return MCIERR_SEQ_PORT_MAPNODEVICE; + default: + return ret; + } +} static DWORD MIDI_mciResume(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms); @@ -233,8 +181,7 @@ { DWORD ret = 0; - if (lpbyt == NULL || - mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { + if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) { WARN("Error reading wmm=%p\n", wmm); ret = MCIERR_INVALID_FILE; } @@ -250,8 +197,7 @@ BYTE hibyte, lobyte; DWORD ret = MCIERR_INVALID_FILE; - if (lpw != NULL && - MIDI_mciReadByte(wmm, &hibyte) == 0 && + if (MIDI_mciReadByte(wmm, &hibyte) == 0 && MIDI_mciReadByte(wmm, &lobyte) == 0) { *lpw = ((WORD)hibyte << 8) + lobyte; ret = 0; @@ -267,8 +213,7 @@ WORD hiword, loword; DWORD ret = MCIERR_INVALID_FILE; - if (lpdw != NULL && - MIDI_mciReadWord(wmm, &hiword) == 0 && + if (MIDI_mciReadWord(wmm, &hiword) == 0 && MIDI_mciReadWord(wmm, &loword) == 0) { *lpdw = MAKELONG(loword, hiword); ret = 0; @@ -283,24 +228,17 @@ { BYTE byte; DWORD value = 0; - WORD ret = 0; - - if (lpdw == NULL) { - ret = MCIERR_INVALID_FILE; - } else { - do { - if (MIDI_mciReadByte(wmm, &byte) != 0) { - return 0; - } - value = (value << 7) + (byte & 0x7F); - ret++; - } while (byte & 0x80); - *lpdw = value; - /* - TRACE("val=%08X\n", value); - */ - } - return ret; + WORD len = 0; + + do { + if (MIDI_mciReadByte(wmm, &byte) != 0) { + return 0; + } + value = (value << 7) + (byte & 0x7F); + len++; + } while (byte & 0x80); + *lpdw = value; + return len; } /************************************************************************** @@ -411,10 +349,7 @@ switch (LOWORD(mmt->dwEventData)) { case 0x02FF: case 0x03FF: - /* position after meta data header */ - mmioSeek(wmm->hFile, mmt->dwIndex + HIWORD(mmt->dwEventData), SEEK_SET); len = mmt->wEventLength - HIWORD(mmt->dwEventData); - if (len >= sizeof(buf)) { WARN("Buffer for text is too small (%u are needed)\n", len); len = sizeof(buf) - 1; @@ -425,20 +360,20 @@ case 0x02: if (wmm->lpstrCopyright) { WARN("Two copyright notices (%s|%s)\n", debugstr_w(wmm->lpstrCopyright), buf); - } else { - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); + HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); } + len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); + wmm->lpstrCopyright = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrCopyright, len ); break; case 0x03: if (wmm->lpstrName) { WARN("Two names (%s|%s)\n", debugstr_w(wmm->lpstrName), buf); - } else { - len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); - wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); - } + HeapFree(GetProcessHeap(), 0, wmm->lpstrName); + } /* last name or name from last track wins */ + len = MultiByteToWideChar( CP_ACP, 0, buf, -1, NULL, 0 ); + wmm->lpstrName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, buf, -1, wmm->lpstrName, len ); break; } } @@ -555,10 +490,10 @@ return MCIERR_INVALID_FILE; } - if (wmm->nTracks & 0x8000) { - /* this shouldn't be a problem... */ - WARN("Ouch !! Implementation limitation to 32k tracks per MIDI file is overflowed\n"); - wmm->nTracks = 0x7FFF; + if (wmm->nTracks > 0x80) { + /* wTrackNr is 7 bits only */ + FIXME("Truncating MIDI file with %u tracks\n", wmm->nTracks); + wmm->nTracks = 0x80; } if ((wmm->tracks = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_MIDITRACK) * wmm->nTracks)) == NULL) { @@ -809,6 +744,10 @@ if (wmm->hFile != 0) mmioClose(wmm->hFile, 0); wmm->hFile = 0; + HeapFree(GetProcessHeap(), 0, wmm->tracks); + HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); + HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); + HeapFree(GetProcessHeap(), 0, wmm->lpstrName); } else { wmm->dwPositionMS = 0; wmm->dwStatus = MCI_MODE_STOP; @@ -839,8 +778,8 @@ if (oldstat == MCI_MODE_PAUSE) dwRet = midiOutReset((HMIDIOUT)wmm->hMidi); - while (wmm->dwStatus != MCI_MODE_STOP) - Sleep(10); + if ((dwFlags & MCI_WAIT) && wmm->hThread) + WaitForSingleObject(wmm->hThread, INFINITE); } /* sanity reset */ @@ -871,6 +810,7 @@ wmm->hFile = 0; TRACE("hFile closed !\n"); } + if (wmm->hThread) CloseHandle(wmm->hThread); HeapFree(GetProcessHeap(), 0, wmm->tracks); HeapFree(GetProcessHeap(), 0, wmm->lpstrElementName); HeapFree(GetProcessHeap(), 0, wmm->lpstrCopyright); @@ -911,55 +851,15 @@ } /************************************************************************** - * MIDI_mciPlay [internal] - */ -static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) -{ - DWORD dwStartMS, dwEndMS; - DWORD dwRet = 0; + * MIDI_player [internal] + */ +static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) +{ + DWORD dwRet; WORD doPlay, nt; MCI_MIDITRACK* mmt; - DWORD hiPulse; - HANDLE oldcb; - - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); - - if (wmm->hFile == 0) { - WARN("Can't play: no file %s!\n", debugstr_w(wmm->lpstrElementName)); - return MCIERR_FILE_NOT_FOUND; - } - - if (wmm->dwStatus != MCI_MODE_STOP) { - if (wmm->dwStatus == MCI_MODE_PAUSE) { - /* FIXME: parameters (start/end) in lpParams may not be used */ - return MIDI_mciResume(wmm, dwFlags, (LPMCI_GENERIC_PARMS)lpParms); - } - WARN("Can't play: device is not stopped !\n"); - return MCIERR_INTERNAL; - } - - if (!(dwFlags & MCI_WAIT)) { - return MCI_SendCommandAsync(wmm->wDevID, MCI_PLAY, dwFlags, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); - } - - if (lpParms && (dwFlags & MCI_FROM)) { - dwStartMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwFrom); - } else { - dwStartMS = wmm->dwPositionMS; - } - - if (lpParms && (dwFlags & MCI_TO)) { - dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); - } else { - dwEndMS = 0xFFFFFFFFul; - } - - TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); - - oldcb = InterlockedExchangePointer(&wmm->hCallback, - (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); - if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); - oldcb = NULL; + DWORD hiPulse, dwStartMS = wmm->dwPositionMS; + HANDLE oldcb = NULL; /* init tracks */ for (nt = 0; nt < wmm->nTracks; nt++) { @@ -977,12 +877,11 @@ dwRet = midiOutOpen((LPHMIDIOUT)&wmm->hMidi, wmm->wPort, 0L, 0L, CALLBACK_NULL); if (dwRet != MMSYSERR_NOERROR) { - return dwRet; + return mmr2mci(dwRet); } wmm->dwPulse = 0; wmm->dwTempo = 500000; - wmm->dwStatus = MCI_MODE_PLAY; wmm->dwPositionMS = 0; wmm->wStartedPlaying = FALSE; @@ -992,7 +891,7 @@ */ while (((volatile WINE_MCIMIDI*)wmm)->dwStatus == MCI_MODE_PAUSE); - doPlay = (wmm->dwPositionMS >= dwStartMS && wmm->dwPositionMS <= dwEndMS); + doPlay = (wmm->dwPositionMS >= dwStartMS && wmm->dwPositionMS <= wmm->dwEndMS); TRACE("wmm->dwStatus=%d, doPlay=%c\n", wmm->dwStatus, doPlay ? 'T' : 'F'); @@ -1187,6 +1086,106 @@ /* Let the potentially asynchronous commands support FAILURE notification. */ if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); + return mmr2mci(dwRet); +} + +static DWORD CALLBACK MIDI_Starter(void *ptr) +{ + WINE_MCIMIDI* wmm = ptr; + return MIDI_player(wmm, MCI_NOTIFY); +} + +static DWORD ensurePlayerThread(WINE_MCIMIDI* wmm) +{ + if (1) { + DWORD dwRet; + + switch (wmm->dwStatus) { + default: + return MCIERR_NONAPPLICABLE_FUNCTION; + case MCI_MODE_PAUSE: + return MIDI_mciResume(wmm, 0, NULL); + case MCI_MODE_PLAY: + /* the player was not stopped, use it */ + return 0; + case MCI_MODE_STOP: + break; + } + wmm->dwStatus = MCI_MODE_PLAY; + if (wmm->hThread) { + WaitForSingleObject(wmm->hThread, INFINITE); + CloseHandle(wmm->hThread); + wmm->hThread = 0; + } + wmm->hThread = CreateThread(NULL, 0, MIDI_Starter, wmm, 0, NULL); + if (!wmm->hThread) { + dwRet = MCIERR_OUT_OF_MEMORY; + } else { + SetThreadPriority(wmm->hThread, THREAD_PRIORITY_TIME_CRITICAL); + dwRet = 0; + } + if (dwRet) + wmm->dwStatus = MCI_MODE_STOP; + return dwRet; + } +} + +/************************************************************************** + * MIDI_mciPlay [internal] + */ +static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ + DWORD dwStartMS, dwEndMS; + DWORD dwRet; + HANDLE oldcb; + + TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + + if (wmm->hFile == 0) { + WARN("Can't play: no file %s!\n", debugstr_w(wmm->lpstrElementName)); + return MCIERR_FILE_NOT_FOUND; + } + + if (lpParms && (dwFlags & MCI_TO)) { + dwEndMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); + /* FIXME: if (dwEndMS > length) return MCIERR_OUTOFRANGE; */ + } else { + dwEndMS = 0xFFFFFFFFul; /* FIXME: dwEndMS = length; */ + } + if (lpParms && (dwFlags & MCI_FROM)) { + dwStartMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwFrom); + } else { + dwStartMS = wmm->dwPositionMS; + } + if (dwEndMS < dwStartMS) + return MCIERR_OUTOFRANGE; + + if (dwFlags & MCI_FROM) { + /* Stop with MCI_NOTIFY_ABORTED and set new position. */ + MIDI_mciStop(wmm, MCI_WAIT, NULL); + wmm->dwPositionMS = dwStartMS; + } /* else use existing player. */ + if (wmm->dwEndMS != dwEndMS) { + oldcb = InterlockedExchangePointer(&wmm->hCallback, NULL); + if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_ABORTED); + wmm->dwEndMS = dwEndMS; + } + + TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); + + if ((dwFlags & MCI_NOTIFY) && lpParms) { + oldcb = InterlockedExchangePointer(&wmm->hCallback, HWND_32(LOWORD(lpParms->dwCallback))); + if (oldcb) mciDriverNotify(oldcb, wmm->wDevID, MCI_NOTIFY_SUPERSEDED); + } + + dwRet = ensurePlayerThread(wmm); + + if (!dwRet && (dwFlags & MCI_WAIT)) { + WaitForSingleObject(wmm->hThread, INFINITE); + GetExitCodeThread(wmm->hThread, &dwRet); + /* STATUS_PENDING cannot happen. It folds onto MCIERR_UNRECOGNIZED_KEYWORD */ + } + /* The player thread performs notification at exit. */ return dwRet; } @@ -1331,13 +1330,14 @@ case MCI_STATUS_LENGTH: if ((dwFlags & MCI_TRACK) && wmm->wFormat == 2) { if (lpParms->dwTrack >= wmm->nTracks) - return MCIERR_BAD_INTEGER; + return MCIERR_OUTOFRANGE; /* FIXME: this is wrong if there is a tempo change inside the file */ lpParms->dwReturn = MIDI_ConvertPulseToMS(wmm, wmm->tracks[lpParms->dwTrack].dwLength); } else { lpParms->dwReturn = MIDI_GetMThdLengthMS(wmm); } lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, lpParms->dwReturn); + /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: @@ -1355,9 +1355,10 @@ TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: - /* FIXME: do I need to use MCI_TRACK ? */ + /* FIXME: check MCI_TRACK == 1 if set */ lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, (dwFlags & MCI_STATUS_START) ? 0 : wmm->dwPositionMS); + /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ TRACE("MCI_STATUS_POSITION %s => %lu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; @@ -1375,7 +1376,7 @@ case MCI_SEQ_STATUS_DIVTYPE: TRACE("MCI_SEQ_STATUS_DIVTYPE !\n"); if (wmm->nDivision > 0x8000) { - switch (wmm->nDivision) { + switch (HIBYTE(wmm->nDivision)) { case 0xE8: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_24; break; /* -24 */ case 0xE7: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_25; break; /* -25 */ case 0xE3: lpParms->dwReturn = MCI_SEQ_DIV_SMPTE_30DROP; break; /* -29 */ /* is the MCI constant correct ? */ @@ -1390,11 +1391,13 @@ break; case MCI_SEQ_STATUS_MASTER: TRACE("MCI_SEQ_STATUS_MASTER !\n"); - lpParms->dwReturn = 0; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_SEQ_NONE, MCI_SEQ_NONE_S); + ret = MCI_RESOURCE_RETURNED; break; case MCI_SEQ_STATUS_SLAVE: TRACE("MCI_SEQ_STATUS_SLAVE !\n"); - lpParms->dwReturn = 0; + lpParms->dwReturn = MAKEMCIRESOURCE(MCI_SEQ_FILE, MCI_SEQ_FILE_S); + ret = MCI_RESOURCE_RETURNED; break; case MCI_SEQ_STATUS_OFFSET: TRACE("MCI_SEQ_STATUS_OFFSET !\n"); @@ -1415,11 +1418,10 @@ break; default: FIXME("Unknown command %08X !\n", lpParms->dwItem); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_UNSUPPORTED_FUNCTION; } } else { - WARN("No Status-Item!\n"); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_MISSING_PARAMETER; } if ((dwFlags & MCI_NOTIFY) && HRESULT_CODE(ret)==0) MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); @@ -1521,7 +1523,7 @@ case MCI_INFO_NAME: str = wmm->lpstrName; break; default: WARN("Don't know this info command (%u)\n", dwFlags); - return MCIERR_UNRECOGNIZED_COMMAND; + return MCIERR_MISSING_PARAMETER; /* not MCIERR_FLAGS_... */ } if (!ret) { if (lpParms->dwRetSize) { @@ -1541,32 +1543,32 @@ */ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { - DWORD ret = 0; + DWORD position; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); - if (lpParms == NULL) { - ret = MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + position = dwFlags & (MCI_SEEK_TO_START|MCI_SEEK_TO_END|MCI_TO); + if (!position) return MCIERR_MISSING_PARAMETER; + if (position&(position-1)) return MCIERR_FLAGS_NOT_COMPATIBLE; + + MIDI_mciStop(wmm, MCI_WAIT, 0); + + if (dwFlags & MCI_TO) { /* FIXME: compare with length */ + wmm->dwPositionMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); + } else if (dwFlags & MCI_SEEK_TO_START) { + wmm->dwPositionMS = 0; } else { - MIDI_mciStop(wmm, MCI_WAIT, 0); - - if (dwFlags & MCI_SEEK_TO_START) { - wmm->dwPositionMS = 0; - } else if (dwFlags & MCI_SEEK_TO_END) { - wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ - } else if (dwFlags & MCI_TO) { - wmm->dwPositionMS = MIDI_ConvertTimeFormatToMS(wmm, lpParms->dwTo); - } else { - WARN("dwFlag doesn't tell where to seek to...\n"); - return MCIERR_MISSING_PARAMETER; - } - - TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); - - if (dwFlags & MCI_NOTIFY) - MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); - } - return ret; + wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ + } + + TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); + + if (dwFlags & MCI_NOTIFY) + MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL); + + return 0; } /*======================================================================* Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 13:01:56 2013 @@ -100,7 +100,7 @@ reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 reactos/dll/win32/mcicda # Synced to Wine-1.5.19 reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.1 -reactos/dll/win32/mciseq # Synced to Wine-1.5.4 +reactos/dll/win32/mciseq # Synced to Wine-1.7.1 reactos/dll/win32/mciwave # Synced to Wine-1.5.19 reactos/dll/win32/mlang # Synced to Wine-1.5.4 reactos/dll/win32/mpr # Autosync

1 0

[hbelusca] 60272: [KERNEL32]: - Revert r60250 (which was here just to test something in all of the test bots). - Display which file we wanted to execute, when seeing that it wasn't an executable fi...
by hbelusca＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: hbelusca Date: Sat Sep 21 13:00:48 2013 New Revision: 60272 URL: http://svn.reactos.org/svn/reactos?rev=60272&view=rev Log: [KERNEL32]: - Revert r60250 (which was here just to test something in all of the test bots). - Display which file we wanted to execute, when seeing that it wasn't an executable file nor a .bat or .cmd file. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Sep 21 13:00:48 2013 @@ -629,10 +629,10 @@ /* Create the Parameter Block */ ProcessParameters = NULL; - DPRINT1("ImageName: '%wZ'\n", &ImageName); + DPRINT("ImageName: '%wZ'\n", &ImageName); DPRINT("DllPath : '%wZ'\n", &DllPath); DPRINT("CurDir : '%wZ'\n", &CurrentDirectory); - DPRINT1("CmdLine : '%wZ'\n", &CommandLine); + DPRINT("CmdLine : '%wZ'\n", &CommandLine); DPRINT("Title : '%wZ'\n", &Title); DPRINT("Desktop : '%wZ'\n", &Desktop); DPRINT("Shell : '%wZ'\n", &Shell); @@ -3440,7 +3440,7 @@ ((_wcsnicmp(ExtBuffer, L".bat", 4)) && (_wcsnicmp(ExtBuffer, L".cmd", 4)))) { - DPRINT1("Invalid EXE, and not a batch or script file\n"); + DPRINT1("'%wZ': Invalid EXE, and not a batch or script file\n", &PathName); SetLastError(ERROR_BAD_EXE_FORMAT); Result = FALSE; goto Quickie;

1 0

[akhaldi] 60271: [PSDK] * Annotate winhttp.h. CORE-7474
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 13:00:03 2013 New Revision: 60271 URL: http://svn.reactos.org/svn/reactos?rev=60271&view=rev Log: [PSDK] * Annotate winhttp.h. CORE-7474 Modified: trunk/reactos/include/psdk/winhttp.h Modified: trunk/reactos/include/psdk/winhttp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winhttp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winhttp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winhttp.h [iso-8859-1] Sat Sep 21 13:00:03 2013 @@ -507,7 +507,13 @@ LPWSTR lpszProxyBypass; } WINHTTP_CURRENT_USER_IE_PROXY_CONFIG; -typedef VOID (CALLBACK *WINHTTP_STATUS_CALLBACK)(HINTERNET,DWORD_PTR,DWORD,LPVOID,DWORD); +typedef VOID +(CALLBACK *WINHTTP_STATUS_CALLBACK)( + _In_ HINTERNET, + _In_ DWORD_PTR, + _In_ DWORD, + _In_ LPVOID, + _In_ DWORD); #define WINHTTP_AUTO_DETECT_TYPE_DHCP 0x00000001 #define WINHTTP_AUTO_DETECT_TYPE_DNS_A 0x00000002 @@ -546,34 +552,217 @@ extern "C" { #endif -BOOL WINAPI WinHttpAddRequestHeaders(HINTERNET,LPCWSTR,DWORD,DWORD); -BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD,LPWSTR*); +BOOL +WINAPI +WinHttpAddRequestHeaders( + _In_ HINTERNET, + _When_(dwHeadersLength == (DWORD)-1, _In_z_) + _When_(dwHeadersLength != (DWORD)-1, _In_reads_(dwHeadersLength)) + LPCWSTR, + _In_ DWORD dwHeadersLength, + _In_ DWORD); + +BOOL +WINAPI +WinHttpDetectAutoProxyConfigUrl( + _In_ DWORD, + _Outptr_result_maybenull_ LPWSTR*); + BOOL WINAPI WinHttpCheckPlatform(void); -BOOL WINAPI WinHttpCloseHandle(HINTERNET); -HINTERNET WINAPI WinHttpConnect(HINTERNET,LPCWSTR,INTERNET_PORT,DWORD); -BOOL WINAPI WinHttpCrackUrl(LPCWSTR,DWORD,DWORD,LPURL_COMPONENTS); -BOOL WINAPI WinHttpCreateUrl(LPURL_COMPONENTS,DWORD,LPWSTR,LPDWORD); -BOOL WINAPI WinHttpGetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); -BOOL WINAPI WinHttpGetProxyForUrl(HINTERNET,LPCWSTR,WINHTTP_AUTOPROXY_OPTIONS*,WINHTTP_PROXY_INFO*); -HINTERNET WINAPI WinHttpOpen(LPCWSTR,DWORD,LPCWSTR,LPCWSTR,DWORD); -HINTERNET WINAPI WinHttpOpenRequest(HINTERNET,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR*,DWORD); -BOOL WINAPI WinHttpQueryAuthParams(HINTERNET,DWORD,LPVOID*); -BOOL WINAPI WinHttpQueryAuthSchemes(HINTERNET,LPDWORD,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryDataAvailable(HINTERNET,LPDWORD); -BOOL WINAPI WinHttpQueryHeaders(HINTERNET,DWORD,LPCWSTR,LPVOID,LPDWORD,LPDWORD); -BOOL WINAPI WinHttpQueryOption(HINTERNET,DWORD,LPVOID,LPDWORD); -BOOL WINAPI WinHttpReadData(HINTERNET,LPVOID,DWORD,LPDWORD); -BOOL WINAPI WinHttpReceiveResponse(HINTERNET,LPVOID); -BOOL WINAPI WinHttpSendRequest(HINTERNET,LPCWSTR,DWORD,LPVOID,DWORD,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetDefaultProxyConfiguration(WINHTTP_PROXY_INFO*); -BOOL WINAPI WinHttpSetCredentials(HINTERNET,DWORD,DWORD,LPCWSTR,LPCWSTR,LPVOID); -BOOL WINAPI WinHttpSetOption(HINTERNET,DWORD,LPVOID,DWORD); -WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback(HINTERNET,WINHTTP_STATUS_CALLBACK,DWORD,DWORD_PTR); -BOOL WINAPI WinHttpSetTimeouts(HINTERNET,int,int,int,int); -BOOL WINAPI WinHttpTimeFromSystemTime(CONST SYSTEMTIME *,LPWSTR); -BOOL WINAPI WinHttpTimeToSystemTime(LPCWSTR,SYSTEMTIME*); -BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); +BOOL WINAPI WinHttpCloseHandle(_In_ HINTERNET); + +HINTERNET +WINAPI +WinHttpConnect( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ INTERNET_PORT, + _Reserved_ DWORD); + +BOOL +WINAPI +WinHttpCrackUrl( + _In_reads_(dwUrlLength) LPCWSTR, + _In_ DWORD dwUrlLength, + _In_ DWORD, + _Inout_ LPURL_COMPONENTS); + +_Success_(return != 0) +BOOL +WINAPI +WinHttpCreateUrl( + _In_ LPURL_COMPONENTS, + _In_ DWORD, + _Out_writes_to_opt_(*pdwUrlLength, *pdwUrlLength) LPWSTR, + _Inout_ LPDWORD pdwUrlLength); + +BOOL +WINAPI +WinHttpGetDefaultProxyConfiguration( + _Inout_ WINHTTP_PROXY_INFO*); + +BOOL +WINAPI +WinHttpGetIEProxyConfigForCurrentUser( + _Inout_ WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*); + +BOOL +WINAPI +WinHttpGetProxyForUrl( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ WINHTTP_AUTOPROXY_OPTIONS*, + _Out_ WINHTTP_PROXY_INFO*); + +HINTERNET +WINAPI +WinHttpOpen( + _In_opt_z_ LPCWSTR, + _In_ DWORD, + _In_opt_z_ LPCWSTR, + _In_opt_z_ LPCWSTR, + _In_ DWORD); + +HINTERNET +WINAPI +WinHttpOpenRequest( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ LPCWSTR*, + _In_ DWORD); + +BOOL +WINAPI +WinHttpQueryAuthParams( + _In_ HINTERNET, + _In_ DWORD, + _Out_ LPVOID*); + +BOOL +WINAPI +WinHttpQueryAuthSchemes( + _In_ HINTERNET, + _Out_ LPDWORD, + _Out_ LPDWORD, + _Out_ LPDWORD); + +BOOL +WINAPI +WinHttpQueryDataAvailable( + _In_ HINTERNET, + __out_data_source(NETWORK) LPDWORD); + +_Success_(return != 0) +BOOL +WINAPI +WinHttpQueryHeaders( + _In_ HINTERNET, + _In_ DWORD, + _In_opt_ LPCWSTR, + _Out_writes_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) __out_data_source(NETWORK) LPVOID, + _Inout_ LPDWORD lpdwBufferLength, + _Inout_ LPDWORD); + +_Success_(return != 0) +BOOL +WINAPI +WinHttpQueryOption( + _In_ HINTERNET, + _In_ DWORD, + _Out_writes_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) __out_data_source(NETWORK) LPVOID, + _Inout_ LPDWORD lpdwBufferLength); + +BOOL +WINAPI +WinHttpReadData( + _In_ HINTERNET, + _Out_writes_bytes_to_(dwNumberOfBytesToRead, *lpdwNumberOfBytesRead) __out_data_source(NETWORK) LPVOID, + _In_ DWORD dwNumberOfBytesToRead, + _Out_ LPDWORD lpdwNumberOfBytesRead); + +BOOL WINAPI WinHttpReceiveResponse(_In_ HINTERNET, _Reserved_ LPVOID); + +BOOL +WINAPI +WinHttpSendRequest( + _In_ HINTERNET, + _In_reads_opt_(dwHeadersLength) LPCWSTR, + _In_ DWORD dwHeadersLength, + _In_reads_bytes_opt_(dwOptionalLength) LPVOID, + _In_ DWORD dwOptionalLength, + _In_ DWORD, + _In_ DWORD_PTR); + +BOOL +WINAPI +WinHttpSetDefaultProxyConfiguration( + _In_ WINHTTP_PROXY_INFO*); + +BOOL +WINAPI +WinHttpSetCredentials( + _In_ HINTERNET, + _In_ DWORD, + _In_ DWORD, + _In_ LPCWSTR, + _In_ LPCWSTR, + _Reserved_ LPVOID); + +BOOL +WINAPI +WinHttpSetOption( + _In_opt_ HINTERNET, + _In_ DWORD dwOption, + _When_((dwOption == WINHTTP_OPTION_USERNAME || + dwOption == WINHTTP_OPTION_PASSWORD || + dwOption == WINHTTP_OPTION_PROXY_USERNAME || + dwOption == WINHTTP_OPTION_PROXY_PASSWORD || + dwOption == WINHTTP_OPTION_USER_AGENT), + _At_((LPCWSTR) lpBuffer, _In_reads_(dwBufferLength))) + _When_((dwOption != WINHTTP_OPTION_USERNAME && + dwOption != WINHTTP_OPTION_PASSWORD && + dwOption != WINHTTP_OPTION_PROXY_USERNAME && + dwOption != WINHTTP_OPTION_PROXY_PASSWORD && + dwOption != WINHTTP_OPTION_USER_AGENT), + _In_reads_bytes_(dwBufferLength)) + LPVOID lpBuffer, + _In_ DWORD dwBufferLength); + +WINHTTP_STATUS_CALLBACK +WINAPI +WinHttpSetStatusCallback( + _In_ HINTERNET, + _In_ WINHTTP_STATUS_CALLBACK, + _In_ DWORD, + _Reserved_ DWORD_PTR); + +BOOL +WINAPI +WinHttpSetTimeouts( + _In_ HINTERNET, + _In_ int, + _In_ int, + _In_ int, + _In_ int); + +BOOL +WINAPI +WinHttpTimeFromSystemTime( + _In_ CONST SYSTEMTIME *, + _Out_writes_bytes_(WINHTTP_TIME_FORMAT_BUFSIZE) LPWSTR); + +BOOL WINAPI WinHttpTimeToSystemTime(_In_z_ LPCWSTR, _Out_ SYSTEMTIME*); + +BOOL +WINAPI +WinHttpWriteData( + _In_ HINTERNET, + _In_reads_bytes_opt_(dwNumberOfBytesToWrite) LPCVOID, + _In_ DWORD dwNumberOfBytesToWrite, + _Out_ LPDWORD); #ifdef __cplusplus }

1 0

[akhaldi] 60270: [MCIQTZ32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 12:59:22 2013 New Revision: 60270 URL: http://svn.reactos.org/svn/reactos?rev=60270&view=rev Log: [MCIQTZ32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc trunk/reactos/dll/win32/mciqtz32/mciqtz.c trunk/reactos/dll/win32/mciqtz32/version.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -6,13 +6,10 @@ list(APPEND SOURCE mciqtz.c - mciavi_res.rc - version.rc ${CMAKE_CURRENT_BINARY_DIR}/mciqtz32.def) -add_library(mciqtz32 SHARED ${SOURCE}) +add_library(mciqtz32 SHARED ${SOURCE} mciavi_res.rc) set_module_type(mciqtz32 win32dll) target_link_libraries(mciqtz32 wine strmiids) -add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll) -add_dependencies(mciqtz32 dxsdk) +add_importlibs(mciqtz32 winmm ole32 user32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciavi_… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciavi_res.rc [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -577,3 +577,5 @@ MCI_ON_S, "on" MCI_OFF_S, "off" END + +#include "version.rc" Modified: trunk/reactos/dll/win32/mciqtz32/mciqtz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/mciqtz.… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/mciqtz.c [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -244,13 +244,13 @@ err: if (wma->vidbasic) - IUnknown_Release(wma->vidbasic); + IBasicVideo_Release(wma->vidbasic); wma->vidbasic = NULL; if (wma->seek) - IUnknown_Release(wma->seek); + IMediaSeeking_Release(wma->seek); wma->seek = NULL; if (wma->vidwin) - IUnknown_Release(wma->vidwin); + IVideoWindow_Release(wma->vidwin); wma->vidwin = NULL; if (wma->pgraph) IGraphBuilder_Release(wma->pgraph); @@ -285,9 +285,9 @@ MCIQTZ_mciStop(wDevID, MCI_WAIT, NULL); if (wma->opened) { - IUnknown_Release(wma->vidwin); - IUnknown_Release(wma->vidbasic); - IUnknown_Release(wma->seek); + IVideoWindow_Release(wma->vidwin); + IBasicVideo_Release(wma->vidbasic); + IMediaSeeking_Release(wma->seek); IMediaEvent_Release(wma->mevent); IGraphBuilder_Release(wma->pgraph); IMediaControl_Release(wma->pmctrl); Modified: trunk/reactos/dll/win32/mciqtz32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/version… ============================================================================== --- trunk/reactos/dll/win32/mciqtz32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciqtz32/version.rc [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_OLESELFREGISTER #define WINE_FILEDESCRIPTION_STR "Wine DirectShow MCI Driver" #define WINE_FILENAME_STR "mciqtz32.dll" #define WINE_FILEVERSION 6,5,1,900 #define WINE_FILEVERSION_STR "6.5.1.900" #define WINE_PRODUCTVERSION 6,5,1,900 #define WINE_PRODUCTVERSION_STR "6.5" +#define WINE_EXTRAVALUES VALUE "OLESelfRegister","" -#include "wine/wine_common_ver.rc" +#include <wine/wine_common_ver.rc> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 12:59:22 2013 @@ -99,7 +99,7 @@ reactos/dll/win32/mapi32 # Synced to Wine-1.7.1 reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 reactos/dll/win32/mcicda # Synced to Wine-1.5.19 -reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4 +reactos/dll/win32/mciqtz32 # Synced to Wine-1.7.1 reactos/dll/win32/mciseq # Synced to Wine-1.5.4 reactos/dll/win32/mciwave # Synced to Wine-1.5.19 reactos/dll/win32/mlang # Synced to Wine-1.5.4

1 0

[akhaldi] 60269: [MCIAVI32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 12:57:03 2013 New Revision: 60269 URL: http://svn.reactos.org/svn/reactos?rev=60269&view=rev Log: [MCIAVI32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mciavi32/CMakeLists.txt trunk/reactos/dll/win32/mciavi32/mciavi.c trunk/reactos/dll/win32/mciavi32/mmoutput.c trunk/reactos/dll/win32/mciavi32/private_mciavi.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mciavi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/CMakeLists.txt [iso-8859-1] Sat Sep 21 12:57:03 2013 @@ -9,10 +9,9 @@ mciavi.c mmoutput.c wnd.c - mciavi_res.rc ${CMAKE_CURRENT_BINARY_DIR}/mciavi32.def) -add_library(mciavi32 SHARED ${SOURCE}) +add_library(mciavi32 SHARED ${SOURCE} mciavi_res.rc) set_module_type(mciavi32 win32dll) target_link_libraries(mciavi32 wine) add_importlibs(mciavi32 msvfw32 winmm user32 gdi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/mciavi32/mciavi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mciavi.… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mciavi.c [iso-8859-1] Sat Sep 21 12:57:03 2013 @@ -87,7 +87,6 @@ InitializeCriticalSection(&wma->cs); wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIAVI.cs"); - wma->ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); @@ -121,7 +120,6 @@ mciSetDriverData(dwDevID, 0); mciFreeCommandResource(wma->wCommandTable); - CloseHandle(wma->ack_event); CloseHandle(wma->hStopEvent); LeaveCriticalSection(&wma->cs); @@ -336,148 +334,33 @@ return dwRet; } -static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms); - -struct MCIAVI_play_data -{ - MCIDEVICEID wDevID; - DWORD flags; - MCI_PLAY_PARMS params; -}; - -/* - * MCIAVI_mciPlay_thread - * - * FIXME: probably should use a common worker thread created at the driver - * load time and queue all async commands to it. - */ -static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) -{ - struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; - DWORD ret; - - TRACE("In thread before async play command (id %08x, flags %08x)\n", data->wDevID, data->flags); - ret = MCIAVI_mciPlay(data->wDevID, data->flags | MCI_WAIT, &data->params); - TRACE("In thread after async play command (id %08x, flags %08x)\n", data->wDevID, data->flags); - - HeapFree(GetProcessHeap(), 0, data); - return ret; -} - -/* - * MCIAVI_mciPlay_async - */ -static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParams) -{ - HANDLE handle, ack_event = wma->ack_event; - struct MCIAVI_play_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct MCIAVI_play_data)); - - if (!data) return MCIERR_OUT_OF_MEMORY; - - data->wDevID = wma->wDevID; - data->flags = dwFlags; - data->params = *lpParams; - - if (!(handle = CreateThread(NULL, 0, MCIAVI_mciPlay_thread, data, 0, NULL))) - { - WARN("Couldn't create thread for async play, playing synchronously\n"); - return MCIAVI_mciPlay_thread(data); - } - SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); - CloseHandle(handle); - /* wait until the thread starts up, so the app could see a changed status */ - WaitForSingleObject(ack_event, INFINITE); - TRACE("Async play has started\n"); - return 0; +static double currenttime_us(void) +{ + LARGE_INTEGER lc, lf; + QueryPerformanceCounter(&lc); + QueryPerformanceFrequency(&lf); + return (lc.QuadPart * 1000000) / lf.QuadPart; } /*************************************************************************** - * MCIAVI_mciPlay [internal] - */ -static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) -{ - WINE_MCIAVI *wma; - DWORD frameTime; + * MCIAVI_player [internal] + */ +static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ DWORD dwRet; LPWAVEHDR waveHdr = NULL; unsigned i, nHdr = 0; - DWORD dwFromFrame, dwToFrame; DWORD numEvents = 1; HANDLE events[2]; - - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - - wma = MCIAVI_mciGetOpenDev(wDevID); - if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; - if (dwFlags & MCI_TEST) return 0; + double next_frame_us; EnterCriticalSection(&wma->cs); - - if (!wma->hFile) - { - LeaveCriticalSection(&wma->cs); - return MCIERR_FILE_NOT_FOUND; - } - if (!wma->hWndPaint) - { - LeaveCriticalSection(&wma->cs); - return MCIERR_NO_WINDOW; - } - - LeaveCriticalSection(&wma->cs); - - if (!(dwFlags & MCI_WAIT)) - return MCIAVI_mciPlay_async(wma, dwFlags, lpParms); - - if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) - ShowWindow(wma->hWndPaint, SW_SHOWNA); - - EnterCriticalSection(&wma->cs); - - dwFromFrame = wma->dwCurrVideoFrame; - dwToFrame = wma->dwPlayableVideoFrames - 1; - - if (dwFlags & MCI_FROM) { - dwFromFrame = MCIAVI_ConvertTimeFormatToFrame(wma, lpParms->dwFrom); - } - if (dwFlags & MCI_TO) { - dwToFrame = MCIAVI_ConvertTimeFormatToFrame(wma, lpParms->dwTo); - } - if (dwToFrame >= wma->dwPlayableVideoFrames) - dwToFrame = wma->dwPlayableVideoFrames - 1; - - TRACE("Playing from frame=%u to frame=%u\n", dwFromFrame, dwToFrame); - - wma->dwCurrVideoFrame = dwFromFrame; - wma->dwToVideoFrame = dwToFrame; - - /* if already playing exit */ - if (wma->dwStatus == MCI_MODE_PLAY) - { - LeaveCriticalSection(&wma->cs); - SetEvent(wma->ack_event); - return 0; - } if (wma->dwToVideoFrame <= wma->dwCurrVideoFrame) { dwRet = 0; - SetEvent(wma->ack_event); goto mci_play_done; } - - wma->dwStatus = MCI_MODE_PLAY; - /* signal the state change */ - SetEvent(wma->ack_event); - - if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN)) - FIXME("Unsupported flag %08x\n", dwFlags); - - /* time is in microseconds, we should convert it to milliseconds */ - frameTime = (wma->mah.dwMicroSecPerFrame + 500) / 1000; events[0] = wma->hStopEvent; if (wma->lpWaveFormat) { @@ -496,39 +379,45 @@ } } + next_frame_us = currenttime_us(); while (wma->dwStatus == MCI_MODE_PLAY) { HDC hDC; - DWORD tc, delta; + double tc, delta; DWORD ret; - tc = GetTickCount(); + tc = currenttime_us(); hDC = wma->hWndPaint ? GetDC(wma->hWndPaint) : 0; if (hDC) { - MCIAVI_PaintFrame(wma, hDC); + while(next_frame_us <= tc && wma->dwCurrVideoFrame < wma->dwToVideoFrame){ + double dur; + ++wma->dwCurrVideoFrame; + dur = MCIAVI_PaintFrame(wma, hDC); + if(!dur) + break; + next_frame_us += dur; + TRACE("next_frame: %f\n", next_frame_us); + } ReleaseDC(wma->hWndPaint, hDC); } + if(wma->dwCurrVideoFrame >= wma->dwToVideoFrame) + break; if (wma->lpWaveFormat) - MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); - - delta = GetTickCount() - tc; - if (delta < frameTime) - delta = frameTime - delta; + MCIAVI_PlayAudioBlocks(wma, nHdr, waveHdr); + + tc = currenttime_us(); + if(tc < next_frame_us) + delta = next_frame_us - tc; else delta = 0; LeaveCriticalSection(&wma->cs); - ret = WaitForMultipleObjects(numEvents, events, FALSE, delta); + ret = WaitForMultipleObjects(numEvents, events, FALSE, delta / 1000); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; - - if (wma->dwCurrVideoFrame < dwToFrame) - wma->dwCurrVideoFrame++; - else - break; } if (wma->lpWaveFormat) { @@ -568,9 +457,142 @@ if (dwFlags & MCI_NOTIFY) { TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), - wDevID, MCI_NOTIFY_SUCCESSFUL); + wma->wDevID, MCI_NOTIFY_SUCCESSFUL); } LeaveCriticalSection(&wma->cs); + return dwRet; +} + +struct MCIAVI_play_data +{ + WINE_MCIAVI *wma; + DWORD flags; + MCI_PLAY_PARMS params; /* FIXME: notify via wma->hCallback like the other MCI drivers */ +}; + +/* + * MCIAVI_mciPlay_thread + * + * FIXME: probably should use a common worker thread created at the driver + * load time and queue all async commands to it. + */ +static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) +{ + struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; + DWORD ret; + + TRACE("In thread before async play command (id %u, flags %08x)\n", data->wma->wDevID, data->flags); + ret = MCIAVI_player(data->wma, data->flags, &data->params); + TRACE("In thread after async play command (id %u, flags %08x)\n", data->wma->wDevID, data->flags); + + HeapFree(GetProcessHeap(), 0, data); + return ret; +} + +/* + * MCIAVI_mciPlay_async + */ +static DWORD MCIAVI_mciPlay_async(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpParams) +{ + HANDLE handle; + struct MCIAVI_play_data *data = HeapAlloc(GetProcessHeap(), 0, sizeof(struct MCIAVI_play_data)); + + if (!data) return MCIERR_OUT_OF_MEMORY; + + data->wma = wma; + data->flags = dwFlags; + if (dwFlags & MCI_NOTIFY) + data->params.dwCallback = lpParams->dwCallback; + + if (!(handle = CreateThread(NULL, 0, MCIAVI_mciPlay_thread, data, 0, NULL))) + { + WARN("Couldn't create thread for async play, playing synchronously\n"); + return MCIAVI_mciPlay_thread(data); + } + SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); + return 0; +} + +/*************************************************************************** + * MCIAVI_mciPlay [internal] + */ +static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) +{ + WINE_MCIAVI *wma; + DWORD dwRet; + DWORD dwFromFrame, dwToFrame; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIAVI_mciGetOpenDev(wDevID); + if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + if (dwFlags & MCI_DGV_PLAY_REVERSE) return MCIERR_UNSUPPORTED_FUNCTION; + if (dwFlags & MCI_TEST) return 0; + + if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN|MCI_MCIAVI_PLAY_FULLBY2)) + FIXME("Unsupported flag %08x\n", dwFlags); + + EnterCriticalSection(&wma->cs); + + if (!wma->hFile) + { + LeaveCriticalSection(&wma->cs); + return MCIERR_FILE_NOT_FOUND; + } + if (!wma->hWndPaint) + { + LeaveCriticalSection(&wma->cs); + return MCIERR_NO_WINDOW; + } + + dwFromFrame = wma->dwCurrVideoFrame; + dwToFrame = wma->dwPlayableVideoFrames - 1; + + if (dwFlags & MCI_FROM) { + dwFromFrame = MCIAVI_ConvertTimeFormatToFrame(wma, lpParms->dwFrom); + } + if (dwFlags & MCI_TO) { + dwToFrame = MCIAVI_ConvertTimeFormatToFrame(wma, lpParms->dwTo); + } + if (dwToFrame >= wma->dwPlayableVideoFrames) + dwToFrame = wma->dwPlayableVideoFrames - 1; + + TRACE("Playing from frame=%u to frame=%u\n", dwFromFrame, dwToFrame); + + wma->dwCurrVideoFrame = dwFromFrame; + wma->dwToVideoFrame = dwToFrame; + + LeaveCriticalSection(&wma->cs); + + if (!(GetWindowLongW(wma->hWndPaint, GWL_STYLE) & WS_VISIBLE)) + ShowWindow(wma->hWndPaint, SW_SHOWNA); + + EnterCriticalSection(&wma->cs); + + /* if already playing exit */ + if (wma->dwStatus == MCI_MODE_PLAY) + { + LeaveCriticalSection(&wma->cs); + return 0; + } + + wma->dwStatus = MCI_MODE_PLAY; + + LeaveCriticalSection(&wma->cs); + + if (dwFlags & MCI_WAIT) + return MCIAVI_player(wma, dwFlags, lpParms); + + dwRet = MCIAVI_mciPlay_async(wma, dwFlags, lpParms); + + if (dwRet) { + EnterCriticalSection(&wma->cs); + wma->dwStatus = MCI_MODE_STOP; + LeaveCriticalSection(&wma->cs); + } return dwRet; } Modified: trunk/reactos/dll/win32/mciavi32/mmoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/mmoutpu… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/mmoutput.c [iso-8859-1] Sat Sep 21 12:57:03 2013 @@ -600,20 +600,20 @@ } } -LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) +double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) { void* pBitmapData; LPBITMAPINFO pBitmapInfo; if (!hDC || !wma->inbih) - return TRUE; + return 0; TRACE("Painting frame %u (cached %u)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { if (!wma->lpVideoIndex[wma->dwCurrVideoFrame].dwOffset) - return FALSE; + return 0; if (wma->lpVideoIndex[wma->dwCurrVideoFrame].dwSize) { @@ -626,7 +626,7 @@ wma->outbih, wma->outdata) != ICERR_OK) { WARN("Decompression error\n"); - return FALSE; + return 0; } } @@ -648,5 +648,5 @@ wma->source.right - wma->source.left, wma->source.bottom - wma->source.top, pBitmapData, pBitmapInfo, DIB_RGB_COLORS, SRCCOPY); - return TRUE; -} + return (wma->ash_video.dwScale / (double)wma->ash_video.dwRate) * 1000000; +} Modified: trunk/reactos/dll/win32/mciavi32/private_mciavi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciavi32/private… ============================================================================== --- trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciavi32/private_mciavi.h [iso-8859-1] Sat Sep 21 12:57:03 2013 @@ -83,7 +83,6 @@ /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent; - HANDLE ack_event; /* acknowledge that an async command has started */ } WINE_MCIAVI; extern HINSTANCE MCIAVI_hInstance DECLSPEC_HIDDEN; @@ -100,7 +99,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) DECLSPEC_HIDDEN; BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) DECLSPEC_HIDDEN; void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) DECLSPEC_HIDDEN; -LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; +double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) DECLSPEC_HIDDEN; /* mciavi.c */ WINE_MCIAVI* MCIAVI_mciGetOpenDev(UINT wDevID) DECLSPEC_HIDDEN; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 12:57:03 2013 @@ -97,7 +97,7 @@ reactos/dll/win32/localui # Synced to Wine-1.7.1 reactos/dll/win32/lz32 # Synced to Wine-1.5.19 reactos/dll/win32/mapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/mciavi32 # Synced to Wine-1.5.4 +reactos/dll/win32/mciavi32 # Synced to Wine-1.7.1 reactos/dll/win32/mcicda # Synced to Wine-1.5.19 reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4 reactos/dll/win32/mciseq # Synced to Wine-1.5.4

1 0

[akhaldi] 60268: [MAPI32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 12:54:15 2013 New Revision: 60268 URL: http://svn.reactos.org/svn/reactos?rev=60268&view=rev Log: [MAPI32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/mapi32/CMakeLists.txt trunk/rostests/winetests/mapi32/prop.c trunk/rostests/winetests/mapi32/testlist.c trunk/rostests/winetests/mapi32/util.c Modified: trunk/rostests/winetests/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/CMakeLists.txt [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -1,7 +1,3 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) list(APPEND SOURCE imalloc.c @@ -10,7 +6,6 @@ testlist.c) add_executable(mapi32_winetest ${SOURCE}) -target_link_libraries(mapi32_winetest wine uuid) set_module_type(mapi32_winetest win32cui) -add_importlibs(mapi32_winetest advapi32 msvcrt kernel32 ntdll) +add_importlibs(mapi32_winetest advapi32 msvcrt kernel32) add_cd_file(TARGET mapi32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/prop.c?r… ============================================================================== --- trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/prop.c [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -690,11 +690,11 @@ pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]); ok(pRet == &pvProp, - "PpropFindProp[%d]: Didn't find existing propery\n", + "PpropFindProp[%d]: Didn't find existing property\n", ptTypes[i]); pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]); - ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent propery\n", + ok(pRet == NULL, "PpropFindProp[%d]: Found nonexistent property\n", ptTypes[i]); } @@ -929,20 +929,20 @@ pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp); ok(pRet == &pvProp, - "LpValFindProp[%d]: Didn't find existing propery id/type\n", + "LpValFindProp[%d]: Didn't find existing property id/type\n", ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp); - ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id\n", + ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent property id\n", ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 0u), 1u, &pvProp); - ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent propery id/type\n", + ok(pRet == NULL, "LpValFindProp[%d]: Found nonexistent property id/type\n", ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp); ok(pRet == &pvProp, - "LpValFindProp[%d]: Didn't find existing propery id\n", + "LpValFindProp[%d]: Didn't find existing property id\n", ptTypes[i]); } } @@ -1302,7 +1302,7 @@ /* Set access to read and write */ sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE); - ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetObjAccess(WRITE): Expected S_OK got 0x%08X\n", sc); tags.cValues = 1; tags.aulPropTag[0] = PR_IMPORTANCE; @@ -1311,31 +1311,31 @@ access[0] = 0; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); ok(sc == MAPI_E_INVALID_PARAMETER, - "SetPropAcess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc); + "SetPropAccess(0): Expected INVALID_PARAMETER got 0x%08X\n",sc); access[0] = IPROP_READWRITE; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); ok(sc == MAPI_E_INVALID_PARAMETER, - "SetPropAcess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc); + "SetPropAccess(RW): Expected INVALID_PARAMETER got 0x%08X\n",sc); access[0] = IPROP_CLEAN; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); ok(sc == MAPI_E_INVALID_PARAMETER, - "SetPropAcess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc); + "SetPropAccess(C): Expected INVALID_PARAMETER got 0x%08X\n",sc); /* Set item access to read/write/clean */ tags.cValues = 1; tags.aulPropTag[0] = PR_IMPORTANCE; access[0] = IPROP_READWRITE|IPROP_CLEAN; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); - ok(sc == S_OK, "SetPropAcess(RW/C): Expected S_OK got 0x%08X\n",sc); + ok(sc == S_OK, "SetPropAccess(RW/C): Expected S_OK got 0x%08X\n",sc); /* Set object access to read only */ sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READONLY); - ok(sc == S_OK, "SetObjAcess(READ): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetObjAccess(READ): Expected S_OK got 0x%08X\n", sc); /* Set item access to read/write/dirty - doesn't care about RO object */ access[0] = IPROP_READONLY|IPROP_DIRTY; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); - ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetPropAccess(WRITE): Expected S_OK got 0x%08X\n", sc); /* Delete any item when set to read only - Error */ lpProbs = NULL; @@ -1347,7 +1347,7 @@ /* Set access to read and write */ sc = IPropData_HrSetObjAccess(lpIProp, IPROP_READWRITE); - ok(sc == S_OK, "SetObjAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetObjAccess(WRITE): Expected S_OK got 0x%08X\n", sc); /* Delete nonexistent item - No error */ lpProbs = NULL; @@ -1401,7 +1401,7 @@ /* Set item to r/w again */ access[0] = IPROP_READWRITE|IPROP_DIRTY; sc = IPropData_HrSetPropAccess(lpIProp, (LPSPropTagArray)&tags, access); - ok(sc == S_OK, "SetPropAcess(WRITE): Expected S_OK got 0x%08X\n", sc); + ok(sc == S_OK, "SetPropAccess(WRITE): Expected S_OK got 0x%08X\n", sc); /* Delete existing item (r/w) - No error, no problems */ lpProbs = NULL; Modified: trunk/rostests/winetests/mapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/testlist… ============================================================================== --- trunk/rostests/winetests/mapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/testlist.c [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_imalloc(void); extern void func_prop(void); Modified: trunk/rostests/winetests/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mapi32/util.c?r… ============================================================================== --- trunk/rostests/winetests/mapi32/util.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mapi32/util.c [iso-8859-1] Sat Sep 21 12:54:15 2013 @@ -147,7 +147,7 @@ ok(pUFromSz("105679") == 105679u, "UFromSz: expected 105679, got %d\n", pUFromSz("105679")); - ok(pUFromSz(" 4") == 0, "UFromSz: exected 0. got %d\n", + ok(pUFromSz(" 4") == 0, "UFromSz: expected 0. got %d\n", pUFromSz(" 4")); } @@ -162,7 +162,7 @@ ok(pUlFromSzHex("fF") == 0xffu, "UlFromSzHex: expected 0xff, got 0x%x\n", pUlFromSzHex("fF")); - ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: exected 0x0. got 0x%x\n", + ok(pUlFromSzHex(" c") == 0, "UlFromSzHex: expected 0x0. got 0x%x\n", pUlFromSzHex(" c")); }

1 0

[akhaldi] 60267: [MAPI32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 12:53:07 2013 New Revision: 60267 URL: http://svn.reactos.org/svn/reactos?rev=60267&view=rev Log: [MAPI32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/sendmail.c trunk/reactos/dll/win32/mapi32/stubs.c trunk/reactos/dll/win32/mapi32/util.c trunk/reactos/dll/win32/mapi32/util.h trunk/reactos/include/psdk/mapi.h trunk/reactos/include/psdk/mapidefs.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -10,12 +10,11 @@ sendmail.c util.c stubs.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/mapi32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mapi32.def) -add_library(mapi32 SHARED ${SOURCE}) +add_library(mapi32 SHARED ${SOURCE} version.rc) set_module_type(mapi32 win32dll) -target_link_libraries(mapi32 wine uuid) -add_importlibs(mapi32 shlwapi shell32 user32 advapi32 msvcrt kernel32 ntdll) +target_link_libraries(mapi32 wine) +add_importlibs(mapi32 shlwapi user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET mapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -45,11 +45,11 @@ typedef struct { - const IMallocVtbl *lpVtbl; + IMalloc IMalloc_iface; LONG lRef; } MAPI_IMALLOC; -static MAPI_IMALLOC MAPI_IMalloc = { &MAPI_IMalloc_vt, 0u }; +static MAPI_IMALLOC MAPI_IMalloc = { { &MAPI_IMalloc_vt }, 0 }; extern LONG MAPI_ObjectCount; /* In mapi32_main.c */ @@ -71,8 +71,8 @@ if (mapiFunctions.MAPIGetDefaultMalloc) return mapiFunctions.MAPIGetDefaultMalloc(); - IMalloc_AddRef((LPMALLOC)&MAPI_IMalloc); - return (LPMALLOC)&MAPI_IMalloc; + IMalloc_AddRef(&MAPI_IMalloc.IMalloc_iface); + return &MAPI_IMalloc.IMalloc_iface; } /************************************************************************** Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -16,8 +16,8 @@ 24 stub PRProviderInit 25 stub LAUNCHWIZARD 26 stub LaunchWizard@20 - 27 stdcall -private DllGetClassObject(ptr ptr ptr) - 28 stdcall -private DllCanUnloadNow() + @ stdcall -private DllGetClassObject(ptr ptr ptr) + @ stdcall -private DllCanUnloadNow() 29 stdcall MAPIOpenFormMgr(ptr ptr) 30 stdcall MAPIOpenFormMgr@8(ptr ptr) MAPIOpenFormMgr 31 stdcall MAPIOpenLocalFormContainer(ptr) @@ -188,3 +188,4 @@ 253 stdcall FixMAPI@0() FixMAPI 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath +256 stdcall MAPISendMailW(ptr ptr ptr long long) Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -37,8 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mapi); -LONG MAPI_ObjectCount = 0; -HINSTANCE hInstMAPI32; +DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; +DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; /*********************************************************************** * DllMain (MAPI32.init) @@ -55,6 +55,7 @@ load_mapi_providers(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); unload_mapi_providers(); break; Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -225,31 +225,39 @@ switch (PROP_TYPE(lpProp->ulPropTag)) { case PT_MV_I2: ulRet = lpProp->Value.MVi.cValues; + /* fall through */ case PT_BOOLEAN: case PT_I2: ulRet *= sizeof(USHORT); break; case PT_MV_I4: ulRet = lpProp->Value.MVl.cValues; + /* fall through */ case PT_ERROR: case PT_I4: ulRet *= sizeof(LONG); break; case PT_MV_I8: ulRet = lpProp->Value.MVli.cValues; + /* fall through */ case PT_I8: ulRet *= sizeof(LONG64); break; case PT_MV_R4: ulRet = lpProp->Value.MVflt.cValues; + /* fall through */ case PT_R4: ulRet *= sizeof(float); break; case PT_MV_APPTIME: case PT_MV_R8: ulRet = lpProp->Value.MVdbl.cValues; + /* fall through */ case PT_APPTIME: case PT_R8: ulRet *= sizeof(double); break; case PT_MV_CURRENCY: ulRet = lpProp->Value.MVcur.cValues; + /* fall through */ case PT_CURRENCY: ulRet *= sizeof(CY); break; case PT_MV_SYSTIME: ulRet = lpProp->Value.MVft.cValues; + /* fall through */ case PT_SYSTIME: ulRet *= sizeof(FILETIME); break; case PT_MV_CLSID: ulRet = lpProp->Value.MVguid.cValues; + /* fall through */ case PT_CLSID: ulRet *= sizeof(GUID); break; case PT_MV_STRING8: ulRet = 0u; @@ -413,12 +421,12 @@ switch (ulOp) { - case RELOP_LT: return iCmp < 0 ? TRUE : FALSE; - case RELOP_LE: return iCmp <= 0 ? TRUE : FALSE; - case RELOP_GT: return iCmp > 0 ? TRUE : FALSE; - case RELOP_GE: return iCmp >= 0 ? TRUE : FALSE; - case RELOP_EQ: return iCmp == 0 ? TRUE : FALSE; - case RELOP_NE: return iCmp != 0 ? TRUE : FALSE; + case RELOP_LT: return iCmp < 0; + case RELOP_LE: return iCmp <= 0; + case RELOP_GT: return iCmp > 0; + case RELOP_GE: return iCmp >= 0; + case RELOP_EQ: return iCmp == 0; + case RELOP_NE: return iCmp != 0; } return FALSE; } @@ -709,7 +717,8 @@ * pcBytes [O] If non-NULL, destination for the size of the property array * * RETURNS - * Success: S_OK. If pcBytes is non-NULL, it contains the size of the propery array. + * Success: S_OK. If pcBytes is non-NULL, it contains the size of the + * properties array. * Failure: MAPI_E_INVALID_PARAMETER, if any parameter is invalid or validation * of the property array fails. */ @@ -731,44 +740,44 @@ lpProps[i].ulPropTag == PROP_ID_INVALID) return MAPI_E_INVALID_PARAMETER; - if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) - { - ulPropSize = UlPropSize(&lpProps[i]); - if (!ulPropSize) - return MAPI_E_INVALID_PARAMETER; - } - - switch (PROP_TYPE(lpProps[i].ulPropTag)) - { - case PT_STRING8: - case PT_UNICODE: - case PT_CLSID: - case PT_BINARY: - case PT_MV_I2: - case PT_MV_I4: - case PT_MV_I8: - case PT_MV_R4: - case PT_MV_R8: - case PT_MV_CURRENCY: - case PT_MV_SYSTIME: - case PT_MV_APPTIME: - ulPropSize += sizeof(SPropValue); - break; - case PT_MV_CLSID: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_STRING8: - case PT_MV_UNICODE: - ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); - break; - case PT_MV_BINARY: - ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); - break; - default: - ulPropSize = sizeof(SPropValue); - break; - } - ulBytes += ulPropSize; + if (PROP_TYPE(lpProps[i].ulPropTag) != PT_OBJECT) + { + ulPropSize = UlPropSize(&lpProps[i]); + if (!ulPropSize) + return MAPI_E_INVALID_PARAMETER; + } + + switch (PROP_TYPE(lpProps[i].ulPropTag)) + { + case PT_STRING8: + case PT_UNICODE: + case PT_CLSID: + case PT_BINARY: + case PT_MV_I2: + case PT_MV_I4: + case PT_MV_I8: + case PT_MV_R4: + case PT_MV_R8: + case PT_MV_CURRENCY: + case PT_MV_SYSTIME: + case PT_MV_APPTIME: + ulPropSize += sizeof(SPropValue); + break; + case PT_MV_CLSID: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_STRING8: + case PT_MV_UNICODE: + ulPropSize += lpProps[i].Value.MVszA.cValues * sizeof(char*) + sizeof(SPropValue); + break; + case PT_MV_BINARY: + ulPropSize += lpProps[i].Value.MVbin.cValues * sizeof(SBinary) + sizeof(SPropValue); + break; + default: + ulPropSize = sizeof(SPropValue); + break; + } + ulBytes += ulPropSize; } if (pcBytes) *pcBytes = ulBytes; @@ -1377,14 +1386,19 @@ /************************************************************************** - * IMAPIProp {MAPI32} - * - * The default Mapi interface for manipulating object properties. + * IPropData {MAPI32} + * + * A default Mapi interface to provide manipulation of object properties. * * DESCRIPTION - * This object provides an interface to an objects properties. It is exposed - * by several types of Mapi objects in order to simplify the querying and - * modification of properties. + * This object provides a default interface suitable in some cases as an + * implementation of the IMAPIProp interface (which has no default + * implementation). In addition to the IMAPIProp() methods inherited, this + * interface allows read/write control over access to the object and its + * individual properties. + * + * To obtain the default implementation of this interface from Mapi, call + * CreateIProp(). * * METHODS */ @@ -1400,7 +1414,7 @@ /* The main property data collection structure */ typedef struct { - const IPropDataVtbl *lpVtbl; + IPropData IPropData_iface; LONG lRef; /* Reference count */ ALLOCATEBUFFER *lpAlloc; /* Memory allocation routine */ ALLOCATEMORE *lpMore; /* Linked memory allocation routine */ @@ -1411,6 +1425,11 @@ CRITICAL_SECTION cs; /* Lock for thread safety */ } IPropDataImpl; +static inline IPropDataImpl *impl_from_IPropData(IPropData *iface) +{ + return CONTAINING_RECORD(iface, IPropDataImpl, IPropData_iface); +} + /* Internal - Get a property value, assumes lock is held */ static IPropDataItem *IMAPIPROP_GetValue(IPropDataImpl *This, ULONG ulPropTag) { @@ -1419,7 +1438,7 @@ LIST_FOR_EACH(cursor, &This->values) { LPIPropDataItem current = LIST_ENTRY(cursor, IPropDataItem, entry); - /* Note that propery types don't have to match, just Id's */ + /* Note that property types don't have to match, just Id's */ if (PROP_ID(current->value->ulPropTag) == PROP_ID(ulPropTag)) return current; } @@ -1479,19 +1498,14 @@ (offsetof(SPropProblemArray,aProblem)+(c)*sizeof(SPropProblem)) /************************************************************************** - * IMAPIProp_QueryInterface {MAPI32} + * IPropData_QueryInterface {MAPI32} * * Inherited method from the IUnknown Interface. * See IUnknown_QueryInterface. - * - * NOTES - * This object exposes the following interfaces: - * - IUnknown() : The default interface for all COM-Objects. - * - IMAPIProp() : The default Mapi interface for manipulating object properties. - */ -static inline HRESULT IMAPIProp_fnQueryInterface(LPMAPIPROP iface, REFIID riid, LPVOID *ppvObj) -{ - IPropDataImpl *This = (IPropDataImpl*)iface; + */ +static HRESULT WINAPI IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) +{ + IPropDataImpl *This = impl_from_IPropData(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppvObj); @@ -1515,14 +1529,14 @@ } /************************************************************************** - * IMAPIProp_AddRef {MAPI32} + * IPropData_AddRef {MAPI32} * * Inherited method from the IUnknown Interface. * See IUnknown_AddRef. */ -static inline ULONG IMAPIProp_fnAddRef(LPMAPIPROP iface) -{ - IPropDataImpl *This = (IPropDataImpl*)iface; +static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface) +{ + IPropDataImpl *This = impl_from_IPropData(iface); TRACE("(%p)->(count before=%u)\n", This, This->lRef); @@ -1530,14 +1544,14 @@ } /************************************************************************** - * IMAPIProp_Release {MAPI32} + * IPropData_Release {MAPI32} * * Inherited method from the IUnknown Interface. * See IUnknown_Release. */ -static inline ULONG IMAPIProp_fnRelease(LPMAPIPROP iface) -{ - IPropDataImpl *This = (IPropDataImpl*)iface; +static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) +{ + IPropDataImpl *This = impl_from_IPropData(iface); LONG lRef; TRACE("(%p)->(count before=%u)\n", This, This->lRef); @@ -1564,7 +1578,7 @@ } /************************************************************************** - * IMAPIProp_GetLastError {MAPI32} + * IPropData_GetLastError {MAPI32} * * Get information about the last error that occurred in an IMAPIProp object. * @@ -1585,9 +1599,8 @@ * - It is possible for this function to succeed and set *lppError to NULL, * if there is no further information to report about hRes. */ -static inline HRESULT -IMAPIProp_fnGetLastError(LPMAPIPROP iface, HRESULT hRes, - ULONG ulFlags, LPMAPIERROR *lppError) +static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, ULONG ulFlags, + LPMAPIERROR *lppError) { TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError); @@ -1599,7 +1612,7 @@ } /************************************************************************** - * IMAPIProp_SaveChanges {MAPI32} + * IPropData_SaveChanges {MAPI32} * * Update any changes made to a transactional IMAPIProp object. * @@ -1611,8 +1624,7 @@ * Success: S_OK. Any outstanding changes are committed to the object. * Failure: An HRESULT error code describing the error. */ -static inline HRESULT -IMAPIProp_fnSaveChanges(LPMAPIPROP iface, ULONG ulFlags) +static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) { TRACE("(%p,0x%08X)\n", iface, ulFlags); @@ -1622,7 +1634,7 @@ } /************************************************************************** - * IMAPIProp_GetProps {MAPI32} + * IPropData_GetProps {MAPI32} * * Get property values from an IMAPIProp object. * @@ -1645,13 +1657,12 @@ * retrieved from iface are present in lppProps with their type * changed to PT_ERROR and Id unchanged. */ -static inline HRESULT -IMAPIProp_fnGetProps(LPMAPIPROP iface, LPSPropTagArray lpTags, - ULONG ulFlags, ULONG *lpCount, LPSPropValue *lppProps) -{ +static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpTags, ULONG ulFlags, + ULONG *lpCount, LPSPropValue *lppProps) +{ + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i; HRESULT hRet = S_OK; - IPropDataImpl *This = (IPropDataImpl*)iface; TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags, lpCount, lppProps); @@ -1712,11 +1723,10 @@ * MAPI_E_BAD_CHARWIDTH, if Ascii or Unicode strings are requested * and that type of string is not supported. */ -static inline HRESULT -IMAPIProp_fnGetPropList(LPMAPIPROP iface, ULONG ulFlags, - LPSPropTagArray *lppTags) -{ - IPropDataImpl *This = (IPropDataImpl*)iface; +static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, + LPSPropTagArray *lppTags) +{ + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i; HRESULT hRet; @@ -1752,16 +1762,15 @@ } /************************************************************************** - * IMAPIProp_OpenProperty {MAPI32} + * IPropData_OpenProperty {MAPI32} * * Not documented at this time. * * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT -IMAPIProp_fnOpenProperty(LPMAPIPROP iface, ULONG ulPropTag, LPCIID iid, - ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) +static HRESULT WINAPI IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag, LPCIID iid, + ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag, debugstr_guid(iid), ulOpts, ulFlags, lpUnk); @@ -1770,7 +1779,7 @@ /************************************************************************** - * IMAPIProp_SetProps {MAPI32} + * IPropData_SetProps {MAPI32} * * Add or edit the property values in an IMAPIProp object. * @@ -1785,11 +1794,10 @@ * exist, or changed to the values in lpProps if they do * Failure: An HRESULT error code describing the error */ -static inline HRESULT -IMAPIProp_fnSetProps(LPMAPIPROP iface, ULONG ulValues, - LPSPropValue lpProps, LPSPropProblemArray *lppProbs) -{ - IPropDataImpl *This = (IPropDataImpl*)iface; +static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPSPropValue lpProps, + LPSPropProblemArray *lppProbs) +{ + IPropDataImpl *This = impl_from_IPropData(iface); HRESULT hRet = S_OK; ULONG i; @@ -1849,7 +1857,7 @@ } /************************************************************************** - * IMAPIProp_DeleteProps {MAPI32} + * IPropData_DeleteProps {MAPI32} * * Delete one or more property values from an IMAPIProp object. * @@ -1864,7 +1872,7 @@ * errors that occurred. * Failure: MAPI_E_INVALID_PARAMETER, if any parameter is invalid. * E_ACCESSDENIED, if this object was created using CreateIProp() and - * a subsequent call to IPropData_SetObjAcess() was made specifying + * a subsequent call to IPropData_SetObjAccess() was made specifying * IPROP_READONLY as the access type. * * NOTES @@ -1872,11 +1880,10 @@ * in lpTags but not in iface. * - lppProbs should be deleted with MAPIFreeBuffer() if returned. */ -static inline HRESULT -IMAPIProp_fnDeleteProps(LPMAPIPROP iface, LPSPropTagArray lpTags, - LPSPropProblemArray *lppProbs) -{ - IPropDataImpl *This = (IPropDataImpl*)iface; +static HRESULT WINAPI IPropData_fnDeleteProps(LPPROPDATA iface, LPSPropTagArray lpTags, + LPSPropProblemArray *lppProbs) +{ + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i, numProbs = 0; HRESULT hRet = S_OK; @@ -1949,18 +1956,18 @@ /************************************************************************** - * IMAPIProp_CopyTo {MAPI32} + * IPropData_CopyTo {MAPI32} * * Not documented at this time. * * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT -IMAPIProp_fnCopyTo(LPMAPIPROP iface, ULONG niids, LPCIID lpiidExcl, - LPSPropTagArray lpPropsExcl, ULONG ulParam, - LPMAPIPROGRESS lpIProgress, LPCIID lpIfaceIid, LPVOID lpDstObj, - ULONG ulFlags, LPSPropProblemArray *lppProbs) +static HRESULT WINAPI IPropData_fnCopyTo(LPPROPDATA iface, ULONG niids, LPCIID lpiidExcl, + LPSPropTagArray lpPropsExcl, ULONG ulParam, + LPMAPIPROGRESS lpIProgress, LPCIID lpIfaceIid, + LPVOID lpDstObj, ULONG ulFlags, + LPSPropProblemArray *lppProbs) { FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids, lpiidExcl, lpPropsExcl, ulParam, lpIProgress, @@ -1969,18 +1976,17 @@ } /************************************************************************** - * IMAPIProp_CopyProps {MAPI32} + * IPropData_CopyProps {MAPI32} * * Not documented at this time. * * RETURNS * An HRESULT success/failure code. */ -static inline HRESULT -IMAPIProp_fnCopyProps(LPMAPIPROP iface, LPSPropTagArray lpInclProps, - ULONG ulParam, LPMAPIPROGRESS lpIProgress, LPCIID lpIface, - LPVOID lpDstObj, ULONG ulFlags, - LPSPropProblemArray *lppProbs) +static HRESULT WINAPI IPropData_fnCopyProps(LPPROPDATA iface, LPSPropTagArray lpInclProps, + ULONG ulParam, LPMAPIPROGRESS lpIProgress, + LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags, + LPSPropProblemArray *lppProbs) { FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps, ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags, @@ -1989,7 +1995,7 @@ } /************************************************************************** - * IMAPIProp_GetNamesFromIDs {MAPI32} + * IPropData_GetNamesFromIDs {MAPI32} * * Get the names of properties from their identifiers. * @@ -2011,10 +2017,9 @@ * MAPI_W_ERRORS_RETURNED if not all properties were retrieved * successfully. */ -static inline HRESULT -IMAPIProp_fnGetNamesFromIDs(LPMAPIPROP iface, LPSPropTagArray *lppPropTags, - LPGUID iid, ULONG ulFlags, ULONG *lpCount, - LPMAPINAMEID **lpppNames) +static HRESULT WINAPI IPropData_fnGetNamesFromIDs(LPPROPDATA iface, LPSPropTagArray *lppPropTags, + LPGUID iid, ULONG ulFlags, ULONG *lpCount, + LPMAPINAMEID **lpppNames) { FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags, debugstr_guid(iid), ulFlags, lpCount, lpppNames); @@ -2022,7 +2027,7 @@ } /************************************************************************** - * IMAPIProp_GetIDsFromNames {MAPI32} + * IPropData_GetIDsFromNames {MAPI32} * * Get property identifiers associated with one or more named properties. * @@ -2042,10 +2047,9 @@ * MAPI_W_ERRORS_RETURNED if not all properties were retrieved * successfully. */ -static inline HRESULT -IMAPIProp_fnGetIDsFromNames(LPMAPIPROP iface, ULONG ulNames, - LPMAPINAMEID *lppNames, ULONG ulFlags, - LPSPropTagArray *lppPropTags) +static HRESULT WINAPI IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulNames, + LPMAPINAMEID *lppNames, ULONG ulFlags, + LPSPropTagArray *lppPropTags) { FIXME("(%p,%d,%p,0x%08X,%p) stub\n", iface, ulNames, lppNames, ulFlags, lppPropTags); @@ -2053,214 +2057,6 @@ } /************************************************************************** - * IPropData {MAPI32} - * - * A default Mapi interface to provide manipulation of object properties. - * - * DESCRIPTION - * This object provides a default interface suitable in some cases as an - * implementation of the IMAPIProp interface (which has no default - * implementation). In addition to the IMAPIProp() methods inherited, this - * interface allows read/write control over access to the object and its - * individual properties. - * - * To obtain the default implementation of this interface from Mapi, call - * CreateIProp(). - * - * METHODS - */ - -/************************************************************************** - * IPropData_QueryInterface {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_QueryInterface. - */ -static HRESULT WINAPI -IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) -{ - return IMAPIProp_fnQueryInterface((LPMAPIPROP)iface, riid, ppvObj); -} - -/************************************************************************** - * IPropData_AddRef {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_AddRef. - */ -static ULONG WINAPI -IPropData_fnAddRef(LPPROPDATA iface) -{ - return IMAPIProp_fnAddRef((LPMAPIPROP)iface); -} - -/************************************************************************** - * IPropData_Release {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_Release. - */ -static ULONG WINAPI -IPropData_fnRelease(LPPROPDATA iface) -{ - return IMAPIProp_fnRelease((LPMAPIPROP)iface); -} - -/************************************************************************** - * IPropData_GetLastError {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_GetLastError. - */ -static HRESULT WINAPI -IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, ULONG ulFlags, - LPMAPIERROR *lppError) -{ - return IMAPIProp_fnGetLastError((LPMAPIPROP)iface, hRes, ulFlags, lppError); -} - -/************************************************************************** - * IPropData_SaveChanges {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_SaveChanges. - */ -static HRESULT WINAPI -IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) -{ - return IMAPIProp_fnSaveChanges((LPMAPIPROP)iface, ulFlags); -} - -/************************************************************************** - * IPropData_GetProps {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_GetProps. - */ -static HRESULT WINAPI -IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpPropTags, - ULONG ulFlags, ULONG *lpCount, LPSPropValue *lppProps) -{ - return IMAPIProp_fnGetProps((LPMAPIPROP)iface, lpPropTags, ulFlags, - lpCount, lppProps); -} - -/************************************************************************** - * IPropData_GetPropList {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_GetPropList. - */ -static HRESULT WINAPI -IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, - LPSPropTagArray *lppPropTags) -{ - return IMAPIProp_fnGetPropList((LPMAPIPROP)iface, ulFlags, lppPropTags); -} - -/************************************************************************** - * IPropData_OpenProperty {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_OpenProperty. - */ -static HRESULT WINAPI -IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag, LPCIID iid, - ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) -{ - return IMAPIProp_fnOpenProperty((LPMAPIPROP)iface, ulPropTag, iid, - ulOpts, ulFlags, lpUnk); -} - -/************************************************************************** - * IPropData_SetProps {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_SetProps. - */ -static HRESULT WINAPI -IPropData_fnSetProps(LPPROPDATA iface, ULONG cValues, LPSPropValue lpProps, - LPSPropProblemArray *lppProbs) -{ - return IMAPIProp_fnSetProps((LPMAPIPROP)iface, cValues, lpProps, lppProbs); -} - -/************************************************************************** - * IPropData_DeleteProps {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_DeleteProps. - */ -static HRESULT WINAPI -IPropData_fnDeleteProps(LPPROPDATA iface, LPSPropTagArray lpPropTags, - LPSPropProblemArray *lppProbs) -{ - return IMAPIProp_fnDeleteProps((LPMAPIPROP)iface, lpPropTags, lppProbs); -} - -/************************************************************************** - * IPropData_CopyTo {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_CopyTo. - */ -static HRESULT WINAPI -IPropData_fnCopyTo(LPPROPDATA iface, ULONG ciidExclude, LPCIID lpIid, - LPSPropTagArray lpProps, ULONG ulParam, - LPMAPIPROGRESS lpProgress, LPCIID lpIface, LPVOID lpDst, - ULONG ulFlags, LPSPropProblemArray *lppProbs) -{ - return IMAPIProp_fnCopyTo((LPMAPIPROP)iface, ciidExclude, lpIid, lpProps, - ulParam, lpProgress, lpIface, lpDst, - ulFlags, lppProbs); -} - -/************************************************************************** - * IPropData_CopyProps {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_CopyProps. - */ -static HRESULT WINAPI -IPropData_fnCopyProps(LPPROPDATA iface, LPSPropTagArray lpProps, - ULONG ulParam, LPMAPIPROGRESS lpProgress, LPCIID lpIface, - LPVOID lpDst, ULONG ulFlags, LPSPropProblemArray *lppProbs) -{ - return IMAPIProp_fnCopyProps((LPMAPIPROP)iface, lpProps, ulParam, - lpProgress, lpIface, lpDst, ulFlags, lppProbs); -} - -/************************************************************************** - * IPropData_GetNamesFromIDs {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_GetNamesFromIDs. - */ -static HRESULT WINAPI -IPropData_fnGetNamesFromIDs(LPPROPDATA iface, LPSPropTagArray *lppPropTags, - LPGUID iid, ULONG ulFlags, ULONG *lpCount, - LPMAPINAMEID **lpppNames) -{ - return IMAPIProp_fnGetNamesFromIDs((LPMAPIPROP)iface, lppPropTags, iid, - ulFlags, lpCount, lpppNames); -} - -/************************************************************************** - * IPropData_GetIDsFromNames {MAPI32} - * - * Inherited method from the IMAPIProp Interface. - * See IMAPIProp_GetIDsFromNames. - */ -static HRESULT WINAPI -IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulNames, - LPMAPINAMEID *lppNames, ULONG ulFlags, - LPSPropTagArray *lppPropTags) -{ - return IMAPIProp_fnGetIDsFromNames((LPMAPIPROP)iface, ulNames, lppNames, - ulFlags, lppPropTags); -} - -/************************************************************************** * IPropData_HrSetObjAccess {MAPI32} * * Set the access level of an IPropData object. @@ -2277,7 +2073,7 @@ static HRESULT WINAPI IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); TRACE("(%p,%x)\n", iface, ulAccess); @@ -2331,8 +2127,7 @@ IPropData_fnHrSetPropAccess(LPPROPDATA iface, LPSPropTagArray lpTags, ULONG *lpAccess) { - IPropDataImpl *This = (IPropDataImpl*)iface; - + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i; TRACE("(%p,%p,%p)\n", iface, lpTags, lpAccess); @@ -2383,7 +2178,7 @@ IPropData_fnHrGetPropAccess(LPPROPDATA iface, LPSPropTagArray *lppTags, ULONG **lppAccess) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); LPVOID lpMem; HRESULT hRet; ULONG i; @@ -2538,7 +2333,7 @@ if (SUCCEEDED(scode)) { - lpPropData->lpVtbl = &IPropDataImpl_vtbl; + lpPropData->IPropData_iface.lpVtbl = &IPropDataImpl_vtbl; lpPropData->lRef = 1; lpPropData->lpAlloc = lpAlloc; lpPropData->lpMore = lpMore; @@ -2548,7 +2343,7 @@ list_init(&lpPropData->values); InitializeCriticalSection(&lpPropData->cs); lpPropData->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IPropDataImpl.cs"); - *lppPropData = (LPPROPDATA)lpPropData; + *lppPropData = &lpPropData->IPropData_iface; } return scode; } Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -45,23 +45,58 @@ //#include "shellapi.h" //#include "shlwapi.h" #include <wine/debug.h> +#include <wine/unicode.h> #include "util.h" #include "res.h" WINE_DEFAULT_DEBUG_CHANNEL(mapi); #define READ_BUF_SIZE 4096 + +#define STORE_UNICODE_OK 0x00040000 + +static LPSTR convert_from_unicode(LPCWSTR wstr) +{ + LPSTR str; + DWORD len; + + if (!wstr) + return NULL; + + len = WideCharToMultiByte(CP_ACP, 0, wstr, -1, NULL, 0, NULL, NULL); + str = HeapAlloc(GetProcessHeap(), 0, len); + WideCharToMultiByte(CP_ACP, 0, wstr, -1, str, len, NULL, NULL); + + return str; +} + +static LPWSTR convert_to_unicode(LPSTR str) +{ + LPWSTR wstr; + DWORD len; + + if (!str) + return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + wstr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, len); + + return wstr; +} /* Internal function to send a message via Extended MAPI. Wrapper around the Simple MAPI function MAPISendMail. */ -static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpMapiMessage message, - FLAGS flags, ULONG reserved) +static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpMapiMessageW message, + FLAGS flags) { - ULONG tags[] = {1, PR_IPM_DRAFTS_ENTRYID}; + ULONG tags[] = {1, 0}; + char *subjectA = NULL, *bodyA = NULL; ULONG retval = MAPI_E_FAILURE; IMAPISession *session = NULL; + BOOL unicode_aware = FALSE; IMAPITable* msg_table; LPSRowSet rows = NULL; IMsgStore* msg_store; @@ -138,12 +173,32 @@ /* We don't need this any more */ FreeProws(rows); + /* Check if the message store supports Unicode */ + tags[1] = PR_STORE_SUPPORT_MASK; + ret = IMsgStore_GetProps(msg_store, (LPSPropTagArray) tags, 0, &values, &props); + + if ((ret == S_OK) && (props[0].Value.l & STORE_UNICODE_OK)) + unicode_aware = TRUE; + else + { + /* Don't convert to ANSI */ + if (flags & MAPI_FORCE_UNICODE) + { + WARN("No Unicode-capable mail client, and MAPI_FORCE_UNICODE is specified. MAPISendMail failed.\n"); + retval = MAPI_E_UNICODE_NOT_SUPPORTED; + IMsgStore_Release(msg_store); + goto logoff; + } + } + /* First open the inbox, from which the drafts folder can be opened */ if (IMsgStore_GetReceiveFolder(msg_store, NULL, 0, &entry_len, &entry_id, NULL) == S_OK) { IMsgStore_OpenEntry(msg_store, entry_len, entry_id, NULL, 0, &obj_type, (LPUNKNOWN*) &folder); MAPIFreeBuffer(entry_id); } + + tags[1] = PR_IPM_DRAFTS_ENTRYID; /* Open the drafts folder, or failing that, try asking the message store for the outbox */ if ((folder == NULL) || ((ret = IMAPIFolder_GetProps(folder, (LPSPropTagArray) tags, 0, &values, &props)) != S_OK)) @@ -179,8 +234,19 @@ /* Set message subject */ if (message->lpszSubject) { - p.ulPropTag = PR_SUBJECT_A; - p.Value.lpszA = message->lpszSubject; + if (unicode_aware) + { + p.ulPropTag = PR_SUBJECT_W; + p.Value.lpszW = message->lpszSubject; + } + else + { + subjectA = convert_from_unicode(message->lpszSubject); + + p.ulPropTag = PR_SUBJECT_A; + p.Value.lpszA = subjectA; + } + IMessage_SetProps(msg, 1, &p, NULL); } @@ -189,10 +255,17 @@ { LPSTREAM stream = NULL; - if (IMessage_OpenProperty(msg, PR_BODY_A, &IID_IStream, 0, + if (IMessage_OpenProperty(msg, unicode_aware ? PR_BODY_W : PR_BODY_A, &IID_IStream, 0, MAPI_MODIFY | MAPI_CREATE, (LPUNKNOWN*) &stream) == S_OK) { - IStream_Write(stream, message->lpszNoteText, strlen(message->lpszNoteText)+1, NULL); + if (unicode_aware) + IStream_Write(stream, message->lpszNoteText, (lstrlenW(message->lpszNoteText)+1) * sizeof(WCHAR), NULL); + else + { + bodyA = convert_from_unicode(message->lpszNoteText); + IStream_Write(stream, bodyA, strlen(bodyA)+1, NULL); + } + IStream_Release(stream); } } @@ -201,20 +274,21 @@ if (message->nFileCount > 0) { ULONG num_attach = 0; - int i, j; + unsigned int i; for (i = 0; i < message->nFileCount; i++) { IAttach* attachment = NULL; + char *filenameA = NULL; SPropValue prop[4]; - LPCSTR filename; + LPCWSTR filename; HANDLE file; if (!message->lpFiles[i].lpszPathName) continue; /* Open the attachment for reading */ - file = CreateFileA(message->lpFiles[i].lpszPathName, GENERIC_READ, FILE_SHARE_READ, + file = CreateFileW(message->lpFiles[i].lpszPathName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) @@ -225,9 +299,11 @@ if (!filename) { + int j; + filename = message->lpFiles[i].lpszPathName; - for (j = strlen(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) + for (j = lstrlenW(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) { if (message->lpFiles[i].lpszPathName[i] == '\\' || message->lpFiles[i].lpszPathName[i] == '/') @@ -238,8 +314,8 @@ } } - TRACE("Attachment %d path: '%s'; filename: '%s'\n", i, debugstr_a(message->lpFiles[i].lpszPathName), - debugstr_a(filename)); + TRACE("Attachment %u path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), + debugstr_w(filename)); /* Create the attachment */ if (IMessage_CreateAttach(msg, NULL, 0, &num_attach, &attachment) != S_OK) @@ -254,10 +330,25 @@ prop[0].ulPropTag = PR_ATTACH_METHOD; prop[0].Value.ul = ATTACH_BY_VALUE; - prop[1].ulPropTag = PR_ATTACH_LONG_FILENAME_A; - prop[1].Value.lpszA = (LPSTR) filename; - prop[2].ulPropTag = PR_ATTACH_FILENAME_A; - prop[2].Value.lpszA = (LPSTR) filename; + + if (unicode_aware) + { + prop[1].ulPropTag = PR_ATTACH_LONG_FILENAME_W; + prop[1].Value.lpszW = (LPWSTR) filename; + prop[2].ulPropTag = PR_ATTACH_FILENAME_W; + prop[2].Value.lpszW = (LPWSTR) filename; + } + else + { + filenameA = convert_from_unicode(filename); + + prop[1].ulPropTag = PR_ATTACH_LONG_FILENAME_A; + prop[1].Value.lpszA = (LPSTR) filenameA; + prop[2].ulPropTag = PR_ATTACH_FILENAME_A; + prop[2].Value.lpszA = (LPSTR) filenameA; + + } + prop[3].ulPropTag = PR_RENDERING_POSITION; prop[3].Value.l = -1; @@ -277,7 +368,7 @@ size += read; } - TRACE("%d bytes read, %d bytes written of attachment\n", read, written); + TRACE("%d bytes written of attachment\n", size); IStream_Commit(stream, STGC_DEFAULT); IStream_Release(stream); @@ -293,6 +384,8 @@ CloseHandle(file); IAttach_Release(attachment); + + HeapFree(GetProcessHeap(), 0, filenameA); } } @@ -302,7 +395,7 @@ if (IMAPISession_PrepareForm(session, NULL, msg, &token) == S_OK) { - ULONG access = 0, status = 0, flags = 0, pc = 0; + ULONG access = 0, status = 0, message_flags = 0, pc = 0; ULONG pT[2] = {1, PR_MSG_STATUS}; /* Retrieve message status, flags, access rights and class */ @@ -317,7 +410,7 @@ if (IMessage_GetProps(msg, (LPSPropTagArray) pT, 0, &pc, &props) == S_OK) { - flags = props->Value.ul; + message_flags = props->Value.ul; MAPIFreeBuffer(props); } @@ -336,7 +429,7 @@ /* Show the message form (edit window) */ ret = IMAPISession_ShowForm(session, 0, msg_store, draft_folder, NULL, - token, NULL, 0, status, flags, access, + token, NULL, 0, status, message_flags, access, props->Value.lpszA); switch (ret) @@ -363,6 +456,9 @@ IMAPIFolder_Release(draft_folder); if (folder) IMAPIFolder_Release(folder); IMsgStore_Release(msg_store); + + HeapFree(GetProcessHeap(), 0, subjectA); + HeapFree(GetProcessHeap(), 0, bodyA); logoff: ; IMAPISession_Logoff(session, 0, 0, 0); @@ -401,7 +497,213 @@ /* Check if we have an Extended MAPI provider - if so, use our wrapper */ if (MAPIInitialize(NULL) == S_OK) - return sendmail_extended_mapi(session, uiparam, message, flags, reserved); + { + MapiMessageW messageW; + ULONG ret; + + ZeroMemory(&messageW, sizeof(MapiMessageW)); + + /* Convert the entries we need to Unicode */ + messageW.lpszSubject = convert_to_unicode(message->lpszSubject); + messageW.lpszNoteText = convert_to_unicode(message->lpszNoteText); + messageW.nFileCount = message->nFileCount; + + if (message->nFileCount && message->lpFiles) + { + lpMapiFileDescW filesW; + unsigned int i; + + filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount); + + for (i = 0; i < message->nFileCount; i++) + { + filesW[i].lpszPathName = convert_to_unicode(message->lpFiles[i].lpszPathName); + filesW[i].lpszFileName = convert_to_unicode(message->lpFiles[i].lpszFileName); + } + + messageW.lpFiles = filesW; + } + + ret = sendmail_extended_mapi(session, uiparam, &messageW, flags); + + /* Now free everything we allocated */ + if (message->nFileCount && message->lpFiles) + { + unsigned int i; + + for (i = 0; i < message->nFileCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageW.lpFiles[i].lpszPathName); + HeapFree(GetProcessHeap(), 0, messageW.lpFiles[i].lpszFileName); + } + + HeapFree(GetProcessHeap(), 0, messageW.lpFiles); + } + + HeapFree(GetProcessHeap(), 0, messageW.lpszSubject); + HeapFree(GetProcessHeap(), 0, messageW.lpszNoteText); + + return ret; + } + + /* Display an error message since we apparently have no mail clients */ + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + + MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); + + return MAPI_E_NOT_SUPPORTED; +} + +static lpMapiRecipDesc convert_recipient_from_unicode(lpMapiRecipDescW recipW, lpMapiRecipDesc dest) +{ + lpMapiRecipDesc ret; + + if (!recipW) + return NULL; + + if (dest) + ret = dest; + else + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc)); + + ret->ulRecipClass = recipW->ulRecipClass; + ret->lpszName = convert_from_unicode(recipW->lpszName); + ret->lpszAddress = convert_from_unicode(recipW->lpszAddress); + ret->ulEIDSize = recipW->ulEIDSize; + ret->lpEntryID = recipW->lpEntryID; + + return ret; +} + +/************************************************************************** + * MAPISendMailW (MAPI32.256) + * + * Send a mail. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessageW structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + */ +ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessageW message, FLAGS flags, ULONG reserved) +{ + WCHAR msg_title[READ_BUF_SIZE], error_msg[READ_BUF_SIZE]; + + /* Check to see if we have a Simple MAPI provider loaded */ + if (mapiFunctions.MAPISendMailW) + return mapiFunctions.MAPISendMailW(session, uiparam, message, flags, reserved); + + /* Check if we have an Extended MAPI provider - if so, use our wrapper */ + if (MAPIInitialize(NULL) == S_OK) + return sendmail_extended_mapi(session, uiparam, message, flags); + + if (mapiFunctions.MAPISendMail) + { + MapiMessage messageA; + ULONG ret; + + if (flags & MAPI_FORCE_UNICODE) + return MAPI_E_UNICODE_NOT_SUPPORTED; + + /* Convert to ANSI and send to MAPISendMail */ + ZeroMemory(&messageA, sizeof(MapiMessage)); + + messageA.lpszSubject = convert_from_unicode(message->lpszSubject); + messageA.lpszNoteText = convert_from_unicode(message->lpszNoteText); + messageA.lpszMessageType = convert_from_unicode(message->lpszMessageType); + messageA.lpszDateReceived = convert_from_unicode(message->lpszDateReceived); + messageA.lpszConversationID = convert_from_unicode(message->lpszConversationID); + messageA.flFlags = message->flFlags; + messageA.lpOriginator = convert_recipient_from_unicode(message->lpOriginator, NULL); + messageA.nRecipCount = message->nRecipCount; + messageA.nFileCount = message->nFileCount; + + if (message->nRecipCount && message->lpRecips) + { + lpMapiRecipDesc recipsA; + unsigned int i; + + recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); + + for (i = 0; i < message->nRecipCount; i++) + { + convert_recipient_from_unicode(&message->lpRecips[i], &recipsA[i]); + } + + messageA.lpRecips = recipsA; + } + + if (message->nFileCount && message->lpFiles) + { + lpMapiFileDesc filesA; + unsigned int i; + + filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); + + for (i = 0; i < message->nFileCount; i++) + { + filesA[i].flFlags = message->lpFiles[i].flFlags; + filesA[i].nPosition = message->lpFiles[i].nPosition; + filesA[i].lpszPathName = convert_from_unicode(message->lpFiles[i].lpszPathName); + filesA[i].lpszFileName = convert_from_unicode(message->lpFiles[i].lpszFileName); + filesA[i].lpFileType = message->lpFiles[i].lpFileType; + } + + messageA.lpFiles = filesA; + } + + ret = mapiFunctions.MAPISendMail(session, uiparam, &messageA, flags, reserved); + + /* Now free everything we allocated */ + if (message->lpOriginator) + { + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator->lpszName); + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator->lpszAddress); + HeapFree(GetProcessHeap(), 0, messageA.lpOriginator); + } + + if (message->nRecipCount && message->lpRecips) + { + unsigned int i; + + for (i = 0; i < message->nRecipCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageA.lpRecips[i].lpszName); + HeapFree(GetProcessHeap(), 0, messageA.lpRecips[i].lpszAddress); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpRecips); + } + + if (message->nFileCount && message->lpFiles) + { + unsigned int i; + + for (i = 0; i < message->nFileCount; i++) + { + HeapFree(GetProcessHeap(), 0, messageA.lpFiles[i].lpszPathName); + HeapFree(GetProcessHeap(), 0, messageA.lpFiles[i].lpszFileName); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpFiles); + } + + HeapFree(GetProcessHeap(), 0, messageA.lpszSubject); + HeapFree(GetProcessHeap(), 0, messageA.lpszNoteText); + HeapFree(GetProcessHeap(), 0, messageA.lpszDateReceived); + HeapFree(GetProcessHeap(), 0, messageA.lpszConversationID); + + return ret; + } /* Display an error message since we apparently have no mail clients */ LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); Modified: trunk/reactos/dll/win32/mapi32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -75,17 +75,6 @@ HRESULT WINAPI -WrapCompressedRTFStream( - LPSTREAM lpCompressedRTFStream, - ULONG ulflags, - LPSTREAM *lpUncompressedRTFStream) -{ - UNIMPLEMENTED; - return E_NOTIMPL; -} - -HRESULT -WINAPI HrGetOmiProvidersFlags( DWORD dwUnknown1, DWORD dwUnknown2) Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -492,7 +492,7 @@ if (lpName1->ulKind == MNID_STRING) return !strcmpW(lpName1->Kind.lpwstrName, lpName2->Kind.lpwstrName); - return lpName1->Kind.lID == lpName2->Kind.lID ? TRUE : FALSE; + return lpName1->Kind.lID == lpName2->Kind.lID; } /************************************************************************** @@ -937,6 +937,18 @@ FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); *lppRows = NULL; return MAPI_E_CALL_FAILED; +} + +/************************************************************************** + * WrapCompressedRTFStream (MAPI32.186) + */ +HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREAM *uncompressed) +{ + if (mapiFunctions.WrapCompressedRTFStream) + return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed); + + FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed); + return MAPI_E_NO_SUPPORT; } static HMODULE mapi_provider; @@ -1079,6 +1091,7 @@ mapiFunctions.MAPISaveMail = (void*) GetProcAddress(mapi_provider, "MAPISaveMail"); mapiFunctions.MAPISendDocuments = (void*) GetProcAddress(mapi_provider, "MAPISendDocuments"); mapiFunctions.MAPISendMail = (void*) GetProcAddress(mapi_provider, "MAPISendMail"); + mapiFunctions.MAPISendMailW = (void*) GetProcAddress(mapi_provider, "MAPISendMailW"); } /* Extended MAPI functions */ @@ -1102,6 +1115,7 @@ mapiFunctions.MAPIOpenLocalFormContainer = (void *) GetProcAddress(mapi_ex_provider, "MAPIOpenLocalFormContainer"); mapiFunctions.OpenStreamOnFile = (void*) GetProcAddress(mapi_ex_provider, "OpenStreamOnFile@24"); mapiFunctions.ScInitMapiUtil = (void*) GetProcAddress(mapi_ex_provider, "ScInitMapiUtil@4"); + mapiFunctions.WrapCompressedRTFStream = (void*) GetProcAddress(mapi_ex_provider, "WrapCompressedRTFStream@12"); } cleanUp: Modified: trunk/reactos/dll/win32/mapi32/util.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.h?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.h [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -25,8 +25,8 @@ #include <mapi.h> //#include <mapix.h> -extern void load_mapi_providers(void); -extern void unload_mapi_providers(void); +extern void load_mapi_providers(void) DECLSPEC_HIDDEN; +extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; typedef struct MAPI_FUNCTIONS { LPMAPIADDRESS MAPIAddress; @@ -41,6 +41,7 @@ LPMAPIRESOLVENAME MAPIResolveName; LPMAPISAVEMAIL MAPISaveMail; LPMAPISENDMAIL MAPISendMail; + LPMAPISENDMAILW MAPISendMailW; LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize; @@ -58,9 +59,10 @@ HRESULT (WINAPI *HrQueryAllRows) (LPMAPITABLE, LPSPropTagArray, LPSRestriction, LPSSortOrderSet, LONG, LPSRowSet *); HRESULT (WINAPI *OpenStreamOnFile) (LPALLOCATEBUFFER, LPFREEBUFFER, ULONG, LPWSTR, LPWSTR, LPSTREAM *); SCODE (WINAPI *ScInitMapiUtil) (ULONG ulReserved); + HRESULT (WINAPI *WrapCompressedRTFStream) (LPSTREAM, ULONG, LPSTREAM *); } MAPI_FUNCTIONS; -extern MAPI_FUNCTIONS mapiFunctions; -extern HINSTANCE hInstMAPI32; +extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; +extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; #endif Modified: trunk/reactos/include/psdk/mapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapi.h?rev=60… ============================================================================== --- trunk/reactos/include/psdk/mapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapi.h [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -47,6 +47,16 @@ LPVOID lpFileType; } MapiFileDesc, *lpMapiFileDesc; +typedef struct +{ + ULONG ulReserved; + ULONG flFlags; + ULONG nPosition; + PWSTR lpszPathName; + PWSTR lpszFileName; + PVOID lpFileType; +} MapiFileDescW, *lpMapiFileDescW; + #ifndef MAPI_ORIG #define MAPI_ORIG 0 #define MAPI_TO 1 @@ -63,6 +73,16 @@ ULONG ulEIDSize; LPVOID lpEntryID; } MapiRecipDesc, *lpMapiRecipDesc; + +typedef struct +{ + ULONG ulReserved; + ULONG ulRecipClass; + PWSTR lpszName; + PWSTR lpszAddress; + ULONG ulEIDSize; + PVOID lpEntryID; +} MapiRecipDescW, *lpMapiRecipDescW; typedef struct { @@ -80,11 +100,26 @@ lpMapiFileDesc lpFiles; } MapiMessage, *lpMapiMessage; +typedef struct +{ + ULONG ulReserved; + PWSTR lpszSubject; + PWSTR lpszNoteText; + PWSTR lpszMessageType; + PWSTR lpszDateReceived; + PWSTR lpszConversationID; + FLAGS flFlags; + lpMapiRecipDescW lpOriginator; + ULONG nRecipCount; + lpMapiRecipDescW lpRecips; + ULONG nFileCount; + lpMapiFileDescW lpFiles; +} MapiMessageW, *lpMapiMessageW; /* Error codes */ #ifndef SUCCESS_SUCCESS -#define SUCCESS_SUCCESS 0L +#define SUCCESS_SUCCESS 0 #endif #define MAPI_USER_ABORT 1 @@ -115,6 +150,7 @@ #define MAPI_E_INVALID_EDITFIELDS 24 #define MAPI_E_INVALID_RECIPS 25 #define MAPI_E_NOT_SUPPORTED 26 +#define MAPI_E_UNICODE_NOT_SUPPORTED 27 /* MAPILogon */ @@ -139,6 +175,10 @@ /* MAPISendMail */ #define MAPI_DIALOG 0x00000008 + +/* MAPISendMailW */ + +#define MAPI_FORCE_UNICODE 0x00040000 /* API typedefs and prototypes */ @@ -194,6 +234,10 @@ typedef MAPISENDMAIL *LPMAPISENDMAIL; MAPISENDMAIL MAPISendMail; +typedef ULONG (WINAPI MAPISENDMAILW)(LHANDLE,ULONG_PTR,lpMapiMessageW,FLAGS,ULONG); +typedef MAPISENDMAILW *LPMAPISENDMAILW; +MAPISENDMAILW MAPISendMailW; + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/mapidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapidefs.h?re… ============================================================================== --- trunk/reactos/include/psdk/mapidefs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapidefs.h [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -446,12 +446,12 @@ } SPropProblemArray, *LPSPropProblemArray; /* FPropContainsProp flags */ -#define FL_FULLSTRING 0x00000ul /* Exact string match */ -#define FL_SUBSTRING 0x00001ul /* Substring match */ -#define FL_PREFIX 0x00002ul /* Prefix match */ -#define FL_IGNORECASE 0x10000ul /* Case insensitive */ -#define FL_IGNORENONSPACE 0x20000ul /* Ignore non spacing characters */ -#define FL_LOOSE 0x40000ul /* Try very hard to match */ +#define FL_FULLSTRING ((ULONG)0x00000) /* Exact string match */ +#define FL_SUBSTRING ((ULONG)0x00001) /* Substring match */ +#define FL_PREFIX ((ULONG)0x00002) /* Prefix match */ +#define FL_IGNORECASE ((ULONG)0x10000) /* Case insensitive */ +#define FL_IGNORENONSPACE ((ULONG)0x20000) /* Ignore non spacing characters */ +#define FL_LOOSE ((ULONG)0x40000) /* Try very hard to match */ /* Table types returned by IMAPITable_GetStatus() */ @@ -649,18 +649,18 @@ } MAPINAMEID, *LPMAPINAMEID; /* Desired notification types (bitflags) */ -#define fnevCriticalError 0x00000001UL -#define fnevNewMail 0x00000002UL -#define fnevObjectCreated 0x00000004UL -#define fnevObjectDeleted 0x00000008UL -#define fnevObjectModified 0x00000010UL -#define fnevObjectMoved 0x00000020UL -#define fnevObjectCopied 0x00000040UL -#define fnevSearchComplete 0x00000080UL -#define fnevTableModified 0x00000100UL -#define fnevStatusObjectModified 0x00000200UL -#define fnevReservedForMapi 0x40000000UL -#define fnevExtended 0x80000000UL +#define fnevCriticalError ((ULONG)0x00000001) +#define fnevNewMail ((ULONG)0x00000002) +#define fnevObjectCreated ((ULONG)0x00000004) +#define fnevObjectDeleted ((ULONG)0x00000008) +#define fnevObjectModified ((ULONG)0x00000010) +#define fnevObjectMoved ((ULONG)0x00000020) +#define fnevObjectCopied ((ULONG)0x00000040) +#define fnevSearchComplete ((ULONG)0x00000080) +#define fnevTableModified ((ULONG)0x00000100) +#define fnevStatusObjectModified ((ULONG)0x00000200) +#define fnevReservedForMapi ((ULONG)0x40000000) +#define fnevExtended ((ULONG)0x80000000) /* Type of notification event */ #define TABLE_CHANGED 1U Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Sep 21 12:53:07 2013 @@ -96,7 +96,7 @@ reactos/dll/win32/localspl # Synced to Wine-1.5.26 reactos/dll/win32/localui # Synced to Wine-1.7.1 reactos/dll/win32/lz32 # Synced to Wine-1.5.19 -reactos/dll/win32/mapi32 # Autosync +reactos/dll/win32/mapi32 # Synced to Wine-1.7.1 reactos/dll/win32/mciavi32 # Synced to Wine-1.5.4 reactos/dll/win32/mcicda # Synced to Wine-1.5.19 reactos/dll/win32/mciqtz32 # Synced to Wine-1.5.4

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
56
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013