January 2011 - Wine-commits

Hans Leidekker : msi: Clean up better when removing a product.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 701f14801f6fa05ba871bfb0da56d55073133b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=701f14801f6fa05ba871bfb0d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 20 09:06:47 2011 +0100 msi: Clean up better when removing a product. --- dlls/msi/action.c | 15 +++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/registry.c | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4bd5157..5a97d17 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5139,21 +5139,16 @@ static UINT msi_unpublish_product(MSIPACKAGE *package, WCHAR *remove) MSIREG_DeleteUserDataProductKey(package->ProductCode); MSIREG_DeleteUninstallKey(package); - if (package->Context == MSIINSTALLCONTEXT_MACHINE) - { - MSIREG_DeleteLocalClassesProductKey(package->ProductCode); - MSIREG_DeleteLocalClassesFeaturesKey(package->ProductCode); - } - else - { - MSIREG_DeleteUserProductKey(package->ProductCode); - MSIREG_DeleteUserFeaturesKey(package->ProductCode); - } + MSIREG_DeleteLocalClassesProductKey(package->ProductCode); + MSIREG_DeleteLocalClassesFeaturesKey(package->ProductCode); + MSIREG_DeleteUserProductKey(package->ProductCode); + MSIREG_DeleteUserFeaturesKey(package->ProductCode); upgrade = msi_dup_property(package->db, szUpgradeCode); if (upgrade) { MSIREG_DeleteUserUpgradeCodesKey(upgrade); + MSIREG_DeleteClassesUpgradeCodesKey(upgrade); msi_free(upgrade); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 47a35b8..b9eb3ea 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -836,6 +836,7 @@ extern UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserFeaturesKey(LPCWSTR szProduct); extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent, LPCWSTR szUserSid); extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode); +extern UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode); extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create); extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode); extern UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 926c90d..017aa24 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1182,6 +1182,21 @@ UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL cr return RegOpenKeyW(HKEY_CLASSES_ROOT, keypath, key); } +UINT MSIREG_DeleteClassesUpgradeCodesKey(LPCWSTR szUpgradeCode) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n", debugstr_w(szUpgradeCode)); + if (!squash_guid(szUpgradeCode, squished_pc)) + return ERROR_FUNCTION_FAILED; + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath, szInstaller_ClassesUpgrade_fmt, squished_pc); + + return RegDeleteTreeW(HKEY_CLASSES_ROOT, keypath); +} + /************************************************************************* * MsiDecomposeDescriptorW [MSI.@] *

1 0

Hans Leidekker : msi/tests: More tests for publishing and unpublishing assemblies.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 167e4eff6d0f8e1d6662372e8a7289ceb88cb827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167e4eff6d0f8e1d6662372e8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 20 09:07:05 2011 +0100 msi/tests: More tests for publishing and unpublishing assemblies. --- dlls/msi/tests/action.c | 84 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 241a917..d018439 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5830,6 +5830,18 @@ static void test_publish_assemblies(void) "<assemblyIdentity type=\"win32\" name=\"Wine.Win32.Local.Assembly\" " "version=\"1.0.0.0\" publicKeyToken=\"abcdef0123456789\" " "processorArchitecture=\"x86\"/>"; + static const char classes_path_dotnet[] = + "Installer\\Assemblies\\Global"; + static const char classes_path_dotnet_local[] = + "Installer\\Assemblies\\C:|Program Files|msitest|application_dotnet.txt"; + static const char classes_path_dotnet_local_wow64[] = + "Installer\\Assemblies\\C:|Program Files (x86)|msitest|application_dotnet.txt"; + static const char classes_path_win32[] = + "Installer\\Win32Assemblies\\Global"; + static const char classes_path_win32_local[] = + "Installer\\Win32Assemblies\\C:|Program Files|msitest|application_win32.txt"; + static const char classes_path_win32_local_wow64[] = + "Installer\\Win32Assemblies\\C:|Program Files (x86)|msitest|application_win32.txt"; static const char path_dotnet[] = "Software\\Microsoft\\Installer\\Assemblies\\Global"; static const char path_dotnet_local[] = @@ -5919,19 +5931,87 @@ static void test_publish_assemblies(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (res == ERROR_SUCCESS) + { + res = RegDeleteValueA(hkey, name_dotnet); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegCloseKey(hkey); + } path = (is_wow64 || is_64bit) ? path_dotnet_local_wow64 : path_dotnet_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (res == ERROR_SUCCESS) + { + res = RegDeleteValueA(hkey, name_win32); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegCloseKey(hkey); + } path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + r = MsiInstallProductA(msifile, "ALLUSERS=1"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + todo_wine { + res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); + RegCloseKey(hkey); + + path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; + res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_dotnet_local, "rcHQPHq?CA(a)Uv-XqMI1e>LF,8A?0d.AW(a)vcZ$Cgox"); + RegCloseKey(hkey); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + RegCloseKey(hkey); + + path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; + res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + RegCloseKey(hkey); + } + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (res == ERROR_SUCCESS) + { + res = RegDeleteValueA(hkey, name_dotnet); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegCloseKey(hkey); + } + + path = (is_wow64 || is_64bit) ? classes_path_dotnet_local_wow64 : classes_path_dotnet_local; + res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + + res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); + ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); + if (res == ERROR_SUCCESS) + { + res = RegDeleteValueA(hkey, name_win32); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + RegCloseKey(hkey); + } + + path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; + res = RegOpenKeyA(HKEY_CLASSES_ROOT, path, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); + done: DeleteFileA("msitest\\win32.txt"); DeleteFileA("msitest\\win32_local.txt");

1 0

Michael Stefaniuc : ole2.dll16: Add missing ILockBytes:: Stat to the vtbl initialisation.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: d2bad4880dc791539929be74c7cec41bd73886f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2bad4880dc791539929be74c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 11:09:54 2011 +0100 ole2.dll16: Add missing ILockBytes::Stat to the vtbl initialisation. --- dlls/ole2.dll16/memlockbytes.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 538f388..11344ba 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -118,6 +118,7 @@ HGLOBALLockBytesImpl16_Construct(HGLOBAL16 hGlobal, VTENT(SetSize); VTENT(LockRegion); VTENT(UnlockRegion); + VTENT(Stat); #undef VTENT msegvt16 = MapLS( &vt16 ); }

1 0

Michael Stefaniuc : ole2.dll16: COM cleanup for the ILockBytes16 iface.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 40753023c2ea6354abc4f8270ceb18ab47bb3f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40753023c2ea6354abc4f8270… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 11:10:36 2011 +0100 ole2.dll16: COM cleanup for the ILockBytes16 iface. --- dlls/ole2.dll16/memlockbytes.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 11344ba..80153df 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -48,12 +48,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ struct HGLOBALLockBytesImpl16 { - /* - * Needs to be the first item in the struct - * since we want to cast this in an ILockBytes pointer - */ - const ILockBytes16Vtbl *lpVtbl; - LONG ref; + ILockBytes16 ILockBytes16_iface; + LONG ref; /* * Support for the LockBytes object @@ -79,6 +75,11 @@ typedef struct HGLOBALLockBytesImpl16 HGLOBALLockBytesImpl16; * */ +static inline HGLOBALLockBytesImpl16 *impl_from_ILockBytes16(ILockBytes16 *iface) +{ + return CONTAINING_RECORD(iface, HGLOBALLockBytesImpl16, ILockBytes16_iface); +} + /****************************************************************************** * This is the constructor for the HGLOBALLockBytesImpl16 class. * @@ -122,8 +123,8 @@ HGLOBALLockBytesImpl16_Construct(HGLOBAL16 hGlobal, #undef VTENT msegvt16 = MapLS( &vt16 ); } - newLockBytes->lpVtbl = (const ILockBytes16Vtbl*)msegvt16; - newLockBytes->ref = 0; + newLockBytes->ILockBytes16_iface.lpVtbl = (const ILockBytes16Vtbl*)msegvt16; + newLockBytes->ref = 0; /* * Initialize the support. */ @@ -177,7 +178,7 @@ static void HGLOBALLockBytesImpl16_Destroy(HGLOBALLockBytesImpl16* This) */ ULONG CDECL HGLOBALLockBytesImpl16_AddRef(ILockBytes16* iface) { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); TRACE("(%p)\n",This); @@ -227,7 +228,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_QueryInterface( * Query Interface always increases the reference count by one when it is * successful */ - HGLOBALLockBytesImpl16_AddRef((ILockBytes16*)This); + HGLOBALLockBytesImpl16_AddRef(&This->ILockBytes16_iface); return S_OK; } @@ -238,7 +239,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_QueryInterface( */ ULONG CDECL HGLOBALLockBytesImpl16_Release(ILockBytes16* iface) { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); ULONG ref; TRACE("(%p)\n",This); @@ -268,7 +269,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt( ULONG cb, /* [in] */ ULONG* pcbRead) /* [out] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); void* supportBuffer; ULONG bytesReadBuffer = 0; @@ -337,7 +338,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_SetSize( ILockBytes16* iface, ULARGE_INTEGER libNewSize) /* [in] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); HGLOBAL16 supportHandle; TRACE("(%p,%d)\n",This,libNewSize.u.LowPart); @@ -379,7 +380,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt( ULONG cb, /* [in] */ ULONG* pcbWritten) /* [out] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); void* supportBuffer; ULARGE_INTEGER newSize; @@ -485,7 +486,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_Stat( STATSTG16* pstatstg, /* [out] */ DWORD grfStatFlag) /* [in] */ { - HGLOBALLockBytesImpl16* const This=(HGLOBALLockBytesImpl16*)iface; + HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); memset(pstatstg, 0, sizeof(STATSTG16)); @@ -520,8 +521,7 @@ HRESULT WINAPI CreateILockBytesOnHGlobal16( newLockBytes = HGLOBALLockBytesImpl16_Construct(hGlobal, fDeleteOnRelease); if (newLockBytes != NULL) - return HGLOBALLockBytesImpl16_QueryInterface((ILockBytes16*)newLockBytes, - &IID_ILockBytes, - (void**)ppLkbyt); + return HGLOBALLockBytesImpl16_QueryInterface(&newLockBytes->ILockBytes16_iface, + &IID_ILockBytes, (void**)ppLkbyt); return E_OUTOFMEMORY; }

1 0

Nikolay Sivov : shell32: Fix interface leak while adding tree items.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 99f0c0a16dbbabdb1047ea03f8d58a5f917d5ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f0c0a16dbbabdb1047ea03f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 01:35:25 2011 +0300 shell32: Fix interface leak while adding tree items. --- dlls/shell32/brsfolder.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 77c55c8..e990c61 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -414,7 +414,7 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf, SetCapture( hwnd ); SetCursor( LoadCursorA( 0, (LPSTR)IDC_WAIT ) ); - while (NOERROR == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched)) + while (S_OK == IEnumIDList_Next(lpe,1,&pidlTemp,&ulFetched)) { ULONG ulAttrs = SFGAO_HASSUBFOLDER | SFGAO_FOLDER; IEnumIDList* pEnumIL = NULL; @@ -521,14 +521,18 @@ static LRESULT BrsFolder_Treeview_Expand( browse_info *info, NMTREEVIEWW *pnmtv if (!_ILIsEmpty(lptvid->lpi)) { r = IShellFolder_BindToObject( lptvid->lpsfParent, lptvid->lpi, 0, - &IID_IShellFolder, (LPVOID *)&lpsf2 ); + &IID_IShellFolder, (void**)&lpsf2 ); } else { lpsf2 = lptvid->lpsfParent; - r = IShellFolder_AddRef(lpsf2); + IShellFolder_AddRef(lpsf2); + r = S_OK; } if (SUCCEEDED(r)) + { FillTreeView( info, lpsf2, lptvid->lpifq, pnmtv->itemNew.hItem, lptvid->pEnumIL); + IShellFolder_Release( lpsf2 ); + } /* My Computer is already sorted and trying to do a simple text * sort will only mess things up */

1 0

Nikolay Sivov : shell32: Free cloned PIDL after tree initialization ( Valgrind).
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 2d542fa752506c551fbd1c792016fa8f1dc6f9c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d542fa752506c551fbd1c792… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 01:41:18 2011 +0300 shell32: Free cloned PIDL after tree initialization (Valgrind). --- dlls/shell32/brsfolder.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index e990c61..705bdfa 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -228,6 +228,7 @@ static void InitializeTreeView( browse_info *info ) hr = SHGetDesktopFolder(&lpsfDesktop); if (FAILED(hr)) { WARN("SHGetDesktopFolder failed! hr = %08x\n", hr); + ILFree(pidlChild); return; } hr = IShellFolder_BindToObject(lpsfDesktop, pidlParent, 0, &IID_IShellFolder, (LPVOID*)&lpsfParent); @@ -236,6 +237,7 @@ static void InitializeTreeView( browse_info *info ) if (FAILED(hr)) { WARN("Could not bind to parent shell folder! hr = %08x\n", hr); + ILFree(pidlChild); return; } @@ -249,6 +251,7 @@ static void InitializeTreeView( browse_info *info ) if (FAILED(hr)) { WARN("Could not bind to root shell folder! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); + ILFree(pidlChild); return; } @@ -258,6 +261,7 @@ static void InitializeTreeView( browse_info *info ) WARN("Could not get child iterator! hr = %08x\n", hr); IShellFolder_Release(lpsfParent); IShellFolder_Release(lpsfRoot); + ILFree(pidlChild); return; } @@ -266,6 +270,7 @@ static void InitializeTreeView( browse_info *info ) pidlParent, pEnumChildren, TVI_ROOT ); SendMessageW( info->hwndTreeView, TVM_EXPAND, TVE_EXPAND, (LPARAM)item ); + ILFree(pidlChild); IShellFolder_Release(lpsfRoot); IShellFolder_Release(lpsfParent); }

1 0

Nikolay Sivov : shell32/tests: Close find file handle (Valgrind).
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 1413e1d6d83817f93fbeeac02a9f24586806212b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1413e1d6d83817f93fbeeac02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 01:46:49 2011 +0300 shell32/tests: Close find file handle (Valgrind). --- dlls/shell32/tests/brsfolder.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 16d4597..fd547cb 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -56,6 +56,7 @@ static int get_number_of_folders(LPCSTR path) } while (FindNextFile(find_handle, &find_data) != 0); + FindClose(find_handle); return number_of_folders; }

1 0

Michael Stefaniuc : compobj.dll16: COM cleanup for the IMalloc16 iface.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: c2f6d0597265cf837a0bac2b5ab6268d71ada557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f6d0597265cf837a0bac2b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 02:00:29 2011 +0100 compobj.dll16: COM cleanup for the IMalloc16 iface. --- dlls/compobj.dll16/compobj.c | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index 8b67322..f4b5d5d 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -88,17 +88,20 @@ static LPMALLOC16 currentMalloc16=NULL; typedef struct { - /* IUnknown fields */ - const IMalloc16Vtbl *lpVtbl; - DWORD ref; - /* IMalloc16 fields */ + IMalloc16 IMalloc16_iface; + DWORD ref; } IMalloc16Impl; +static inline IMalloc16Impl *impl_from_IMalloc16(IMalloc16 *iface) +{ + return CONTAINING_RECORD(iface, IMalloc16Impl, IMalloc16_iface); +} + /****************************************************************************** * IMalloc16_QueryInterface [COMPOBJ.500] */ HRESULT CDECL IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) { - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj); if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) || @@ -114,7 +117,8 @@ HRESULT CDECL IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID * * IMalloc16_AddRef [COMPOBJ.501] */ ULONG CDECL IMalloc16_fnAddRef(IMalloc16* iface) { - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->AddRef()\n",This); return 1; /* cannot be freed */ } @@ -123,7 +127,8 @@ ULONG CDECL IMalloc16_fnAddRef(IMalloc16* iface) { * IMalloc16_Release [COMPOBJ.502] */ ULONG CDECL IMalloc16_fnRelease(IMalloc16* iface) { - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->Release()\n",This); return 1; /* cannot be freed */ } @@ -132,7 +137,8 @@ ULONG CDECL IMalloc16_fnRelease(IMalloc16* iface) { * IMalloc16_Alloc [COMPOBJ.503] */ SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) { - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->Alloc(%d)\n",This,cb); return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) ); } @@ -143,7 +149,7 @@ SEGPTR CDECL IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) { VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) { void *ptr = MapSL(pv); - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); TRACE("(%p)->Free(%08x)\n",This,pv); UnMapLS(pv); HeapFree( GetProcessHeap(), 0, ptr ); @@ -155,7 +161,8 @@ VOID CDECL IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) { SEGPTR ret; - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->Realloc(%08x,%d)\n",This,pv,cb); if (!pv) ret = IMalloc16_fnAlloc(iface, cb); @@ -174,7 +181,8 @@ SEGPTR CDECL IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) */ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) { - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->GetSize(%08x)\n",This,pv); return HeapSize( GetProcessHeap(), 0, MapSL(pv) ); } @@ -183,7 +191,8 @@ DWORD CDECL IMalloc16_fnGetSize(IMalloc16* iface,SEGPTR pv) * IMalloc16_DidAlloc [COMPOBJ.507] */ INT16 CDECL IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { - IMalloc16 *This = iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; } @@ -192,7 +201,8 @@ INT16 CDECL IMalloc16_fnDidAlloc(IMalloc16* iface,LPVOID pv) { * IMalloc16_HeapMinimize [COMPOBJ.508] */ LPVOID CDECL IMalloc16_fnHeapMinimize(IMalloc16* iface) { - IMalloc16Impl *This = (IMalloc16Impl *)iface; + IMalloc16Impl *This = impl_from_IMalloc16(iface); + TRACE("(%p)->HeapMinimize()\n",This); return NULL; } @@ -224,7 +234,7 @@ IMalloc16_Constructor(void) #undef VTENT msegvt16 = MapLS( &vt16 ); } - This->lpVtbl = (const IMalloc16Vtbl*)msegvt16; + This->IMalloc16_iface.lpVtbl = (const IMalloc16Vtbl*)msegvt16; This->ref = 1; return (LPMALLOC16)MapLS( This ); }

1 0

Michael Stefaniuc : explorerframe: COM cleanup for the IClassFactory iface.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 4156a8045260bb2be8e7f2db91cabcf323e94a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4156a8045260bb2be8e7f2db9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 01:59:16 2011 +0100 explorerframe: COM cleanup for the IClassFactory iface. --- dlls/explorerframe/explorerframe_main.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.c b/dlls/explorerframe/explorerframe_main.c index 365898f..a62d885 100644 --- a/dlls/explorerframe/explorerframe_main.c +++ b/dlls/explorerframe/explorerframe_main.c @@ -101,22 +101,22 @@ HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) /************************************************************************* * Implement the ExplorerFrame class factory - * - * (Taken from shdocvw/factory.c; based on implementation in - * ddraw/main.c) */ -#define FACTORY(x) ((IClassFactory*) &(x)->lpClassFactoryVtbl) - typedef struct { - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*cf)(IUnknown*, REFIID, void**); LONG ref; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + /************************************************************************* - * EFCF_QueryInterface (IUnknown) + * EFCF_QueryInterface */ static HRESULT WINAPI EFCF_QueryInterface(IClassFactory* iface, REFIID riid, void **ppobj) @@ -140,7 +140,7 @@ static HRESULT WINAPI EFCF_QueryInterface(IClassFactory* iface, } /************************************************************************* - * EFCF_AddRef (IUnknown) + * EFCF_AddRef */ static ULONG WINAPI EFCF_AddRef(IClassFactory *iface) { @@ -150,7 +150,7 @@ static ULONG WINAPI EFCF_AddRef(IClassFactory *iface) } /************************************************************************* - * EFCF_Release (IUnknown) + * EFCF_Release */ static ULONG WINAPI EFCF_Release(IClassFactory *iface) { @@ -165,7 +165,7 @@ static ULONG WINAPI EFCF_Release(IClassFactory *iface) static HRESULT WINAPI EFCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return This->cf(pOuter, riid, ppobj); } @@ -198,12 +198,12 @@ static const IClassFactoryVtbl EFCF_Vtbl = */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - static IClassFactoryImpl NSTCClassFactory = {&EFCF_Vtbl, NamespaceTreeControl_Constructor}; + static IClassFactoryImpl NSTCClassFactory = {{&EFCF_Vtbl}, NamespaceTreeControl_Constructor}; TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); if(IsEqualGUID(&CLSID_NamespaceTreeControl, rclsid)) - return IClassFactory_QueryInterface(FACTORY(&NSTCClassFactory), riid, ppv); + return IClassFactory_QueryInterface(&NSTCClassFactory.IClassFactory_iface, riid, ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Michael Stefaniuc : ddraw: Drop "Thunk_" from the names of the IDirect3DDevice methods.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: f4acb9bb5362806ab849862350cf83f70226e142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4acb9bb5362806ab84986235… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 20 02:03:36 2011 +0100 ddraw: Drop "Thunk_" from the names of the IDirect3DDevice methods. --- dlls/ddraw/device.c | 81 +++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 50 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 466ddd6..6587394 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -211,10 +211,8 @@ Thunk_IDirect3DDeviceImpl_2_QueryInterface(IDirect3DDevice2 *iface, return IDirect3DDevice7_QueryInterface((IDirect3DDevice7 *)device_from_device2(iface), riid, obj); } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *iface, - REFIID riid, - void **obp) +static HRESULT WINAPI IDirect3DDeviceImpl_1_QueryInterface(IDirect3DDevice *iface, REFIID riid, + void **obp) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obp); @@ -260,8 +258,7 @@ Thunk_IDirect3DDeviceImpl_2_AddRef(IDirect3DDevice2 *iface) return IDirect3DDevice7_AddRef((IDirect3DDevice7 *)device_from_device2(iface)); } -static ULONG WINAPI -Thunk_IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface) +static ULONG WINAPI IDirect3DDeviceImpl_1_AddRef(IDirect3DDevice *iface) { TRACE("iface %p.\n", iface); @@ -408,8 +405,7 @@ Thunk_IDirect3DDeviceImpl_2_Release(IDirect3DDevice2 *iface) return IDirect3DDevice7_Release((IDirect3DDevice7 *)device_from_device2(iface)); } -static ULONG WINAPI -Thunk_IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface) +static ULONG WINAPI IDirect3DDeviceImpl_1_Release(IDirect3DDevice *iface) { TRACE("iface %p.\n", iface); @@ -541,10 +537,8 @@ Thunk_IDirect3DDeviceImpl_2_GetCaps(IDirect3DDevice2 *iface, return IDirect3DDevice3_GetCaps((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, D3DHWDevDesc, D3DHELDevDesc); } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_GetCaps(IDirect3DDevice *iface, - D3DDEVICEDESC *D3DHWDevDesc, - D3DDEVICEDESC *D3DHELDevDesc) +static HRESULT WINAPI IDirect3DDeviceImpl_1_GetCaps(IDirect3DDevice *iface, + D3DDEVICEDESC *D3DHWDevDesc, D3DDEVICEDESC *D3DHELDevDesc) { IDirect3DDeviceImpl *This = device_from_device1(iface); TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, D3DHWDevDesc, D3DHELDevDesc); @@ -589,10 +583,8 @@ IDirect3DDeviceImpl_2_SwapTextureHandles(IDirect3DDevice2 *iface, return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *iface, - IDirect3DTexture *D3DTex1, - IDirect3DTexture *D3DTex2) +static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice *iface, + IDirect3DTexture *D3DTex1, IDirect3DTexture *D3DTex2) { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirectDrawSurfaceImpl *surf1 = surface_from_texture1(D3DTex1); @@ -653,9 +645,7 @@ Thunk_IDirect3DDeviceImpl_2_GetStats(IDirect3DDevice2 *iface, return IDirect3DDevice3_GetStats((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, Stats); } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_GetStats(IDirect3DDevice *iface, - D3DSTATS *Stats) +static HRESULT WINAPI IDirect3DDeviceImpl_1_GetStats(IDirect3DDevice *iface, D3DSTATS *Stats) { IDirect3DDeviceImpl *This = device_from_device1(iface); @@ -813,9 +803,8 @@ Thunk_IDirect3DDeviceImpl_2_AddViewport(IDirect3DDevice2 *iface, return IDirect3DDevice3_AddViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp); } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, - IDirect3DViewport *Direct3DViewport) +static HRESULT WINAPI IDirect3DDeviceImpl_1_AddViewport(IDirect3DDevice *iface, + IDirect3DViewport *Direct3DViewport) { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport; @@ -883,9 +872,8 @@ Thunk_IDirect3DDeviceImpl_2_DeleteViewport(IDirect3DDevice2 *iface, return IDirect3DDevice3_DeleteViewport((IDirect3DDevice3 *)&This->IDirect3DDevice3_vtbl, (IDirect3DViewport3 *)vp); } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *iface, - IDirect3DViewport *Direct3DViewport) +static HRESULT WINAPI IDirect3DDeviceImpl_1_DeleteViewport(IDirect3DDevice *iface, + IDirect3DViewport *Direct3DViewport) { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Direct3DViewport; @@ -987,11 +975,8 @@ Thunk_IDirect3DDeviceImpl_2_NextViewport(IDirect3DDevice2 *iface, return hr; } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface, - IDirect3DViewport *Viewport, - IDirect3DViewport **lplpDirect3DViewport, - DWORD Flags) +static HRESULT WINAPI IDirect3DDeviceImpl_1_NextViewport(IDirect3DDevice *iface, + IDirect3DViewport *Viewport, IDirect3DViewport **lplpDirect3DViewport, DWORD Flags) { IDirect3DDeviceImpl *This = device_from_device1(iface); IDirect3DViewportImpl *vp = (IDirect3DViewportImpl *)Viewport; @@ -1332,10 +1317,8 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, return D3D_OK; } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice *iface, - LPD3DENUMTEXTUREFORMATSCALLBACK Callback, - void *Arg) +static HRESULT WINAPI IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice *iface, + LPD3DENUMTEXTUREFORMATSCALLBACK Callback, void *Arg) { IDirect3DDeviceImpl *This = device_from_device1(iface); @@ -1615,8 +1598,7 @@ Thunk_IDirect3DDeviceImpl_2_BeginScene(IDirect3DDevice2 *iface) return IDirect3DDevice7_BeginScene((IDirect3DDevice7 *)device_from_device2(iface)); } -static HRESULT WINAPI -Thunk_IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface) +static HRESULT WINAPI IDirect3DDeviceImpl_1_BeginScene(IDirect3DDevice *iface) { TRACE("iface %p.\n", iface); @@ -1687,8 +1669,7 @@ Thunk_IDirect3DDeviceImpl_2_EndScene(IDirect3DDevice2 *iface) return IDirect3DDevice7_EndScene((IDirect3DDevice7 *)device_from_device2(iface)); } -static HRESULT WINAPI DECLSPEC_HOTPATCH -Thunk_IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface) +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDeviceImpl_1_EndScene(IDirect3DDevice *iface) { TRACE("iface %p.\n", iface); @@ -6875,28 +6856,28 @@ static const struct IDirect3DDevice2Vtbl d3d_device2_vtbl = static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = { /*** IUnknown Methods ***/ - Thunk_IDirect3DDeviceImpl_1_QueryInterface, - Thunk_IDirect3DDeviceImpl_1_AddRef, - Thunk_IDirect3DDeviceImpl_1_Release, + IDirect3DDeviceImpl_1_QueryInterface, + IDirect3DDeviceImpl_1_AddRef, + IDirect3DDeviceImpl_1_Release, /*** IDirect3DDevice1 ***/ IDirect3DDeviceImpl_1_Initialize, - Thunk_IDirect3DDeviceImpl_1_GetCaps, - Thunk_IDirect3DDeviceImpl_1_SwapTextureHandles, + IDirect3DDeviceImpl_1_GetCaps, + IDirect3DDeviceImpl_1_SwapTextureHandles, IDirect3DDeviceImpl_1_CreateExecuteBuffer, - Thunk_IDirect3DDeviceImpl_1_GetStats, + IDirect3DDeviceImpl_1_GetStats, IDirect3DDeviceImpl_1_Execute, - Thunk_IDirect3DDeviceImpl_1_AddViewport, - Thunk_IDirect3DDeviceImpl_1_DeleteViewport, - Thunk_IDirect3DDeviceImpl_1_NextViewport, + IDirect3DDeviceImpl_1_AddViewport, + IDirect3DDeviceImpl_1_DeleteViewport, + IDirect3DDeviceImpl_1_NextViewport, IDirect3DDeviceImpl_1_Pick, IDirect3DDeviceImpl_1_GetPickRecords, - Thunk_IDirect3DDeviceImpl_1_EnumTextureFormats, + IDirect3DDeviceImpl_1_EnumTextureFormats, IDirect3DDeviceImpl_1_CreateMatrix, IDirect3DDeviceImpl_1_SetMatrix, IDirect3DDeviceImpl_1_GetMatrix, IDirect3DDeviceImpl_1_DeleteMatrix, - Thunk_IDirect3DDeviceImpl_1_BeginScene, - Thunk_IDirect3DDeviceImpl_1_EndScene, + IDirect3DDeviceImpl_1_BeginScene, + IDirect3DDeviceImpl_1_EndScene, IDirect3DDeviceImpl_1_GetDirect3D };

1 0