wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Hans Leidekker : msi: Initialize the installation context from the registry if the product is installed .
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: db6dbcf2a2f44715052e8efba824a624d24eb295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6dbcf2a2f44715052e8efba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:15 2011 +0200 msi: Initialize the installation context from the registry if the product is installed. --- dlls/msi/action.c | 17 +++++++++-------- dlls/msi/msi.c | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index bea3052..71f4f6a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -488,14 +488,15 @@ static BOOL needs_ui_sequence(MSIPACKAGE *package) UINT msi_set_context(MSIPACKAGE *package) { - int num; - - package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; - - num = msi_get_property_int(package->db, szAllUsers, 0); - if (num == 1 || num == 2) - package->Context = MSIINSTALLCONTEXT_MACHINE; - + UINT r = msi_locate_product( package->ProductCode, &package->Context ); + if (r != ERROR_SUCCESS) + { + int num = msi_get_property_int( package->db, szAllUsers, 0 ); + if (num == 1 || num == 2) + package->Context = MSIINSTALLCONTEXT_MACHINE; + else + package->Context = MSIINSTALLCONTEXT_USERUNMANAGED; + } return ERROR_SUCCESS; } diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 2a8fa72..7506338 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -54,6 +54,7 @@ UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) HKEY hkey = NULL; *context = MSIINSTALLCONTEXT_NONE; + if (!szProduct) return ERROR_UNKNOWN_PRODUCT; if (MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hkey, FALSE) == ERROR_SUCCESS)

1 0

Hans Leidekker : msi: Remove local patch packages when the product is removed.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 70e3790707cd8ba40167e443fe8a415904bd0677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e3790707cd8ba40167e443f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:42:03 2011 +0200 msi: Remove local patch packages when the product is removed. --- dlls/msi/action.c | 5 +++++ dlls/msi/msipriv.h | 3 +++ dlls/msi/package.c | 24 ++++++++++++------------ dlls/msi/patch.c | 31 +++++++++++++++++++++---------- 4 files changed, 41 insertions(+), 22 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2c9c989..bea3052 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4938,6 +4938,11 @@ static UINT msi_unpublish_product( MSIPACKAGE *package, const WCHAR *remove ) LIST_FOR_EACH_ENTRY(patch, &package->patches, MSIPATCHINFO, entry) { MSIREG_DeleteUserDataPatchKey(patch->patchcode, package->Context); + if (!strcmpW( package->ProductCode, patch->products )) + { + TRACE("removing local patch package %s\n", debugstr_w(patch->localfile)); + patch->delete_on_close = TRUE; + } /* FIXME: remove local patch package if this is the last product */ } TRACE("removing local package %s\n", debugstr_w(package->localfile)); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7fb2d65..2524752 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -170,10 +170,12 @@ typedef struct tagMSIPATCHINFO { struct list entry; LPWSTR patchcode; + LPWSTR products; LPWSTR transforms; LPWSTR filename; LPWSTR localfile; MSIPATCHSTATE state; + BOOL delete_on_close; } MSIPATCHINFO; typedef struct tagMSIBINARY @@ -770,6 +772,7 @@ extern UINT msi_apply_transforms( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si ) DECLSPEC_HIDDEN; extern UINT msi_apply_patches( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) DECLSPEC_HIDDEN; +extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index c9cbad1..e635886 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -293,18 +293,6 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( package->script ); } - LIST_FOR_EACH_SAFE( item, cursor, &package->patches ) - { - MSIPATCHINFO *patch = LIST_ENTRY( item, MSIPATCHINFO, entry ); - - list_remove( &patch->entry ); - msi_free( patch->patchcode ); - msi_free( patch->transforms ); - msi_free( patch->localfile ); - msi_free( patch->filename ); - msi_free( patch ); - } - LIST_FOR_EACH_SAFE( item, cursor, &package->binaries ) { MSIBINARY *binary = LIST_ENTRY( item, MSIBINARY, entry ); @@ -329,6 +317,18 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( cab ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->patches ) + { + MSIPATCHINFO *patch = LIST_ENTRY( item, MSIPATCHINFO, entry ); + + list_remove( &patch->entry ); + if (patch->delete_on_close && !DeleteFileW( patch->localfile )) + { + ERR("failed to delete %s (%u)\n", debugstr_w(patch->localfile), GetLastError()); + } + msi_free_patchinfo( patch ); + } + msi_free( package->BaseURL ); msi_free( package->PackagePath ); msi_free( package->ProductCode ); diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index c2660ad..4801872 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -184,10 +184,16 @@ static UINT msi_parse_patch_summary( MSISUMMARYINFO *si, MSIPATCHINFO **patch ) p[1] = 0; } TRACE("patch code %s\n", debugstr_w(pi->patchcode)); - + if (!(pi->products = msi_suminfo_dup_string( si, PID_TEMPLATE ))) + { + msi_free( pi->patchcode ); + msi_free( pi ); + return ERROR_OUTOFMEMORY; + } if (!(pi->transforms = msi_suminfo_dup_string( si, PID_LASTAUTHOR ))) { msi_free( pi->patchcode ); + msi_free( pi->products ); msi_free( pi ); return ERROR_OUTOFMEMORY; } @@ -597,6 +603,16 @@ static UINT msi_apply_patch_db( MSIPACKAGE *package, MSIDATABASE *patch_db, MSIP return ERROR_SUCCESS; } +void msi_free_patchinfo( MSIPATCHINFO *patch ) +{ + msi_free( patch->patchcode ); + msi_free( patch->products ); + msi_free( patch->transforms ); + msi_free( patch->filename ); + msi_free( patch->localfile ); + msi_free( patch ); +} + static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) { static const WCHAR dotmsp[] = {'.','m','s','p',0}; @@ -646,11 +662,8 @@ done: msiobj_release( &patch_db->hdr ); if (patch && r != ERROR_SUCCESS) { - msi_free( patch->patchcode ); - msi_free( patch->transforms ); - msi_free( patch->filename ); - msi_free( patch->localfile ); - msi_free( patch ); + DeleteFileW( patch->localfile ); + msi_free_patchinfo( patch ); } return r; } @@ -756,6 +769,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) if (!patch_info->localfile) { msiobj_release( &patch_db->hdr ); + msi_free_patchinfo( patch_info ); return ERROR_OUTOFMEMORY; } r = msi_apply_patch_db( package, patch_db, patch_info ); @@ -763,10 +777,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) if (r != ERROR_SUCCESS) { ERR("failed to apply patch %u\n", r); - msi_free( patch_info->patchcode ); - msi_free( patch_info->transforms ); - msi_free( patch_info->localfile ); - msi_free( patch_info ); + msi_free_patchinfo( patch_info ); } return r; }

1 0

Hans Leidekker : msi: Don't create a temporary copy of the package.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 621b0405c90ef57429f869529106ee28dc32812d URL: http://source.winehq.org/git/wine.git/?a=commit;h=621b0405c90ef57429f869529… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:41:43 2011 +0200 msi: Don't create a temporary copy of the package. There's no need for it now that we open the package in transacted mode. --- dlls/msi/action.c | 30 +------ dlls/msi/msi.c | 2 +- dlls/msi/msipriv.h | 5 +- dlls/msi/package.c | 230 ++++++++++++++++++++++++++++++++-------------------- dlls/msi/patch.c | 2 +- 5 files changed, 151 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=621b0405c90ef57429f86…

1 0

Hans Leidekker : msi: Print a warning instead of a fixme if we fail to open the database.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 0f67869d8402150ab9a555b4d705e137faf52483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f67869d8402150ab9a555b4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:41:27 2011 +0200 msi: Print a warning instead of a fixme if we fail to open the database. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a3e61d9..3813f30 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -373,7 +373,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) if( FAILED( r ) || !stg ) { - FIXME("open failed r = %08x for %s\n", r, debugstr_w(szDBPath)); + WARN("open failed r = %08x for %s\n", r, debugstr_w(szDBPath)); return ERROR_FUNCTION_FAILED; }

1 0

Hans Leidekker : msi/tests: Use a package code that is different from the product code.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 763e2f3edc814504e3af841d87de08ad135824a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=763e2f3edc814504e3af841d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 23 14:41:14 2011 +0200 msi/tests: Use a package code that is different from the product code. --- dlls/msi/tests/patch.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index 4c6db56..89d5bd0 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -286,7 +286,7 @@ static void set_suminfo( const char *filename ) r = MsiSummaryInfoSetProperty( hsi, 7, VT_LPSTR, 0, NULL, ";1033" ); ok( r == ERROR_SUCCESS, "failed to set summary info %u\n", r ); - r = MsiSummaryInfoSetProperty( hsi, 9, VT_LPSTR, 0, NULL, "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}" ); + r = MsiSummaryInfoSetProperty( hsi, 9, VT_LPSTR, 0, NULL, "{E528DDD6-4801-4BEC-BBB6-C5EE0FD097E9}" ); ok( r == ERROR_SUCCESS, "failed to set summary info %u\n", r ); r = MsiSummaryInfoSetProperty( hsi, 14, VT_I4, 100, NULL, NULL );

1 0

Huw Davies : gdi32: Add an exception handler to catch bad pointers passed by an application.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 75e2e9cf3fd127774259931259355c29643a7bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e2e9cf3fd12777425993125… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:49:53 2011 +0100 gdi32: Add an exception handler to catch bad pointers passed by an application. --- dlls/gdi32/dibdrv/dc.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 962c7da..234f827 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -23,6 +23,7 @@ #include "gdi_private.h" #include "dibdrv.h" +#include "wine/exception.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dib); @@ -272,7 +273,16 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) return ERROR_BAD_FORMAT; - ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + __TRY + { + ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + } + __EXCEPT_PAGE_FAULT + { + WARN( "invalid bits pointer %p\n", src_bits ); + ret = FALSE; + } + __ENDTRY /* We shared the color tables, so there's no need to free the dib_infos here */ if(!ret) return ERROR_BAD_FORMAT;

1 0

Huw Davies : gdi32: Remove an unneeded level of indentation.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 597edc503f75946a71c2d38cd3711cb33986374f URL: http://source.winehq.org/git/wine.git/?a=commit;h=597edc503f75946a71c2d38cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:49:52 2011 +0100 gdi32: Remove an unneeded level of indentation. --- dlls/gdi32/dib.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index add3a70..65e9e1b 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -614,14 +614,12 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, if (ptr) { err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); - { - if (src_bits.free) src_bits.free( &src_bits ); - src_bits.ptr = ptr; - src_bits.is_copy = TRUE; - src_bits.free = free_heap_bits; - if (!err) - err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); - } + if (src_bits.free) src_bits.free( &src_bits ); + src_bits.ptr = ptr; + src_bits.is_copy = TRUE; + src_bits.free = free_heap_bits; + if (!err) + err = funcs->pPutImage( NULL, hbitmap, clip, dst_info, &src_bits, &src, &dst, 0 ); } else err = ERROR_OUTOFMEMORY; }

1 0

Huw Davies : gdi32: Add support for all of the ternary rops.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 1def8d635a8f09321ec7df29c07643e1f130b7d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1def8d635a8f09321ec7df29c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:32 2011 +0100 gdi32: Add support for all of the ternary rops. --- dlls/gdi32/dibdrv/bitblt.c | 524 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 514 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1def8d635a8f09321ec7d…

1 0

Huw Davies : gdi32: Add a copy_rect helper function.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 95f1abc8d87e462c90ba6d5e66a986eff71fe0ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f1abc8d87e462c90ba6d5e6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:31 2011 +0100 gdi32: Add a copy_rect helper function. --- dlls/gdi32/dibdrv/bitblt.c | 51 ++++++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 9e6c74f..3e4de88 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -27,6 +27,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +static DWORD copy_rect( dib_info *dst, const RECT *dst_rect, const dib_info *src, const RECT *src_rect, + HRGN clip, INT rop2 ) +{ + POINT origin; + RECT clipped_rect; + const WINEREGION *clip_data; + int i; + + origin.x = src_rect->left; + origin.y = src_rect->top; + + if (clip == NULL) dst->funcs->copy_rect( dst, dst_rect, src, &origin, rop2 ); + else + { + clip_data = get_wine_region( clip ); + for (i = 0; i < clip_data->numRects; i++) + { + if (intersect_rect( &clipped_rect, dst_rect, clip_data->rects + i )) + { + origin.x = src_rect->left + clipped_rect.left - dst_rect->left; + origin.y = src_rect->top + clipped_rect.top - dst_rect->top; + dst->funcs->copy_rect( dst, &clipped_rect, src, &origin, rop2 ); + } + } + release_wine_region( clip ); + } + return ERROR_SUCCESS; +} + static void set_color_info( const dib_info *dib, BITMAPINFO *info ) { DWORD *masks = (DWORD *)info->bmiColors; @@ -182,8 +211,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info dib_info src_dib; HRGN saved_clip = NULL; dibdrv_physdev *pdev = NULL; - const WINEREGION *clip_data; - int i, rop2; + int rop2; TRACE( "%p %p %p\n", dev, hbitmap, info ); @@ -244,24 +272,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info rop2 = ((rop >> 16) & 0xf) + 1; - if (clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); - else - { - clip_data = get_wine_region( clip ); - for (i = 0; i < clip_data->numRects; i++) - { - RECT clipped_rect; - - if (intersect_rect( &clipped_rect, &dst->visrect, clip_data->rects + i )) - { - origin.x = src->visrect.left + clipped_rect.left - dst->visrect.left; - origin.y = src->visrect.top + clipped_rect.top - dst->visrect.top; - dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); - } - } - release_wine_region( clip ); - } - ret = ERROR_SUCCESS; + ret = copy_rect( dib, &dst->visrect, &src_dib, &src->visrect, clip, rop2 ); if (saved_clip) restore_clipping_region( pdev, saved_clip );

1 0

Huw Davies : gdi32: Move the dib driver' s GetImage and PutImage to a new source file.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: ff307d573acd7d6472844925a8ed740d485d3aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff307d573acd7d6472844925a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 23 11:16:30 2011 +0100 gdi32: Move the dib driver's GetImage and PutImage to a new source file. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/dibdrv/bitblt.c | 280 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 261 +---------------------------------------- dlls/gdi32/dibdrv/dibdrv.h | 12 ++ 4 files changed, 297 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff307d573acd7d6472844…

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011