April 2008 - Wine-Commits - list.winehq.org

Dan Hipschman : qedit: Implement IMediaDet_get_OutputStreams.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: d3061d48e1c78c331b93be7a880876ebff2730dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3061d48e1c78c331b93be7a8… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:53:52 2008 -0700 qedit: Implement IMediaDet_get_OutputStreams. --- dlls/qedit/mediadet.c | 170 ++++++++++++++++++++++++++++++++++++++- dlls/qedit/tests/mediadet.c | 90 ++++++++++++++++++-- dlls/qedit/tests/qedit.rc | 6 +- dlls/qedit/tests/rc.h | 29 +++++++ dlls/qedit/tests/test_sound.avi | Bin 0 -> 6070 bytes 5 files changed, 282 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d3061d48e1c78c331b93b…

1 0

Dan Hipschman : qedit: Implement IMediaDet_put_Filename.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: dc3d6fbe7fcaf0d6c73817d4a600e8b3cba24038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3d6fbe7fcaf0d6c73817d4a… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:52:14 2008 -0700 qedit: Implement IMediaDet_put_Filename. --- dlls/qedit/mediadet.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/tests/mediadet.c | 2 +- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index eb9f81d..5ee064e 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -25,8 +25,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); typedef struct MediaDetImpl { const IMediaDetVtbl *MediaDet_Vtbl; LONG refCount; + IGraphBuilder *graph; + IBaseFilter *source; } MediaDetImpl; +static void MD_cleanup(MediaDetImpl *This) +{ + if (This->source) IBaseFilter_Release(This->source); + This->source = NULL; + if (This->graph) IGraphBuilder_Release(This->graph); + This->graph = NULL; +} + static ULONG WINAPI MediaDet_AddRef(IMediaDet* iface) { MediaDetImpl *This = (MediaDetImpl *)iface; @@ -43,6 +53,7 @@ static ULONG WINAPI MediaDet_Release(IMediaDet* iface) if (refCount == 0) { + MD_cleanup(This); CoTaskMemFree(This); return 0; } @@ -132,9 +143,35 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { + static const WCHAR reader[] = {'R','e','a','d','e','r',0}; MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, newVal); - return E_NOTIMPL; + IGraphBuilder *gb; + IBaseFilter *bf; + HRESULT hr; + + TRACE("(%p)->(%s)\n", This, debugstr_w(newVal)); + + if (This->graph) + { + WARN("MSDN says not to call this method twice\n"); + MD_cleanup(This); + } + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, + &IID_IGraphBuilder, (void **) &gb); + if (FAILED(hr)) + return hr; + + hr = IGraphBuilder_AddSourceFilter(gb, newVal, reader, &bf); + if (FAILED(hr)) + { + IGraphBuilder_Release(gb); + return hr; + } + + This->graph = gb; + This->source = bf; + return S_OK; } static HRESULT WINAPI MediaDet_GetBitmapBits(IMediaDet* iface, @@ -228,6 +265,8 @@ HRESULT MediaDet_create(IUnknown * pUnkOuter, LPVOID * ppv) { obj->refCount = 1; obj->MediaDet_Vtbl = &IMediaDet_VTable; + obj->graph = NULL; + obj->source = NULL; *ppv = obj; return S_OK; diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 3f8016d..867d868 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -95,7 +95,7 @@ static void test_mediadet(void) filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); - todo_wine ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); + ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); SysFreeString(filename); hr = IMediaDet_get_OutputStreams(pM, &nstrms);

1 0

Dan Hipschman : qedit: Implement IMediaDet_get_Filename.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 7d2d5a25cbe9a3722f183991729e694d5978905c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2d5a25cbe9a3722f1839917… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:52:50 2008 -0700 qedit: Implement IMediaDet_get_Filename. --- dlls/qedit/Makefile.in | 2 +- dlls/qedit/mediadet.c | 42 ++++++++++++++++++++++++++++++++++++++++-- dlls/qedit/tests/mediadet.c | 21 ++++++++++++++++++--- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 34707fa..d4db2a4 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qedit.dll -IMPORTS = ole32 advapi32 kernel32 +IMPORTS = oleaut32 ole32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid C_SRCS = \ diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 5ee064e..062c105 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -17,6 +17,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + #include "qedit_private.h" #include "wine/debug.h" @@ -137,8 +146,37 @@ static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) { MediaDetImpl *This = (MediaDetImpl *)iface; - FIXME("(%p)->(%p): not implemented!\n", This, pVal); - return E_NOTIMPL; + IFileSourceFilter *file; + LPOLESTR name; + HRESULT hr; + + TRACE("(%p)\n", This); + + if (!pVal) + return E_POINTER; + + *pVal = NULL; + /* MSDN says it should return E_FAIL if no file is open, but tests + show otherwise. */ + if (!This->source) + return S_OK; + + hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter, + (void **) &file); + if (FAILED(hr)) + return hr; + + hr = IFileSourceFilter_GetCurFile(file, &name, NULL); + IFileSourceFilter_Release(file); + if (FAILED(hr)) + return hr; + + *pVal = SysAllocString(name); + CoTaskMemFree(name); + if (!*pVal) + return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 867d868..3e6e48f 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -93,6 +93,18 @@ static void test_mediadet(void) ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); ok(pM != NULL, "pM is NULL\n"); + filename = NULL; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename\n"); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + + filename = (BSTR) -1; + hr = IMediaDet_get_Filename(pM, &filename); + /* Despite what MSDN claims, this returns S_OK. */ + ok(hr == S_OK, "IMediaDet_get_Filename\n"); + ok(filename == NULL, "IMediaDet_get_Filename\n"); + filename = SysAllocString(test_avi_filename); hr = IMediaDet_put_Filename(pM, filename); ok(hr == S_OK, "IMediaDet_put_Filename -> %x\n", hr); @@ -104,11 +116,14 @@ static void test_mediadet(void) filename = NULL; hr = IMediaDet_get_Filename(pM, &filename); - todo_wine ok(hr == S_OK, "IMediaDet_get_Filename\n"); - todo_wine ok(lstrcmpW(filename, test_avi_filename) == 0, - "IMediaDet_get_Filename\n"); + ok(hr == S_OK, "IMediaDet_get_Filename\n"); + ok(lstrcmpW(filename, test_avi_filename) == 0, + "IMediaDet_get_Filename\n"); SysFreeString(filename); + hr = IMediaDet_get_Filename(pM, NULL); + ok(hr == E_POINTER, "IMediaDet_get_Filename\n"); + hr = IMediaDet_put_CurrentStream(pM, 0); todo_wine ok(hr == S_OK, "IMediaDet_put_CurrentStream\n");

1 0

Dan Hipschman : qedit/tests: Fix an incorrect count given to GetTempPathW.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 063aa3a1afb6c5441f76a13dc16e3fddf47ff99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=063aa3a1afb6c5441f76a13dc… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Tue Apr 8 16:51:28 2008 -0700 qedit/tests: Fix an incorrect count given to GetTempPathW. --- dlls/qedit/tests/mediadet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 0870fd0..3f8016d 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -56,7 +56,7 @@ static BOOL init_tests(void) if (size == 0) return FALSE; - if (!GetTempPathW(sizeof temp_path, temp_path)) + if (!GetTempPathW(MAX_PATH, temp_path)) return FALSE; /* We might end up relying on the extension here, so .TMP is no good. */

1 0

Aric Stewart : imm32: ImmDestroyContext cannot destroy the default context.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: bb52d30111ba5b4c7e646874945a4ec333b8fec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb52d30111ba5b4c7e6468749… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 8 13:26:05 2008 -0500 imm32: ImmDestroyContext cannot destroy the default context. --- dlls/imm32/imm.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 0995fb6..1ffe559 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -109,6 +109,8 @@ static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I',' #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) +static BOOL IMM_DestroyContext(HIMC hIMC); + static inline WCHAR *strdupAtoW( const char *str ) { WCHAR *ret = NULL; @@ -150,7 +152,7 @@ static void IMM_InitThreadData(void) static void IMM_FreeThreadData(void) { IMMThreadData* data = TlsGetValue(tlsIndex); - ImmDestroyContext(data->defaultContext); + IMM_DestroyContext(data->defaultContext); DestroyWindow(data->hwndDefault); HeapFree(GetProcessHeap(),0,data); TRACE("Thread Data Destroyed\n"); @@ -510,7 +512,7 @@ HIMC WINAPI ImmCreateContext(void) if (!new_context->immKbd->pImeSelect(new_context, TRUE)) { TRACE("Selection of IME failed\n"); - ImmDestroyContext(new_context); + IMM_DestroyContext(new_context); return 0; } @@ -520,10 +522,7 @@ HIMC WINAPI ImmCreateContext(void) return (HIMC)new_context; } -/*********************************************************************** - * ImmDestroyContext (IMM32.@) - */ -BOOL WINAPI ImmDestroyContext(HIMC hIMC) +static BOOL IMM_DestroyContext(HIMC hIMC) { InputContextData *data = (InputContextData*)hIMC; @@ -550,6 +549,17 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) } /*********************************************************************** + * ImmDestroyContext (IMM32.@) + */ +BOOL WINAPI ImmDestroyContext(HIMC hIMC) +{ + if (hIMC != IMM_GetThreadData()->defaultContext) + return IMM_DestroyContext(hIMC); + else + return FALSE; +} + +/*********************************************************************** * ImmDisableIME (IMM32.@) */ BOOL WINAPI ImmDisableIME(DWORD idThread)

1 0

Andrew Talbot : advapi32: Array parameters are passed to function as pointers so lose size information .
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 5c8473ba780cf26494bfcddce5e2364a20aabc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8473ba780cf26494bfcddce… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Apr 8 13:44:01 2008 +0100 advapi32: Array parameters are passed to function as pointers so lose size information. --- dlls/advapi32/cred.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index ab988da..44de697 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -82,7 +82,7 @@ static DWORD read_credential_blob(HKEY hkey, const BYTE key_data[KEY_SIZE], else if (type != REG_BINARY) return ERROR_REGISTRY_CORRUPT; - key.Length = key.MaximumLength = sizeof(key_data); + key.Length = key.MaximumLength = KEY_SIZE; key.Buffer = (unsigned char *)key_data; data.Length = data.MaximumLength = *credential_blob_size; @@ -442,7 +442,7 @@ static DWORD write_credential_blob(HKEY hkey, LPCWSTR target_name, DWORD type, struct ustring key; DWORD ret; - key.Length = key.MaximumLength = sizeof(key_data); + key.Length = key.MaximumLength = KEY_SIZE; key.Buffer = (unsigned char *)key_data; encrypted_credential_blob = HeapAlloc(GetProcessHeap(), 0, credential_blob_size);

1 0

Erik de Castro Lopo : msvcrt: Clear end-of-file flag on fseek.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 60501aa93e506e8a36504d6cf325f480c619577f URL: http://source.winehq.org/git/wine.git/?a=commit;h=60501aa93e506e8a36504d6cf… Author: Erik de Castro Lopo <mle+win(a)mega-nerd.com> Date: Tue Apr 8 21:53:53 2008 +1000 msvcrt: Clear end-of-file flag on fseek. --- dlls/msvcrt/file.c | 2 ++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0c1e84b..866d28d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -918,6 +918,8 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, long offset, int whence) if(file->_flag & MSVCRT__IORW) { file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } + /* Clear end of file flag */ + file->_flag &= ~MSVCRT__IOEOF; return (_lseek(file->_file,offset,whence) == -1)?-1:0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index d406ae5..aa58a32 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -241,7 +241,7 @@ static void test_readmode( BOOL ascii_mode ) ok(fread(buffer,1,1,file)==0,"fread failure in %s\n", IOMODE); ok(feof(file)!=0,"feof failure in %s\n", IOMODE); ok(fseek(file,-3,SEEK_CUR)==0,"seek failure in %s\n", IOMODE); - todo_wine ok(feof(file)==0,"feof failure in %s\n", IOMODE); + ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==1,"fread failed in %s\n", IOMODE); ok(feof(file)==0,"feof failure in %s\n", IOMODE); ok(fread(buffer,2,1,file)==0,"fread failure in %s\n",IOMODE);

1 0

Maarten Lankhorst : quartz: Don't free a null media type in the file source .
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 4763e83b60528a8564332d3ba18c51d3e4509f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4763e83b60528a8564332d3ba… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:31:15 2008 -0700 quartz: Don't free a null media type in the file source. --- dlls/quartz/filesource.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index fd977f9..b2d6838 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -96,6 +96,7 @@ static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GU size = sizeof(keying); if (!l) l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) CLSIDFromString(keying, minorType); @@ -433,7 +434,8 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL; CoTaskMemFree(This->pszFileName); - FreeMediaType(This->pmt); + if (This->pmt) + FreeMediaType(This->pmt); CoTaskMemFree(This); return 0; } @@ -681,7 +683,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi } CoTaskMemFree(This->pszFileName); - FreeMediaType(This->pmt); + if (This->pmt) + FreeMediaType(This->pmt); This->pszFileName = NULL; This->pmt = NULL;

1 0

Maarten Lankhorst : quartz: Make the pullpin forward the BeginFlush before doing its own flushing.
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: 994af69cac31bc53842ad13570bcce6797b89207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=994af69cac31bc53842ad1357… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:34:21 2008 -0700 quartz: Make the pullpin forward the BeginFlush before doing its own flushing. --- dlls/quartz/pin.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 8ec39be..7d54a51 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1595,6 +1595,12 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) PullPin *This = (PullPin *)iface; TRACE("(%p)->()\n", iface); + EnterCriticalSection(This->pin.pCritSec); + { + SendFurther( iface, deliver_beginflush, NULL, NULL ); + } + LeaveCriticalSection(This->pin.pCritSec); + EnterCriticalSection(&This->thread_lock); { if (This->state == State_Running) @@ -1607,8 +1613,6 @@ HRESULT WINAPI PullPin_BeginFlush(IPin * iface) EnterCriticalSection(This->pin.pCritSec); { This->fnCleanProc(This->pin.pUserData); - - SendFurther( iface, deliver_beginflush, NULL, NULL ); } LeaveCriticalSection(This->pin.pCritSec);

1 0

Maarten Lankhorst : quartz: Make the DirectSound renderer return S_FALSE packet if in the paused state .
by Alexandre Julliard April 9, 2008

April 9, 2008

Module: wine Branch: master Commit: de117c1eb54488f839a790d5901ae34c3063dfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de117c1eb54488f839a790d59… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 7 22:30:30 2008 -0700 quartz: Make the DirectSound renderer return S_FALSE packet if in the paused state. --- dlls/quartz/dsoundrender.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e65ae12..290e02e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -231,6 +231,9 @@ static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) TRACE("%p %p\n", iface, pSample); + if (This->state == State_Paused) + return S_FALSE; + if (This->state == State_Stopped) return VFW_E_WRONG_STATE; @@ -804,9 +807,9 @@ static HRESULT WINAPI DSoundRender_InputPin_BeginFlush(IPin * iface) DSoundRenderImpl *pFilter = (DSoundRenderImpl *)This->pin.pinInfo.pFilter; HRESULT hr; + TRACE("\n"); hr = InputPin_BeginFlush(iface); - FIXME("Requested flush\n"); EnterCriticalSection(This->pin.pCritSec); if (pFilter->dsbuffer) IDirectSoundBuffer_Stop(pFilter->dsbuffer);

1 0