January 2011 - Wine-Commits

Juan Lang : crypt32: Ensure temporary string is NULL-terminated to avoid uninitialized memory access (valgrind).
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 862eab28201ca4e2c4705b112f9b5c0a0516522c URL: http://source.winehq.org/git/wine.git/?a=commit;h=862eab28201ca4e2c4705b112… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 19 12:21:24 2011 -0800 crypt32: Ensure temporary string is NULL-terminated to avoid uninitialized memory access (valgrind). --- dlls/crypt32/str.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 9d814df..81e9ec3 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -789,7 +789,7 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, LONG i; LPWSTR ptr; - nameValue.Value.pbData = CryptMemAlloc((value->end - value->start) * + nameValue.Value.pbData = CryptMemAlloc((value->end - value->start + 1) * sizeof(WCHAR)); if (!nameValue.Value.pbData) { @@ -803,6 +803,11 @@ static BOOL CRYPT_EncodeValueWithType(DWORD dwCertEncodingType, if (value->start[i] == '"') i++; } + /* The string is NULL terminated because of a quirk in encoding + * unicode names values: if the length is given as 0, the value is + * assumed to be a NULL-terminated string. + */ + *ptr = 0; nameValue.Value.cbData = (LPBYTE)ptr - nameValue.Value.pbData; } ret = CryptEncodeObjectEx(dwCertEncodingType, X509_UNICODE_NAME_VALUE,

1 0

Henri Verbeet : d3d8/tests: Fix test_ApplyStateBlock() (Valgrind).
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 3d64b44c8c4ab172d4db67b6d3ffd8549687e7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d64b44c8c4ab172d4db67b6d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 19 19:20:10 2011 +0100 d3d8/tests: Fix test_ApplyStateBlock() (Valgrind). --- dlls/d3d8/tests/device.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e4aabf4..edcb72b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2084,33 +2084,32 @@ static void test_ApplyStateBlock(void) goto cleanup; } - IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &token); - ok(token !=0, "received null token\n"); - IDirect3DDevice8_BeginStateBlock(device); IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, TRUE); IDirect3DDevice8_EndStateBlock(device, &token); + ok(token, "Received zero stateblock handle.\n"); IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); - ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); - ok(received==FALSE, "Expected = TRUE, received FALSE\n"); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); + ok(!received, "Expected = FALSE, received TRUE.\n"); IDirect3DDevice8_ApplyStateBlock(device, 0); - ok(hr == D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); - ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); - ok(received==FALSE, "Expected = TRUE, received FALSE\n"); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); + ok(!received, "Expected FALSE, received TRUE.\n"); IDirect3DDevice8_ApplyStateBlock(device, token); - ok(hr == D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); hr = IDirect3DDevice8_GetRenderState(device, D3DRS_ZENABLE, &received); - ok(hr==D3D_OK, "Expected= D3D_OK, Got= %#x\n", hr); - ok(received==TRUE, "Expected = TRUE, received FALSE\n"); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x.\n", hr); + ok(received, "Expected TRUE, received FALSE.\n"); - cleanup: - if(device) IDirect3DDevice8_Release(device); - if(d3d8) IDirect3D8_Release(d3d8); + IDirect3DDevice8_DeleteStateBlock(device, token); + IDirect3DDevice8_Release(device); +cleanup: + if (d3d8) IDirect3D8_Release(d3d8); } START_TEST(device)

1 0

Alexandre Julliard : include: Add an assert.h msvcrt header.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 6dcf94b21c878de94a3a8673e86cda103d5e357e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dcf94b21c878de94a3a8673e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 19:49:08 2011 +0100 include: Add an assert.h msvcrt header. --- include/Makefile.in | 1 + include/msvcrt/assert.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 0257b9b..e5c2b53 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -343,6 +343,7 @@ SRCDIR_INCLUDES = \ msiquery.h \ mssip.h \ mstcpip.h \ + msvcrt/assert.h \ msvcrt/conio.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ diff --git a/include/msvcrt/assert.h b/include/msvcrt/assert.h new file mode 100644 index 0000000..c9cb164 --- /dev/null +++ b/include/msvcrt/assert.h @@ -0,0 +1,37 @@ +/* + * Assert support + * + * Copyright 2011 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <crtdefs.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#undef assert +#ifdef NDEBUG +#define assert(_expr) ((void)0) +#else +extern void __cdecl _assert(const char *, const char *, unsigned int); +#define assert(_expr) (void)((!!(_expr)) || (_assert(#_expr, __FILE__, __LINE__), 0)) +#endif + +#ifdef __cplusplus +} +#endif

1 0

Alexandre Julliard : shdocvw: Convert coclass registration to the IRegistrar mechanism.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 8bb4bde1e5cae22cd92296b91a69e98ade2ed831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb4bde1e5cae22cd92296b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 21:30:14 2011 +0100 shdocvw: Convert coclass registration to the IRegistrar mechanism. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/factory.c | 39 +++--------------- dlls/shdocvw/shdocvw.inf | 95 ------------------------------------------- dlls/shdocvw/shdocvw_v1.idl | 41 ++++++++++++++++++ include/exdisp.idl | 53 ++++++++++++++++++++---- 5 files changed, 93 insertions(+), 136 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bb4bde1e5cae22cd9229…

1 0

Alexandre Julliard : shell32: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Jan. 20, 2011

Jan. 20, 2011

Module: wine Branch: master Commit: 2afe205ebd759f598a3de5d3bd224036b2aae0d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afe205ebd759f598a3de5d3b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 20:27:50 2011 +0100 shell32: Convert dll registration to the IRegistrar mechanism. --- dlls/shell32/Makefile.in | 3 +- dlls/shell32/regsvr.c | 881 -------------------------------------- dlls/shell32/shell32.rc | 3 + dlls/shell32/shell32.rgs | 51 +++ dlls/shell32/shell32_classes.idl | 137 ++++++ dlls/shell32/shell32_main.c | 21 + dlls/shell32/shellpath.c | 73 ++++ 7 files changed, 287 insertions(+), 882 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2afe205ebd759f598a3de…

1 0

André Hentschel : German typo fixes
by Jeremy Newman Jan. 19, 2011

Jan. 19, 2011

Module: website Branch: master Commit: a425621344690533a5eaa1384a64e13e39fa74b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=a425621344690533a5eaa1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 19 19:08:39 2011 +0100 German typo fixes --- templates/de/download/deb.template | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/de/download/deb.template b/templates/de/download/deb.template index a437baf..35aaf3a 100644 --- a/templates/de/download/deb.template +++ b/templates/de/download/deb.template @@ -9,13 +9,13 @@ Wine für Ubuntu und Ubuntu Derivate als Pakete die in Repositories untergebracht sind. Ubuntu's Standard Repository enthält Wine, wenn du allerdings mit dem neuesten Wine auf dem Laufenden bleiben willst nutze das von -WineHQ mit folgenden Anleitung. +WineHQ mit folgender Anleitung. <h2>Hinzufügen des WineHQ Repository:</h2> Öffne das Software-Paketquellenmenü durch -Anwendungen->Software-Center, dannBearbeiten->Software-Paketquellen.... +Anwendungen->Software-Center, dann Bearbeiten->Software-Paketquellen... Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinzufügen. <img src="{$root}/images/distro/de_ubuntu-softwaresources1.png" width="686" height="516" alt="System->Systemverwaltung->Software-Paketquellen" border="0"> @@ -28,7 +28,7 @@ Wähle dann den Software von Drittanbietern-Reiter und klicke auf Hinz Die 1.3 Pakete hier sind Betapakete. Das bedeutet, dass sie in regelmäßigen Abständen -<a href="http://wiki.winehq.org/Regression">Regressions</a> erleiden, wodurch +<a href="http://wiki.winehq.org/Regression">Regressionen</a> erleiden, wodurch eine Aktualisierung die Wine-Funktionalität beeinträchtigen kann. Wenn die stabile Version Wine 1.2 bei dir funktioniert, willst du diese Betapakete wahrscheinlich nicht benutzen.

1 0

Juan Lang : crypt32: Ensure that chain validity time is initialized ( valgrind).
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 98834637eb25caf986c9feae3eaa0b855cc19a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98834637eb25caf986c9feae3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 19 09:15:29 2011 -0800 crypt32: Ensure that chain validity time is initialized (valgrind). --- dlls/crypt32/tests/chain.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 71be975..d11dece 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2664,7 +2664,9 @@ static PCCERT_CHAIN_CONTEXT getChain(HCERTCHAINENGINE engine, CERT_CHAIN_PARA chainPara = { sizeof(chainPara), { 0 } }; FILETIME fileTime; - SystemTimeToFileTime(checkTime, &fileTime); + ok(SystemTimeToFileTime(checkTime, &fileTime), + "SystemTimeToFileTime failed for day %d, month %d, year %d\n", + checkTime->wDay, checkTime->wMonth, checkTime->wYear); ret = pCertGetCertificateChain(engine, endCert, &fileTime, includeStore ? store : NULL, &chainPara, flags, NULL, &chain); if (todo & TODO_CHAIN) @@ -4340,6 +4342,8 @@ static void check_authenticode_policy(void) policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredUnknownCAPolicyCheck, &oct2007, &policyPara); + epochStart.wDay = epochStart.wMonth = 1; + epochStart.wYear = 1601; CHECK_CHAIN_POLICY_STATUS(CERT_CHAIN_POLICY_AUTHENTICODE, NULL, ignoredUnknownCAPolicyCheck, &epochStart, &policyPara); policyPara.dwFlags = CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG;

1 0

Greg Geldorp : riched20/tests: Skip some tests on non-English platforms.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: bee48efdceb97d2585ebc026f36173d6bfaf67a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee48efdceb97d2585ebc026f… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 19 12:54:32 2011 +0100 riched20/tests: Skip some tests on non-English platforms. --- dlls/riched20/tests/editor.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 63b23e9..57827db 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4822,6 +4822,7 @@ static void test_EM_FORMATRANGE(void) HDC hdc; HWND hwndRichEdit = new_richedit(NULL); FORMATRANGE fr; + BOOL skip_non_english; static const struct { const char *string; /* The string */ int first; /* First 'pagebreak', 0 for don't care */ @@ -4834,6 +4835,10 @@ static void test_EM_FORMATRANGE(void) {"WINE\r\n\r\nwine\r\nwine", 5, 6} }; + skip_non_english = (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH); + if (skip_non_english) + skip("Skipping some tests on non-English platform\n"); + hdc = GetDC(hwndRichEdit); ok(hdc != NULL, "Could not get HDC\n"); @@ -4895,7 +4900,8 @@ static void test_EM_FORMATRANGE(void) fr.chrg.cpMax = -1; r = SendMessage(hwndRichEdit, EM_FORMATRANGE, TRUE, (LPARAM) &fr); todo_wine { - ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom); + if (! skip_non_english) + ok(fr.rc.bottom == (stringsize.cy * tpp_y), "Expected bottom to be %d, got %d\n", (stringsize.cy * tpp_y), fr.rc.bottom); } if (fmtstrings[i].first) todo_wine { @@ -4911,7 +4917,7 @@ static void test_EM_FORMATRANGE(void) todo_wine { ok(r == fmtstrings[i].second, "Expected %d, got %d\n", fmtstrings[i].second, r); } - else + else if (! skip_non_english) ok (r < len, "Expected < %d, got %d\n", len, r); /* There is at least on more page, but we don't care */

1 0

Huw Davies : wininet: Add tests for querying INTERNET_OPTION_MAX_CONNS_PER_SERVER and INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER and fix typo in the implementation .
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 354f97dff82618c996074ad217088b5ac26b7fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=354f97dff82618c996074ad21… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 19 15:11:11 2011 +0000 wininet: Add tests for querying INTERNET_OPTION_MAX_CONNS_PER_SERVER and INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER and fix typo in the implementation. --- dlls/wininet/internet.c | 2 +- dlls/wininet/tests/internet.c | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 002f4e4..df8901a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2305,7 +2305,7 @@ DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD * if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; - *(ULONG*)size = 4; + *(ULONG*)buffer = 4; *size = sizeof(ULONG); return ERROR_SUCCESS; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d066830..e179dca 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -164,7 +164,7 @@ static void test_InternetCanonicalizeUrlA(void) static void test_InternetQueryOptionA(void) { HINTERNET hinet,hurl; - DWORD len; + DWORD len, val; DWORD err; static const char useragent[] = {"Wininet Test"}; char *buffer; @@ -248,6 +248,19 @@ static void test_InternetQueryOptionA(void) ok(err == ERROR_INSUFFICIENT_BUFFER, "Got wrong error code%d\n",err); InternetCloseHandle(hinet); + + len = sizeof(val); + retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_SERVER, &val, &len); + ok(retval == TRUE,"Got wrong return value %d\n", retval); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 2, "got %d\n", val); + + len = sizeof(val); + retval = InternetQueryOptionA(NULL, INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER, &val, &len); + ok(retval == TRUE,"Got wrong return value %d\n", retval); + ok(len == sizeof(val), "got %d\n", len); + ok(val == 4, "got %d\n", val); + } static void test_get_cookie(void)

1 0

Alexandre Julliard : widl: Don' t generate proxies for oleautomation interfaces.
by Alexandre Julliard Jan. 19, 2011

Jan. 19, 2011

Module: wine Branch: master Commit: 56425e3767689dad544e0f3a7c8e6f39bc13ff7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=56425e3767689dad544e0f3a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 17:43:01 2011 +0100 widl: Don't generate proxies for oleautomation interfaces. --- tools/widl/proxy.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 9952179..c945ac0 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -576,8 +576,6 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) const statement_t *stmt; int first_func = 1; - /* FIXME: check for [oleautomation], shouldn't generate proxies/stubs if specified */ - STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { var_t *func = stmt->u.var; if (first_func) { @@ -701,7 +699,11 @@ static int does_any_iface(const statement_list_t *stmts, type_pred_t pred) int need_proxy(const type_t *iface) { - return is_object(iface) && !is_local(iface->attrs); + if (!is_object( iface )) return 0; + if (is_local( iface->attrs )) return 0; + if (is_attr( iface->attrs, ATTR_OLEAUTOMATION )) return 0; + if (is_attr( iface->attrs, ATTR_DISPINTERFACE )) return 0; + return 1; } int need_stub(const type_t *iface)

1 0