wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Thomas Faber : msvcrt: Fix malloc_func_t/free_func_t calling convention.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: bf5c7d4546b791e3e00f8501c3e74173266a07b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5c7d4546b791e3e00f8501c… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat May 5 13:42:00 2012 +0200 msvcrt: Fix malloc_func_t/free_func_t calling convention. --- dlls/msvcrt/msvcrt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0fd3410..e255a2e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -245,8 +245,8 @@ int __cdecl MSVCRT__set_new_mode(int mode); void* __cdecl MSVCRT_operator_new(MSVCRT_size_t); void __cdecl MSVCRT_operator_delete(void*); -typedef void* (*__cdecl malloc_func_t)(MSVCRT_size_t); -typedef void (*__cdecl free_func_t)(void*); +typedef void* (__cdecl *malloc_func_t)(MSVCRT_size_t); +typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int);

1 0

Vincent Povirk : msvcm80: Add __setusermatherr_m stub.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: eb29d8705384c21efaee2605fa7dc2fed420dc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb29d8705384c21efaee2605f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 4 10:51:57 2012 -0500 msvcm80: Add __setusermatherr_m stub. --- dlls/msvcm80/msvcm80.spec | 2 +- dlls/msvcm80/msvcm80_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 5c72393..86e50bf 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -300,7 +300,7 @@ @ stub -arch=win64 ?setw@std@@YA?AU?$_Smanip@_J@1@_J@Z @ stub ?signal@@YAP6MXH@ZHH@Z @ stub ?signal@@YAP6MXH@ZHP6MXH@Z@Z -@ stub __setusermatherr_m +@ cdecl __setusermatherr_m(ptr) @ stub towctrans @ stub wctrans @ stub wctype diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index bf5d637..0dd94ca 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -49,3 +49,10 @@ void __cdecl CrtImplementationDetails_RegisterModuleUninitializer(void* handler) { FIXME("%p: stub\n", handler); } + +/* handler is a "method" with signature int32 (*handler)(_exception*), but I'm + * not sure what that means */ +void __cdecl __setusermatherr_m(void *handler) +{ + FIXME("%p: stub\n", handler); +}

1 0

Vincent Povirk : msvcm80: Add stub RegisterModuleUninitializer function.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: de012d0be67acc478a9e2ae0941cc4d623128181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de012d0be67acc478a9e2ae09… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 4 08:52:27 2012 -0500 msvcm80: Add stub RegisterModuleUninitializer function. --- dlls/msvcm80/msvcm80.spec | 4 ++-- dlls/msvcm80/msvcm80_main.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index 04224cd..5c72393 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -1,8 +1,8 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX@Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX@Z0@Z @ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation -@ stub -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler@System@@@Z -@ stub -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler@System@@@Z +@ cdecl -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler@System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer +@ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler@System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString@System@@@Z @ stub -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString@System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString@System@@P$AAVException@3@@Z diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index 29bfdc7..bf5d637 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -43,3 +43,9 @@ void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void) { FIXME("stub\n"); } + +/* void __cdecl <CrtImplementationDetails>::RegisterModuleUninitializer(System.EventHandler^) */ +void __cdecl CrtImplementationDetails_RegisterModuleUninitializer(void* handler) +{ + FIXME("%p: stub\n", handler); +}

1 0

Vincent Povirk : msvcm80: Add stub DoDllLanguageSupportValidation function.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 01a1a5f80992f110cd7df34e01b18f6cc7756f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a1a5f80992f110cd7df34e0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 15:11:13 2012 -0500 msvcm80: Add stub DoDllLanguageSupportValidation function. --- dlls/msvcm80/msvcm80.spec | 2 +- dlls/msvcm80/msvcm80_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index dd92996..04224cd 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -1,6 +1,6 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX@Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX@Z0@Z -@ stub ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ +@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation @ stub -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler@System@@@Z @ stub -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler@System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString@System@@@Z diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index 44f7a56..29bfdc7 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -21,6 +21,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcm); + BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) @@ -33,3 +37,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +/* void __cdecl <CrtImplementationDetails>::DoDllLanguageSupportValidation(void) */ +void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void) +{ + FIXME("stub\n"); +}

1 0

Vincent Povirk : msvcm80: Add stub dll.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 7e8ce7badc4f2c6c83214000c25bddfff7b79cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ce7badc4f2c6c83214000c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 14:15:32 2012 -0500 msvcm80: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcm80/Makefile.in | 6 + dlls/msvcm80/msvcm80.spec | 306 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcm80/msvcm80_main.c | 35 +++++ 5 files changed, 349 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8ce7badc4f2c6c83214…

1 0

Vincent Povirk : winebuild: Allow angle brackets in export names.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: ee1531ef789999e7a7766718c73e44baa75b94da URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1531ef789999e7a7766718c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 14:16:01 2012 -0500 winebuild: Allow angle brackets in export names. --- tools/winebuild/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 1e23e3c..0498e75 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -45,7 +45,7 @@ static const char *separator_chars; static const char *comment_chars; /* valid characters in ordinal names */ -static const char valid_ordname_chars[] = "/$:-_@?abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; +static const char valid_ordname_chars[] = "/$:-_@?<>abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; static const char * const TypeNames[TYPE_NBTYPES] = {

1 0

Erich Hoover : ws2_32/tests: Fix cleanup for first IOCP duplicated handle test.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: baa005638586fe0d11d77226b7ccd838c5ae0759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baa005638586fe0d11d77226b… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu May 3 16:32:34 2012 -0600 ws2_32/tests: Fix cleanup for first IOCP duplicated handle test. --- dlls/ws2_32/tests/sock.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b71be34..e9814e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5585,12 +5585,34 @@ static void test_completion_port(void) ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); ok(!olp, "Overlapped structure is at %p\n", olp); - closesocket(src); src = INVALID_SOCKET; closesocket(dup); dup = INVALID_SOCKET; + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); + todo_wine ok(key == 125, "Key is %lu\n", key); + todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); + todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); + todo_wine ok(olp && olp->Internal == (ULONG)STATUS_CANCELLED, "Internal status is %lx\n", olp ? olp->Internal : 0); + + SetLastError(0xdeadbeef); + key = 0xdeadbeef; + num_bytes = 0xdeadbeef; + olp = (WSAOVERLAPPED *)0xdeadbeef; + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); + ok(bret == FALSE, "failed to get completion status %u\n", bret); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); + /* Test IOCP with duplicated handle (closing duplicated handle) */ if ((src = setup_iocp_src(&bindAddress)) == INVALID_SOCKET) @@ -5618,15 +5640,12 @@ static void test_completion_port(void) key = 0xdeadbeef; num_bytes = 0xdeadbeef; olp = (WSAOVERLAPPED *)0xdeadbeef; - - bret = GetQueuedCompletionStatus(io_port, &num_bytes, &key, &olp, 100); + bret = GetQueuedCompletionStatus( io_port, &num_bytes, &key, &olp, 200 ); ok(bret == FALSE, "failed to get completion status %u\n", bret); - todo_wine ok(GetLastError() == ERROR_OPERATION_ABORTED, "Last error was %d\n", GetLastError()); - todo_wine ok(key == 125, "Key is %lu\n", key); - todo_wine ok(num_bytes == 0, "Number of bytes transferred is %u\n", num_bytes); - todo_wine ok(olp == &ov, "Overlapped structure is at %p\n", olp); - todo_wine ok(olp && (broken(olp->Internal == (ULONG)STATUS_PENDING) || (olp->Internal == (ULONG)STATUS_CANCELLED)), - "Internal status is %lx\n", olp ? olp->Internal : 0); + ok(GetLastError() == WAIT_TIMEOUT, "Last error was %d\n", GetLastError()); + ok(key == 0xdeadbeef, "Key is %lu\n", key); + ok(num_bytes == 0xdeadbeef, "Number of bytes transferred is %u\n", num_bytes); + ok(!olp, "Overlapped structure is at %p\n", olp); SetLastError(0xdeadbeef); key = 0xdeadbeef;

1 0

Alexandre Julliard : winex11: Give XInitThreads yet another chance.
by Alexandre Julliard 07 May '12

07 May '12

Module: wine Branch: master Commit: 07bc017ff13c43bc897de730715e8b07139268ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=07bc017ff13c43bc897de7307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 5 12:13:38 2012 +0200 winex11: Give XInitThreads yet another chance. --- dlls/winex11.drv/x11drv_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9e791e5..88e2114 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -539,6 +539,7 @@ static BOOL process_attach(void) /* Open display */ + if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); if (!(display = XOpenDisplay( NULL ))) return FALSE; fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */

1 0

Christian Costa : amstream: Add the corresponding pin to every media stream added to the media stream filter + add tests .
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: dec3d502901d56839ee5240c1ee68158efdcfac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec3d502901d56839ee5240c1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:21:28 2012 +0200 amstream: Add the corresponding pin to every media stream added to the media stream filter + add tests. --- dlls/amstream/mediastreamfilter.c | 96 +++++++++++++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 48 ++++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index cd08490..ee9d970 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -1,7 +1,7 @@ /* * Implementation of MediaStream Filter * - * Copyright 2008 Christian Costa + * Copyright 2008, 2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,10 +35,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); +typedef struct MediaStreamFilter_InputPin +{ + BaseInputPin pin; +} MediaStreamFilter_InputPin; + +static const IPinVtbl MediaStreamFilter_InputPin_Vtbl = +{ + BaseInputPinImpl_QueryInterface, + BasePinImpl_AddRef, + BaseInputPinImpl_Release, + BaseInputPinImpl_Connect, + BaseInputPinImpl_ReceiveConnection, + BasePinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BasePinImpl_NewSegment +}; + typedef struct { BaseFilter filter; ULONG nb_streams; IMediaStream** streams; + IPin** pins; } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -46,6 +74,32 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamF return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); } +static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) +{ + return S_FALSE; +} + +static LONG WINAPI BasePinImp_GetMediaTypeVersion(BasePin *This) +{ + return 0; +} + +static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *amt) +{ + return S_FALSE; +} + +static const BasePinFuncTable input_BaseFuncTable = { + BasePinImpl_CheckMediaType, + NULL, + BasePinImp_GetMediaTypeVersion, + BasePinImp_GetMediaType +}; + +static const BaseInputPinFuncTable input_BaseInputFuncTable = { + NULL +}; + /*** IUnknown methods ***/ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, @@ -93,7 +147,10 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { int i; for (i = 0; i < This->nb_streams; i++) + { IMediaStream_Release(This->streams[i]); + IPin_Release(This->pins[i]); + } HeapFree(GetProcessHeap(), 0, This); } @@ -178,6 +235,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); IMediaStream** streams; + IPin** pins; + MediaStreamFilter_InputPin* pin; + HRESULT hr; + PIN_INFO info; + MSPID purpose_id; TRACE("(%p)->(%p)\n", iface, pAMMediaStream); @@ -185,6 +247,24 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i if (!streams) return E_OUTOFMEMORY; This->streams = streams; + pins = CoTaskMemRealloc(This->pins, (This->nb_streams + 1) * sizeof(IPin*)); + if (!pins) + return E_OUTOFMEMORY; + This->pins = pins; + info.pFilter = (IBaseFilter*)&This->filter; + info.dir = PINDIR_INPUT; + hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); + if (FAILED(hr)) + return hr; + /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ + info.achName[0] = 'I'; + StringFromGUID2(&purpose_id, info.achName + 1, 40); + hr = BaseInputPin_Construct(&MediaStreamFilter_InputPin_Vtbl, &info, &input_BaseFuncTable, &input_BaseInputFuncTable, &This->filter.csFilter, NULL, &This->pins[This->nb_streams]); + if (FAILED(hr)) + return hr; + + pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; + pin->pin.pin.pinInfo.pFilter = (LPVOID)This; This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; This->nb_streams++; @@ -294,14 +374,22 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl = static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) { - /* No pins */ + IMediaStreamFilterImpl* This = (IMediaStreamFilterImpl*)iface; + + if (pos < This->nb_streams) + { + IPin_AddRef(This->pins[pos]); + return This->pins[pos]; + } + return NULL; } static LONG WINAPI MediaStreamFilterImpl_GetPinCount(BaseFilter *iface) { - /* No pins */ - return 0; + IMediaStreamFilterImpl* This = (IMediaStreamFilterImpl*)iface; + + return This->nb_streams; } static const BaseFilterFuncTable BaseFuncTable = { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c62e83d..36c97b9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -364,6 +364,54 @@ static void test_media_streams(void) } } + if (media_stream_filter) + { + IEnumPins *enum_pins; + + hr = IMediaStreamFilter_EnumPins(media_stream_filter, &enum_pins); + ok(hr == S_OK, "IBaseFilter_EnumPins returned: %x\n", hr); + if (hr == S_OK) + { + IPin* pins[3] = { NULL, NULL, NULL }; + ULONG nb_pins; + ULONG expected_nb_pins = audio_stream ? 2 : 1; + int i; + + hr = IEnumPins_Next(enum_pins, 3, pins, &nb_pins); + ok(SUCCEEDED(hr), "IEnumPins_Next returned: %x\n", hr); + ok(nb_pins == expected_nb_pins, "Number of pins is %u instead of %u\n", nb_pins, expected_nb_pins); + for (i = 0; i < min(nb_pins, expected_nb_pins); i++) + { + IEnumMediaTypes* enum_media_types; + AM_MEDIA_TYPE* media_types[10]; + ULONG nb_media_types; + IPin* pin; + PIN_INFO info; + WCHAR id[40]; + + /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ + id[0] = 'I'; + StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 40); + + hr = IPin_ConnectedTo(pins[i], &pin); + ok(hr == VFW_E_NOT_CONNECTED, "IPin_ConnectedTo returned: %x\n", hr); + hr = IPin_QueryPinInfo(pins[i], &info); + ok(hr == S_OK, "IPin_QueryPinInfo returned: %x\n", hr); + IBaseFilter_Release(info.pFilter); + ok(info.dir == PINDIR_INPUT, "Pin direction is %u instead of %u\n", info.dir, PINDIR_INPUT); + ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); + hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); + ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); + hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(AM_MEDIA_TYPE), media_types, &nb_media_types); + ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); + ok(nb_media_types == 0, "nb_media_types should be 0 instead of %u\n", nb_media_types); + IEnumMediaTypes_Release(enum_media_types); + IPin_Release(pins[i]); + } + IEnumPins_Release(enum_pins); + } + } + if (video_stream) IMediaStream_Release(video_stream); if (audio_stream)

1 0

Christian Costa : amstream: Add checks to GetFormat.
by Alexandre Julliard 04 May '12

04 May '12

Module: wine Branch: master Commit: 49762b1679c498ccd46ad79e941ab44623295fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49762b1679c498ccd46ad79e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:21:20 2012 +0200 amstream: Add checks to GetFormat. --- dlls/amstream/mediastream.c | 15 +++++++++------ dlls/amstream/tests/amstream.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 2aeaaa4..6656bf7 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -159,13 +159,13 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_SendEndOfStream(IDirectDrawMedi /*** IDirectDrawMediaStream methods ***/ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface, - DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette, - DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) + DDSURFACEDESC *current_format, IDirectDrawPalette **palette, + DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, - pdwFlags); + FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, + flags); - return E_NOTIMPL; + return MS_E_NOSTREAM; } @@ -390,7 +390,10 @@ static HRESULT WINAPI IAudioMediaStreamImpl_GetFormat(IAudioMediaStream *iface, FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); - return E_NOTIMPL; + if (!wave_format_current) + return E_POINTER; + + return MS_E_NOSTREAM; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f613c8c..c62e83d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -248,6 +248,13 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { + DDSURFACEDESC current_format, desired_format; + IDirectDrawPalette *palette; + DWORD flags; + + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "IDirectDrawoMediaStream_GetFormat returned: %x\n", hr); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); } @@ -333,9 +340,16 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { IAudioData* audio_data = NULL; + WAVEFORMATEX format; + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = IAudioMediaStream_GetFormat(audio_media_stream, NULL); + ok(hr == E_POINTER, "IAudioMediaStream_GetFormat returned: %x\n", hr); + hr = IAudioMediaStream_GetFormat(audio_media_stream, &format); + ok(hr == MS_E_NOSTREAM, "IAudioMediaStream_GetFormat returned: %x\n", hr); + hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample);

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
74
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 May 2012