February 2011 - Wine-commits

Andrew Nguyen : dxdiagn: Add code to create stub containers for DxDiag_DirectSound.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 827ce16286c797e054bdb0494352f33398e4daeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=827ce16286c797e054bdb0494… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:14:35 2011 -0600 dxdiagn: Add code to create stub containers for DxDiag_DirectSound. --- dlls/dxdiagn/provider.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 02855bb..dfb892a 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1210,6 +1210,23 @@ cleanup: static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { + static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; + static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; + + IDxDiagContainerImpl_Container *cont; + + cont = allocate_information_node(DxDiag_SoundDevices); + if (!cont) + return E_OUTOFMEMORY; + + add_subcontainer(node, cont); + + cont = allocate_information_node(DxDiag_SoundCaptureDevices); + if (!cont) + return E_OUTOFMEMORY; + + add_subcontainer(node, cont); + return S_OK; }

1 0

Andrew Nguyen : dxdiagn: Add code that populates the DxDiag_DirectXFiles container.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 606f428275fb3f209795dd25db0c3fef7240e9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=606f428275fb3f209795dd25d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:14:45 2011 -0600 dxdiagn: Add code that populates the DxDiag_DirectXFiles container. --- dlls/dxdiagn/provider.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 162 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index dfb892a..c61555e 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1250,8 +1250,170 @@ static HRESULT build_systemdevices_tree(IDxDiagContainerImpl_Container *node) return S_OK; } +static HRESULT fill_file_description(IDxDiagContainerImpl_Container *node, const WCHAR *szFilePath, const WCHAR *szFileName) +{ + static const WCHAR szSlashSep[] = {'\\',0}; + static const WCHAR szPath[] = {'s','z','P','a','t','h',0}; + static const WCHAR szName[] = {'s','z','N','a','m','e',0}; + static const WCHAR szVersion[] = {'s','z','V','e','r','s','i','o','n',0}; + static const WCHAR szAttributes[] = {'s','z','A','t','t','r','i','b','u','t','e','s',0}; + static const WCHAR szLanguageEnglish[] = {'s','z','L','a','n','g','u','a','g','e','E','n','g','l','i','s','h',0}; + static const WCHAR dwFileTimeHigh[] = {'d','w','F','i','l','e','T','i','m','e','H','i','g','h',0}; + static const WCHAR dwFileTimeLow[] = {'d','w','F','i','l','e','T','i','m','e','L','o','w',0}; + static const WCHAR bBeta[] = {'b','B','e','t','a',0}; + static const WCHAR bDebug[] = {'b','D','e','b','u','g',0}; + static const WCHAR bExists[] = {'b','E','x','i','s','t','s',0}; + + /* Values */ + static const WCHAR szFinal_Retail_v[] = {'F','i','n','a','l',' ','R','e','t','a','i','l',0}; + static const WCHAR szEnglish_v[] = {'E','n','g','l','i','s','h',0}; + static const WCHAR szVersionFormat[] = {'%','u','.','%','0','2','u','.','%','0','4','u','.','%','0','4','u',0}; + + HRESULT hr; + WCHAR *szFile; + WCHAR szVersion_v[1024]; + DWORD retval, hdl; + void *pVersionInfo = NULL; + BOOL boolret = FALSE; + UINT uiLength; + VS_FIXEDFILEINFO *pFileInfo; + + szFile = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(szFilePath) + + lstrlenW(szFileName) + 2 /* slash + terminator */)); + if (!szFile) + return E_OUTOFMEMORY; + + lstrcpyW(szFile, szFilePath); + lstrcatW(szFile, szSlashSep); + lstrcatW(szFile, szFileName); + + retval = GetFileVersionInfoSizeW(szFile, &hdl); + if (retval) + { + pVersionInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, retval); + if (!pVersionInfo) + { + hr = E_OUTOFMEMORY; + goto cleanup; + } + + if (GetFileVersionInfoW(szFile, 0, retval, pVersionInfo) && + VerQueryValueW(pVersionInfo, szSlashSep, (void **)&pFileInfo, &uiLength)) + boolret = TRUE; + } + + hr = add_bstr_property(node, szPath, szFile); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(node, szName, szFileName); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(node, bExists, boolret); + if (FAILED(hr)) + goto cleanup; + + if (boolret) + { + snprintfW(szVersion_v, sizeof(szVersion_v)/sizeof(szVersion_v[0]), + szVersionFormat, + HIWORD(pFileInfo->dwFileVersionMS), + LOWORD(pFileInfo->dwFileVersionMS), + HIWORD(pFileInfo->dwFileVersionLS), + LOWORD(pFileInfo->dwFileVersionLS)); + + hr = add_bstr_property(node, szVersion, szVersion_v); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(node, szAttributes, szFinal_Retail_v); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(node, szLanguageEnglish, szEnglish_v); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(node, dwFileTimeHigh, pFileInfo->dwFileDateMS); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(node, dwFileTimeLow, pFileInfo->dwFileDateLS); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(node, bBeta, ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_PRERELEASE) != 0); + if (FAILED(hr)) + goto cleanup; + + hr = add_bool_property(node, bDebug, ((pFileInfo->dwFileFlags & pFileInfo->dwFileFlagsMask) & VS_FF_DEBUG) != 0); + if (FAILED(hr)) + goto cleanup; + } + + hr = S_OK; +cleanup: + HeapFree(GetProcessHeap(), 0, pVersionInfo); + HeapFree(GetProcessHeap(), 0, szFile); + + return hr; +} static HRESULT build_directxfiles_tree(IDxDiagContainerImpl_Container *node) { + static const WCHAR dlls[][15] = + { + {'d','3','d','8','.','d','l','l',0}, + {'d','3','d','9','.','d','l','l',0}, + {'d','d','r','a','w','.','d','l','l',0}, + {'d','e','v','e','n','u','m','.','d','l','l',0}, + {'d','i','n','p','u','t','8','.','d','l','l',0}, + {'d','i','n','p','u','t','.','d','l','l',0}, + {'d','m','b','a','n','d','.','d','l','l',0}, + {'d','m','c','o','m','p','o','s','.','d','l','l',0}, + {'d','m','i','m','e','.','d','l','l',0}, + {'d','m','l','o','a','d','e','r','.','d','l','l',0}, + {'d','m','s','c','r','i','p','t','.','d','l','l',0}, + {'d','m','s','t','y','l','e','.','d','l','l',0}, + {'d','m','s','y','n','t','h','.','d','l','l',0}, + {'d','m','u','s','i','c','.','d','l','l',0}, + {'d','p','l','a','y','x','.','d','l','l',0}, + {'d','p','n','e','t','.','d','l','l',0}, + {'d','s','o','u','n','d','.','d','l','l',0}, + {'d','s','w','a','v','e','.','d','l','l',0}, + {'d','x','d','i','a','g','n','.','d','l','l',0}, + {'q','u','a','r','t','z','.','d','l','l',0} + }; + + HRESULT hr; + WCHAR szFilePath[MAX_PATH]; + INT i; + + GetSystemDirectoryW(szFilePath, MAX_PATH); + + for (i = 0; i < sizeof(dlls) / sizeof(dlls[0]); i++) + { + static const WCHAR szFormat[] = {'%','d',0}; + + WCHAR szFileID[5]; + IDxDiagContainerImpl_Container *file_container; + + snprintfW(szFileID, sizeof(szFileID)/sizeof(szFileID[0]), szFormat, i); + + file_container = allocate_information_node(szFileID); + if (!file_container) + return E_OUTOFMEMORY; + + hr = fill_file_description(file_container, szFilePath, dlls[i]); + if (FAILED(hr)) + { + free_information_tree(file_container); + continue; + } + + add_subcontainer(node, file_container); + } + return S_OK; }

1 0

Andrew Nguyen : dxdiagn: Add code that populates the DxDiag_DirectShowFilters container.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 5ae57265c59a35931cf055876ec44e87ab11dcfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ae57265c59a35931cf055876… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:14:53 2011 -0600 dxdiagn: Add code that populates the DxDiag_DirectShowFilters container. --- dlls/dxdiagn/provider.c | 271 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 270 insertions(+), 1 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index c61555e..5eafefd 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1417,11 +1417,280 @@ static HRESULT build_directxfiles_tree(IDxDiagContainerImpl_Container *node) return S_OK; } -static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node) +static HRESULT read_property_names(IPropertyBag *pPropBag, VARIANT *friendly_name, VARIANT *clsid_name) { + static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; + static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; + + HRESULT hr; + + VariantInit(friendly_name); + VariantInit(clsid_name); + + hr = IPropertyBag_Read(pPropBag, wszFriendlyName, friendly_name, 0); + if (FAILED(hr)) + return hr; + + hr = IPropertyBag_Read(pPropBag, wszClsidName, clsid_name, 0); + if (FAILED(hr)) + { + VariantClear(friendly_name); + return hr; + } + return S_OK; } +static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subcont, BYTE *pData, ULONG cb) +{ + static const WCHAR szVersionW[] = {'s','z','V','e','r','s','i','o','n',0}; + static const WCHAR dwInputs[] = {'d','w','I','n','p','u','t','s',0}; + static const WCHAR dwOutputs[] = {'d','w','O','u','t','p','u','t','s',0}; + static const WCHAR dwMeritW[] = {'d','w','M','e','r','i','t',0}; + static const WCHAR szVersionFormat[] = {'v','%','d',0}; + + HRESULT hr; + IFilterMapper2 *pFileMapper = NULL; + IAMFilterData *pFilterData = NULL; + REGFILTER2 *pRF = NULL; + WCHAR bufferW[10]; + ULONG j; + DWORD dwNOutputs = 0; + DWORD dwNInputs = 0; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC, &IID_IFilterMapper2, + (void **)&pFileMapper); + if (FAILED(hr)) + return hr; + + hr = IFilterMapper2_QueryInterface(pFileMapper, &IID_IAMFilterData, (void **)&pFilterData); + if (FAILED(hr)) + goto cleanup; + + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&pRF); + if (FAILED(hr)) + goto cleanup; + + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); + hr = add_bstr_property(subcont, szVersionW, bufferW); + if (FAILED(hr)) + goto cleanup; + + if (pRF->dwVersion == 1) + { + for (j = 0; j < pRF->u.s.cPins; j++) + if (pRF->u.s.rgPins[j].bOutput) + dwNOutputs++; + else + dwNInputs++; + } + else if (pRF->dwVersion == 2) + { + for (j = 0; j < pRF->u.s1.cPins2; j++) + if (pRF->u.s1.rgPins2[j].dwFlags & REG_PINFLAG_B_OUTPUT) + dwNOutputs++; + else + dwNInputs++; + } + + hr = add_ui4_property(subcont, dwInputs, dwNInputs); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(subcont, dwOutputs, dwNOutputs); + if (FAILED(hr)) + goto cleanup; + + hr = add_ui4_property(subcont, dwMeritW, pRF->dwMerit); + if (FAILED(hr)) + goto cleanup; + + hr = S_OK; +cleanup: + CoTaskMemFree(pRF); + if (pFilterData) IAMFilterData_Release(pFilterData); + if (pFileMapper) IFilterMapper2_Release(pFileMapper); + + return hr; +} + +static HRESULT fill_filter_container(IDxDiagContainerImpl_Container *subcont, IMoniker *pMoniker) +{ + static const WCHAR szName[] = {'s','z','N','a','m','e',0}; + static const WCHAR ClsidFilterW[] = {'C','l','s','i','d','F','i','l','t','e','r',0}; + static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a',0}; + + HRESULT hr; + IPropertyBag *pPropFilterBag = NULL; + BYTE *pData; + VARIANT friendly_name; + VARIANT clsid_name; + VARIANT v; + + VariantInit(&friendly_name); + VariantInit(&clsid_name); + VariantInit(&v); + + hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, (void **)&pPropFilterBag); + if (FAILED(hr)) + return hr; + + hr = read_property_names(pPropFilterBag, &friendly_name, &clsid_name); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(subcont, szName, V_BSTR(&friendly_name)); + if (FAILED(hr)) + goto cleanup; + + hr = add_bstr_property(subcont, ClsidFilterW, V_BSTR(&clsid_name)); + if (FAILED(hr)) + goto cleanup; + + hr = IPropertyBag_Read(pPropFilterBag, wszFilterDataName, &v, NULL); + if (FAILED(hr)) + goto cleanup; + + hr = SafeArrayAccessData(V_ARRAY(&v), (void **)&pData); + if (FAILED(hr)) + goto cleanup; + + hr = fill_filter_data_information(subcont, pData, V_ARRAY(&v)->rgsabound->cElements); + SafeArrayUnaccessData(V_ARRAY(&v)); + if (FAILED(hr)) + goto cleanup; + + hr = S_OK; +cleanup: + VariantClear(&v); + VariantClear(&clsid_name); + VariantClear(&friendly_name); + if (pPropFilterBag) IPropertyBag_Release(pPropFilterBag); + + return hr; +} + +static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node) +{ + static const WCHAR szCatName[] = {'s','z','C','a','t','N','a','m','e',0}; + static const WCHAR ClsidCatW[] = {'C','l','s','i','d','C','a','t',0}; + static const WCHAR szIdFormat[] = {'%','d',0}; + + HRESULT hr; + int i = 0; + ICreateDevEnum *pCreateDevEnum; + IEnumMoniker *pEmCat = NULL; + IMoniker *pMCat = NULL; + IEnumMoniker *pEnum = NULL; + + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, + &IID_ICreateDevEnum, (void **)&pCreateDevEnum); + if (FAILED(hr)) + return hr; + + hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEmCat, 0); + if (FAILED(hr)) + goto cleanup; + + while (IEnumMoniker_Next(pEmCat, 1, &pMCat, NULL) == S_OK) + { + VARIANT vCatName; + VARIANT vCatClsid; + IPropertyBag *pPropBag; + CLSID clsidCat; + IMoniker *pMoniker = NULL; + + hr = IMoniker_BindToStorage(pMCat, NULL, NULL, &IID_IPropertyBag, (void **)&pPropBag); + if (FAILED(hr)) + { + IMoniker_Release(pMCat); + break; + } + + hr = read_property_names(pPropBag, &vCatName, &vCatClsid); + IPropertyBag_Release(pPropBag); + if (FAILED(hr)) + { + IMoniker_Release(pMCat); + break; + } + + hr = CLSIDFromString(V_BSTR(&vCatClsid), &clsidCat); + if (FAILED(hr)) + { + IMoniker_Release(pMCat); + VariantClear(&vCatClsid); + VariantClear(&vCatName); + break; + } + + hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0); + if (hr != S_OK) + { + IMoniker_Release(pMCat); + VariantClear(&vCatClsid); + VariantClear(&vCatName); + continue; + } + + while (IEnumMoniker_Next(pEnum, 1, &pMoniker, NULL) == S_OK) + { + WCHAR bufferW[10]; + IDxDiagContainerImpl_Container *subcont; + + snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szIdFormat, i); + subcont = allocate_information_node(bufferW); + if (!subcont) + { + hr = E_OUTOFMEMORY; + IMoniker_Release(pMoniker); + break; + } + + hr = add_bstr_property(subcont, szCatName, V_BSTR(&vCatName)); + if (FAILED(hr)) + { + free_information_tree(subcont); + IMoniker_Release(pMoniker); + break; + } + + hr = add_bstr_property(subcont, ClsidCatW, V_BSTR(&vCatClsid)); + if (FAILED(hr)) + { + free_information_tree(subcont); + IMoniker_Release(pMoniker); + break; + } + + hr = fill_filter_container(subcont, pMoniker); + if (FAILED(hr)) + { + free_information_tree(subcont); + IMoniker_Release(pMoniker); + break; + } + + add_subcontainer(node, subcont); + i++; + IMoniker_Release(pMoniker); + } + + IEnumMoniker_Release(pEnum); + IMoniker_Release(pMCat); + VariantClear(&vCatClsid); + VariantClear(&vCatName); + + if (FAILED(hr)) + break; + } + +cleanup: + if (pEmCat) IEnumMoniker_Release(pEmCat); + ICreateDevEnum_Release(pCreateDevEnum); + return hr; +} + static HRESULT build_logicaldisks_tree(IDxDiagContainerImpl_Container *node) { return S_OK;

1 0

Andrew Nguyen : dxdiagn: Remove the old container initialization code in preparation for switching to the information tree .
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 6ffcfe58c924ff7a8e5c8aef92c77444d0569fd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffcfe58c924ff7a8e5c8aef9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:15:07 2011 -0600 dxdiagn: Remove the old container initialization code in preparation for switching to the information tree. --- dlls/dxdiagn/provider.c | 607 +---------------------------------------------- 1 files changed, 12 insertions(+), 595 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ffcfe58c924ff7a8e5c8…

1 0

Andrew Nguyen : dxdiagn: Transition to the information tree by making IDxDiagContainer view the information tree .
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: a9d1f1bb4faa21df8399f0ed21fa95b2bb7b620b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d1f1bb4faa21df8399f0ed2… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:17:16 2011 -0600 dxdiagn: Transition to the information tree by making IDxDiagContainer view the information tree. --- dlls/dxdiagn/container.c | 98 ++++++++------------------------------- dlls/dxdiagn/dxdiag_private.h | 31 ++++--------- dlls/dxdiagn/provider.c | 64 +------------------------- dlls/dxdiagn/tests/container.c | 2 +- 4 files changed, 33 insertions(+), 162 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9d1f1bb4faa21df8399f…

1 0

Andrew Nguyen : dxdiagn: Restore a few traces in the container construction functions.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 80354e5031fc2ad275d6a889c9032141a40eaa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=80354e5031fc2ad275d6a889c… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Feb 15 01:17:44 2011 -0600 dxdiagn: Restore a few traces in the container construction functions. --- dlls/dxdiagn/provider.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index f19fcc0..9a6ba6b 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -635,6 +635,9 @@ static HRESULT fill_file_description(IDxDiagContainerImpl_Container *node, const UINT uiLength; VS_FIXEDFILEINFO *pFileInfo; + TRACE("Filling container %p for %s in %s\n", node, + debugstr_w(szFileName), debugstr_w(szFilePath)); + szFile = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * (lstrlenW(szFilePath) + lstrlenW(szFileName) + 2 /* slash + terminator */)); if (!szFile) @@ -680,6 +683,8 @@ static HRESULT fill_file_description(IDxDiagContainerImpl_Container *node, const HIWORD(pFileInfo->dwFileVersionLS), LOWORD(pFileInfo->dwFileVersionLS)); + TRACE("Found version as (%s)\n", debugstr_w(szVersion_v)); + hr = add_bstr_property(node, szVersion, szVersion_v); if (FAILED(hr)) goto cleanup; @@ -896,6 +901,9 @@ static HRESULT fill_filter_container(IDxDiagContainerImpl_Container *subcont, IM if (FAILED(hr)) goto cleanup; + TRACE("Name = %s\n", debugstr_w(V_BSTR(&friendly_name))); + TRACE("CLSID = %s\n", debugstr_w(V_BSTR(&clsid_name))); + hr = add_bstr_property(subcont, szName, V_BSTR(&friendly_name)); if (FAILED(hr)) goto cleanup; @@ -990,6 +998,8 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node continue; } + TRACE("Enumerating class %s\n", debugstr_guid(&clsidCat)); + while (IEnumMoniker_Next(pEnum, 1, &pMoniker, NULL) == S_OK) { WCHAR bufferW[10];

1 0

Alexandre Julliard : cabinet: Store the CCAB data as soon as it is available.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 28fce46de7e41656e9dde3bf16cad60905a7a5ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=28fce46de7e41656e9dde3bf1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 15 14:11:22 2011 +0100 cabinet: Store the CCAB data as soon as it is available. Also add a helper function for the cabinet header size. --- dlls/cabinet/fci.c | 478 ++++++++++------------------------------------------ 1 files changed, 86 insertions(+), 392 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28fce46de7e41656e9dde…

1 0

Juan Lang : rsaenh: Fully initialize schannel algorithm information.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 00ba1f606c0b393cdb44c83e867d99fe28640d3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ba1f606c0b393cdb44c83e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Feb 14 10:57:51 2011 -0800 rsaenh: Fully initialize schannel algorithm information. --- dlls/rsaenh/rsaenh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0acf4c7..61d1b87 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -866,6 +866,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwSaltLen = 0; memset(pCryptKey->abKeyValue, 0, sizeof(pCryptKey->abKeyValue)); memset(pCryptKey->abInitVector, 0, sizeof(pCryptKey->abInitVector)); + memset(&pCryptKey->siSChannelInfo.saEncAlg, 0, sizeof(pCryptKey->siSChannelInfo.saEncAlg)); + memset(&pCryptKey->siSChannelInfo.saMACAlg, 0, sizeof(pCryptKey->siSChannelInfo.saMACAlg)); init_data_blob(&pCryptKey->siSChannelInfo.blobClientRandom); init_data_blob(&pCryptKey->siSChannelInfo.blobServerRandom); init_data_blob(&pCryptKey->blobHmacKey);

1 0

Nikolay Sivov : msxml3: Add basic putref_stylesheet() implementation.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 855ca45f295bcace966a603d354f6a9cb99ab596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=855ca45f295bcace966a603d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 12 15:42:15 2011 +0300 msxml3: Add basic putref_stylesheet() implementation. --- dlls/msxml3/stylesheet.c | 27 ++++++++++++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 97 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c index 8455b30..446a97f 100644 --- a/dlls/msxml3/stylesheet.c +++ b/dlls/msxml3/stylesheet.c @@ -41,6 +41,8 @@ typedef struct _xsltemplate { IXSLTemplate IXSLTemplate_iface; LONG ref; + + IXMLDOMNode *node; } xsltemplate; static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) @@ -48,6 +50,13 @@ static inline xsltemplate *impl_from_IXSLTemplate( IXSLTemplate *iface ) return CONTAINING_RECORD(iface, xsltemplate, IXSLTemplate_iface); } +static void xsltemplate_set_node( xsltemplate *This, IXMLDOMNode *node ) +{ + if (This->node) IXMLDOMNode_Release(This->node); + This->node = node; + if (node) IXMLDOMNode_AddRef(node); +} + static HRESULT WINAPI xsltemplate_QueryInterface( IXSLTemplate *iface, REFIID riid, @@ -85,7 +94,10 @@ static ULONG WINAPI xsltemplate_Release( IXSLTemplate *iface ) ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) + { + if (This->node) IXMLDOMNode_Release( This->node ); heap_free( This ); + } return ref; } @@ -166,8 +178,18 @@ static HRESULT WINAPI xsltemplate_putref_stylesheet( IXSLTemplate *iface, { xsltemplate *This = impl_from_IXSLTemplate( iface ); - FIXME("(%p)->(%p): stub\n", This, node); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, node); + + if (!node) + { + xsltemplate_set_node(This, NULL); + return S_OK; + } + + /* FIXME: test for document type */ + xsltemplate_set_node(This, node); + + return S_OK; } static HRESULT WINAPI xsltemplate_get_stylesheet( IXSLTemplate *iface, @@ -217,6 +239,7 @@ HRESULT XSLTemplate_create(IUnknown *pUnkOuter, void **ppObj) This->IXSLTemplate_iface.lpVtbl = &xsltemplate_vtbl; This->ref = 1; + This->node = NULL; *ppObj = &This->IXSLTemplate_iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 34cc322..c1b5bb4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -627,12 +627,10 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid, #define _create(cls) cls, #cls #define create_document(iid) _create_object(&_create(CLSID_DOMDocument), iid, __LINE__) - #define create_document_version(v, iid) _create_object(&_create(CLSID_DOMDocument ## v), iid, __LINE__) - #define create_cache(iid) _create_object(&_create(CLSID_XMLSchemaCache), iid, __LINE__) - #define create_cache_version(v, iid) _create_object(&_create(CLSID_XMLSchemaCache ## v), iid, __LINE__) +#define create_xsltemplate(iid) _create_object(&_create(CLSID_XSLTemplate), iid, __LINE__) static BSTR alloc_str_from_narrow(const char *str) { @@ -7660,6 +7658,76 @@ static void test_get_xml(void) free_bstrs(); } +static void test_xsltemplate(void) +{ + IXSLTemplate *template; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + HRESULT hr; + ULONG ref1, ref2; + + template = create_xsltemplate(&IID_IXSLTemplate); + if (!template) return; + + /* works as reset */ + hr = IXSLTemplate_putref_stylesheet(template, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + doc = create_document(&IID_IXMLDOMDocument); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_("<a>test</a>"), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* putref with non-xsl document */ + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* not a freethreaded document */ + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + todo_wine ok(hr == E_FAIL, "got 0x%08x\n", hr); + + IXMLDOMDocument_Release(doc); + + hr = CoCreateInstance(&CLSID_FreeThreadedDOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + if (hr != S_OK) + { + win_skip("failed to create free threaded document instance: 0x%08x\n", hr); + IXSLTemplate_Release(template); + return; + } + + b = VARIANT_TRUE; + hr = IXMLDOMDocument_loadXML( doc, _bstr_(szTransformSSXML), &b ); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok( b == VARIANT_TRUE, "got %d\n", b); + + /* freethreaded document */ + ref1 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + hr = IXSLTemplate_putref_stylesheet(template, (IXMLDOMNode*)doc); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + ok(ref2 > ref1, "got %d\n", ref2); + + /* drop reference */ + hr = IXSLTemplate_putref_stylesheet(template, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ref2 = IXMLDOMDocument_AddRef(doc); + IXMLDOMDocument_Release(doc); + ok(ref2 == ref1, "got %d\n", ref2); + + IXMLDOMDocument_Release(doc); + IXSLTemplate_Release(template); +} + START_TEST(domdoc) { IXMLDOMDocument *doc; @@ -7724,6 +7792,7 @@ START_TEST(domdoc) test_createProcessingInstruction(); test_put_nodeTypedValue(); test_get_xml(); + test_xsltemplate(); CoUninitialize(); }

1 0

Nikolay Sivov : msxml3: Add a stub IXSLProcessor.
by Alexandre Julliard 15 Feb '11

15 Feb '11

Module: wine Branch: master Commit: 8fdf64e882ba874e739c23ad1299b5d9d208cf57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fdf64e882ba874e739c23ad1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 12 16:40:36 2011 +0300 msxml3: Add a stub IXSLProcessor. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/stylesheet.c | 318 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 9 ++ 4 files changed, 327 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8fdf64e882ba874e739c2…

1 0