April 2015 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Store the disk id for file patches.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 0762dd68f8feeaa7698aa4d47cee02507a2c0190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0762dd68f8feeaa7698aa4d47… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:25:27 2015 +0200 msi: Store the disk id for file patches. --- dlls/msi/action.c | 23 ++++++++++++++++++++++- dlls/msi/msipriv.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d1c46b8..edd08f7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1278,7 +1278,7 @@ static UINT load_file(MSIRECORD *row, LPVOID param) load_file_hash(package, file); load_file_disk_id(package, file); - TRACE("File Loaded (%s)\n",debugstr_w(file->File)); + TRACE("File loaded (file %s sequence %u)\n", debugstr_w(file->File), file->Sequence); list_add_tail( &package->files, &file->entry ); @@ -1336,6 +1336,25 @@ static UINT load_all_media( MSIPACKAGE *package ) return r; } +static UINT load_patch_disk_id( MSIPACKAGE *package, MSIFILEPATCH *patch ) +{ + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','`','D','i','s','k','I','d','`',' ', 'F','R','O','M',' ', + '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', + '`','L','a','s','t','S','e','q','u','e','n','c','e','`',' ','>','=',' ','%','u',0}; + MSIRECORD *rec; + + if (!(rec = MSI_QueryGetRecord( package->db, query, patch->Sequence ))) + { + WARN("query failed\n"); + return ERROR_FUNCTION_FAILED; + } + + patch->disk_id = MSI_RecordGetInteger( rec, 1 ); + msiobj_release( &rec->hdr ); + return ERROR_SUCCESS; +} + static UINT load_patch(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; @@ -1365,6 +1384,8 @@ static UINT load_patch(MSIRECORD *row, LPVOID param) * _StreamRef - External key into MsiPatchHeaders (instead of the header field) */ + load_patch_disk_id( package, patch ); + TRACE("Patch loaded (file %s sequence %u)\n", debugstr_w(patch->File->File), patch->Sequence); list_add_tail( &package->filepatches, &patch->entry ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index ac7ba32..b58dc32 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -594,6 +594,7 @@ typedef struct tagMSIFILEPATCH INT PatchSize; INT Attributes; BOOL IsApplied; + UINT disk_id; } MSIFILEPATCH; typedef struct tagMSIAPPID

1 0

Hans Leidekker : msi: Don' t apply file patches in the cabinet extraction callback.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 006801366e1b9e9f647ae46ccf3e899e8872a796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006801366e1b9e9f647ae46cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:32:18 2015 +0200 msi: Don't apply file patches in the cabinet extraction callback. --- dlls/msi/action.c | 1 - dlls/msi/files.c | 92 +++++++++++++++++++++++++++++------------------------- dlls/msi/msipriv.h | 3 +- dlls/msi/package.c | 9 ++++++ 4 files changed, 61 insertions(+), 44 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index edd08f7..a9a157b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1377,7 +1377,6 @@ static UINT load_patch(MSIRECORD *row, LPVOID param) patch->Sequence = MSI_RecordGetInteger( row, 2 ); patch->PatchSize = MSI_RecordGetInteger( row, 3 ); patch->Attributes = MSI_RecordGetInteger( row, 4 ); - patch->IsApplied = FALSE; /* FIXME: * Header field - for patch validation. diff --git a/dlls/msi/files.c b/dlls/msi/files.c index dff00df..96fb48a 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -436,13 +436,14 @@ done: return rc; } -static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) +static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WCHAR *key ) { MSIFILEPATCH *patch; LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { - if (!patch->IsApplied && !strcmpW( key, patch->File->File )) return patch; + if (!patch->extracted && patch->disk_id == disk_id && !strcmpW( key, patch->File->File )) + return patch; } return NULL; } @@ -450,45 +451,25 @@ static MSIFILEPATCH *get_next_filepatch( MSIPACKAGE *package, const WCHAR *key ) static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { - static MSIFILEPATCH *p = NULL; - static WCHAR patch_path[MAX_PATH] = {0}; - static WCHAR temp_folder[MAX_PATH] = {0}; + static MSIFILEPATCH *patch; + static WCHAR tmpfile[MAX_PATH], tmpdir[MAX_PATH]; + UINT_PTR disk_id = (UINT_PTR)user; + + if (!tmpdir[0]) GetTempPathW( MAX_PATH, tmpdir ); if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (temp_folder[0] == '\0') - GetTempPathW(MAX_PATH, temp_folder); - - if (!(p = get_next_filepatch(package, file)) || !p->File->Component->Enabled) - return FALSE; + if (!(patch = find_filepatch( package, disk_id, file ))) return FALSE; - GetTempFileNameW(temp_folder, NULL, 0, patch_path); - - *path = strdupW(patch_path); - *attrs = p->File->Attributes; + GetTempFileNameW( tmpdir, NULL, 0, tmpfile ); + *path = strdupW( tmpfile ); + *attrs = patch->File->Attributes; } else if (action == MSICABEXTRACT_FILEEXTRACTED) { - WCHAR patched_file[MAX_PATH]; - BOOL br; - - GetTempFileNameW(temp_folder, NULL, 0, patched_file); - - br = ApplyPatchToFileW(patch_path, p->File->TargetPath, patched_file, 0); - if (br) - { - /* FIXME: baseline cache */ - - DeleteFileW( p->File->TargetPath ); - MoveFileW( patched_file, p->File->TargetPath ); - - p->IsApplied = TRUE; - } - else - ERR("Failed patch %s: %d.\n", debugstr_w(p->File->TargetPath), GetLastError()); - - DeleteFileW(patch_path); - p = NULL; + patch->path = strdupW( tmpfile ); + patch->extracted = TRUE; + patch = NULL; } return TRUE; @@ -504,6 +485,8 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); + TRACE("extracting files\n"); + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { MSIFILE *file = patch->File; @@ -519,7 +502,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) comp->Action = msi_get_component_action( package, comp ); if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) continue; - if (!patch->IsApplied) + if (!patch->extracted) { MSICABDATA data; @@ -529,23 +512,48 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) ERR("Failed to ready media for %s\n", debugstr_w(file->File)); goto done; } - - data.mi = mi; + data.mi = mi; data.package = package; - data.cb = patchfiles_cb; - data.user = (PVOID)(UINT_PTR)mi->disk_id; + data.cb = patchfiles_cb; + data.user = (PVOID)(UINT_PTR)mi->disk_id; - if (!msi_cabextract(package, mi, &data)) + if (!msi_cabextract( package, mi, &data )) { ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); rc = ERROR_INSTALL_FAILURE; goto done; } } + } + + TRACE("applying patches\n"); + + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + WCHAR tmpdir[MAX_PATH], tmpfile[MAX_PATH]; + BOOL ret; + + if (!patch->path) continue; + + GetTempPathW( MAX_PATH, tmpdir ); + GetTempFileNameW( tmpdir, NULL, 0, tmpfile ); + + ret = ApplyPatchToFileW( patch->path, patch->File->TargetPath, tmpfile, 0 ); + if (ret) + { + DeleteFileW( patch->File->TargetPath ); + MoveFileW( tmpfile, patch->File->TargetPath ); + } + else + WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); + + DeleteFileW( patch->path ); + DeleteFileW( tmpfile ); + RemoveDirectoryW( tmpdir ); - if (!patch->IsApplied && !(patch->Attributes & msidbPatchAttributesNonVital)) + if (!ret && !(patch->Attributes & msidbPatchAttributesNonVital)) { - ERR("Failed to apply patch to file: %s\n", debugstr_w(file->File)); + ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); rc = ERROR_INSTALL_FAILURE; goto done; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index b58dc32..fe4f6d6 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -593,8 +593,9 @@ typedef struct tagMSIFILEPATCH INT Sequence; INT PatchSize; INT Attributes; - BOOL IsApplied; + BOOL extracted; UINT disk_id; + WCHAR *path; } MSIFILEPATCH; typedef struct tagMSIAPPID diff --git a/dlls/msi/package.c b/dlls/msi/package.c index fcbf663..1053053 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -200,6 +200,15 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( file ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->filepatches ) + { + MSIFILEPATCH *patch = LIST_ENTRY( item, MSIFILEPATCH, entry ); + + list_remove( &patch->entry ); + msi_free( patch->path ); + msi_free( patch ); + } + /* clean up extension, progid, class and verb structures */ LIST_FOR_EACH_SAFE( item, cursor, &package->classes ) {

1 0

Hans Leidekker : msi: Don' t mark global assembly files as installed when they are extracted.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 20ef12a762b73519147d4920a37697bc3c9e8921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ef12a762b73519147d4920a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:32:44 2015 +0200 msi: Don't mark global assembly files as installed when they are extracted. --- dlls/msi/action.c | 11 ++++++++--- dlls/msi/files.c | 17 +++++++++-------- dlls/msi/install.c | 2 +- dlls/msi/msi.c | 2 +- dlls/msi/msipriv.h | 1 + 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a9a157b..4eec12a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2169,13 +2169,18 @@ WCHAR *msi_build_directory_name( DWORD count, ... ) return dir; } -static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) +BOOL msi_is_global_assembly( MSICOMPONENT *comp ) { - MSIASSEMBLY *assembly = file->Component->assembly; + return comp->assembly && !comp->assembly->application; +} +static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) +{ msi_free( file->TargetPath ); - if (assembly && !assembly->application) + if (msi_is_global_assembly( file->Component )) { + MSIASSEMBLY *assembly = file->Component->assembly; + if (!assembly->tempdir) assembly->tempdir = get_temp_dir(); file->TargetPath = msi_build_directory_name( 2, assembly->tempdir, file->FileName ); msi_track_tempfile( package, file->TargetPath ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 96fb48a..fb56a6d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -80,7 +80,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (not part of patch)\n", debugstr_w(file->File)); return msifs_skipped; } - if ((comp->assembly && !comp->assembly->application && !comp->assembly->installed) || + if ((msi_is_global_assembly( comp ) && !comp->assembly->installed) || GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("installing %s (missing)\n", debugstr_w(file->File)); @@ -291,7 +291,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (f->disk_id != disk_id || (f->state != msifs_missing && f->state != msifs_overwrite)) return FALSE; - if (!f->Component->assembly || f->Component->assembly->application) + if (!msi_is_global_assembly( f->Component )) { msi_create_directory(package, f->Component->Directory); } @@ -300,7 +300,7 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, } else if (action == MSICABEXTRACT_FILEEXTRACTED) { - f->state = msifs_installed; + if (!msi_is_global_assembly( f->Component )) f->state = msifs_installed; f = NULL; } @@ -393,22 +393,22 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); - if (!file->Component->assembly || file->Component->assembly->application) + if (!msi_is_global_assembly( file->Component )) { msi_create_directory(package, file->Component->Directory); } rc = copy_install_file(package, file, source); if (rc != ERROR_SUCCESS) { - ERR("Failed to copy %s to %s (%d)\n", debugstr_w(source), - debugstr_w(file->TargetPath), rc); + ERR("Failed to copy %s to %s (%u)\n", debugstr_w(source), debugstr_w(file->TargetPath), rc); rc = ERROR_INSTALL_FAILURE; msi_free(source); goto done; } msi_free(source); } - else if (file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) + else if (!msi_is_global_assembly( file->Component ) && + file->state != msifs_installed && !(file->Attributes & msidbFileAttributesPatchAdded)) { ERR("compressed file wasn't installed (%s)\n", debugstr_w(file->File)); rc = ERROR_INSTALL_FAILURE; @@ -419,7 +419,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (!comp->assembly || (file->state != msifs_missing && file->state != msifs_overwrite)) + if (!msi_is_global_assembly( comp ) || (file->state != msifs_missing && file->state != msifs_overwrite)) continue; rc = msi_install_assembly( package, comp ); @@ -429,6 +429,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) rc = ERROR_INSTALL_FAILURE; break; } + file->state = msifs_installed; } done: diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 5810a1e..a0f69c9 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -588,7 +588,7 @@ UINT MSI_SetTargetPathW( MSIPACKAGE *package, LPCWSTR szFolder, LPCWSTR szFolder const WCHAR *dir; MSICOMPONENT *comp = file->Component; - if (!comp->Enabled || (comp->assembly && !comp->assembly->application)) continue; + if (!comp->Enabled || msi_is_global_assembly( comp )) continue; dir = msi_get_target_folder( package, comp->Directory ); msi_free( file->TargetPath ); diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index df71ed2..9dc30be 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2048,7 +2048,7 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i GetWindowsDirectoryW( path, MAX_PATH ); if (component && component[0]) { - if (comp->assembly && !comp->assembly->application) *temp = comp->Cost; + if (msi_is_global_assembly( comp )) *temp = comp->Cost; if (!comp->Enabled || !comp->KeyPath) { *cost = 0; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fe4f6d6..9c016f3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1045,6 +1045,7 @@ extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; +extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Clean up handling of temporary files.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 17b05316a5a62d48cca50f416da5e7f2f14fef99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b05316a5a62d48cca50f416… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:33:11 2015 +0200 msi: Clean up handling of temporary files. --- dlls/msi/action.c | 37 ++++++++++++++++++------ dlls/msi/custom.c | 81 +++++++++++++++++++++++++++++++---------------------- dlls/msi/database.c | 1 + dlls/msi/dialog.c | 29 ++----------------- dlls/msi/files.c | 49 +++++++++++++++----------------- dlls/msi/msipriv.h | 9 ++---- dlls/msi/package.c | 65 +++++++++++------------------------------- 7 files changed, 120 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=17b05316a5a62d48cca50…

1 0

Hans Leidekker : msi: Get rid of global variables the cabinet extraction callbacks.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: eb116d6640ba9860bc0ef5bcfdafb63c9d766b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb116d6640ba9860bc0ef5bcf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 1 12:33:36 2015 +0200 msi: Get rid of global variables the cabinet extraction callbacks. --- dlls/msi/files.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b6833e9..d1e3ecf 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -278,12 +278,11 @@ static MSIFILE *find_file( MSIPACKAGE *package, UINT disk_id, const WCHAR *filen static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR filename, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { - static MSIFILE *file = NULL; - UINT_PTR disk_id = (UINT_PTR)user; + MSIFILE *file = *(MSIFILE **)user; if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (!(file = find_file( package, disk_id, filename ))) + if (!(file = find_file( package, file->disk_id, filename ))) { TRACE("unknown file in cabinet (%s)\n", debugstr_w(filename)); return FALSE; @@ -297,11 +296,11 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR filename, DWORD action, } *path = strdupW( file->TargetPath ); *attrs = file->Attributes; + *(MSIFILE **)user = file; } else if (action == MSICABEXTRACT_FILEEXTRACTED) { if (!msi_is_global_assembly( file->Component )) file->state = msifs_installed; - file = NULL; } return TRUE; @@ -372,11 +371,12 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) (file->IsCompressed && !mi->is_extracted)) { MSICABDATA data; + MSIFILE *cursor = file; data.mi = mi; data.package = package; data.cb = installfiles_cb; - data.user = (PVOID)(UINT_PTR)mi->disk_id; + data.user = &cursor; if (file->IsCompressed && !msi_cabextract(package, mi, &data)) { @@ -451,21 +451,20 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { - static MSIFILEPATCH *patch; - UINT_PTR disk_id = (UINT_PTR)user; + MSIFILEPATCH *patch = *(MSIFILEPATCH **)user; if (action == MSICABEXTRACT_BEGINEXTRACT) { - if (!(patch = find_filepatch( package, disk_id, file ))) return FALSE; + if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; patch->path = msi_create_temp_file( package->db ); *path = strdupW( patch->path ); *attrs = patch->File->Attributes; + *(MSIFILEPATCH **)user = patch; } else if (action == MSICABEXTRACT_FILEEXTRACTED) { patch->extracted = TRUE; - patch = NULL; } return TRUE; @@ -501,6 +500,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) if (!patch->extracted) { MSICABDATA data; + MSIFILEPATCH *cursor = patch; rc = ready_media( package, TRUE, mi ); if (rc != ERROR_SUCCESS) @@ -511,7 +511,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) data.mi = mi; data.package = package; data.cb = patchfiles_cb; - data.user = (PVOID)(UINT_PTR)mi->disk_id; + data.user = &cursor; if (!msi_cabextract( package, mi, &data )) {

1 0

David Hedberg : comdlg32: Only attempt to update the layout if the dialog window exists.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 2afbf9dbbcc56f686c35be03557cabf9589b1a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afbf9dbbcc56f686c35be035… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Sun Mar 29 22:56:29 2015 +0200 comdlg32: Only attempt to update the layout if the dialog window exists. --- dlls/comdlg32/itemdlg.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c37b66e..b5093b8 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1225,7 +1225,7 @@ static HRESULT init_custom_controls(FileDialogImpl *This) /************************************************************************** * Window related functions. */ -static SIZE update_layout(FileDialogImpl *This) +static void update_layout(FileDialogImpl *This) { HDWP hdwp; HWND hwnd; @@ -1233,21 +1233,19 @@ static SIZE update_layout(FileDialogImpl *This) RECT cancel_rc, open_rc; RECT filetype_rc, filename_rc, filenamelabel_rc; RECT toolbar_rc, ebrowser_rc, customctrls_rc; - int missing_width, missing_height; static const UINT vspacing = 4, hspacing = 4; - SIZE ret; + static const UINT min_width = 320, min_height = 200; - GetClientRect(This->dlg_hwnd, &dialog_rc); - - missing_width = max(0, 320 - dialog_rc.right); - missing_height = max(0, 200 - dialog_rc.bottom); + if (!GetClientRect(This->dlg_hwnd, &dialog_rc)) + { + TRACE("Invalid dialog window, not updating layout\n"); + return; + } - if(missing_width || missing_height) + if(dialog_rc.right < min_width || dialog_rc.bottom < min_height) { - TRACE("Missing (%d, %d)\n", missing_width, missing_height); - ret.cx = missing_width; - ret.cy = missing_height; - return ret; + TRACE("Dialog size (%d, %d) too small, not updating layout\n", dialog_rc.right, dialog_rc.bottom); + return; } /**** @@ -1399,8 +1397,7 @@ static SIZE update_layout(FileDialogImpl *This) else ERR("Failed to position dialog controls.\n"); - ret.cx = 0; ret.cy = 0; - return ret; + return; } static HRESULT init_explorerbrowser(FileDialogImpl *This)

1 0

Christoph von Wittich : riched20: Handle SCF_WORD.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: ca2b70b2855be5f0166a639a07e43c2b3e877ed2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca2b70b2855be5f0166a639a0… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Sun Mar 29 22:07:50 2015 +0200 riched20: Handle SCF_WORD. --- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 8 ++++++-- dlls/riched20/editor.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 043a32a..e3e42cc 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -710,7 +710,7 @@ int ME_MoveCursorChars(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) } -static BOOL +BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) { ME_DisplayItem *pRun = cursor->pRun, *pOtherRun; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 171ec69..a4403ca 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3510,8 +3510,12 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if (editor->mode & TM_PLAINTEXT) return 0; if (wParam & SCF_WORD) { - FIXME("EM_SETCHARFORMAT: word selection not supported\n"); - return 0; + ME_Cursor start; + ME_Cursor end = editor->pCursors[0]; + ME_MoveCursorWords(editor, &end, +1); + start = end; + ME_MoveCursorWords(editor, &start, -1); + ME_SetCharFormat(editor, &start, &end, p); } bRepaint = ME_IsSelection(editor); ME_SetSelectionCharFormat(editor, p); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e4c13a9..e2b837a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -166,6 +166,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) DECLSPEC_ /* caret.c */ void ME_SetCursorToStart(ME_TextEditor *editor, ME_Cursor *cursor) DECLSPEC_HIDDEN; int ME_SetSelection(ME_TextEditor *editor, int from, int to) DECLSPEC_HIDDEN; +BOOL ME_MoveCursorWords(ME_TextEditor *editor, ME_Cursor *cursor, int nRelOfs) DECLSPEC_HIDDEN; void ME_HideCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void ME_ShowCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN; void ME_MoveCaret(ME_TextEditor *ed) DECLSPEC_HIDDEN;

1 0

Sergey Isakov : windowscodecs: Fix wrong pointer to formal parameter.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 98186d42a57f47641413c19731e8a97587a66f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98186d42a57f47641413c1973… Author: Sergey Isakov <isakov-sl(a)bk.ru> Date: Fri Mar 27 21:35:23 2015 +0300 windowscodecs: Fix wrong pointer to formal parameter. --- dlls/windowscodecs/icnsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index d5d123a..5ce44a2 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -397,7 +397,7 @@ static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; - hr = configure_write_source(iface, pIBitmapSource, &prc, + hr = configure_write_source(iface, pIBitmapSource, prc, &GUID_WICPixelFormat32bppBGRA, This->size, This->size, 1.0, 1.0);

1 0

Shuai Meng : vbscript: Implemented Oct.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 56ab12ccef84b0e42cddd03a85815beb323ee393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ab12ccef84b0e42cddd03a8… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Sat Mar 28 17:24:46 2015 +0800 vbscript: Implemented Oct. --- dlls/vbscript/global.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 30 ++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 74acff7..ee9168b 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -584,8 +584,43 @@ static HRESULT Global_Hex(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + WCHAR buf[23], *ptr; + DWORD n; + int ret; + + TRACE("%s\n", debugstr_variant(arg)); + + switch(V_VT(arg)) { + case VT_I2: + n = (WORD)V_I2(arg); + break; + case VT_NULL: + if(res) + V_VT(res) = VT_NULL; + return S_OK; + default: + hres = to_int(arg, &ret); + if(FAILED(hres)) + return hres; + else + n = ret; + } + + buf[22] = 0; + ptr = buf + 21; + + if(n) { + do { + *ptr-- = '0' + (n & 0x7); + n >>= 3; + }while(n); + ptr++; + }else { + *ptr = '0'; + } + + return return_string(res, ptr); } static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 8c92cf5..7b97df4 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,36 @@ TestHex empty, "0" Call ok(getVT(hex(null)) = "VT_NULL", "getVT(hex(null)) = " & getVT(hex(null))) Call ok(getVT(hex(empty)) = "VT_BSTR", "getVT(hex(empty)) = " & getVT(hex(empty))) +Sub TestOct(x, ex, res_type) + Call ok(Oct(x) = ex, "Oct(" & x & ") = " & Oct(x) & " expected " & ex) + Call ok(getVT(Oct(x)) = res_type, "getVT(Oct(" &x & ")) = " & getVT(Oct(x)) & "expected " & res_type) +End Sub + +Sub TestOctError(num, err_num) + On error resume next + Call Oct(num) + Call ok(Err.number = err_num, "Oct(" & num & ") error number is " & Err.number & " expected " & err_num) +End Sub + +TestOct empty, "0", "VT_BSTR" +TestOct 0, "0", "VT_BSTR" +TestOct 9, "11", "VT_BSTR" +TestOct "9", "11", "VT_BSTR" +TestOct 8.5, "10", "VT_BSTR" +TestOct 9.5, "12", "VT_BSTR" +TestOct -1, "177777", "VT_BSTR" +TestOct -32767, "100001", "VT_BSTR" +TestOct -32768, "37777700000", "VT_BSTR" +TestOct 2147483647.49, "17777777777", "VT_BSTR" +TestOct -2147483648.5, "20000000000", "VT_BSTR" +Call ok(getVT(Oct(null)) = "VT_NULL", "getVT(Oct(null)) = " & getVT(Oct(null))) +newObject.myval = 5 +TestOct newObject, "5", "VT_BSTR" + +TestOctError 2147483647.5, 6 +TestOctError -2147483648.51, 6 +TestOctError "test", 13 + x = InStr(1, "abcd", "bc") Call ok(x = 2, "InStr returned " & x)

1 0

Francois Gouget : winex11.drv: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 01 Apr '15

01 Apr '15

Module: wine Branch: master Commit: 3adc91f3fc0d0df70c3ed5ad0be41eb36afcbb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adc91f3fc0d0df70c3ed5ad0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 31 21:05:29 2015 +0200 winex11.drv: Remove unneeded NONAMELESSXXX directives. --- dlls/winex11.drv/event.c | 2 -- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/mouse.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 612951d..a1abfe7 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -40,8 +40,6 @@ #include <stdarg.h> #include <string.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 039d15b..1323e19 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -39,7 +39,7 @@ #include <string.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0858f2e..3a11b41 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -44,7 +44,6 @@ MAKE_FUNCPTR(XcursorLibraryLoadCursor); #endif /* SONAME_LIBXCURSOR */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define OEMRESOURCE #include "windef.h" #include "winbase.h"

1 0