February 2009 - Wine-commits

Michael Stefaniuc : tools: Remove unused alloca.h include.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 2b066327ec8454342f19735519bbf37f37c9a5be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b066327ec8454342f1973551… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Feb 12 23:29:39 2009 +0100 tools: Remove unused alloca.h include. --- tools/widl/parser.y | 3 --- tools/wrc/parser.y | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8e24504..d5260c1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -28,9 +28,6 @@ #include <assert.h> #include <ctype.h> #include <string.h> -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif #include "widl.h" #include "utils.h" diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 1742628..512d272 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -129,9 +129,6 @@ #include <assert.h> #include <ctype.h> #include <string.h> -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif #include "wrc.h" #include "utils.h"

1 0

Juan Lang : crypt32: Fix a few test failures on some Windows 98 systems.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 72848b7b2c6b5d50aef97d2ea7a01332bb9aafab URL: http://source.winehq.org/git/wine.git/?a=commit;h=72848b7b2c6b5d50aef97d2ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 15:02:43 2009 -0800 crypt32: Fix a few test failures on some Windows 98 systems. --- dlls/crypt32/tests/ctl.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/tests/ctl.c b/dlls/crypt32/tests/ctl.c index 2b80bf0..f09420c 100644 --- a/dlls/crypt32/tests/ctl.c +++ b/dlls/crypt32/tests/ctl.c @@ -156,7 +156,8 @@ static void testCreateCTL(void) signedCTLWithSubjectAlgorithm, sizeof(signedCTLWithSubjectAlgorithm)); ok(!ctl && (GetLastError() == ERROR_INVALID_DATA || - GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE), /* win9x */ + GetLastError() == CRYPT_E_UNEXPECTED_MSG_TYPE /* win9x */ || + GetLastError() == ERROR_SUCCESS /* some win98 */), "expected ERROR_INVALID_DATA, got %d (0x%08x)\n", GetLastError(), GetLastError()); /* This signed CTL with the appropriate inner content type can be decoded. @@ -326,7 +327,7 @@ static void testAddCTLToStore(void) { HCERTSTORE store; BOOL ret; - DWORD numCTLs; + DWORD numCTLs, expectedCTLs; PCCTL_CONTEXT ctl; store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, @@ -368,7 +369,8 @@ static void testAddCTLToStore(void) if (ret) { /* win9x */ - ok(GetLastError() == CRYPT_E_NOT_FOUND, + ok(GetLastError() == CRYPT_E_NOT_FOUND || + GetLastError() == OSS_DATA_ERROR /* some win98 */, "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); } else @@ -389,10 +391,14 @@ static void testAddCTLToStore(void) signedCTLWithCTLInnerContent, sizeof(signedCTLWithCTLInnerContent), CERT_STORE_ADD_NEW, NULL); ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + expectedCTLs = 1; ret = CertAddEncodedCTLToStore(store, X509_ASN_ENCODING, signedCTLWithUsage, sizeof(signedCTLWithUsage), CERT_STORE_ADD_NEW, NULL); - ok(ret, "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + ok(ret || broken(GetLastError() == OSS_DATA_ERROR /* some win98 */), + "CertAddEncodedCTLToStore failed: %08x\n", GetLastError()); + if (ret) + expectedCTLs++; /* Check that two exist */ numCTLs = 0; ctl = NULL; @@ -401,8 +407,8 @@ static void testAddCTLToStore(void) if (ctl) numCTLs++; } while (ctl); - ok(numCTLs == 2 || broken(numCTLs == 1 /* some Win98 */), - "expected 2 CTLs, got %d\n", numCTLs); + ok(numCTLs == expectedCTLs, "expected %d CTLs, got %d\n", expectedCTLs, + numCTLs); CertCloseStore(store, 0); store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0,

1 0

Juan Lang : advapi32: Fix a test failure on systems that are domain members .
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 58c6467ce60017cebcd241d7a4b82820b343b94d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c6467ce60017cebcd241d7a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 14:27:53 2009 -0800 advapi32: Fix a test failure on systems that are domain members. --- dlls/advapi32/tests/security.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a681cb1..4513549 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1884,6 +1884,7 @@ static void test_LookupAccountName(void) domain_size = 0; ret = LookupAccountNameA(NULL, computer_name, NULL, &sid_size, NULL, &domain_size, &sid_use); ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER || + GetLastError() == ERROR_NONE_MAPPED /* in a domain */ || broken(GetLastError() == ERROR_TRUSTED_DOMAIN_FAILURE) || broken(GetLastError() == ERROR_TRUSTED_RELATIONSHIP_FAILURE)), "LookupAccountNameA failed: %d\n", GetLastError());

1 0

Juan Lang : crypt32: Allow an alternate chain policy status for broken systems.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 33e32229202bd759807cda45e29c04e13d359e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e32229202bd759807cda45e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 11 15:00:01 2009 -0800 crypt32: Allow an alternate chain policy status for broken systems. --- dlls/crypt32/tests/chain.c | 123 ++++++++++++++++++++++++++------------------ 1 files changed, 72 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33e32229202bd759807cd…

1 0

Juan Lang : netapi32: Fix tests on systems with reduced privilege.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: c233fd579625578e2628c03d14f625cd40484efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c233fd579625578e2628c03d1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 12:36:27 2009 -0800 netapi32: Fix tests on systems with reduced privilege. --- dlls/netapi32/tests/access.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index dfa68ef..301cd19 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -251,6 +251,11 @@ static void run_userhandling_tests(void) ret = pNetUserDel(NULL, sTooLongName); ok(ret == NERR_Success, "Deleting the user failed : %d\n", ret); } + else if (ret == ERROR_ACCESS_DENIED) + { + skip("not enough permissions to add a user\n"); + return; + } else ok(ret == NERR_BadUsername || broken(ret == NERR_PasswordTooShort), /* NT4 */ @@ -260,7 +265,8 @@ static void run_userhandling_tests(void) usri.usri1_password = sTooLongPassword; ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); - ok(ret == NERR_PasswordTooShort, "Adding user with too long password returned 0x%08x\n", ret); + ok(ret == NERR_PasswordTooShort || ret == ERROR_ACCESS_DENIED /* Win2003 */, + "Adding user with too long password returned 0x%08x\n", ret); usri.usri1_name = sTooLongName; usri.usri1_password = sTooLongPassword;

1 0

Juan Lang : shell32: Let caller determine whether a shell path function must succeed or fail.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 6feb5cdd04440d5cf84a3578652bfdfb94cdf817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feb5cdd04440d5cf84a35786… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 10:33:03 2009 -0800 shell32: Let caller determine whether a shell path function must succeed or fail. --- dlls/shell32/tests/shellpath.c | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index f6298d4..883f231 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -384,7 +384,7 @@ static void testApiParameters(void) } /* Returns the folder's PIDL type, or 0xff if one can't be found. */ -static BYTE testSHGetFolderLocation(BOOL optional, int folder) +static BYTE testSHGetFolderLocation(int folder) { LPITEMIDLIST pidl; HRESULT hr; @@ -395,12 +395,8 @@ static BYTE testSHGetFolderLocation(BOOL optional, int folder) pidl = NULL; hr = pSHGetFolderLocation(NULL, folder, NULL, 0, &pidl); - ok(SUCCEEDED(hr) || optional, - "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl) failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { - ok(pidl != NULL, - "SHGetFolderLocation(NULL, %s, NULL, 0, &pidl) succeeded, but returned pidl is NULL\n", getFolderName(folder)); if (pidl) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -416,7 +412,7 @@ static BYTE testSHGetFolderLocation(BOOL optional, int folder) } /* Returns the folder's PIDL type, or 0xff if one can't be found. */ -static BYTE testSHGetSpecialFolderLocation(BOOL optional, int folder) +static BYTE testSHGetSpecialFolderLocation(int folder) { LPITEMIDLIST pidl; HRESULT hr; @@ -427,14 +423,8 @@ static BYTE testSHGetSpecialFolderLocation(BOOL optional, int folder) pidl = NULL; hr = pSHGetSpecialFolderLocation(NULL, folder, &pidl); - ok(SUCCEEDED(hr) || optional || - broken((folder == CSIDL_COOKIES || folder == CSIDL_INTERNET) && - hr == E_INVALIDARG) /* NT4 */, - "SHGetSpecialFolderLocation(NULL, %s, &pidl) failed: 0x%08x\n", getFolderName(folder), hr); if (SUCCEEDED(hr)) { - ok(pidl != NULL, - "SHGetSpecialFolderLocation(NULL, %s, &pidl) succeeded, but returned pidl is NULL\n", getFolderName(folder)); if (pidl) { LPITEMIDLIST pidlLast = pILFindLastID(pidl); @@ -489,7 +479,7 @@ static void testShellValues(const struct shellExpectedValues testEntries[], if (pSHGetFolderLocation) { - type = testSHGetFolderLocation(optional, testEntries[i].folder); + type = testSHGetFolderLocation(testEntries[i].folder); for (j = 0; !foundTypeMatch && j < testEntries[i].numTypes; j++) if (testEntries[i].types[j] == type) foundTypeMatch = TRUE; @@ -497,7 +487,7 @@ static void testShellValues(const struct shellExpectedValues testEntries[], "%s has unexpected type %d (0x%02x)\n", getFolderName(testEntries[i].folder), type, type); } - type = testSHGetSpecialFolderLocation(optional, testEntries[i].folder); + type = testSHGetSpecialFolderLocation(testEntries[i].folder); for (j = 0, foundTypeMatch = FALSE; !foundTypeMatch && j < testEntries[i].numTypes; j++) if (testEntries[i].types[j] == type) @@ -579,12 +569,6 @@ static void testDesktop(void) { testSHGetFolderPath(FALSE, CSIDL_DESKTOP); testSHGetSpecialFolderPath(FALSE, CSIDL_DESKTOP); - /* Test the desktop; even though SHITEMID should always contain abID of at - * least one type, when cb is 0 its value is undefined. So don't check - * what the returned type is, just make sure it exists. - */ - testSHGetFolderLocation(FALSE, CSIDL_DESKTOP); - testSHGetSpecialFolderLocation(FALSE, CSIDL_DESKTOP); } /* Checks the PIDL type of all the known values. */

1 0

Juan Lang : setupapi: Add stub entries for CM_Query_And_Remove_SubTreeA/ W and CM_Query_And_Remove_SubTree_ExA/W.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 37feb6fd69e44a6a2d5bd92ed4270b948f68a4d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37feb6fd69e44a6a2d5bd92ed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 11:20:40 2009 -0800 setupapi: Add stub entries for CM_Query_And_Remove_SubTreeA/W and CM_Query_And_Remove_SubTree_ExA/W. --- dlls/setupapi/setupapi.spec | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 1b8aa3e..c37a2b9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -144,6 +144,10 @@ @ stub CM_Open_Class_Key_ExW @ stub CM_Open_DevNode_Key @ stub CM_Open_DevNode_Key_Ex +@ stub CM_Query_And_Remove_SubTreeA +@ stub CM_Query_And_Remove_SubTreeW +@ stub CM_Query_And_Remove_SubTree_ExA +@ stub CM_Query_And_Remove_SubTree_ExW @ stub CM_Query_Arbitrator_Free_Data @ stub CM_Query_Arbitrator_Free_Data_Ex @ stub CM_Query_Arbitrator_Free_Size

1 0

Juan Lang : crypt32: Removed unneeded strcmp.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 5d5f7a41f07ef2525446772fa708f7e978b50316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5f7a41f07ef2525446772fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 09:24:18 2009 -0800 crypt32: Removed unneeded strcmp. --- dlls/crypt32/tests/oid.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 9c9a0bd..bb23a1e 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -139,8 +139,7 @@ static void testAlgIDToOID(void) if (strcmp(oid, algIDToOID[i].oid)) { if (algIDToOID[i].altOid) - ok(!strcmp(oid, algIDToOID[i].oid) || - !strcmp(oid, algIDToOID[i].altOid), + ok(!strcmp(oid, algIDToOID[i].altOid), "Expected %s or %s, got %s\n", algIDToOID[i].oid, algIDToOID[i].altOid, oid); else

1 0

Juan Lang : wintrust: Fix typo.
by Alexandre Julliard 13 Feb '09

13 Feb '09

Module: wine Branch: master Commit: 6407fb70363c64f80d262b03c7199753852b3fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6407fb70363c64f80d262b03c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Feb 12 09:23:40 2009 -0800 wintrust: Fix typo. --- dlls/wintrust/tests/register.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/register.c b/dlls/wintrust/tests/register.c index ccceb6c..8a6675c 100644 --- a/dlls/wintrust/tests/register.c +++ b/dlls/wintrust/tests/register.c @@ -291,7 +291,7 @@ static void test_RegPolicyFlags(void) size = sizeof(flags1); r = RegQueryValueExA(key, State, NULL, NULL, (LPBYTE)&flags1, &size); ok(!r || r == ERROR_FILE_NOT_FOUND, "RegQueryValueEx failed: %d\n", r); - if (r) + if (!r) ok(flags1 == flags2, "Got %08x flags instead of %08x\n", flags1, flags2); flags3 = flags2 | 1;

1 0

Jeremy Newman : adjust the layout spacing of some elements just a bit
by Jeremy Newman 12 Feb '09

12 Feb '09

Module: website Branch: master Commit: 91e11fdc69c0aafa6ca479dacace339ab0c793ab URL: http://source.winehq.org/git/website.git/?a=commit;h=91e11fdc69c0aafa6ca479… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Feb 12 16:50:39 2009 -0600 adjust the layout spacing of some elements just a bit --- templates/en/download.template | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 1526531..27d1c76 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -3,7 +3,7 @@ <h1 class="title">Wine Downloads</h1> -<h2><a name="crossover"></a>Supported Wine</h2> +<h2 style="margin-bottom: 10px;"><a name="crossover"></a>Supported Wine</h2> <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> @@ -34,13 +34,19 @@ requested in exchange for hosting the Wine web site.</p> -<h2><a name="binary"></a>Wine Binary Downloads</h2> - -<p><table><tr><td>Latest stable release:</td><td>Wine {$config_stable_release}</td> -<td rowspan="2"><b>See the -<a href="http://wiki.winehq.org/HowTo">installation and configuration how-to</a> -for post-installation instructions.</b></td></tr> -<tr><td>Latest development release:</td><td>Wine {$config_master_release}</td></tr></table></p> +<h2 style="margin-bottom: 5px;"><a name="binary"></a>Wine Binary Downloads</h2> + +<table style="margin: 0 0 15px 0;" width="100%"> +<tr> + <td width="200">Latest stable release:</td><td>Wine {$config_stable_release}</td> + <td rowspan="2" valign="top" style="padding-left: 20px; text-align: center;"><b>See the + <a href="http://wiki.winehq.org/HowTo">installation and configuration how-to</a> + for post-installation instructions.</b></td> +</tr> +<tr> + <td>Latest development release:</td><td>Wine {$config_master_release}</td> +</tr> +</table> <table border="0" cellpadding="5" cellspacing="1" bgcolor="#EFEFEF"> @@ -133,7 +139,7 @@ for post-installation instructions.</b></td></tr> </table> -<h2><a name="binary"></a>3rd Party Tools</h2> +<h2 style="margin-bottom: 10px;"><a name="binary"></a>3rd Party Tools</h2> <p>Sometimes a customization of Wine can cause an application to work, but this change cannot be incorporated into Wine for some reason. To help overcome current deficiencies in Wine, various third party applications for end users have been made over the years. These applications are entirely unsupported by the Wine developers, however you may find them useful. For more information, see <a href="http://wiki.winehq.org/ThirdPartyApplications">our wiki page</a> on third party applications.</p>

1 0