October 2009 - Wine-commits

Charles Davis : ntdll: Implement DVD_GetRegion() on both Linux and Mac OS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: ca786887a2bc1311f892d74a1430c58d0bf96b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca786887a2bc1311f892d74a1… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:24 2009 -0600 ntdll: Implement DVD_GetRegion() on both Linux and Mac OS. --- dlls/ntdll/cdrom.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 64 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index d3dd54b..70fc1d1 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2348,13 +2348,73 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD_COPY_PROTECT_KEY key) /****************************************************************** * DVD_GetRegion * - * + * This IOCTL combines information from both IOCTL_DVD_READ_KEY + * with key type DvdGetRpcKey and IOCTL_DVD_READ_STRUCTURE with + * structure type DvdCopyrightInformation into one structure. */ -static NTSTATUS DVD_GetRegion(int dev, PDVD_REGION region) +static NTSTATUS DVD_GetRegion(int fd, PDVD_REGION region) { - FIXME("\n"); - return STATUS_SUCCESS; +#if defined(linux) + NTSTATUS ret = STATUS_NOT_SUPPORTED; + dvd_struct dvd; + dvd_authinfo auth_info; + + dvd.type = DVD_STRUCT_COPYRIGHT; + dvd.copyright.layer_num = 0; + auth_info.type = DVD_LU_SEND_RPC_STATE; + + ret = CDROM_GetStatusCode(ioctl( fd, DVD_AUTH, &auth_info )); + if (ret == STATUS_SUCCESS) + { + ret = CDROM_GetStatusCode(ioctl( fd, DVD_READ_STRUCT, &dvd )); + + if (ret == STATUS_SUCCESS) + { + region->CopySystem = dvd.copyright.cpst; + region->RegionData = dvd.copyright.rmi; + region->SystemRegion = auth_info.lrpcs.region_mask; + region->ResetCount = auth_info.lrpcs.ucca; + } + } + return ret; +#elif defined(__FreeBSD__) || defined(__NetBSD__) + TRACE("bsd\n"); + return STATUS_NOT_SUPPORTED; +#elif defined(__APPLE__) + dk_dvd_report_key_t key; + dk_dvd_read_structure_t dvd; + DVDRegionPlaybackControlInfo rpc; + DVDCopyrightInfo copy; + NTSTATUS ret = STATUS_NOT_SUPPORTED; + + key.format = kDVDKeyFormatRegionState; + key.keyClass = kDVDKeyClassCSS_CPPM_CPRM; + key.bufferLength = sizeof(rpc); + key.buffer = &rpc; + dvd.format = kDVDStructureFormatCopyrightInfo; + dvd.bufferLength = sizeof(copy); + dvd.buffer = © + + ret = CDROM_GetStatusCode(ioctl( fd, DKIOCDVDREPORTKEY, &key )); + + if (ret == STATUS_SUCCESS) + { + ret = CDROM_GetStatusCode(ioctl( fd, DKIOCDVDREADSTRUCTURE, &dvd )); + + if (ret == STATUS_SUCCESS) + { + region->CopySystem = copy.copyrightProtectionSystemType; + region->RegionData = copy.regionMask; + region->SystemRegion = rpc.driveRegion; + region->ResetCount = rpc.numberUserResets; + } + } + return ret; +#else + FIXME("\n"); + return STATUS_NOT_SUPPORTED; +#endif } /******************************************************************

1 0

Charles Davis : ntdll: Finish implementation of DVD_ReadKey() with key type DvdGetRpcKey on Linux.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: e3823e14ce0483b41b45e96c3773fc11bc8fba38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3823e14ce0483b41b45e96c3… Author: Charles Davis <cdavis(a)mymail.mines.edu> Date: Mon Oct 19 12:15:31 2009 -0600 ntdll: Finish implementation of DVD_ReadKey() with key type DvdGetRpcKey on Linux. --- dlls/ntdll/cdrom.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 70fc1d1..069ac01 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -2182,6 +2182,8 @@ static NTSTATUS DVD_ReadKey(int fd, PDVD_COPY_PROTECT_KEY key) ((PDVD_RPC_KEY)key->KeyData)->TypeCode = auth_info.lrpcs.type; ((PDVD_RPC_KEY)key->KeyData)->RegionMask = auth_info.lrpcs.region_mask; ((PDVD_RPC_KEY)key->KeyData)->RpcScheme = auth_info.lrpcs.rpc_scheme; + ((PDVD_RPC_KEY)key->KeyData)->UserResetsAvailable = auth_info.lrpcs.ucca; + ((PDVD_RPC_KEY)key->KeyData)->ManufacturerResetsAvailable = auth_info.lrpcs.vra; } break; default:

1 0

Louis Lenders : d3d9/tests: Test {IDirect3DTexture9, IDirect3DSurface9}:: UnlockRect for rectangles that are not locked.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 786271e1a18a81498795d3820ef6277217a9862e URL: http://source.winehq.org/git/wine.git/?a=commit;h=786271e1a18a81498795d3820… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Oct 15 23:13:12 2009 +0200 d3d9/tests: Test {IDirect3DTexture9, IDirect3DSurface9}::UnlockRect for rectangles that are not locked. --- dlls/d3d9/tests/surface.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index b3cb1b6..396e0c4 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -167,7 +167,10 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) IDirect3DTexture9_GetLevelDesc(pTexture, j, &descr); hr = IDirect3DTexture9_LockRect(pTexture, j, &rc, NULL, 0); ok(SUCCEEDED(hr), "IDirect3DTexture9_LockRect: %08x\n", hr); - IDirect3DTexture9_UnlockRect(pTexture, j); + hr = IDirect3DTexture9_UnlockRect(pTexture, j); + ok(SUCCEEDED(hr), "IDirect3DTexture9_UnLockRect: %08x\n", hr); + hr = IDirect3DTexture9_UnlockRect(pTexture, j); +todo_wine ok(SUCCEEDED(hr), "Double IDirect3DTexture9_UnLockRect failed with %08x\n", hr); pitch = ((descr.Width + 3) >> 2) << 3; if (i > 0) pitch <<= 1; @@ -217,6 +220,8 @@ static void test_lockrect_offset(IDirect3DDevice9 *device) hr = IDirect3DSurface9_UnlockRect(surface); ok(SUCCEEDED(hr), "UnlockRect failed (%08x)\n", hr); + hr = IDirect3DSurface9_UnlockRect(surface); + ok(hr == D3DERR_INVALIDCALL, "Double UnlockRect returned %08x, expected D3DERR_INVALIDCALL\n", hr); hr = IDirect3DSurface9_LockRect(surface, &locked_rect, &rect, 0); ok(SUCCEEDED(hr), "LockRect failed (%08x)\n", hr);

1 0

Hib Eris : msi/tests: Add tests for merging existing tables.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 6aad5cb30790355a193be2440c479a24c72020b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aad5cb30790355a193be2440… Author: Hib Eris <hib(a)hiberis.nl> Date: Tue Oct 20 14:24:30 2009 +0200 msi/tests: Add tests for merging existing tables. --- dlls/msi/tests/db.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 019ff5e..3551c9c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7553,6 +7553,70 @@ static void test_dbmerge(void) ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + query = "DROP TABLE `One`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DROP TABLE `One`"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `One` ( `A` INT, `B` CHAR(72) PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 1, 'foo' )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `One` ( `A`, `B` ) VALUES ( 2, 'bar' )"; + r = run_query(href, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `One`"; + r = MsiDatabaseOpenViewA(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + ok(r == 1, "Expected 1, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 2, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmpA(buf, "foo"), "Expected \"foo\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 2, "Expected 2, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 2, buf, &size); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine ok(!lstrcmpA(buf, "bar"), "Expected \"bar\", got \"%s\"\n", buf); + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, + "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); MsiCloseHandle(href); DeleteFileA(msifile);

1 0

Owen Rudge : comctl32: Ensure listview control has focus when marquee dragging.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 36e9153f38af09abe4e527fb9b62d5aa4c1201c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36e9153f38af09abe4e527fb9… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 19 10:57:14 2009 -0500 comctl32: Ensure listview control has focus when marquee dragging. --- dlls/comctl32/listview.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4de9149..3744e10 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9539,6 +9539,9 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN } else { + if (!infoPtr->bFocus) + SetFocus(infoPtr->hwndSelf); + /* remove all selections */ if (!(wKey & MK_CONTROL) && !(wKey & MK_SHIFT)) LISTVIEW_DeselectAll(infoPtr);

1 0

Paul Vriens : oleaut32/tests: Remove a temp file.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 5f52d86cc2af82ed745ec04287abdaad2e836049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f52d86cc2af82ed745ec0428… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 20 13:36:15 2009 +0200 oleaut32/tests: Remove a temp file. --- dlls/ole32/tests/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 5ec51cf..480fa17 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1910,6 +1910,8 @@ static void test_references(void) while ( c1 ) c1 = IStorage_Release(stg); } } + + DeleteFileA(filenameA); } /* dest

1 0

Damjan Jovanovic : cfgmgr32.h: Define MAX_DEVICE_ID_LEN.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 47334849c3f6c07ca9c95e8696ede8c9d90f304e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47334849c3f6c07ca9c95e869… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Oct 20 13:44:41 2009 +0200 cfgmgr32.h: Define MAX_DEVICE_ID_LEN. --- include/cfgmgr32.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 9e99985..2b80534 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -97,6 +97,9 @@ typedef DWORD CONFIGRET; #define CR_INVALID_STRUCTURE_SIZE 0x3b #define NUM_CR_RESULTS 0x3c +#define MAX_DEVICE_ID_LEN 200 +#define MAX_DEVNODE_ID_LEN MAX_DEVICE_ID_LEN + #define MAX_CLASS_NAME_LEN 32 #define MAX_GUID_STRING_LEN 39 #define MAX_PROFILE_LEN 80

1 0

Hans Leidekker : msi: Always create a temporary copy of the package.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 33d9f37f4a34533a543446a54f69d4d212db89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d9f37f4a34533a543446a54… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 20 14:09:08 2009 +0200 msi: Always create a temporary copy of the package. --- dlls/msi/package.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index fa0cd6f..1d34770 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -908,6 +908,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) if ( UrlIsW( szPackage, URLIS_URL ) ) { file = msi_download_file( szPackage, temppath ); + if ( file != szPackage ) + file = copy_package_to_temp( file, temppath ); base_url = strdupW( szPackage ); if ( !base_url )

1 0

Hans Leidekker : msi: Create the local copy before opening the database.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 8dd3d389b02a6477e78aa9af1ccc310fa3a562a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd3d389b02a6477e78aa9af1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 20 14:09:53 2009 +0200 msi: Create the local copy before opening the database. --- dlls/msi/action.c | 61 ++------------------------------------------------ dlls/msi/database.c | 5 ++++ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 49 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e108701..b9b8199 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3802,63 +3802,6 @@ static UINT ACTION_UnpublishFeatures(MSIPACKAGE *package) return ERROR_SUCCESS; } -static UINT msi_get_local_package_name( LPWSTR path ) -{ - static const WCHAR szInstaller[] = { - '\\','I','n','s','t','a','l','l','e','r','\\',0}; - static const WCHAR fmt[] = { '%','x','.','m','s','i',0}; - DWORD time, len, i; - HANDLE handle; - - time = GetTickCount(); - GetWindowsDirectoryW( path, MAX_PATH ); - lstrcatW( path, szInstaller ); - CreateDirectoryW( path, NULL ); - - len = lstrlenW(path); - for (i=0; i<0x10000; i++) - { - snprintfW( &path[len], MAX_PATH - len, fmt, (time+i)&0xffff ); - handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - CloseHandle(handle); - break; - } - if (GetLastError() != ERROR_FILE_EXISTS && - GetLastError() != ERROR_SHARING_VIOLATION) - return ERROR_FUNCTION_FAILED; - } - - return ERROR_SUCCESS; -} - -static UINT msi_make_package_local( MSIPACKAGE *package, HKEY hkey ) -{ - WCHAR packagefile[MAX_PATH]; - UINT r; - - r = msi_get_local_package_name( packagefile ); - if (r != ERROR_SUCCESS) - return r; - - TRACE("Copying to local package %s\n",debugstr_w(packagefile)); - - r = CopyFileW( package->db->path, packagefile, FALSE); - - if (!r) - { - ERR("Unable to copy package (%s -> %s) (error %d)\n", - debugstr_w(package->db->path), debugstr_w(packagefile), GetLastError()); - return ERROR_FUNCTION_FAILED; - } - - msi_reg_set_val_str( hkey, INSTALLPROPERTY_LOCALPACKAGEW, packagefile ); - - return ERROR_SUCCESS; -} - static UINT msi_publish_install_properties(MSIPACKAGE *package, HKEY hkey) { LPWSTR prop, val, key; @@ -3990,7 +3933,9 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) goto done; - msi_make_package_local(package, props); + msi_reg_set_val_str( props, INSTALLPROPERTY_LOCALPACKAGEW, package->db->localfile ); + msi_free( package->db->localfile ); + package->db->localfile = NULL; rc = msi_publish_install_properties(package, hkey); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 8d0ee42..a75b8a8 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -65,6 +65,11 @@ static VOID MSI_CloseDatabase( MSIOBJECTHDR *arg ) DeleteFileW( db->deletefile ); msi_free( db->deletefile ); } + if (db->localfile) + { + DeleteFileW( db->localfile ); + msi_free( db->localfile ); + } } UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 296e87d..9692b64 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -76,6 +76,7 @@ typedef struct tagMSIDATABASE UINT bytes_per_strref; LPWSTR path; LPWSTR deletefile; + LPWSTR localfile; LPCWSTR mode; struct list tables; struct list transforms; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1d34770..1ab2afd 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -870,6 +870,38 @@ LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ) return filename; } +static UINT msi_get_local_package_name( LPWSTR path ) +{ + static const WCHAR szInstaller[] = { + '\\','I','n','s','t','a','l','l','e','r','\\',0}; + static const WCHAR fmt[] = { '%','x','.','m','s','i',0}; + DWORD time, len, i; + HANDLE handle; + + time = GetTickCount(); + GetWindowsDirectoryW( path, MAX_PATH ); + strcatW( path, szInstaller ); + CreateDirectoryW( path, NULL ); + + len = strlenW(path); + for (i = 0; i < 0x10000; i++) + { + snprintfW( &path[len], MAX_PATH - len, fmt, (time + i)&0xffff ); + handle = CreateFileW( path, GENERIC_WRITE, 0, NULL, + CREATE_NEW, FILE_ATTRIBUTE_NORMAL, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + CloseHandle(handle); + break; + } + if (GetLastError() != ERROR_FILE_EXISTS && + GetLastError() != ERROR_SHARING_VIOLATION) + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; +} + UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) { static const WCHAR OriginalDatabase[] = @@ -880,7 +912,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) MSIHANDLE handle; LPWSTR ptr, base_url = NULL; UINT r; - WCHAR temppath[MAX_PATH]; + WCHAR temppath[MAX_PATH], localfile[MAX_PATH]; LPCWSTR file = szPackage; TRACE("%s %p\n", debugstr_w(szPackage), pPackage); @@ -921,6 +953,19 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) else file = copy_package_to_temp( szPackage, temppath ); + r = msi_get_local_package_name( localfile ); + if (r != ERROR_SUCCESS) + return r; + + TRACE("Copying to local package %s\n", debugstr_w(localfile)); + + if (!CopyFileW( file, localfile, FALSE )) + { + ERR("Unable to copy package (%s -> %s) (error %u)\n", + debugstr_w(file), debugstr_w(localfile), GetLastError()); + return GetLastError(); + } + r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); if( r != ERROR_SUCCESS ) { @@ -932,6 +977,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return r; } + + db->localfile = strdupW( localfile ); } package = MSI_CreatePackage( db, base_url );

1 0

Hans Leidekker : msi: Open the database read/write in MSI_OpenPackageW.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: afcd2c535894c1768e3fc007277f86400b2067aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcd2c535894c1768e3fc0072… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 20 14:10:19 2009 +0200 msi: Open the database read/write in MSI_OpenPackageW. Fixes transforms that add binary streams. --- dlls/msi/package.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1ab2afd..13091d9 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -966,7 +966,11 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) return GetLastError(); } - r = MSI_OpenDatabaseW( file, MSIDBOPEN_READONLY, &db ); + /* transforms that add binary streams require that we open the database + * read/write, which is safe because we always create a copy that is thrown + * away when we're done. + */ + r = MSI_OpenDatabaseW( file, MSIDBOPEN_DIRECT, &db ); if( r != ERROR_SUCCESS ) { if (file != szPackage)

1 0