October 2012 - Wine-commits

Jason Edmeades : cmd: Fix regression around prompting during copy.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 270163f38086c231926f96516b9dca31097a90f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=270163f38086c231926f96516… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 4 09:57:33 2012 +0100 cmd: Fix regression around prompting during copy. --- programs/cmd/wcmdmain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3c18356..5109ecf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1162,7 +1162,10 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { + BOOL oldinteractive = interactive; + interactive = FALSE; WCMD_batch (thisDir, command, called, NULL, INVALID_HANDLE_VALUE); + interactive = oldinteractive; return; } else {

1 0

Jason Edmeades : cmd: Rework parameter parsing for WCMD_Copy.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 89b8868ae057d25ebbfe420e157e05318d85a16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b8868ae057d25ebbfe420e1… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Mon Oct 8 21:25:58 2012 +0100 cmd: Rework parameter parsing for WCMD_Copy. --- programs/cmd/builtins.c | 221 +++++++++++++++++++++++++++++++++++++++++++++-- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 214 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89b8868ae057d25ebbfe4…

1 0

Jason Edmeades : cmd: Rework the body of WCMD_copy based on new parameter parsing.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 7b9971abf908409bd75e06b2efdb40f6f84e940d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9971abf908409bd75e06b2e… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 9 20:11:50 2012 +0100 cmd: Rework the body of WCMD_copy based on new parameter parsing. --- programs/cmd/builtins.c | 363 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 251 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b9971abf908409bd75e0…

1 0

Jason Edmeades : cmd: Fix some issues with ~ modifier expansion.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 8f019b1111a0ad4523eed2ba93f16ef09ba350e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f019b1111a0ad4523eed2ba9… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 11 22:53:38 2012 +0100 cmd: Fix some issues with ~ modifier expansion. --- programs/cmd/batch.c | 111 +++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 15 ++-- 3 files changed, 74 insertions(+), 53 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index b77931d..6fc9970 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -430,11 +430,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, modifierLen = lastModifier - firstModifier; finaloutput[0] = 0x00; - /* Useful for debugging purposes: */ - /*printf("Modifier string '%*.*s' and variable is %c\n Param starts as '%s'\n", - (modifierLen), (modifierLen), firstModifier, *lastModifier, - outputparam);*/ - /* 1. Handle '~' : Strip surrounding quotes */ if (outputparam[0]=='"' && memchrW(firstModifier, '~', modifierLen) != NULL) { @@ -477,64 +472,69 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, exists = GetFileAttributesExW(fullfilename, GetFileExInfoStandard, &fileInfo); - /* 2. Handle 'a' : Output attributes */ - if (exists && - memchrW(firstModifier, 'a', modifierLen) != NULL) { + /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ + if (memchrW(firstModifier, 'a', modifierLen) != NULL) { WCHAR defaults[] = {'-','-','-','-','-','-','-','-','-','\0'}; doneModifier = TRUE; - strcpyW(thisoutput, defaults); - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - thisoutput[0]='d'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) - thisoutput[1]='r'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) - thisoutput[2]='a'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) - thisoutput[3]='h'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) - thisoutput[4]='s'; - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) - thisoutput[5]='c'; - /* FIXME: What are 6 and 7? */ - if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) - thisoutput[8]='l'; - strcatW(finaloutput, thisoutput); + + if (exists) { + strcpyW(thisoutput, defaults); + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + thisoutput[0]='d'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) + thisoutput[1]='r'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE) + thisoutput[2]='a'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + thisoutput[3]='h'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_SYSTEM) + thisoutput[4]='s'; + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED) + thisoutput[5]='c'; + /* FIXME: What are 6 and 7? */ + if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + thisoutput[8]='l'; + strcatW(finaloutput, thisoutput); + } } - /* 3. Handle 't' : Date+time */ - if (exists && - memchrW(firstModifier, 't', modifierLen) != NULL) { + /* 3. Handle 't' : Date+time (File doesn't have to exist) */ + if (memchrW(firstModifier, 't', modifierLen) != NULL) { SYSTEMTIME systime; int datelen; doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Format the time */ - FileTimeToSystemTime(&fileInfo.ftLastWriteTime, &systime); - GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systime, - NULL, thisoutput, MAX_PATH); - strcatW(thisoutput, spaceW); - datelen = strlenW(thisoutput); - GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &systime, - NULL, (thisoutput+datelen), MAX_PATH-datelen); - strcatW(finaloutput, thisoutput); + if (exists) { + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); + + /* Format the time */ + FileTimeToSystemTime(&fileInfo.ftLastWriteTime, &systime); + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &systime, + NULL, thisoutput, MAX_PATH); + strcatW(thisoutput, spaceW); + datelen = strlenW(thisoutput); + GetTimeFormatW(LOCALE_USER_DEFAULT, TIME_NOSECONDS, &systime, + NULL, (thisoutput+datelen), MAX_PATH-datelen); + strcatW(finaloutput, thisoutput); + } } - /* 4. Handle 'z' : File length */ - if (exists && - memchrW(firstModifier, 'z', modifierLen) != NULL) { + /* 4. Handle 'z' : File length (File doesn't have to exist) */ + if (memchrW(firstModifier, 'z', modifierLen) != NULL) { /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */ ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/ fileInfo.nFileSizeLow; static const WCHAR fmt[] = {'%','u','\0'}; doneModifier = TRUE; - if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - wsprintfW(thisoutput, fmt, fullsize); - strcatW(finaloutput, thisoutput); + if (exists) { + if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); + wsprintfW(thisoutput, fmt, fullsize); + strcatW(finaloutput, thisoutput); + } } /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ @@ -557,14 +557,18 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, WCHAR fname[MAX_PATH]; WCHAR ext[MAX_PATH]; BOOL doneFileModifier = FALSE; - - if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); + BOOL addSpace = (finaloutput[0] != 0x00); /* Split into components */ WCMD_splitpath(fullfilename, drive, dir, fname, ext); /* 5. Handle 'd' : Drive Letter */ if (memchrW(firstModifier, 'd', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, drive); doneModifier = TRUE; doneFileModifier = TRUE; @@ -572,6 +576,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* 6. Handle 'p' : Path */ if (memchrW(firstModifier, 'p', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, dir); doneModifier = TRUE; doneFileModifier = TRUE; @@ -579,6 +588,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* 7. Handle 'n' : Name */ if (memchrW(firstModifier, 'n', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, fname); doneModifier = TRUE; doneFileModifier = TRUE; @@ -586,6 +600,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, /* 8. Handle 'x' : Ext */ if (memchrW(firstModifier, 'x', modifierLen) != NULL) { + if (addSpace) { + strcatW(finaloutput, spaceW); + addSpace = FALSE; + } + strcatW(finaloutput, ext); doneModifier = TRUE; doneFileModifier = TRUE; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 8a47238..44d7f2f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -347,6 +347,7 @@ rem file attribute for %%i in ("U V" W) do echo '%%~ai' echo foo> foo for %%i in (foo) do echo '%%~ai' +for %%i in (foo) do echo '%%~zi' del foo rem file date/time rem Not fully testable, until we can grep dir's output to get foo's creation time in an envvar... diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4bab1ef..ec11324 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -303,13 +303,14 @@ N @todo_wine@'@drive@@shortpath(a)R S'@or_broken@'' @todo_wine@'@drive@@shortpath(a)T'@or_broken@'' @todo_wine@'@drive@@shortpath(a)ABCDEFGHIJK.LMNOP'@or_broken@'' -(a)todo_wine@''@or_broken@'%~ai' -(a)todo_wine@''@or_broken@'%~ai' -(a)todo_wine@'--a------'@or_broken@'%~ai' -(a)todo_wine@''@or_broken@'%~ti' -(a)todo_wine@''@or_broken@'%~ti' -(a)todo_wine@''@or_broken@'%~zi' -(a)todo_wine@''@or_broken@'%~zi' +''@or_broken@'%~ai' +''@or_broken@'%~ai' +'--a------'@or_broken@'%~ai' +'5'@or_broken@'%~zi' +''@or_broken@'%~ti' +''@or_broken@'%~ti' +''@or_broken@'%~zi' +''@or_broken@'%~zi' @drive@@path@ @drive@@path@ @drive@

1 0

Jason Edmeades : cmd: Add suite of tests for the copy command.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: a65314c8fa9bcfaad380261fd94e3ad35b7e955d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65314c8fa9bcfaad380261fd… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Oct 11 23:40:21 2012 +0100 cmd: Add suite of tests for the copy command. --- programs/cmd/tests/test_builtins.cmd | 297 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 57 ++++++ 2 files changed, 354 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a65314c8fa9bcfaad3802…

1 0

Jason Edmeades : cmd: Support copy to an 'ascii' destination.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 260210f6e60755e980a73870852bd837821a72d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=260210f6e60755e980a738708… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 12 00:37:24 2012 +0100 cmd: Support copy to an 'ascii' destination. --- programs/cmd/builtins.c | 49 ++++++++++++++++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 10 +++--- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9e66cb0..c560602 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -371,6 +371,36 @@ void WCMD_choice (const WCHAR * command) { } /**************************************************************************** + * WCMD_AppendEOF + * + * Adds an EOF onto the end of a file + * Returns TRUE on success + */ +static BOOL WCMD_AppendEOF(WCHAR *filename) +{ + HANDLE h; + + char eof = '\x1a'; + + WINE_TRACE("Appending EOF to %s\n", wine_dbgstr_w(filename)); + h = CreateFileW(filename, GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + + if (h == NULL) { + WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + return FALSE; + } else { + SetFilePointer (h, 0, NULL, FILE_END); + if (!WriteFile(h, &eof, 1, NULL, NULL)) { + WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + return FALSE; + } + CloseHandle(h); + } + return TRUE; +} + +/**************************************************************************** * WCMD_copy * * Copy a file or wildcarded set. @@ -800,10 +830,6 @@ void WCMD_copy(WCHAR * command) { WINE_FIXME("Need to ascii copy %s to %s - dropping to binary copy\n", wine_dbgstr_w(srcpath), wine_dbgstr_w(outname)); } - /* Append EOF if ascii destination and we are not going to add more onto the end */ - if (!destination->binarycopy && !anyconcats) { - WINE_FIXME("Need to ascii copy destination (append EOF)\n"); - } status = CopyFileW(srcpath, outname, FALSE); if (!status) { WCMD_print_error (); @@ -811,6 +837,14 @@ void WCMD_copy(WCHAR * command) { } else { WINE_TRACE("Copied successfully\n"); if (anyconcats) writtenoneconcat = TRUE; + + /* Append EOF if ascii destination and we are not going to add more onto the end */ + if (!destination->binarycopy && !anyconcats) { + if (!WCMD_AppendEOF(outname)) { + WCMD_print_error (); + errorlevel = 1; + } + } } } } @@ -829,8 +863,11 @@ void WCMD_copy(WCHAR * command) { } /* Append EOF if ascii destination and we were concatenating */ - if (!destination->binarycopy && anyconcats && writtenoneconcat) { - WINE_FIXME("Need to ascii copy destination (append EOF) to concatenated file\n"); + if (!errorlevel && !destination->binarycopy && anyconcats && writtenoneconcat) { + if (!WCMD_AppendEOF(destination->name)) { + WCMD_print_error (); + errorlevel = 1; + } } /* Exit out of the routine, freeing any remaing allocated memory */ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 9eebcdf..620e44b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -879,14 +879,14 @@ Passed: file size check on file2 [8]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file3 [11]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_default [5]@or_broken(a)Skipping file size check on NT4 Passed: file size check on file1_default2 [5]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file1_plus_eof [6]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file2_plus_eof [9]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file3_plus_eof [12]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file1_plus_eof [6]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file2_plus_eof [9]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file3_plus_eof [12]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file12_plus_eof [14]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file12_no_eof [13]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file12_eof2 [14]@or_broken(a)Skipping file size check on NT4 -(a)todo_wine@Passed: file size check on file1_binary_srccopy [6]@or_broken(a)Skipping file size check on NT4 -Passed: file size check on file1_ascii_srccopy [5]@or_broken(a)Skipping file size check on NT4 +Passed: file size check on file1_binary_srccopy [6]@or_broken(a)Skipping file size check on NT4 +(a)todo_wine@Passed: file size check on file1_ascii_srccopy [5]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file123_default_copy [25]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file123_ascii_copy [25]@or_broken(a)Skipping file size check on NT4 @todo_wine(a)Passed: file size check on file123_binary_copy [27]@or_broken(a)Skipping file size check on NT4

1 0

Christian Costa : amstream: Get rid of (IBaseFilter*) casts.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 568c88ccb943df016acc9b4b16593eb23161a036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568c88ccb943df016acc9b4b1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 23:07:07 2012 +0200 amstream: Get rid of (IBaseFilter*) casts. --- dlls/amstream/mediastreamfilter.c | 52 +++++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 9d38b72..194914e 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -164,74 +164,82 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) /*** IPersist methods ***/ -static HRESULT WINAPI MediaStreamFilterImpl_GetClassID(IMediaStreamFilter * iface, CLSID * pClsid) +static HRESULT WINAPI MediaStreamFilterImpl_GetClassID(IMediaStreamFilter *iface, CLSID *clsid) { - return BaseFilterImpl_GetClassID((IBaseFilter*)iface, pClsid); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_GetClassID(&This->filter.IBaseFilter_iface, clsid); } /*** IBaseFilter methods ***/ -static HRESULT WINAPI MediaStreamFilterImpl_Stop(IMediaStreamFilter * iface) +static HRESULT WINAPI MediaStreamFilterImpl_Stop(IMediaStreamFilter *iface) { FIXME("(%p)->(): Stub!\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI MediaStreamFilterImpl_Pause(IMediaStreamFilter * iface) +static HRESULT WINAPI MediaStreamFilterImpl_Pause(IMediaStreamFilter *iface) { FIXME("(%p)->(): Stub!\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI MediaStreamFilterImpl_Run(IMediaStreamFilter * iface, REFERENCE_TIME tStart) +static HRESULT WINAPI MediaStreamFilterImpl_Run(IMediaStreamFilter *iface, REFERENCE_TIME start) { - FIXME("(%p)->(%s): Stub!\n", iface, wine_dbgstr_longlong(tStart)); + FIXME("(%p)->(%s): Stub!\n", iface, wine_dbgstr_longlong(start)); return E_NOTIMPL; } -static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) +static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter *iface, DWORD ms_timeout, FILTER_STATE *state) { - return BaseFilterImpl_GetState((IBaseFilter*)iface, dwMilliSecsTimeout, pState); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_GetState(&This->filter.IBaseFilter_iface, ms_timeout, state); } -static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter * iface, IReferenceClock *pClock) +static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter *iface, IReferenceClock *clock) { - return BaseFilterImpl_SetSyncSource((IBaseFilter*)iface, pClock); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_SetSyncSource(&This->filter.IBaseFilter_iface, clock); } -static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter * iface, IReferenceClock **ppClock) +static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *iface, IReferenceClock **clock) { - return BaseFilterImpl_GetSyncSource((IBaseFilter*)iface, ppClock); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_GetSyncSource(&This->filter.IBaseFilter_iface, clock); } -static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter * iface, IEnumPins **ppEnum) +static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins) { - return BaseFilterImpl_EnumPins((IBaseFilter*)iface, ppEnum); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_EnumPins(&This->filter.IBaseFilter_iface, enum_pins); } -static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter * iface, LPCWSTR Id, IPin **ppPin) +static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_w(Id), ppPin); + FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_w(id), pin); return E_NOTIMPL; } -static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter * iface, FILTER_INFO *pInfo) +static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info) { - return BaseFilterImpl_QueryFilterInfo((IBaseFilter*)iface, pInfo); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_QueryFilterInfo(&This->filter.IBaseFilter_iface, info); } -static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) +static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter *iface, IFilterGraph *graph, LPCWSTR name) { - return BaseFilterImpl_JoinFilterGraph((IBaseFilter*)iface, pGraph, pName); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_JoinFilterGraph(&This->filter.IBaseFilter_iface, graph, name); } -static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter * iface, LPWSTR *pVendorInfo) +static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter *iface, LPWSTR *vendor_info) { - return BaseFilterImpl_QueryVendorInfo((IBaseFilter*)iface, pVendorInfo); + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_QueryVendorInfo(&This->filter.IBaseFilter_iface, vendor_info); } /*** IMediaStreamFilter methods ***/

1 0

Christian Costa : amstream: Cleanup MediaStreamFilterImpl_QueryInterface.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 5d5da39ddc1094e563e7bb81070f821cdb722cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5da39ddc1094e563e7bb810… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 23:07:15 2012 +0200 amstream: Cleanup MediaStreamFilterImpl_QueryInterface. --- dlls/amstream/mediastreamfilter.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 194914e..8423cfa 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -102,29 +102,22 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = { /*** IUnknown methods ***/ -static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, - void **ppv) +static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface) { - IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); - *ppv = NULL; + *ret_iface = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; - else if (IsEqualIID(riid, &IID_IMediaStreamFilter)) - *ppv = This; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IPersist) || + IsEqualIID(riid, &IID_IMediaFilter) || + IsEqualIID(riid, &IID_IBaseFilter) || + IsEqualIID(riid, &IID_IMediaStreamFilter)) + *ret_iface = iface; - if (*ppv) + if (*ret_iface) { - IUnknown_AddRef((IUnknown *)(*ppv)); + IMediaStreamFilter_AddRef(*ret_iface); return S_OK; }

1 0

Christian Costa : amstream: Implement BasePinImpl_CheckMediaType in media stream filter.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 604fb218b77eec6ee6e204e43fda237316c30b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=604fb218b77eec6ee6e204e43… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 23:07:24 2012 +0200 amstream: Implement BasePinImpl_CheckMediaType in media stream filter. --- dlls/amstream/mediastreamfilter.c | 42 +++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8423cfa..a2851ca 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -76,6 +76,48 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamF static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) { + IMediaStreamFilterImpl *filter = impl_from_IMediaStreamFilter((IMediaStreamFilter*)This->pinInfo.pFilter); + MSPID purpose_id; + int i; + + TRACE("Checking media type %s - %s\n", debugstr_guid(&pmt->majortype), debugstr_guid(&pmt->subtype)); + + /* Find which stream is associated with the pin */ + for (i = 0; i < filter->nb_streams; i++) + if (&This->IPin_iface == filter->pins[i]) + break; + + if (i == filter->nb_streams) + return S_FALSE; + + if (FAILED(IMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) + return S_FALSE; + + TRACE("Checking stream with purpose id %s\n", debugstr_guid(&purpose_id)); + + if (IsEqualGUID(&purpose_id, &MSPID_PrimaryVideo) && IsEqualGUID(&pmt->majortype, &MEDIATYPE_Video)) + { + if (IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB1) || + IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB4) || + IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB8) || + IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB565) || + IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB555) || + IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB24) || + IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_RGB32)) + { + TRACE("Video sub-type %s matches\n", debugstr_guid(&pmt->subtype)); + return S_OK; + } + } + else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio) && IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio)) + { + if (IsEqualGUID(&pmt->subtype, &MEDIASUBTYPE_PCM)) + { + TRACE("Audio sub-type %s matches\n", debugstr_guid(&pmt->subtype)); + return S_OK; + } + } + return S_FALSE; }

1 0

Christian Costa : amstream: Implement BasePinImp_GetMediaType in media stream filter.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 7e82db784a448c6802001345d6230f72a711d237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e82db784a448c6802001345d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 23:07:31 2012 +0200 amstream: Implement BasePinImp_GetMediaType in media stream filter. --- dlls/amstream/mediastreamfilter.c | 60 ++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index a2851ca..9b2bd8e 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -126,8 +126,66 @@ static LONG WINAPI BasePinImp_GetMediaTypeVersion(BasePin *This) return 0; } -static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *amt) +static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int index, AM_MEDIA_TYPE *amt) { + IMediaStreamFilterImpl *filter = (IMediaStreamFilterImpl*)This->pinInfo.pFilter; + MSPID purpose_id; + int i; + + /* Find which stream is associated with the pin */ + for (i = 0; i < filter->nb_streams; i++) + if (&This->IPin_iface == filter->pins[i]) + break; + + if (i == filter->nb_streams) + return S_FALSE; + + if (FAILED(IMediaStream_GetInformation(filter->streams[i], &purpose_id, NULL))) + return S_FALSE; + + TRACE("Processing stream with purpose id %s\n", debugstr_guid(&purpose_id)); + + if (IsEqualGUID(&purpose_id, &MSPID_PrimaryVideo)) + { + amt->majortype = MEDIATYPE_Video; + + switch (index) + { + case 0: + amt->subtype = MEDIASUBTYPE_RGB1; + break; + case 1: + amt->subtype = MEDIASUBTYPE_RGB4; + break; + case 2: + amt->subtype = MEDIASUBTYPE_RGB8; + break; + case 3: + amt->subtype = MEDIASUBTYPE_RGB565; + break; + case 4: + amt->subtype = MEDIASUBTYPE_RGB555; + break; + case 5: + amt->subtype = MEDIASUBTYPE_RGB24; + break; + case 6: + amt->subtype = MEDIASUBTYPE_RGB32; + break; + default: + return S_FALSE; + } + } + else if (IsEqualGUID(&purpose_id, &MSPID_PrimaryAudio)) + { + if (!index) + { + amt->majortype = MEDIATYPE_Audio; + amt->subtype = MEDIASUBTYPE_PCM; + return S_OK; + } + } + return S_FALSE; }

1 0