February 2008 - Wine-commits

Dmitry Timoshkov : mscms: Allow compilation without LCMS installed.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: b9bea18cfe7571f5074b3df7bea91317aa637ad1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bea18cfe7571f5074b3df7b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 26 09:45:07 2008 +0800 mscms: Allow compilation without LCMS installed. --- dlls/mscms/transform.c | 116 +++++++++++++++++++++++------------------------ 1 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/mscms/transform.c b/dlls/mscms/transform.c index 13bc55a..ec33a10 100644 --- a/dlls/mscms/transform.c +++ b/dlls/mscms/transform.c @@ -34,6 +34,63 @@ WINE_DEFAULT_DEBUG_CHANNEL(mscms); +#ifdef HAVE_LCMS + +static DWORD from_profile( HPROFILE profile ) +{ + PROFILEHEADER header; + + GetColorProfileHeader( profile, &header ); + TRACE( "color space: 0x%08x %s\n", header.phDataColorSpace, MSCMS_dbgstr_tag( header.phDataColorSpace ) ); + + switch (header.phDataColorSpace) + { + case 0x434d594b: return TYPE_CMYK_16; /* 'CMYK' */ + case 0x47524159: return TYPE_GRAY_16; /* 'GRAY' */ + case 0x4c616220: return TYPE_Lab_16; /* 'Lab ' */ + case 0x52474220: return TYPE_RGB_16; /* 'RGB ' */ + case 0x58595a20: return TYPE_XYZ_16; /* 'XYZ ' */ + default: + WARN("unhandled format\n"); + return TYPE_RGB_16; + } +} + +static DWORD from_bmformat( BMFORMAT format ) +{ + TRACE( "bitmap format: 0x%08x\n", format ); + + switch (format) + { + case BM_RGBTRIPLETS: return TYPE_RGB_8; + case BM_BGRTRIPLETS: return TYPE_BGR_8; + case BM_GRAY: return TYPE_GRAY_8; + default: + FIXME("unhandled bitmap format\n"); + return TYPE_RGB_8; + } +} + +static DWORD from_type( COLORTYPE type ) +{ + TRACE( "color type: 0x%08x\n", type ); + + switch (type) + { + case COLOR_GRAY: return TYPE_GRAY_16; + case COLOR_RGB: return TYPE_RGB_16; + case COLOR_XYZ: return TYPE_XYZ_16; + case COLOR_Yxy: return TYPE_Yxy_16; + case COLOR_Lab: return TYPE_Lab_16; + case COLOR_CMYK: return TYPE_CMYK_16; + default: + FIXME("unhandled color type\n"); + return TYPE_RGB_16; + } +} + +#endif /* HAVE_LCMS */ + /****************************************************************************** * CreateColorTransformA [MSCMS.@] * @@ -58,28 +115,6 @@ HTRANSFORM WINAPI CreateColorTransformA( LPLOGCOLORSPACEA space, HPROFILE dest, return CreateColorTransformW( &spaceW, dest, target, flags ); } -static DWORD from_profile( HPROFILE profile ) -{ - PROFILEHEADER header; - - GetColorProfileHeader( profile, &header ); - TRACE( "color space: 0x%08x %s\n", header.phDataColorSpace, MSCMS_dbgstr_tag( header.phDataColorSpace ) ); - - switch (header.phDataColorSpace) - { - case 0x434d594b: return TYPE_CMYK_16; /* 'CMYK' */ - case 0x47524159: return TYPE_GRAY_16; /* 'GRAY' */ - case 0x4c616220: return TYPE_Lab_16; /* 'Lab ' */ - case 0x52474220: return TYPE_RGB_16; /* 'RGB ' */ - case 0x58595a20: return TYPE_XYZ_16; /* 'XYZ ' */ - default: - { - WARN("unhandled format\n"); - return TYPE_RGB_16; - } - } -} - /****************************************************************************** * CreateColorTransformW [MSCMS.@] * @@ -234,23 +269,6 @@ BOOL WINAPI DeleteColorTransform( HTRANSFORM transform ) return ret; } -static DWORD from_bmformat( BMFORMAT format ) -{ - TRACE( "bitmap format: 0x%08x\n", format ); - - switch (format) - { - case BM_RGBTRIPLETS: return TYPE_RGB_8; - case BM_BGRTRIPLETS: return TYPE_BGR_8; - case BM_GRAY: return TYPE_GRAY_8; - default: - { - FIXME("unhandled bitmap format\n"); - return TYPE_RGB_8; - } - } -} - /****************************************************************************** * TranslateBitmapBits [MSCMS.@] * @@ -295,26 +313,6 @@ BOOL WINAPI TranslateBitmapBits( HTRANSFORM transform, PVOID srcbits, BMFORMAT i return ret; } -static DWORD from_type( COLORTYPE type ) -{ - TRACE( "color type: 0x%08x\n", type ); - - switch (type) - { - case COLOR_GRAY: return TYPE_GRAY_16; - case COLOR_RGB: return TYPE_RGB_16; - case COLOR_XYZ: return TYPE_XYZ_16; - case COLOR_Yxy: return TYPE_Yxy_16; - case COLOR_Lab: return TYPE_Lab_16; - case COLOR_CMYK: return TYPE_CMYK_16; - default: - { - FIXME("unhandled color type\n"); - return TYPE_RGB_16; - } - } -} - /****************************************************************************** * TranslateColors [MSCMS.@] *

1 0

James Hawkins : msi: Search existing published sources if the media cannot be found.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: bdbb7a0348c558c4ecd93f089aacf3b335d8f9d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdbb7a0348c558c4ecd93f089… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:55:56 2008 -0600 msi: Search existing published sources if the media cannot be found. --- dlls/msi/files.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 2b8ae6f..33a3a5a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -589,6 +589,49 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf return ERROR_SUCCESS; } +/* FIXME: search NETWORK and URL sources as well */ +static UINT find_published_source(MSIPACKAGE *package, struct media_info *mi) +{ + WCHAR source[MAX_PATH]; + WCHAR volume[MAX_PATH]; + WCHAR prompt[MAX_PATH]; + DWORD volumesz, promptsz; + DWORD index, size; + WORD id; + UINT r; + + r = MsiSourceListGetInfoW(package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, source, &size); + if (r != ERROR_SUCCESS) + return r; + + index = 0; + volumesz = MAX_PATH; + promptsz = MAX_PATH; + while (MsiSourceListEnumMediaDisksW(package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, index++, &id, + volume, &volumesz, prompt, &promptsz) == ERROR_SUCCESS) + { + mi->disk_id = id; + mi->volume_label = msi_realloc(mi->volume_label, ++volumesz * sizeof(WCHAR)); + lstrcpyW(mi->volume_label, volume); + mi->disk_prompt = msi_realloc(mi->disk_prompt, ++promptsz * sizeof(WCHAR)); + lstrcpyW(mi->disk_prompt, prompt); + + if (source_matches_volume(mi, source)) + { + /* FIXME: what about SourceDir */ + lstrcpyW(mi->source, source); + lstrcatW(mi->source, mi->cabinet); + return ERROR_SUCCESS; + } + } + + return ERROR_FUNCTION_FAILED; +} + static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { UINT rc = ERROR_SUCCESS; @@ -641,8 +684,13 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m if (file->IsCompressed && GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) { - ERR("Cabinet not found: %s\n", debugstr_w(mi->source)); - return ERROR_INSTALL_FAILURE; + /* FIXME: this might be done earlier in the install process */ + rc = find_published_source(package, mi); + if (rc != ERROR_SUCCESS) + { + ERR("Cabinet not found: %s\n", debugstr_w(mi->source)); + return ERROR_INSTALL_FAILURE; + } } return ERROR_SUCCESS;

1 0

James Hawkins : msi: Publish source information in the user-unmanaged context.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 4d2cf7a44b7d738511170ca8fbc7b64857320b24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2cf7a44b7d738511170ca8f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:50:53 2008 -0600 msi: Publish source information in the user-unmanaged context. --- dlls/msi/files.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ba25f04..da92965 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -554,10 +554,10 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf lstrcatW(mi->source, mi->cabinet); } - msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, + msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, mi->disk_id, mi->volume_label, mi->disk_prompt); - msi_package_add_info(package, MSIINSTALLCONTEXT_USERMANAGED, + msi_package_add_info(package, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSISOURCETYPE_MEDIA, INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source);

1 0

James Hawkins : msi: Remove setting a source list property that' s in the wrong place.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: d62bd166dc95d092fe8cc5447531badf7f5c6469 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d62bd166dc95d092fe8cc5447… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:51:41 2008 -0600 msi: Remove setting a source list property that's in the wrong place. --- dlls/msi/files.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index da92965..8ed2395 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -739,21 +739,11 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { struct media_info *mi; UINT rc = ERROR_SUCCESS; - LPWSTR ptr; MSIFILE *file; /* increment progress bar each time action data is sent */ ui_progress(package,1,1,0,0); - /* handle the keys for the SourceList */ - ptr = strrchrW(package->PackagePath,'\\'); - if (ptr) - { - ptr++; - msi_package_add_info(package, MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, ptr); - } - schedule_install_files(package); /*

1 0

James Hawkins : msi: Read the disk prompt source list property from the user-unmanaged context.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: acfed4cfab7b2c15650d0c3fb105e93dee36cbbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfed4cfab7b2c15650d0c3fb… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:52:34 2008 -0600 msi: Read the disk prompt source list property from the user-unmanaged context. --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7058aa8..54a9fbe 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4255,13 +4255,13 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) DWORD size = 0; rc = MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, + MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW,NULL,&size); if (rc == ERROR_MORE_DATA) { prompt = msi_alloc(size * sizeof(WCHAR)); MsiSourceListGetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, + MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_DISKPROMPTW,prompt,&size); } else

1 0

James Hawkins : msi: Read the source list properties from the user-unmanaged context.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 6e2048bbc7070e5bba7f1671e4ed31a65c0356cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e2048bbc7070e5bba7f1671e… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:53:27 2008 -0600 msi: Read the source list properties from the user-unmanaged context. --- dlls/msi/msi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 13b693f..7cfafbc 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -365,12 +365,12 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, } sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); lstrcatW(sourcepath,filename); @@ -2193,11 +2193,11 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLST return r; sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); lstrcatW( sourcepath, filename ); @@ -2378,11 +2378,11 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, *ptr = 0; sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED, + MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); lstrcatW( sourcepath, filename );

1 0

James Hawkins : msi: Store the media type and set the last used source type accordingly.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 7d10d1d2d0fadbe21b8aeab5f74566a572d61283 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d10d1d2d0fadbe21b8aeab5f… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:54:14 2008 -0600 msi: Store the media type and set the last used source type accordingly. --- dlls/msi/action.c | 10 ---------- dlls/msi/files.c | 37 +++++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 54a9fbe..dee64d1 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3468,16 +3468,6 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto end; - buffer = msi_dup_property( package, cszSourceDir ); - - rc = MsiSourceListSetInfoW( package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, - INSTALLPROPERTY_LASTUSEDSOURCEW, buffer ); - msi_free(buffer); - if (rc != ERROR_SUCCESS) - goto end; - /* FIXME: Need to write more keys to the user registry */ hDb= alloc_msihandle( &package->db->hdr ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 8ed2395..2b8ae6f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -59,6 +59,7 @@ static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; struct media_info { UINT disk_id; + UINT type; UINT last_sequence; LPWSTR disk_prompt; LPWSTR cabinet; @@ -504,6 +505,8 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf { MSIRECORD *row; LPWSTR source_dir; + LPWSTR source; + DWORD options; UINT r; static const WCHAR query[] = { @@ -539,6 +542,9 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf source_dir = msi_dup_property(package, cszSourceDir); lstrcpyW(mi->source, source_dir); + PathStripToRootW(source_dir); + mi->type = GetDriveTypeW(source_dir); + if (file->IsCompressed && mi->cabinet) { if (mi->cabinet[0] == '#') @@ -554,12 +560,30 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf lstrcatW(mi->source, mi->cabinet); } - msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, - mi->disk_id, mi->volume_label, mi->disk_prompt); + options = MSICODE_PRODUCT; + if (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) + { + source = source_dir; + options |= MSISOURCETYPE_MEDIA; + } + else if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) + { + source = package->BaseURL; + options |= MSISOURCETYPE_URL; + } + else + { + source = mi->source; + options |= MSISOURCETYPE_NETWORK; + } + + if (mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) + msi_package_add_media_disk(package, MSIINSTALLCONTEXT_USERUNMANAGED, + MSICODE_PRODUCT, mi->disk_id, + mi->volume_label, mi->disk_prompt); msi_package_add_info(package, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT | MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); + options, INSTALLPROPERTY_LASTUSEDSOURCEW, source); msi_free(source_dir); return ERROR_SUCCESS; @@ -602,14 +626,11 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m { LPWSTR source = msi_dup_property(package, cszSourceDir); BOOL matches; - UINT type; - PathStripToRootW(source); - type = GetDriveTypeW(source); matches = source_matches_volume(mi, source); msi_free(source); - if ((type == DRIVE_CDROM || type == DRIVE_REMOVABLE) && !matches) + if ((mi->type == DRIVE_CDROM || mi->type == DRIVE_REMOVABLE) && !matches) { rc = msi_change_media(package, mi); if (rc != ERROR_SUCCESS)

1 0

James Hawkins : msi: Allow setting a media disk as the last used source in the internal msi_set_last_used_source .
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: cf84e2df5b2da6d4843b9566039cab1e07c2ed00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf84e2df5b2da6d4843b95660… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Tue Feb 26 01:55:01 2008 -0600 msi: Allow setting a media disk as the last used source in the internal msi_set_last_used_source. --- dlls/msi/action.c | 10 +++++++--- dlls/msi/msipriv.h | 2 ++ dlls/msi/source.c | 51 +++++++++++++++++++++++++++++++++------------------ 3 files changed, 42 insertions(+), 21 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index dee64d1..d5fad0c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3508,9 +3508,13 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) /* publish the SourceList info */ LIST_FOR_EACH_ENTRY(info, &package->sourcelist_info, MSISOURCELISTINFO, entry) { - MsiSourceListSetInfoW(package->ProductCode, NULL, - info->context, info->options, - info->property, info->value); + if (!lstrcmpW(info->property, INSTALLPROPERTY_LASTUSEDSOURCEW)) + msi_set_last_used_source(package->ProductCode, NULL, info->context, + info->options, info->value); + else + MsiSourceListSetInfoW(package->ProductCode, NULL, + info->context, info->options, + info->property, info->value); } LIST_FOR_EACH_ENTRY(disk, &package->sourcelist_media, MSIMEDIADISK, entry) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index e23261b..975ebb6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -885,6 +885,8 @@ extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); extern void msi_ui_error( DWORD msg_id, DWORD type ); +extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, + MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); /* control event stuff */ extern VOID ControlEvent_FireSubscribedEvent(MSIPACKAGE *package, LPCWSTR event, diff --git a/dlls/msi/source.c b/dlls/msi/source.c index b508569..37a0b8b 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -701,15 +701,16 @@ UINT WINAPI MsiSourceListSetInfoA(LPCSTR szProduct, LPCSTR szUserSid, return ret; } -static UINT set_last_used_source(HKEY source, LPCWSTR product, LPCWSTR usersid, - MSIINSTALLCONTEXT context, DWORD options, - LPCWSTR value) +UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, + MSIINSTALLCONTEXT context, DWORD options, + LPCWSTR value) { + HKEY source; LPWSTR buffer; WCHAR typechar; DWORD size; UINT r; - int index = 0; + int index = 1; static const WCHAR format[] = {'%','c',';','%','i',';','%','s',0}; @@ -717,27 +718,36 @@ static UINT set_last_used_source(HKEY source, LPCWSTR product, LPCWSTR usersid, typechar = 'n'; else if (options & MSISOURCETYPE_URL) typechar = 'u'; + else if (options & MSISOURCETYPE_MEDIA) + typechar = 'm'; else return ERROR_INVALID_PARAMETER; - /* make sure the source is registered */ - r = MsiSourceListAddSourceExW(product, usersid, context, - options, value, 0); - if (r != ERROR_SUCCESS) - return r; + if (!(options & MSISOURCETYPE_MEDIA)) + { + r = MsiSourceListAddSourceExW(product, usersid, context, + options, value, 0); + if (r != ERROR_SUCCESS) + return r; - while ((r = MsiSourceListEnumSourcesW(product, usersid, context, options, - index, NULL, NULL)) == ERROR_SUCCESS) - index++; + index = 0; + while ((r = MsiSourceListEnumSourcesW(product, usersid, context, options, + index, NULL, NULL)) == ERROR_SUCCESS) + index++; - if (r != ERROR_NO_MORE_ITEMS) - return r; + if (r != ERROR_NO_MORE_ITEMS) + return r; + } size = (lstrlenW(format) + lstrlenW(value) + 7) * sizeof(WCHAR); buffer = msi_alloc(size); if (!buffer) return ERROR_OUTOFMEMORY; + r = OpenSourceKey(product, &source, MSICODE_PRODUCT, context, FALSE); + if (r != ERROR_SUCCESS) + return r; + sprintfW(buffer, format, typechar, index, value); size = (lstrlenW(buffer) + 1) * sizeof(WCHAR); @@ -745,6 +755,7 @@ static UINT set_last_used_source(HKEY source, LPCWSTR product, LPCWSTR usersid, REG_SZ, (LPBYTE)buffer, size); msi_free(buffer); + RegCloseKey(source); return r; } @@ -818,15 +829,19 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid, if (rc != ERROR_SUCCESS) rc = ERROR_UNKNOWN_PROPERTY; } - else if (strcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)==0) - rc = set_last_used_source(sourcekey, szProduct, szUserSid, dwContext, - dwOptions, szValue); + else if (!lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW)) + { + if (!(dwOptions & (MSISOURCETYPE_NETWORK | MSISOURCETYPE_URL))) + rc = ERROR_INVALID_PARAMETER; + else + rc = msi_set_last_used_source(szProduct, szUserSid, dwContext, + dwOptions, szValue); + } else rc = ERROR_UNKNOWN_PROPERTY; RegCloseKey(sourcekey); return rc; - } /******************************************************************

1 0

Andrew Talbot : dmscript: Assign to structs instead of using memcpy.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: e1062df14bd2cea5026aad904944093ea1d9b02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1062df14bd2cea5026aad904… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 19:48:22 2008 +0000 dmscript: Assign to structs instead of using memcpy. --- dlls/dmscript/script.c | 24 ++++++++++++------------ dlls/dmscript/scripttrack.c | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index a294249..3d9ae42 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -224,12 +224,12 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (L static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -237,9 +237,9 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (L if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); @@ -260,13 +260,13 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor DMUS_PRIVATE_CHUNK Chunk; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; LARGE_INTEGER liMove; /* used when skipping chunks */ - + TRACE("(%p, %p, %p)\n", This, pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicScript, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicScript; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -431,7 +431,7 @@ static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTRE static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); - memcpy(pClassID, &CLSID_DirectMusicScript, sizeof(CLSID)); + *pClassID = CLSID_DirectMusicScript; return S_OK; } @@ -704,8 +704,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl (LPCGUID lpcGUID, LPVOID* ppob obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicScript, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicScript; obj->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicScriptImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index f50ff10..d8a4697 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -284,8 +284,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVOID *ppo track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicScriptTrack, sizeof (CLSID)); + track->pDesc->guidClass = CLSID_DirectMusicScriptTrack; track->ref = 0; /* will be inited by QueryInterface */ - + return IDirectMusicScriptTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); }

1 0

Andrew Talbot : dmusic: Assign to structs instead of using memcpy.
by Alexandre Julliard 26 Feb '08

26 Feb '08

Module: wine Branch: master Commit: 6b39f35cf5ed1fa0371beab5114a00c984f8fc9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b39f35cf5ed1fa0371beab51… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Feb 25 19:48:31 2008 +0000 dmusic: Assign to structs instead of using memcpy. --- dlls/dmusic/collection.c | 20 ++++++++++---------- dlls/dmusic/port.c | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 06842c5..1fc7bd2 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -192,12 +192,12 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_GetDescripto static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { ICOM_THIS_MULTI(IDirectMusicCollectionImpl, ObjectVtbl, iface); TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc)); - + /* According to MSDN, we should copy only given values, not whole struct */ if (pDesc->dwValidData & DMUS_OBJ_OBJECT) - memcpy (&This->pDesc->guidObject, &pDesc->guidObject, sizeof (pDesc->guidObject)); + This->pDesc->guidObject = pDesc->guidObject; if (pDesc->dwValidData & DMUS_OBJ_CLASS) - memcpy (&This->pDesc->guidClass, &pDesc->guidClass, sizeof (pDesc->guidClass)); + This->pDesc->guidClass = pDesc->guidClass; if (pDesc->dwValidData & DMUS_OBJ_NAME) lstrcpynW(This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) @@ -205,9 +205,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_SetDescripto if (pDesc->dwValidData & DMUS_OBJ_FILENAME) lstrcpynW(This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME); if (pDesc->dwValidData & DMUS_OBJ_VERSION) - memcpy (&This->pDesc->vVersion, &pDesc->vVersion, sizeof (pDesc->vVersion)); + This->pDesc->vVersion = pDesc->vVersion; if (pDesc->dwValidData & DMUS_OBJ_DATE) - memcpy (&This->pDesc->ftDate, &pDesc->ftDate, sizeof (pDesc->ftDate)); + This->pDesc->ftDate = pDesc->ftDate; if (pDesc->dwValidData & DMUS_OBJ_MEMORY) { memcpy (&This->pDesc->llMemLength, &pDesc->llMemLength, sizeof (pDesc->llMemLength)); memcpy (This->pDesc->pbMemData, pDesc->pbMemData, sizeof (pDesc->pbMemData)); @@ -230,11 +230,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescrip LARGE_INTEGER liMove; /* used when skipping chunks */ TRACE("(%p, %p, %p)\n", This, pStream, pDesc); - + /* FIXME: should this be determined from stream? */ pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&pDesc->guidClass, &CLSID_DirectMusicCollection, sizeof(CLSID)); - + pDesc->guidClass = CLSID_DirectMusicCollection; + IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -770,9 +770,9 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl (LPCGUID lpcGUID, LPVOID* obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&obj->pDesc->guidClass, &CLSID_DirectMusicCollection, sizeof (CLSID)); + obj->pDesc->guidClass = CLSID_DirectMusicCollection; obj->ref = 0; /* will be inited by QueryInterface */ list_init (&obj->Instruments); - + return IDirectMusicCollectionImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); } diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index fd7bda4..83fda74 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -115,7 +115,7 @@ static HRESULT WINAPI IDirectMusicPortImpl_Compact (LPDIRECTMUSICPORT iface) { static HRESULT WINAPI IDirectMusicPortImpl_GetCaps (LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS pPortCaps) { IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; TRACE("(%p, %p)\n", This, pPortCaps); - memcpy(pPortCaps, &This->caps, sizeof(DMUS_PORTCAPS)); + *pPortCaps = This->caps; return S_OK; } @@ -250,8 +250,8 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, obj->lpVtbl = &DirectMusicPort_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ obj->fActive = FALSE; - memcpy(&obj->params, pPortParams, sizeof(DMUS_PORTPARAMS)); - memcpy(&obj->caps, pPortCaps, sizeof(DMUS_PORTCAPS)); + obj->params = *pPortParams; + obj->caps = *pPortCaps; obj->pDirectSound = NULL; obj->pLatencyClock = NULL; hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL);

1 0