November 2006 - Wine-commits

Peter Oberndorfer : dbghelp: Make dwarf2_parse_line_numbers handle missing line number section.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 6d0948f7a6095bd49a5a6392290cfd01c1ee6f8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d0948f7a6095bd49a5a63922… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Nov 6 20:05:28 2006 +0100 dbghelp: Make dwarf2_parse_line_numbers handle missing line number section. --- dlls/dbghelp/dwarf.c | 5 +++++ dlls/dbghelp/elf_module.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index eab1f04..b68824b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -150,6 +150,7 @@ typedef struct dwarf2_debug_info_s struct vector children; } dwarf2_debug_info_t; +#define NO_MAP ((const void*)0xffffffff) typedef struct dwarf2_section_s { @@ -1595,6 +1596,10 @@ static void dwarf2_parse_line_numbers(co struct vector files; const char** p; + /* section with line numbers stripped */ + if (sections[section_line].address == NO_MAP) + return; + traverse.data = sections[section_line].address + offset; traverse.start_data = traverse.data; traverse.end_data = traverse.data + 4; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a509848..8aaeb5f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -901,7 +901,7 @@ static BOOL elf_load_debug_info_from_map dw2_debug, fmap->sect[debug_sect].shdr.sh_size, dw2_debug_abbrev, fmap->sect[debug_abbrev_sect].shdr.sh_size, dw2_debug_str, fmap->sect[debug_str_sect].shdr.sh_size, - dw2_debug_line, fmap->sect[debug_line_sect].shdr.sh_size); + dw2_debug_line, dw2_debug_line != NO_MAP ? fmap->sect[debug_line_sect].shdr.sh_size : 0); if (!lret) WARN("Couldn't correctly read stabs\n"); ret = ret || lret;

1 0

Andrey Turkin : shlwapi: Implement GetShellSecurityDescriptor and test for it.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 5151c81a23431c0ead7e0448d6b9d5084d90695e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5151c81a23431c0ead7e0448d… Author: Andrey Turkin <pancha(a)mail.nnov.ru> Date: Mon Nov 6 21:34:50 2006 +0300 shlwapi: Implement GetShellSecurityDescriptor and test for it. --- dlls/shlwapi/ordinal.c | 148 ++++++++++++++++++++++++++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- dlls/shlwapi/tests/ordinal.c | 105 ++++++++++++++++++++++++++++++ 3 files changed, 254 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5151c81a23431c0ead7e0…

1 0

Stefan Dösinger : wined3d: ScissorRect correction.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: def7df305e8b480d1082e2cad344223bd3a09496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def7df305e8b480d1082e2cad… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 6 14:28:15 2006 +0100 wined3d: ScissorRect correction. --- dlls/wined3d/device.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6727152..794cba3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4650,11 +4650,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl static HRESULT WINAPI IWineD3DDeviceImpl_SetScissorRect(IWineD3DDevice *iface, CONST RECT* pRect) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - ENTER_GL(); + RECT windowRect; + UINT winHeight; - /** FIXME: Windows uses a top,left origin openGL uses a bottom Right? **/ - TRACE("(%p)Setting new Scissor Rect to %d:%d-%d:%d\n", This, pRect->left, pRect->top, pRect->right, pRect->bottom); - glScissor(pRect->left, pRect->top, pRect->right - pRect->left, pRect->bottom - pRect->top); + GetClientRect(((IWineD3DSwapChainImpl *)This->swapchains[0])->win_handle, &windowRect); + /* Warning: glScissor uses window coordinates, not viewport coordinates, so our viewport correction does not apply + * Warning2: Even in windowed mode the coords are relative to the window, not the screen + */ + winHeight = windowRect.bottom - windowRect.top; + TRACE("(%p)Setting new Scissor Rect to %d:%d-%d:%d\n", This, pRect->left, pRect->bottom - winHeight, + pRect->right - pRect->left, pRect->bottom - pRect->top); + ENTER_GL(); + glScissor(pRect->left, winHeight - pRect->bottom, pRect->right - pRect->left, pRect->bottom - pRect->top); + checkGLcall("glScissor"); LEAVE_GL(); return WINED3D_OK;

1 0

Detlef Riekenberg : winex11.drv: Fix failure of X11DRV_ChoosePixelFormat.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 2a14dc958aef1efde867aa0bcb89a5fffbf26cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a14dc958aef1efde867aa0bc… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Nov 5 20:58:56 2006 +0100 winex11.drv: Fix failure of X11DRV_ChoosePixelFormat. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 537d7b2..d41beea 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -873,9 +873,9 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV } /* Get a list containing all supported FB configurations */ - cfgs = pglXChooseFBConfig(gdi_display, DefaultScreen(gdi_display), NULL, &nCfgs); + cfgs = pglXGetFBConfigs(gdi_display, DefaultScreen(gdi_display), &nCfgs); if (NULL == cfgs || 0 == nCfgs) { - ERR("glXChooseFBConfig returns NULL (glError: %d)\n", pglGetError()); + ERR("glXGetFBConfigs returns NULL (glError: %d)\n", pglGetError()); goto choose_exit; }

1 0

James Hawkins : msi: Factor out download_remote_cabinet and reuse extract_cabinet_file to extract a remote cabinet .
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 1ae4ab6ef7b911199c65dabd10be49657aeccb42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae4ab6ef7b911199c65dabd1… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:14:20 2006 -0800 msi: Factor out download_remote_cabinet and reuse extract_cabinet_file to extract a remote cabinet. --- dlls/msi/files.c | 87 ++++++++++++++++++++++------------------------------- 1 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 1195116..703c795 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -354,52 +354,6 @@ static void free_media_info( struct medi msi_free( mi ); } -/* downloads a remote cabinet and extracts it if it exists */ -static UINT msi_extract_remote_cabinet( MSIPACKAGE *package, struct media_info *mi ) -{ - FDICABINETINFO cabinfo; - WCHAR temppath[MAX_PATH]; - WCHAR src[MAX_PATH]; - LPSTR cabpath; - LPCWSTR file; - LPWSTR ptr; - HFDI hfdi; - ERF erf; - int hf; - - /* the URL is the path prefix of the package URL and the filename - * of the file to download - */ - ptr = strrchrW(package->PackagePath, '/'); - lstrcpynW(src, package->PackagePath, ptr - package->PackagePath + 2); - ptr = strrchrW(mi->source, '\\'); - lstrcatW(src, ptr + 1); - - file = msi_download_file( src, temppath ); - lstrcpyW(mi->source, file); - - /* check if the remote cabinet still exists, ignore if it doesn't */ - hfdi = FDICreate(cabinet_alloc, cabinet_free, cabinet_open, cabinet_read, - cabinet_write, cabinet_close, cabinet_seek, 0, &erf); - if (!hfdi) - { - ERR("FDICreate failed\n"); - return ERROR_FUNCTION_FAILED; - } - - cabpath = strdupWtoA(mi->source); - hf = cabinet_open(cabpath, _O_RDONLY, 0); - if (!FDIIsCabinet(hfdi, hf, &cabinfo)) - { - WARN("Remote cabinet %s does not exist.\n", debugstr_w(mi->source)); - msi_free(cabpath); - return ERROR_SUCCESS; - } - - msi_free(cabpath); - return !extract_cabinet_file(package, mi); -} - static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi, LPCWSTR prompt ) { LPWSTR error, error_dialog; @@ -423,6 +377,34 @@ static UINT msi_change_media( MSIPACKAGE return r; } +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, '\\'); + lstrcatW(src, ptr + 1); + + cab = msi_download_file(src, temppath); + lstrcpyW(mi->source, cab); + + msi_free(src); + return ERROR_SUCCESS; +} + static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, MSIFILE *file ) { @@ -534,12 +516,15 @@ static UINT ready_media_for_file( MSIPAC if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && UrlIsW(package->BaseURL, URLIS_URL)) { - rc = msi_extract_remote_cabinet(package, mi); - } - else - { - rc = !extract_cabinet_file(package, mi); + rc = download_remote_cabinet(package, mi); + if (rc != ERROR_SUCCESS || + GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) + { + goto done; + } } + + rc = !extract_cabinet_file(package, mi); } else {

1 0

James Hawkins : msi: Store the base URL of the MSI package if it is downloaded.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: ae18c2dc7f7e337b0eb7f3a15f04d35a56355586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae18c2dc7f7e337b0eb7f3a15… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:13:47 2006 -0800 msi: Store the base URL of the MSI package if it is downloaded. --- dlls/msi/files.c | 2 +- dlls/msi/helpers.c | 1 + dlls/msi/msipriv.h | 3 ++- dlls/msi/package.c | 16 ++++++++++++++-- dlls/msi/preview.c | 2 +- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 4bede98..1195116 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -532,7 +532,7 @@ static UINT ready_media_for_file( MSIPAC /* only download the remote cabinet file if a local copy does not exist */ if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES && - UrlIsW(package->PackagePath, URLIS_URL)) + UrlIsW(package->BaseURL, URLIS_URL)) { rc = msi_extract_remote_cabinet(package, mi); } diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index acb0f77..490e181 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -591,6 +591,7 @@ void ACTION_free_package_structures( MSI msi_free(package->script); } + msi_free(package->BaseURL); msi_free(package->PackagePath); msi_free(package->ProductCode); msi_free(package->ActionFormat); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8fe25d6..44e9170 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -228,6 +228,7 @@ typedef struct tagMSIPACKAGE struct list RunningActions; + LPWSTR BaseURL; LPWSTR PackagePath; LPWSTR ProductCode; @@ -620,7 +621,7 @@ extern UINT VIEW_find_column( MSIVIEW *, extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ); /* package internals */ -extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE * ); +extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPWSTR ); extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE ** ); extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 3aaad69..1455c6d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -428,7 +428,7 @@ static UINT msi_get_word_count( MSIPACKA return word_count; } -MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db ) +MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPWSTR base_url ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; static const WCHAR szpi[] = {'%','i',0}; @@ -466,6 +466,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABA package->WordCount = msi_get_word_count( package ); package->PackagePath = strdupW( db->path ); + package->BaseURL = strdupW( base_url ); /* OK, here is where we do a slew of things to the database to * prep for all that is to come as a package */ @@ -550,6 +551,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIDATABASE *db = NULL; MSIPACKAGE *package; MSIHANDLE handle; + LPWSTR ptr, base_url = NULL; UINT r; static const WCHAR OriginalDatabase[] = @@ -571,7 +573,16 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, LPCWSTR file; if ( UrlIsW( szPackage, URLIS_URL ) ) + { file = msi_download_file( szPackage, temppath ); + + base_url = strdupW( szPackage ); + if ( !base_url ) + return ERROR_OUTOFMEMORY; + + ptr = strrchrW( base_url, '/' ); + if (ptr) *(ptr + 1) = '\0'; + } else file = copy_package_to_temp( szPackage, temppath ); @@ -589,7 +600,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, } } - package = MSI_CreatePackage( db ); + package = MSI_CreatePackage( db, base_url ); + msi_free( base_url ); msiobj_release( &db->hdr ); if( !package ) return ERROR_FUNCTION_FAILED; diff --git a/dlls/msi/preview.c b/dlls/msi/preview.c index 4f4cc5c..ddf0a7a 100644 --- a/dlls/msi/preview.c +++ b/dlls/msi/preview.c @@ -43,7 +43,7 @@ MSIPREVIEW *MSI_EnableUIPreview( MSIDATA MSIPREVIEW *preview = NULL; MSIPACKAGE *package; - package = MSI_CreatePackage( db ); + package = MSI_CreatePackage( db, NULL ); if( package ) { preview = alloc_msiobject( MSIHANDLETYPE_PREVIEW, sizeof (MSIPREVIEW),

1 0

James Hawkins : msi: Factor copy_install_file out of ACTION_InstallFiles.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 542101fcda71016022fca5a8040acefec7878f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542101fcda71016022fca5a80… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:12:22 2006 -0800 msi: Factor copy_install_file out of ACTION_InstallFiles. --- dlls/msi/files.c | 66 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 42 insertions(+), 24 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index deda59f..4bede98 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -597,6 +597,42 @@ static void schedule_install_files(MSIPA } } +static UINT copy_install_file(MSIFILE *file) +{ + BOOL ret; + UINT gle; + + TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath)); + + ret = CopyFileW(file->SourcePath, file->TargetPath, FALSE); + if (ret) + { + file->state = msifs_installed; + return ERROR_SUCCESS; + } + + gle = GetLastError(); + if (gle == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) + { + TRACE("overwriting existing file\n"); + gle = ERROR_SUCCESS; + } + else if (gle == ERROR_FILE_NOT_FOUND) + { + /* FIXME: this needs to be tested, I'm pretty sure it fails */ + TRACE("Source file not found\n"); + gle = ERROR_SUCCESS; + } + else if (!(file->Attributes & msidbFileAttributesVital)) + { + TRACE("Ignoring error for nonvital\n"); + gle = ERROR_SUCCESS; + } + + return gle; +} + /* * ACTION_InstallFiles() * @@ -673,31 +709,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac continue; } - rc = CopyFileW(file->SourcePath,file->TargetPath,FALSE); - if (!rc) - { - rc = GetLastError(); - ERR("Unable to copy file (%s -> %s) (error %d)\n", - debugstr_w(file->SourcePath), debugstr_w(file->TargetPath), rc); - if (rc == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) - { - rc = 0; - } - else if (rc == ERROR_FILE_NOT_FOUND) - { - ERR("Source File Not Found! Continuing\n"); - rc = 0; - } - else if (file->Attributes & msidbFileAttributesVital) - { - ERR("Ignoring Error and continuing (nonvital file)...\n"); - rc = 0; - } - } - else + rc = copy_install_file(file); + if (rc != ERROR_SUCCESS) { - file->state = msifs_installed; - rc = ERROR_SUCCESS; + ERR("Failed to copy %s to %s (%d)\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath), rc); + rc = ERROR_INSTALL_FAILURE; + break; } }

1 0

James Hawkins : msi: Factor schedule_install_files out of ACTION_InstallFiles.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: a13bbaf7361830638c9e34c8a57bb2d955dae966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a13bbaf7361830638c9e34c8a… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:11:26 2006 -0800 msi: Factor schedule_install_files out of ACTION_InstallFiles. --- dlls/msi/files.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3359dc1..deda59f 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -581,6 +581,22 @@ static UINT get_file_target(MSIPACKAGE * return ERROR_FUNCTION_FAILED; } +static void schedule_install_files(MSIPACKAGE *package) +{ + MSIFILE *file; + + LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry) + { + if (!ACTION_VerifyComponentForAction(file->Component, INSTALLSTATE_LOCAL)) + { + TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); + + ui_progress(package,2,file->FileSize,0,0); + file->state = msifs_skipped; + } + } +} + /* * ACTION_InstallFiles() * @@ -608,20 +624,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, ptr); } - /* FIXME("Write DiskPrompt\n"); */ - - /* Pass 1 */ - LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) - { - if (!ACTION_VerifyComponentForAction( file->Component, INSTALLSTATE_LOCAL )) - { - ui_progress(package,2,file->FileSize,0,0); - TRACE("File %s is not scheduled for install\n", - debugstr_w(file->File)); - file->state = msifs_skipped; - } - } + schedule_install_files(package); /* * Despite MSDN specifying that the CreateFolders action

1 0

James Hawkins : msi: Model the media_info structure members after the columns in the media table .
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: de3b84df091ab13a6685f34fb905b38260e4b1d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3b84df091ab13a6685f34fb… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:10:52 2006 -0800 msi: Model the media_info structure members after the columns in the media table. --- dlls/msi/files.c | 108 +++++++++++++++++++++-------------------------------- 1 files changed, 43 insertions(+), 65 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3506004..3359dc1 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -58,10 +58,12 @@ extern const WCHAR szRemoveFiles[]; static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0}; struct media_info { + UINT disk_id; UINT last_sequence; - LPWSTR last_volume; - LPWSTR last_path; - DWORD count; + LPWSTR disk_prompt; + LPWSTR cabinet; + LPWSTR volume_label; + BOOL is_continuous; WCHAR source[MAX_PATH]; }; @@ -112,7 +114,7 @@ end: typedef struct { MSIPACKAGE* package; - LPCSTR cab_path; + struct media_info *mi; } CabData; static void * cabinet_alloc(ULONG cb) @@ -282,53 +284,43 @@ static INT_PTR cabinet_notify(FDINOTIFIC */ static BOOL extract_cabinet_file(MSIPACKAGE* package, struct media_info *mi) { + LPSTR cabinet, cab_path = NULL; + LPWSTR ptr; HFDI hfdi; ERF erf; - BOOL ret; - char *cabinet; - char *cab_path; - static CHAR empty[] = ""; + BOOL ret = FALSE; CabData data; - TRACE("Extracting %s to %s\n",debugstr_w(mi->source), debugstr_w(mi->last_path)); - - hfdi = FDICreate(cabinet_alloc, - cabinet_free, - cabinet_open, - cabinet_read, - cabinet_write, - cabinet_close, - cabinet_seek, - 0, - &erf); + TRACE("Extracting %s\n", debugstr_w(mi->source)); + + hfdi = FDICreate(cabinet_alloc, cabinet_free, cabinet_open, cabinet_read, + cabinet_write, cabinet_close, cabinet_seek, 0, &erf); if (!hfdi) { ERR("FDICreate failed\n"); return FALSE; } - if (!(cabinet = strdupWtoA( mi->source ))) - { - FDIDestroy(hfdi); - return FALSE; - } - if (!(cab_path = strdupWtoA( mi->last_path ))) - { - FDIDestroy(hfdi); - msi_free(cabinet); - return FALSE; - } + ptr = strrchrW(mi->source, '\\') + 1; + cabinet = strdupWtoA(ptr); + if (!cabinet) + goto done; - data.package = package; - data.cab_path = cab_path; + cab_path = strdupWtoA(mi->source); + if (!cab_path) + goto done; - ret = FDICopy(hfdi, cabinet, empty, 0, cabinet_notify, NULL, &data); + cab_path[ptr - mi->source] = '\0'; + + data.package = package; + data.mi = mi; + ret = FDICopy(hfdi, cabinet, cab_path, 0, cabinet_notify, NULL, &data); if (!ret) ERR("FDICopy failed\n"); +done: FDIDestroy(hfdi); - msi_free(cabinet); msi_free(cab_path); @@ -356,7 +348,9 @@ static VOID set_file_source(MSIPACKAGE* static void free_media_info( struct media_info *mi ) { - msi_free( mi->last_path ); + msi_free( mi->disk_prompt ); + msi_free( mi->cabinet ); + msi_free( mi->volume_label ); msi_free( mi ); } @@ -441,19 +435,18 @@ static UINT ready_media_for_file( MSIPAC ' ','%', 'i',' ','O','R','D','E','R',' ','B','Y',' ', '`','D','i','s','k','I','d','`',0}; LPCWSTR cab, volume; + LPWSTR source_dir; DWORD sz; INT seq; LPCWSTR prompt; - MSICOMPONENT *comp = file->Component; if (file->Sequence <= mi->last_sequence) { - set_file_source(package, file, mi->last_path); + set_file_source(package, file, mi->source); TRACE("Media already ready (%u, %u)\n",file->Sequence,mi->last_sequence); return ERROR_SUCCESS; } - mi->count ++; row = MSI_QueryGetRecord(package->db, ExecSeqQuery, file->Sequence); if (!row) { @@ -464,22 +457,21 @@ static UINT ready_media_for_file( MSIPAC volume = MSI_RecordGetString(row, 5); prompt = MSI_RecordGetString(row, 3); - msi_free(mi->last_path); - mi->last_path = NULL; + source_dir = msi_dup_property(package, cszSourceDir); if (!file->IsCompressed) { - mi->last_path = resolve_folder(package, comp->Directory, TRUE, FALSE, NULL); - set_file_source(package, file, mi->last_path); + lstrcpyW(mi->source, source_dir); + set_file_source(package, file, mi->source); MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, + MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, prompt); MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); + INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); msiobj_release(&row->hdr); return rc; } @@ -494,21 +486,16 @@ static UINT ready_media_for_file( MSIPAC /* the stream does not contain the # character */ if (cab[0]=='#') { - LPWSTR path, p; + LPWSTR path; rc = writeout_cabinet_stream(package,&cab[1],mi->source); if (rc != ERROR_SUCCESS) return rc; - mi->last_path = strdupW(mi->source); - p = strrchrW(mi->last_path,'\\'); - if (p) - p[1] = 0; - path = msi_dup_property( package, cszSourceDir ); MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, + MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, prompt); MsiSourceListSetInfoW(package->ProductCode, NULL, @@ -521,7 +508,6 @@ static UINT ready_media_for_file( MSIPAC else { sz = MAX_PATH; - mi->last_path = msi_alloc(MAX_PATH*sizeof(WCHAR)); if (MSI_GetPropertyW(package, cszSourceDir, mi->source, &sz)) { ERR("No Source dir defined\n"); @@ -529,7 +515,6 @@ static UINT ready_media_for_file( MSIPAC } else { - strcpyW(mi->last_path,mi->source); strcatW(mi->source,cab); if (GetFileAttributesW(mi->source) == INVALID_FILE_ATTRIBUTES) @@ -541,13 +526,7 @@ static UINT ready_media_for_file( MSIPAC MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); - - /* extract the cab file into a folder in the temp folder */ - sz = MAX_PATH; - if (MSI_GetPropertyW(package, cszTempFolder,mi->last_path, &sz) - != ERROR_SUCCESS) - GetTempPathW(MAX_PATH,mi->last_path); + INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); } } @@ -565,22 +544,21 @@ static UINT ready_media_for_file( MSIPAC else { sz = MAX_PATH; - mi->last_path = msi_alloc(MAX_PATH*sizeof(WCHAR)); MSI_GetPropertyW(package,cszSourceDir,mi->source,&sz); - strcpyW(mi->last_path,mi->source); MsiSourceListSetInfoW(package->ProductCode, NULL, MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT|MSISOURCETYPE_MEDIA, - INSTALLPROPERTY_LASTUSEDSOURCEW, mi->last_path); + INSTALLPROPERTY_LASTUSEDSOURCEW, mi->source); } - set_file_source(package, file, mi->last_path); + set_file_source(package, file, mi->source); MsiSourceListAddMediaDiskW(package->ProductCode, NULL, - MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->count, volume, + MSIINSTALLCONTEXT_USERMANAGED, MSICODE_PRODUCT, mi->disk_id, volume, prompt); done: + msi_free(source_dir); msiobj_release(&row->hdr); return rc;

1 0

James Hawkins : msi: Use msi_alloc_zero instead of a helper function that sets everything to zero .
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 842ffc35456fa447a9653b60938d68e845cc444b URL: http://source.winehq.org/git/wine.git/?a=commit;h=842ffc35456fa447a9653b609… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Nov 7 15:10:22 2006 -0800 msi: Use msi_alloc_zero instead of a helper function that sets everything to zero. --- dlls/msi/files.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3b6b2a9..3506004 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -354,23 +354,6 @@ static VOID set_file_source(MSIPACKAGE* file->SourcePath = build_directory_name(2, path, file->File); } -static struct media_info *create_media_info( void ) -{ - struct media_info *mi; - - mi = msi_alloc( sizeof *mi ); - if (mi) - { - mi->last_sequence = 0; - mi->last_volume = NULL; - mi->last_path = NULL; - mi->count = 0; - mi->source[0] = 0; - } - - return mi; -} - static void free_media_info( struct media_info *mi ) { msi_free( mi->last_path ); @@ -670,7 +653,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *pac */ msi_create_component_directories( package ); - mi = create_media_info(); + mi = msi_alloc_zero( sizeof(struct media_info) ); /* Pass 2 */ LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry )

1 0