November 2006 - Wine-Commits

Rob Shearman : rpcrt4: Use MaxCalls from the protseq when determining the backlog length to pass in to listen .
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 034eaa1cadf1299cae65c57925ec1f6da8f3668a URL: http://source.winehq.org/git/wine.git/?a=commit;h=034eaa1cadf1299cae65c5792… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 8 20:46:32 2006 +0000 rpcrt4: Use MaxCalls from the protseq when determining the backlog length to pass in to listen. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 20d318d..66d2811 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -799,7 +799,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i continue; } - ret = listen(sock, 10); + ret = listen(sock, protseq->MaxCalls); if (ret < 0) { WARN("listen failed: %s\n", strerror(errno));

1 0

Rob Shearman : include: Add RPC/ DCE defines and structures related to RPC_SECURITY_QOS_V2.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 433993eed78de91cdf01f32b7eef0e13eed06504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433993eed78de91cdf01f32b7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 8 20:47:39 2006 +0000 include: Add RPC/DCE defines and structures related to RPC_SECURITY_QOS_V2. --- include/rpcdce.h | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 deletions(-) diff --git a/include/rpcdce.h b/include/rpcdce.h index c483928..48d1b94 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -139,6 +139,45 @@ #define RPC_C_AUTHN_DIGEST 21 #define RPC_C_AUTHN_MQ 100 #define RPC_C_AUTHN_DEFAULT 0xffffffff +/* values for RPC_SECURITY_QOS*::ImpersonationLevel */ +#define RPC_C_IMP_LEVEL_DEFAULT 0 +#define RPC_C_IMP_LEVEL_ANONYMOUS 1 +#define RPC_C_IMP_LEVEL_IDENTIFY 2 +#define RPC_C_IMP_LEVEL_IMPERSONATE 3 +#define RPC_C_IMP_LEVEL_DELEGATE 4 + +/* values for RPC_SECURITY_QOS*::IdentityTracking */ +#define RPC_C_QOS_IDENTIFY_STATIC 0 +#define RPC_C_QOS_IDENTIFY_DYNAMIC 1 + +/* flags for RPC_SECURITY_QOS*::Capabilities */ +#define RPC_C_QOS_CAPABILITIES_DEFAULT 0x0 +#define RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH 0x1 +#define RPC_C_QOS_CAPABILITIES_MAKE_FULLSIC 0x2 +#define RPC_C_QOS_CAPABILITIES_ANY_AUTHORITY 0x4 + +/* values for RPC_SECURITY_QOS*::Version */ +#define RPC_C_SECURITY_QOS_VERSION 1 +#define RPC_C_SECURITY_QOS_VERSION_1 1 +#define RPC_C_SECURITY_QOS_VERSION_2 2 + +/* flags for RPC_SECURITY_QOS_V2::AdditionalSecurityInfoType */ +#define RPC_C_AUTHN_INFO_TYPE_HTTP 1 + +/* flags for RPC_HTTP_TRANSPORT_CREDENTIALS::Flags */ +#define RPC_C_HTTP_FLAG_USE_SSL 0x1 +#define RPC_C_HTTP_FLAG_USE_FIRST_AUTH_SCHEME 0x2 + +/* values for RPC_HTTP_TRANSPORT_CREDENTIALS::AuthenticationTarget */ +#define RPC_C_HTTP_AUTHN_TARGET_SERVER 1 +#define RPC_C_HTTP_AUTHN_TARGET_PROXY 2 + +#define RPC_C_HTTP_AUTHN_SCHEME_BASIC 0x01 +#define RPC_C_HTTP_AUTHN_SCHEME_NTLM 0x02 +#define RPC_C_HTTP_AUTHN_SCHEME_PASSPORT 0x04 +#define RPC_C_HTTP_AUTHN_SCHEME_DIGEST 0x08 +#define RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE 0x10 + typedef RPC_STATUS RPC_ENTRY RPC_IF_CALLBACK_FN( RPC_IF_HANDLE InterfaceUuid, void *Context ); typedef void (__RPC_USER *RPC_AUTH_KEY_RETRIEVAL_FN)(); @@ -171,6 +210,26 @@ typedef struct _SEC_WINNT_AUTH_IDENTITY_ unsigned long Flags; } SEC_WINNT_AUTH_IDENTITY_A, *PSEC_WINNT_AUTH_IDENTITY_A; +typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_W +{ + SEC_WINNT_AUTH_IDENTITY_W *TransportCredentials; + unsigned long Flags; + unsigned long AuthenticationTarget; + unsigned long NumberOfAuthnSchemes; + unsigned long *AuthnSchemes; + unsigned short *ServerCertificateSubject; +} RPC_HTTP_TRANSPORT_CREDENTIALS_W, *PRPC_HTTP_TRANSPORT_CREDENTIALS_W; + +typedef struct _RPC_HTTP_TRANSPORT_CREDENTIALS_A +{ + SEC_WINNT_AUTH_IDENTITY_A *TransportCredentials; + unsigned long Flags; + unsigned long AuthenticationTarget; + unsigned long NumberOfAuthnSchemes; + unsigned long *AuthnSchemes; + unsigned char *ServerCertificateSubject; +} RPC_HTTP_TRANSPORT_CREDENTIALS_A, *PRPC_HTTP_TRANSPORT_CREDENTIALS_A; + typedef struct _RPC_SECURITY_QOS { unsigned long Version; unsigned long Capabilities; @@ -178,10 +237,44 @@ typedef struct _RPC_SECURITY_QOS { unsigned long ImpersonationType; } RPC_SECURITY_QOS, *PRPC_SECURITY_QOS; +typedef struct _RPC_SECURITY_QOS_V2_W +{ + unsigned long Version; + unsigned long Capabilities; + unsigned long IdentityTracking; + unsigned long ImpersonationType; + unsigned long AdditionalSecurityInfoType; + union + { + RPC_HTTP_TRANSPORT_CREDENTIALS_W *HttpCredentials; + } u; +} RPC_SECURITY_QOS_V2_W, *PRPC_SECURITY_QOS_V2_W; + +typedef struct _RPC_SECURITY_QOS_V2_A +{ + unsigned long Version; + unsigned long Capabilities; + unsigned long IdentityTracking; + unsigned long ImpersonationType; + unsigned long AdditionalSecurityInfoType; + union + { + RPC_HTTP_TRANSPORT_CREDENTIALS_A *HttpCredentials; + } u; +} RPC_SECURITY_QOS_V2_A, *PRPC_SECURITY_QOS_V2_A; + #define _SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(_SEC_WINNT_AUTH_IDENTITY_) #define SEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(SEC_WINNT_AUTH_IDENTITY_) #define PSEC_WINNT_AUTH_IDENTITY WINELIB_NAME_AW(PSEC_WINNT_AUTH_IDENTITY_) +#define RPC_HTTP_TRANSPORT_CREDENTIALS_ WINELIB_NAME_AW(RPC_HTTP_TRANSPORT_CREDENTIALS_) +#define PRPC_HTTP_TRANSPORT_CREDENTIALS_ WINELIB_NAME_AW(PRPC_HTTP_TRANSPORT_CREDENTIALS_) +#define _RPC_HTTP_TRANSPORT_CREDENTIALS_ WINELIB_NAME_AW(_RPC_HTTP_TRANSPORT_CREDENTIALS_) + +#define RPC_SECURITY_QOS_V2 WINELIB_NAME_AW(RPC_SECURITY_QOS_V2_) +#define PRPC_SECURITY_QOS_V2 WINELIB_NAME_AW(PRPC_SECURITY_QOS_V2_) +#define _RPC_SECURITY_QOS_V2 WINELIB_NAME_AW(_RPC_SECURITY_QOS_V2_) + /* SEC_WINNT_AUTH Flags */ #define SEC_WINNT_AUTH_IDENTITY_ANSI 0x1 #define SEC_WINNT_AUTH_IDENTITY_UNICODE 0x2

1 0

James Hawkins : msi: Move the file sequence check out of ready_media_info to avoid an unnecessary function call .
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: d21e1cc05bfbedc651b9c188f854fdb595f6ef1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21e1cc05bfbedc651b9c188f… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 8 14:04:54 2006 -0800 msi: Move the file sequence check out of ready_media_info to avoid an unnecessary function call. --- dlls/msi/files.c | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index dd5fa63..5f7232b 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -473,13 +473,6 @@ static UINT ready_media_for_file( MSIPAC UINT rc = ERROR_SUCCESS; BOOL found = FALSE; - if (file->Sequence <= mi->last_sequence) - { - set_file_source(package, file, mi->source); - TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence); - return ERROR_SUCCESS; - } - rc = load_media_info(package, file, mi); if (rc != ERROR_SUCCESS) { @@ -487,12 +480,6 @@ static UINT ready_media_for_file( MSIPAC return ERROR_FUNCTION_FAILED; } - if (!file->IsCompressed) - { - set_file_source(package, file, mi->source); - return rc; - } - if (mi->cabinet) { TRACE("Source is CAB %s\n", debugstr_w(mi->cabinet)); @@ -522,8 +509,6 @@ static UINT ready_media_for_file( MSIPAC rc = !extract_cabinet_file(package, mi); } - set_file_source(package, file, mi->source); - return rc; } @@ -636,22 +621,24 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac mi = msi_alloc_zero( sizeof(struct media_info) ); - /* Pass 2 */ LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { if (file->state != msifs_missing && file->state != msifs_overwrite) continue; - TRACE("Pass 2: %s\n",debugstr_w(file->File)); - - rc = ready_media_for_file( package, mi, file ); - if (rc != ERROR_SUCCESS) + if (file->Sequence > mi->last_sequence || mi->is_continuous) { - ERR("Unable to ready media\n"); - rc = ERROR_FUNCTION_FAILED; - break; + rc = ready_media_for_file( package, mi, file ); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to ready media\n"); + rc = ERROR_FUNCTION_FAILED; + break; + } } + set_file_source(package, file, mi->source); + TRACE("file paths %s to %s\n",debugstr_w(file->SourcePath), debugstr_w(file->TargetPath));

1 0

Peter Oberndorfer : dbghelp: Do not write to array element -1.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: a39f3da5fcc9737d5af584749d78587df099a61c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39f3da5fcc9737d5af584749… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Wed Nov 8 21:24:52 2006 +0100 dbghelp: Do not write to array element -1. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8aaeb5f..86b5c7a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -162,7 +162,7 @@ static const char* elf_map_section(struc */ static void elf_unmap_section(struct elf_file_map* fmap, int sidx) { - if (sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != NO_MAP) + if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != NO_MAP) { munmap((char*)fmap->sect[sidx].mapped, fmap->sect[sidx].shdr.sh_size); fmap->sect[sidx].mapped = NO_MAP;

1 0

James Hawkins : msi: Add support for continuous cabinets.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: fa8fc1628a455928f36e5dc884f87ad22a717fb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8fc1628a455928f36e5dc88… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 8 14:07:53 2006 -0800 msi: Add support for continuous cabinets. --- dlls/msi/files.c | 123 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 100 insertions(+), 23 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 151ba58..38b1f8f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -67,6 +67,29 @@ struct media_info { WCHAR source[MAX_PATH]; }; +static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) +{ + LPWSTR error, error_dialog; + UINT r = ERROR_SUCCESS; + + static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; + static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; + + if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) + return ERROR_SUCCESS; + + error = generate_error_string( package, 1302, 1, mi->disk_prompt ); + error_dialog = msi_dup_property( package, error_prop ); + + while ( r == ERROR_SUCCESS && GetFileAttributesW( mi->source ) == INVALID_FILE_ATTRIBUTES ) + r = msi_spawn_error_dialog( package, error_dialog, error ); + + msi_free( error ); + msi_free( error_dialog ); + + return r; +} + /* * This is a helper function for handling embedded cabinet media */ @@ -210,10 +233,83 @@ static void msi_file_update_ui( MSIPACKA ui_progress( package, 2, f->FileSize, 0, 0); } +static UINT msi_media_get_disk_info( CabData *data ) +{ + MSIPACKAGE *package = data->package; + MSIRECORD *row; + LPWSTR ptr; + + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', + '`','M','e','d','i','a','`',' ','W','H','E','R','E',' ', + '`','D','i','s','k','I','d','`',' ','=',' ','%','i',0}; + + row = MSI_QueryGetRecord(package->db, query, data->mi->disk_id); + if (!row) + { + TRACE("Unable to query row\n"); + return ERROR_FUNCTION_FAILED; + } + + data->mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3)); + data->mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); + + ptr = strrchrW(data->mi->source, '\\') + 1; + lstrcpyW(ptr, data->mi->cabinet); + + return ERROR_SUCCESS; +} + static INT_PTR cabinet_notify(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) { + TRACE("(%d)\n", fdint); + switch (fdint) { + case fdintPARTIAL_FILE: + { + CabData *data = (CabData *)pfdin->pv; + data->mi->is_continuous = FALSE; + return 0; + } + case fdintNEXT_CABINET: + { + CabData *data = (CabData *)pfdin->pv; + struct media_info *mi = data->mi; + LPWSTR cab = strdupAtoW(pfdin->psz1); + UINT rc; + + msi_free(mi->disk_prompt); + + mi->disk_id++; + mi->is_continuous = TRUE; + + rc = msi_media_get_disk_info(data); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to get next cabinet information: %d\n", rc); + return -1; + } + + if (lstrcmpiW(mi->cabinet, cab)) + { + msi_free(cab); + ERR("Continuous cabinet does not match the next cabinet in the Media table\n"); + return -1; + } + + msi_free(cab); + + TRACE("Searching for %s\n", debugstr_w(mi->source)); + + if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + rc = msi_change_media(data->package, mi); + + if (rc != ERROR_SUCCESS) + return -1; + + return 0; + } case fdintCOPY_FILE: { CabData *data = (CabData*) pfdin->pv; @@ -354,29 +450,6 @@ static void free_media_info( struct medi msi_free( mi ); } -static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) -{ - LPWSTR error, error_dialog; - UINT r = ERROR_SUCCESS; - - static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0}; - static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - - if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) - return ERROR_SUCCESS; - - error = generate_error_string( package, 1302, 1, mi->disk_prompt ); - error_dialog = msi_dup_property( package, error_prop ); - - while ( r == ERROR_SUCCESS && GetFileAttributesW( mi->source ) == INVALID_FILE_ATTRIBUTES ) - r = msi_spawn_error_dialog( package, error_dialog, error ); - - msi_free( error ); - msi_free( error_dialog ); - - return r; -} - static UINT download_remote_cabinet(MSIPACKAGE *package, struct media_info *mi) { WCHAR temppath[MAX_PATH]; @@ -472,6 +545,10 @@ static UINT ready_media(MSIPACKAGE *pack UINT rc = ERROR_SUCCESS; BOOL found = FALSE; + /* media info for continuous cabinet is already loaded */ + if (mi->is_continuous) + return ERROR_SUCCESS; + rc = load_media_info(package, file, mi); if (rc != ERROR_SUCCESS) {

1 0

James Hawkins : msi: Extract cabinets in ACTION_InstallFiles. ready_media is for finding and loading medi.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 6d537a311fb44edcdbca170ffab31ead2df73ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d537a311fb44edcdbca170ff… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 8 14:05:47 2006 -0800 msi: Extract cabinets in ACTION_InstallFiles. ready_media is for finding and loading medi. --- dlls/msi/files.c | 61 ++++++++++++++++++++--------------------------------- 1 files changed, 23 insertions(+), 38 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 5f7232b..151ba58 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -467,8 +467,7 @@ static UINT load_media_info(MSIPACKAGE * return ERROR_SUCCESS; } -static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, - MSIFILE *file ) +static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { UINT rc = ERROR_SUCCESS; BOOL found = FALSE; @@ -480,33 +479,21 @@ static UINT ready_media_for_file( MSIPAC return ERROR_FUNCTION_FAILED; } - if (mi->cabinet) + if (file->IsCompressed && + GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) { - TRACE("Source is CAB %s\n", debugstr_w(mi->cabinet)); - - /* only download the remote cabinet file if a local copy does not exist */ - if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && - UrlIsW(package->BaseURL, URLIS_URL)) + if (package->BaseURL && UrlIsW(package->BaseURL, URLIS_URL)) { rc = download_remote_cabinet(package, mi); - if (rc != ERROR_SUCCESS || - GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + if (rc == ERROR_SUCCESS && + GetFileAttributesW(mi->source) != INVALID_FILE_ATTRIBUTES) { - found = FALSE; + found = TRUE; } } if (!found) - { rc = msi_change_media(package, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Cabinet not found: %s\n", debugstr_w(mi->cabinet)); - return ERROR_FUNCTION_FAILED; - } - } - - rc = !extract_cabinet_file(package, mi); } return rc; @@ -602,7 +589,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac ptr = strrchrW(package->PackagePath,'\\'); if (ptr) { - ptr ++; + ptr++; MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, @@ -628,13 +615,20 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac if (file->Sequence > mi->last_sequence || mi->is_continuous) { - rc = ready_media_for_file( package, mi, file ); + rc = ready_media(package, file, mi); if (rc != ERROR_SUCCESS) { ERR("Failed to ready media\n"); rc = ERROR_FUNCTION_FAILED; break; } + + if (file->IsCompressed && !extract_cabinet_file(package, mi)) + { + ERR("Failed to extract cabinet: %s\n", debugstr_w(mi->cabinet)); + rc = ERROR_FUNCTION_FAILED; + break; + } } set_file_source(package, file, mi->source); @@ -642,34 +636,25 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac TRACE("file paths %s to %s\n",debugstr_w(file->SourcePath), debugstr_w(file->TargetPath)); - if (file->state != msifs_missing && file->state != msifs_overwrite) - continue; - - /* compressed files are extracted in ready_media_for_file */ - if (file->IsCompressed) + if (!file->IsCompressed) { - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW(file->TargetPath)) + rc = copy_install_file(file); + if (rc != ERROR_SUCCESS) { - ERR("compressed file wasn't extracted (%s)\n", - debugstr_w(file->TargetPath)); + ERR("Failed to copy %s to %s (%d)\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath), rc); rc = ERROR_INSTALL_FAILURE; break; } - - continue; } - - rc = copy_install_file(file); - if (rc != ERROR_SUCCESS) + else if (file->state != msifs_installed) { - ERR("Failed to copy %s to %s (%d)\n", debugstr_w(file->SourcePath), - debugstr_w(file->TargetPath), rc); + ERR("compressed file wasn't extracted (%s)\n", debugstr_w(file->TargetPath)); rc = ERROR_INSTALL_FAILURE; break; } } - /* cleanup */ free_media_info( mi ); return rc; }

1 0

James Hawkins : msi: Factor out load_media_info from ready_media_for_file.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 6ef6512938d1162114735a482572755f9dd4d099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef6512938d1162114735a482… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 8 14:03:36 2006 -0800 msi: Factor out load_media_info from ready_media_for_file. --- dlls/msi/files.c | 171 ++++++++++++++++++++++++------------------------------ 1 files changed, 75 insertions(+), 96 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 553b9da..dd5fa63 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -405,111 +405,97 @@ static UINT download_remote_cabinet(MSIP return ERROR_SUCCESS; } -static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, - MSIFILE *file ) +static UINT load_media_info(MSIPACKAGE *package, MSIFILE *file, struct media_info *mi) { - UINT rc = ERROR_SUCCESS; - MSIRECORD * row = 0; - static const WCHAR ExecSeqQuery[] = - {'S','E','L','E','C','T',' ','*',' ', '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','`',' ','>','=', - ' ','%', 'i',' ','O','R','D','E','R',' ','B','Y',' ', - '`','D','i','s','k','I','d','`',0}; - LPCWSTR cab, volume; + MSIRECORD *row; LPWSTR source_dir; - DWORD sz; - INT seq; + UINT r; - if (file->Sequence <= mi->last_sequence) - { - set_file_source(package, file, mi->source); - TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence); - return ERROR_SUCCESS; - } + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ', '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','`',' ','>','=', + ' ','%','i',' ','A','N','D',' ','`','D','i','s','k','I','d','`',' ','>','=', + ' ','%','i',' ','O','R','D','E','R',' ','B','Y',' ', + '`','D','i','s','k','I','d','`',0 + }; - row = MSI_QueryGetRecord(package->db, ExecSeqQuery, file->Sequence); + row = MSI_QueryGetRecord(package->db, query, file->Sequence, mi->disk_id); if (!row) { TRACE("Unable to query row\n"); return ERROR_FUNCTION_FAILED; } - volume = MSI_RecordGetString(row, 5); + mi->disk_id = MSI_RecordGetInteger(row, 1); + mi->last_sequence = MSI_RecordGetInteger(row, 2); mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3)); + mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); + mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); + msiobj_release(&row->hdr); source_dir = msi_dup_property(package, cszSourceDir); - if (!file->IsCompressed) + if (mi->cabinet && mi->cabinet[0] == '#') + { + 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); - set_file_source(package, file, mi->source); - MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, - mi->disk_prompt); - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); - msiobj_release(&row->hdr); - return rc; + if (mi->cabinet) + lstrcatW(mi->source, mi->cabinet); } - seq = MSI_RecordGetInteger(row,2); - mi->last_sequence = seq; - - cab = MSI_RecordGetString(row,4); - if (cab) - { - TRACE("Source is CAB %s\n",debugstr_w(cab)); - /* the stream does not contain the # character */ - if (cab[0]=='#') - { - LPWSTR path; - - rc = writeout_cabinet_stream(package,&cab[1],mi->source); - if (rc != ERROR_SUCCESS) - return rc; + MsiSourceListAddMediaDiskW(package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, + mi->disk_id, mi->volume_label, mi->disk_prompt); - path = msi_dup_property( package, cszSourceDir ); + MsiSourceListSetInfoW(package->ProductCode, NULL, + MSIINSTALLCONTEXT_USERMANAGED, + MSICODE_PRODUCT | MSISOURCETYPE_MEDIA, + INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); - MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, - volume, mi->disk_prompt); + msi_free(source_dir); + return ERROR_SUCCESS; +} - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_NETWORK, - INSTALLPROPERTY_LASTUSEDSOURCEW, path); +static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, + MSIFILE *file ) +{ + UINT rc = ERROR_SUCCESS; + BOOL found = FALSE; - msi_free(path); - } - else - { - sz = MAX_PATH; - if (MSI_GetPropertyW(package, cszSourceDir, mi->source, &sz)) - { - ERR("No Source dir defined\n"); - rc = ERROR_FUNCTION_FAILED; - } - else - { - strcatW(mi->source,cab); + if (file->Sequence <= mi->last_sequence) + { + set_file_source(package, file, mi->source); + TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence); + return ERROR_SUCCESS; + } - if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) - rc = msi_change_media(package, mi); + rc = load_media_info(package, file, mi); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to load media info\n"); + return ERROR_FUNCTION_FAILED; + } - if ( rc != ERROR_SUCCESS ) - goto done; + if (!file->IsCompressed) + { + set_file_source(package, file, mi->source); + return rc; + } - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); - } - } + if (mi->cabinet) + { + TRACE("Source is CAB %s\n", debugstr_w(mi->cabinet)); /* only download the remote cabinet file if a local copy does not exist */ if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && @@ -519,32 +505,25 @@ static UINT ready_media_for_file( MSIPAC if (rc != ERROR_SUCCESS || GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) { - goto done; + found = FALSE; + } + } + + if (!found) + { + rc = msi_change_media(package, mi); + if (rc != ERROR_SUCCESS) + { + ERR("Cabinet not found: %s\n", debugstr_w(mi->cabinet)); + return ERROR_FUNCTION_FAILED; } } rc = !extract_cabinet_file(package, mi); } - else - { - sz = MAX_PATH; - MSI_GetPropertyW(package,cszSourceDir,mi->source,&sz); - MsiSourceListSetInfoW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, - MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); - } set_file_source(package, file, mi->source); - MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, - mi->disk_prompt); - -done: - msi_free(source_dir); - msiobj_release(&row->hdr); - return rc; }

1 0

James Hawkins : msi: Use disk_prompt from the media_info structure instead of passing an extra parameter to msi_change_media .
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: a621c2a6619ec43a1b33c4464e13864739c366cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a621c2a6619ec43a1b33c4464… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 8 14:03:01 2006 -0800 msi: Use disk_prompt from the media_info structure instead of passing an extra parameter to msi_change_media. --- dlls/msi/files.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 703c795..553b9da 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -354,7 +354,7 @@ static void free_media_info( struct medi msi_free( mi ); } -static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi, LPCWSTR prompt ) +static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi ) { LPWSTR error, error_dialog; UINT r = ERROR_SUCCESS; @@ -365,7 +365,7 @@ static UINT msi_change_media( MSIPACKAGE if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE ) return ERROR_SUCCESS; - error = generate_error_string( package, 1302, 1, prompt ); + error = generate_error_string( package, 1302, 1, mi->disk_prompt ); error_dialog = msi_dup_property( package, error_prop ); while ( r == ERROR_SUCCESS && GetFileAttributesW( mi->source ) == INVALID_FILE_ATTRIBUTES ) @@ -420,7 +420,6 @@ static UINT ready_media_for_file( MSIPAC LPWSTR source_dir; DWORD sz; INT seq; - LPCWSTR prompt; if (file->Sequence <= mi->last_sequence) { @@ -437,7 +436,7 @@ static UINT ready_media_for_file( MSIPAC } volume = MSI_RecordGetString(row, 5); - prompt = MSI_RecordGetString(row, 3); + mi->disk_prompt = strdupW(MSI_RecordGetString(row, 3)); source_dir = msi_dup_property(package, cszSourceDir); @@ -448,7 +447,7 @@ static UINT ready_media_for_file( MSIPAC MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, - prompt); + mi->disk_prompt); MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, @@ -478,7 +477,7 @@ static UINT ready_media_for_file( MSIPAC MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, - volume, prompt); + volume, mi->disk_prompt); MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, @@ -500,7 +499,7 @@ static UINT ready_media_for_file( MSIPAC strcatW(mi->source,cab); if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) - rc = msi_change_media(package, mi, prompt); + rc = msi_change_media(package, mi); if ( rc != ERROR_SUCCESS ) goto done; @@ -540,7 +539,7 @@ static UINT ready_media_for_file( MSIPAC MsiSourceListAddMediaDiskW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, - prompt); + mi->disk_prompt); done: msi_free(source_dir);

1 0

Alexandre Julliard : ntdll: Re-add sys/ioctl. h that got lost in the PeekNamedPipe move.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: df51cf5c8316802e67c5c9a408bdc10c8d08c37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=df51cf5c8316802e67c5c9a40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 09:18:43 2006 +0100 ntdll: Re-add sys/ioctl.h that got lost in the PeekNamedPipe move. --- dlls/ntdll/file.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5d397cc..4e646cb 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -42,6 +42,9 @@ #endif #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif #ifdef HAVE_POLL_H #include <poll.h> #endif

1 0

James Hawkins : msi: Only add text to the scroll control if text is provided.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 9d899129bf696afabf76ef5ba6f24fcf582abff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d899129bf696afabf76ef5ba… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Nov 8 11:40:25 2006 -0800 msi: Only add text to the scroll control if text is provided. --- dlls/msi/dialog.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 407cb29..d928edc 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -920,6 +920,7 @@ static UINT msi_dialog_scrolltext_contro struct msi_scrolltext_info *info; msi_control *control; HMODULE hRichedit; + LPCWSTR text; DWORD style; info = msi_alloc( sizeof *info ); @@ -949,7 +950,9 @@ static UINT msi_dialog_scrolltext_contro SetPropW( control->hwnd, szButtonData, info ); /* add the text into the richedit */ - msi_scrolltext_add_text( control, MSI_RecordGetString( rec, 10 ) ); + text = MSI_RecordGetString( rec, 10 ); + if (text) + msi_scrolltext_add_text( control, text ); return ERROR_SUCCESS; }

1 0