March 2012 - Wine-Commits - list.winehq.org

Christian Costa : amstream: Remove duplicate GraphBuilder member.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: b15c4113c0ad887cf7a85ddd405dda5ba4e130e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b15c4113c0ad887cf7a85ddd4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:48 2012 +0100 amstream: Remove duplicate GraphBuilder member. --- dlls/amstream/amstream.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 72ace4a..82dcd24 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -36,7 +36,6 @@ typedef struct { LONG ref; IGraphBuilder* pFilterGraph; IPin* ipin; - IGraphBuilder* GraphBuilder; ULONG nbStreams; IMediaStream** pStreams; STREAM_TYPE StreamType; @@ -313,10 +312,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac return ret; } - ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); - if (ret != S_OK) - goto end; - ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); if(ret != S_OK) return ret; @@ -357,7 +352,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac goto end; } - ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); end: IBaseFilter_Release(BaseFilter); @@ -383,7 +378,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, if(dwFlags != AMMSF_NOCLOCK) return E_INVALIDARG; - return IGraphBuilder_Render(This->GraphBuilder, This->ipin); + return IGraphBuilder_Render(This->pFilterGraph, This->ipin); } static const IAMMultiMediaStreamVtbl AM_Vtbl =

1 0

Christian Costa : amstream: Free all used resources when releasing MultiMediaStream object.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: abc6d186ead35d2cad28c5a2a69183c6ed4f3a5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abc6d186ead35d2cad28c5a2a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:55:04 2012 +0100 amstream: Free all used resources when releasing MultiMediaStream object. --- dlls/amstream/amstream.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index a731d5e..c771f77 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -106,11 +106,20 @@ static ULONG WINAPI IAMMultiMediaStreamImpl_Release(IAMMultiMediaStream* iface) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; TRACE("(%p/%p)\n", iface, This); if (!ref) + { + for(i = 0; i < This->nbStreams; i++) + IMediaStream_Release(This->pStreams[i]); + if (This->ipin) + IPin_Release(This->ipin); + if (This->pFilterGraph) + IGraphBuilder_Release(This->pFilterGraph); HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Akihiro Sagawa : msvcrt/tests: Add tests for fflush on input stream.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 09a7f8c196f3416becbfc4f1500b733e06040e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09a7f8c196f3416becbfc4f15… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:03 2012 +0900 msvcrt/tests: Add tests for fflush on input stream. --- dlls/msvcrt/tests/file.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b9b904d..9e93234 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -591,6 +591,58 @@ static void test_flsbuf( void ) free(tempf); } +static void test_fflush( void ) +{ + static const char obuf[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; + char buf1[16], buf2[24]; + char *tempf; + FILE *tempfh; + int ret; + + tempf=_tempnam(".","wne"); + + /* Prepare the file. */ + tempfh = fopen(tempf,"wb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fwrite(obuf, 1, sizeof(obuf), tempfh); + fclose(tempfh); + + /* Open the file for input. */ + tempfh = fopen(tempf,"rb"); + ok(tempfh != NULL, "Can't open test file.\n"); + fread(buf1, 1, sizeof(buf1), tempfh); + + /* Using fflush() on input stream is undefined in ANSI. + * But MSDN says that it clears input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = fflush(tempfh); + ok(ret == 0, "expected 0, got %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + + /* fflush(NULL) doesn't clear input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = fflush(NULL); + ok(ret == 0, "expected 0, got %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + ok(memcmp(buf1, buf2, sizeof(buf1)) != 0, "Got unexpected data (%c)\n", buf2[0]); + + /* _flushall() clears input buffer. */ + _lseek(_fileno(tempfh), 0, SEEK_SET); + ret = _flushall(); + ok(ret >= 0, "unexpected ret %d\n", ret); + memset(buf2, '?', sizeof(buf2)); + fread(buf2, 1, sizeof(buf2), tempfh); + todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + + fclose(tempfh); + + unlink(tempf); + free(tempf); +} + static void test_fgetwc( void ) { #define LLEN 512 @@ -1582,6 +1634,7 @@ START_TEST(file) test_fgetc(); test_fputc(); test_flsbuf(); + test_fflush(); test_fgetwc(); test_ctrlz(); test_file_put_get();

1 0

Akihiro Sagawa : msvcrt: Add support for fflush to clear an input buffer.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 1a01893c746beff8b41b7ad9c78df47ced89a012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a01893c746beff8b41b7ad9c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:04 2012 +0900 msvcrt: Add support for fflush to clear an input buffer. --- dlls/msvcrt/file.c | 7 +++++++ dlls/msvcrt/tests/file.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c15e33f..7fbe07e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -792,6 +792,13 @@ int CDECL MSVCRT_fflush(MSVCRT_FILE* file) MSVCRT__unlock_file(file); return res; + } else if(file->_flag & MSVCRT__IOREAD) { + MSVCRT__lock_file(file); + file->_cnt = 0; + file->_ptr = file->_base; + MSVCRT__unlock_file(file); + + return 0; } return 0; } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 9e93234..6d745d9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -619,7 +619,7 @@ static void test_fflush( void ) ok(ret == 0, "expected 0, got %d\n", ret); memset(buf2, '?', sizeof(buf2)); fread(buf2, 1, sizeof(buf2), tempfh); - todo_wine ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); + ok(memcmp(buf1, buf2, sizeof(buf1)) == 0, "Got unexpected data (%c)\n", buf2[0]); /* fflush(NULL) doesn't clear input buffer. */ _lseek(_fileno(tempfh), 0, SEEK_SET);

1 0

Akihiro Sagawa : msvcrt: Add a helper function to flush all buffers.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 58d6a9a331811312968077c77a9805ab85c35afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=58d6a9a331811312968077c77… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 12 21:14:06 2012 +0900 msvcrt: Add a helper function to flush all buffers. --- dlls/msvcrt/file.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7fbe07e..b057f9e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -748,13 +748,11 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path) return -1; } -/* _flushall calls MSVCRT_fflush which calls _flushall */ +/* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file); -/********************************************************************* - * _flushall (MSVCRT.@) - */ -int CDECL MSVCRT__flushall(void) +/* INTERNAL: Flush all stream buffer */ +static int msvcrt_flush_all_buffers(int mask) { int i, num_flushed = 0; MSVCRT_FILE *file; @@ -765,7 +763,7 @@ int CDECL MSVCRT__flushall(void) if (file->_flag) { - if(file->_flag & MSVCRT__IOWRT) { + if(file->_flag & mask) { MSVCRT_fflush(file); num_flushed++; } @@ -778,6 +776,14 @@ int CDECL MSVCRT__flushall(void) } /********************************************************************* + * _flushall (MSVCRT.@) + */ +int CDECL MSVCRT__flushall(void) +{ + return msvcrt_flush_all_buffers(MSVCRT__IOWRT); +} + +/********************************************************************* * fflush (MSVCRT.@) */ int CDECL MSVCRT_fflush(MSVCRT_FILE* file)

1 0

Kusanagi Kouichi : gdi32: find_face_from_filename() needs to take font replacements into account.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 6a49adeee6f889913bc960ce3483d83a1d777ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a49adeee6f889913bc960ce3… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Mar 14 21:01:49 2012 +0900 gdi32: find_face_from_filename() needs to take font replacements into account. --- dlls/gdi32/freetype.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4d4a37d..ec39814 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -890,6 +890,14 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) } +static const struct list *get_face_list_from_family(const Family *family) +{ + if (!list_empty(&family->faces)) + return &family->faces; + else + return family->replacement; +} + static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_name) { Family *family; @@ -903,9 +911,11 @@ static Face *find_face_from_filename(const WCHAR *file_name, const WCHAR *face_n LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { + const struct list *face_list; if(face_name && strcmpiW(face_name, family->FamilyName)) continue; - LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + face_list = get_face_list_from_family(family); + LIST_FOR_EACH_ENTRY(face, face_list, Face, entry) { if (!face->file) continue; @@ -1957,14 +1967,6 @@ static SYSTEM_LINKS *find_font_link(const WCHAR *name) return NULL; } -static const struct list *get_face_list_from_family(const Family *family) -{ - if (!list_empty(&family->faces)) - return &family->faces; - else - return family->replacement; -} - static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value;

1 0

Hans Leidekker : include: Add the IAssemblyName interface.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: cc3d2101305253fa51d1be485e18a8bdab4447c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3d2101305253fa51d1be485… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 14 09:43:56 2012 +0100 include: Add the IAssemblyName interface. --- include/winsxs.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/include/winsxs.idl b/include/winsxs.idl index 202b91f..b425b2f 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -21,6 +21,7 @@ import "oleidl.idl"; interface IAssemblyCache; interface IAssemblyCacheItem; +interface IAssemblyName; typedef struct _FUSION_INSTALL_REFERENCE_ { @@ -99,4 +100,98 @@ interface IAssemblyCacheItem : IUnknown HRESULT AbortItem(); } +[ + object, + uuid(cd193bc0-b4bc-11D2-9833-00c04fc31d2e), + pointer_default(unique), + local +] +interface IAssemblyName : IUnknown +{ + typedef [public] enum + { + ASM_NAME_PUBLIC_KEY, + ASM_NAME_PUBLIC_KEY_TOKEN, + ASM_NAME_HASH_VALUE, + ASM_NAME_NAME, + ASM_NAME_MAJOR_VERSION, + ASM_NAME_MINOR_VERSION, + ASM_NAME_BUILD_NUMBER, + ASM_NAME_REVISION_NUMBER, + ASM_NAME_CULTURE, + ASM_NAME_PROCESSOR_ID_ARRAY, + ASM_NAME_OSINFO_ARRAY, + ASM_NAME_HASH_ALGID, + ASM_NAME_ALIAS, + ASM_NAME_CODEBASE_URL, + ASM_NAME_CODEBASE_LASTMOD, + ASM_NAME_NULL_PUBLIC_KEY, + ASM_NAME_NULL_PUBLIC_KEY_TOKEN, + ASM_NAME_CUSTOM, + ASM_NAME_NULL_CUSTOM, + ASM_NAME_MVID, + ASM_NAME_MAX_PARAMS + } ASM_NAME; + + typedef [public] enum + { + ASM_DISPLAYF_VERSION = 0x1, + ASM_DISPLAYF_CULTURE = 0x2, + ASM_DISPLAYF_PUBLIC_KEY_TOKEN = 0x4, + ASM_DISPLAYF_PUBLIC_KEY = 0x8, + ASM_DISPLAYF_CUSTOM = 0x10, + ASM_DISPLAYF_PROCESSORARCHITECTURE = 0x20, + ASM_DISPLAYF_LANGUAGEID = 0x40 + } ASM_DISPLAY_FLAGS; + + HRESULT SetProperty( + [in] DWORD id, + [in] LPVOID property, + [in] DWORD size); + + HRESULT GetProperty( + [in] DWORD id, + [out] LPVOID buffer, + [in][out] LPDWORD buflen); + + HRESULT Finalize(); + + HRESULT GetDisplayName( + [out] LPWSTR buffer, + [in][out] LPDWORD buflen, + [in] DWORD flags); + + HRESULT Reserved( + [in] REFIID riid, + [in] IUnknown *pUnkReserved1, + [in] IUnknown *pUnkReserved2, + [in] LPCOLESTR szReserved, + [in] LONGLONG llReserved, + [in] LPVOID pvReserved, + [in] DWORD cbReserved, + [out] LPVOID *ppReserved); + + HRESULT GetName( + [in][out] LPDWORD buflen, + [out] LPWSTR buffer); + + HRESULT GetVersion( + [out] LPDWORD hi, + [out] LPDWORD low); + + HRESULT IsEqual( + [in] IAssemblyName *name, + [in] DWORD flags); + + HRESULT Clone( + [out] IAssemblyName **name); +} + +typedef [unique] IAssemblyName *LPASSEMBLYNAME; +typedef [public] enum +{ + CANOF_PARSE_DISPLAY_NAME = 0x1, + CANOF_SET_DEFAULT_VALUES = 0x2 +} CREATE_ASM_NAME_OBJ_FLAGS; + cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);")

1 0

Hans Leidekker : sxs: Add a stub implementation of IAssemblyName.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 21e5c4c4172f03c0e982d5c62bd2ddfef63f5fe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21e5c4c4172f03c0e982d5c62… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 14 09:44:12 2012 +0100 sxs: Add a stub implementation of IAssemblyName. --- dlls/sxs/Makefile.in | 1 + dlls/sxs/name.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sxs/sxs.spec | 2 +- include/winsxs.idl | 1 + 4 files changed, 223 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index 180f91c..b9832db 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = oleaut32 ole32 C_SRCS = \ cache.c \ + name.c \ sxs.c @MAKE_DLL_RULES@ diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c new file mode 100644 index 0000000..1adeebd --- /dev/null +++ b/dlls/sxs/name.c @@ -0,0 +1,220 @@ +/* + * IAssemblyName implementation + * + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "winsxs.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + +struct name +{ + IAssemblyName IAssemblyName_iface; + LONG refs; +}; + +static inline struct name *impl_from_IAssemblyName( IAssemblyName *iface ) +{ + return CONTAINING_RECORD( iface, struct name, IAssemblyName_iface ); +} + +static HRESULT WINAPI name_QueryInterface( + IAssemblyName *iface, + REFIID riid, + void **obj ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + + TRACE("%p, %s, %p\n", name, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID( riid, &IID_IUnknown ) || + IsEqualIID( riid, &IID_IAssemblyName )) + { + IUnknown_AddRef( iface ); + *obj = name; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI name_AddRef( + IAssemblyName *iface ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + return InterlockedIncrement( &name->refs ); +} + +static ULONG WINAPI name_Release( IAssemblyName *iface ) +{ + struct name *name = impl_from_IAssemblyName( iface ); + ULONG refs = InterlockedDecrement( &name->refs ); + + if (!refs) + { + TRACE("destroying %p\n", name); + HeapFree( GetProcessHeap(), 0, name ); + } + return refs; +} + +static HRESULT WINAPI name_SetProperty( + IAssemblyName *iface, + DWORD id, + LPVOID property, + DWORD size ) +{ + FIXME("%p, %d, %p, %d\n", iface, id, property, size); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetProperty( + IAssemblyName *iface, + DWORD id, + LPVOID buffer, + LPDWORD buflen ) +{ + FIXME("%p, %d, %p, %p\n", iface, id, buffer, buflen); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Finalize( + IAssemblyName *iface ) +{ + FIXME("%p\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetDisplayName( + IAssemblyName *iface, + LPOLESTR buffer, + LPDWORD buflen, + DWORD flags ) +{ + FIXME("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Reserved( + IAssemblyName *iface, + REFIID riid, + IUnknown *pUnkReserved1, + IUnknown *pUnkReserved2, + LPCOLESTR szReserved, + LONGLONG llReserved, + LPVOID pvReserved, + DWORD cbReserved, + LPVOID *ppReserved ) +{ + FIXME("%p, %s, %p, %p, %s, %x%08x, %p, %d, %p\n", iface, + debugstr_guid(riid), pUnkReserved1, pUnkReserved2, + debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + pvReserved, cbReserved, ppReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetName( + IAssemblyName *iface, + LPDWORD buflen, + WCHAR *buffer ) +{ + FIXME("%p, %p, %p\n", iface, buflen, buffer); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_GetVersion( + IAssemblyName *iface, + LPDWORD hi, + LPDWORD low ) +{ + FIXME("%p, %p, %p\n", iface, hi, low); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_IsEqual( + IAssemblyName *name1, + IAssemblyName *name2, + DWORD flags ) +{ + FIXME("%p, %p, 0x%08x\n", name1, name2, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI name_Clone( + IAssemblyName *iface, + IAssemblyName **name ) +{ + FIXME("%p, %p\n", iface, name); + return E_NOTIMPL; +} + +static const IAssemblyNameVtbl name_vtbl = +{ + name_QueryInterface, + name_AddRef, + name_Release, + name_SetProperty, + name_GetProperty, + name_Finalize, + name_GetDisplayName, + name_Reserved, + name_GetName, + name_GetVersion, + name_IsEqual, + name_Clone +}; + +/****************************************************************** + * CreateAssemblyNameObject (SXS.@) + */ +HRESULT WINAPI CreateAssemblyNameObject( + LPASSEMBLYNAME *obj, + LPCWSTR assembly, + DWORD flags, + LPVOID reserved ) +{ + struct name *name; + + TRACE("%p, %s, 0x%08x, %p\n", obj, debugstr_w(assembly), flags, reserved); + + if (!obj) return E_INVALIDARG; + + *obj = NULL; + if (!assembly || !assembly[0] || flags != CANOF_PARSE_DISPLAY_NAME) + return E_INVALIDARG; + + if (!(name = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*name) ))) + return E_OUTOFMEMORY; + + name->IAssemblyName_iface.lpVtbl = &name_vtbl; + name->refs = 1; + + *obj = &name->IAssemblyName_iface; + return S_OK; +} diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index e199bb1..2a27313 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,2 @@ @ stdcall CreateAssemblyCache(ptr long) -@ stub CreateAssemblyNameObject +@ stdcall CreateAssemblyNameObject(ptr wstr long ptr) diff --git a/include/winsxs.idl b/include/winsxs.idl index b425b2f..775c69a 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -195,3 +195,4 @@ typedef [public] enum } CREATE_ASM_NAME_OBJ_FLAGS; cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);") +cpp_quote("HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *,LPCWSTR,DWORD,LPVOID);")

1 0

Christian Costa : amstream: Add source filter to the filtergraph before loading the file.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: 14e228c699e6a06792b97f27af2c9d4eda1057ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e228c699e6a06792b97f27a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:54:56 2012 +0100 amstream: Add source filter to the filtergraph before loading the file. --- dlls/amstream/amstream.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 82dcd24..a731d5e 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -316,6 +316,10 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac if(ret != S_OK) return ret; + ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); + if (FAILED(ret)) + goto end; + ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); if(ret != S_OK) { @@ -337,23 +341,18 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* ifac } ret = IEnumPins_Next(EnumPins, 1, &ipin, NULL); - if(ret == S_OK) + if (ret == S_OK) { ret = IPin_QueryDirection(ipin, &pin_direction); IEnumPins_Release(EnumPins); - if(ret == S_OK && pin_direction == PINDIR_OUTPUT) + if (ret == S_OK && pin_direction == PINDIR_OUTPUT) This->ipin = ipin; - else - goto end; } else { IEnumPins_Release(EnumPins); - goto end; } - ret = IGraphBuilder_AddSourceFilter(This->pFilterGraph, pszFileName, pszFileName, &BaseFilter); - end: IBaseFilter_Release(BaseFilter); IFileSourceFilter_Release(SourceFilter);

1 0

Christian Costa : devenum: Reset moniker pointer before calling IFilterMapper2_RegisterFilter.
by Alexandre Julliard March 14, 2012

March 14, 2012

Module: wine Branch: master Commit: a85957ae0ec324e09c232dabb0e830112a169d2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a85957ae0ec324e09c232dabb… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 12 19:52:30 2012 +0100 devenum: Reset moniker pointer before calling IFilterMapper2_RegisterFilter. --- dlls/devenum/createdevenum.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 5a20da5..615305d 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -670,8 +670,11 @@ static HRESULT DEVENUM_CreateSpecialCategories(void) /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ - if (pMoniker) - IMoniker_Release(pMoniker); + if (pMoniker) + { + IMoniker_Release(pMoniker); + pMoniker = NULL; + } wsprintfW(szDSoundName, szDSoundNameFormat, wocaps.szPname); res = IFilterMapper2_RegisterFilter(pMapper,

1 0