Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[akhaldi] 70094: [INCLUDES/WINE] Update debug.h. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 14:43:59 2015 New Revision: 70094 URL: http://svn.reactos.org/svn/reactos?rev=70094&view=rev Log: [INCLUDES/WINE] Update debug.h. CORE-10536 Modified: trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] Tue Nov 24 14:43:59 2015 @@ -252,7 +252,7 @@ "|VT_ARRAY", "|VT_VECTOR|VT_ARRAY", "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", + "|VT_VECTOR|VT_BYREF", "|VT_ARRAY|VT_BYREF", "|VT_VECTOR|VT_ARRAY|VT_BYREF", "|VT_RESERVED", @@ -260,7 +260,7 @@ "|VT_ARRAY|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_RESERVED", "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_BYREF|VT_RESERVED", "|VT_ARRAY|VT_BYREF|VT_RESERVED", "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", }; @@ -285,6 +285,8 @@ if (V_VT(v) & VT_BYREF) { if (V_VT(v) == (VT_VARIANT|VT_BYREF)) return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + if (V_VT(v) == (VT_BSTR|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_BSTR|VT_BYREF: %s}", v, V_BSTRREF(v) ? wine_dbgstr_w(*V_BSTRREF(v)) : "(none)" ); return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); } @@ -337,7 +339,7 @@ case VT_VOID: return wine_dbg_sprintf( "%p {VT_VOID}", v ); case VT_RECORD: - return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_RECORD(v), V_RECORDINFO(v) ); default: return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); }

8 years, 11 months

[akhaldi] 70093: [QUARTZ_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 12:34:05 2015 New Revision: 70093 URL: http://svn.reactos.org/svn/reactos?rev=70093&view=rev Log: [QUARTZ_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Added: trunk/rostests/winetests/quartz/mpegsplit.c (with props) Modified: trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/quartz/fil_data.idl trunk/rostests/winetests/quartz/filtergraph.c trunk/rostests/winetests/quartz/filtermapper.c trunk/rostests/winetests/quartz/testlist.c Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -8,6 +8,7 @@ filtermapper.c memallocator.c misc.c + mpegsplit.c referenceclock.c videorenderer.c testlist.c) Modified: trunk/rostests/winetests/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/fil_data… ============================================================================== --- trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/fil_data.idl [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "objidl.idl"; import "strmif.idl"; Modified: trunk/rostests/winetests/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filtergr… ============================================================================== --- trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtergraph.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -180,6 +180,9 @@ ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); + ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned %x\n", hr); + /* add the two filters to the graph */ hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); @@ -203,6 +206,15 @@ ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, NULL, pIn); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, NULL); + ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); + + hr = IGraphBuilder_Connect(pgraph, pIn, pIn); + ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr); if (pIn) IPin_Release(pIn); if (pEnum) IEnumPins_Release(pEnum); Modified: trunk/rostests/winetests/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/filterma… ============================================================================== --- trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/filtermapper.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -509,7 +509,7 @@ saBound.lLbound = 0; saBound.cElements = sizeof(data_block); psa = SafeArrayCreate(VT_UI1, 1, &saBound); - ok(psa != NULL, "Unable to crate safe array\n"); + ok(psa != NULL, "Unable to create safe array\n"); if (!psa) goto out; hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); ok(hr == S_OK, "Unable to access array data\n"); Added: trunk/rostests/winetests/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/mpegspli… ============================================================================== --- trunk/rostests/winetests/quartz/mpegsplit.c (added) +++ trunk/rostests/winetests/quartz/mpegsplit.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -0,0 +1,58 @@ +/* + * Unit tests for the MPEG-1 stream splitter functions + * + * Copyright 2015 Anton Baskanov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "wine/test.h" +#include "dshow.h" + +static IUnknown *create_mpeg_splitter(void) +{ + IUnknown *mpeg_splitter = NULL; + HRESULT result = CoCreateInstance(&CLSID_MPEG1Splitter, NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&mpeg_splitter); + ok(S_OK == result, "got 0x%08x\n", result); + return mpeg_splitter; +} + +static void test_query_interface(void) +{ + IUnknown *mpeg_splitter = create_mpeg_splitter(); + + IAMStreamSelect *stream_select = NULL; + HRESULT result = IUnknown_QueryInterface( + mpeg_splitter, &IID_IAMStreamSelect, (void **)&stream_select); + ok(S_OK == result, "got 0x%08x\n", result); + if (S_OK == result) + { + IAMStreamSelect_Release(stream_select); + } + + IUnknown_Release(mpeg_splitter); +} + +START_TEST(mpegsplit) +{ + CoInitialize(NULL); + + test_query_interface(); + + CoUninitialize(); +} Propchange: trunk/rostests/winetests/quartz/mpegsplit.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/quartz/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/testlist… ============================================================================== --- trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/testlist.c [iso-8859-1] Tue Nov 24 12:34:05 2015 @@ -1,4 +1,4 @@ -/* Automatically generated file; DO NOT EDIT!! */ +/* Automatically generated by make depend; DO NOT EDIT!! */ #define STANDALONE #include <wine/test.h> @@ -9,6 +9,7 @@ extern void func_filtermapper(void); extern void func_memallocator(void); extern void func_misc(void); +extern void func_mpegsplit(void); extern void func_referenceclock(void); extern void func_videorenderer(void); @@ -20,7 +21,8 @@ { "filtermapper", func_filtermapper }, { "memallocator", func_memallocator }, { "misc", func_misc }, + { "mpegsplit", func_mpegsplit }, + { "referenceclock", func_referenceclock }, { "videorenderer", func_videorenderer }, - { "referenceclock", func_referenceclock }, { 0, 0 } };

8 years, 11 months

[akhaldi] 70092: [QUARTZ] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 12:33:33 2015 New Revision: 70092 URL: http://svn.reactos.org/svn/reactos?rev=70092&view=rev Log: [QUARTZ] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt trunk/reactos/dll/directx/wine/quartz/avisplit.c trunk/reactos/dll/directx/wine/quartz/fil_data.idl trunk/reactos/dll/directx/wine/quartz/filesource.c trunk/reactos/dll/directx/wine/quartz/filtergraph.c trunk/reactos/dll/directx/wine/quartz/filtermapper.c trunk/reactos/dll/directx/wine/quartz/mpegsplit.c trunk/reactos/dll/directx/wine/quartz/parser.c trunk/reactos/dll/directx/wine/quartz/pin.c trunk/reactos/dll/directx/wine/quartz/regsvr.c trunk/reactos/dll/directx/wine/quartz/systemclock.c trunk/reactos/dll/directx/wine/quartz/vmr9.c trunk/reactos/dll/directx/wine/quartz/waveparser.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/CMakeLists.txt [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ @@ -52,7 +55,7 @@ set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${quartz_rc_deps}") set_module_type(quartz win32dll) target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB}) -add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 advapi32_vista shlwapi msvcrt kernel32 ntdll) add_dependencies(quartz dxsdk quartz_idlheader stdole2) add_pch(quartz quartz_private.h SOURCE) add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -186,7 +186,7 @@ ++stream->index_next; } - rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1 << 31)); + rtSampleStop = rtSampleStart + MEDIATIME_FROM_BYTES(entry->dwSize & ~(1u << 31)); TRACE("offset(%u) size(%u)\n", (DWORD)BYTES_FROM_MEDIATIME(rtSampleStart), (DWORD)BYTES_FROM_MEDIATIME(rtSampleStop - rtSampleStart)); } @@ -579,7 +579,7 @@ BOOL keyframe = !(pIndex->aIndex[x].dwSize >> 31); DWORDLONG offset = pIndex->qwBaseOffset + pIndex->aIndex[x].dwOffset; TRACE("dwOffset: %x%08x\n", (DWORD)(offset >> 32), (DWORD)offset); - TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1<<31))); + TRACE("dwSize: %u\n", (pIndex->aIndex[x].dwSize & ~(1u << 31))); TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); } @@ -977,7 +977,7 @@ for (z = 0; z < stream->stdindex[y]->nEntriesInUse; ++z) { - UINT len = stream->stdindex[y]->aIndex[z].dwSize & ~(1 << 31); + UINT len = stream->stdindex[y]->aIndex[z].dwSize & ~(1u << 31); frames += len / stream->streamheader.dwSampleSize + !!(len % stream->streamheader.dwSampleSize); } } @@ -1092,24 +1092,18 @@ return E_FAIL; } - pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); - - while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE)) + /* Skip any chunks until we find the LIST chunk */ + do { pos += sizeof(RIFFCHUNK) + list.cb; - hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } - - if (list.fcc != FOURCC_LIST) - { - ERR("Expected LIST, but got %.04s\n", (LPSTR)&list.fcc); - return E_FAIL; - } - if (list.fccListType != listtypeAVIMOVIE) - { - ERR("Expected AVI movie list, but got %.04s\n", (LPSTR)&list.fccListType); + while (hr == S_OK && (list.fcc != FOURCC_LIST || + (list.fcc == FOURCC_LIST && list.fccListType != listtypeAVIMOVIE))); + + if (hr != S_OK) + { + ERR("Failed to find LIST chunk from AVI file\n"); return E_FAIL; } @@ -1117,20 +1111,17 @@ /* FIXME: AVIX files are extended beyond the FOURCC chunk "AVI ", and thus won't be played here, * once I get one of the files I'll try to fix it */ - if (hr == S_OK) - { - This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); - pos += list.cb + sizeof(RIFFCHUNK); - - pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); - if (pos > total) - { - ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); - return E_FAIL; - } - - hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); - } + This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); + pos += list.cb + sizeof(RIFFCHUNK); + + pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); + if (pos > total) + { + ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + return E_FAIL; + } + + hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); props->cbAlign = 1; props->cbPrefix = 0; @@ -1325,7 +1316,7 @@ { if (stream->streamheader.dwSampleSize) { - ULONG len = stream->stdindex[y]->aIndex[z].dwSize & ~(1 << 31); + ULONG len = stream->stdindex[y]->aIndex[z].dwSize & ~(1u << 31); ULONG size = stream->streamheader.dwSampleSize; pin->dwSamplesProcessed += len / size; @@ -1443,7 +1434,7 @@ if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } Modified: trunk/reactos/dll/directx/wine/quartz/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/fil_data.idl [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/fil_data.idl [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "objidl.idl"; import "strmif.idl"; Modified: trunk/reactos/dll/directx/wine/quartz/filesource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filesource.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -795,20 +795,18 @@ *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) + *ppv = &This->pin.pin.IPin_iface; else if (IsEqualIID(riid, &IID_IAsyncReader)) *ppv = &This->IAsyncReader_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking)) + if (!IsEqualIID(riid, &IID_IMediaSeeking)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE; Modified: trunk/reactos/dll/directx/wine/quartz/filtergraph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtergraph.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -589,7 +589,7 @@ if (info_out.dir != PINDIR_OUTPUT) { IBaseFilter_Release(info_out.pFilter); - return E_UNEXPECTED; + return VFW_E_CANNOT_CONNECT; } hr = IPin_QueryPinInfo(in, &info_in); @@ -599,7 +599,7 @@ goto out; if (info_in.dir != PINDIR_INPUT) { - hr = E_UNEXPECTED; + hr = VFW_E_CANNOT_CONNECT; goto out; } @@ -891,6 +891,9 @@ TRACE("(%p/%p)->(%p, %p)\n", This, iface, ppinOut, ppinIn); + if(!ppinOut || !ppinIn) + return E_POINTER; + if (TRACE_ON(quartz)) { hr = IPin_QueryPinInfo(ppinIn, &PinInfo); Modified: trunk/reactos/dll/directx/wine/quartz/filtermapper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/fi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/filtermapper.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -1514,7 +1514,7 @@ if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); - lRet = SHDeleteKeyW(hKey, wszPins); + lRet = RegDeleteTreeW(hKey, wszPins); if (lRet != ERROR_SUCCESS) hr = HRESULT_FROM_WIN32(lRet); @@ -1573,7 +1573,7 @@ strcatW(wszPinNameKey, wszSlash); strcatW(wszPinNameKey, Name); - lRet = SHDeleteKeyW(hKey, wszPinNameKey); + lRet = RegDeleteTreeW(hKey, wszPinNameKey); hr = HRESULT_FROM_WIN32(lRet); CoTaskMemFree(wszPinNameKey); } Modified: trunk/reactos/dll/directx/wine/quartz/mpegsplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/mp… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/mpegsplit.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -23,6 +23,9 @@ #include "quartz_private.h" +#include <strmif.h> + + #define SEQUENCE_HEADER_CODE 0xB3 #define PACK_START_CODE 0xBA @@ -38,6 +41,7 @@ typedef struct MPEGSplitterImpl { ParserImpl Parser; + IAMStreamSelect IAMStreamSelect_iface; LONGLONG EndOfFile; LONGLONG position; DWORD begin_offset; @@ -47,9 +51,19 @@ BOOL seek; } MPEGSplitterImpl; +static inline MPEGSplitterImpl *impl_from_IBaseFilter( IBaseFilter *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.filter.IBaseFilter_iface); +} + static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); +} + +static inline MPEGSplitterImpl *impl_from_IAMStreamSelect( IAMStreamSelect *iface ) +{ + return CONTAINING_RECORD(iface, MPEGSplitterImpl, IAMStreamSelect_iface); } static int MPEGSplitter_head_check(const BYTE *header) @@ -97,9 +111,7 @@ int bitrate_index, freq_index, lsf = 1, mpeg1, layer, padding, bitrate, length; LONGLONG duration; - if (!(header[0] == 0xff && ((header[1]>>5)&0x7) == 0x7 && - ((header[1]>>1)&0x3) != 0 && ((header[2]>>4)&0xf) != 0xf && - ((header[2]>>2)&0x3) != 0x3)) + if (MPEGSplitter_head_check(header) != MPEG_AUDIO_HEADER) { FIXME("Not a valid header: %02x:%02x:%02x:%02x\n", header[0], header[1], header[2], header[3]); return E_INVALIDARG; @@ -189,9 +201,9 @@ if (SUCCEEDED(hr)) { IMediaSample_SetTime(sample, &rtSampleStart, &rtSampleStop); - IMediaSample_SetPreroll(sample, 0); - IMediaSample_SetDiscontinuity(sample, 0); - IMediaSample_SetSyncPoint(sample, 1); + IMediaSample_SetPreroll(sample, FALSE); + IMediaSample_SetDiscontinuity(sample, FALSE); + IMediaSample_SetSyncPoint(sample, TRUE); hr = IAsyncReader_Request(pin->pReader, sample, 0); if (SUCCEEDED(hr)) { @@ -461,7 +473,7 @@ HRESULT hr; LONGLONG pos = 0; /* in bytes */ BYTE header[10]; - int streamtype = 0; + int streamtype; LONGLONG total, avail; AM_MEDIA_TYPE amt; PIN_INFO piOutput; @@ -499,12 +511,37 @@ hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); if (SUCCEEDED(hr)) pos += 4; - TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); } while (0); - while(SUCCEEDED(hr) && !(streamtype=MPEGSplitter_head_check(header))) - { - TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + while(SUCCEEDED(hr)) + { + TRACE("Testing header %x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + + streamtype = MPEGSplitter_head_check(header); + if (streamtype == MPEG_AUDIO_HEADER) + { + LONGLONG length; + if (parse_header(header, &length, NULL) == S_OK) + { + BYTE next_header[4]; + /* Ensure we have a valid header by seeking for the next frame, some bad + * encoded ID3v2 may have an incorrect length and we end up finding bytes + * like FF FE 00 28 which are nothing more than a Unicode BOM followed by + * ')' character from inside a ID3v2 tag. Unfortunately that sequence + * matches like a valid mpeg audio header. + */ + hr = IAsyncReader_SyncRead(pPin->pReader, pos + length - 4, 4, next_header); + if (FAILED(hr)) + break; + if (parse_header(next_header, &length, NULL) == S_OK) + break; + TRACE("%x:%x:%x:%x is a fake audio header, looking for next...\n", + header[0], header[1], header[2], header[3]); + } + } + else if (streamtype) /* Video or System stream */ + break; + /* No valid header yet; shift by a byte and check again */ memmove(header, header+1, 3); hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3); @@ -695,7 +732,7 @@ IMediaSample_SetPreroll(sample, FALSE); IMediaSample_SetDiscontinuity(sample, TRUE); IMediaSample_SetSyncPoint(sample, 1); - This->seek = 0; + This->seek = FALSE; hr = IAsyncReader_Request(pin->pReader, sample, 0); if (SUCCEEDED(hr)) @@ -712,9 +749,36 @@ return hr; } +static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IBaseFilter(iface); + TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); + + *ppv = NULL; + + if ( IsEqualIID(riid, &IID_IUnknown) + || IsEqualIID(riid, &IID_IPersist) + || IsEqualIID(riid, &IID_IMediaFilter) + || IsEqualIID(riid, &IID_IBaseFilter) ) + *ppv = iface; + else if ( IsEqualIID(riid, &IID_IAMStreamSelect) ) + *ppv = &This->IAMStreamSelect_iface; + + if (*ppv) + { + IBaseFilter_AddRef(iface); + return S_OK; + } + + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IVideoWindow)) + FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); + + return E_NOINTERFACE; +} + static const IBaseFilterVtbl MPEGSplitter_Vtbl = { - Parser_QueryInterface, + MPEGSplitter_QueryInterface, Parser_AddRef, Parser_Release, Parser_GetClassID, @@ -731,6 +795,64 @@ Parser_QueryVendorInfo }; +static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_QueryInterface(&This->Parser.filter.IBaseFilter_iface, riid, ppv); +} + +static ULONG WINAPI AMStreamSelect_AddRef(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_AddRef(&This->Parser.filter.IBaseFilter_iface); +} + +static ULONG WINAPI AMStreamSelect_Release(IAMStreamSelect *iface) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + return IBaseFilter_Release(&This->Parser.filter.IBaseFilter_iface); +} + +static HRESULT WINAPI AMStreamSelect_Count(IAMStreamSelect *iface, DWORD *streams) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%p) stub!\n", This, iface, streams); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Info(IAMStreamSelect *iface, LONG index, AM_MEDIA_TYPE **media_type, DWORD *flags, LCID *lcid, DWORD *group, WCHAR **name, IUnknown **object, IUnknown **unknown) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%p,%p,%p,%p,%p,%p,%p) stub!\n", This, iface, index, media_type, flags, lcid, group, name, object, unknown); + + return E_NOTIMPL; +} + +static HRESULT WINAPI AMStreamSelect_Enable(IAMStreamSelect *iface, LONG index, DWORD flags) +{ + MPEGSplitterImpl *This = impl_from_IAMStreamSelect(iface); + + FIXME("(%p/%p)->(%d,%x) stub!\n", This, iface, index, flags); + + return E_NOTIMPL; +} + +static const IAMStreamSelectVtbl AMStreamSelectVtbl = +{ + AMStreamSelect_QueryInterface, + AMStreamSelect_AddRef, + AMStreamSelect_Release, + AMStreamSelect_Count, + AMStreamSelect_Info, + AMStreamSelect_Enable +}; + HRESULT MPEGSplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) { MPEGSplitterImpl *This; @@ -754,10 +876,11 @@ CoTaskMemFree(This); return hr; } - This->seek = 1; + This->IAMStreamSelect_iface.lpVtbl = &AMStreamSelectVtbl; + This->seek = TRUE; /* Note: This memory is managed by the parser filter once created */ - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } Modified: trunk/reactos/dll/directx/wine/quartz/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/parser.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -133,11 +133,11 @@ || IsEqualIID(riid, &IID_IPersist) || IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter) ) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -507,21 +507,21 @@ { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_QueryInterface((IUnknown *)This, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI Parser_Seeking_AddRef(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_AddRef((IUnknown *)This); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI Parser_Seeking_Release(IMediaSeeking * iface) { ParserImpl *This = impl_from_IMediaSeeking(iface); - return IUnknown_Release((IUnknown *)This); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static const IMediaSeekingVtbl Parser_Seeking_Vtbl = Modified: trunk/reactos/dll/directx/wine/quartz/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/pi… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/pin.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -203,7 +203,7 @@ pPinImpl->dRate = 1.0; pPinImpl->state = Req_Die; pPinImpl->fnCustomRequest = pCustomRequest; - pPinImpl->stop_playback = 1; + pPinImpl->stop_playback = TRUE; InitializeCriticalSection(&pPinImpl->thread_lock); pPinImpl->thread_lock.DebugInfo->Spare[0] = (DWORD_PTR)( __FILE__ ": PullPin.thread_lock"); @@ -406,6 +406,7 @@ { DWORD_PTR dwUser; + pSample = NULL; IAsyncReader_WaitForNext(This->pReader, 0, &pSample, &dwUser); if (!pSample) @@ -628,7 +629,7 @@ /* Wake up! */ assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); This->state = Req_Run; - This->stop_playback = 0; + This->stop_playback = FALSE; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); } @@ -654,7 +655,7 @@ assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); This->state = Req_Pause; - This->stop_playback = 1; + This->stop_playback = TRUE; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); @@ -690,7 +691,7 @@ assert(This->state == Req_Pause || This->state == Req_Sleepy); - This->stop_playback = 1; + This->stop_playback = TRUE; This->state = Req_Die; assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); ResetEvent(This->hEventStateChanged); Modified: trunk/reactos/dll/directx/wine/quartz/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/re… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/regsvr.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -240,7 +240,7 @@ WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = SHDeleteKeyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -346,18 +346,18 @@ WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = SHDeleteKeyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = SHDeleteKeyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } @@ -500,7 +500,7 @@ if (res != ERROR_SUCCESS) break; StringFromGUID2(list->subtype, buf, 39); - res = SHDeleteKeyW(majortype_key, buf); + res = RegDeleteTreeW(majortype_key, buf); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; /* Removed majortype key if there is no more subtype key */ @@ -535,7 +535,7 @@ res = ERROR_SUCCESS; else if (res == ERROR_SUCCESS) for (; res == ERROR_SUCCESS && list->majortype; ++list) { - res = SHDeleteKeyA(extensions_root_key, list->extension); + res = RegDeleteTreeA(extensions_root_key, list->extension); if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } Modified: trunk/reactos/dll/directx/wine/quartz/systemclock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/sy… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/systemclock.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -209,7 +209,7 @@ if (IsEqualIID (riid, &IID_IUnknown) || IsEqualIID (riid, &IID_IReferenceClock)) { SystemClockImpl_AddRef(iface); - *ppobj = This; + *ppobj = &This->IReferenceClock_iface; return S_OK; } Modified: trunk/reactos/dll/directx/wine/quartz/vmr9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/vm… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/vmr9.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -24,7 +24,6 @@ #include <d3d9.h> #include <vmr9.h> -#include <strmif.h> struct quartz_vmr { @@ -3068,6 +3067,7 @@ D3DDISPLAYMODE mode; hr = IDirect3D9_EnumAdapterModes(This->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); + if (hr == D3DERR_INVALIDCALL) break; /* out of adapters */ } while (FAILED(hr)); if (FAILED(hr)) ERR("HR: %08x\n", hr); @@ -3094,6 +3094,6 @@ This->SurfaceAllocatorNotify = NULL; This->reset = FALSE; - *ppv = This; - return S_OK; -} + *ppv = &This->IVMRImagePresenter9_iface; + return S_OK; +} Modified: trunk/reactos/dll/directx/wine/quartz/waveparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/wa… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/waveparser.c [iso-8859-1] Tue Nov 24 12:33:33 2015 @@ -106,9 +106,9 @@ pin->rtCurrent = pin->rtNext; pin->rtNext = rtSampleStop; - IMediaSample_SetPreroll(newsample, 0); - IMediaSample_SetDiscontinuity(newsample, 0); - IMediaSample_SetSyncPoint(newsample, 1); + IMediaSample_SetPreroll(newsample, FALSE); + IMediaSample_SetDiscontinuity(newsample, FALSE); + IMediaSample_SetSyncPoint(newsample, TRUE); hr = IAsyncReader_Request(pin->pReader, newsample, 0); } @@ -424,7 +424,7 @@ if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->Parser.filter.IBaseFilter_iface; return hr; } 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] Tue Nov 24 12:33:33 2015 @@ -39,7 +39,7 @@ reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.55 reactos/dll/win32/activeds # Synced to WineStaging-1.7.47

8 years, 11 months

[akhaldi] 70091: [QEDIT] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 12:30:47 2015 New Revision: 70091 URL: http://svn.reactos.org/svn/reactos?rev=70091&view=rev Log: [QEDIT] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/qedit/samplegrabber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/qedit/sam… ============================================================================== --- trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/qedit/samplegrabber.c [iso-8859-1] Tue Nov 24 12:30:47 2015 @@ -25,11 +25,11 @@ static const WCHAR pin_in_name[] = { 'I', 'n', 0 }; static const WCHAR pin_out_name[] = { 'O', 'u', 't', 0 }; -static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype); +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past); /* Single media type enumerator */ typedef struct _ME_Impl { - IEnumMediaTypes me; + IEnumMediaTypes IEnumMediaTypes_iface; LONG refCount; BOOL past; AM_MEDIA_TYPE mtype; @@ -38,22 +38,42 @@ /* IEnumMediaTypes interface implementation */ -/* IUnknown */ -static ULONG WINAPI -Single_IEnumMediaTypes_AddRef(IEnumMediaTypes *iface) -{ - ME_Impl *This = (ME_Impl *)iface; +static inline ME_Impl *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) +{ + return CONTAINING_RECORD(iface, ME_Impl, IEnumMediaTypes_iface); +} + +static HRESULT WINAPI Single_IEnumMediaTypes_QueryInterface(IEnumMediaTypes *iface, REFIID riid, + void **ret_iface) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ret_iface); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumMediaTypes)) { + *ret_iface = iface; + IEnumMediaTypes_AddRef(iface); + return S_OK; + } + *ret_iface = NULL; + WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI Single_IEnumMediaTypes_AddRef(IEnumMediaTypes *iface) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedIncrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); return refCount; } -/* IUnknown */ -static ULONG WINAPI -Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) -{ - ME_Impl *This = (ME_Impl *)iface; +static ULONG WINAPI Single_IEnumMediaTypes_Release(IEnumMediaTypes *iface) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedDecrement(&This->refCount); + TRACE("(%p) new ref = %u\n", This, refCount); if (refCount == 0) { @@ -65,30 +85,13 @@ return refCount; } -/* IUnknown */ -static HRESULT WINAPI -Single_IEnumMediaTypes_QueryInterface(IEnumMediaTypes *iface, REFIID riid, void **ppvObject) -{ - ME_Impl *This = (ME_Impl *)iface; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IEnumMediaTypes)) { - Single_IEnumMediaTypes_AddRef(iface); - *ppvObject = &(This->me); - return S_OK; - } - *ppvObject = NULL; - WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject); - return E_NOINTERFACE; -} - /* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, AM_MEDIA_TYPE **types, ULONG *fetched) -{ - ME_Impl *This = (ME_Impl *)iface; +static HRESULT WINAPI Single_IEnumMediaTypes_Next(IEnumMediaTypes *iface, ULONG nTypes, + AM_MEDIA_TYPE **types, ULONG *fetched) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); ULONG count = 0; + TRACE("(%p)->(%u, %p, %p)\n", This, nTypes, types, fetched); if (!nTypes) return E_INVALIDARG; @@ -110,39 +113,35 @@ return (count == nTypes) ? S_OK : S_FALSE; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Skip(IEnumMediaTypes *iface, ULONG nTypes) -{ - ME_Impl *This = (ME_Impl *)iface; +static HRESULT WINAPI Single_IEnumMediaTypes_Skip(IEnumMediaTypes *iface, ULONG nTypes) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%u)\n", This, nTypes); if (nTypes) This->past = TRUE; return This->past ? S_FALSE : S_OK; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Reset(IEnumMediaTypes *iface) -{ - ME_Impl *This = (ME_Impl *)iface; +static HRESULT WINAPI Single_IEnumMediaTypes_Reset(IEnumMediaTypes *iface) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->()\n", This); This->past = FALSE; return S_OK; } -/* IEnumMediaTypes */ -static HRESULT WINAPI -Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **me) -{ - ME_Impl *This = (ME_Impl *)iface; +static HRESULT WINAPI Single_IEnumMediaTypes_Clone(IEnumMediaTypes *iface, IEnumMediaTypes **me) +{ + ME_Impl *This = impl_from_IEnumMediaTypes(iface); + TRACE("(%p)->(%p)\n", This, me); if (!me) return E_POINTER; - *me = mediaenum_create(&This->mtype); + *me = mediaenum_create(&This->mtype, This->past); if (!*me) return E_OUTOFMEMORY; - ((ME_Impl *)*me)->past = This->past; return S_OK; } @@ -160,28 +159,30 @@ Single_IEnumMediaTypes_Clone, }; -static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype) +static IEnumMediaTypes *mediaenum_create(const AM_MEDIA_TYPE *mtype, BOOL past) { ME_Impl *obj = CoTaskMemAlloc(sizeof(ME_Impl)); - if (obj) { - ZeroMemory(obj, sizeof(ME_Impl)); - obj->me.lpVtbl = &IEnumMediaTypes_VTable; - obj->refCount = 1; - obj->past = FALSE; - if (mtype) { - obj->mtype = *mtype; - obj->mtype.pUnk = NULL; - if (mtype->cbFormat) { - obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); - CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); - } - else - obj->mtype.pbFormat = NULL; + + if (!obj) + return NULL; + ZeroMemory(obj, sizeof(*obj)); + obj->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypes_VTable; + obj->refCount = 1; + obj->past = past; + if (mtype) { + obj->mtype = *mtype; + obj->mtype.pUnk = NULL; + if (mtype->cbFormat) { + obj->mtype.pbFormat = CoTaskMemAlloc(mtype->cbFormat); + CopyMemory(obj->mtype.pbFormat, mtype->pbFormat, mtype->cbFormat); } else - obj->mtype.majortype = GUID_NULL; - } - return &obj->me; + obj->mtype.pbFormat = NULL; + } + else + obj->mtype.majortype = GUID_NULL; + + return &obj->IEnumMediaTypes_iface; } @@ -1083,7 +1084,7 @@ TRACE("(%p)->(%p)\n", This, mtypes); if (!mtypes) return E_POINTER; - *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL); + *mtypes = mediaenum_create(This->sg->pin_in.pair ? &This->sg->mtype : NULL, FALSE); return *mtypes ? S_OK : E_OUTOFMEMORY; } 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] Tue Nov 24 12:30:47 2015 @@ -38,7 +38,7 @@ reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37 +reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.55

8 years, 11 months

[akhaldi] 70090: [DXDIAGN_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 11:02:38 2015 New Revision: 70090 URL: http://svn.reactos.org/svn/reactos?rev=70090&view=rev Log: [DXDIAGN_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/dxdiagn/container.c Modified: trunk/rostests/winetests/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dxdiagn/contain… ============================================================================== --- trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dxdiagn/container.c [iso-8859-1] Tue Nov 24 11:02:38 2015 @@ -36,6 +36,11 @@ static const WCHAR DxDiag_SystemInfo[] = {'D','x','D','i','a','g','_','S','y','s','t','e','m','I','n','f','o',0}; static const WCHAR DxDiag_DisplayDevices[] = {'D','x','D','i','a','g','_','D','i','s','p','l','a','y','D','e','v','i','c','e','s',0}; +static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d','.', + 'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; +static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','D','i','r','e','c','t','S','o','u','n','d','.', + 'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e', + 'D','e','v','i','c','e','s',0}; /* Based on debugstr_variant in dlls/jscript/jsutils.c. */ static const char *debugstr_variant(const VARIANT *var) @@ -896,7 +901,8 @@ {szProcessorEnglish, VT_BSTR}, }; - IDxDiagContainer *container; + IDxDiagContainer *container, *container2; + static const WCHAR empty[] = {0}; HRESULT hr; if (!create_root_IDxDiagContainer()) @@ -905,6 +911,9 @@ return; } + hr = IDxDiagContainer_GetChildContainer(pddc, empty, &container2); + ok(hr == E_INVALIDARG, "Expected IDxDiagContainer::GetChildContainer to return E_INVALIDARG, got 0x%08x\n", hr); + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SystemInfo, &container); ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); @@ -912,6 +921,14 @@ { trace("Testing container DxDiag_SystemInfo\n"); test_container_properties(container, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + + container2 = NULL; + hr = IDxDiagContainer_GetChildContainer(container, empty, &container2); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(container2 != NULL, "Expected container2 != NULL\n"); + ok(container2 != container, "Expected container != container2\n"); + if (hr == S_OK) IDxDiagContainer_Release(container2); + IDxDiagContainer_Release(container); } @@ -1020,6 +1037,149 @@ IDxDiagProvider_Release(pddp); } +static void test_DxDiag_SoundDevices(void) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; + static const WCHAR empty[] = {0}; + + static const struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szGuidDeviceID, VT_BSTR}, + {szDriverName, VT_BSTR}, + {szDriverPath, VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SoundDevices, &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child, *child2; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + } + + child2 = NULL; + hr = IDxDiagContainer_GetChildContainer(child, empty, &child2); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + ok(child2 != NULL, "Expected child2 != NULL\n"); + ok(child2 != child, "Expected child != child2\n"); + if (hr == S_OK) IDxDiagContainer_Release(child2); + + IDxDiagContainer_Release(child); + } + +cleanup: + if (sound_cont) IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +static void test_DxDiag_SoundCaptureDevices(void) +{ + static const WCHAR szDescription[] = {'s','z','D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + static const WCHAR szDriverName[] = {'s','z','D','r','i','v','e','r','N','a','m','e',0}; + + static const struct property_test property_tests[] = + { + {szDescription, VT_BSTR}, + {szGuidDeviceID, VT_BSTR}, + {szDriverName, VT_BSTR}, + {szDriverPath, VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, DxDiag_SoundCaptureDevices, &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + if (hr == S_OK) + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + if (hr != S_OK) + goto cleanup; + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, sizeof(child_container)/sizeof(WCHAR)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + if (hr == S_OK) + { + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); + } + IDxDiagContainer_Release(child); + } + +cleanup: + if (sound_cont) IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -1034,5 +1194,7 @@ test_root_children(); test_DxDiag_SystemInfo(); test_DxDiag_DisplayDevices(); + test_DxDiag_SoundDevices(); + test_DxDiag_SoundCaptureDevices(); CoUninitialize(); }

8 years, 11 months

[akhaldi] 70089: [DXDIAGN] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 10:59:31 2015 New Revision: 70089 URL: http://svn.reactos.org/svn/reactos?rev=70089&view=rev Log: [DXDIAGN] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt trunk/reactos/dll/directx/wine/dxdiagn/container.c trunk/reactos/dll/directx/wine/dxdiagn/fil_data.idl trunk/reactos/dll/directx/wine/dxdiagn/provider.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/C… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/CMakeLists.txt [iso-8859-1] Tue Nov 24 10:59:31 2015 @@ -19,6 +19,6 @@ set_module_type(dxdiagn win32dll) target_link_libraries(dxdiagn strmiids dxguid uuid wine) add_dependencies(dxdiagn dxdiagn_idlheader) -add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 msvcrt kernel32 ntdll) +add_importlibs(dxdiagn d3d9 ddraw version ole32 oleaut32 psapi user32 dsound msvcrt kernel32 ntdll) add_pch(dxdiagn dxdiag_private.h SOURCE) add_cd_file(TARGET dxdiagn DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dxdiagn/container.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/c… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/container.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/container.c [iso-8859-1] Tue Nov 24 10:59:31 2015 @@ -154,6 +154,14 @@ orig_tmp = tmp = HeapAlloc(GetProcessHeap(), 0, tmp_len * sizeof(WCHAR)); if (NULL == tmp) return E_FAIL; lstrcpynW(tmp, pwszContainer, tmp_len); + + /* special handling for an empty string and leaf container */ + if (!tmp[0] && list_empty(&pContainer->subContainers)) { + hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pContainer, This->pProv, (void **)ppInstance); + if (SUCCEEDED(hr)) + TRACE("Succeeded in getting the container instance\n"); + goto out; + } cur = strchrW(tmp, '.'); while (NULL != cur) { @@ -162,7 +170,7 @@ TRACE("Trying to get parent container %s\n", debugstr_w(tmp)); hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (FAILED(hr)) - goto on_error; + goto out; cur++; /* go after '.' (just replaced by \0) */ tmp = cur; cur = strchrW(tmp, '.'); @@ -176,7 +184,7 @@ TRACE("Succeeded in getting the container instance\n"); } -on_error: +out: HeapFree(GetProcessHeap(), 0, orig_tmp); return hr; } Modified: trunk/reactos/dll/directx/wine/dxdiagn/fil_data.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/f… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/fil_data.idl [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/fil_data.idl [iso-8859-1] Tue Nov 24 10:59:31 2015 @@ -15,6 +15,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + +#pragma makedep header import "objidl.idl"; import "strmif.idl"; Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p… ============================================================================== --- trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c [iso-8859-1] Tue Nov 24 10:59:31 2015 @@ -24,10 +24,12 @@ #include <winver.h> #include <uuids.h> +#include <mmddk.h> #include <d3d9.h> #include <fil_data.h> #include <psapi.h> #include <wbemcli.h> +#include <dsound.h> static const WCHAR szEmpty[] = {0}; @@ -321,7 +323,7 @@ return E_OUTOFMEMORY; V_VT(&prop->vProp) = VT_BOOL; - V_BOOL(&prop->vProp) = data; + V_BOOL(&prop->vProp) = data ? VARIANT_TRUE : VARIANT_FALSE; list_add_tail(&node->properties, &prop->entry); ++node->nProperties; @@ -1175,11 +1177,85 @@ return fill_display_information_fallback(node); } +struct enum_context +{ + IDxDiagContainerImpl_Container *cont; + HRESULT hr; + int index; +}; + +static const WCHAR szGUIDFmt[] = +{ + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0', + '2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2', + 'x','%','0','2','x','%','0','2','x','%','0','2','x',0 +}; + +static LPWSTR guid_to_string(LPWSTR lpwstr, REFGUID lpcguid) +{ + wsprintfW(lpwstr, szGUIDFmt, lpcguid->Data1, lpcguid->Data2, + lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1], + lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4], + lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]); + + return lpwstr; +} + +BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID context) +{ + static const WCHAR deviceid_fmtW[] = {'%','u',0}; + static const WCHAR szGuidDeviceID[] = {'s','z','G','u','i','d','D','e','v','i','c','e','I','D',0}; + static const WCHAR szDriverPath[] = {'s','z','D','r','i','v','e','r','P','a','t','h',0}; + + struct enum_context *enum_ctx = context; + IDxDiagContainerImpl_Container *device; + WCHAR buffer[256]; + const WCHAR *p, *name; + + /* the default device is enumerated twice, one time without GUID */ + if (!guid) return TRUE; + + snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); + device = allocate_information_node(buffer); + if (!device) + { + enum_ctx->hr = E_OUTOFMEMORY; + return FALSE; + } + + add_subcontainer(enum_ctx->cont, device); + + guid_to_string(buffer, guid); + enum_ctx->hr = add_bstr_property(device, szGuidDeviceID, buffer); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDescription, desc); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDriverPath, module); + if (FAILED(enum_ctx->hr)) + return FALSE; + + name = module; + if ((p = strrchrW(name, '\\'))) name = p + 1; + if ((p = strrchrW(name, '/'))) name = p + 1; + + enum_ctx->hr = add_bstr_property(device, szDriverName, name); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->index++; + return TRUE; +} + static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; + struct enum_context enum_ctx; IDxDiagContainerImpl_Container *cont; cont = allocate_information_node(DxDiag_SoundDevices); @@ -1188,11 +1264,27 @@ add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + cont = allocate_information_node(DxDiag_SoundCaptureDevices); if (!cont) return E_OUTOFMEMORY; add_subcontainer(node, cont); + + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundCaptureEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; return S_OK; } 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] Tue Nov 24 10:59:31 2015 @@ -36,7 +36,7 @@ reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 -reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/qedit # Synced to WineStaging-1.7.37 reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47

8 years, 11 months

[akhaldi] 70088: [DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 10:57:37 2015 New Revision: 70088 URL: http://svn.reactos.org/svn/reactos?rev=70088&view=rev Log: [DPLAYX] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplobby.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Tue Nov 24 10:57:37 2015 @@ -5797,7 +5797,7 @@ guid_cache = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID) * dwIndex); if (!guid_cache) { - ERR(": failed to alloc required memory.\n"); + ERR(": failed to allocate required memory.\n"); return DPERR_EXCEPTION; } cache_count = dwIndex; Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] Tue Nov 24 10:57:37 2015 @@ -745,8 +745,6 @@ DWORD dwAtIndex; LPCSTR atKey = "Address Types"; LPCSTR guidDataSubKey = "Guid"; - FILETIME filetime; - TRACE(" this time through: %s\n", subKeyName ); 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] Tue Nov 24 10:57:37 2015 @@ -34,7 +34,7 @@ reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/msdmo # Synced to WineStaging-1.7.47

8 years, 11 months

[akhaldi] 70087: [DINPUT_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 10:52:32 2015 New Revision: 70087 URL: http://svn.reactos.org/svn/reactos?rev=70087&view=rev Log: [DINPUT_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/rostests/winetests/dinput/mouse.c Modified: trunk/rostests/winetests/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dinput/mouse.c?… ============================================================================== --- trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/dinput/mouse.c [iso-8859-1] Tue Nov 24 10:52:32 2015 @@ -97,6 +97,7 @@ DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; + MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -134,6 +135,8 @@ * loose mouse input */ hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

8 years, 11 months

[akhaldi] 70086: [DINPUT] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 10:51:48 2015 New Revision: 70086 URL: http://svn.reactos.org/svn/reactos?rev=70086&view=rev Log: [DINPUT] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/dinput/device.c trunk/reactos/dll/directx/wine/dinput/dinput_main.c trunk/reactos/dll/directx/wine/dinput/dinput_private.h trunk/reactos/dll/directx/wine/dinput/keyboard.c trunk/reactos/dll/directx/wine/dinput/mouse.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dinput/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/de… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/device.c [iso-8859-1] Tue Nov 24 10:51:48 2015 @@ -1618,13 +1618,8 @@ if (!This->acquired) return DIERR_NOTACQUIRED; -#ifndef __REACTOS__ - __wine_check_for_events( QS_ALLINPUT ); - return DI_OK; -#else - /* Devices do not need to be polled on ReactOS. */ - return DI_NOEFFECT; -#endif + check_dinput_events(); + return DI_OK; } HRESULT WINAPI IDirectInputDevice2AImpl_Poll(LPDIRECTINPUTDEVICE8A iface) Modified: trunk/reactos/dll/directx/wine/dinput/dinput_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_main.c [iso-8859-1] Tue Nov 24 10:51:48 2015 @@ -320,6 +320,39 @@ return priorityFlags; } +#if defined __i386__ && defined _MSC_VER +__declspec(naked) BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref) +{ + __asm + { + push ebp + mov ebp, esp + push [ebp+16] + push [ebp+12] + call [ebp+8] + leave + ret + } +} +#elif defined __i386__ && defined __GNUC__ +extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref)) +#endif + /****************************************************************************** * IDirectInputA_EnumDevices */ @@ -352,7 +385,7 @@ TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) return S_OK; } } @@ -392,7 +425,7 @@ TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) - if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) + if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) return S_OK; } } @@ -1464,7 +1497,7 @@ /* Force creation of the message queue */ PeekMessageW( &msg, 0, 0, 0, PM_NOREMOVE ); - SetEvent(*(LPHANDLE)param); + SetEvent(param); while (GetMessageW( &msg, 0, 0, 0 )) { @@ -1532,6 +1565,7 @@ } static DWORD hook_thread_id; +static HANDLE hook_thread_event; static CRITICAL_SECTION_DEBUG dinput_critsect_debug = { @@ -1550,23 +1584,20 @@ TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { - HANDLE event; - - event = CreateEventW(NULL, FALSE, FALSE, NULL); - hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &hook_thread_id); - if (event && hook_thread) + hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); + LeaveCriticalSection(&dinput_hook_crit); + } + else if (list_empty(&direct_input_list) && hook_thread) + { + DWORD tid = hook_thread_id; + + if (hook_thread_event) /* if thread is not started yet */ { - HANDLE handles[2]; - handles[0] = event; - handles[1] = hook_thread; - WaitForMultipleObjects(2, handles, FALSE, INFINITE); + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; } - LeaveCriticalSection(&dinput_hook_crit); - CloseHandle(event); - } - else if (list_empty(&direct_input_list) && hook_thread) - { - DWORD tid = hook_thread_id; hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); @@ -1608,9 +1639,32 @@ callwndproc_hook = NULL; } + if (hook_thread_event) /* if thread is not started yet */ + { + WaitForSingleObject(hook_thread_event, INFINITE); + CloseHandle(hook_thread_event); + hook_thread_event = NULL; + } + PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, 0 ); LeaveCriticalSection(&dinput_hook_crit); +} + +void check_dinput_events(void) +{ + /* Windows does not do that, but our current implementation of winex11 + * requires periodic event polling to forward events to the wineserver. + * + * We have to call this function from multiple places, because: + * - some games do not explicitly poll for mouse events + * (for example Culpa Innata) + * - some games only poll the device, and neither keyboard nor mouse + * (for example Civilization: Call to Power 2) + */ +#ifndef __REACTOS__ + MsgWaitForMultipleObjectsEx(0, NULL, 0, QS_ALLINPUT, 0); +#endif } BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved) Modified: trunk/reactos/dll/directx/wine/dinput/dinput_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/di… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/dinput_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/dinput_private.h [iso-8859-1] Tue Nov 24 10:51:48 2015 @@ -79,6 +79,7 @@ extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; +extern void check_dinput_events(void) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); extern void _copy_diactionformatAtoW(LPDIACTIONFORMATW, LPDIACTIONFORMATA) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/directx/wine/dinput/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/ke… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/keyboard.c [iso-8859-1] Tue Nov 24 10:51:48 2015 @@ -319,9 +319,7 @@ if (len != This->base.data_format.user_df->dwDataSize ) return DIERR_INVALIDPARAM; -#ifndef __REACTOS__ - __wine_check_for_events( QS_ALLINPUT ); -#endif + check_dinput_events(); EnterCriticalSection(&This->base.crit); Modified: trunk/reactos/dll/directx/wine/dinput/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dinput/mo… ============================================================================== --- trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dinput/mouse.c [iso-8859-1] Tue Nov 24 10:51:48 2015 @@ -530,17 +530,15 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) { SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); + TRACE("(%p)->(%u,%p)\n", This, len, ptr); if(This->base.acquired == 0) return DIERR_NOTACQUIRED; -#ifndef __REACTOS__ - __wine_check_for_events( QS_ALLINPUT ); -#endif - - TRACE("(this=%p,0x%08x,%p):\n", This, len, ptr); + check_dinput_events(); + + EnterCriticalSection(&This->base.crit); _dump_mouse_state(&This->m_state); - EnterCriticalSection(&This->base.crit); /* Copy the current mouse state */ fill_DataFormat(ptr, len, &This->m_state, &This->base.data_format); 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] Tue Nov 24 10:51:48 2015 @@ -30,7 +30,7 @@ reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.47

8 years, 11 months

[akhaldi] 70085: [DEVENUM] Sync with Wine Staging 1.7.55. CORE-10536

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Nov 24 10:48:09 2015 New Revision: 70085 URL: http://svn.reactos.org/svn/reactos?rev=70085&view=rev Log: [DEVENUM] Sync with Wine Staging 1.7.55. CORE-10536 Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt trunk/reactos/dll/directx/wine/devenum/createdevenum.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/C… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/CMakeLists.txt [iso-8859-1] Tue Nov 24 10:48:09 2015 @@ -1,3 +1,6 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -19,7 +22,7 @@ set_source_files_properties(devenum.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/devenum_classes.rgs) set_module_type(devenum win32dll UNICODE) target_link_libraries(devenum strmiids uuid wine) -add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 shlwapi msvcrt kernel32 ntdll) +add_importlibs(devenum advapi32 advapi32_vista ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32 ntdll) add_delay_importlibs(devenum msvfw32) add_pch(devenum devenum_private.h SOURCE) add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/c… ============================================================================== --- trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c [iso-8859-1] Tue Nov 24 10:48:09 2015 @@ -676,15 +676,15 @@ * or switched from pulseaudio to alsa, delete all old devices first */ if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioRendererCategory, &basekey, path, MAX_PATH))) - SHDeleteKeyW(basekey, path); + RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_AudioInputDeviceCategory, &basekey, path, MAX_PATH))) - SHDeleteKeyW(basekey, path); + RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoInputDeviceCategory, &basekey, path, MAX_PATH))) - SHDeleteKeyW(basekey, path); + RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_MidiRendererCategory, &basekey, path, MAX_PATH))) - SHDeleteKeyW(basekey, path); + RegDeleteTreeW(basekey, path); if (SUCCEEDED(DEVENUM_GetCategoryKey(&CLSID_VideoCompressorCategory, &basekey, path, MAX_PATH))) - SHDeleteKeyW(basekey, path); + RegDeleteTreeW(basekey, path); rf2.dwVersion = 2; rf2.dwMerit = MERIT_PREFERRED; 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] Tue Nov 24 10:48:09 2015 @@ -29,7 +29,7 @@ reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/d3dxof # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.55 -reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.55 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47

8 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
46
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 November 2015