January 2008 - Wine-Commits

James Hawkins : msi: Check the local package for existence when resolving the package source.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: e28cedf698ca113d8aaa44a77eec7b7dff80859d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28cedf698ca113d8aaa44a77… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:48:32 2008 -0700 msi: Check the local package for existence when resolving the package source. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 562178c..e116967 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4203,7 +4203,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) msi_set_sourcedir_props(package, TRUE); - attrib = GetFileAttributesW(package->PackagePath); + attrib = GetFileAttributesW(package->db->path); if (attrib == INVALID_FILE_ATTRIBUTES) { LPWSTR prompt; @@ -4221,7 +4221,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) INSTALLPROPERTY_DISKPROMPTW,prompt,&size); } else - prompt = strdupW(package->PackagePath); + prompt = strdupW(package->db->path); msg = generate_error_string(package,1302,1,prompt); while(attrib == INVALID_FILE_ATTRIBUTES) @@ -4232,7 +4232,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) rc = ERROR_INSTALL_USEREXIT; break; } - attrib = GetFileAttributesW(package->PackagePath); + attrib = GetFileAttributesW(package->db->path); } msi_free(prompt); rc = ERROR_SUCCESS;

1 0

James Hawkins : msi: Directly download mi-> source now that SourceDir points to the URL.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: b012c3366ce2debdb4e278524583336fcae2f571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b012c3366ce2debdb4e278524… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:47:48 2008 -0700 msi: Directly download mi->source now that SourceDir points to the URL. --- dlls/msi/files.c | 42 +++++------------------------------------- 1 files changed, 5 insertions(+), 37 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 7e73b75..4be78b3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -500,42 +500,6 @@ static void free_media_info( struct media_info *mi ) msi_free( mi ); } -static UINT download_remote_cabinet(MSIPACKAGE *package, struct media_info *mi) -{ - WCHAR temppath[MAX_PATH]; - LPWSTR src, ptr; - LPCWSTR cab; - - src = strdupW(package->BaseURL); - if (!src) - return ERROR_OUTOFMEMORY; - - ptr = strrchrW(src, '/'); - if (!ptr) - { - msi_free(src); - return ERROR_FUNCTION_FAILED; - } - - *(ptr + 1) = '\0'; - ptr = strrchrW(mi->source, '\\'); - if (!ptr) - ptr = mi->source; - - src = msi_realloc(src, (lstrlenW(src) + lstrlenW(ptr)) * sizeof(WCHAR)); - if (!src) - return ERROR_OUTOFMEMORY; - - lstrcatW(src, ptr + 1); - - temppath[0] = '\0'; - cab = msi_download_file(src, temppath); - lstrcpyW(mi->source, cab); - - msi_free(src); - return ERROR_SUCCESS; -} - static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { MSIRECORD *row; @@ -625,7 +589,11 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { - return download_remote_cabinet(package, mi); + WCHAR temppath[MAX_PATH]; + + msi_download_file(mi->source, temppath); + lstrcpyW(mi->source, temppath); + return ERROR_SUCCESS; } /* check volume matches, change media if not */

1 0

James Hawkins : msi: OriginalDatabase can be a URL so check for a forward slash too.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 186487663a9305831a3125cbd724f1b1519242e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186487663a9305831a3125cbd… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:47:14 2008 -0700 msi: OriginalDatabase can be a URL so check for a forward slash too. --- dlls/msi/action.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a96d2b3..562178c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -623,8 +623,12 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) p = strrchrW( db, '\\' ); if (!p) { - msi_free(db); - return ERROR_SUCCESS; + p = strrchrW( db, '/' ); + if (!p) + { + msi_free(db); + return ERROR_SUCCESS; + } } len = p - db + 2;

1 0

James Hawkins : msi: SourceDir is formed from the path of OriginalDatabase.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 062070bfbe8a8be5c72a23969558f1f3eb61e12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=062070bfbe8a8be5c72a23969… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:46:39 2008 -0700 msi: SourceDir is formed from the path of OriginalDatabase. --- dlls/msi/action.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 95ecf4a..a96d2b3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -60,6 +60,8 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) * consts and values used */ static const WCHAR c_colon[] = {'C',':','\\',0}; +static const WCHAR szOriginalDatabase[] = + {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; static const WCHAR szCreateFolders[] = {'C','r','e','a','t','e','F','o','l','d','e','r','s',0}; @@ -610,17 +612,24 @@ BOOL ui_sequence_exists( MSIPACKAGE *package ) static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) { - LPWSTR p; + LPWSTR p, db; LPWSTR source, check; DWORD len; - p = strrchrW( package->PackagePath, '\\' ); + db = msi_dup_property( package, szOriginalDatabase ); + if (!db) + return ERROR_OUTOFMEMORY; + + p = strrchrW( db, '\\' ); if (!p) + { + msi_free(db); return ERROR_SUCCESS; + } - len = p - package->PackagePath + 2; + len = p - db + 2; source = msi_alloc( len * sizeof(WCHAR) ); - lstrcpynW( source, package->PackagePath, len ); + lstrcpynW( source, db, len ); check = msi_dup_property( package, cszSourceDir ); if (!check || replace) @@ -634,6 +643,7 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) msi_free( check ); msi_free( source ); + msi_free( db ); return ERROR_SUCCESS; } @@ -3872,8 +3882,6 @@ static UINT msi_get_local_package_name( LPWSTR path ) static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) { - static const WCHAR szOriginalDatabase[] = - {'O','r','i','g','i','n','a','l','D','a','t','a','b','a','s','e',0}; WCHAR packagefile[MAX_PATH]; LPWSTR msiFilePath; HKEY props;

1 0

James Hawkins : msi: OriginalDatabase is the fully-expanded path to the original package if the package is local and installed from the command line .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 781e19aa4c60b5b80019b4278f74d266ba8dfe56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781e19aa4c60b5b80019b4278… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:46:00 2008 -0700 msi: OriginalDatabase is the fully-expanded path to the original package if the package is local and installed from the command line. --- dlls/msi/package.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d4d0262..a8d33e0 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -932,20 +932,18 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if( file != szPackage ) track_tempfile( package, file ); + MSI_SetPropertyW( package, Database, db->path ); + if( UrlIsW( szPackage, URLIS_URL ) ) - { - MSI_SetPropertyW( package, OriginalDatabase, szPackage ); - MSI_SetPropertyW( package, Database, db->path ); - } - else if( szPackage[0] != '#' ) - { MSI_SetPropertyW( package, OriginalDatabase, szPackage ); - MSI_SetPropertyW( package, Database, szPackage ); - } + else if( szPackage[0] == '#' ) + MSI_SetPropertyW( package, OriginalDatabase, db->path ); else { - MSI_SetPropertyW( package, OriginalDatabase, db->path ); - MSI_SetPropertyW( package, Database, db->path ); + WCHAR fullpath[MAX_PATH]; + + GetFullPathNameW( szPackage, MAX_PATH, fullpath, NULL ); + MSI_SetPropertyW( package, OriginalDatabase, fullpath ); } *pPackage = package;

1 0

James Hawkins : msi: If the package is a URL, the OriginalDatabase property should be the URL and the DATABASE property should be the path to the local temporary package .
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 4121c9bbc66cb8ae76e46a763c3ab900d7da3f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4121c9bbc66cb8ae76e46a763… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:44:30 2008 -0700 msi: If the package is a URL, the OriginalDatabase property should be the URL and the DATABASE property should be the path to the local temporary package. --- dlls/msi/package.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a448214..d4d0262 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -932,7 +932,12 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if( file != szPackage ) track_tempfile( package, file ); - if( szPackage[0] != '#' ) + if( UrlIsW( szPackage, URLIS_URL ) ) + { + MSI_SetPropertyW( package, OriginalDatabase, szPackage ); + MSI_SetPropertyW( package, Database, db->path ); + } + else if( szPackage[0] != '#' ) { MSI_SetPropertyW( package, OriginalDatabase, szPackage ); MSI_SetPropertyW( package, Database, szPackage );

1 0

James Hawkins : msi: Factor out msi_set_sourcedir_props.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: c777d3095a2f4e1aecf0499054de7d0a0d8f7637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c777d3095a2f4e1aecf049905… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 13:45:13 2008 -0700 msi: Factor out msi_set_sourcedir_props. --- dlls/msi/action.c | 68 ++++++++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9e0cf1f..95ecf4a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -608,6 +608,36 @@ BOOL ui_sequence_exists( MSIPACKAGE *package ) return FALSE; } +static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) +{ + LPWSTR p; + LPWSTR source, check; + DWORD len; + + p = strrchrW( package->PackagePath, '\\' ); + if (!p) + return ERROR_SUCCESS; + + len = p - package->PackagePath + 2; + source = msi_alloc( len * sizeof(WCHAR) ); + lstrcpynW( source, package->PackagePath, len ); + + check = msi_dup_property( package, cszSourceDir ); + if (!check || replace) + MSI_SetPropertyW( package, cszSourceDir, source ); + + msi_free( check ); + + check = msi_dup_property( package, cszSOURCEDIR ); + if (!check || replace) + MSI_SetPropertyW( package, cszSOURCEDIR, source ); + + msi_free( check ); + msi_free( source ); + + return ERROR_SUCCESS; +} + /**************************************************** * TOP level entry points *****************************************************/ @@ -629,7 +659,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, if (szPackagePath) { - LPWSTR p, check, dir; + LPWSTR p, dir; LPCWSTR file; dir = strdupW(szPackagePath); @@ -658,18 +688,9 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, lstrcpyW(package->PackagePath, dir); lstrcatW(package->PackagePath, file); - - check = msi_dup_property( package, cszSourceDir ); - if (!check) - MSI_SetPropertyW(package, cszSourceDir, dir); - msi_free(check); - - check = msi_dup_property( package, cszSOURCEDIR ); - if (!check) - MSI_SetPropertyW(package, cszSOURCEDIR, dir); - msi_free(dir); - msi_free(check); + + msi_set_sourcedir_props(package, FALSE); } msi_parse_command_line( package, szCommandLine ); @@ -4156,27 +4177,6 @@ UINT ACTION_ForceReboot(MSIPACKAGE *package) return ERROR_INSTALL_SUSPEND; } -static UINT msi_set_sourcedir_props(MSIPACKAGE *package) -{ - LPWSTR p, source; - DWORD len; - - p = strrchrW( package->PackagePath, '\\' ); - if (!p) - return ERROR_SUCCESS; - - len = p - package->PackagePath + 2; - source = msi_alloc( len * sizeof(WCHAR) ); - lstrcpynW( source, package->PackagePath, len ); - - MSI_SetPropertyW( package, cszSourceDir, source ); - MSI_SetPropertyW( package, cszSOURCEDIR, source ); - - msi_free( source ); - - return ERROR_SUCCESS; -} - static UINT ACTION_ResolveSource(MSIPACKAGE* package) { DWORD attrib; @@ -4189,7 +4189,7 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) if (!package->PackagePath) return ERROR_SUCCESS; - msi_set_sourcedir_props(package); + msi_set_sourcedir_props(package, TRUE); attrib = GetFileAttributesW(package->PackagePath); if (attrib == INVALID_FILE_ATTRIBUTES)

1 0

James Hawkins : msi: WriteEnvironmentStrings should also write to REG_EXPAND_SZ strings.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 31c461ea5b3e201dd62b257d7e88891754d3c80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=31c461ea5b3e201dd62b257d7… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 11:46:09 2008 -0600 msi: WriteEnvironmentStrings should also write to REG_EXPAND_SZ strings. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b1841f7..9e0cf1f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4948,7 +4948,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) size = 0; res = RegQueryValueExW(env, name, NULL, &type, NULL, &size); if ((res != ERROR_SUCCESS && res != ERROR_FILE_NOT_FOUND) || - (res == ERROR_SUCCESS && type != REG_SZ)) + (res == ERROR_SUCCESS && type != REG_SZ && type != REG_EXPAND_SZ)) goto done; if (res != ERROR_FILE_NOT_FOUND)

1 0

James Hawkins : msi: Only read an internal package if the file to install is compressed.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: 4b4f737bfc24b0aae3add148584204b9a8acca95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4f737bfc24b0aae3add1485… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Jan 5 00:07:34 2008 -0600 msi: Only read an internal package if the file to install is compressed. --- dlls/msi/files.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 442c73a..7e73b75 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -573,22 +573,20 @@ static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_inf mi->first_volume = strdupW(mi->volume_label); source_dir = msi_dup_property(package, cszSourceDir); + lstrcpyW(mi->source, source_dir); - if (mi->cabinet && mi->cabinet[0] == '#') + if (file->IsCompressed && mi->cabinet) { - r = writeout_cabinet_stream(package, &mi->cabinet[1], mi->source); - if (r != ERROR_SUCCESS) + if (mi->cabinet[0] == '#') { - ERR("Failed to extract cabinet stream\n"); - return ERROR_FUNCTION_FAILED; + r = writeout_cabinet_stream(package, &mi->cabinet[1], mi->source); + if (r != ERROR_SUCCESS) + { + ERR("Failed to extract cabinet stream\n"); + return ERROR_FUNCTION_FAILED; + } } - } - else - { - lstrcpyW(mi->source, source_dir); - - - if (mi->cabinet) + else lstrcatW(mi->source, mi->cabinet); }

1 0

Eric Pouech : richedit: Uniformly handle the bPitchAndFamily field out of CHARFORMAT.
by Alexandre Julliard Jan. 7, 2008

Jan. 7, 2008

Module: wine Branch: master Commit: d65daea45476791964afdb317a6e8e5a44709ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65daea45476791964afdb317… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jan 4 21:12:20 2008 +0100 richedit: Uniformly handle the bPitchAndFamily field out of CHARFORMAT. --- dlls/riched20/editor.c | 1 + dlls/riched20/run.c | 3 ++- dlls/riched20/style.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 43c27d1..85ac5b2 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -419,6 +419,7 @@ static void ME_RTFCharAttrHook(RTF_Info *info) fmt.szFaceName[sizeof(fmt.szFaceName)/sizeof(WCHAR)-1] = '\0'; fmt.bCharSet = f->rtfFCharSet; fmt.dwMask = CFM_FACE | CFM_CHARSET; + fmt.bPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; } } break; diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 5a3119d..2da891e 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -950,7 +950,8 @@ void ME_GetCharFormat(ME_TextEditor *editor, int nFrom, int nTo, CHARFORMAT2W *p { if (!(tmp.dwMask & CFM_FACE)) pFmt->dwMask &= ~CFM_FACE; - else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName)) + else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName) || + pFmt->bPitchAndFamily != tmp.bPitchAndFamily) pFmt->dwMask &= ~CFM_FACE; } if (pFmt->yHeight != tmp.yHeight) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 453c15b..ba7d6d3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -320,7 +320,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) if (s->fmt.dwEffects & s->fmt.dwMask & (CFM_SUBSCRIPT|CFM_SUPERSCRIPT)) lf->lfHeight = (lf->lfHeight*2)/3; /*lf.lfQuality = PROOF_QUALITY; */ - lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; + if (s->fmt.dwMask & CFM_FACE) + lf->lfPitchAndFamily = s->fmt.bPitchAndFamily; if (s->fmt.dwMask & CFM_CHARSET) lf->lfCharSet = s->fmt.bCharSet; }

1 0