wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Louis Lenders : rpcrt4: Quiet two noisy fixme`s.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: bc1b56ad1861a0e7aff80776108d67794f556e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc1b56ad1861a0e7aff80776… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Apr 16 16:36:58 2019 +0200 rpcrt4: Quiet two noisy fixme`s. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d71d2fa..dbf4074 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7263,7 +7263,10 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, */ void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) { - FIXME("(%p, %p, %d, 0x%x): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); + static int once; + + if (!once++) + FIXME("(%p, %p, %d, 0x%x): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); if (pStubMsg->CorrDespIncrement == 0) pStubMsg->CorrDespIncrement = 2; /* size of the normal (non-range) /robust payload */ @@ -7301,5 +7304,8 @@ void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) */ void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) { - FIXME("(%p): stub\n", pStubMsg); + static int once; + + if (!once++) + FIXME("(%p): stub\n", pStubMsg); }

1 0

Hans Leidekker : wineboot: Also process Run keys from the 32-bit registry view.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 6c486058f8a174c25e85a27f17f4468796bef0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c486058f8a174c25e85a27f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 16 11:27:38 2019 +0200 wineboot: Also process Run keys from the 32-bit registry view. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/wineboot.c | 153 ++++++++++++++++++++----------------------- 1 file changed, 72 insertions(+), 81 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b85a3b6..0b544e5 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -90,6 +90,7 @@ extern BOOL shutdown_all_desktops( BOOL force ); extern void kill_processes( BOOL kill_desktop ); static WCHAR windowsdir[MAX_PATH]; +static const BOOL is_64bit = sizeof(void *) > sizeof(int); /* retrieve the (unix) path to the wine.inf file */ static char *get_wine_inf_path(void) @@ -765,119 +766,109 @@ static DWORD runCmd(LPWSTR cmdline, LPCWSTR dir, BOOL wait, BOOL minimized) return exit_code; } -/* - * Process a "Run" type registry key. - * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is - * opened. - * szKeyName is the key holding the actual entries. - * bDelete tells whether we should delete each value right before executing it. - * bSynchronous tells whether we should wait for the prog to complete before - * going on to the next prog. - */ -static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, - BOOL bSynchronous ) +static void process_run_key( HKEY key, const WCHAR *keyname, BOOL delete, BOOL synchronous ) { - static const WCHAR WINKEY_NAME[]={'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; - HKEY hkWin, hkRun; - DWORD res, dispos; - DWORD i, nMaxCmdLine=0, nMaxValue=0; - WCHAR *szCmdLine=NULL; - WCHAR *szValue=NULL; - - if (hkRoot==HKEY_LOCAL_MACHINE) - WINE_TRACE("processing %s entries under HKLM\n",wine_dbgstr_w(szKeyName) ); - else - WINE_TRACE("processing %s entries under HKCU\n",wine_dbgstr_w(szKeyName) ); + HKEY runkey; + LONG res; + DWORD disp, i, max_cmdline = 0, max_value = 0; + WCHAR *cmdline = NULL, *value = NULL; - if (RegCreateKeyExW( hkRoot, WINKEY_NAME, 0, NULL, 0, KEY_READ, NULL, &hkWin, NULL ) != ERROR_SUCCESS) - return TRUE; + if (RegCreateKeyExW( key, keyname, 0, NULL, 0, delete ? KEY_ALL_ACCESS : KEY_READ, NULL, &runkey, &disp )) + return; - if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, - NULL, &hkRun, &dispos )) != ERROR_SUCCESS) - { - RegCloseKey( hkWin ); - return TRUE; - } - RegCloseKey( hkWin ); - if (dispos == REG_CREATED_NEW_KEY) goto end; + if (disp == REG_CREATED_NEW_KEY) + goto end; - if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, - &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS ) + if (RegQueryInfoKeyW( runkey, NULL, NULL, NULL, NULL, NULL, NULL, &i, &max_value, &max_cmdline, NULL, NULL )) goto end; - if( i==0 ) + if (!i) { - WINE_TRACE("No commands to execute.\n"); - - res=ERROR_SUCCESS; + WINE_TRACE( "No commands to execute.\n" ); goto end; } - - if( (szCmdLine=HeapAlloc(GetProcessHeap(),0,nMaxCmdLine))==NULL ) + if (!(cmdline = HeapAlloc( GetProcessHeap(), 0, max_cmdline ))) { - WINE_ERR("Couldn't allocate memory for the commands to be executed\n"); - - res=ERROR_NOT_ENOUGH_MEMORY; + WINE_ERR( "Couldn't allocate memory for the commands to be executed.\n" ); goto end; } - - if( (szValue=HeapAlloc(GetProcessHeap(),0,(++nMaxValue)*sizeof(*szValue)))==NULL ) + if (!(value = HeapAlloc( GetProcessHeap(), 0, ++max_value * sizeof(*value) ))) { - WINE_ERR("Couldn't allocate memory for the value names\n"); - - res=ERROR_NOT_ENOUGH_MEMORY; + WINE_ERR( "Couldn't allocate memory for the value names.\n" ); goto end; } - - while( i>0 ) - { - DWORD nValLength=nMaxValue, nDataLength=nMaxCmdLine; - DWORD type; - --i; + while (i) + { + DWORD len = max_value, len_data = max_cmdline, type; - if( (res=RegEnumValueW( hkRun, i, szValue, &nValLength, 0, &type, - (LPBYTE)szCmdLine, &nDataLength ))!=ERROR_SUCCESS ) + if ((res = RegEnumValueW( runkey, --i, value, &len, 0, &type, (BYTE *)cmdline, &len_data ))) { - WINE_ERR("Couldn't read in value %d - %d\n", i, res ); - + WINE_ERR( "Couldn't read value %u (%d).\n", i, res ); continue; } - - if( bDelete && (res=RegDeleteValueW( hkRun, szValue ))!=ERROR_SUCCESS ) + if (delete && (res = RegDeleteValueW( runkey, value ))) { - WINE_ERR("Couldn't delete value - %d, %d. Running command anyways.\n", i, res ); + WINE_ERR( "Couldn't delete value %u (%d). Running command anyways.\n", i, res ); } - - if( type!=REG_SZ ) + if (type != REG_SZ) { - WINE_ERR("Incorrect type of value #%d (%d)\n", i, type ); - + WINE_ERR( "Incorrect type of value %u (%u).\n", i, type ); continue; } - - if( (res=runCmd(szCmdLine, NULL, bSynchronous, FALSE ))==INVALID_RUNCMD_RETURN ) + if (runCmd( cmdline, NULL, synchronous, FALSE ) == INVALID_RUNCMD_RETURN) { - WINE_ERR("Error running cmd %s (%d)\n", wine_dbgstr_w(szCmdLine), GetLastError() ); + WINE_ERR( "Error running cmd %s (%u).\n", wine_dbgstr_w(cmdline), GetLastError() ); } - - WINE_TRACE("Done processing cmd #%d\n", i); + WINE_TRACE( "Done processing cmd %u.\n", i ); } - res=ERROR_SUCCESS; - end: - HeapFree( GetProcessHeap(), 0, szValue ); - HeapFree( GetProcessHeap(), 0, szCmdLine ); - - if( hkRun!=NULL ) - RegCloseKey( hkRun ); + HeapFree( GetProcessHeap(), 0, value ); + HeapFree( GetProcessHeap(), 0, cmdline ); + RegCloseKey( runkey ); + WINE_TRACE( "Done.\n" ); +} - WINE_TRACE("done\n"); +/* + * Process a "Run" type registry key. + * hkRoot is the HKEY from which "Software\Microsoft\Windows\CurrentVersion" is + * opened. + * szKeyName is the key holding the actual entries. + * bDelete tells whether we should delete each value right before executing it. + * bSynchronous tells whether we should wait for the prog to complete before + * going on to the next prog. + */ +static void ProcessRunKeys( HKEY root, const WCHAR *keyname, BOOL delete, BOOL synchronous ) +{ + static const WCHAR keypathW[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + HKEY key; - return res==ERROR_SUCCESS; + if (root == HKEY_LOCAL_MACHINE) + { + WINE_TRACE( "Processing %s entries under HKLM.\n", wine_dbgstr_w(keyname) ); + if (!RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ, NULL, &key, NULL )) + { + process_run_key( key, keyname, delete, synchronous ); + RegCloseKey( key ); + } + if (is_64bit && !RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ|KEY_WOW64_32KEY, NULL, &key, NULL )) + { + process_run_key( key, keyname, delete, synchronous ); + RegCloseKey( key ); + } + } + else + { + WINE_TRACE( "Processing %s entries under HKCU.\n", wine_dbgstr_w(keyname) ); + if (!RegCreateKeyExW( root, keypathW, 0, NULL, 0, KEY_READ, NULL, &key, NULL )) + { + process_run_key( key, keyname, delete, synchronous ); + RegCloseKey( key ); + } + } } /*

1 0

Hans Leidekker : msi: Always use the 64-bit registry view to retrieve registered owner and organization.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 0d17f36c13f129d5bfed290a0583b441657a6a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d17f36c13f129d5bfed290a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 11:30:15 2019 +0200 msi: Always use the 64-bit registry view to retrieve registered owner and organization. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 490c687..1e16fb1 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 }; - static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; + static const WCHAR szRegisteredOwner[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; static const WCHAR szRegisteredOrganization[] = { 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 }; @@ -971,10 +971,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) CloseHandle( hkey ); } if ((!username || !companyname) && - RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, &hkey ) == ERROR_SUCCESS) + RegOpenKeyExW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, + &hkey ) == ERROR_SUCCESS) { if (!username && - (username = msi_reg_get_val_str( hkey, szRegisteredUser ))) + (username = msi_reg_get_val_str( hkey, szRegisteredOwner ))) msi_set_property( package->db, szUSERNAME, username, -1 ); if (!companyname && (companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization )))

1 0

Hans Leidekker : msi/tests: Check the NT key first when retrieving registered owner and organization.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: dec192ce22283c4c0cb80337e0ce0904d9d9be89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dec192ce22283c4c0cb80337… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 11:30:14 2019 +0200 msi/tests: Check the NT key first when retrieving registered owner and organization. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 60ae92e..7a515df 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase else { if (bcase) - ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); else - ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); } } @@ -3408,7 +3408,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner"); @@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner");

1 0

Hans Leidekker : msi: Get rid of redundant KEY_WOW64_64KEY flags.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: be02ecda3c27f4fa3ed574b1df4e51337f9304de URL: https://source.winehq.org/git/wine.git/?a=commit;h=be02ecda3c27f4fa3ed574b1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 19 11:30:13 2019 +0200 msi: Get rid of redundant KEY_WOW64_64KEY flags. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3eca3bf..8c350f6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1747,11 +1747,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch ); + res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_READ, &patch ); if (res != ERROR_SUCCESS) goto done; @@ -1761,7 +1761,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done;

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for ReadSample().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 2ca469f818a192f277ef7c33dc73c39a6f2de795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca469f818a192f277ef7c33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:15 2019 +0300 mfreadwrite/tests: Add some tests for ReadSample(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 59 +++++++++++++++++++++++++++++++++++++++++ include/mfreadwrite.idl | 21 +++++++++------ 2 files changed, 72 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 188e688..29e8e08 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -187,11 +187,14 @@ static struct async_callback *create_async_callback(void) static void test_source_reader(void) { IMFMediaType *mediatype, *mediatype2; + DWORD stream_flags, actual_index; struct async_callback *callback; IMFAttributes *attributes; IMFSourceReader *reader; IMFMediaSource *source; IMFByteStream *stream; + LONGLONG timestamp; + IMFSample *sample; BOOL selected; HRESULT hr; @@ -298,6 +301,62 @@ todo_wine ok(hr == S_OK, "Failed to get current media type, hr %#x.\n", hr); IMFMediaType_Release(mediatype); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(!stream_flags, "Unexpected stream flags %#x.\n", stream_flags); + IMFSample_Release(sample); + + /* There is no video stream. */ + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); + ok(actual_index == MF_SOURCE_READER_FIRST_VIDEO_STREAM, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ERROR, "Unexpected stream flags %#x.\n", stream_flags); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &actual_index, &stream_flags, + &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, &timestamp, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, NULL, &timestamp, &sample); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + NULL, &stream_flags, &timestamp, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, NULL, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, MF_SOURCE_READER_CONTROLF_DRAIN, + &actual_index, &stream_flags, NULL, &sample); + ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr); + ok(actual_index == 0, "Unexpected stream index %u\n", actual_index); + ok(stream_flags == MF_SOURCE_READERF_ENDOFSTREAM, "Unexpected stream flags %#x.\n", stream_flags); + ok(!sample, "Unexpected sample object.\n"); + /* Flush. */ hr = IMFSourceReader_Flush(reader, MF_SOURCE_READER_FIRST_VIDEO_STREAM); ok(hr == MF_E_INVALIDSTREAMNUMBER, "Unexpected hr %#x.\n", hr); diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 0eea43b..ed09b74 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -19,6 +19,11 @@ import "mfobjects.idl"; import "mftransform.idl"; +typedef [v1_enum] enum MF_SOURCE_READER_CONTROL_FLAG +{ + MF_SOURCE_READER_CONTROLF_DRAIN = 0x00000001, +} MF_SOURCE_READER_CONTROL_FLAG; + enum { MF_SOURCE_READER_INVALID_STREAM_INDEX = 0xffffffff, @@ -30,15 +35,15 @@ enum MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff }; -typedef enum MF_SOURCE_READER_FLAG +typedef [v1_enum] enum MF_SOURCE_READER_FLAG { - MF_SOURCE_READERF_ERROR = 0x001, - MF_SOURCE_READERF_ENDOFSTREAM = 0x002, - MF_SOURCE_READERF_NEWSTREAM = 0x004, - MF_SOURCE_READERF_NATIVEMEDIATYPECHANGED = 0x010, - MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED = 0x020, - MF_SOURCE_READERF_STREAMTICK = 0x100, - MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x200 + MF_SOURCE_READERF_ERROR = 0x00000001, + MF_SOURCE_READERF_ENDOFSTREAM = 0x00000002, + MF_SOURCE_READERF_NEWSTREAM = 0x00000004, + MF_SOURCE_READERF_NATIVEMEDIATYPECHANGED = 0x00000010, + MF_SOURCE_READERF_CURRENTMEDIATYPECHANGED = 0x00000020, + MF_SOURCE_READERF_STREAMTICK = 0x00000100, + MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x00000200, } MF_SOURCE_READER_FLAG; typedef struct _MF_SINK_WRITER_STATISTICS

1 0

Nikolay Sivov : mfreadwrite: Handle MEMediaSample event.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: fcf8cbfb2a616db2fe7c1c58e97c48a596fc267b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcf8cbfb2a616db2fe7c1c58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:14 2019 +0300 mfreadwrite: Handle MEMediaSample event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 84db9aa..43dfd4e 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -37,6 +37,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -72,11 +73,19 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } +struct sample +{ + struct list entry; + IMFSample *sample; +}; + struct media_stream { IMFMediaStream *stream; IMFMediaType *current; DWORD id; + CRITICAL_SECTION cs; + struct list samples; }; typedef struct source_reader @@ -308,8 +317,64 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static HRESULT source_reader_media_sample_handler(struct source_reader *reader, IMFMediaStream *stream, + IMFMediaEvent *event) +{ + IMFSample *sample; + unsigned int i; + DWORD id = 0; + HRESULT hr; + + TRACE("Got new sample for stream %p.\n", stream); + + if (FAILED(hr = media_event_get_object(event, &IID_IMFSample, (void **)&sample))) + { + WARN("Failed to get sample object, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = media_stream_get_id(stream, &id))) + { + WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + IMFSample_Release(sample); + return hr; + } + + for (i = 0; i < reader->stream_count; ++i) + { + if (id == reader->streams[i].id) + { + struct sample *pending_sample; + + if (!(pending_sample = heap_alloc(sizeof(*pending_sample)))) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + pending_sample->sample = sample; + IMFSample_AddRef(pending_sample->sample); + + EnterCriticalSection(&reader->streams[i].cs); + list_add_tail(&reader->streams[i].samples, &pending_sample->entry); + LeaveCriticalSection(&reader->streams[i].cs); + + break; + } + } + + if (i == reader->stream_count) + WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + +failed: + IMFSample_Release(sample); + + return hr; +} + static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { + struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); MediaEventType event_type; IMFMediaStream *stream; IMFMediaEvent *event; @@ -326,6 +391,18 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba TRACE("Got event %u.\n", event_type); + switch (event_type) + { + case MEMediaSample: + hr = source_reader_media_sample_handler(reader, stream, event); + break; + default: + ; + } + + if (FAILED(hr)) + WARN("Failed while handling %d event, hr %#x.\n", event_type, hr); + IMFMediaEvent_Release(event); IMFMediaStream_BeginGetEvent(stream, iface, (IUnknown *)stream); @@ -394,10 +471,21 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) for (i = 0; i < reader->stream_count; ++i) { - if (reader->streams[i].stream) - IMFMediaStream_Release(reader->streams[i].stream); - if (reader->streams[i].current) - IMFMediaType_Release(reader->streams[i].current); + struct media_stream *stream = &reader->streams[i]; + struct sample *ptr, *next; + + if (stream->stream) + IMFMediaStream_Release(stream->stream); + if (stream->current) + IMFMediaType_Release(stream->current); + DeleteCriticalSection(&stream->cs); + + LIST_FOR_EACH_ENTRY_SAFE(ptr, next, &stream->samples, struct sample, entry) + { + IMFSample_Release(ptr->sample); + list_remove(&ptr->entry); + heap_free(ptr); + } } heap_free(reader->streams); DeleteCriticalSection(&reader->cs); @@ -832,6 +920,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri IMFMediaType_Release(src_type); if (FAILED(hr)) break; + + InitializeCriticalSection(&object->streams[i].cs); + list_init(&object->streams[i].samples); } if (FAILED(hr))

1 0

Nikolay Sivov : mfreadwrite: Add a helper to get stream identifier.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 002010e31a41e68433f7d1ac00f60f2c961fdd93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=002010e31a41e68433f7d1ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:13 2019 +0300 mfreadwrite: Add a helper to get stream identifier. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index bb9ad0f..84db9aa 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -152,6 +152,20 @@ static HRESULT media_event_get_object(IMFMediaEvent *event, REFIID riid, void ** return hr; } +static HRESULT media_stream_get_id(IMFMediaStream *stream, DWORD *id) +{ + IMFStreamDescriptor *sd; + HRESULT hr; + + if (SUCCEEDED(hr = IMFMediaStream_GetStreamDescriptor(stream, &sd))) + { + hr = IMFStreamDescriptor_GetStreamIdentifier(sd, id); + IMFStreamDescriptor_Release(sd); + } + + return hr; +} + static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { @@ -190,7 +204,6 @@ static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyn static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IMFMediaEvent *event) { - IMFStreamDescriptor *sd; IMFMediaStream *stream; unsigned int i; DWORD id = 0; @@ -204,13 +217,7 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM TRACE("Got new stream %p.\n", stream); - if (SUCCEEDED(hr = IMFMediaStream_GetStreamDescriptor(stream, &sd))) - { - hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &id); - IMFStreamDescriptor_Release(sd); - } - - if (FAILED(hr)) + if (FAILED(hr = media_stream_get_id(stream, &id))) { WARN("Unidentified stream %p, hr %#x.\n", stream, hr); IMFMediaStream_Release(stream);

1 0

Nikolay Sivov : mfreadwrite: Add a helper to get associated event object value.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 5dfe4776186c2b1feb0171bcc9d94b3060b99c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dfe4776186c2b1feb0171bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:12 2019 +0300 mfreadwrite: Add a helper to get associated event object value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 51 +++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d80e450..bb9ad0f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -122,6 +122,36 @@ static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); } +static HRESULT media_event_get_object(IMFMediaEvent *event, REFIID riid, void **obj) +{ + PROPVARIANT value; + HRESULT hr; + + PropVariantInit(&value); + if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + { + WARN("Failed to get event value, hr %#x.\n", hr); + return hr; + } + + if (value.vt != VT_UNKNOWN || !value.u.punkVal) + { + WARN("Unexpected value type %d.\n", value.vt); + PropVariantClear(&value); + return E_UNEXPECTED; + } + + hr = IUnknown_QueryInterface(value.u.punkVal, riid, obj); + PropVariantClear(&value); + if (FAILED(hr)) + { + WARN("Unexpected object type.\n"); + return hr; + } + + return hr; +} + static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj) { @@ -162,30 +192,13 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM { IMFStreamDescriptor *sd; IMFMediaStream *stream; - PROPVARIANT value; unsigned int i; DWORD id = 0; HRESULT hr; - PropVariantInit(&value); - if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + if (FAILED(hr = media_event_get_object(event, &IID_IMFMediaStream, (void **)&stream))) { - WARN("Failed to get event value, hr %#x.\n", hr); - return hr; - } - - if (value.vt != VT_UNKNOWN || !value.u.punkVal) - { - WARN("Unexpected value type %d.\n", value.vt); - PropVariantClear(&value); - return E_UNEXPECTED; - } - - hr = IUnknown_QueryInterface(value.u.punkVal, &IID_IMFMediaStream, (void **)&stream); - PropVariantClear(&value); - if (FAILED(hr)) - { - WARN("Unexpected object type.\n"); + WARN("Failed to get stream object, hr %#x.\n", hr); return hr; }

1 0

Nikolay Sivov : mfreadwrite: Duplicate media type returned with GetNativeMediaType().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 5b3fdc26b7450d312f33e0cad70eac5b55e746ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b3fdc26b7450d312f33e0ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 11:06:11 2019 +0300 mfreadwrite: Duplicate media type returned with GetNativeMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 10 ++++++++-- dlls/mfreadwrite/tests/mfplat.c | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 7625669..d80e450 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -463,6 +463,7 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR struct source_reader *reader = impl_from_IMFSourceReader(iface); IMFMediaTypeHandler *handler; IMFStreamDescriptor *sd; + IMFMediaType *src_type; BOOL selected; HRESULT hr; @@ -489,11 +490,16 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR return hr; if (type_index == MF_SOURCE_READER_CURRENT_TYPE_INDEX) - hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &src_type); else - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, type); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, &src_type); IMFMediaTypeHandler_Release(handler); + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); + + IMFMediaType_Release(src_type); + return hr; } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 074c403..188e688 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -186,9 +186,9 @@ static struct async_callback *create_async_callback(void) static void test_source_reader(void) { + IMFMediaType *mediatype, *mediatype2; struct async_callback *callback; IMFAttributes *attributes; - IMFMediaType *mediatype; IMFSourceReader *reader; IMFMediaSource *source; IMFByteStream *stream; @@ -267,6 +267,10 @@ todo_wine hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype); ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype2); + ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(mediatype != mediatype2, "Unexpected media type instance.\n"); + IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); /* MF_SOURCE_READER_CURRENT_TYPE_INDEX is Win8+ */

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019