October 2009 - Wine-commits

Andrew Eikum : mshtml: Fix typo in WARN.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: be4178928b2d49121837719eaddee094c88908a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4178928b2d49121837719ea… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 9 15:38:32 2009 -0500 mshtml: Fix typo in WARN. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d7fe4a9..8ed0108 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -647,7 +647,7 @@ static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) hres = CreateURLMoniker(NULL, wine_url, mon); if(FAILED(hres)) - WARN("CreateURLMonikrer failed: %08x\n", hres); + WARN("CreateURLMoniker failed: %08x\n", hres); return hres; }

1 0

Andrew Eikum : mshtml: Fix typo in TRACE.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 1c27f252250728086db62340d5631f4da67be80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c27f252250728086db62340d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 9 17:37:13 2009 -0500 mshtml: Fix typo in TRACE. --- dlls/mshtml/secmgr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index be56e5d..c71bb4b 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -76,7 +76,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); const WCHAR *url; - TRACE("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + TRACE("(%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW;

1 0

Juan Lang : crypt32: Pass pointer to structure rather than assuming a particular alignment.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 37754e49c8082c436c8736e0ed71c48aa9a21796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37754e49c8082c436c8736e0e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 9 14:06:59 2009 -0700 crypt32: Pass pointer to structure rather than assuming a particular alignment. --- dlls/crypt32/encode.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 258384c..10d63b4 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2800,13 +2800,10 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyQualifiers(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) { - DWORD cPolicyQualifier = *(DWORD *)pvStructInfo; - const CERT_POLICY_QUALIFIER_INFO *rgPolicyQualifier = - *(const CERT_POLICY_QUALIFIER_INFO **) - ((LPBYTE)pvStructInfo + sizeof(DWORD)); + const CERT_POLICY_INFO *info = pvStructInfo; BOOL ret; - if (!cPolicyQualifier) + if (!info->cPolicyQualifier) { *pcbEncoded = 0; ret = TRUE; @@ -2820,10 +2817,11 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyQualifiers(DWORD dwCertEncodingType, DWORD bytesNeeded = 0, lenBytes, size, i; ret = TRUE; - for (i = 0; ret && i < cPolicyQualifier; i++) + for (i = 0; ret && i < info->cPolicyQualifier; i++) { - items[0].pvStructInfo = rgPolicyQualifier[i].pszPolicyQualifierId; - items[1].pvStructInfo = &rgPolicyQualifier[i].Qualifier; + items[0].pvStructInfo = + info->rgPolicyQualifier[i].pszPolicyQualifierId; + items[1].pvStructInfo = &info->rgPolicyQualifier[i].Qualifier; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, sizeof(items) / sizeof(items[0]), dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, NULL, &size); @@ -2847,12 +2845,12 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyQualifiers(DWORD dwCertEncodingType, CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, &lenBytes); pbEncoded += lenBytes; - for (i = 0; ret && i < cPolicyQualifier; i++) + for (i = 0; ret && i < info->cPolicyQualifier; i++) { items[0].pvStructInfo = - rgPolicyQualifier[i].pszPolicyQualifierId; + info->rgPolicyQualifier[i].pszPolicyQualifierId; items[1].pvStructInfo = - &rgPolicyQualifier[i].Qualifier; + &info->rgPolicyQualifier[i].Qualifier; size = bytesNeeded; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, sizeof(items) / sizeof(items[0]), @@ -2877,7 +2875,7 @@ static BOOL CRYPT_AsnEncodeCertPolicy(DWORD dwCertEncodingType, { struct AsnEncodeSequenceItem items[2] = { { info->pszPolicyIdentifier, CRYPT_AsnEncodeOid, 0 }, - { &info->cPolicyQualifier, CRYPT_AsnEncodeCertPolicyQualifiers, 0 }, + { info, CRYPT_AsnEncodeCertPolicyQualifiers, 0 }, }; BOOL ret;

1 0

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32 versions.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: bfe67814f9486d45816d8b06bca94880164d9c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfe67814f9486d45816d8b06b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 9 21:44:58 2009 +0200 comctl32/tests: Fix some test failures on older comctl32 versions. --- dlls/comctl32/tests/datetime.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 7cd08a0..1de433c 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -678,7 +678,9 @@ static void test_wm_set_get_text(void) hWnd = create_datetime_control(0); ret = SendMessage(hWnd, WM_SETTEXT, 0, (LPARAM)a_str); - expect(CB_ERR, ret); + ok(CB_ERR == ret || + broken(1 == ret), /* comctl32 <= 4.72 */ + "Expected CB_ERR, got %ld\n", ret); buff[0] = 0; ret = SendMessage(hWnd, WM_GETTEXT, sizeof(buff), (LPARAM)buff);

1 0

Paul Vriens : ddraw/tests: Don't crash on older ddraw.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 72fab20ffe0d7f713a78c4cbee8d6ef87ca16c93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72fab20ffe0d7f713a78c4cbe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 10 10:06:32 2009 +0200 ddraw/tests: Don't crash on older ddraw. --- dlls/ddraw/tests/ddrawmodes.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 7ea4d53..bd8bec7 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -149,9 +149,14 @@ static void test_DirectDrawEnumerateA(void) ret = pDirectDrawEnumerateA((LPDDENUMCALLBACKA)0xdeadbeef, NULL); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with callback that crashes. */ - ret = pDirectDrawEnumerateA(crash_callbackA, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + if (pDirectDrawEnumerateExA) + { + /* Test with callback that crashes. */ + ret = pDirectDrawEnumerateA(crash_callbackA, NULL); + ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + } + else + win_skip("Test would crash on older ddraw\n"); /* Test with valid callback parameter and NULL context parameter. */ trace("Calling DirectDrawEnumerateA with test_nullcontext_callbackA callback and NULL context.\n"); @@ -185,7 +190,9 @@ static void test_DirectDrawEnumerateW(void) /* Test with NULL callback parameter. */ ret = pDirectDrawEnumerateW(NULL, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); + ok(ret == DDERR_INVALIDPARAMS || + ret == DDERR_UNSUPPORTED, /* Older ddraw */ + "Expected DDERR_INVALIDPARAMS or DDERR_UNSUPPORTED, got %d\n", ret); /* Test with invalid callback parameter. */ ret = pDirectDrawEnumerateW((LPDDENUMCALLBACKW)0xdeadbeef, NULL);

1 0

Michael Stefaniuc : windowscodecs: Remove redundant NULL check before HeapFree (Smatch).
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 13ad5d17250e5e5822ab3a99122f9bef4c8ae08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ad5d17250e5e5822ab3a991… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 10 01:05:10 2009 +0200 windowscodecs: Remove redundant NULL check before HeapFree (Smatch). --- dlls/windowscodecs/pngformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 6aaca6b..3334d76 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -860,7 +860,7 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, /* set up setjmp/longjmp error handling */ if (setjmp(png_jmpbuf(This->png_ptr))) { - if (row_pointers) HeapFree(GetProcessHeap(), 0, row_pointers); + HeapFree(GetProcessHeap(), 0, row_pointers); return E_FAIL; }

1 0

Andrey Turkin : ntdll: Run TLS callbacks in zero-sized TLS directories.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 7aeaa0338c6e1e313463da8dbad7fc2e9b32304c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aeaa0338c6e1e313463da8db… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Oct 10 15:09:02 2009 +0400 ntdll: Run TLS callbacks in zero-sized TLS directories. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 71d7ecd..42c4225 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -845,7 +845,7 @@ static NTSTATUS alloc_process_tls(void) IMAGE_DIRECTORY_ENTRY_TLS, &size ))) continue; size = (dir->EndAddressOfRawData - dir->StartAddressOfRawData) + dir->SizeOfZeroFill; - if (!size) continue; + if (!size && !dir->AddressOfCallBacks) continue; tls_total_size += size; tls_module_count++; }

1 0

Andrey Turkin : advapi32: Ignore invalid MultipleTrusteeOperation values in SetEntriesInAcl.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 7de9f842e55bc00f48650e8ba7e262abf3ba701b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de9f842e55bc00f48650e8ba… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat Oct 10 17:52:09 2009 +0400 advapi32: Ignore invalid MultipleTrusteeOperation values in SetEntriesInAcl. --- dlls/advapi32/security.c | 2 +- dlls/advapi32/tests/security.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index bff68a3..24c48c8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3484,7 +3484,7 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, pEntries[i].Trustee.TrusteeForm, pEntries[i].Trustee.TrusteeType, pEntries[i].Trustee.ptstrName); - if (pEntries[i].Trustee.MultipleTrusteeOperation != NO_MULTIPLE_TRUSTEE) + if (pEntries[i].Trustee.MultipleTrusteeOperation == TRUSTEE_IS_IMPERSONATE) { WARN("bad multiple trustee operation %d for trustee %d\n", pEntries[i].Trustee.MultipleTrusteeOperation, i); ret = ERROR_INVALID_PARAMETER; diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index dfcd45b..1a2e39d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2528,11 +2528,19 @@ static void test_SetEntriesInAcl(void) ExplicitAccess.grfAccessPermissions = KEY_WRITE; ExplicitAccess.grfAccessMode = GRANT_ACCESS; ExplicitAccess.grfInheritance = NO_INHERITANCE; - ExplicitAccess.Trustee.pMultipleTrustee = NULL; - ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; - ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; ExplicitAccess.Trustee.ptstrName = EveryoneSid; + ExplicitAccess.Trustee.MultipleTrusteeOperation = 0xDEADBEEF; + ExplicitAccess.Trustee.pMultipleTrustee = (PVOID)0xDEADBEEF; + res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); + ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); + ok(NewAcl != NULL, "returned acl was NULL\n"); + LocalFree(NewAcl); + + ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; + ExplicitAccess.Trustee.pMultipleTrustee = NULL; + ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; res = pSetEntriesInAclW(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclW failed: %u\n", res); ok(NewAcl != NULL, "returned acl was NULL\n");

1 0

Paul Vriens : shell32/tests: Fix test failure on Cyrillic locales.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 7a0430d0e8bd1e1266e20f655ab03e223b26bb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0430d0e8bd1e1266e20f655… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Oct 11 10:21:26 2009 +0200 shell32/tests: Fix test failure on Cyrillic locales. --- dlls/shell32/tests/shlfileop.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index cbd6025..33d1a94 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -48,8 +48,8 @@ "Expected %d, got %d\n", ret, retval) static CHAR CURR_DIR[MAX_PATH]; -static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00c4,'\0','\0'}; - /* "c:\Ä", or "c:\A" with diaeresis */ +static const WCHAR UNICODE_PATH[] = {'c',':','\\',0x00ae,'\0','\0'}; + /* "c:\®" can be used in all codepages */ /* Double-null termination needed for pFrom field of SHFILEOPSTRUCT */ static HMODULE hshell32;

1 0

Jacek Caban : mshtml: Return NULL documentElement in READYSTATE_UNINITIALIZED state.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 5763637e9b3dae64f99da51f3541a6f44aa4a837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5763637e9b3dae64f99da51f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 11 21:10:07 2009 +0200 mshtml: Return NULL documentElement in READYSTATE_UNINITIALIZED state. --- dlls/mshtml/htmldoc3.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index f4f923f..c5a7a97 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -141,6 +141,11 @@ static HRESULT WINAPI HTMLDocument3_get_documentElement(IHTMLDocument3 *iface, I TRACE("(%p)->(%p)\n", This, p); + if(This->doc_obj->readystate == READYSTATE_UNINITIALIZED) { + *p = NULL; + return S_OK; + } + if(!This->nsdoc) { WARN("NULL nsdoc\n"); return E_UNEXPECTED;

1 0