December 2007 - Wine-Commits

Rob Shearman : rpcrt4: Use an alertable wait in rpcrt4_protseq_np_wait_for_new_connection to fix a small memory leak flagged by Valgrind .
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 7092590c90624978823ff875e5ea6f2adcf73fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=7092590c90624978823ff875e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 6 15:08:11 2007 +0000 rpcrt4: Use an alertable wait in rpcrt4_protseq_np_wait_for_new_connection to fix a small memory leak flagged by Valgrind. This is called only by the RPCRT4_server_thread so we don't have to worry about application user APCs being run at improper times. --- dlls/rpcrt4/rpc_transport.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 0c893e8..ea49b77 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -604,8 +604,16 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, if (!objs) return -1; - - res = WaitForMultipleObjects(count, objs, FALSE, INFINITE); + + do + { + /* an alertable wait isn't strictly necessary, but due to our + * overlapped I/O implementation in Wine we need to free some memory + * by the file user APC being called, even if no completion routine was + * specified at the time of starting the async operation */ + res = WaitForMultipleObjectsEx(count, objs, FALSE, INFINITE, TRUE); + } while (res == WAIT_IO_COMPLETION); + if (res == WAIT_OBJECT_0) return 0; else if (res == WAIT_FAILED)

1 0

Rob Shearman : oleaut32: Fix a leak of the typelib in the tmarshal tests.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 83a02c545c93bbb926b859ec001d420c925c2be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83a02c545c93bbb926b859ec0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 6 14:06:19 2007 +0000 oleaut32: Fix a leak of the typelib in the tmarshal tests. --- dlls/oleaut32/tests/tmarshal.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index ce645bf..7e958de 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -600,6 +600,7 @@ static IWidget *Widget_Create(void) ok_ole_success(hr, CreateStdDispatch); ITypeInfo_Release(pTypeInfo); } + ITypeLib_Release(pTypeLib); } if (SUCCEEDED(hr))

1 0

Rob Shearman : oleaut32: Fix two memory leaks in the test for DispCallFunc.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: d7682104e6038c86a4f2e153fd941a7bc46ac548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7682104e6038c86a4f2e153f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 6 14:06:15 2007 +0000 oleaut32: Fix two memory leaks in the test for DispCallFunc. --- dlls/oleaut32/tests/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index c96fb33..ce645bf 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1160,6 +1160,8 @@ static void test_DispCallFunc(void) hr = DispCallFunc(pWidget, 36, CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult); ok_ole_success(hr, DispCallFunc); VariantClear(&varresult); + VariantClear(&vararg[1]); + VariantClear(&vararg[2]); } START_TEST(tmarshal)

1 0

Rob Shearman : oleaut32: Fix a reference count leak of the TMarshalDispatchChannel.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: bc9b5c22fea6a0f29bc68fc5ccbfdb97a778e490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9b5c22fea6a0f29bc68fc5c… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 6 14:06:11 2007 +0000 oleaut32: Fix a reference count leak of the TMarshalDispatchChannel. --- dlls/oleaut32/tmarshal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 75e3d3b..6e5f494 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -471,7 +471,9 @@ TMProxyImpl_Connect( HRESULT hr = TMarshalDispatchChannel_Create(pRpcChannelBuffer, &This->iid, &pDelegateChannel); if (FAILED(hr)) return hr; - return IRpcProxyBuffer_Connect(This->dispatch_proxy, pDelegateChannel); + hr = IRpcProxyBuffer_Connect(This->dispatch_proxy, pDelegateChannel); + IRpcChannelBuffer_Release(pDelegateChannel); + return hr; } return S_OK;

1 0

Rob Shearman : rsaenh: Fix some leaks of the provider handle in the rsaenh tests.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 5d88c0cbad931cbd0a79faac26f21941a9e558d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d88c0cbad931cbd0a79faac2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 6 14:06:06 2007 +0000 rsaenh: Fix some leaks of the provider handle in the rsaenh tests. --- dlls/rsaenh/tests/rsaenh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index b44398d..4b3176c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1937,6 +1937,7 @@ static void test_null_provider(void) result = CryptGetUserKey(prov, AT_SIGNATURE, &key); ok(result, "CryptGetUserKey failed: %08x\n", GetLastError()); CryptDestroyKey(key); + CryptReleaseContext(prov, 0); CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); @@ -1956,9 +1957,11 @@ static void test_null_provider(void) result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok (result, "CryptGetUserKey failed with error %08x\n", GetLastError()); CryptDestroyKey(key); + CryptReleaseContext(prov, 0); CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + CryptReleaseContext(prov, 0); /* test the machine key set */ CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL,

1 0

Rob Shearman : rpcrt4: Implement NdrConformantStructFree.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: ba6aec70ca1d2e9c158dd23fc2fd738a1be5e6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6aec70ca1d2e9c158dd23fc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Dec 6 14:06:02 2007 +0000 rpcrt4: Implement NdrConformantStructFree. --- dlls/rpcrt4/ndr_marshall.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d7da092..be18de8 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -3559,7 +3559,40 @@ void WINAPI NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { - FIXME("stub\n"); + const NDR_CSTRUCT_FORMAT *pCStructFormat = (const NDR_CSTRUCT_FORMAT *)pFormat; + PFORMAT_STRING pCArrayFormat; + ULONG esize; + + TRACE("(%p, %p, %p)\n", pStubMsg, pMemory, pFormat); + + pFormat += sizeof(NDR_CSTRUCT_FORMAT); + if ((pCStructFormat->type != RPC_FC_CPSTRUCT) && (pCStructFormat->type != RPC_FC_CSTRUCT)) + { + ERR("invalid format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + + pCArrayFormat = (const unsigned char *)&pCStructFormat->offset_to_array_description + + pCStructFormat->offset_to_array_description; + if (*pCArrayFormat != RPC_FC_CARRAY) + { + ERR("invalid array format type %x\n", pCStructFormat->type); + RpcRaiseException(RPC_S_INTERNAL_ERROR); + return; + } + esize = *(const WORD*)(pCArrayFormat+2); + + ComputeConformance(pStubMsg, pMemory + pCStructFormat->memory_size, + pCArrayFormat + 4, 0); + + TRACE("memory_size = %d\n", pCStructFormat->memory_size); + + /* copy constant sized part of struct */ + pStubMsg->BufferMark = pStubMsg->Buffer; + + if (pCStructFormat->type == RPC_FC_CPSTRUCT) + EmbeddedPointerFree(pStubMsg, pMemory, pFormat); } /***********************************************************************

1 0

Jonathan Ernst : winecfg: Add missing audio tab controls to other languages .
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 8070e52c4217c377d070406006f4453f095afabf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8070e52c4217c377d07040600… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Dec 6 12:16:43 2007 +0100 winecfg: Add missing audio tab controls to other languages. --- programs/winecfg/Bg.rc | 1 + programs/winecfg/Cs.rc | 3 ++- programs/winecfg/De.rc | 3 ++- programs/winecfg/Fi.rc | 3 ++- programs/winecfg/Hu.rc | 3 ++- programs/winecfg/It.rc | 44 +++++++++++++++++++++++++++++++++++++++++--- programs/winecfg/Ja.rc | 7 ++++++- programs/winecfg/Pt.rc | 43 ++++++++++++++++++++++++++++++++++++++++--- programs/winecfg/Ro.rc | 3 ++- programs/winecfg/Ru.rc | 3 ++- programs/winecfg/Si.rc | 47 +++++++++++++++++++++++++++++++++++++++++++++++ programs/winecfg/Tr.rc | 3 ++- 12 files changed, 149 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8070e52c4217c377d0704…

1 0

Jonathan Ernst : winecfg: Updated French translation.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: f53619e78b0c5f6a1c9bf01a1df270203eb84c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53619e78b0c5f6a1c9bf01a1… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Thu Dec 6 12:16:19 2007 +0100 winecfg: Updated French translation. --- programs/winecfg/Fr.rc | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 83dceff..581802c 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -63,18 +63,17 @@ BEGIN GROUPBOX " Param�tres des fen�tres ",IDC_STATIC,8,4,244,180 CONTROL "Permettre aux applications DirectX d'emp�cher la souris de quitter leur fen�tre",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP | BS_MULTILINE,15,14,230,16 + + CONTROL "Permettre au gestionnaire de &fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Si les fen�tres sont g�r�es par votre gestionnaire de fen�tres, elles auront des bordures standard, elles respecteront votre bureau virtuel et appara�tront dans la liste des fen�tres.\n\nSi les fen�tres ne sont pas g�r�es, elles seront d�connect�es de votre gestionnaire de fen�tres. Ceci signifie qu'elle ne seront pas parfaitement int�gr�es � votre bureau, mais que l'�mulation sera plus pr�cise ce qui permet � certains programmes de mieux fonctionner.", IDC_STATIC,15,45,228,80 - CONTROL "Permettre au gestionnaire de fen�tres de contr�ler les fen�tres",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,140,230,8 - /* FIXME: the wording of this explanation could be a lot better */ + CONTROL "�muler un bureau virtuel",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,113,230,10 LTEXT "Vous avez le choix entre l'�mulation d'un bureau Windows o� toutes les fen�tres de vos programmes Windows sont confin�es ou bien d'afficher les fen�tres de ces programmes sur votre bureau standard.", IDC_STATIC,15,154,228,28 LTEXT "Taille du bureau :",IDC_DESKTOP_SIZE,15,125,60,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,129,123,8,8,WS_DISABLED - CONTROL "Emuler un bureau virtuel",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,113,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,84,123,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,137,123,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -84,10 +83,10 @@ BEGIN COMBOBOX IDC_D3D_VSHADER_MODE,110,198,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Permettre le Pixel Shader (si support� par le mat�riel)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,215,230,10 - GROUPBOX " Screen Resolution ",IDC_STATIC,8,242,244,25 + GROUPBOX " R�solution de l'�cran ",IDC_STATIC,8,242,244,25 CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,250,187,15 EDITTEXT IDC_RES_DPIEDIT,204,250,23,13,ES_NUMBER|WS_TABSTOP - LTEXT "dpi",IDC_STATIC,235,252,10,8 + LTEXT "ppp",IDC_STATIC,235,252,10,8 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -99,11 +98,11 @@ BEGIN , IDC_STATIC,16,16,220,32 LTEXT "&Nouveau surclassage pour :",IDC_STATIC,16,58,100,8 COMBOBOX IDC_DLLCOMBO,16,68,140,14,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP | CBS_SORT | CBS_LOWERCASE - PUSHBUTTON "&Ajouter surclassage",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON + PUSHBUTTON "&Ajouter",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON LTEXT "Surclassages existants :",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,140,WS_BORDER | WS_TABSTOP | WS_VSCROLL - PUSHBUTTON "&Editer surclassage",IDC_DLLS_EDITDLL,164,96,82,14 - PUSHBUTTON "&Supprimer surclassage",IDC_DLLS_REMOVEDLL,164,114,82,14 + PUSHBUTTON "&Modifier",IDC_DLLS_EDITDLL,164,96,82,14 + PUSHBUTTON "&Supprimer",IDC_DLLS_REMOVEDLL,164,114,82,14 END IDD_LOADORDER DIALOG DISCARDABLE 80, 90, 110, 92 @@ -140,17 +139,17 @@ BEGIN LTEXT "&Type :",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,43,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Label et num�ro de s�rie",IDC_LABELSERIAL_STATIC,15,155,95,10 + LTEXT "�tiquette et num�ro de s�rie",IDC_LABELSERIAL_STATIC,15,155,95,10 PUSHBUTTON "&Affichage avanc�",IDC_BUTTON_SHOW_HIDE_ADVANCED,186,136,60,13 CONTROL "Autod�tection depuis le &lecteur :",IDC_RADIO_AUTODETECT,"Button", BS_AUTORADIOBUTTON,15,166,140,10 EDITTEXT IDC_EDIT_DEVICE,27,176,174,13,ES_AUTOHSCROLL - PUSHBUTTON "Pa&rcourir...",IDC_BUTTON_BROWSE_DEVICE,206,176,40,13 + PUSHBUTTON "&Parcourir...",IDC_BUTTON_BROWSE_DEVICE,206,176,40,13 CONTROL "Assigner &manuellement :",IDC_RADIO_ASSIGN,"Button", BS_AUTORADIOBUTTON,15,195,140,10 - LTEXT "&Label :",IDC_STATIC_LABEL,33,208,40,12 + LTEXT "�&tiquette :",IDC_STATIC_LABEL,33,208,40,12 EDITTEXT IDC_EDIT_LABEL,74,205,67,13,ES_AUTOHSCROLL | WS_TABSTOP LTEXT "N� de s�rie :",IDC_STATIC_SERIAL,33,225,40,12 EDITTEXT IDC_EDIT_SERIAL,74,221,67,13,ES_AUTOHSCROLL | WS_TABSTOP @@ -165,15 +164,16 @@ BEGIN GROUPBOX " S�lection du pilote ",IDC_STATIC,8,4,244,195 LTEXT "S�lectionnez un pilote audio en cochant la case en regard du pilote d�sir�. D�sactivez le son en ne s�lectionnant aucun pilote. La s�lection de pilotes multiples n'est pas recommand�e. Configurez le pilote en effectuant un click droit dessus.",IDC_STATIC,15,20,227,60 CONTROL "Mat�riel",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,60,140,130 - PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,160,60,86,14 + PUSHBUTTON "&Tester le son",IDC_AUDIO_TEST,160,60,86,14 + PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,160,80,86,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Acc�l�ration mat�rielle : ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,50,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Echantillonage (d�faut) :",IDC_STATIC,15,232,130,8 + LTEXT "�chantillonage (d�faut) :",IDC_STATIC,15,232,130,8 COMBOBOX IDC_DSOUND_RATES,100,230,38,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Bits par �chantillon :",IDC_STATIC,153,232,80,8 COMBOBOX IDC_DSOUND_BITS,223,230,25,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Emulation pilote",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 + CONTROL "�mulation pilote",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,250,230,10 END IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Lei Zhang : quartz: Validate input for IFilterGraph_FindFilterByName.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 2d1a6016c9b18fabeb38a6dbe2fcfe82847706d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1a6016c9b18fabeb38a6dbe… Author: Lei Zhang <thestig(a)google.com> Date: Wed Dec 5 20:11:33 2007 -0800 quartz: Validate input for IFilterGraph_FindFilterByName. --- dlls/quartz/filtergraph.c | 4 +++- dlls/quartz/tests/filtergraph.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index e583cee..eb6321b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -483,7 +483,8 @@ static HRESULT WINAPI GraphBuilder_FindFilterByName(IGraphBuilder *iface, TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_w(pName), pName, ppFilter); - *ppFilter = NULL; + if (!ppFilter) + return E_POINTER; for (i = 0; i < This->nFilters; i++) { @@ -495,6 +496,7 @@ static HRESULT WINAPI GraphBuilder_FindFilterByName(IGraphBuilder *iface, } } + *ppFilter = NULL; return VFW_E_NOT_FOUND; } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 85cce7c..4a29edb 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -143,6 +143,8 @@ static void test_graph_builder(void) hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, &pF2); ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned %x\n", hr); ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); + hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); + ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); releasefiltergraph(); }

1 0

Lei Zhang : quartz: Add some IGraphBuilder related tests.
by Alexandre Julliard Dec. 7, 2007

Dec. 7, 2007

Module: wine Branch: master Commit: 646eefaa476995c387f8616a401c4dba6e2fccc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=646eefaa476995c387f8616a4… Author: Lei Zhang <thestig(a)google.com> Date: Wed Dec 5 20:10:54 2007 -0800 quartz: Add some IGraphBuilder related tests. --- dlls/quartz/tests/filtergraph.c | 47 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 8cbae7b..abdaa09 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -102,6 +102,52 @@ static void test_render_run(void) releasefiltergraph(); } +static void test_graph_builder(void) +{ + HRESULT hr; + IBaseFilter *pF = NULL; + IBaseFilter *pF2 = NULL; + IPin *pIn = NULL; + IEnumPins *pEnum = NULL; + PIN_DIRECTION dir; + static const WCHAR testFilterW[] = {'t','e','s','t','F','i','l','t','e','r',0}; + static const WCHAR fooBarW[] = {'f','o','o','B','a','r',0}; + + if (!createfiltergraph()) + return; + + /* create video filter */ + hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (LPVOID*)&pF); + ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); + ok(pF != NULL, "pF is NULL\n"); + + /* add the two filters to the graph */ + hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); + ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); + + /* find the pins */ + hr = IBaseFilter_EnumPins(pF, &pEnum); + ok(hr == S_OK, "IBaseFilter_EnumPins failed for pF: %x\n", hr); + ok(pEnum != NULL, "pEnum is NULL\n"); + hr = IEnumPins_Next(pEnum, 1, &pIn, NULL); + ok(hr == S_OK, "IEnumPins_Next failed for pF: %x\n", hr); + ok(pIn != NULL, "pIn is NULL\n"); + hr = IPin_QueryDirection(pIn, &dir); + ok(hr == S_OK, "IPin_QueryDirection failed: %x\n", hr); + ok(dir == PINDIR_INPUT, "pin has wrong direction\n"); + + hr = IGraphBuilder_FindFilterByName(pgraph, fooBarW, &pF2); + todo_wine { + ok(hr == VFW_E_NOT_FOUND, "IGraphBuilder_FindFilterByName returned %x\n", hr); + } + ok(pF2 == NULL, "IGraphBuilder_FindFilterByName returned %p\n", pF2); + hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, &pF2); + ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned %x\n", hr); + ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); + releasefiltergraph(); +} + static void test_filter_graph2(void) { HRESULT hr; @@ -119,5 +165,6 @@ START_TEST(filtergraph) { CoInitialize(NULL); test_render_run(); + test_graph_builder(); test_filter_graph2(); }

1 0