January 2011 - Wine-commits

Eric Pouech : kernel32: Fix prototype when no curses dev package is present .
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: f3fe497b4f300191d548b5121d85b436293e7e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3fe497b4f300191d548b5121… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Jan 19 22:34:35 2011 +0100 kernel32: Fix prototype when no curses dev package is present. --- dlls/kernel32/term.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index 8111f0b..a7e18ec 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -365,5 +365,5 @@ int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) #else BOOL TERM_Init(void) {return FALSE;} BOOL TERM_Exit(void) {return FALSE;} -int TERM_FillInputRecord(const char* in, INPUT_RECORD* ir) {return -1;} +int TERM_FillInputRecord(const char* in, size_t len, INPUT_RECORD* ir) {return -1;} #endif

1 0

Nikolay Sivov : oleaut32: Fix a stream leak on failure.
by Alexandre Julliard 20 Jan '11

20 Jan '11

Module: wine Branch: master Commit: 92dbc57a7705b8e4b7d2e6d4e5176e59dd456d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92dbc57a7705b8e4b7d2e6d4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 20 00:38:16 2011 +0300 oleaut32: Fix a stream leak on failure. --- dlls/oleaut32/tmarshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9d3d73e..6536bb4 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -153,6 +153,7 @@ _unmarshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN *pUnk) { hres = IStream_Write(pStm,buf->base+buf->curoff,xsize,&res); if (hres) { ERR("stream write %x\n",hres); + IStream_Release(pStm); return hres; } @@ -160,12 +161,14 @@ _unmarshal_interface(marshal_state *buf, REFIID riid, LPUNKNOWN *pUnk) { hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); if (hres) { ERR("Failed Seek %x\n",hres); + IStream_Release(pStm); return hres; } hres = CoUnmarshalInterface(pStm,riid,(LPVOID*)pUnk); if (hres) { ERR("Unmarshalling interface %s failed with %x\n",debugstr_guid(riid),hres); + IStream_Release(pStm); return hres; }

1 0

Alexandre Julliard : include: Add an assert.h msvcrt header.
by Alexandre Julliard 20 Jan '11

20 Jan '11

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 : shell32: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 20 Jan '11

20 Jan '11

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

Alexandre Julliard : shdocvw: Convert coclass registration to the IRegistrar mechanism.
by Alexandre Julliard 20 Jan '11

20 Jan '11

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

André Hentschel : German typo fixes
by Jeremy Newman 19 Jan '11

19 Jan '11

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 19 Jan '11

19 Jan '11

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 : urlmon/tests: Fix tests when connecting via proxy.
by Alexandre Julliard 19 Jan '11

19 Jan '11

Module: wine Branch: master Commit: 3f153007ba7c19fdb8b30c19143ad26e146c5eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f153007ba7c19fdb8b30c191… Author: Greg Geldorp <ggeldorp(a)vmware.com> Date: Wed Jan 19 12:44:07 2011 +0100 urlmon/tests: Fix tests when connecting via proxy. --- dlls/urlmon/tests/protocol.c | 24 +++++++++++++++++++++++- dlls/urlmon/tests/url.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index dd8cbf9..dcfe20c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -221,6 +221,25 @@ static int strcmp_ww(LPCWSTR strw1, LPCWSTR strw2) return lstrcmpA(stra1, stra2); } +static BOOL proxy_active(void) +{ + HKEY internet_settings; + DWORD proxy_enable; + DWORD size; + + if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", + 0, KEY_QUERY_VALUE, &internet_settings) != ERROR_SUCCESS) + return FALSE; + + size = sizeof(DWORD); + if (RegQueryValueExA(internet_settings, "ProxyEnable", NULL, NULL, (LPBYTE) &proxy_enable, &size) != ERROR_SUCCESS) + proxy_enable = 0; + + RegCloseKey(internet_settings); + + return proxy_enable != 0; +} + static HRESULT WINAPI HttpSecurity_QueryInterface(IHttpSecurity *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) @@ -581,7 +600,10 @@ static void call_continue(PROTOCOLDATA *protocol_data) CLEAR_CALLED(ReportProgress_CONNECTING); CLEAR_CALLED(ReportProgress_PROXYDETECTING); }else if(test_redirect) { - CHECK_CALLED(ReportProgress_FINDINGRESOURCE); + if (! proxy_active()) + CHECK_CALLED(ReportProgress_FINDINGRESOURCE); + else + CLEAR_CALLED(ReportProgress_FINDINGRESOURCE); }else todo_wine { CHECK_NOT_CALLED(ReportProgress_FINDINGRESOURCE); /* IE7 does call this */ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 47b2e79..21d5fd6 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -246,6 +246,25 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static BOOL proxy_active(void) +{ + HKEY internet_settings; + DWORD proxy_enable; + DWORD size; + + if (RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", + 0, KEY_QUERY_VALUE, &internet_settings) != ERROR_SUCCESS) + return FALSE; + + size = sizeof(DWORD); + if (RegQueryValueExA(internet_settings, "ProxyEnable", NULL, NULL, (LPBYTE) &proxy_enable, &size) != ERROR_SUCCESS) + proxy_enable = 0; + + RegCloseKey(internet_settings); + + return proxy_enable != 0; +} + static BOOL is_urlmon_protocol(int prot) { return prot == FILE_TEST || prot == HTTP_TEST || prot == HTTPS_TEST || prot == FTP_TEST || prot == MK_TEST; @@ -2799,8 +2818,16 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) CHECK_CALLED(GetRootSecurityId); } if(http_is_first || (test_protocol == HTTPS_TEST && !(flags & BINDTEST_INVALID_CN))) { - CHECK_CALLED(OnProgress_FINDINGRESOURCE); - CHECK_CALLED(OnProgress_CONNECTING); + if (! proxy_active()) + { + CHECK_CALLED(OnProgress_FINDINGRESOURCE); + CHECK_CALLED(OnProgress_CONNECTING); + } + else + { + CLEAR_CALLED(OnProgress_FINDINGRESOURCE); + CLEAR_CALLED(OnProgress_CONNECTING); + } }else todo_wine { CHECK_NOT_CALLED(OnProgress_FINDINGRESOURCE); /* IE7 does call this */

1 0

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

19 Jan '11

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 19 Jan '11

19 Jan '11

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