July 2008 - Wine-commits - list.winehq.org

Maarten Lankhorst : quartz: Use correct media type in transformfilter' s QueryAccept.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 2b452ced743333e8a3ba4a1dc560b5912192d8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b452ced743333e8a3ba4a1dc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 22 04:13:44 2008 -0700 quartz: Use correct media type in transformfilter's QueryAccept. --- dlls/quartz/transform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 5c090c0..6ca4ce1 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -65,7 +65,7 @@ static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TY static HRESULT TransformFilter_Output_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) { TransformFilterImpl* pTransformFilter = (TransformFilterImpl*)iface; - AM_MEDIA_TYPE* outpmt = &((OutputPin*)pTransformFilter->ppPins[1])->pin.mtCurrent; + AM_MEDIA_TYPE* outpmt = &pTransformFilter->pmt; TRACE("%p\n", iface); if (IsEqualIID(&pmt->majortype, &outpmt->majortype) && IsEqualIID(&pmt->subtype, &outpmt->subtype))

1 0

Maarten Lankhorst : uuids: Add MEDIASUBTYPE_AYUV.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 668be5c7578a1b66f78245f1651e85f10644f5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668be5c7578a1b66f78245f16… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Jul 23 13:26:12 2008 -0700 uuids: Add MEDIASUBTYPE_AYUV. --- include/uuids.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/uuids.h b/include/uuids.h index 344957f..54a30fc 100644 --- a/include/uuids.h +++ b/include/uuids.h @@ -45,6 +45,7 @@ OUR_GUID_ENTRY(MEDIASUBTYPE_YVYU, 0x55595659, 0x0000, 0x0010, OUR_GUID_ENTRY(MEDIASUBTYPE_UYVY, 0x59565955, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_Y211, 0x31313259, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_YV12, 0x32315659, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) +OUR_GUID_ENTRY(MEDIASUBTYPE_AYUV, 0x56555941, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_CLJR, 0x524a4c43, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_IF09, 0x39304649, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71) OUR_GUID_ENTRY(MEDIASUBTYPE_CPLA, 0x414c5043, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71)

1 0

Maarten Lankhorst : quartz: Trace the iface pointer in the memory allocator .
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: fa38a7e313afaa04a78c736ed8f82bb379fbebfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa38a7e313afaa04a78c736ed… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jul 28 11:29:18 2008 -0700 quartz: Trace the iface pointer in the memory allocator. --- dlls/quartz/memallocator.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index 2ee8d71..1718d19 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -486,7 +486,7 @@ static HRESULT WINAPI StdMediaSample2_GetPointer(IMediaSample2 * iface, BYTE ** { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p)\n", ppBuffer); + TRACE("(%p)->(%p)\n", iface, ppBuffer); *ppBuffer = This->props.pbBuffer; @@ -513,7 +513,7 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T HRESULT hr; StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p, %p)\n", pStart, pEnd); + TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); if (!(This->props.dwSampleFlags & AM_SAMPLE_TIMEVALID)) hr = VFW_E_SAMPLE_TIME_NOT_SET; @@ -539,7 +539,7 @@ static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_T { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p, %p)\n", pStart, pEnd); + TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); if (pStart) { @@ -564,7 +564,7 @@ static HRESULT WINAPI StdMediaSample2_IsSyncPoint(IMediaSample2 * iface) { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("()\n"); + TRACE("(%p)->()\n", iface); return (This->props.dwSampleFlags & AM_SAMPLE_SPLICEPOINT) ? S_OK : S_FALSE; } @@ -573,7 +573,7 @@ static HRESULT WINAPI StdMediaSample2_SetSyncPoint(IMediaSample2 * iface, BOOL b { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%s)\n", bIsSyncPoint ? "TRUE" : "FALSE"); + TRACE("(%p)->(%s)\n", iface, bIsSyncPoint ? "TRUE" : "FALSE"); if (bIsSyncPoint) This->props.dwSampleFlags |= AM_SAMPLE_SPLICEPOINT; @@ -587,7 +587,7 @@ static HRESULT WINAPI StdMediaSample2_IsPreroll(IMediaSample2 * iface) { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("()\n"); + TRACE("(%p)->()\n", iface); return (This->props.dwSampleFlags & AM_SAMPLE_PREROLL) ? S_OK : S_FALSE; } @@ -596,7 +596,7 @@ static HRESULT WINAPI StdMediaSample2_SetPreroll(IMediaSample2 * iface, BOOL bIs { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%s)\n", bIsPreroll ? "TRUE" : "FALSE"); + TRACE("(%p)->(%s)\n", iface, bIsPreroll ? "TRUE" : "FALSE"); if (bIsPreroll) This->props.dwSampleFlags |= AM_SAMPLE_PREROLL; @@ -610,7 +610,7 @@ static LONG WINAPI StdMediaSample2_GetActualDataLength(IMediaSample2 * iface) { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("()\n"); + TRACE("(%p)->()\n", iface); return This->props.lActual; } @@ -619,7 +619,7 @@ static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface, { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%d)\n", len); + TRACE("(%p)->(%d)\n", iface, len); if ((len > This->props.cbBuffer) || (len < 0)) { @@ -637,7 +637,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaType(IMediaSample2 * iface, AM_MED { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p)\n", ppMediaType); + TRACE("(%p)->(%p)\n", iface, ppMediaType); if (!This->props.pMediaType) { /* Make sure we return a NULL pointer (required by native Quartz dll) */ @@ -656,7 +656,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p)\n", pMediaType); + TRACE("(%p)->(%p)\n", iface, pMediaType); if (This->props.pMediaType) FreeMediaType(This->props.pMediaType); @@ -670,7 +670,7 @@ static HRESULT WINAPI StdMediaSample2_IsDiscontinuity(IMediaSample2 * iface) { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("()\n"); + TRACE("(%p)->()\n", iface); return (This->props.dwSampleFlags & AM_SAMPLE_DATADISCONTINUITY) ? S_OK : S_FALSE; } @@ -679,7 +679,7 @@ static HRESULT WINAPI StdMediaSample2_SetDiscontinuity(IMediaSample2 * iface, BO { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%s)\n", bIsDiscontinuity ? "TRUE" : "FALSE"); + TRACE("(%p)->(%s)\n", iface, bIsDiscontinuity ? "TRUE" : "FALSE"); if (bIsDiscontinuity) This->props.dwSampleFlags |= AM_SAMPLE_DATADISCONTINUITY; @@ -693,7 +693,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p, %p)\n", pStart, pEnd); + TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); if (This->tMediaStart == INVALID_MEDIA_TIME) return VFW_E_MEDIA_TIME_NOT_SET; @@ -708,7 +708,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLO { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%p, %p)\n", pStart, pEnd); + TRACE("(%p)->(%p, %p)\n", iface, pStart, pEnd); if (pStart) This->tMediaStart = *pStart; @@ -727,7 +727,7 @@ static HRESULT WINAPI StdMediaSample2_GetProperties(IMediaSample2 * iface, DWORD { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%d, %p)\n", cbProperties, pbProperties); + TRACE("(%p)->(%d, %p)\n", iface, cbProperties, pbProperties); memcpy(pbProperties, &This->props, min(cbProperties, sizeof(This->props))); @@ -738,7 +738,7 @@ static HRESULT WINAPI StdMediaSample2_SetProperties(IMediaSample2 * iface, DWORD { StdMediaSample2 *This = (StdMediaSample2 *)iface; - TRACE("(%d, %p)\n", cbProperties, pbProperties); + TRACE("(%p)->(%d, %p)\n", iface, cbProperties, pbProperties); /* NOTE: pbBuffer and cbBuffer are read-only */ memcpy(&This->props, pbProperties, min(cbProperties, AM_SAMPLE2_PROP_SIZE_WRITABLE));

1 0

Maarten Lankhorst : qcap: Make the server directly register a filter instead of the workarounds.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 6032ab4f175a21dfb5d49885133cc3a9bd70d0df URL: http://source.winehq.org/git/wine.git/?a=commit;h=6032ab4f175a21dfb5d498851… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 22 14:38:26 2008 -0700 qcap: Make the server directly register a filter instead of the workarounds. --- dlls/qcap/dllsetup.c | 122 +----------------------------------------------- dlls/qcap/dllsetup.h | 11 +---- dlls/qcap/qcap_main.c | 13 ----- 3 files changed, 4 insertions(+), 142 deletions(-) diff --git a/dlls/qcap/dllsetup.c b/dlls/qcap/dllsetup.c index 6aa1478..a732b73 100644 --- a/dlls/qcap/dllsetup.c +++ b/dlls/qcap/dllsetup.c @@ -99,106 +99,6 @@ err_out: } /* - * SetupRegisterFilter through IFilterMapper2 - */ -static HRESULT SetupRegisterFilter2(const AMOVIESETUP_FILTER * const pSetup, - IFilterMapper2 * pIFM2, BOOL bRegister) -{ - HRESULT hr; - - if (NULL == pSetup) - return S_FALSE; - - /* unregister filter */ - hr = IFilterMapper2_UnregisterFilter(pIFM2, 0, 0, pSetup->clsID); - - if (bRegister) - { - REGFILTER2 rf2; - rf2.dwVersion = 1; - rf2.dwMerit = pSetup->dwMerit; - rf2.u.s.cPins = pSetup->nPins; - rf2.u.s.rgPins = pSetup->lpPin; - - /* register filter */ - hr = IFilterMapper2_RegisterFilter(pIFM2, pSetup->clsID, - pSetup->strName, 0, 0, NULL, &rf2); - } - else - { - /* filter not found is ignored here, - but there is no #define for 0x80070002 */ - if (HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) == hr) - hr = NOERROR; - } - return hr; -} - -/* - * SetupRegisterFilter through IFilterMapper - */ -static HRESULT SetupRegisterFilter(const AMOVIESETUP_FILTER * const pSetup, - IFilterMapper * pIFM, BOOL bRegister) -{ - HRESULT hr; - - if (NULL == pSetup) - return S_FALSE; - - /* unregister filter */ - hr = IFilterMapper_UnregisterFilter(pIFM, *pSetup->clsID); - - if (bRegister) - { - /* register filter */ - hr = IFilterMapper_RegisterFilter(pIFM, *pSetup->clsID, - pSetup->strName, pSetup->dwMerit); - if (SUCCEEDED(hr)) - { - const AMOVIESETUP_PIN *lpPin = pSetup->lpPin; - const AMOVIESETUP_MEDIATYPE *lpType; - UINT i, j; - - for (i = 0; i < pSetup->nPins; i++, lpPin++) - { - hr = IFilterMapper_RegisterPin(pIFM, *(pSetup->clsID), - lpPin->strName, - lpPin->bRendered, - lpPin->bOutput, - lpPin->bZero, - lpPin->bMany, - *(lpPin->clsConnectsToFilter), - lpPin->strConnectsToPin); - - if (SUCCEEDED(hr)) - { - lpType = lpPin->lpMediaType; - - /* and each pin's media types */ - for (j = 0; j < lpPin->nMediaTypes; j++, lpType++) - { - hr = IFilterMapper_RegisterPinType(pIFM, *(pSetup->clsID), - lpPin->strName, - *(lpType->clsMajorType), - *(lpType->clsMinorType)); - if (FAILED(hr)) break; - } - if (FAILED(hr)) break; - } - if (FAILED(hr)) break; - } - } - } - else - { - /* filter not registered is ignored here, there is no definition for 0x80070002 */ - if (HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) == hr) - hr = NOERROR; - } - return hr; -} - -/* * RegisterAllClasses() */ static HRESULT SetupRegisterAllClasses(const CFactoryTemplate * pList, int num, @@ -246,7 +146,6 @@ HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, static const WCHAR szFileName[] = {'q','c','a','p','.','d','l','l',0}; HRESULT hr = NOERROR; IFilterMapper2 *pIFM2 = NULL; - IFilterMapper *pIFM = NULL; /* first register all server classes, just to make sure */ if (bRegister) @@ -260,13 +159,6 @@ HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, TRACE("Getting IFilterMapper2\r\n"); hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&pIFM2); - if (FAILED(hr)) - { - TRACE("- trying IFilterMapper instead\r\n"); - - hr = CoCreateInstance(&CLSID_FilterMapper, NULL, CLSCTX_INPROC_SERVER, - &IID_IFilterMapper, (void **)&pIFM); - } if (SUCCEEDED(hr)) { @@ -275,14 +167,9 @@ HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, /* scan through array of CFactoryTemplates registering all filters */ for (i = 0; i < num; i++, pList++) { - if (NULL != pList->m_pAMovieSetup_Filter) + if (pList->m_pAMovieSetup_Filter.dwVersion) { - if (pIFM2) - hr = SetupRegisterFilter2(pList->m_pAMovieSetup_Filter, - pIFM2, bRegister); - else - hr = SetupRegisterFilter(pList->m_pAMovieSetup_Filter, - pIFM, bRegister); + hr = IFilterMapper2_RegisterFilter(pIFM2, pList->m_ClsID, pList->m_Name, NULL, &CLSID_LegacyAmFilterCategory, NULL, &pList->m_pAMovieSetup_Filter); } /* check final error for this pass and break loop if we failed */ @@ -291,10 +178,7 @@ HRESULT SetupRegisterServers(const CFactoryTemplate * pList, int num, } /* release interface */ - if (pIFM2) - IFilterMapper2_Release(pIFM2); - else - IFilterMapper_Release(pIFM); + IFilterMapper2_Release(pIFM2); } /* and clear up */ diff --git a/dlls/qcap/dllsetup.h b/dlls/qcap/dllsetup.h index 4b587ac..d582b74 100644 --- a/dlls/qcap/dllsetup.h +++ b/dlls/qcap/dllsetup.h @@ -35,15 +35,6 @@ typedef REGFILTERPINS AMOVIESETUP_PIN, * PAMOVIESETUP_PIN, * LPAMOVIESETUP_PIN; -typedef struct _AMOVIESETUP_FILTER -{ - const CLSID *clsID; - const WCHAR *strName; - DWORD dwMerit; - UINT nPins; - const AMOVIESETUP_PIN *lpPin; -} AMOVIESETUP_FILTER, * PAMOVIESETUP_FILTER, * LPAMOVIESETUP_FILTER; - /* This needs to go into Combase.h */ typedef IUnknown *(CALLBACK *LPFNNewCOMObject)(LPUNKNOWN pUnkOuter, HRESULT *phr); typedef void (CALLBACK *LPFNInitRoutine)(BOOL bLoading, const CLSID *rclsid); @@ -53,7 +44,7 @@ typedef struct tagCFactoryTemplate { const CLSID *m_ClsID; LPFNNewCOMObject m_lpfnNew; LPFNInitRoutine m_lpfnInit; - const AMOVIESETUP_FILTER *m_pAMovieSetup_Filter; + const REGFILTER2 m_pAMovieSetup_Filter; } CFactoryTemplate; /**************************************************************************** diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 0d29f58..e5c9e3b 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -83,79 +83,66 @@ static CFactoryTemplate const g_cTemplates[] = { wAudioCaptureFilter, &CLSID_AudioCaptureFilter, QCAP_createAudioCaptureFilter, - NULL, NULL },{ wAVICompressor, &CLSID_AVICompressor, QCAP_createAVICompressor, - NULL, NULL },*/{ wVFWCaptFilter, &CLSID_VfwCapture, QCAP_createVFWCaptureFilter, - NULL, NULL },/*{ wVFWCaptFilterProp, &CLSID_VFWCaptureFilterPropertyPage, QCAP_createVFWCaptureFilterPropertyPage, - NULL, NULL },{ wAVIMux, &CLSID_AVImux, QCAP_createAVImux, - NULL, NULL },{ wAVIMuxPropPage, &CLSID_AVImuxPropertyPage, QCAP_createAVImuxPropertyPage, - NULL, NULL },{ wAVIMuxPropPage1, &CLSID_AVImuxPropertyPage1, QCAP_createAVImuxPropertyPage1, - NULL, NULL },{ wFileWriter, &CLSID_FileWriter, QCAP_createFileWriter, - NULL, NULL },*/{ wCaptGraphBuilder, &CLSID_CaptureGraphBuilder, QCAP_createCaptureGraphBuilder2, - NULL, NULL },{ wCaptGraphBuilder2, &CLSID_CaptureGraphBuilder2, QCAP_createCaptureGraphBuilder2, - NULL, NULL }/*,{ wInfPinTeeFilter, &CLSID_InfinitePinTeeFilter, QCAP_createInfinitePinTeeFilter, - NULL, NULL },{ wSmartTeeFilter, &CLSID_SmartTeeFilter, QCAP_createSmartTeeFilter, - NULL, NULL },{ wAudioInMixerProp, &CLSID_AudioInputMixerPropertyPage, QCAP_createAudioInputMixerPropertyPage, - NULL, NULL }*/ };

1 0

Juan Lang : crypt32: Add tests for CryptHashMessage.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: e0d28c89f05878d058709a1b177e87dc672bb7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d28c89f05878d058709a1b1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 28 13:27:19 2008 -0700 crypt32: Add tests for CryptHashMessage. --- dlls/crypt32/tests/message.c | 178 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 177 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 459dcdc..fc2a842 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -1,7 +1,7 @@ /* * Unit test suite for crypt32.dll's Crypt*Message functions * - * Copyright 2007 Juan Lang + * Copyright 2007-2008 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -237,8 +237,184 @@ static void test_verify_message_signature(void) ok(!ret, "Expected failure\n"); } +static const BYTE detachedHashBlob[] = { +0x30,0x3f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x32, +0x30,0x30,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0x04,0x10,0x2d,0x1b,0xbc,0x1f,0xc7,0xab,0x36,0x8d,0xdb,0x95,0xe6, +0x24,0xb9,0x66,0x7c,0x21 }; +static const BYTE hashBlob[] = { +0x30,0x47,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x05,0xa0,0x3a, +0x30,0x38,0x02,0x01,0x00,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x02,0x05,0x05,0x00,0x30,0x13,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01, +0x07,0x01,0xa0,0x06,0x04,0x04,0xde,0xad,0xbe,0xef,0x04,0x10,0x2f,0x24,0x92, +0x30,0xa8,0xe7,0xc2,0xbf,0x60,0x05,0xcc,0xd2,0x67,0x92,0x59,0xec }; +static const BYTE hashVal[] = { +0x2d,0x1b,0xbc,0x1f,0xc7,0xab,0x36,0x8d,0xdb,0x95,0xe6,0x24,0xb9,0x66,0x7c, +0x21 }; + +static void test_hash_message(void) +{ + BOOL ret; + CRYPT_HASH_MESSAGE_PARA para; + static const BYTE blob1[] = { 0xde, 0xad, 0xbe, 0xef }; + static const BYTE blob2[] = { 0xba, 0xad, 0xf0, 0x0d }; + const BYTE *toHash[] = { blob1, blob2 }; + DWORD hashSize[] = { sizeof(blob1), sizeof(blob2) }; + DWORD hashedBlobSize, computedHashSize; + static char oid_rsa_md5[] = szOID_RSA_MD5; + LPBYTE hashedBlob, computedHash; + + /* Crash + ret = CryptHashMessage(NULL, FALSE, 0, NULL, 0, NULL, NULL, NULL, NULL); + */ + memset(&para, 0, sizeof(para)); + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got 0x%08x\n", GetLastError()); + para.cbSize = sizeof(para); + /* Not quite sure what "success" means in this case, but it does succeed */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + /* With a bogus encoding type it "succeeds" */ + para.dwMsgEncodingType = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + /* According to MSDN, the third parameter (cToBeHashed) must be 1 if the + * second parameter (fDetached) is FALSE, but again it "succeeds." + */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + /* Even passing parameters to hash results in "success." */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, NULL, NULL, + NULL); + /* Try again with a valid encoding type */ + para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, NULL, NULL, NULL, NULL, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + /* And with valid data to hash */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, NULL, NULL, + NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + /* But requesting the size of the hashed blob and indicating there's data + * to hash results in a crash + */ + if (0) + { + ret = CryptHashMessage(&para, FALSE, 2, NULL, NULL, NULL, + &hashedBlobSize, NULL, NULL); + } + /* Passing a valid pointer for the data to hash fails, as the hash + * algorithm is finally checked. + */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, + &hashedBlobSize, NULL, NULL); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_UNKNOWN_ALGO, + "expected CRYPT_E_UNKNOWN_ALGO, got 0x%08x (%d)\n", GetLastError(), + GetLastError()); + para.HashAlgorithm.pszObjId = oid_rsa_md5; + /* With a valid hash algorithm, this succeeds, even though fDetached is + * FALSE. + */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, + &hashedBlobSize, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + if (ret) + { + /* Actually attempting to get the hashed data fails, perhaps because + * detached is FALSE. + */ + hashedBlob = HeapAlloc(GetProcessHeap(), 0, hashedBlobSize); + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, hashedBlob, + &hashedBlobSize, NULL, NULL); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got 0x%08x (%d)\n", GetLastError(), + GetLastError()); + HeapFree(GetProcessHeap(), 0, hashedBlob); + } + /* Repeating tests with fDetached = TRUE results in success */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, TRUE, 2, toHash, hashSize, NULL, + &hashedBlobSize, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + if (ret) + { + hashedBlob = HeapAlloc(GetProcessHeap(), 0, hashedBlobSize); + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, TRUE, 2, toHash, hashSize, hashedBlob, + &hashedBlobSize, NULL, NULL); + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + ok(hashedBlobSize == sizeof(detachedHashBlob), + "unexpected size of detached blob %d\n", hashedBlobSize); + ok(!memcmp(hashedBlob, detachedHashBlob, hashedBlobSize), + "unexpected detached blob value\n"); + HeapFree(GetProcessHeap(), 0, hashedBlob); + } + /* Hashing a single item with fDetached = FALSE also succeeds */ + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, FALSE, 1, toHash, hashSize, NULL, + &hashedBlobSize, NULL, NULL); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + if (ret) + { + hashedBlob = HeapAlloc(GetProcessHeap(), 0, hashedBlobSize); + ret = CryptHashMessage(&para, FALSE, 1, toHash, hashSize, hashedBlob, + &hashedBlobSize, NULL, NULL); + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + ok(hashedBlobSize == sizeof(hashBlob), + "unexpected size of detached blob %d\n", hashedBlobSize); + ok(!memcmp(hashedBlob, hashBlob, hashedBlobSize), + "unexpected detached blob value\n"); + HeapFree(GetProcessHeap(), 0, hashedBlob); + } + /* Check the computed hash value too. You don't need to get the encoded + * blob to get it. + */ + computedHashSize = 0xdeadbeef; + ret = CryptHashMessage(&para, TRUE, 2, toHash, hashSize, NULL, + &hashedBlobSize, NULL, &computedHashSize); + todo_wine + ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); + todo_wine + ok(computedHashSize == 16, "expected hash size of 16, got %d\n", + computedHashSize); + if (ret) + { + computedHash = HeapAlloc(GetProcessHeap(), 0, computedHashSize); + SetLastError(0xdeadbeef); + ret = CryptHashMessage(&para, TRUE, 2, toHash, hashSize, NULL, + &hashedBlobSize, computedHash, &computedHashSize); + ok(computedHashSize == sizeof(hashVal), + "unexpected size of hash value %d\n", computedHashSize); + ok(!memcmp(computedHash, hashVal, computedHashSize), + "unexpected value\n"); + HeapFree(GetProcessHeap(), 0, computedHash); + } +} + START_TEST(message) { test_msg_get_signer_count(); test_verify_message_signature(); + test_hash_message(); }

1 0

Juan Lang : crypt32: Implement CryptHashMessage.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 2849333f25176e0acba7c255b814fe7a72f66ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2849333f25176e0acba7c255b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 28 13:27:45 2008 -0700 crypt32: Implement CryptHashMessage. --- dlls/crypt32/message.c | 54 ++++++++++++++++++++++++++++++++++++++---- dlls/crypt32/tests/message.c | 11 -------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 5e82708..fe4d4ec 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -218,9 +218,53 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, DWORD rgcbToBeHashed[], BYTE *pbHashedBlob, DWORD *pcbHashedBlob, BYTE *pbComputedHash, DWORD *pcbComputedHash) { - FIXME("(%p, %d, %d, %p, %p, %p, %p, %p, %p): stub\n", pHashPara, - fDetachedHash, cToBeHashed, rgpbToBeHashed, rgcbToBeHashed, pbHashedBlob, - pcbHashedBlob, pbComputedHash, pcbComputedHash); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + DWORD i, flags; + BOOL ret = FALSE; + HCRYPTMSG msg; + CMSG_HASHED_ENCODE_INFO info; + + TRACE("(%p, %d, %d, %p, %p, %p, %p, %p, %p)\n", pHashPara, fDetachedHash, + cToBeHashed, rgpbToBeHashed, rgcbToBeHashed, pbHashedBlob, pcbHashedBlob, + pbComputedHash, pcbComputedHash); + + if (pHashPara->cbSize != sizeof(CRYPT_HASH_MESSAGE_PARA)) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + /* Native seems to ignore any encoding type other than the expected + * PKCS_7_ASN_ENCODING + */ + if (GET_CMSG_ENCODING_TYPE(pHashPara->dwMsgEncodingType) != + PKCS_7_ASN_ENCODING) + return TRUE; + /* Native also seems to do nothing if the output parameter isn't given */ + if (!pcbHashedBlob) + return TRUE; + + flags = fDetachedHash ? CMSG_DETACHED_FLAG : 0; + memset(&info, 0, sizeof(info)); + info.cbSize = sizeof(info); + info.hCryptProv = pHashPara->hCryptProv; + memcpy(&info.HashAlgorithm, &pHashPara->HashAlgorithm, + sizeof(info.HashAlgorithm)); + info.pvHashAuxInfo = pHashPara->pvHashAuxInfo; + msg = CryptMsgOpenToEncode(pHashPara->dwMsgEncodingType, flags, CMSG_HASHED, + &info, NULL, NULL); + if (msg) + { + for (i = 0, ret = TRUE; ret && i < cToBeHashed; i++) + ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i], + i == cToBeHashed - 1 ? TRUE : FALSE); + if (ret) + { + ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbHashedBlob, + pcbHashedBlob); + if (ret && pcbComputedHash) + ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, + pbComputedHash, pcbComputedHash); + } + CryptMsgClose(msg); + } + return ret; } diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index fc2a842..11b8c1c 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -271,27 +271,23 @@ static void test_hash_message(void) memset(&para, 0, sizeof(para)); SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", GetLastError()); para.cbSize = sizeof(para); /* Not quite sure what "success" means in this case, but it does succeed */ SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); /* With a bogus encoding type it "succeeds" */ para.dwMsgEncodingType = 0xdeadbeef; SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 0, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); /* According to MSDN, the third parameter (cToBeHashed) must be 1 if the * second parameter (fDetached) is FALSE, but again it "succeeds." */ SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 2, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); /* Even passing parameters to hash results in "success." */ SetLastError(0xdeadbeef); @@ -301,13 +297,11 @@ static void test_hash_message(void) para.dwMsgEncodingType = PKCS_7_ASN_ENCODING; SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 2, NULL, NULL, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); /* And with valid data to hash */ SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, NULL, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); /* But requesting the size of the hashed blob and indicating there's data * to hash results in a crash @@ -323,7 +317,6 @@ static void test_hash_message(void) SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 2, toHash, hashSize, NULL, &hashedBlobSize, NULL, NULL); - todo_wine ok(!ret && GetLastError() == CRYPT_E_UNKNOWN_ALGO, "expected CRYPT_E_UNKNOWN_ALGO, got 0x%08x (%d)\n", GetLastError(), GetLastError()); @@ -354,7 +347,6 @@ static void test_hash_message(void) SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, TRUE, 2, toHash, hashSize, NULL, &hashedBlobSize, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); if (ret) { @@ -373,7 +365,6 @@ static void test_hash_message(void) SetLastError(0xdeadbeef); ret = CryptHashMessage(&para, FALSE, 1, toHash, hashSize, NULL, &hashedBlobSize, NULL, NULL); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); if (ret) { @@ -393,9 +384,7 @@ static void test_hash_message(void) computedHashSize = 0xdeadbeef; ret = CryptHashMessage(&para, TRUE, 2, toHash, hashSize, NULL, &hashedBlobSize, NULL, &computedHashSize); - todo_wine ok(ret, "CryptHashMessage failed: 0x%08x\n", GetLastError()); - todo_wine ok(computedHashSize == 16, "expected hash size of 16, got %d\n", computedHashSize); if (ret)

1 0

Juan Lang : crypt32: Move simplified message functions to their own file.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: c1a69ee36d4b57c08bd4c1a84e0e2bac89d709b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a69ee36d4b57c08bd4c1a84… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 28 13:16:23 2008 -0700 crypt32: Move simplified message functions to their own file. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/message.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/msg.c | 167 ------------------------------------ 3 files changed, 215 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a69ee36d4b57c08bd4c…

1 0

Juan Lang : crypt32: Move simplified message tests to their own file.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: bca6cbcea70e6b09e4bc7019e01b60ac50d8abc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca6cbcea70e6b09e4bc7019e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 28 13:25:44 2008 -0700 crypt32: Move simplified message tests to their own file. --- dlls/crypt32/tests/Makefile.in | 1 + dlls/crypt32/tests/message.c | 244 ++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/msg.c | 180 ----------------------------- 3 files changed, 245 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bca6cbcea70e6b09e4bc7…

1 0

Juan Lang : crypt32: Add stub for CryptHashMessage.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 628d773ebde49a948d7060188741212f58ca4350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=628d773ebde49a948d7060188… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 28 13:26:09 2008 -0700 crypt32: Add stub for CryptHashMessage. --- dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/message.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index b7f45d0..a5ef37d 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -129,7 +129,7 @@ @ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) @ stdcall CryptHashCertificate(long long long ptr long ptr ptr) -@ stub CryptHashMessage +@ stdcall CryptHashMessage(ptr long long ptr ptr ptr ptr ptr ptr) @ stdcall CryptHashPublicKeyInfo(long long long long ptr ptr ptr) @ stub CryptHashToBeSigned @ stub CryptImportPKCS8 diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c index 1a32969..5e82708 100644 --- a/dlls/crypt32/message.c +++ b/dlls/crypt32/message.c @@ -212,3 +212,15 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, TRACE("returning %d\n", ret); return ret; } + +BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara, + BOOL fDetachedHash, DWORD cToBeHashed, const BYTE *rgpbToBeHashed[], + DWORD rgcbToBeHashed[], BYTE *pbHashedBlob, DWORD *pcbHashedBlob, + BYTE *pbComputedHash, DWORD *pcbComputedHash) +{ + FIXME("(%p, %d, %d, %p, %p, %p, %p, %p, %p): stub\n", pHashPara, + fDetachedHash, cToBeHashed, rgpbToBeHashed, rgcbToBeHashed, pbHashedBlob, + pcbHashedBlob, pbComputedHash, pcbComputedHash); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Jacek Caban : mshtml: Forward IHTMLTextContainer:: get_scrollTop to IHTMLElement2.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 985115d804ba62893fbc82307686f964ede10198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=985115d804ba62893fbc82307… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 22:02:45 2008 +0200 mshtml: Forward IHTMLTextContainer::get_scrollTop to IHTMLElement2. --- dlls/mshtml/htmltextcont.c | 6 ++++-- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmltextcont.c b/dlls/mshtml/htmltextcont.c index c5141bc..212784c 100644 --- a/dlls/mshtml/htmltextcont.c +++ b/dlls/mshtml/htmltextcont.c @@ -128,8 +128,10 @@ static HRESULT WINAPI HTMLTextContainer_put_scrollTop(IHTMLTextContainer *iface, static HRESULT WINAPI HTMLTextContainer_get_scrollTop(IHTMLTextContainer *iface, long *p) { HTMLTextContainer *This = HTMLTEXTCONT_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement2_get_scrollTop(HTMLELEM2(&This->element), p); } static HRESULT WINAPI HTMLTextContainer_put_scrollLeft(IHTMLTextContainer *iface, long v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 13fcfa2..ecdc0c6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1018,13 +1018,22 @@ static long _elem_get_scroll_width(unsigned line, IUnknown *unk) static long _elem_get_scroll_top(unsigned line, IUnknown *unk) { IHTMLElement2 *elem = _get_elem2_iface(line, unk); - long l = -1; + IHTMLTextContainer *txtcont; + long l = -1, l2 = -1; HRESULT hres; hres = IHTMLElement2_get_scrollTop(elem, &l); ok_(__FILE__,line) (hres == S_OK, "get_scrollTop failed: %08x\n", hres); IHTMLElement2_Release(elem); + hres = IUnknown_QueryInterface(unk, &IID_IHTMLTextContainer, (void**)&txtcont); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLTextContainer: %08x\n", hres); + + hres = IHTMLTextContainer_get_scrollTop(txtcont, &l2); + IHTMLTextContainer_Release(txtcont); + ok_(__FILE__,line) (hres == S_OK, "IHTMLTextContainer::get_scrollTop failed: %ld\n", l2); + ok_(__FILE__,line) (l == l2, "unexpected top %ld, expected %ld\n", l2, l); + return l; }

1 0