May 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Support attributes list for elements.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 2dfa1bffc4b975cdd72f0f1f7cd55d7db28e6c57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfa1bffc4b975cdd72f0f1f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 19:37:59 2011 +0400 msxml3: Support attributes list for elements. --- dlls/msxml3/mxwriter.c | 39 +++++++- dlls/msxml3/tests/saxreader.c | 209 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 141f58d..a791acb 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -548,12 +548,47 @@ static HRESULT WINAPI mxwriter_saxcontent_startElement( if (!namespaceUri || !local_name || !QName) return E_INVALIDARG; - if (attr) FIXME("attributes not handled\n"); - xmlOutputBufferWriteString(This->buffer, "<"); s = xmlchar_from_wchar(QName); xmlOutputBufferWriteString(This->buffer, (char*)s); heap_free(s); + + if (attr) + { + HRESULT hr; + INT length; + INT i; + + hr = ISAXAttributes_getLength(attr, &length); + if (FAILED(hr)) return hr; + + if (length) xmlOutputBufferWriteString(This->buffer, " "); + + for (i = 0; i < length; i++) + { + const WCHAR *str; + INT len; + + hr = ISAXAttributes_getQName(attr, i, &str, &len); + if (FAILED(hr)) return hr; + + s = xmlchar_from_wchar(str); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + + xmlOutputBufferWriteString(This->buffer, "=\""); + + hr = ISAXAttributes_getValue(attr, i, &str, &len); + if (FAILED(hr)) return hr; + + s = xmlchar_from_wchar(str); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + + xmlOutputBufferWriteString(This->buffer, "\""); + } + } + xmlOutputBufferWriteString(This->buffer, ">"); return S_OK; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 2bdb8b5..cac238c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -491,6 +491,211 @@ static const ISAXErrorHandlerVtbl errorHandlerVtbl = static ISAXErrorHandler errorHandler = { &errorHandlerVtbl }; +static HRESULT WINAPI isaxattributes_QueryInterface( + ISAXAttributes* iface, + REFIID riid, + void **ppvObject) +{ + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISAXAttributes)) + { + *ppvObject = iface; + } + else + { + return E_NOINTERFACE; + } + + return S_OK; +} + +static ULONG WINAPI isaxattributes_AddRef(ISAXAttributes* iface) +{ + return 2; +} + +static ULONG WINAPI isaxattributes_Release(ISAXAttributes* iface) +{ + return 1; +} + +static HRESULT WINAPI isaxattributes_getLength(ISAXAttributes* iface, int *length) +{ + *length = 2; + return S_OK; +} + +static HRESULT WINAPI isaxattributes_getURI( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pUrl, + int *pUriSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getLocalName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pLocalName, + int *pLocalNameLength) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getQName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pQName, + int *pQNameLength) +{ + static const WCHAR attr1W[] = {'a',':','a','t','t','r','1',0}; + static const WCHAR attr2W[] = {'a','t','t','r','2',0}; + + ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); + + *pQName = (nIndex == 0) ? attr1W : attr2W; + *pQNameLength = lstrlenW(*pQName); + + return S_OK; +} + +static HRESULT WINAPI isaxattributes_getName( + ISAXAttributes* iface, + int nIndex, + const WCHAR **pUri, + int * pUriLength, + const WCHAR ** pLocalName, + int * pLocalNameSize, + const WCHAR ** pQName, + int * pQNameLength) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getIndexFromName( + ISAXAttributes* iface, + const WCHAR * pUri, + int cUriLength, + const WCHAR * pLocalName, + int cocalNameLength, + int * index) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getIndexFromQName( + ISAXAttributes* iface, + const WCHAR * pQName, + int nQNameLength, + int * index) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getType( + ISAXAttributes* iface, + int nIndex, + const WCHAR ** pType, + int * pTypeLength) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getTypeFromName( + ISAXAttributes* iface, + const WCHAR * pUri, + int nUri, + const WCHAR * pLocalName, + int nLocalName, + const WCHAR ** pType, + int * nType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getTypeFromQName( + ISAXAttributes* iface, + const WCHAR * pQName, + int nQName, + const WCHAR ** pType, + int * nType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValue( + ISAXAttributes* iface, + int nIndex, + const WCHAR ** pValue, + int * nValue) +{ + static const WCHAR attrval1W[] = {'a','1',0}; + static const WCHAR attrval2W[] = {'a','2',0}; + + ok(nIndex == 0 || nIndex == 1, "invalid index received %d\n", nIndex); + + *pValue = (nIndex == 0) ? attrval1W : attrval2W; + *nValue = lstrlenW(*pValue); + + return S_OK; +} + +static HRESULT WINAPI isaxattributes_getValueFromName( + ISAXAttributes* iface, + const WCHAR * pUri, + int nUri, + const WCHAR * pLocalName, + int nLocalName, + const WCHAR ** pValue, + int * nValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxattributes_getValueFromQName( + ISAXAttributes* iface, + const WCHAR * pQName, + int nQName, + const WCHAR ** pValue, + int * nValue) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ISAXAttributesVtbl SAXAttributesVtbl = +{ + isaxattributes_QueryInterface, + isaxattributes_AddRef, + isaxattributes_Release, + isaxattributes_getLength, + isaxattributes_getURI, + isaxattributes_getLocalName, + isaxattributes_getQName, + isaxattributes_getName, + isaxattributes_getIndexFromName, + isaxattributes_getIndexFromQName, + isaxattributes_getType, + isaxattributes_getTypeFromName, + isaxattributes_getTypeFromQName, + isaxattributes_getValue, + isaxattributes_getValueFromName, + isaxattributes_getValueFromQName +}; + +static ISAXAttributes saxattributes = { &SAXAttributesVtbl }; + static void test_saxreader(void) { HRESULT hr; @@ -1059,6 +1264,10 @@ static void test_mxwriter_startendelement(void) todo_wine ok(!lstrcmpW(_bstr_("<><b></b><nspace:c/></a>"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + /* try with attributes */ + hr = ISAXContentHandler_startElement(content, _bstr_(""), 0, _bstr_(""), 0, _bstr_("b"), 1, &saxattributes); + ok(hr == S_OK, "got %08x\n", hr); + hr = ISAXContentHandler_endDocument(content); todo_wine ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : comctl32/listview: Don' t refuse to set subitem data when some extra flag is specified.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 740e7be12883eed4c7cc7e65c1ab641da33476ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=740e7be12883eed4c7cc7e65c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 12:48:14 2011 +0400 comctl32/listview: Don't refuse to set subitem data when some extra flag is specified. --- dlls/comctl32/listview.c | 4 +- dlls/comctl32/tests/listview.c | 54 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1f64cbe..9f8b2a9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4272,9 +4272,9 @@ static BOOL set_sub_item(const LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, particularly useful. We currently do not actually do anything with the flag on subitems. */ - if (lpLVItem->mask & ~(LVIF_TEXT | LVIF_IMAGE | LVIF_STATE)) return FALSE; + if (lpLVItem->mask & ~(LVIF_TEXT | LVIF_IMAGE | LVIF_STATE | LVIF_DI_SETITEM)) return FALSE; if (!(lpLVItem->mask & (LVIF_TEXT | LVIF_IMAGE | LVIF_STATE))) return TRUE; - + /* get the subitem structure, and create it if not there */ hdpaSubItems = DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); assert (hdpaSubItems); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 305ec2d..e9fa684 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3,7 +3,7 @@ * * Copyright 2006 Mike McCormack for CodeWeavers * Copyright 2007 George Gov - * Copyright 2009 Nikolay Sivov + * Copyright 2009-2011 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1030,10 +1030,11 @@ static void insert_item(HWND hwnd, int idx) static void test_items(void) { const LPARAM lparamTest = 0x42; + static CHAR text[] = "Text"; + char buffA[5]; HWND hwnd; LVITEMA item; DWORD r; - static CHAR text[] = "Text"; hwnd = CreateWindowEx(0, "SysListView32", "foo", LVS_REPORT, 10, 10, 100, 200, hwndparent, NULL, NULL, NULL); @@ -1140,6 +1141,55 @@ static void test_items(void) r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); ok(r == 1, "ret %d\n", r); + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = buffA; + item.cchTextMax = sizeof(buffA); + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r == 1, "ret %d\n", r); + ok(!memcmp(item.pszText, text, sizeof(text)), "got text %s, expected %s\n", item.pszText, text); + + /* set up with extra flag */ + /* 1. reset subitem text */ + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = NULL; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + ok(r == 1, "ret %d\n", r); + + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = buffA; + buffA[0] = 'a'; + item.cchTextMax = sizeof(buffA); + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r == 1, "ret %d\n", r); + ok(item.pszText[0] == 0, "got %p\n", item.pszText); + + /* 2. set new text with extra flag specified */ + item.mask = LVIF_TEXT | LVIF_DI_SETITEM; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = text; + r = SendMessage(hwnd, LVM_SETITEMA, 0, (LPARAM) &item); + ok(r == 1 || broken(r == 0) /* NT4 */, "ret %d\n", r); + + if (r == 1) + { + item.mask = LVIF_TEXT; + item.iItem = 0; + item.iSubItem = 1; + item.pszText = buffA; + buffA[0] = 'a'; + item.cchTextMax = sizeof(buffA); + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r == 1, "ret %d\n", r); + ok(!memcmp(item.pszText, text, sizeof(text)), "got %s, expected %s\n", item.pszText, text); + } + /* Query param from subitem: returns main item param */ memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM;

1 0

Alexandre Julliard : kernel32/tests: Fix a race that could corrupt the thread register state.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: f555c2d8572b83595e5a9742ec4444c3ade17d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f555c2d8572b83595e5a9742e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 17:12:22 2011 +0200 kernel32/tests: Fix a race that could corrupt the thread register state. --- dlls/kernel32/tests/thread.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 8376575..373eea7 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -898,6 +898,7 @@ static HANDLE event; static void WINAPI set_test_val( int val ) { test_value += val; + ExitThread(0); } static DWORD WINAPI threadFunc6(LPVOID p) @@ -954,7 +955,7 @@ static void test_SetThreadContext(void) prevcount, GetLastError() ); WaitForSingleObject( thread, INFINITE ); - ok( test_value == 20, "test_value %d instead of 20\n", test_value ); + ok( test_value == 10, "test_value %d instead of 20\n", test_value ); ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef);

1 0

Nikolay Sivov : comctl32/tests: Test message result for equality.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 7f640316616a92c73e71df6e805bf9b8cc27b8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f640316616a92c73e71df6e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 11:51:55 2011 +0400 comctl32/tests: Test message result for equality. --- dlls/comctl32/tests/listview.c | 70 ++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f640316616a92c73e71d…

1 0

Huw Davies : gameux: Zero initialize the fixed length arrays.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 173f8d23b89ec32ba4298108d1e76d41fae8dc81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173f8d23b89ec32ba4298108d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 12:50:39 2011 +0100 gameux: Zero initialize the fixed length arrays. --- dlls/gameux/gamestatistics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 63b8c8f..65aa0f7 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -998,7 +998,7 @@ static HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) { TRACE("(%p)\n", ppStats); - *ppStats = HeapAlloc( GetProcessHeap(), 0, sizeof(**ppStats)); + *ppStats = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**ppStats)); if(!(*ppStats)) return E_OUTOFMEMORY;

1 0

Hans Leidekker : msi: Clone an open stream if possible in cabinet_open_stream.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 3f7312fdc1aeec1cac782706ca4a0225fa39e9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f7312fdc1aeec1cac782706c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:41:14 2011 +0200 msi: Clone an open stream if possible in cabinet_open_stream. --- dlls/msi/media.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index bf0522a..608e84c 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -235,13 +235,17 @@ static INT_PTR CDECL cabinet_open_stream( char *pszFile, int oflag, int pmode ) WARN("failed to encode stream name\n"); return 0; } - hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); - msi_free( encoded ); - if (FAILED(hr)) + if (msi_clone_open_stream( package_disk.package->db, cab->storage, encoded, &stream ) != ERROR_SUCCESS) { - WARN("failed to open stream 0x%08x\n", hr); - return 0; + hr = IStorage_OpenStream( cab->storage, encoded, NULL, STGM_READ|STGM_SHARE_EXCLUSIVE, 0, &stream ); + msi_free( encoded ); + if (FAILED(hr)) + { + WARN("failed to open stream 0x%08x\n", hr); + return 0; + } } + msi_free( encoded ); return (INT_PTR)stream; }

1 0

Hans Leidekker : msi: Add support for version 1.0 of the .NET runtime.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 6b8a8d75e239bb11ea9a2f09c1a2dbecd4b53bc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b8a8d75e239bb11ea9a2f09c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:40:33 2011 +0200 msi: Add support for version 1.0 of the .NET runtime. --- dlls/msi/assembly.c | 35 +++++++++++++++++++++++++++++------ dlls/msi/msipriv.h | 1 + 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index a81bcde..2beb005 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -31,41 +31,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +static HRESULT (WINAPI *pCreateAssemblyCacheNet10)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); -static HMODULE hfusion11, hfusion20, hmscoree, hsxs; +static HMODULE hfusion10, hfusion11, hfusion20, hmscoree, hsxs; static BOOL init_function_pointers( void ) { static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; + static const WCHAR szVersion10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; - if (pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20) return TRUE; + if (pCreateAssemblyCacheNet10 || pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20) return TRUE; if (!(hmscoree = LoadLibraryA( "mscoree.dll" ))) return FALSE; - if (!(pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ))) goto error; + pGetFileVersion = (void *)GetProcAddress( hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ if (!(pLoadLibraryShim = (void *)GetProcAddress( hmscoree, "LoadLibraryShim" ))) goto error; + if (!pLoadLibraryShim( szFusion, szVersion10, NULL, &hfusion10 )) + pCreateAssemblyCacheNet10 = (void *)GetProcAddress( hfusion10, "CreateAssemblyCache" ); + if (!pLoadLibraryShim( szFusion, szVersion11, NULL, &hfusion11 )) pCreateAssemblyCacheNet11 = (void *)GetProcAddress( hfusion11, "CreateAssemblyCache" ); if (!pLoadLibraryShim( szFusion, szVersion20, NULL, &hfusion20 )) pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); - if (!pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20) goto error; + if (!pCreateAssemblyCacheNet10 && !pCreateAssemblyCacheNet11 && !pCreateAssemblyCacheNet20) goto error; if (!(hsxs = LoadLibraryA( "sxs.dll" ))) goto error; if (!(pCreateAssemblyCacheSxs = (void *)GetProcAddress( hsxs, "CreateAssemblyCache" ))) goto error; return TRUE; error: + pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); FreeLibrary( hmscoree ); @@ -75,16 +82,26 @@ error: BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { if (!init_function_pointers()) return FALSE; - if (package->cache_net[CLR_VERSION_V11] || package->cache_net[CLR_VERSION_V20]) return TRUE; + if (package->cache_net[CLR_VERSION_V10] || + package->cache_net[CLR_VERSION_V11] || + package->cache_net[CLR_VERSION_V20]) return TRUE; if (pCreateAssemblyCacheSxs( &package->cache_sxs, 0 ) != S_OK) return FALSE; + if (pCreateAssemblyCacheNet10) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V10], 0 ); if (pCreateAssemblyCacheNet11) pCreateAssemblyCacheNet11( &package->cache_net[CLR_VERSION_V11], 0 ); if (pCreateAssemblyCacheNet20) pCreateAssemblyCacheNet20( &package->cache_net[CLR_VERSION_V20], 0 ); - if (package->cache_net[CLR_VERSION_V11] || package->cache_net[CLR_VERSION_V20]) + if (package->cache_net[CLR_VERSION_V10] || + package->cache_net[CLR_VERSION_V11] || + package->cache_net[CLR_VERSION_V20]) { return TRUE; } + if (package->cache_net[CLR_VERSION_V10]) + { + IAssemblyCache_Release( package->cache_net[CLR_VERSION_V10] ); + package->cache_net[CLR_VERSION_V10] = NULL; + } if (package->cache_net[CLR_VERSION_V11]) { IAssemblyCache_Release( package->cache_net[CLR_VERSION_V11] ); @@ -117,8 +134,10 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) IAssemblyCache_Release( package->cache_sxs ); package->cache_sxs = NULL; } + pCreateAssemblyCacheNet10 = NULL; pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; + FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 ); FreeLibrary( hmscoree ); @@ -249,12 +268,14 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } +static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR clr_version_v11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR clr_version_v20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR clr_version_unknown[] = {'u','n','k','n','o','w','n',0}; static const WCHAR *clr_version[] = { + clr_version_v10, clr_version_v11, clr_version_v20 }; @@ -339,6 +360,8 @@ static enum clr_version get_clr_version( const WCHAR *filename ) enum clr_version version = CLR_VERSION_V11; WCHAR *strW; + if (!pGetFileVersion) return CLR_VERSION_V10; + hr = pGetFileVersion( filename, NULL, 0, &len ); if (hr != HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index d13868f..11ccfca 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -339,6 +339,7 @@ enum platform enum clr_version { + CLR_VERSION_V10, CLR_VERSION_V11, CLR_VERSION_V20, CLR_VERSION_MAX

1 0

Hans Leidekker : msi: Keep track of a stream's storage.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 4f9971f5f8bac5df4d5a4c160185b1f4a3a6345c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9971f5f8bac5df4d5a4c160… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:40:48 2011 +0200 msi: Keep track of a stream's storage. --- dlls/msi/database.c | 34 +++++++++++++++++++++------------- dlls/msi/msipriv.h | 5 +++-- dlls/msi/streams.c | 6 +++--- dlls/msi/table.c | 2 +- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 2cb9ec4..02fc007 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -61,10 +61,11 @@ typedef struct tagMSITRANSFORM { typedef struct tagMSISTREAM { struct list entry; + IStorage *stg; IStream *stm; } MSISTREAM; -static UINT find_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) +static UINT find_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) { MSISTREAM *stream; @@ -73,6 +74,8 @@ static UINT find_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) HRESULT r; STATSTG stat; + if (stream->stg != stg) continue; + r = IStream_Stat( stream->stm, &stat, 0 ); if( FAILED( r ) ) { @@ -94,11 +97,11 @@ static UINT find_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) return ERROR_FUNCTION_FAILED; } -static UINT clone_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) +UINT msi_clone_open_stream( MSIDATABASE *db, IStorage *stg, LPCWSTR name, IStream **stm ) { IStream *stream; - if (find_open_stream( db, name, &stream ) == ERROR_SUCCESS) + if (find_open_stream( db, stg, name, &stream ) == ERROR_SUCCESS) { HRESULT r; LARGE_INTEGER pos; @@ -124,15 +127,16 @@ static UINT clone_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) return ERROR_FUNCTION_FAILED; } -UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) +UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; + IStorage *stg; WCHAR decoded[MAX_STREAM_NAME_LEN]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); - if (clone_open_stream( db, stname, stm ) == ERROR_SUCCESS) + if (msi_clone_open_stream( db, db->storage, stname, stm ) == ERROR_SUCCESS) return ERROR_SUCCESS; r = IStorage_OpenStream( db->storage, stname, NULL, @@ -146,18 +150,21 @@ UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) r = IStorage_OpenStream( transform->stg, stname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); if (SUCCEEDED(r)) + { + stg = transform->stg; break; + } } } + else stg = db->storage; if( SUCCEEDED(r) ) { MSISTREAM *stream; - stream = msi_alloc( sizeof(MSISTREAM) ); - if( !stream ) - return ERROR_NOT_ENOUGH_MEMORY; - + if (!(stream = msi_alloc( sizeof(MSISTREAM) ))) return ERROR_NOT_ENOUGH_MEMORY; + stream->stg = stg; + IStream_AddRef( stg ); stream->stm = *stm; IStream_AddRef( *stm ); list_add_tail( &db->streams, &stream->entry ); @@ -178,7 +185,7 @@ static void free_transforms( MSIDATABASE *db ) } } -void db_destroy_stream( MSIDATABASE *db, LPCWSTR stname ) +void msi_destroy_stream( MSIDATABASE *db, const WCHAR *stname ) { MSISTREAM *stream, *stream2; @@ -200,8 +207,9 @@ void db_destroy_stream( MSIDATABASE *db, LPCWSTR stname ) list_remove( &stream->entry ); IStream_Release( stream->stm ); + IStream_Release( stream->stg ); + IStorage_DestroyElement( stream->stg, stname ); msi_free( stream ); - IStorage_DestroyElement( db->storage, stname ); CoTaskMemFree( stat.pwcsName ); break; } @@ -213,10 +221,10 @@ static void free_streams( MSIDATABASE *db ) { while( !list_empty( &db->streams ) ) { - MSISTREAM *s = LIST_ENTRY( list_head( &db->streams ), - MSISTREAM, entry ); + MSISTREAM *s = LIST_ENTRY(list_head( &db->streams ), MSISTREAM, entry); list_remove( &s->entry ); IStream_Release( s->stm ); + IStream_Release( s->stg ); msi_free( s ); } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 11ccfca..2cc7daf 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -799,8 +799,9 @@ extern LPWSTR encode_streamname(BOOL bTable, LPCWSTR in) DECLSPEC_HIDDEN; extern BOOL decode_streamname(LPCWSTR in, LPWSTR out) DECLSPEC_HIDDEN; /* database internals */ -extern UINT db_get_raw_stream( MSIDATABASE *, LPCWSTR, IStream ** ) DECLSPEC_HIDDEN; -void db_destroy_stream( MSIDATABASE *, LPCWSTR ) DECLSPEC_HIDDEN; +extern UINT msi_get_raw_stream( MSIDATABASE *, LPCWSTR, IStream ** ) DECLSPEC_HIDDEN; +extern UINT msi_clone_open_stream( MSIDATABASE *, IStorage *, const WCHAR *, IStream ** ) DECLSPEC_HIDDEN; +void msi_destroy_stream( MSIDATABASE *, const WCHAR * ) DECLSPEC_HIDDEN; extern UINT MSI_OpenDatabaseW( LPCWSTR, LPCWSTR, MSIDATABASE ** ) DECLSPEC_HIDDEN; extern UINT MSI_DatabaseOpenViewW(MSIDATABASE *, LPCWSTR, MSIQUERY ** ) DECLSPEC_HIDDEN; extern UINT MSI_OpenQuery( MSIDATABASE *, MSIQUERY **, LPCWSTR, ... ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 44c4e67..c9c2d3e 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -182,7 +182,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U } encname = encode_streamname(FALSE, name); - db_destroy_stream(sv->db, encname); + msi_destroy_stream(sv->db, encname); r = write_stream_data(sv->db->storage, name, data, count, FALSE); if (r != ERROR_SUCCESS) @@ -529,12 +529,12 @@ static INT add_streams_to_table(MSISTREAMSVIEW *sv) /* these streams appear to be unencoded */ if (*stat.pwcsName == 0x0005) { - r = db_get_raw_stream(sv->db, stat.pwcsName, &stream->stream); + r = msi_get_raw_stream(sv->db, stat.pwcsName, &stream->stream); } else { encname = encode_streamname(FALSE, stat.pwcsName); - r = db_get_raw_stream(sv->db, encname, &stream->stream); + r = msi_get_raw_stream(sv->db, encname, &stream->stream); msi_free(encname); } CoTaskMemFree(stat.pwcsName); diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f53b817..91f3676 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1221,7 +1221,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt } encname = encode_streamname( FALSE, full_name ); - r = db_get_raw_stream( tv->db, encname, stm ); + r = msi_get_raw_stream( tv->db, encname, stm ); if( r ) ERR("fetching stream %s, error = %d\n",debugstr_w(full_name), r);

1 0

Hans Leidekker : msi: Destroy assembly caches right after use.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: bffd5e0cbbda9e38d934ccb042ed01ee307bedcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffd5e0cbbda9e38d934ccb04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:39:58 2011 +0200 msi: Destroy assembly caches right after use. This avoids keeping dlls loaded that the .NET service pack installers want to replace. --- dlls/msi/action.c | 11 ++++++++++- dlls/msi/assembly.c | 41 +++++++++++++++++++++++++++++++---------- dlls/msi/files.c | 6 ++++-- dlls/msi/msipriv.h | 6 ++++-- 4 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 227e661..669881c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1736,7 +1736,7 @@ static UINT load_component( MSIRECORD *row, LPVOID param ) comp->Action = INSTALLSTATE_UNKNOWN; comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->assembly = load_assembly( package, comp ); + comp->assembly = msi_load_assembly( package, comp ); return ERROR_SUCCESS; } @@ -1755,8 +1755,17 @@ static UINT load_all_components( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; + if (!msi_init_assembly_caches( package )) + { + ERR("can't initialize assembly caches\n"); + msiobj_release( &view->hdr ); + return ERROR_FUNCTION_FAILED; + } + r = MSI_IterateRecords(view, NULL, load_component, package); msiobj_release(&view->hdr); + + msi_destroy_assembly_caches( package ); return r; } diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 6bccc79..a81bcde 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -37,12 +37,13 @@ static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); +static HMODULE hfusion11, hfusion20, hmscoree, hsxs; + static BOOL init_function_pointers( void ) { static const WCHAR szFusion[] = {'f','u','s','i','o','n','.','d','l','l',0}; static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; - HMODULE hfusion11 = NULL, hfusion20 = NULL, hmscoree, hsxs; if (pCreateAssemblyCacheNet11 || pCreateAssemblyCacheNet20) return TRUE; @@ -71,7 +72,7 @@ error: return FALSE; } -static BOOL init_assembly_caches( MSIPACKAGE *package ) +BOOL msi_init_assembly_caches( MSIPACKAGE *package ) { if (!init_function_pointers()) return FALSE; if (package->cache_net[CLR_VERSION_V11] || package->cache_net[CLR_VERSION_V20]) return TRUE; @@ -99,6 +100,31 @@ static BOOL init_assembly_caches( MSIPACKAGE *package ) return FALSE; } +void msi_destroy_assembly_caches( MSIPACKAGE *package ) +{ + UINT i; + + for (i = 0; i < CLR_VERSION_MAX; i++) + { + if (package->cache_net[i]) + { + IAssemblyCache_Release( package->cache_net[i] ); + package->cache_net[i] = NULL; + } + } + if (package->cache_sxs) + { + IAssemblyCache_Release( package->cache_sxs ); + package->cache_sxs = NULL; + } + pCreateAssemblyCacheNet11 = NULL; + pCreateAssemblyCacheNet20 = NULL; + FreeLibrary( hfusion11 ); + FreeLibrary( hfusion20 ); + FreeLibrary( hmscoree ); + FreeLibrary( hsxs ); +} + static MSIRECORD *get_assembly_record( MSIPACKAGE *package, const WCHAR *comp ) { static const WCHAR query[] = { @@ -239,18 +265,13 @@ static const WCHAR *get_clr_version_str( enum clr_version version ) return clr_version[version]; } -MSIASSEMBLY *load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) +/* assembly caches must be initialized */ +MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { MSIRECORD *rec; MSIASSEMBLY *a; if (!(rec = get_assembly_record( package, comp->Component ))) return NULL; - if (!init_assembly_caches( package )) - { - ERR("can't initialize assembly caches\n"); - msiobj_release( &rec->hdr ); - return NULL; - } if (!(a = msi_alloc_zero( sizeof(MSIASSEMBLY) ))) { msiobj_release( &rec->hdr ); @@ -334,7 +355,7 @@ static enum clr_version get_clr_version( const WCHAR *filename ) return version; } -UINT install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) +UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { HRESULT hr; const WCHAR *manifest; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6608874..ff21604 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -20,7 +20,7 @@ /* - * Actions dealing with files These are + * Actions dealing with files: * * InstallFiles * DuplicateFiles @@ -390,12 +390,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } + msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { if (comp->ActionRequest == INSTALLSTATE_LOCAL && comp->Enabled && comp->assembly && !comp->assembly->installed) { - rc = install_assembly( package, comp ); + rc = msi_install_assembly( package, comp ); if (rc != ERROR_SUCCESS) { ERR("Failed to install assembly\n"); @@ -404,6 +405,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } } } + msi_destroy_assembly_caches( package ); done: msi_free_media_info(mi); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 78d1972..d13868f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -999,8 +999,10 @@ extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value) DECLSPEC_HIDDEN; extern UINT msi_get_local_package_name(LPWSTR path, LPCWSTR suffix) DECLSPEC_HIDDEN; extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) DECLSPEC_HIDDEN; -extern MSIASSEMBLY *load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; -extern UINT install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; +extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; +extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; +extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; +extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern WCHAR *font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Avoid loading cabinet streams more than once.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 395479f0d194b7b7e1cf6b766825f492faafde5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=395479f0d194b7b7e1cf6b766… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:39:42 2011 +0200 msi: Avoid loading cabinet streams more than once. --- dlls/msi/action.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c4d7717..227e661 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2114,6 +2114,8 @@ static UINT load_all_media( MSIPACKAGE *package ) MSIQUERY *view; UINT r; + if (!list_empty( &package->cabinet_streams )) return ERROR_SUCCESS; + r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS;

1 0