August 2010 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Return true spec in nsIURI::GetSpec.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: e83402122d87fb3b075fe4f83bf3cabe8d9daa3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83402122d87fb3b075fe4f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 18 13:38:07 2010 +0200 mshtml: Return true spec in nsIURI::GetSpec. --- dlls/mshtml/nsio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d7b0989..5332a02 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1575,8 +1575,8 @@ static nsresult NSAPI nsURI_GetSpec(nsIURL *iface, nsACString *aSpec) TRACE("(%p)->(%p)\n", This, aSpec); if(This->use_wine_url) { - char speca[INTERNET_MAX_URL_LENGTH] = "wine:"; - WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca+5, sizeof(speca)-5, NULL, NULL); + char speca[INTERNET_MAX_URL_LENGTH]; + WideCharToMultiByte(CP_ACP, 0, This->wine_url, -1, speca, sizeof(speca), NULL, NULL); nsACString_SetData(aSpec, speca); return NS_OK;

1 0

Hans Leidekker : msi/tests: Fix some WoW64 test failures.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 4102156e0fcc159a74e300e8e62f14aee4ae19f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4102156e0fcc159a74e300e8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 11:21:18 2010 +0200 msi/tests: Fix some WoW64 test failures. --- dlls/msi/tests/msi.c | 8 ++++---- dlls/msi/tests/package.c | 9 ++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index dc023f4..e4da576 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4800,7 +4800,7 @@ static void test_MsiGetProductInfoEx(void) lstrcpyA(keypath, "Software\\Microsoft\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); - res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &prodkey); + res = RegCreateKeyExA(HKEY_CURRENT_USER, keypath, 0, NULL, 0, access, NULL, &prodkey, NULL); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); sz = MAX_PATH; @@ -5191,7 +5191,7 @@ static void test_MsiGetProductInfoEx(void) RegDeleteValueA(prodkey, "HelpTelephone"); RegDeleteValueA(prodkey, "HelpLink"); RegDeleteValueA(prodkey, "LocalPackage"); - RegDeleteKeyA(prodkey, ""); + delete_key(prodkey, "", access & KEY_WOW64_64KEY); RegCloseKey(prodkey); /* MSIINSTALLCONTEXT_USERMANAGED */ @@ -5604,9 +5604,9 @@ static void test_MsiGetProductInfoEx(void) RegDeleteValueA(propkey, "HelpTelephone"); RegDeleteValueA(propkey, "HelpLink"); RegDeleteValueA(propkey, "ManagedLocalPackage"); - RegDeleteKeyA(propkey, ""); + delete_key(propkey, "", access & KEY_WOW64_64KEY); RegCloseKey(propkey); - RegDeleteKeyA(localkey, ""); + delete_key(localkey, "", access & KEY_WOW64_64KEY); RegCloseKey(localkey); lstrcpyA(keypath, "Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\Managed\\"); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index b326617..ce9fc2a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7866,11 +7866,6 @@ static void test_appsearch_reglocator(void) LPCSTR str; LONG res; UINT r; - REGSAM access = KEY_ALL_ACCESS; - BOOL wow64; - - if (pIsWow64Process && pIsWow64Process(GetCurrentProcess(), &wow64) && wow64) - access |= KEY_WOW64_64KEY; version = TRUE; if (!create_file_with_version("test.dll", MAKELONG(2, 1), MAKELONG(4, 3))) @@ -7910,7 +7905,7 @@ static void test_appsearch_reglocator(void) ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); } - res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Wine", 0, NULL, 0, access, NULL, &hklm, NULL); + res = RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine", &hklm); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegSetValueA(hklm, NULL, REG_SZ, "defvalue", 8); @@ -8516,7 +8511,7 @@ static void test_appsearch_reglocator(void) RegDeleteValueA(hklm, "Value15"); RegDeleteValueA(hklm, "Value16"); RegDeleteValueA(hklm, "Value17"); - delete_key(hklm, "", access); + RegDeleteKey(hklm, ""); RegCloseKey(hklm); RegDeleteValueA(classes, "Value1");

1 0

Hans Leidekker : mscms/tests: Mark some win98 test results as broken.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 46fb926501bd09f4a57efa52dd04ff66f48381a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46fb926501bd09f4a57efa52d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 11:20:25 2010 +0200 mscms/tests: Mark some win98 test results as broken. --- dlls/mscms/tests/profile.c | 76 +++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 28 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 91ae97a..b60fff4 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -459,39 +459,42 @@ static void test_GetStandardColorSpaceProfileA(void) DWORD size; CHAR oldprofile[MAX_PATH]; CHAR newprofile[MAX_PATH]; - const CHAR emptyA[] = ""; - DWORD zero = 0; - DWORD sizeP = sizeof(newprofile); /* Parameter checks */ /* Single invalid parameter checks: */ + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ - ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileA(machine, LCS_sRGB, newprofile, &size); ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileA(NULL, (DWORD)-1, newprofile, &size); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &sizeP); + ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, NULL, &size); ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &zero); + ret = pGetStandardColorSpaceProfileA(NULL, LCS_sRGB, newprofile, &size); ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Several invalid parameter checks: */ + size = 0; SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &zero); + ret = pGetStandardColorSpaceProfileA(machine, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); @@ -499,15 +502,17 @@ static void test_GetStandardColorSpaceProfileA(void) ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &zero); + ret = pGetStandardColorSpaceProfileA(NULL, 0, NULL, &size); ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ - ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileA(NULL, 0, newprofile, &size); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); - else ok( !lstrcmpiA( newprofile, emptyA ) && GetLastError() == 0xfaceabee, + else ok( !lstrcmpiA( newprofile, "" ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileA() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */ @@ -540,45 +545,55 @@ static void test_GetStandardColorSpaceProfileW(void) WCHAR oldprofile[MAX_PATH]; WCHAR newprofile[MAX_PATH]; CHAR newprofileA[MAX_PATH]; - const CHAR empty[] = ""; - DWORD zero = 0; - DWORD sizeP = sizeof(newprofile); /* Parameter checks */ /* Single invalid parameter checks: */ + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 1st param, */ - ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(machineW, LCS_sRGB, newprofile, &size); ok( !ret && GetLastError() == ERROR_NOT_SUPPORTED, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(NULL, (DWORD)-1, newprofile, &size); ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 2nd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || broken(ret), /* Win98 and WinME */ "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 3rd param, */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &sizeP); - ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &size); + ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || + broken(GetLastError() == 0xfaceabee) /* win98 */, + "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* 4th param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* dereferenced 4th param. */ - ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, &zero); - ok( !ret && (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, newprofile, &size); + ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_MORE_DATA || + GetLastError() == ERROR_INSUFFICIENT_BUFFER || + broken(GetLastError() == 0xfaceabee) /* win98 */, + "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); /* Several invalid parameter checks: */ + size = 0; SetLastError(0xfaceabee); /* 1st, maybe 2nd and then dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &zero); + ret = pGetStandardColorSpaceProfileW(machineW, 0, newprofile, &size); ok( !ret && (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED), "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); @@ -586,18 +601,23 @@ static void test_GetStandardColorSpaceProfileW(void) ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, NULL); ok( !ret && GetLastError() == ERROR_INVALID_PARAMETER, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + size = 0; SetLastError(0xfaceabee); /* maybe 2nd, then 3rd and dereferenced 4th param, */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, NULL, &zero); - ok( !ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || GetLastError() == ERROR_FILE_NOT_FOUND), - "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ret = pGetStandardColorSpaceProfileW(NULL, 0, NULL, &size); + ok( !ret || broken(ret) /* win98 */, "GetStandardColorSpaceProfileW succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == 0xfaceabee) /* win98 */, + "GetStandardColorSpaceProfileW() returns GLE=%u\n", GetLastError() ); + size = sizeof(newprofile); SetLastError(0xfaceabee); /* maybe 2nd param. */ - ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); + ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &size); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); else { WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); - ok( !lstrcmpiA( newprofileA, empty ) && GetLastError() == 0xfaceabee, + ok( !lstrcmpiA( newprofileA, "" ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); }

1 0

Hans Leidekker : msi/tests: Use HKEY_CURRENT_USER instead of HKEY_LOCAL_MACHINE for registry tests.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 7c89d4f28f6f1edf1253b337c5312f4a1078b653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c89d4f28f6f1edf1253b337c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 11:21:34 2010 +0200 msi/tests: Use HKEY_CURRENT_USER instead of HKEY_LOCAL_MACHINE for registry tests. Works around test failures on 64-bit Windows where MsiInstallProduct returns success even though the registry keys specified in the Registry table are not created. --- dlls/msi/tests/automation.c | 12 ++++++------ dlls/msi/tests/install.c | 43 +++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c89d4f28f6f1edf1253b…

1 0

Alexandre Julliard : configure: Require autoconf 2.62, older versions don' t handle source dir symlinks correctly.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 438835640f641701731c8d26069615549035ba00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438835640f641701731c8d260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 18 12:01:37 2010 +0200 configure: Require autoconf 2.62, older versions don't handle source dir symlinks correctly. --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a5d7b25..8cbbe78 100644 --- a/configure.ac +++ b/configure.ac @@ -4,8 +4,8 @@ dnl See ChangeLog file for detailed change history. m4_define(WINE_VERSION,regexp(m4_include(VERSION),[version \([-.0-9A-Za-z]+\)],[\1])) -dnl autoconf versions before 2.59d don't handle multi-line subst variables correctly -AC_PREREQ(2.59d) +dnl autoconf versions before 2.62 don't handle source dir symlinks correctly +AC_PREREQ(2.62) AC_INIT([Wine],[WINE_VERSION],[wine-devel(a)winehq.org],[wine],[http://www.winehq.org]) AC_CONFIG_SRCDIR(server/atom.c) AC_CONFIG_HEADERS(include/config.h)

1 0

Hans Leidekker : msi: Bump version to 4.5.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 378bb21f8ee89f27879c8833b3309a3c1a414cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378bb21f8ee89f27879c8833b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 11:22:37 2010 +0200 msi: Bump version to 4.5. --- dlls/msi/msipriv.h | 6 +++--- dlls/msi/version.rc | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 344b145..a5d089e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -595,9 +595,9 @@ typedef struct tagMSISCRIPT #define MSIHANDLETYPE_PACKAGE 5 #define MSIHANDLETYPE_PREVIEW 6 -#define MSI_MAJORVERSION 3 -#define MSI_MINORVERSION 1 -#define MSI_BUILDNUMBER 4000 +#define MSI_MAJORVERSION 4 +#define MSI_MINORVERSION 5 +#define MSI_BUILDNUMBER 6001 #define GUID_SIZE 39 #define SQUISH_GUID_SIZE 33 diff --git a/dlls/msi/version.rc b/dlls/msi/version.rc index 4fe3d91..ab027f4 100644 --- a/dlls/msi/version.rc +++ b/dlls/msi/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 3,1,4000,2435 -#define WINE_FILEVERSION_STR "3.1.4000.2435" -#define WINE_PRODUCTVERSION 3,1,4000,2435 -#define WINE_PRODUCTVERSION_STR "3.1.4000.2435" +#define WINE_FILEVERSION 4,5,6001,22159 +#define WINE_FILEVERSION_STR "4.5.6001.22159" +#define WINE_PRODUCTVERSION 4,5,6001,22159 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22159" #include "wine/wine_common_ver.rc"

1 0

Hans Leidekker : msi: Handle signature filenames in short|long notation.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 5d85497a15af1e8bd8095228faf22f29667a6d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d85497a15af1e8bd8095228f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 11:22:12 2010 +0200 msi: Handle signature filenames in short|long notation. --- dlls/msi/appsearch.c | 8 +++++++- dlls/msi/tests/package.c | 25 ++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index a516bda..dfab396 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -89,7 +89,7 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig, 'S','i','g','n','a','t','u','r','e',' ', 'w','h','e','r','e',' ','S','i','g','n','a','t','u','r','e',' ','=',' ', '\'','%','s','\'',0}; - LPWSTR minVersion, maxVersion; + LPWSTR minVersion, maxVersion, p; MSIRECORD *row; DWORD time; @@ -106,6 +106,12 @@ static UINT ACTION_AppSearchGetSignature(MSIPACKAGE *package, MSISIGNATURE *sig, /* get properties */ sig->File = msi_dup_record_field(row,2); + if ((p = strchrW(sig->File, '|'))) + { + p++; + memmove(sig->File, p, (strlenW(p) + 1) * sizeof(WCHAR)); + } + minVersion = msi_dup_record_field(row,3); if (minVersion) { diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ce9fc2a..9e7f104 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7507,7 +7507,7 @@ static void test_appsearch(void) UINT r; MSIHANDLE hdb; CHAR prop[MAX_PATH]; - DWORD size = MAX_PATH; + DWORD size; hdb = create_package_db(); ok ( hdb, "failed to create package database\n" ); @@ -7518,17 +7518,29 @@ static void test_appsearch(void) r = add_appsearch_entry( hdb, "'WEBBROWSERPROG', 'NewSignature1'" ); ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); + ok( r == ERROR_SUCCESS, "cannot add entry: %d\n", r ); + r = create_reglocator_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); r = add_reglocator_entry( hdb, "'NewSignature1', 0, 'htmlfile\\shell\\open\\command', '', 1" ); ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = create_drlocator_table( hdb ); + ok( r == ERROR_SUCCESS, "cannot create DrLocator table: %d\n", r ); + + r = add_drlocator_entry( hdb, "'NewSignature2', 0, 'c:\\windows\\system32', 0" ); + ok( r == ERROR_SUCCESS, "cannot create RegLocator table: %d\n", r ); + r = create_signature_table( hdb ); ok( r == ERROR_SUCCESS, "cannot create Signature table: %d\n", r ); r = add_signature_entry( hdb, "'NewSignature1', 'FileName', '', '', '', '', '', '', ''" ); - ok( r == ERROR_SUCCESS, "cannot create Signature table: %d\n", r ); + ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); + + r = add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + ok( r == ERROR_SUCCESS, "cannot add signature: %d\n", r ); r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -7538,12 +7550,14 @@ static void test_appsearch(void) return; } ok( r == ERROR_SUCCESS, "failed to create package %u\n", r ); - MsiCloseHandle( hdb ); + if (r != ERROR_SUCCESS) + goto done; r = MsiDoAction( hpkg, "AppSearch" ); ok( r == ERROR_SUCCESS, "AppSearch failed: %d\n", r); + size = sizeof(prop); r = MsiGetPropertyA( hpkg, "WEBBROWSERPROG", prop, &size ); ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); todo_wine @@ -7551,6 +7565,11 @@ static void test_appsearch(void) ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); } + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "NOTEPAD", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + +done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); }

1 0

Hans Leidekker : msi/tests: Skip SourceDir tests on win9x.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 0c044c10d005c6ee774761108f07fefa453cd755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c044c10d005c6ee774761108… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 11:21:51 2010 +0200 msi/tests: Skip SourceDir tests on win9x. --- dlls/msi/tests/install.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 72b16de..7be5094 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -10572,6 +10572,11 @@ static void test_sourcedir_props(void) { UINT r; + if (on_win9x) + { + win_skip("skipping sourcedir tests on win9x\n"); + return; + } if (is_process_limited()) { skip("process is limited\n");

1 0

Hans Leidekker : wldap32: Fix handling of zero timeout value in ldap_search_extW.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 3fbf6bdf113a5fe1768aca146f8062cc96c208d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fbf6bdf113a5fe1768aca146… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 18 12:33:35 2010 +0200 wldap32: Fix handling of zero timeout value in ldap_search_extW. Based on a patch by Adam Romanek. --- dlls/wldap32/search.c | 12 ++++++++---- dlls/wldap32/tests/parse.c | 20 ++++++++++++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/search.c b/dlls/wldap32/search.c index 16158a4..6b0f4de 100644 --- a/dlls/wldap32/search.c +++ b/dlls/wldap32/search.c @@ -243,7 +243,7 @@ ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, #ifdef HAVE_LDAP char *baseU = NULL, *filterU = NULL, **attrsU = NULL; LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; - struct timeval tv; + struct timeval tv, *tvp = NULL; ret = WLDAP32_LDAP_NO_MEMORY; @@ -274,11 +274,15 @@ ULONG CDECL ldap_search_extW( WLDAP32_LDAP *ld, PWCHAR base, ULONG scope, if (!clientctrlsU) goto exit; } - tv.tv_sec = timelimit; - tv.tv_usec = 0; + if (timelimit) + { + tv.tv_sec = timelimit; + tv.tv_usec = 0; + tvp = &tv; + } ret = map_error( ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, - serverctrlsU, clientctrlsU, &tv, sizelimit, (int *)message )); + serverctrlsU, clientctrlsU, tvp, sizelimit, (int *)message )); exit: strfreeU( baseU ); diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 0f22d23..61bc9ca 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -86,6 +86,25 @@ static void test_ldap_parse_sort_control( LDAP *ld ) ldap_controls_free( server_ctrls ); } +static void test_ldap_search_extW( LDAP *ld ) +{ + ULONG ret, message, timelimit; + WCHAR base[] = {0}, filter[] = {'o','u','=','*',0}; + + timelimit = 20; + ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); + if (ret == LDAP_SERVER_DOWN) + { + skip("test server can't be reached\n"); + return; + } + ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + + timelimit = 0; + ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); + ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); +} + START_TEST (parse) { LDAP *ld; @@ -94,5 +113,6 @@ START_TEST (parse) ok( ld != NULL, "ldap_init failed\n" ); test_ldap_parse_sort_control( ld ); + test_ldap_search_extW( ld ); ldap_unbind( ld ); }

1 0

David Hedberg : explorerframe: Implement GetSelectedItems.
by Alexandre Julliard Aug. 18, 2010

Aug. 18, 2010

Module: wine Branch: master Commit: 20872fadce7ece0fa330b2b49d33033cb298e137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20872fadce7ece0fa330b2b49… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Wed Aug 18 07:08:15 2010 +0200 explorerframe: Implement GetSelectedItems. --- dlls/explorerframe/nstc.c | 13 ++- dlls/explorerframe/tests/nstc.c | 203 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 213 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20872fadce7ece0fa330b…

1 0