Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[akhaldi] 75890: [OLE32] Sync with Wine Staging 2.16. CORE-13762 a56bc8f ole32: Store proxy/stub CLSIDs per process, not per apartment. 3b44927 ole32: New high resolution cursors generated from SVG...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:56:11 2017 New Revision: 75890 URL: http://svn.reactos.org/svn/reactos?rev=75890&view=rev Log: [OLE32] Sync with Wine Staging 2.16. CORE-13762 a56bc8f ole32: Store proxy/stub CLSIDs per process, not per apartment. 3b44927 ole32: New high resolution cursors generated from SVG. 5a3b87a ole32: Avoid null pointer dereferences in CoGetTreatAsClass. 13c6d37 ole32: Add stub for OleGetIconOfFile. 33a720b ole32: InitNew() should fail if there is a current storage. 966e8a2 ole32: Create initial cache entries for the CLSID_Picture_ classes. 111b72f ole32: Add the ability to create an entry without returning it. 705ccd7 ole32: Start allocating regular cache entries with id of 2. 0267564 ole32: Fix incorrectly assigned member in the presentation stream. 85a1309 ole32: Make bitmap_info_size() static. Modified: trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/drag_copy.cur trunk/reactos/dll/win32/ole32/drag_link.cur trunk/reactos/dll/win32/ole32/drag_move.cur trunk/reactos/dll/win32/ole32/nodrop.cur trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -146,6 +146,17 @@ CLSID clsid; }; +static struct list registered_psclsid_list = LIST_INIT(registered_psclsid_list); + +static CRITICAL_SECTION cs_registered_psclsid_list; +static CRITICAL_SECTION_DEBUG psclsid_cs_debug = +{ + 0, 0, &cs_registered_psclsid_list, + { &psclsid_cs_debug.ProcessLocksList, &psclsid_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_registered_psclsid_list") } +}; +static CRITICAL_SECTION cs_registered_psclsid_list = { &psclsid_cs_debug, -1, 0, 0, 0, 0 }; + /* * This is a marshallable object exposing registered local servers. * IServiceProvider is used only because it happens meet requirements @@ -600,7 +611,6 @@ list_init(&apt->proxies); list_init(&apt->stubmgrs); - list_init(&apt->psclsids); list_init(&apt->loaded_dlls); apt->ipidc = 0; apt->refs = 1; @@ -709,6 +719,21 @@ } LeaveCriticalSection( &csRegisteredClassList ); +} + +static void revoke_registered_psclsids(void) +{ + struct registered_psclsid *psclsid, *psclsid2; + + EnterCriticalSection( &cs_registered_psclsid_list ); + + LIST_FOR_EACH_ENTRY_SAFE(psclsid, psclsid2, &registered_psclsid_list, struct registered_psclsid, entry) + { + list_remove(&psclsid->entry); + HeapFree(GetProcessHeap(), 0, psclsid); + } + + LeaveCriticalSection( &cs_registered_psclsid_list ); } /****************************************************************************** @@ -1149,15 +1174,6 @@ * must have a ref on the apartment and so it cannot be destroyed). */ stub_manager_int_release(stubmgr); - } - - LIST_FOR_EACH_SAFE(cursor, cursor2, &apt->psclsids) - { - struct registered_psclsid *registered_psclsid = - LIST_ENTRY(cursor, struct registered_psclsid, entry); - - list_remove(&registered_psclsid->entry); - HeapFree(GetProcessHeap(), 0, registered_psclsid); } /* if this assert fires, then another thread took a reference to a @@ -1966,6 +1982,7 @@ { TRACE("() - Releasing the COM libraries\n"); + revoke_registered_psclsids(); RunningObjectTableImpl_UnInitialize(); } else if (lCOMRefCnt<1) { @@ -2558,17 +2575,17 @@ if (!pclsid) return E_INVALIDARG; - EnterCriticalSection(&apt->cs); - - LIST_FOR_EACH_ENTRY(registered_psclsid, &apt->psclsids, struct registered_psclsid, entry) + EnterCriticalSection(&cs_registered_psclsid_list); + + LIST_FOR_EACH_ENTRY(registered_psclsid, &registered_psclsid_list, struct registered_psclsid, entry) if (IsEqualIID(&registered_psclsid->iid, riid)) { *pclsid = registered_psclsid->clsid; - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); return S_OK; } - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); data.cbSize = sizeof(data); if (FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, @@ -2613,6 +2630,9 @@ * * NOTES * + * Unlike CoRegisterClassObject(), CLSIDs registered with CoRegisterPSClsid() + * will be returned from other apartments in the same process. + * * This function does not add anything to the registry and the effects are * limited to the lifetime of the current process. * @@ -2632,28 +2652,28 @@ return CO_E_NOTINITIALIZED; } - EnterCriticalSection(&apt->cs); - - LIST_FOR_EACH_ENTRY(registered_psclsid, &apt->psclsids, struct registered_psclsid, entry) + EnterCriticalSection(&cs_registered_psclsid_list); + + LIST_FOR_EACH_ENTRY(registered_psclsid, &registered_psclsid_list, struct registered_psclsid, entry) if (IsEqualIID(&registered_psclsid->iid, riid)) { registered_psclsid->clsid = *rclsid; - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); return S_OK; } registered_psclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(struct registered_psclsid)); if (!registered_psclsid) { - LeaveCriticalSection(&apt->cs); + LeaveCriticalSection(&cs_registered_psclsid_list); return E_OUTOFMEMORY; } registered_psclsid->iid = *riid; registered_psclsid->clsid = *rclsid; - list_add_head(&apt->psclsids, &registered_psclsid->entry); - - LeaveCriticalSection(&apt->cs); + list_add_head(&registered_psclsid_list, &registered_psclsid->entry); + + LeaveCriticalSection(&cs_registered_psclsid_list); return S_OK; } @@ -3803,6 +3823,10 @@ LONG len = sizeof(szClsidNew); TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + + if (!clsidOld || !clsidNew) + return E_INVALIDARG; + *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -126,7 +126,6 @@ struct list stubmgrs; /* stub managers for exported objects (CS cs) */ BOOL remunk_exported; /* has the IRemUnknown interface for this apartment been created yet? (CS cs) */ LONG remoting_started; /* has the RPC system been started for this apartment? (LOCK) */ - struct list psclsids; /* list of registered PS CLSIDs (CS cs) */ struct list loaded_dlls; /* list of dlls loaded by this apartment (CS cs) */ DWORD host_apt_tid; /* thread ID of apartment hosting objects of differing threading model (CS cs) */ HWND host_apt_hwnd; /* handle to apartment window of host apartment (CS cs) */ Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… ============================================================================== --- trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -67,7 +67,7 @@ DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ DVASPECT dvAspect; DWORD lindex; - DWORD tymed; + DWORD advf; DWORD unknown7; /* 0 */ DWORD dwObjectExtentX; DWORD dwObjectExtentY; @@ -145,7 +145,9 @@ */ DWORD sinkAspects; DWORD sinkAdviseFlag; - IAdviseSink* sinkInterface; + IAdviseSink *sinkInterface; + + CLSID clsid; IStorage *presentationStorage; /* list of cache entries */ @@ -214,7 +216,7 @@ * * Return the size of the bitmap info structure including color table. */ -int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) +static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) { unsigned int colors, size, masks = 0; @@ -305,10 +307,10 @@ /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ -static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed, BOOL load) +static HRESULT check_valid_clipformat_and_tymed(CLIPFORMAT cfFormat, DWORD tymed) { if (!cfFormat || !tymed || - (cfFormat == CF_METAFILEPICT && (tymed == TYMED_MFPICT || load)) || + (cfFormat == CF_METAFILEPICT && tymed == TYMED_MFPICT) || (cfFormat == CF_BITMAP && tymed == TYMED_GDI) || (cfFormat == CF_DIB && tymed == TYMED_HGLOBAL) || (cfFormat == CF_ENHMETAFILE && tymed == TYMED_ENHMF)) @@ -345,30 +347,38 @@ } static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc, DWORD advf, - DataCacheEntry **cache_entry, BOOL load) + BOOL automatic, DataCacheEntry **cache_entry) { HRESULT hr; - - hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed, load); + DWORD id = automatic ? 1 : This->last_cache_id; + DataCacheEntry *entry; + + hr = check_valid_clipformat_and_tymed(formatetc->cfFormat, formatetc->tymed); if (FAILED(hr)) return hr; if (hr == CACHE_S_FORMATETC_NOTSUPPORTED) TRACE("creating unsupported format %d\n", formatetc->cfFormat); - *cache_entry = HeapAlloc(GetProcessHeap(), 0, sizeof(**cache_entry)); - if (!*cache_entry) + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); + if (!entry) return E_OUTOFMEMORY; - if (!init_cache_entry(*cache_entry, formatetc, advf, This->last_cache_id)) + if (!init_cache_entry(entry, formatetc, advf, id)) goto fail; - list_add_tail(&This->cache_list, &(*cache_entry)->entry); - This->last_cache_id++; - + if (automatic) + list_add_head(&This->cache_list, &entry->entry); + else + { + list_add_tail(&This->cache_list, &entry->entry); + This->last_cache_id++; + } + + if (cache_entry) *cache_entry = entry; return hr; fail: - HeapFree(GetProcessHeap(), 0, *cache_entry); + HeapFree(GetProcessHeap(), 0, entry); return E_OUTOFMEMORY; } @@ -783,7 +793,7 @@ header.unknown3 = 4; header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; - header.tymed = cache_entry->stgmedium.tymed; + header.advf = cache_entry->advise_flags; header.unknown7 = 0; header.dwObjectExtentX = 0; header.dwObjectExtentY = 0; @@ -1011,6 +1021,66 @@ IStream_Release(cache_entry->stream); cache_entry->stream = NULL; } +} + +static inline DWORD tymed_from_cf( DWORD cf ) +{ + switch( cf ) + { + case CF_BITMAP: return TYMED_GDI; + case CF_METAFILEPICT: return TYMED_MFPICT; + case CF_ENHMETAFILE: return TYMED_ENHMF; + case CF_DIB: + default: return TYMED_HGLOBAL; + } +} + +/**************************************************************** + * create_automatic_entry + * + * Creates an appropriate cache entry for one of the CLSID_Picture_ + * classes. The connection id of the entry is one. Any pre-existing + * automatic entry is re-assigned a new connection id, and moved to + * the end of the list. + */ +static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) +{ + static const struct data + { + const CLSID *clsid; + FORMATETC fmt; + } data[] = + { + { &CLSID_Picture_Dib, { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { &CLSID_Picture_Metafile, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT } }, + { &CLSID_Picture_EnhMetafile, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, + { NULL } + }; + const struct data *ptr = data; + struct list *head; + DataCacheEntry *entry; + + if (IsEqualCLSID( &cache->clsid, clsid )) return S_OK; + + /* move and reassign any pre-existing automatic entry */ + if ((head = list_head( &cache->cache_list ))) + { + entry = LIST_ENTRY( head, DataCacheEntry, entry ); + if (entry->id == 1) + { + list_remove( &entry->entry ); + entry->id = cache->last_cache_id++; + list_add_tail( &cache->cache_list, &entry->entry ); + } + } + + while (ptr->clsid) + { + if (IsEqualCLSID( clsid, ptr->clsid )) + return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + ptr++; + } + return S_OK; } /********************************************************* @@ -1334,22 +1404,9 @@ static HRESULT WINAPI DataCache_GetClassID(IPersistStorage *iface, CLSID *clsid) { DataCache *This = impl_from_IPersistStorage( iface ); - HRESULT hr; - STATSTG statstg; - - TRACE( "(%p, %p)\n", iface, clsid ); - - if (This->presentationStorage) - { - hr = IStorage_Stat( This->presentationStorage, &statstg, STATFLAG_NONAME ); - if (SUCCEEDED(hr)) - { - *clsid = statstg.clsid; - return S_OK; - } - } - - *clsid = CLSID_NULL; + + TRACE( "(%p, %p) returning %s\n", iface, clsid, debugstr_guid(&This->clsid) ); + *clsid = This->clsid; return S_OK; } @@ -1386,22 +1443,33 @@ IStorage* pStg) { DataCache *This = impl_from_IPersistStorage(iface); + CLSID clsid; + HRESULT hr; TRACE("(%p, %p)\n", iface, pStg); if (This->presentationStorage != NULL) - IStorage_Release(This->presentationStorage); + return CO_E_ALREADYINITIALIZED; This->presentationStorage = pStg; IStorage_AddRef(This->presentationStorage); This->dirty = TRUE; + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED(hr)) + { + IStorage_Release( pStg ); + This->presentationStorage = NULL; + return hr; + } + This->clsid = clsid; return S_OK; } -static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *stm, +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD advf, IStream *stm, enum stream_type type ) { DataCacheEntry *cache_entry; @@ -1411,7 +1479,7 @@ cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); if (!cache_entry) - hr = DataCache_CreateEntry( This, fmt, 0, &cache_entry, TRUE ); + hr = DataCache_CreateEntry( This, fmt, advf, FALSE, &cache_entry ); if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); @@ -1457,9 +1525,9 @@ fmtetc.ptd = NULL; /* FIXME */ fmtetc.dwAspect = header.dvAspect; fmtetc.lindex = header.lindex; - fmtetc.tymed = header.tymed; - - add_cache_entry( This, &fmtetc, stm, pres_stream ); + fmtetc.tymed = tymed_from_cf( clipformat ); + + add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); } IStream_Release( stm ); } @@ -1490,7 +1558,7 @@ return E_FAIL; } - return add_cache_entry( This, fmt, stm, contents_stream ); + return add_cache_entry( This, fmt, 0, stm, contents_stream ); } static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; @@ -1508,10 +1576,21 @@ DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; IStream *stm; + CLSID clsid; + DataCacheEntry *entry, *cursor2; TRACE("(%p, %p)\n", iface, pStg); IPersistStorage_HandsOffStorage( iface ); + + LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) + DataCacheEntry_Destroy( This, entry ); + + ReadClassStg( pStg, &clsid ); + hr = create_automatic_entry( This, &clsid ); + if (FAILED( hr )) return hr; + + This->clsid = clsid; hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); @@ -2162,7 +2241,7 @@ return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry, FALSE); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) { @@ -2593,11 +2672,15 @@ newObject->sinkAspects = 0; newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; + newObject->clsid = CLSID_NULL; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); - newObject->last_cache_id = 1; + newObject->last_cache_id = 2; newObject->dirty = FALSE; newObject->running_object = NULL; + + create_automatic_entry( newObject, clsid ); + newObject->clsid = *clsid; return newObject; } Modified: trunk/reactos/dll/win32/ole32/drag_copy.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_copy.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/drag_link.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_link.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/drag_move.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/drag_move.… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/nodrop.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/nodrop.cur… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -54,6 +54,15 @@ } /*********************************************************************** + * OleGetIconOfFile [OLE32.@] + */ +HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) +{ + FIXME("(%s, %d), stub!\n", debugstr_w(path), use_file_as_label); + return NULL; +} + +/*********************************************************************** * OleRegEnumFormatEtc [OLE32.@] */ HRESULT WINAPI DECLSPEC_HOTPATCH OleRegEnumFormatEtc ( @@ -74,12 +83,3 @@ FIXME("stub!\n"); return E_NOTIMPL; } - -/*********************************************************************** - * OleGetIconOfFile [OLE32.@] - */ -HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) -{ - FIXME("(%p, %d), stub!\n", path, use_file_as_label); - return NULL; -} Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Sun Sep 17 22:56:11 2017 @@ -236,7 +236,7 @@ @ stdcall OleGetAutoConvert(ptr ptr) @ stdcall OleGetClipboard(ptr) @ stdcall OleGetIconOfClass(ptr ptr long) -@ stdcall OleGetIconOfFile(ptr long) +@ stdcall OleGetIconOfFile(wstr long) @ stdcall OleInitialize(ptr) @ stdcall OleInitializeWOW(long long) @ stdcall OleIsCurrentClipboard(ptr) 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] Sun Sep 17 22:56:11 2017 @@ -139,7 +139,7 @@ reactos/dll/win32/objsel # Synced to WineStaging-2.9 reactos/dll/win32/odbc32 # Synced to WineStaging-2.9. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-2.9 -reactos/dll/win32/ole32 # Synced to WineStaging-2.9 +reactos/dll/win32/ole32 # Synced to WineStaging-2.16 reactos/dll/win32/oleacc # Synced to WineStaging-2.9 reactos/dll/win32/oleaut32 # Synced to WineStaging-2.9 reactos/dll/win32/olecli32 # Synced to WineStaging-2.9

7 years

[akhaldi] 75889: [MSIMG32] Sync with Wine Staging 2.16. CORE-13762 f77bf35 msimg32: Label ordinals.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:55:42 2017 New Revision: 75889 URL: http://svn.reactos.org/svn/reactos?rev=75889&view=rev Log: [MSIMG32] Sync with Wine Staging 2.16. CORE-13762 f77bf35 msimg32: Label ordinals. Modified: trunk/reactos/dll/win32/msimg32/msimg32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msimg32/msimg32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/msimg32.… ============================================================================== --- trunk/reactos/dll/win32/msimg32/msimg32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimg32/msimg32.spec [iso-8859-1] Sun Sep 17 22:55:42 2017 @@ -1,5 +1,5 @@ +1 stdcall vSetDdrawflag() @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend @ stdcall -private DllInitialize(long long ptr) DllMain @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt -@ stdcall vSetDdrawflag() 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] Sun Sep 17 22:55:42 2017 @@ -113,7 +113,7 @@ reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/msi # Synced to WineStaging-2.9 -reactos/dll/win32/msimg32 # Synced to WineStaging-2.9 +reactos/dll/win32/msimg32 # Synced to WineStaging-2.16 reactos/dll/win32/msimtf # Synced to WineStaging-2.9 reactos/dll/win32/msisip # Synced to WineStaging-2.9 reactos/dll/win32/msisys.ocx # Synced to WineStaging-2.9

7 years

[ekohl] 75888: syssetup: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13785

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Sep 17 22:55:33 2017 New Revision: 75888 URL: http://svn.reactos.org/svn/reactos?rev=75888&view=rev Log: syssetup: Improve Japanese translation Patch by Katayama Hirofumi MZ. CORE-13785 Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Sep 17 22:55:33 2017 @@ -6,8 +6,8 @@ FONT 9, "MS UI Gothic" BEGIN LTEXT "ReactOSã»ããã¢ãã ã¦ã£ã¶ã¼ãã¸ããããã", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "ãã®ã¦ã£ã¶ã¼ãã§ã¯ãReactOS ãã³ã³ãã¥ã¼ã¿ã«ã¤ã³ã¹ãã¼ã«ãã¾ãã ReactOSãæ£ããã»ããã¢ããããããã«ãã¦ã¼ã¶ã¼ã¨ã³ã³ãã¥ã¼ã¿ã« é¢ããæå ±ãéããå¿è¦ãããã¾ãã", IDC_STATIC, 115, 40, 195, 100 - LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ãã®ã¦ã£ã¶ã¼ãã§ã¯ãReactOS ãã³ã³ãã¥ã¼ã¿ã«ã¤ã³ã¹ãã¼ã«ãã¾ããReactOS ãæ£ããã»ããã¢ããããããã«ãã¦ã¼ã¶ã¼ã¨ã³ã³ãã¥ã¼ã¿ã«é¢ããæå ±ãéããå¿è¦ãããã¾ãã", IDC_STATIC, 115, 40, 195, 100 + LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 115, 169, 195, 17 END IDD_ACKPAGE DIALOGEX 0, 0, 317, 143 @@ -15,11 +15,11 @@ CAPTION "ReactOS ã»ããã¢ãã" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN - LTEXT "ReactOSã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨æãã¾ãã ãããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ReactOSã®éçºã«å©ç¨ããã¾ããã", IDC_STATIC, 15, 7, 286, 19 + LTEXT "ReactOS ã®éçºèãããä¸è¨ã®ãªã¼ãã³ã½ã¼ã¹ ããã¸ã§ã¯ãã«æè¬ã®æãè¡¨æãã¾ãããããã®ãã¹ã¦ã¾ãã¯ä¸é¨ã¯ ReactOS ã®éçºã«å©ç¨ããã¾ããã", IDC_STATIC, 15, 7, 286, 19 LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL - LTEXT "ReactOSã¯GPLã®ä¸ã«ã©ã¤ã»ã³ã¹ããã¦ããããã¹ã¦ã¾ãã¯ä¸é¨ãåå©ç¨ã åéå¸ããå ´åã¯GPLã«å¾ãå¿è¦ãããã¾ãã", IDC_STATIC, 15, 110, 227, 19 + LTEXT "ReactOS ã¯ GPL ã®ä¸ã«ã©ã¤ã»ã³ã¹ããã¦ããããã¹ã¦ã¾ãã¯ä¸é¨ãåå©ç¨ã åéå¸ããå ´åã¯ GPL ã«å¾ãå¿è¦ãããã¾ãã", IDC_STATIC, 15, 110, 227, 19 PUSHBUTTON "GPLãè¡¨ç¤º(&V)...", IDC_VIEWGPL, 251, 110, 50, 19 - LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 15, 136, 195, 17 + LTEXT "ã»ããã¢ãããç¶è¡ããã«ã¯ [æ¬¡ã¸] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 15, 136, 195, 17 END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -28,7 +28,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ååã¨ä¼ç¤¾åã¾ãã¯çµç¹åãå¥åãã¦ãã ããã", IDC_STATIC, 54, 7, 242, 21 + LTEXT "ååã¨ä¼ç¤¾åã¾ãã¯çµç¹åãå¥åãã¦ä¸ããã", IDC_STATIC, 54, 7, 242, 21 LTEXT "åå(&M):", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "çµç¹å(&O):", IDC_STATIC, 54, 57, 44, 8 @@ -41,12 +41,12 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ã³ã³ãã¥ã¼ã¿åãåè§63æåä»¥åã§å¥åãã¦ãã ããã ã³ã³ãã¥ã¼ã¿ããããã¯ã¼ã¯ä¸ã«ããå ´åã¯ãååãéè¤ããªãããã«ãã¦ãã ããã", IDC_STATIC, 54, 7, 250, 24 + LTEXT "ã³ã³ãã¥ã¼ã¿åãåè§ 63 æåä»¥åã§å¥åãã¦ä¸ãããã³ã³ãã¥ã¼ã¿ããããã¯ã¼ã¯ä¸ã«ããå ´åã¯ãååãéè¤ããªãããã«ãã¦ä¸ããã", IDC_STATIC, 54, 7, 250, 24 LTEXT "ã³ã³ãã¥ã¼ã¿å(&C):", IDC_STATIC, 54, 38, 75, 8 EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 - LTEXT "Administratorã¨å¼ã°ããã¦ã¼ã¶ã¼ã¢ã«ã¦ã³ããä½æãã¾ãã ã³ã³ãã¥ã¼ã¿ã«ãã«ã¢ã¯ã»ã¹ãå¿è¦ãªã¨ãããã®ã¢ã«ã¦ã³ããä½¿ç¨ãã¾ãã", IDC_STATIC, 54, 57, 250, 25 - LTEXT "Administratorã®ãã¹ã¯ã¼ããåè§ 127 æåä»¥åã§å¥åãã¦ãã ããã", IDC_STATIC, 54, 87, 250, 8 + LTEXT "Administrator ã¨å¼ã°ããã¦ã¼ã¶ã¼ ã¢ã«ã¦ã³ããä½æãã¾ããã³ã³ãã¥ã¼ã¿ã«ãã«ã¢ã¯ã»ã¹ãå¿è¦ãªã¨ãããã®ã¢ã«ã¦ã³ããä½¿ç¨ãã¾ãã", IDC_STATIC, 54, 57, 250, 25 + LTEXT "Administrator ã®ãã¹ã¯ã¼ããåè§ 127 æåä»¥åã§å¥åãã¦ä¸ããã", IDC_STATIC, 54, 87, 250, 8 LTEXT "Administrator ã®ãã¹ã¯ã¼ã(&A):", IDC_STATIC, 54, 104, 105, 8 EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "ãã¹ã¯ã¼ãã®ç¢ºèªå¥å(&O):", IDC_STATIC, 54, 123, 105, 8 @@ -59,13 +59,13 @@ FONT 9, "MS UI Gothic" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 - LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ãã ããã ã¦ã¼ã¶ã¼ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã ", IDC_STATIC, 53, 7, 253, 20 + LTEXT "ã·ã¹ãã ã®ãã±ã¼ã«ããã¢ããªã±ã¼ã·ã§ã³ã§ä½¿ç¨ãããè¨èªã«è¨å®ãã¦ä¸ãããã¦ã¼ã¶ã¼ ãã±ã¼ã«ã¯ãæ°å¤ãéè²¨ãæ¥ä»ã®è¡¨ç¤ºæ¹æ³ãå¶å¾¡ãã¾ãã", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "ã·ã¹ãã ãã¦ã¼ã¶ã¼ãã±ã¼ã«è¨å®å¤æ´ã«ã¯[ã«ã¹ã¿ãã¤ãº]ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 50, 166, 25 + LTEXT "ã·ã¹ãã ãã¦ã¼ã¶ã¼ ãã±ã¼ã«è¨å®å¤æ´ã«ã¯ [ã«ã¹ã¿ãã¤ãº] ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 50, 166, 25 PUSHBUTTON "ã«ã¹ã¿ãã¤ãº(&C)...", IDC_CUSTOMLOCALE, 220, 52, 80, 14 LTEXT "ãã¼ãã¼ã ã¬ã¤ã¢ã¦ãã¯ããã¼ãæ¼ããã¨ãã«ã©ã®æåãå¥åãããããå¶å¾¡ãã¾ãã", IDC_STATIC, 53, 81, 253, 20 LTEXT "", IDC_LAYOUTTEXT, 53, 106, 250, 14 - LTEXT "ãã¼ãã¼ãã¬ã¤ã¢ã¦ãå¤æ´ã«ã¯[ã«ã¹ã¿ãã¤ãº]ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 120, 166, 25 + LTEXT "ãã¼ãã¼ã ã¬ã¤ã¢ã¦ãå¤æ´ã«ã¯ [ã«ã¹ã¿ãã¤ãº] ãã¯ãªãã¯ãã¾ãã", IDC_STATIC, 53, 120, 166, 25 PUSHBUTTON "ã«ã¹ã¿ãã¤ãº(&U)...", IDC_CUSTOMLAYOUT, 220, 122, 80, 14 END @@ -110,12 +110,12 @@ LTEXT "ReactOS ã»ããã¢ãã ã¦ã£ã¶ã¼ãã®å®äº", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "ReactOS ã»ããã¢ãããæ£å¸¸ã«å®äºãã¾ããã\n\n[å®äº] ãã¯ãªãã¯ããã¨ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã¾ãã", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "ãã©ã¤ãã«CDãããå ´åã¯åãåºãã¦ãã ããã åèµ·åããã«ã¯ å®äºãã¯ãªãã¯ãã¦ãã ããã", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ãã©ã¤ãã« CD ãããå ´åã¯åãåºãã¦ä¸ãããåèµ·åããã«ã¯ [å®äº] ãã¯ãªãã¯ãã¦ä¸ããã", IDC_STATIC, 115, 169, 195, 17 END IDD_GPL DIALOGEX 0, 0, 333, 230 STYLE DS_SHELLFONT | DS_CENTER | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "GNU General Public License" +CAPTION "GNU ä¸è¬å¬è¡å©ç¨è¨±è«¾æ¸" FONT 9, "MS UI Gothic" BEGIN EDITTEXT IDC_GPL_TEXT, 7, 7, 319, 190, ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL @@ -124,7 +124,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0, 0, 274, 26 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "ãå¾ã¡ãã ãã..." +CAPTION "ãå¾ã¡ä¸ãã..." FONT 9, "MS UI Gothic", 400, 0, 1 BEGIN LTEXT "", IDC_STATUSLABEL, 7, 8, 234, 12, SS_WORDELLIPSIS @@ -141,10 +141,10 @@ IDS_LOCALETITLE "å°åã®è¨å®" IDS_LOCALESUBTITLE "ReactOS ãæ§ããªå°åã¨è¨èªã«ãããã¦ã«ã¹ã¿ãã¤ãºãããã¨ãã§ãã¾ãã" IDS_DATETIMETITLE "æ¥ä»ã¨æå»" - IDS_DATETIMESUBTITLE "ã³ã³ãã¥ã¼ã¿ã®æ¥ä»ã¨æå»ãæ£ããè¨å®ãã¦ãã ããã" + IDS_DATETIMESUBTITLE "ã³ã³ãã¥ã¼ã¿ã®æ¥ä»ã¨æå»ãæ£ããè¨å®ãã¦ä¸ããã" IDS_PROCESSTITLE "ã³ã³ãã¼ãã³ãã®ç»é²ä¸" - IDS_PROCESSSUBTITLE "ãå¾ã¡ãã ãã..." - IDS_THEMESELECTIONTITLE "ã¢ãã¢ã©ã³ã¹" + IDS_PROCESSSUBTITLE "ãå¾ã¡ä¸ãã..." + IDS_THEMESELECTIONTITLE "å¤è¦³" IDS_THEMESELECTIONSUBTITLE "å¥½ããªãã¼ãããé¸ã³ä¸ãã" END @@ -153,10 +153,10 @@ IDS_REACTOS_SETUP "ReactOS ã»ããã¢ãã" IDS_UNKNOWN_ERROR "ä¸æãªã¨ã©ã¼" IDS_REGISTERING_COMPONENTS "ã³ã³ãã¼ãã³ããç»é²ãã¦ãã¾ã..." - IDS_LOADLIBRARY_FAILED "LoadLibraryã«å¤±æ: " - IDS_GETPROCADDR_FAILED "GetProcAddrã«å¤±æ: " - IDS_REGSVR_FAILED "DllRegisterServerã«å¤±æ: " - IDS_DLLINSTALL_FAILED "DllInstallã«å¤±æ: " + IDS_LOADLIBRARY_FAILED "LoadLibrary ã«å¤±æ: " + IDS_GETPROCADDR_FAILED "GetProcAddr ã«å¤±æ: " + IDS_REGSVR_FAILED "DllRegisterServer ã«å¤±æ: " + IDS_DLLINSTALL_FAILED "DllInstall ã«å¤±æ: " IDS_TIMEOUT "ç»é²ä¸ã«ã¿ã¤ã ã¢ã¦ããã¾ãã" IDS_REASON_UNKNOWN "" /* @@ -174,10 +174,10 @@ IDS_WZD_NAME "ã»ããã¢ããã¯ã¦ã¼ã¶åãå¥åãããã¾ã§ç¶è¡ã§ãã¾ããã" IDS_WZD_SETCOMPUTERNAME "ã³ã³ãã¥ã¼ã¿åã®è¨å®ã«å¤±æãã¾ããã" IDS_WZD_COMPUTERNAME "ã»ããã¢ããã¯ã³ã³ãã¥ã¼ã¿åãå¥åãããã¾ã§ç¶è¡ã§ãã¾ããã" - IDS_WZD_PASSWORDEMPTY "ãã¹ã¯ã¼ããå¥åãã¦ãã ãã !" - IDS_WZD_PASSWORDMATCH "å¥åããããã¹ã¯ã¼ããä¸è´ãã¾ããã ããä¸åº¦æã¾ãããã¹ã¯ã¼ããå¥åãã¦ãã ããã" - IDS_WZD_PASSWORDCHAR "å¥åããããã¹ã¯ã¼ãã«ã¯ç¡å¹ãªæåãå«ã¾ãã¦ãã¾ãã æå¹ãªãã¹ã¯ã¼ããå¥åãã¦ãã ããã" - IDS_WZD_LOCALTIME "ã»ããã¢ããã¯ãã¼ã«ã«ã¿ã¤ã ãè¨å®ã§ãã¾ããã§ããã" + IDS_WZD_PASSWORDEMPTY "ãã¹ã¯ã¼ããå¥åãã¦ä¸ããï¼" + IDS_WZD_PASSWORDMATCH "å¥åããããã¹ã¯ã¼ããä¸è´ãã¾ãããããä¸åº¦æã¾ãããã¹ã¯ã¼ããå¥åãã¦ä¸ããã" + IDS_WZD_PASSWORDCHAR "å¥åããããã¹ã¯ã¼ãã«ã¯ç¡å¹ãªæåãå«ã¾ãã¦ãã¾ããæå¹ãªãã¹ã¯ã¼ããå¥åãã¦ä¸ããã" + IDS_WZD_LOCALTIME "ã»ããã¢ããã¯ãã¼ã«ã« ã¿ã¤ã ãè¨å®ã§ãã¾ããã§ããã" END STRINGTABLE

7 years

[akhaldi] 75887: [MSACM32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:55:26 2017 New Revision: 75887 URL: http://svn.reactos.org/svn/reactos?rev=75887&view=rev Log: [MSACM32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c… ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Sun Sep 17 22:55:26 2017 @@ -38,9 +38,194 @@ DWORD_PTR dwInstance, DWORD fdwSupport) { + MMRESULT rc; + HACMDRIVER had; + if (winetest_interactive) trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag); + rc = acmDriverOpen(&had, hadid, 0); + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, + "acmDriverOpen(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + if (rc == MMSYSERR_NOERROR) + { + ACMFORMATDETAILSA fd = {0}; + WAVEFORMATEX *pwfx, dst; + ACMFORMATTAGDETAILSA aftd_pcm = {0}; + DWORD dwSize, dwSizeMax; + DWORD i; + + fd.cbStruct = sizeof(fd); + if (paftd->cbFormatSize < sizeof(WAVEFORMATEX)) + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WAVEFORMATEX)); + else + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, paftd->cbFormatSize); + fd.pwfx = pwfx; + fd.cbwfx = paftd->cbFormatSize; + fd.dwFormatTag = paftd->dwFormatTag; + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* try bad wFormatTag */ + fd.pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx->wFormatTag = paftd->dwFormatTag; + + /* try bad fdwSupport */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = sizeof(PCMWAVEFORMAT)-1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = paftd->cbFormatSize; + + /* test bad parameters (all zero) */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_FORMAT); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test acmFormatSuggest */ + + /* if we don't specify a format, we must give at least the driver's maximum size for any format */ + acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &dwSize); + rc = acmFormatSuggest(had, pwfx, &dst, dwSize-1, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(had, pwfx, &dst, dwSize, 0); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* if we do specify a format, we must give at least the driver's maximum size for that format */ + aftd_pcm.cbStruct = sizeof(aftd_pcm); + aftd_pcm.dwFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatTagDetailsA(had, &aftd_pcm, ACM_FORMATTAGDETAILSF_LARGESTSIZE); + ok(rc == MMSYSERR_NOERROR, "returned %08x\n", rc); + + dst.wFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatSuggest(had, pwfx, &dst, aftd_pcm.cbFormatSize-1, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(had, pwfx, &dst, aftd_pcm.cbFormatSize, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test nonexistent format */ + dst.wFormatTag = 0xbeef; + rc = acmFormatSuggest(had, pwfx, &dst, 0, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE || rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* if the driver is NULL, we must give at least the maximum size for any driver */ + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &dwSizeMax); + rc = acmFormatSuggest(NULL, pwfx, &dst, dwSizeMax-1, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + { + rc = acmFormatSuggest(NULL, pwfx, &dst, dwSizeMax, 0); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + } + + /* if we specify a dst format, we must give the maximum size for that format */ + dst.wFormatTag = WAVE_FORMAT_PCM; + rc = acmFormatSuggest(NULL, pwfx, &dst, aftd_pcm.cbFormatSize-1, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == MMSYSERR_INVALPARAM || broken (rc == ACMERR_NOTPOSSIBLE), /* WinXP */ + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(NULL, pwfx, &dst, aftd_pcm.cbFormatSize, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + dst.wFormatTag = paftd->dwFormatTag; + rc = acmFormatSuggest(NULL, pwfx, &dst, paftd->cbFormatSize-1, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == MMSYSERR_INVALPARAM || broken (rc == ACMERR_NOTPOSSIBLE), /* WinXP */ + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + rc = acmFormatSuggest(NULL, pwfx, &dst, paftd->cbFormatSize, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test nonexistent format */ + dst.wFormatTag = 0xbeef; + rc = acmFormatSuggest(NULL, pwfx, &dst, 0, ACM_FORMATSUGGESTF_WFORMATTAG); + ok(rc == ACMERR_NOTPOSSIBLE || rc == MMSYSERR_INVALPARAM, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + /* test index */ + for (i = 0; i < paftd->cStandardFormats; i++) + { + fd.dwFormatIndex = i; + + fd.fdwSupport = 0; + fd.cbwfx = paftd->cbFormatSize; + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + /* Windows will write cbSize (and other data) even if the + * given cbwfx is not large enough */ + fd.fdwSupport = 0; + fd.cbwfx = sizeof(PCMWAVEFORMAT); + fd.pwfx->cbSize = 0xbeef; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + todo_wine_if(rc != MMSYSERR_NOERROR) /* remove when fixed */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + todo_wine_if(fd.pwfx->cbSize != paftd->cbFormatSize - sizeof(WAVEFORMATEX)) /* remove when fixed */ + ok(fd.pwfx->cbSize == paftd->cbFormatSize - sizeof(WAVEFORMATEX), + "got %d\n", fd.pwfx->cbSize); + } + + /* one more */ + fd.dwFormatIndex = paftd->cStandardFormats; + fd.fdwSupport = 0; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + HeapFree(GetProcessHeap(), 0, pwfx); + } return TRUE; } @@ -49,8 +234,82 @@ DWORD_PTR dwInstance, DWORD fd) { + MMRESULT rc; + HACMDRIVER had; + WAVEFORMATEX *dst, *dstMax; + DWORD dwSize, dwSizeMax; + DWORD fdwSupport; + + acmMetrics((HACMOBJ)hadid, ACM_METRIC_DRIVER_SUPPORT, &fdwSupport); + if (winetest_interactive) trace(" 0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat); + + acmDriverOpen(&had, hadid, 0); + dwSize = pafd->cbwfx; + dst = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); + + /* test acmFormatSuggest with valid src format */ + if (pafd->dwFormatTag == WAVE_FORMAT_PCM) + { + rc = acmFormatSuggest(had, pafd->pwfx, dst, dwSize, 0); + /* this fails on some decode-only drivers */ + ok(rc == MMSYSERR_NOERROR || rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + if (rc == MMSYSERR_NOERROR) + { + if (fdwSupport & ACMDRIVERDETAILS_SUPPORTF_CODEC) /* supports different conversions */ + ok(dst->wFormatTag != WAVE_FORMAT_PCM, "expected different format\n"); + else + ok(dst->wFormatTag == WAVE_FORMAT_PCM, + "expected %d, got %d\n", WAVE_FORMAT_PCM, dst->wFormatTag); + } + } + else + { + rc = acmFormatSuggest(had, pafd->pwfx, dst, dwSize, 0); + ok(rc == MMSYSERR_NOERROR, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + ok(dst->wFormatTag == WAVE_FORMAT_PCM, + "expected %d, got %d\n", WAVE_FORMAT_PCM, dst->wFormatTag); + ok(dst->nChannels == pafd->pwfx->nChannels, + "expected %d, got %d\n", pafd->pwfx->nChannels, dst->nChannels); + if (pafd->dwFormatTag != 0x42) /* codec 0x0042 returns a different sample rate */ + ok(dst->nSamplesPerSec == pafd->pwfx->nSamplesPerSec, + "expected %d, got %d\n", pafd->pwfx->nSamplesPerSec, dst->nSamplesPerSec); + ok(dst->wBitsPerSample == 16, + "expected %d, got %d\n", 16, dst->wBitsPerSample); + ok(dst->nBlockAlign == 2*pafd->pwfx->nChannels, + "expected %d, got %d\n", 2*pafd->pwfx->nChannels, dst->nBlockAlign); + + /* test with NULL driver */ + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &dwSizeMax); + dstMax = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSizeMax); + rc = acmFormatSuggest(NULL, pafd->pwfx, dstMax, dwSizeMax, 0); + ok(rc == MMSYSERR_NOERROR, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + + HeapFree(GetProcessHeap(), 0, dstMax); + } + + ZeroMemory(dst, dwSize); + dst->wFormatTag = pafd->pwfx->wFormatTag; + rc = acmFormatSuggest(had, pafd->pwfx, dst, dwSize, ACM_FORMATSUGGESTF_WFORMATTAG); + if (fdwSupport & ACMDRIVERDETAILS_SUPPORTF_CONVERTER) /* supports same conversions */ + ok(rc == MMSYSERR_NOERROR, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, MMSYSERR_NOERROR); + else + todo_wine_if(rc != ACMERR_NOTPOSSIBLE) + ok(rc == ACMERR_NOTPOSSIBLE, + "acmFormatSuggest(): rc = %08x, should be %08x\n", + rc, ACMERR_NOTPOSSIBLE); + + HeapFree(GetProcessHeap(), 0, dst); + acmDriverClose(had, 0); return TRUE; } @@ -330,18 +589,46 @@ "acmFormatEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_INVALPARAM); - if (dwSize < sizeof(WAVEFORMATEX)) - dwSize = sizeof(WAVEFORMATEX); - pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); - pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); + if (dwSize >= sizeof(WAVEFORMATEX)) + pwfx->cbSize = LOWORD(dwSize) - sizeof(WAVEFORMATEX); pwfx->wFormatTag = WAVE_FORMAT_UNKNOWN; fd.cbStruct = sizeof(fd); fd.pwfx = pwfx; fd.cbwfx = dwSize; fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try bad callback */ + rc = acmFormatEnumA(had, &fd, NULL, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad pwfx */ + fd.pwfx = NULL; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.pwfx = pwfx; + + /* fdwSupport must be zero */ + fd.fdwSupport = 0xdeadbeef; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.fdwSupport = 0; + + /* try bad pwfx structure size */ + fd.cbwfx = dwSize-1; + rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatEnumA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + fd.cbwfx = dwSize; /* try valid parameters */ rc = acmFormatEnumA(had, &fd, FormatEnumProc, 0, 0); @@ -382,6 +669,37 @@ ok(rc == MMSYSERR_NOERROR, "acmFormatTagEnumA(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); + + /* try bad pointer */ + rc = acmFormatDetailsA(had, NULL, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + /* try bad structure size */ + ZeroMemory(&fd, sizeof(fd)); + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd) - 1; + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); + + fd.cbStruct = sizeof(fd); + fd.pwfx = pwfx; + ZeroMemory(fd.pwfx, dwSize); + fd.cbwfx = dwSize; + fd.dwFormatTag = WAVE_FORMAT_UNKNOWN; + + /* try WAVE_FORMAT_UNKNOWN */ + rc = acmFormatDetailsA(had, &fd, ACM_FORMATDETAILSF_INDEX); + ok(rc == MMSYSERR_INVALPARAM, + "acmFormatDetailsA(): rc = %08x, should be %08x\n", + rc, MMSYSERR_INVALPARAM); HeapFree(GetProcessHeap(), 0, pwfx); @@ -724,11 +1042,112 @@ ok(mr == MMSYSERR_NOERROR, "close failed: 0x%x\n", mr); } +static const BYTE input[64] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}; + +struct stream_output +{ + WAVEFORMATEX src; + WAVEFORMATEX dst; + BYTE output[256]; + DWORD dst_used; + BOOL todo; +}; + +static const struct stream_output expected_output[] = { + /* #0: Identical conversion */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + + /* #1: 1 -> 2 channels */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, + + /* #2: 2 -> 1 channels: all of the audio underflows due to addition */ + {{WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, 32, FALSE}, + + /* #3: 2 -> 2 channels */ + {{WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {WAVE_FORMAT_PCM, 2, 8000, 16000, 2, 8}, {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63}, 64, FALSE}, + + /* #4: 8 -> 16 bits per sample */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 16000, 2, 16}, {0,128,0,129,0,130,0,131,0,132,0,133,0,134,0,135,0,136,0,137,0,138,0,139,0,140,0,141,0,142,0,143,0,144,0,145,0,146,0,147,0,148,0,149,0,150,0,151,0,152,0,153,0,154,0,155,0,156,0,157,0,158,0,159,0,160,0,161,0,162,0,163,0,164,0,165,0,166,0,167,0,168,0,169,0,170,0,171,0,172,0,173,0,174,0,175,0,176,0,177,0,178,0,179,0,180,0,181,0,182,0,183,0,184,0,185,0,186,0,187,0,188,0,189,0,190,0,191}, 128, FALSE}, + + /* #5: 16 -> 8 bits per sample */ + {{WAVE_FORMAT_PCM, 1, 8000, 16000, 2, 16}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {129,131,133,135,137,139,141,143,145,147,149,151,153,155,157,159,161,163,165,167,169,171,173,175,177,179,181,183,185,187,189,191}, 32, FALSE}, + + /* #6: 16 bits per sample, 2 -> 1 channels */ + {{WAVE_FORMAT_PCM, 2, 8000, 32000, 4, 16}, {WAVE_FORMAT_PCM, 1, 8000, 16000, 2, 16}, {2,4,10,12,18,20,26,28,34,36,42,44,50,52,58,60,66,68,74,76,82,84,90,92,98,100,106,108,114,116,122,124}, 32, FALSE}, + + /* #7: 8000 -> 11025 sample rate */ + /* FIXME: upsampling is slightly off on wine - the algorithm is wrong whenever error > (srcrate + dstrate) / 2 */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {0,1,1,2,3,4,4,5,6,7,7,8,9,9,10,11,12,12,13,14,15,15,16,17,17,18,19,20,20,21,22,22,23,24,25,25,26,27,28,28,29,30,30,31,32,33,33,34,35,36,36,37,38,38,39,40,41,41,42,43,44,44,45,46,46,47,48,49,49,50,51,52,52,53,54,54,55,56,57,57,58,59,60,60,61,62,62,63}, 88, TRUE}, + + /* #8: 8000 -> 22050 sample rate */ + {{WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {0,0,1,1,1,2,2,3,3,3,4,4,4,5,5,5,6,6,7,7,7,8,8,8,9,9,9,10,10,11,11,11,12,12,12,13,13,13,14,14,15,15,15,16,16,16,17,17,17,18,18,19,19,19,20,20,20,21,21,21,22,22,22,23,23,24,24,24,25,25,25,26,26,26,27,27,28,28,28,29,29,29,30,30,30,31,31,32,32,32,33,33,33,34,34,34,35,35,36,36,36,37,37,37,38,38,38,39,39,40,40,40,41,41,41,42,42,42,43,43,44,44,44,45,45,45,46,46,46,47,47,48,48,48,49,49,49,50,50,50,51,51,52,52,52,53,53,53,54,54,54,55,55,56,56,56,57,57,57,58,58,58,59,59,60,60,60,61,61,61,62,62,62,63,63,63}, 176, TRUE}, + + /* #9: 11025 -> 22050 sample rate */ + {{WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22,22,23,23,24,24,25,25,26,26,27,27,28,28,29,29,30,30,31,31,32,32,33,33,34,34,35,35,36,36,37,37,38,38,39,39,40,40,41,41,42,42,43,43,44,44,45,45,46,46,47,47,48,48,49,49,50,50,51,51,52,52,53,53,54,54,55,55,56,56,57,57,58,58,59,59,60,60,61,61,62,62,63,63}, 128, FALSE}, + + /* #10: 22050 -> 11025 sample rate */ + {{WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59,61,63}, 32, FALSE}, + + /* #11: 11025 -> 8000 sample rate */ + {{WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {0,2,3,4,6,7,8,10,11,13,14,15,17,18,19,21,22,24,25,26,28,29,31,32,33,35,36,37,39,40,42,43,44,46,47,48,50,51,53,54,55,57,58,59,61,62}, 46, FALSE}, + + /* #12: 22050 -> 8000 sample rate */ + {{WAVE_FORMAT_PCM, 1, 22050, 22050, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {1,4,6,9,12,15,17,20,23,26,28,31,34,37,39,42,45,48,50,53,56,59,62}, 23, FALSE}, + + /* #13: 44100 -> 8000 sample rate */ + {{WAVE_FORMAT_PCM, 1, 44100, 44100, 1, 8}, {WAVE_FORMAT_PCM, 1, 8000, 8000, 1, 8}, {2,8,13,19,24,30,35,41,46,52,57,63}, 12, FALSE}, +}; + +static void test_convert(void) +{ + HACMSTREAM has; + ACMSTREAMHEADER hdr = {0}; + BYTE output[256]; + MMRESULT mmr; + unsigned i; + + for (i = 0; i < sizeof(expected_output)/sizeof(struct stream_output); i++) + { + mmr = acmStreamOpen(&has, NULL, (WAVEFORMATEX *)&expected_output[i].src, (WAVEFORMATEX *)&expected_output[i].dst, NULL, 0, 0, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: open failed: 0x%x\n", i, mmr); + + memset(&hdr, 0, sizeof(hdr)); + hdr.cbStruct = sizeof(hdr); + hdr.pbSrc = (BYTE *)input; + hdr.cbSrcLength = sizeof(input); + hdr.pbDst = output; + hdr.cbDstLength = sizeof(output); + + mmr = acmStreamPrepareHeader(has, &hdr, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: prepare failed: 0x%x\n", i, mmr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_PREPARED, "#%d: header wasn't prepared: 0x%x\n", i, hdr.fdwStatus); + + memset(&output, 0, sizeof(output)); + mmr = acmStreamConvert(has, &hdr, ACM_STREAMCONVERTF_BLOCKALIGN); + ok(mmr == MMSYSERR_NOERROR, "#%d: convert failed: 0x%x\n", i, mmr); + ok(hdr.fdwStatus & ACMSTREAMHEADER_STATUSF_DONE, "#%d: conversion was not done: 0x%x\n", i, hdr.fdwStatus); + ok(hdr.cbSrcLengthUsed == hdr.cbSrcLength, "#%d: expected %d, got %d\n", i, hdr.cbSrcLength, hdr.cbSrcLengthUsed); + ok(hdr.cbDstLengthUsed == expected_output[i].dst_used, "#%d: expected %d, got %d\n", i, expected_output[i].dst_used, hdr.cbDstLengthUsed); +todo_wine_if(expected_output[i].todo) + ok(!memcmp(expected_output[i].output, output, hdr.cbDstLengthUsed), "#%d: output does not match\n", i); + + mmr = acmStreamUnprepareHeader(has, &hdr, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: unprepare failed: 0x%x\n", i, mmr); + ok(hdr.fdwStatus == ACMSTREAMHEADER_STATUSF_DONE, "#%d: header wasn't unprepared: 0x%x\n", i, hdr.fdwStatus); + + mmr = acmStreamClose(has, 0); + ok(mmr == MMSYSERR_NOERROR, "#%d: close failed: 0x%x\n", i, mmr); + } +} + static void test_acmFormatSuggest(void) { WAVEFORMATEX src, dst; DWORD suggest; MMRESULT rc; + DWORD sizeMax; + + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &sizeMax); /* Test a valid PCM format */ src.wFormatTag = WAVE_FORMAT_PCM; @@ -740,26 +1159,7 @@ src.cbSize = 0; suggest = 0; memset(&dst, 0, sizeof(dst)); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); - ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); -todo_wine - ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); - ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); - ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); -todo_wine - ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); -todo_wine - ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); -todo_wine - ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - - /* All parameters from destination are valid */ - suggest = ACM_FORMATSUGGESTF_NCHANNELS - | ACM_FORMATSUGGESTF_NSAMPLESPERSEC - | ACM_FORMATSUGGESTF_WBITSPERSAMPLE - | ACM_FORMATSUGGESTF_WFORMATTAG; - dst = src; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); @@ -768,51 +1168,58 @@ ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); - /* Test for WAVE_FORMAT_MSRT24 used in Monster Truck Madness 2 */ - src.wFormatTag = WAVE_FORMAT_MSRT24; - src.nChannels = 1; - src.nSamplesPerSec = 8000; - src.nAvgBytesPerSec = 16000; - src.nBlockAlign = 2; - src.wBitsPerSample = 16; - src.cbSize = 0; - dst = src; + /* All parameters from destination are valid */ suggest = ACM_FORMATSUGGESTF_NCHANNELS | ACM_FORMATSUGGESTF_NSAMPLESPERSEC | ACM_FORMATSUGGESTF_WBITSPERSAMPLE | ACM_FORMATSUGGESTF_WFORMATTAG; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); - ok(rc == ACMERR_NOTPOSSIBLE, "failed with error 0x%x\n", rc); - memset(&dst, 0, sizeof(dst)); + dst = src; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(PCMWAVEFORMAT), suggest); + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + ok(src.wFormatTag == dst.wFormatTag, "expected %d, got %d\n", src.wFormatTag, dst.wFormatTag); + ok(src.nChannels == dst.nChannels, "expected %d, got %d\n", src.nChannels, dst.nChannels); + ok(src.nSamplesPerSec == dst.nSamplesPerSec, "expected %d, got %d\n", src.nSamplesPerSec, dst.nSamplesPerSec); + ok(src.nAvgBytesPerSec == dst.nAvgBytesPerSec, "expected %d, got %d\n", src.nAvgBytesPerSec, dst.nAvgBytesPerSec); + ok(src.nBlockAlign == dst.nBlockAlign, "expected %d, got %d\n", src.nBlockAlign, dst.nBlockAlign); + ok(src.wBitsPerSample == dst.wBitsPerSample, "expected %d, got %d\n", src.wBitsPerSample, dst.wBitsPerSample); + + /* Test an invalid PCM format */ + ZeroMemory(&dst, sizeof(dst)); + src.nSamplesPerSec = 0xdeadbeef; suggest = 0; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst), suggest); -todo_wine + rc = acmFormatSuggest(NULL, &src, &dst, sizeMax, suggest); + todo_wine { + ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); + ok(dst.wFormatTag == WAVE_FORMAT_PCM, "expected %d, got %d\n", WAVE_FORMAT_PCM, dst.wFormatTag); + ok(dst.nSamplesPerSec == 0xdeadbeef, "expected %d, got %d\n", 0xdeadbeef, dst.nSamplesPerSec); + } + src.nSamplesPerSec = 8000; + + /* Test a nonexistent format */ + src.wFormatTag = 0xbeef; + rc = acmFormatSuggest(NULL, &src, &dst, sizeMax-1, suggest); ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - /* Invalid struct size */ - src.wFormatTag = WAVE_FORMAT_PCM; - rc = acmFormatSuggest(NULL, &src, &dst, 0, suggest); -todo_wine + rc = acmFormatSuggest(NULL, &src, &dst, sizeMax, suggest); + todo_wine + ok(rc == MMSYSERR_NODRIVER, "failed with error 0x%x\n", rc); + + /* Test converting between two known but incompatible formats */ + src.wFormatTag = WAVE_FORMAT_ALAW; + src.nChannels = 1; + src.nSamplesPerSec = 8000; + src.nAvgBytesPerSec = 8000; + src.nBlockAlign = 1; + src.wBitsPerSample = 8; + src.cbSize = 0; + suggest = ACM_FORMATSUGGESTF_WFORMATTAG; + dst.wFormatTag = WAVE_FORMAT_IMA_ADPCM; + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(IMAADPCMWAVEFORMAT)-1, suggest); ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) / 2, suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - /* cbSize is the last parameter and not required for PCM */ - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - 1, suggest); - ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize), suggest); - ok(rc == MMSYSERR_NOERROR, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize) - 1, suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - /* cbSize is required for others */ - src.wFormatTag = WAVE_FORMAT_ADPCM; - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - sizeof(dst.cbSize), suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); - rc = acmFormatSuggest(NULL, &src, &dst, sizeof(dst) - 1, suggest); -todo_wine - ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); + + rc = acmFormatSuggest(NULL, &src, &dst, sizeof(IMAADPCMWAVEFORMAT), suggest); + todo_wine + ok(rc == MMSYSERR_NODRIVER, "failed with error 0x%x\n", rc); /* Invalid suggest flags */ src.wFormatTag = WAVE_FORMAT_PCM; @@ -830,8 +1237,46 @@ ok(rc == MMSYSERR_INVALPARAM, "failed with error 0x%x\n", rc); } - -void test_mp3(void) +static void test_acmFormatTagDetails(void) +{ + ACMFORMATTAGDETAILSW aftd = {0}; + MMRESULT rc; + + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = WAVE_FORMAT_MPEGLAYER3; + rc = acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (rc == MMSYSERR_NOERROR) + ok(aftd.cbFormatSize == sizeof(MPEGLAYER3WAVEFORMAT), "got %d\n", aftd.cbFormatSize); +} + +static void test_acmFormatChoose(void) +{ + ACMFORMATCHOOSEW afc = {0}; + WAVEFORMATEX *pwfx; + DWORD sizeMax; + MMRESULT rc; + + acmMetrics(NULL, ACM_METRIC_MAX_SIZE_FORMAT, &sizeMax); + pwfx = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeMax); + + afc.cbStruct = sizeof(afc); + afc.pwfx = pwfx; + + /* test invalid struct size */ + afc.cbStruct = sizeof(afc)-1; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.cbStruct = sizeof(afc); + + afc.pwfx = NULL; + rc = acmFormatChooseW(&afc); + ok(rc == MMSYSERR_INVALPARAM, "expected 0xb, got 0x%x\n", rc); + afc.pwfx = pwfx; + + HeapFree(GetProcessHeap(), 0, pwfx); +} + +static void test_mp3(void) { MPEGLAYER3WAVEFORMAT src; WAVEFORMATEX dst; @@ -1067,7 +1512,10 @@ { driver_tests(); test_prepareheader(); + test_convert(); test_acmFormatSuggest(); + test_acmFormatTagDetails(); + test_acmFormatChoose(); test_mp3(); /* Test acmDriverAdd in the end as it may conflict * with other tests due to codec lookup order */

7 years

[akhaldi] 75886: [MSACM32] Sync with Wine Staging 2.16. CORE-13762 993faf5 msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT. 84e61e6 msacm32: Add invalid parameter checks for acmFormatChoo...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:55:04 2017 New Revision: 75886 URL: http://svn.reactos.org/svn/reactos?rev=75886&view=rev Log: [MSACM32] Sync with Wine Staging 2.16. CORE-13762 993faf5 msacm32: Implement ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT. 84e61e6 msacm32: Add invalid parameter checks for acmFormatChoose(). 5e2c243 msacm32: Don't add a format entry if it is decode-only. cadedd7 msacm32: Rewrite PCM conversion functions. 7493364 msacm32: Check correct variable. ab2760e msacm32: Try to suggest PCM to PCM conversion first. 8e88af3 msacm32: Add more invalid parameter checks for acmFormatSuggest(). 1e30f79 msacm32: Add invalid parameter checks for acmFormatDetails(). c984aa5 msacm32: Add more invalid parameter checks for acmFormatEnum(). 4e0c370 msacm32: Don't write cbSize if the format is WAVE_FORMAT_PCM. Removed: trunk/reactos/dll/win32/msacm32/msacm.spec trunk/reactos/dll/win32/msacm32/msacm_main.c Modified: trunk/reactos/dll/win32/msacm32/format.c trunk/reactos/dll/win32/msacm32/pcmconverter.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/format.c… ============================================================================== --- trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/format.c [iso-8859-1] Sun Sep 17 22:55:04 2017 @@ -41,18 +41,29 @@ switch (affd->mode) { case WINE_ACMFF_TAG: - if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, - CB_FINDSTRINGEXACT, -1, - (LPARAM)paftd->szFormatTag) == CB_ERR) - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, - CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (paftd->cStandardFormats > 0) + { + if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_FINDSTRINGEXACT, -1, + (LPARAM)paftd->szFormatTag) == CB_ERR) + { + int index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); + if (((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == affd->afc->pwfx->wFormatTag)) || + (!(affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + (paftd->dwFormatTag == WAVE_FORMAT_PCM))) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, + CB_SETCURSEL, index, 0); + } + } break; case WINE_ACMFF_FORMAT: if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) { HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; unsigned int i, len; MMRESULT mmr; WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; @@ -62,14 +73,16 @@ afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); if (!afd.pwfx) return FALSE; afd.pwfx->wFormatTag = paftd->dwFormatTag; - afd.pwfx->cbSize = paftd->cbFormatSize; + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + afd.pwfx->cbSize = paftd->cbFormatSize - sizeof(WAVEFORMATEX); afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) { static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'}; - int j; + int j, index; afd.dwFormatIndex = i; + afd.fdwSupport = 0; mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX); if (mmr == MMSYSERR_NOERROR) { lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); @@ -78,14 +91,17 @@ buffer[j] = ' '; wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024); - SendDlgItemMessageW(affd->hWnd, + index = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_ADDSTRING, 0, (LPARAM)buffer); + if ((affd->afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT) && + affd->afc->cbwfx >= paftd->cbFormatSize && + !memcmp(afd.pwfx, affd->afc->pwfx, paftd->cbFormatSize)) + SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, + CB_SETCURSEL, index, 0); } } acmDriverClose(had, 0); - SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, - CB_SETCURSEL, 0, 0); HeapFree(MSACM_hHeap, 0, afd.pwfx); } } @@ -95,7 +111,7 @@ HACMDRIVER had; if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { - ACMFORMATDETAILSW afd; + ACMFORMATDETAILSW afd = {0}; afd.cbStruct = sizeof(afd); afd.dwFormatTag = paftd->dwFormatTag; @@ -117,7 +133,7 @@ return TRUE; } -static BOOL MSACM_FillFormatTags(HWND hWnd) +static BOOL MSACM_FillFormatTags(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -127,13 +143,15 @@ affd.hWnd = hWnd; affd.mode = WINE_ACMFF_TAG; + affd.afc = afc; acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); return TRUE; } -static BOOL MSACM_FillFormat(HWND hWnd) +static BOOL MSACM_FillFormat(HWND hWnd, PACMFORMATCHOOSEW afc) { ACMFORMATTAGDETAILSW aftd; struct MSACM_FillFormatData affd; @@ -145,6 +163,7 @@ affd.hWnd = hWnd; affd.mode = WINE_ACMFF_FORMAT; + affd.afc = afc; SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_GETLBTEXT, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, @@ -152,7 +171,8 @@ (LPARAM)affd.szFormatTag); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); - SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); + if (SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_GETCURSEL, 0, 0) == CB_ERR) + SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); return TRUE; } @@ -191,10 +211,11 @@ case WM_INITDIALOG: afc = (PACMFORMATCHOOSEW)lParam; SetPropW(hWnd, fmt_prop, (HANDLE)afc); - MSACM_FillFormatTags(hWnd); - MSACM_FillFormat(hWnd); + MSACM_FillFormatTags(hWnd, afc); + MSACM_FillFormat(hWnd, afc); if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| ACMFORMATCHOOSE_STYLEF_SHOWHELP| + ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) FIXME("Unsupported style %08x\n", afc->fdwStyle); @@ -213,7 +234,7 @@ case IDD_ACMFORMATCHOOSE_CMB_FORMATTAG: switch (HIWORD(wParam)) { case CBN_SELCHANGE: - MSACM_FillFormat(hWnd); + MSACM_FillFormat(hWnd, afc); break; default: TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n", @@ -266,6 +287,9 @@ LPWSTR name = NULL; LPWSTR templ = NULL; DWORD sz; + + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEA)) + return MMSYSERR_INVALPARAM; afcw.cbStruct = sizeof(afcw); afcw.fdwStyle = pafmtc->fdwStyle; @@ -338,6 +362,12 @@ */ MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) { + if (pafmtc->cbStruct < sizeof(ACMFORMATCHOOSEW)) + return MMSYSERR_INVALPARAM; + + if (!pafmtc->pwfx) + return MMSYSERR_INVALPARAM; + if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE) return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance, pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); @@ -358,11 +388,15 @@ { ACMFORMATDETAILSW afdw; MMRESULT mmr; + + if (!pafd) + return MMSYSERR_INVALPARAM; memset(&afdw, 0, sizeof(afdw)); afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafd->dwFormatIndex; afdw.dwFormatTag = pafd->dwFormatTag; + afdw.fdwSupport = pafd->fdwSupport; afdw.pwfx = pafd->pwfx; afdw.cbwfx = pafd->cbwfx; @@ -384,10 +418,26 @@ MMRESULT mmr; static const WCHAR fmt1[] = {'%','d',' ','H','z',0}; static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0}; + ACMFORMATTAGDETAILSW aftd = {0}; TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + if (!pafd) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; + + if (!pafd->pwfx) + return MMSYSERR_INVALPARAM; + + if (pafd->cbwfx < sizeof(PCMWAVEFORMAT)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (pafd->dwFormatTag == WAVE_FORMAT_UNKNOWN) + return MMSYSERR_INVALPARAM; switch (fdwDetails) { case ACM_FORMATDETAILSF_FORMAT: @@ -413,7 +463,16 @@ } break; case ACM_FORMATDETAILSF_INDEX: - /* should check pafd->dwFormatIndex < aftd->cStandardFormats */ + aftd.cbStruct = sizeof(aftd); + aftd.dwFormatTag = pafd->dwFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG); + if (mmr != MMSYSERR_NOERROR) + break; + if (pafd->dwFormatIndex >= aftd.cStandardFormats) + { + mmr = MMSYSERR_INVALPARAM; + break; + } mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: @@ -475,6 +534,9 @@ if (!pafda) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafda->cbStruct < sizeof(*pafda)) return MMSYSERR_INVALPARAM; @@ -482,6 +544,7 @@ afdw.cbStruct = sizeof(afdw); afdw.dwFormatIndex = pafda->dwFormatIndex; afdw.dwFormatTag = pafda->dwFormatTag; + afdw.fdwSupport = pafda->fdwSupport; afdw.pwfx = pafda->pwfx; afdw.cbwfx = pafda->cbwfx; @@ -560,6 +623,7 @@ for (j = 0; j < aftd.cStandardFormats; j++) { pafd->dwFormatIndex = j; pafd->dwFormatTag = aftd.dwFormatTag; + pafd->fdwSupport = 0; if (acmFormatDetailsW(had, pafd, ACM_FORMATDETAILSF_INDEX) != MMSYSERR_NOERROR) continue; @@ -596,6 +660,8 @@ PWINE_ACMDRIVERID padid; WAVEFORMATEX wfxRef; BOOL ret; + DWORD cbwfxMax; + MMRESULT mmr; TRACE("(%p, %p, %p, %ld, %d)\n", had, pafd, fnCallback, dwInstance, fdwEnum); @@ -603,7 +669,16 @@ if (!pafd) return MMSYSERR_INVALPARAM; + if (!fnCallback) + return MMSYSERR_INVALPARAM; + if (pafd->cbStruct < sizeof(*pafd)) + return MMSYSERR_INVALPARAM; + + if (pafd->fdwSupport) + return MMSYSERR_INVALPARAM; + + if (!pafd->pwfx) return MMSYSERR_INVALPARAM; if (fdwEnum & (ACM_FORMATENUMF_WFORMATTAG|ACM_FORMATENUMF_NCHANNELS| @@ -621,6 +696,12 @@ if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + + mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); + if (mmr != MMSYSERR_NOERROR) + return mmr; + if (pafd->cbwfx < cbwfxMax) + return MMSYSERR_INVALPARAM; if (had) { HACMDRIVERID hadid; @@ -650,6 +731,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, PWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { + ACMFORMATTAGDETAILSW aftd = {0}; ACMDRVFORMATSUGGEST adfg; MMRESULT mmr; @@ -662,6 +744,32 @@ if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC| ACM_FORMATSUGGESTF_WBITSPERSAMPLE|ACM_FORMATSUGGESTF_WFORMATTAG)) return MMSYSERR_INVALFLAG; + + /* if we were given PCM, try to convert to PCM */ + if (pwfxSrc->wFormatTag == WAVE_FORMAT_PCM && !had && + !(fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG)) + { + ACMFORMATDETAILSW afd = {0}; + afd.cbStruct = sizeof(afd); + afd.dwFormatTag = WAVE_FORMAT_PCM; + afd.pwfx = pwfxSrc; + afd.cbwfx = sizeof(PCMWAVEFORMAT); + if (!acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_FORMAT)) + { + memcpy(pwfxDst, pwfxSrc, sizeof(PCMWAVEFORMAT)); + return MMSYSERR_NOERROR; + } + } + + aftd.cbStruct = sizeof(aftd); + if (fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) + aftd.dwFormatTag = pwfxDst->wFormatTag; + mmr = acmFormatTagDetailsW(had, &aftd, ACM_FORMATTAGDETAILSF_LARGESTSIZE); + if ((fdwSuggest & ACM_FORMATSUGGESTF_WFORMATTAG) && mmr == ACMERR_NOTPOSSIBLE) + return ACMERR_NOTPOSSIBLE; + + if (cbwfxDst < aftd.cbFormatSize) + return MMSYSERR_INVALPARAM; adfg.cbStruct = sizeof(adfg); adfg.fdwSuggest = fdwSuggest; Removed: trunk/reactos/dll/win32/msacm32/msacm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.sp… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm.spec (removed) @@ -1,40 +0,0 @@ - 1 stub WEP - 2 stub DRIVERPROC - 3 stub ___EXPORTEDSTUB - 7 pascal acmGetVersion() acmGetVersion16 - 8 pascal -ret16 acmMetrics(word word ptr) acmMetrics16 - 10 pascal -ret16 acmDriverEnum(ptr long long) acmDriverEnum16 - 11 pascal -ret16 acmDriverDetails(word ptr long) acmDriverDetails16 - 12 pascal -ret16 acmDriverAdd(ptr word long long long) acmDriverAdd16 - 13 pascal -ret16 acmDriverRemove(word long) acmDriverRemove16 - 14 pascal -ret16 acmDriverOpen(ptr word long) acmDriverOpen16 - 15 pascal -ret16 acmDriverClose(word long) acmDriverClose16 - 16 pascal acmDriverMessage(word word long long) acmDriverMessage16 - 17 pascal -ret16 acmDriverID(word ptr long) acmDriverID16 - 18 pascal -ret16 acmDriverPriority(word long long) acmDriverPriority16 - 30 pascal -ret16 acmFormatTagDetails(word ptr long) acmFormatTagDetails16 - 31 pascal -ret16 acmFormatTagEnum(word ptr ptr long long) acmFormatTagEnum16 - 40 pascal -ret16 acmFormatChoose(ptr) acmFormatChoose16 - 41 pascal -ret16 acmFormatDetails(word ptr long) acmFormatDetails16 - 42 pascal -ret16 acmFormatEnum(word ptr ptr long long) acmFormatEnum16 - 45 pascal -ret16 acmFormatSuggest(word ptr ptr long long) acmFormatSuggest16 - 50 pascal -ret16 acmFilterTagDetails(word ptr long) acmFilterTagDetails16 - 51 pascal -ret16 acmFilterTagEnum(word ptr ptr long long) acmFilterTagEnum16 - 60 pascal -ret16 acmFilterChoose(ptr) acmFilterChoose16 - 61 pascal -ret16 acmFilterDetails(word ptr long) acmFilterDetails16 - 62 pascal -ret16 acmFilterEnum(word ptr ptr long long) acmFilterEnum16 - 70 pascal -ret16 acmStreamOpen(ptr word ptr ptr ptr long long long) acmStreamOpen16 - 71 pascal -ret16 acmStreamClose(word long) acmStreamClose16 - 72 pascal -ret16 acmStreamSize(word long ptr long) acmStreamSize16 - 75 pascal -ret16 acmStreamConvert(word ptr long) acmStreamConvert16 - 76 pascal -ret16 acmStreamReset(word long) acmStreamReset16 - 77 pascal -ret16 acmStreamPrepareHeader(word ptr long) acmStreamPrepareHeader16 - 78 pascal -ret16 acmStreamUnprepareHeader(word ptr long) acmStreamUnprepareHeader16 -150 stub ACMAPPLICATIONEXIT -175 stub ACMHUGEPAGELOCK -176 stub ACMHUGEPAGEUNLOCK -200 stub ACMOPENCONVERSION -201 stub ACMCLOSECONVERSION -202 stub ACMCONVERT -203 stub ACMCHOOSEFORMAT -255 pascal DllEntryPoint(long word word word long word) MSACM_DllEntryPoint Removed: trunk/reactos/dll/win32/msacm32/msacm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm_ma… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm_main.c (removed) @@ -1,451 +0,0 @@ -/* - * MSACM library - * - * Copyright 1998 Patrik Stridvall - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "wineacm.h" - -/************************************************************************** - * DllEntryPoint (MSACM.255) - * - * MSACM DLL entry point - * - */ -BOOL WINAPI MSACM_DllEntryPoint(DWORD fdwReason, HINSTANCE16 hinstDLL, WORD ds, - WORD wHeapSize, DWORD dwReserved1, WORD wReserved2) -{ - static HANDLE hndl; - - TRACE("0x%x 0x%lx\n", hinstDLL, fdwReason); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - if (!hndl && !(hndl = LoadLibraryA("MSACM32.DLL"))) { - ERR("Could not load sibling MsAcm32.dll\n"); - return FALSE; - } - break; - case DLL_PROCESS_DETACH: - FreeLibrary(hndl); - hndl = 0; - break; - case DLL_THREAD_ATTACH: - case DLL_THREAD_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** - * acmGetVersion (MSACM.7) - */ -DWORD WINAPI acmGetVersion16(void) -{ - return acmGetVersion(); -} - -/*********************************************************************** - * acmMetrics (MSACM.8) - */ - -MMRESULT16 WINAPI acmMetrics16( - HACMOBJ16 hao, UINT16 uMetric, LPVOID pMetric) -{ - FIXME("(0x%04x, %d, %p): semi-stub\n", hao, uMetric, pMetric); - - if(!hao) return acmMetrics(0, uMetric, pMetric); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverEnum (MSACM.10) - */ -MMRESULT16 WINAPI acmDriverEnum16( - ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(%p, %ld, %ld): stub\n", - fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverDetails (MSACM.11) - */ - -MMRESULT16 WINAPI acmDriverDetails16( - HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverAdd (MSACM.12) - */ -MMRESULT16 WINAPI acmDriverAdd16( - LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, - LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) -{ - FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n", - phadid, hinstModule, lParam, dwPriority, fdwAdd - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverRemove (MSACM.13) - */ -MMRESULT16 WINAPI acmDriverRemove16( - HACMDRIVERID16 hadid, DWORD fdwRemove) -{ - FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverOpen (MSACM.14) - */ -MMRESULT16 WINAPI acmDriverOpen16( - LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) -{ - FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverClose (MSACM.15) - */ -MMRESULT16 WINAPI acmDriverClose16( - HACMDRIVER16 had, DWORD fdwClose) -{ - FIXME("(0x%04x, %ld): stub\n", had, fdwClose); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverMessage (MSACM.16) - */ -LRESULT WINAPI acmDriverMessage16( - HACMDRIVER16 had, UINT16 uMsg, LPARAM lParam1, LPARAM lParam2) -{ - FIXME("(0x%04x, %d, %ld, %ld): stub\n", - had, uMsg, lParam1, lParam2 - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/*********************************************************************** - * acmDriverID (MSACM.17) - */ -MMRESULT16 WINAPI acmDriverID16( - HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) -{ - FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmDriverPriority (MSACM.18) - */ -MMRESULT16 WINAPI acmDriverPriority16( - HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) -{ - FIXME("(0x%04x, %ld, %ld): stub\n", - hadid, dwPriority, fdwPriority - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatTagDetails (MSACM.30) - */ -MMRESULT16 WINAPI acmFormatTagDetails16( - HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatTagEnum (MSACM.31) - */ -MMRESULT16 WINAPI acmFormatTagEnum16( - HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, - ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, paftd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatChoose (MSACM.40) - */ -MMRESULT16 WINAPI acmFormatChoose16( - LPACMFORMATCHOOSE16 pafmtc) -{ - FIXME("(%p): stub\n", pafmtc); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatDetails (MSACM.41) - */ -MMRESULT16 WINAPI acmFormatDetails16( - HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatEnum (MSACM.42) - */ -MMRESULT16 WINAPI acmFormatEnum16( - HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, - ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, pafd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFormatSuggest (MSACM.45) - */ -MMRESULT16 WINAPI acmFormatSuggest16( - HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, - LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterTagDetails (MSACM.50) - */ -MMRESULT16 WINAPI acmFilterTagDetails16( - HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterTagEnum (MSACM.51) - */ -MMRESULT16 WINAPI acmFilterTagEnum16( - HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, - ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, paftd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterChoose (MSACM.60) - */ -MMRESULT16 WINAPI acmFilterChoose16( - LPACMFILTERCHOOSE16 pafltrc) -{ - FIXME("(%p): stub\n", pafltrc); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterDetails (MSACM.61) - */ -MMRESULT16 WINAPI acmFilterDetails16( - HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) -{ - FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmFilterEnum (MSACM.62) - */ -MMRESULT16 WINAPI acmFilterEnum16( - HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, - ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) -{ - FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", - had, pafd, fnCallback, dwInstance, fdwEnum - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamOpen (MSACM.70) - */ -MMRESULT16 WINAPI acmStreamOpen16( - LPHACMSTREAM16 phas, HACMDRIVER16 had, - LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, - LPWAVEFILTER pwfltr, DWORD dwCallback, - DWORD dwInstance, DWORD fdwOpen) -{ - FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", - phas, had, pwfxSrc, pwfxDst, pwfltr, - dwCallback, dwInstance, fdwOpen - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamClose (MSACM.71) - */ -MMRESULT16 WINAPI acmStreamClose16( - HACMSTREAM16 has, DWORD fdwClose) -{ - FIXME("(0x%04x, %ld): stub\n", has, fdwClose); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamSize (MSACM.72) - */ -MMRESULT16 WINAPI acmStreamSize16( - HACMSTREAM16 has, DWORD cbInput, - LPDWORD pdwOutputBytes, DWORD fdwSize) -{ - FIXME("(0x%04x, %ld, %p, %ld): stub\n", - has, cbInput, pdwOutputBytes, fdwSize - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamConvert (MSACM.75) - */ -MMRESULT16 WINAPI acmStreamConvert16( - HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) -{ - FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamReset (MSACM.76) - */ -MMRESULT16 WINAPI acmStreamReset16( - HACMSTREAM16 has, DWORD fdwReset) -{ - FIXME("(0x%04x, %ld): stub\n", has, fdwReset); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamPrepareHeader (MSACM.77) - */ -MMRESULT16 WINAPI acmStreamPrepareHeader16( - HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) -{ - FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * acmStreamUnprepareHeader (MSACM.78) - */ -MMRESULT16 WINAPI acmStreamUnprepareHeader16( - HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) -{ - FIXME("(0x%04x, %p, %ld): stub\n", - has, pash, fdwUnprepare - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return MMSYSERR_ERROR; -} - -/*********************************************************************** - * ACMAPPLICATIONEXIT (MSACM.150) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMHUGEPAGELOCK (MSACM.175) - *FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMHUGEPAGEUNLOCK (MSACM.176) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMOPENCONVERSION (MSACM.200) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMCLOSECONVERSION (MSACM.201) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMCONVERT (MSACM.202) - * FIXME - * No documentation found. - */ - -/*********************************************************************** - * ACMCHOOSEFORMAT (MSACM.203) - * FIXME - * No documentation found. - */ - - Modified: trunk/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/pcmconve… ============================================================================== --- trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/pcmconverter.c [iso-8859-1] Sun Sep 17 22:55:04 2017 @@ -58,13 +58,16 @@ /* flags for fdwDriver */ #define PCM_RESAMPLE 1 +typedef void (*PCM_CONVERT_KEEP_RATE)(const unsigned char*, int, unsigned char*); + +typedef void (*PCM_CONVERT_CHANGE_RATE)(const DWORD, const unsigned char*, DWORD*, const DWORD, unsigned char*, DWORD*); + /* data used while converting */ typedef struct tagAcmPcmData { /* conversion routine, depending if rate conversion is required */ union { - void (*cvtKeepRate)(const unsigned char*, int, unsigned char*); - void (*cvtChangeRate)(DWORD, const unsigned char*, LPDWORD, - DWORD, unsigned char*, LPDWORD); + PCM_CONVERT_KEEP_RATE cvtKeepRate; + PCM_CONVERT_CHANGE_RATE cvtChangeRate; } cvt; } AcmPcmData; @@ -502,8 +505,6 @@ } -typedef void (*PCM_CONVERT_KEEP_RATE)(const unsigned char*, int, unsigned char*); - static const PCM_CONVERT_KEEP_RATE PCM_ConvertKeepRate[] = { cvtSS88K, cvtSM88K, cvtMS88K, cvtMM88K, cvtSS816K, cvtSM816K, cvtMS816K, cvtMM816K, @@ -524,397 +525,416 @@ * <M> is the number of bits of output channel (8 or 16) * */ -static void cvtSS88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = *src; - *dst++ = *src; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = M8(src[0], src[1]); - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = *src; - *dst++ = *src; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM88C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = *src; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, C816(src[0])); dst += 2; - W16(dst, C816(src[1])); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, M16(C816(src[0]), C816(src[1]))); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, C816(*src)); dst += 2; - W16(dst, C816(*src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM816C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, C816(*src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src++; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(R16(src)); - *dst++ = C168(R16(src + 2)); - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(M16(R16(src), R16(src + 2))); - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(R16(src)); - *dst++ = C168(R16(src)); - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc==0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM168C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - *dst++ = C168(R16(src)); - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, R16(src)); dst += 2; - W16(dst, R16(src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, M16(R16(src), R16(src + 2))); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 4; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while((*ndst)--) { - W16(dst, R16(src)); dst += 2; - W16(dst, R16(src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM1616C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W16(dst, R16(src)); dst += 2; - error = error + srcRate; - while (error > dstRate) { - src += 2; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSS2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W24(dst, R24(src)); dst += 3; - W24(dst, R24(src)); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 6; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtSM2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W24(dst, M24(R24(src), R24(src + 3))); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 6; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMS2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while((*ndst)--) { - W24(dst, R24(src)); dst += 3; - W24(dst, R24(src)); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 3; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -static void cvtMM2424C(DWORD srcRate, const unsigned char* src, LPDWORD nsrc, - DWORD dstRate, unsigned char* dst, LPDWORD ndst) -{ - DWORD error = dstRate / 2; - TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst); - - while ((*ndst)--) { - W24(dst, R24(src)); dst += 3; - error = error + srcRate; - while (error > dstRate) { - src += 3; - (*nsrc)--; - if (*nsrc == 0) - return; - error = error - dstRate; - } - } -} - -typedef void (*PCM_CONVERT_CHANGE_RATE)(DWORD, const unsigned char*, LPDWORD, DWORD, unsigned char*, LPDWORD); + +static void cvtSS88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = src[0]; + *dst++ = src[1]; + } + src += 2; + } +} + +static void cvtSM88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = M8(src[0], src[1]); + } + src += 2; + } +} + +static void cvtMS88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = src[0]; + *dst++ = src[0]; + } + src += 1; + } +} + +static void cvtMM88C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = src[0]; + } + src += 1; + } +} + +static void cvtSS816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, C816(src[0])); dst += 2; + W16(dst, C816(src[1])); dst += 2; + } + src += 2; + } +} + +static void cvtSM816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, M16(C816(src[0]), C816(src[1]))); dst += 2; + } + src += 2; + } +} + +static void cvtMS816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, C816(src[0])); dst += 2; + W16(dst, C816(src[0])); dst += 2; + } + src += 1; + } +} + +static void cvtMM816C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, C816(src[0])); dst += 2; + } + src += 1; + } +} + +static void cvtSS168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(R16(src)); + *dst++ = C168(R16(src + 2)); + } + src += 4; + } +} + +static void cvtSM168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(M16(R16(src), R16(src + 2))); + } + src += 4; + } +} + +static void cvtMS168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(R16(src)); + *dst++ = C168(R16(src)); + } + src += 2; + } +} + +static void cvtMM168C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + *dst++ = C168(R16(src)); + } + src += 2; + } +} + +static void cvtSS1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, R16(src)); dst += 2; + W16(dst, R16(src + 2)); dst += 2; + } + src += 4; + } +} + +static void cvtSM1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, M16(R16(src), R16(src + 2))); dst += 2; + } + src += 4; + } +} + +static void cvtMS1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, R16(src)); dst += 2; + W16(dst, R16(src)); dst += 2; + } + src += 2; + } +} + +static void cvtMM1616C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W16(dst, R16(src)); dst += 2; + } + src += 2; + } +} + +static void cvtSS2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, R24(src)); dst += 3; + W24(dst, R24(src + 3)); dst += 3; + } + src += 6; + } +} + +static void cvtSM2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, M24(R24(src), R24(src + 3))); dst += 3; + } + src += 6; + } +} + +static void cvtMS2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, R24(src)); dst += 3; + W24(dst, R24(src)); dst += 3; + } + src += 3; + } +} + +static void cvtMM2424C(const DWORD srcRate, const unsigned char *src, DWORD *nsrc, + const DWORD dstRate, unsigned char *dst, DWORD *ndst) +{ + DWORD error = srcRate / 2; + DWORD maxSrc = *nsrc, maxDst = *ndst; + *ndst = 0; + for (*nsrc = 0; *nsrc < maxSrc; (*nsrc)++) { + error += dstRate; + while (error > srcRate) { + if (*ndst == maxDst) + return; + (*ndst)++; + error -= srcRate; + + W24(dst, R24(src)); dst += 3; + } + src += 3; + } +} static const PCM_CONVERT_CHANGE_RATE PCM_ConvertChangeRate[] = { cvtSS88C, cvtSM88C, cvtMS88C, cvtMM88C, @@ -1268,12 +1288,8 @@ /* do the job */ if (adsi->fdwDriver & PCM_RESAMPLE) { - DWORD nsrc2 = nsrc; - DWORD ndst2 = ndst; - apd->cvt.cvtChangeRate(adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc2, - adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst2); - nsrc -= nsrc2; - ndst -= ndst2; + apd->cvt.cvtChangeRate(adsi->pwfxSrc->nSamplesPerSec, adsh->pbSrc, &nsrc, + adsi->pwfxDst->nSamplesPerSec, adsh->pbDst, &ndst); } else { if (nsrc < ndst) ndst = nsrc; else nsrc = ndst; 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] Sun Sep 17 22:55:04 2017 @@ -100,7 +100,7 @@ reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.23 reactos/dll/win32/mpr # Synced to WineStaging-2.9 reactos/dll/win32/mprapi # Synced to WineStaging-2.9 -reactos/dll/win32/msacm32 # Synced to WineStaging-2.9 +reactos/dll/win32/msacm32 # Synced to WineStaging-2.16 reactos/dll/win32/msacm32.drv # Synced to WineStaging-2.9 reactos/dll/win32/msadp32.acm # Synced to WineStaging-2.9 reactos/dll/win32/mscat32 # Synced to WineStaging-2.9

7 years

[akhaldi] 75885: [MAPI32] Sync with Wine Staging 2.16. CORE-13762 b0a31c3 mapi32: A spelling fix in a comment.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:54:52 2017 New Revision: 75885 URL: http://svn.reactos.org/svn/reactos?rev=75885&view=rev Log: [MAPI32] Sync with Wine Staging 2.16. CORE-13762 b0a31c3 mapi32: A spelling fix in a comment. Modified: trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/media/doc/README.WINE 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] Sun Sep 17 22:54:52 2017 @@ -1623,7 +1623,7 @@ * * PARAMS * iface [I] IMAPIProp object to get the property values from - * lpTags [I] Property tage of property values to be retrieved + * lpTags [I] Property tags of property values to be retrieved * ulFlags [I] Return 0=Ascii MAPI_UNICODE=Unicode strings for * unspecified types * lpCount [O] Destination for number of properties returned 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] Sun Sep 17 22:54:52 2017 @@ -89,7 +89,7 @@ reactos/dll/win32/jsproxy # Synced to WineStaging-2.16 reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9 -reactos/dll/win32/mapi32 # Synced to WineStaging-2.9 +reactos/dll/win32/mapi32 # Synced to WineStaging-2.16 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-2.9 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9

7 years

[akhaldi] 75884: [JSPROXY] Sync with Wine Staging 2.16. CORE-13762 a79c6a8 jsproxy: Label ordinals.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:54:44 2017 New Revision: 75884 URL: http://svn.reactos.org/svn/reactos?rev=75884&view=rev Log: [JSPROXY] Sync with Wine Staging 2.16. CORE-13762 a79c6a8 jsproxy: Label ordinals. Modified: trunk/reactos/dll/win32/jsproxy/jsproxy.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jsproxy/jsproxy.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/jsproxy.… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/jsproxy.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jsproxy/jsproxy.spec [iso-8859-1] Sun Sep 17 22:54:44 2017 @@ -1,5 +1,6 @@ -@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll -@ stub InternetInitializeExAutoProxyDll -@ stdcall InternetDeInitializeAutoProxyDll(str long) -@ stub InternetDeInitializeExAutoProxyDll -@ stdcall InternetGetProxyInfo(str long str long ptr ptr) +101 stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +102 stdcall InternetDeInitializeAutoProxyDll(str long) +103 stdcall InternetGetProxyInfo(str long str long ptr ptr) +104 stub InternetInitializeAutoProxyDllEx +105 stub InternetDeInitializeAutoProxyDllEx +106 stub InternetGetProxyInfoEx 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] Sun Sep 17 22:54:44 2017 @@ -86,7 +86,7 @@ reactos/dll/win32/itircl # Synced to WineStaging-2.9 reactos/dll/win32/itss # Synced to WineStaging-2.9 reactos/dll/win32/jscript # Synced to WineStaging-2.16 -reactos/dll/win32/jsproxy # Synced to WineStaging-2.9 +reactos/dll/win32/jsproxy # Synced to WineStaging-2.16 reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9 reactos/dll/win32/mapi32 # Synced to WineStaging-2.9

7 years

[akhaldi] 75883: [JSCRIPT_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:54:31 2017 New Revision: 75883 URL: http://svn.reactos.org/svn/reactos?rev=75883&view=rev Log: [JSCRIPT_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/jscript/run.c Modified: trunk/rostests/winetests/jscript/run.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r… ============================================================================== --- trunk/rostests/winetests/jscript/run.c [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/run.c [iso-8859-1] Sun Sep 17 22:54:31 2017 @@ -1322,7 +1322,7 @@ return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[6], v; + VARIANT args[7], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1362,6 +1362,8 @@ V_UI4(args+4) = 0xffffffff; V_VT(args+5) = VT_BYREF|VT_VARIANT; V_VARIANTREF(args+5) = &v; + V_VT(args+6) = VT_R4; + V_R4(args+6) = 0.5; V_VT(&v) = VT_I4; V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); @@ -2651,7 +2653,8 @@ CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp," + "function(r4,i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" @@ -2661,6 +2664,8 @@ " ok(ui4 > 0, 'ui4 = ' + ui4);" " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" " ok(i4ref === 2, 'i4ref = ' + i4ref);" + " ok(r4 === 0.5, 'r4 = ' + r4);" + " ok(getVT(r4) === 'VT_R8', 'getVT(r4) = ' + getVT(r4));" "});"); CHECK_CALLED(global_testargtypes_i);

7 years

[akhaldi] 75882: [JSCRIPT] Sync with Wine Staging 2.16. CORE-13762 c25208f jscript: Added support for VT_R4 VARIANT types. 5c8c4d9 jscript: A spelling fix in a comment.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:54:24 2017 New Revision: 75882 URL: http://svn.reactos.org/svn/reactos?rev=75882&view=rev Log: [JSCRIPT] Sync with Wine Staging 2.16. CORE-13762 c25208f jscript: Added support for VT_R4 VARIANT types. 5c8c4d9 jscript: A spelling fix in a comment. Modified: trunk/reactos/dll/win32/jscript/compile.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/jscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.… ============================================================================== --- trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] Sun Sep 17 22:54:24 2017 @@ -1736,7 +1736,7 @@ if(stat->finally_statement) { /* * finally block expects two elements on the stack, which may be: - * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed addres + * - (true, return_addr) set by OP_pop_except, OP_end_finally jumps back to passed address * - (false, exception_value) set when unwinding an exception, which OP_end_finally rethrows */ finally_off = ctx->code_off; Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] Sun Sep 17 22:54:24 2017 @@ -293,6 +293,9 @@ case VT_UI4: *r = jsval_number(V_UI4(var)); return S_OK; + case VT_R4: + *r = jsval_number(V_R4(var)); + return S_OK; case VT_UNKNOWN: if(V_UNKNOWN(var)) { IDispatch *disp; 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] Sun Sep 17 22:54:24 2017 @@ -85,7 +85,7 @@ reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-2.9 reactos/dll/win32/itss # Synced to WineStaging-2.9 -reactos/dll/win32/jscript # Synced to WineStaging-2.9 +reactos/dll/win32/jscript # Synced to WineStaging-2.16 reactos/dll/win32/jsproxy # Synced to WineStaging-2.9 reactos/dll/win32/loadperf # Synced to WineStaging-2.9 reactos/dll/win32/lz32 # Synced to WineStaging-2.9

7 years

[akhaldi] 75881: [INETCOMM_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 22:54:17 2017 New Revision: 75881 URL: http://svn.reactos.org/svn/reactos?rev=75881&view=rev Log: [INETCOMM_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/inetcomm/mimeole.c Modified: trunk/rostests/winetests/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/inetcomm/mimeol… ============================================================================== --- trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/rostests/winetests/inetcomm/mimeole.c [iso-8859-1] Sun Sep 17 22:54:17 2017 @@ -197,9 +197,17 @@ MIMEPARAMINFO *param_info; IMimeAllocator *alloc; BODYOFFSETS offsets; + CLSID clsid; hr = CoCreateInstance(&CLSID_IMimeBody, NULL, CLSCTX_INPROC_SERVER, &IID_IMimeBody, (void**)&body); ok(hr == S_OK, "ret %08x\n", hr); + + hr = IMimeBody_GetClassID(body, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr); + + hr = IMimeBody_GetClassID(body, &clsid); + ok(hr == S_OK, "ret %08x\n", hr); + ok(IsEqualGUID(&clsid, &IID_IMimeBody), "got %s\n", wine_dbgstr_guid(&clsid)); hr = IMimeBody_GetHandle(body, &handle); ok(hr == MIME_E_NO_DATA, "ret %08x\n", hr); @@ -445,14 +453,14 @@ Stream_Clone }; -static TestStream *create_test_stream(void) +static IStream *create_test_stream(void) { TestStream *stream; stream = HeapAlloc(GetProcessHeap(), 0, sizeof(*stream)); stream->IStream_iface.lpVtbl = &StreamVtbl; stream->ref = 1; stream->pos = 0; - return stream; + return &stream->IStream_iface; } #define test_stream_read(a,b,c,d) _test_stream_read(__LINE__,a,b,c,d) @@ -474,8 +482,7 @@ static void test_SetData(void) { - IStream *stream, *stream2; - TestStream *test_stream; + IStream *stream, *stream2, *test_stream; IMimeBody *body; HRESULT hr; @@ -492,7 +499,7 @@ IStream_Release(stream); test_stream = create_test_stream(); - hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, &test_stream->IStream_iface); + hr = IMimeBody_SetData(body, IET_BINARY, "text", "plain", &IID_IStream, test_stream); ok(hr == S_OK, "ret %08x\n", hr); hr = IMimeBody_IsContentType(body, "text", "plain"); @@ -507,7 +514,7 @@ CHECK_CALLED(Stream_Stat); CHECK_CALLED(Stream_Seek_END); ok(hr == S_OK, "GetData failed %08x\n", hr); - ok(stream != &test_stream->IStream_iface, "unexpected stream\n"); + ok(stream != test_stream, "unexpected stream\n"); SET_EXPECT(Stream_Seek); SET_EXPECT(Stream_Read); @@ -538,7 +545,7 @@ IStream_Release(stream); IStream_Release(stream2); - IStream_Release(&test_stream->IStream_iface); + IStream_Release(test_stream); stream = create_stream_from_string(" \t\r\n|}~YWJj ZGV|}~mZw== \t"); /* "abcdefg" in base64 obscured by invalid chars */ hr = IMimeBody_SetData(body, IET_BASE64, "text", "plain", &IID_IStream, stream);

7 years

← Newer
1
...
10
11
12
13
14
15
16
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017