On Thu, Jun 4, 2009 at 3:12 AM, Hans Leidekker hans@codeweavers.com wrote:
diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3ba34d1..f22c01f 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1822,7 +1822,7 @@ static UINT msi_check_product_patches(LPCWSTR prodcode, LPCWSTR usersid, LPWSTR patch, LPWSTR targetprod, MSIINSTALLCONTEXT *targetctx, LPWSTR targetsid, DWORD *sidsize, LPWSTR *transforms) {
- MSIPATCHSTATE state;
- MSIPATCHSTATE state = MSIPATCHSTATE_INVALID;
LPWSTR ptr, patches = NULL; HKEY prod, patchkey = 0; HKEY localprod = 0, localpatch = 0; diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a9eef76..3263ec1 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -939,6 +939,7 @@ static void test_settargetpath(void) sz = sizeof tempdir - 1; r = MsiGetTargetPath( hpkg, "TARGETDIR", tempdir, &sz ); sprintf( file, "%srootfile.txt", tempdir );
- buffer[0] = 0;
query_file_path( hpkg, "[#RootFile]", buffer ); ok( r == ERROR_SUCCESS, "failed to get target path: %d\n", r); ok( !lstrcmp(buffer, file), "Expected %s, got %s\n", file, buffer ); @@ -11057,8 +11058,8 @@ static void test_access(void)
static void test_emptypackage(void) {
- MSIHANDLE hpkg, hdb, hsuminfo;
- MSIHANDLE hview, hrec;
- MSIHANDLE hpkg = 0, hdb = 0, hsuminfo = 0;
- MSIHANDLE hview = 0, hrec = 0;
MSICONDITION condition; CHAR buffer[MAX_PATH]; DWORD size;
Howdy Hans,
One of your recent msi patches (I suspect this one), causes several hundred failures/succeeding todo's on my previously passing box. Could you have a look: http://test.winehq.org/data/1a0a47d60c337ca096c26da291adf82e49770f34/wine_ae...
On Thursday 04 June 2009 10:12:02 pm Austin English wrote:
One of your recent msi patches (I suspect this one), causes several hundred failures/succeeding todo's on my previously passing box. Could you have a look: http://test.winehq.org/data/1a0a47d60c337ca096c26da291adf82e49770f34/wine_ae...
Tests fail even before code touched by that patch or any of the other patches in that set is called. Can you revert them and try again?
-Hans
On Fri, Jun 5, 2009 at 1:35 AM, Hans Leidekkerhans@codeweavers.com wrote:
On Thursday 04 June 2009 10:12:02 pm Austin English wrote:
One of your recent msi patches (I suspect this one), causes several hundred failures/succeeding todo's on my previously passing box. Could you have a look: http://test.winehq.org/data/1a0a47d60c337ca096c26da291adf82e49770f34/wine_ae...
Tests fail even before code touched by that patch or any of the other patches in that set is called. Can you revert them and try again?
Yeah, appears to have been caused by something else...maybe one of the winegcc patches?
Anywho, fixed now. Sorry for the scare.