November 2007 - Wine-Commits

James Hawkins : msi: Return a remote interface to the database in a custom action.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 0e29f314f5a344f3d5258c88077411837905e3aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e29f314f5a344f3d5258c880… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 11 18:13:08 2007 -0600 msi: Return a remote interface to the database in a custom action. --- dlls/msi/database.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 91 ++++++++++++++++++++++++++-- dlls/msi/msiserver.idl | 15 +++++ dlls/msi/package.c | 35 ++++++++++- dlls/msi/preview.c | 19 ++++++- dlls/msi/suminfo.c | 24 +++++++- 7 files changed, 331 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e29f314f5a344f3d5258…

1 0

James Hawkins : msi: Create the _Tables table when creating a database.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 7dffb518c08f7abd0c1a9425afa1539552906d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dffb518c08f7abd0c1a9425a… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 11 18:05:56 2007 -0600 msi: Create the _Tables table when creating a database. --- dlls/msi/database.c | 6 +++++- dlls/msi/tests/db.c | 16 +++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index d0f0097..c30121a 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -82,6 +82,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) WCHAR path[MAX_PATH]; static const WCHAR backslash[] = {'\\',0}; + static WCHAR szTables[] = { '_','T','a','b','l','e','s',0 }; TRACE("%s %s\n",debugstr_w(szDBPath),debugstr_w(szPersist) ); @@ -114,7 +115,10 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( r == ERROR_SUCCESS ) { IStorage_SetClass( stg, &CLSID_MsiDatabase ); - r = msi_init_string_table( stg ); + /* create the _Tables stream */ + r = write_stream_data(stg, szTables, NULL, 0, TRUE); + if (!FAILED(r)) + r = msi_init_string_table( stg ); } created = TRUE; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 4b747f1..c269572 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4497,11 +4497,8 @@ void enum_stream_names(IStorage *stg) if(FAILED(hr) || !count) break; - todo_wine - { - ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name), - "Expected table %d name to match\n", n); - } + ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name), + "Expected table %d name to match\n", n); stm = NULL; hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, @@ -4514,15 +4511,11 @@ void enum_stream_names(IStorage *stg) hr = IStream_Read(stm, data, sz, &count); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - if (n == 1) todo_wine ok(count == database_table_data[n].size, "Expected %d, got %d\n", database_table_data[n].size, count); if (!database_table_data[n].size) - { - if (n == 1) todo_wine ok(!memcmp(data, check, MAX_PATH), "data should not be changed\n"); - } else ok(!memcmp(data, database_table_data[n].data, database_table_data[n].size), "Expected table %d data to match\n", n); @@ -4531,10 +4524,7 @@ void enum_stream_names(IStorage *stg) n++; } - todo_wine - { - ok(n == 3, "Expected 3, got %d\n", n); - } + ok(n == 3, "Expected 3, got %d\n", n); IEnumSTATSTG_Release(stgenum); }

1 0

James Hawkins : msi: Test the default tables added by MsiOpenDatabase.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: ef1277d462a407d410e11b628aeaf2ff19a39cb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1277d462a407d410e11b628… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Nov 11 18:04:33 2007 -0600 msi: Test the default tables added by MsiOpenDatabase. --- dlls/msi/tests/db.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 84dabeb..4b747f1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4453,6 +4453,121 @@ static void test_viewmodify_delete(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); } +static const WCHAR _Tables[] = {0x4840, 0x3f7f, 0x4164, 0x422f, 0x4836, 0}; +static const WCHAR _StringData[] = {0x4840, 0x3f3f, 0x4577, 0x446c, 0x3b6a, 0x45e4, 0x4824, 0}; +static const WCHAR _StringPool[] = {0x4840, 0x3f3f, 0x4577, 0x446c, 0x3e6a, 0x44b2, 0x482f, 0}; + +static const WCHAR data14[] = { /* _StringPool */ +/* len, refs */ + 0, 0, /* string 0 '' */ +}; + +static const struct { + LPCWSTR name; + const void *data; + DWORD size; +} database_table_data[] = +{ + {_Tables, NULL, 0}, + {_StringData, NULL, 0}, + {_StringPool, data14, sizeof data14}, +}; + +void enum_stream_names(IStorage *stg) +{ + IEnumSTATSTG *stgenum = NULL; + IStream *stm; + HRESULT hr; + STATSTG stat; + ULONG n, count; + BYTE data[MAX_PATH]; + BYTE check[MAX_PATH]; + DWORD sz; + + memset(check, 'a', MAX_PATH); + + hr = IStorage_EnumElements(stg, 0, NULL, 0, &stgenum); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + n = 0; + while(TRUE) + { + count = 0; + hr = IEnumSTATSTG_Next(stgenum, 1, &stat, &count); + if(FAILED(hr) || !count) + break; + + todo_wine + { + ok(!lstrcmpW(stat.pwcsName, database_table_data[n].name), + "Expected table %d name to match\n", n); + } + + stm = NULL; + hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, + STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(stm != NULL, "Expected non-NULL stream\n"); + + sz = MAX_PATH; + memset(data, 'a', MAX_PATH); + hr = IStream_Read(stm, data, sz, &count); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + if (n == 1) todo_wine + ok(count == database_table_data[n].size, + "Expected %d, got %d\n", database_table_data[n].size, count); + + if (!database_table_data[n].size) + { + if (n == 1) todo_wine + ok(!memcmp(data, check, MAX_PATH), "data should not be changed\n"); + } + else + ok(!memcmp(data, database_table_data[n].data, database_table_data[n].size), + "Expected table %d data to match\n", n); + + IStream_Release(stm); + n++; + } + + todo_wine + { + ok(n == 3, "Expected 3, got %d\n", n); + } + + IEnumSTATSTG_Release(stgenum); +} + +static void test_defaultdatabase(void) +{ + UINT r; + HRESULT hr; + MSIHANDLE hdb; + IStorage *stg = NULL; + + static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hdb); + + hr = StgOpenStorage(msifileW, NULL, STGM_READ | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(stg != NULL, "Expected non-NULL stg\n"); + + enum_stream_names(stg); + + IStorage_Release(stg); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -4480,4 +4595,5 @@ START_TEST(db) test_viewmodify_update(); test_stringtable(); test_viewmodify_delete(); + test_defaultdatabase(); }

1 0

Rob Shearman : ole32: Free the memory associated with the open DLL list on unloading of ole32.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 433639f783b3b36f708a0283f70fe137198b92bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=433639f783b3b36f708a0283f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:06:35 2007 +0000 ole32: Free the memory associated with the open DLL list on unloading of ole32. --- dlls/ole32/compobj.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4bd8e81..154ebc5 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -965,6 +965,21 @@ static void COMPOBJ_DllList_ReleaseRef(OpenDll *entry, BOOL free_entry) } } +/* frees memory associated with active dll list */ +static void COMPOBJ_DllList_Free(void) +{ + OpenDll *entry, *cursor2; + EnterCriticalSection(&csOpenDllList); + LIST_FOR_EACH_ENTRY_SAFE(entry, cursor2, &openDllList, OpenDll, entry) + { + list_remove(&entry->entry); + + HeapFree(GetProcessHeap(), 0, entry->library_name); + HeapFree(GetProcessHeap(), 0, entry); + } + LeaveCriticalSection(&csOpenDllList); +} + /****************************************************************************** * CoBuildVersion [OLE32.@] * CoBuildVersion [COMPOBJ.1] @@ -3721,6 +3736,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) OLEDD_UnInitialize(); COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); + COMPOBJ_DllList_Free(); OLE32_hInstance = 0; break;

1 0

Rob Shearman : ole32: Initialise data_cf in DataCacheEntry' s to zero to indicate no data present on creation.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 1dc91c41a7615f3910df922403280827f314f847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc91c41a7615f3910df92240… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:06:24 2007 +0000 ole32: Initialise data_cf in DataCacheEntry's to zero to indicate no data present on creation. --- dlls/ole32/datacache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 57cbbf5..1b43eb5 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -295,6 +295,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc (*cache_entry)->fmtetc.ptd = HeapAlloc(GetProcessHeap(), 0, formatetc->ptd->tdSize); memcpy((*cache_entry)->fmtetc.ptd, formatetc->ptd, formatetc->ptd->tdSize); } + (*cache_entry)->data_cf = 0; (*cache_entry)->stgmedium.tymed = TYMED_NULL; (*cache_entry)->stgmedium.pUnkForRelease = NULL; (*cache_entry)->storage = NULL;

1 0

Rob Shearman : ole32: Fix a leak of a moniker object in test_default_handler.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: dd527a7d2cb5ef3b2cd7ac54456e9217322aa00f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd527a7d2cb5ef3b2cd7ac544… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:06:19 2007 +0000 ole32: Fix a leak of a moniker object in test_default_handler. --- dlls/ole32/tests/ole2.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4eb6be6..bcac1b4 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1395,6 +1395,7 @@ static void test_default_handler(void) ok_ole_success(hr, "CreateItemMoniker"); hr = IOleObject_SetMoniker(pObject, OLEWHICHMK_CONTAINER, pMoniker); ok_ole_success(hr, "IOleObject_SetMoniker"); + IMoniker_Release(pMoniker); hr = IOleObject_GetMoniker(pObject, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &pMoniker); ok(hr == E_FAIL, "IOleObject_GetMoniker should have returned E_FAIL instead of 0x%08x\n", hr);

1 0

Rob Shearman : ole32: Fix a memory leak in DataCacheEntry_Save.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 8f6218a7c8d291a66a6d4c7916abccc3ee9872ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6218a7c8d291a66a6d4c791… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:06:11 2007 +0000 ole32: Fix a memory leak in DataCacheEntry_Save. --- dlls/ole32/datacache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 249882e..57cbbf5 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -750,6 +750,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *This, IStorage *storage, if (data) hr = IStream_Write(pres_stream, data, header.dwSize, NULL); + HeapFree(GetProcessHeap(), 0, data); IStream_Release(pres_stream); return hr;

1 0

Rob Shearman : ole32: Fix a memory leak of moniker in RunningObjectTableImpl_Register.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 5885be4e11a1a6e68e6a0a23a651728b41e9e944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5885be4e11a1a6e68e6a0a23a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:05:51 2007 +0000 ole32: Fix a memory leak of moniker in RunningObjectTableImpl_Register. --- dlls/ole32/moniker.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index f6c1ca1..c4975b9 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -544,6 +544,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, IMoniker_Release(pmkObjectName); if (hr != S_OK) { + HeapFree(GetProcessHeap(), 0, moniker); rot_entry_delete(rot_entry); return hr; } @@ -567,6 +568,7 @@ RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD grfFlags, } break; } + HeapFree(GetProcessHeap(), 0, moniker); if (FAILED(hr)) { rot_entry_delete(rot_entry);

1 0

Rob Shearman : ole32: Fix a leak of the IBindCtx object in FileMonikerImpl_IsEqual.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 3bd222004ed975ab35509109eb36bfdd5385854e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bd222004ed975ab35509109e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:05:42 2007 +0000 ole32: Fix a leak of the IBindCtx object in FileMonikerImpl_IsEqual. --- dlls/ole32/filemoniker.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index cc8eae9..8702d0f 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -793,13 +793,15 @@ FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) res = CreateBindCtx(0,&bind); if (FAILED(res)) return res; + res = S_FALSE; if (SUCCEEDED(IMoniker_GetDisplayName(pmkOtherMoniker,bind,NULL,&filePath))) { - int result = lstrcmpiW(filePath, This->filePathName); + if (!lstrcmpiW(filePath, This->filePathName)) + res = S_OK; CoTaskMemFree(filePath); - if ( result == 0 ) return S_OK; } - return S_FALSE; + IBindCtx_Release(bind); + return res; } /******************************************************************************

1 0

Rob Shearman : ole32: Fix a memory leak in get_moniker_comparison_data.
by Alexandre Julliard Nov. 12, 2007

Nov. 12, 2007

Module: wine Branch: master Commit: 2249565eb76cfb53567defe268e90d327fb9e6dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2249565eb76cfb53567defe26… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Nov 10 16:05:31 2007 +0000 ole32: Fix a memory leak in get_moniker_comparison_data. --- dlls/ole32/moniker.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index c704a50..f6c1ca1 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -279,6 +279,7 @@ static HRESULT get_moniker_comparison_data(IMoniker *pMoniker, MonikerComparison memcpy(&(*moniker_data)->abData[0], &clsid, sizeof(clsid)); memcpy(&(*moniker_data)->abData[sizeof(clsid)], pszDisplayName, (len+1)*sizeof(WCHAR)); + CoTaskMemFree(pszDisplayName); } return S_OK; }

1 0