July 2008 - Wine-devel - list.winehq.org

re: gdiplus: Test for CharacterRange.
by Dan Kegel 11 Jul '08

11 Jul '08

Hi Adam, http://source.winehq.org/git/wine.git/?a=commit;h=2f7bb7c5385c86dced1c7e1d1… seems to trigger a valgrind warning in your test code. http://kegel.com/wine/valgrind/logs-2008-07-10-07.15/vg-gdiplus_stringforma… + Conditional jump or move depends on uninitialised value(s) + at winetest_vok (test.h:259) + by winetest_ok (test.h:304) + by test_characterrange (stringformat.c:67) + by func_stringformat (stringformat.c:87) + by run_test (test.h:452) + by main (test.h:501) + Uninitialised value was created by a stack allocation + at test_characterrange (stringformat.c:53) Could you have a look? Thanks, Dan

1 0

Re: msxml3/tests: Added more tests to ISAXXMLReader_putContentHandler and ISAXXMLReader_getContentHandler, added todo test for ISAXXMLReader_parse
by Alistair Leslie-Hughes 10 Jul '08

10 Jul '08

Piotr Caban wrote: > --- > + hr = ISAXXMLReader_getContentHandler(reader, &lpContentHandler); Hi Piotr, You might want to add the test. hr = ISAXXMLReader_getContentHandler(reader, NULL); Best Regards Alistair Leslie-Hughes

2 1

Re: winhttp: tests/winhttp.c[new]: Add test for WinHttpOpenRequest
by Zac Brown 10 Jul '08

10 Jul '08

Zac Brown wrote: > Add test for WinHttpOpenRequest. This test is modeled after > wininet/tests/http.c's InternetOpenRequest_test function. > > This is the first of many tests for getting Bug 14381 > (http://bugs.winehq.org/show_bug.cgi?id=14381) fixed with regard to > WinHTTP. > > > ------------------------------------------------------------------------ > > --- > Makefile.in | 2 + > configure | 3 + > dlls/Makefile.in | 1 + > dlls/winhttp/tests/Makefile.in | 13 +++++ > dlls/winhttp/tests/winhttp.c | 105 ++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 124 insertions(+), 0 deletions(-) > create mode 100644 dlls/winhttp/tests/Makefile.in > create mode 100644 dlls/winhttp/tests/winhttp.c > > diff --git a/Makefile.in b/Makefile.in > index 1b35079..6a56e44 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -495,6 +495,7 @@ ALL_MAKEFILES = \ > dlls/winex11.drv/Makefile \ > dlls/wing32/Makefile \ > dlls/winhttp/Makefile \ > + dlls/winhttp/tests/Makefile \ > dlls/wininet/Makefile \ > dlls/wininet/tests/Makefile \ > dlls/winmm/Makefile \ > @@ -924,6 +925,7 @@ dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules > dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules > dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules > dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules > +dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules > dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules > dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules > dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules > diff --git a/configure b/configure > index d9f9b65..a276261 100755 > --- a/configure > +++ b/configure > @@ -22416,6 +22416,8 @@ ac_config_files="$ac_config_files dlls/wing32/Makefile" > > ac_config_files="$ac_config_files dlls/winhttp/Makefile" > > +ac_config_files="$ac_config_files dlls/winhttp/tests/Makefile" > + > ac_config_files="$ac_config_files dlls/wininet/Makefile" > > ac_config_files="$ac_config_files dlls/wininet/tests/Makefile" > @@ -23481,6 +23483,7 @@ do > "dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;; > "dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;; > "dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;; > + "dlls/winhttp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/tests/Makefile" ;; > "dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;; > "dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; > "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; > diff --git a/dlls/Makefile.in b/dlls/Makefile.in > index d130f35..1a77dc0 100644 > --- a/dlls/Makefile.in > +++ b/dlls/Makefile.in > @@ -362,6 +362,7 @@ TESTSUBDIRS = \ > usp10/tests \ > uxtheme/tests \ > version/tests \ > + winhttp/tests \ > wininet/tests \ > winmm/tests \ > winspool.drv/tests \ > diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in > new file mode 100644 > index 0000000..3f35e08 > --- /dev/null > +++ b/dlls/winhttp/tests/Makefile.in > @@ -0,0 +1,13 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = winhttp.dll > +IMPORTS = winhttp ws2_32 kernel32 > + > +CTESTS = \ > + winhttp.c > + > +(a)MAKE_TEST_RULES@ > + > +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c > new file mode 100644 > index 0000000..afc9d97 > --- /dev/null > +++ b/dlls/winhttp/tests/winhttp.c > @@ -0,0 +1,105 @@ > +/* > + * WinHTTP - tests > + * > + * Copyright 2008 Google (Zac Brown) > + * > + * 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 > + */ > + > +#define COBJMACROS > + > +#include <stdarg.h> > +#include <stdio.h> > +#include <stdlib.h> > + > +#include <windef.h> > +#include <winbase.h> > +#include <winhttp.h> > + > +#include "wine/test.h" > + > +/* Function pointer declarations for functions being used */ > +static HINTERNET (WINAPI *pWinHttpOpen) (LPCWSTR pwszUserAgent, DWORD dwAccessType, > + LPCWSTR pwszProxyName, LPCWSTR pwszProxyBypass, DWORD dwFlags); > +static HINTERNET (WINAPI *pWinHttpConnect) (HINTERNET hSession, LPCWSTR pwszServerName, > + INTERNET_PORT nServerPort, DWORD dwReserved); > +static HINTERNET (WINAPI *pWinHttpOpenRequest) (HINTERNET hConnect, LPCWSTR pwszVerb, > + LPCWSTR pwszObjectName, LPCWSTR pwszVersion, LPCWSTR pwszReferrer, > + LPCWSTR* ppwszAcceptTypes, DWORD dwFlags); > +static BOOL (WINAPI *pWinHttpSendRequest) (HINTERNET hRequest, LPCWSTR pwszHeaders, > + DWORD dwHeadersLength, LPVOID lpOptional, DWORD dwOptionalLength, > + DWORD dwTotalLength, DWORD_PTR dwContext); > +static BOOL (WINAPI *pWinHttpCloseHandle) (HINTERNET hInternet); > + > +static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; > +static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; > + > +/* BEGIN TESTS */ > + > +static void test_OpenRequest (void) > +{ > + BOOL ret; > + HINTERNET session, request, connection; > + session = request = connection = NULL; > + > + session = pWinHttpOpen (test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); > + todo_wine ok (session != NULL, "WinHttpOpen failed to open session.\n"); > + > + /* Test with a bad server name */ > + SetLastError (0xdeadbeef); > + connection = pWinHttpConnect (session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); > + ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); > + todo_wine ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); > + > + /* Test with a valid server name */ > + connection = pWinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); > + todo_wine ok (connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); > + > + request = pWinHttpOpenRequest (connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); > + if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) > + { > + skip("Network unreachable, skipping.\n"); > + goto done; > + } > + todo_wine ok (request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); > + > + ret = pWinHttpSendRequest (request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); > + todo_wine > + { > + ok (ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); > + ok (WinHttpCloseHandle (request), "WinHttpCloseHandle failed on closing request.\n"); > + } > + > + done: > + todo_wine > + { > + ok (WinHttpCloseHandle (connection), "WinHttpCloseHandle failed on closing connection.\n"); > + ok (WinHttpCloseHandle (session), "WinHttpCloseHandle failed on closing session.\n"); > + } > +} > + > +START_TEST (winhttp) > +{ > + HMODULE hmod = LoadLibraryA ("winhttp.dll"); > + > + pWinHttpOpen = (void *) GetProcAddress (hmod, "WinHttpOpen"); > + pWinHttpConnect = (void *) GetProcAddress (hmod, "WinHttpConnect"); > + pWinHttpOpenRequest = (void *) GetProcAddress (hmod, "WinHttpOpenRequest"); > + pWinHttpSendRequest = (void *) GetProcAddress (hmod, "WinHttpSendRequest"); > + pWinHttpCloseHandle = (void *) GetProcAddress (hmod, "WinHttpCloseHandle"); > + > + test_OpenRequest(); > +} > > > ------------------------------------------------------------------------ > > Ignore this patch, comments from James warrant a revision.

1 0

Re: winhttp: main.c: Add stub implementation for WinHttpGetDefaultProxyConfiguration
by James Hawkins 10 Jul '08

10 Jul '08

On Thu, Jul 10, 2008 at 4:58 PM, Zac Brown <zac(a)zacbrown.org> wrote: > Add stub implementation for WinHttpGetDefaultProxyConfiguration > +BOOL WINAPI WinHttpGetDefaultProxyConfiguration (WINHTTP_PROXY_INFO* pProxyInfo) +{ + FIXME("(%p): stub\n", pProxyInfo); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} You need to be consistent with the style of the rest of the file (no space after function names before opening parenthesis). -- James Hawkins

1 0

Re: msxml3: oldChild in xmlnode_removeChild may be NULL
by Alistair Leslie-Hughes 10 Jul '08

10 Jul '08

Piotr Caban wrote: > --- > IXMLDOMNode_Release(child); > IXMLDOMNode_AddRef(childNode); >- *oldChild = childNode; >+ >+ if(oldChild) >+ *oldChild = childNode; >return S_OK; > Hi Piotr, Your leaking childNode, it should be destroyed in this case. Best Regards Alistair Leslie-Hughes

1 0

Re: Fallback from RPC_C_AUTHN_GSS_NEGOTIATE to RPC_C_AUTHN_WINNT if no SPNEGO package available
by Rob Shearman 10 Jul '08

10 Jul '08

2008/7/1 Stefan Kuhr <winesku(a)googlemail.com>: > Hello everyone, Hi Stefan, Thank you for your contribution. > please find attached a patch for Bug #14222 (which I just submitted to > bugzilla). I think that this patch is not a hack, because even if > someday a Negotiate package is available in WINE, this code won't > break the Negotiate package. That may be so, but it won't work for servers that only register the RPC_C_AUTHN_GSS_NEGOTIATE authentication scheme. So the patch should include a FIXME to warn users about this. Otherwise, the patch is fine. > Oh, and there was no rpcrt4 component to > be selected for this bug in bugzilla, you might consider to add one. Currently, we are using the "ole" component for RPC bugs, including rpcrt4 and widl, but I agree that this isn't clear. I think we should probably split the ole component up into rpc (which would be a container for rpcrt4 & widl issues), ole32 and oleaut32. > Please let me know if I did something obvious wrong since this is the > first time I submit a patch to WINE. -- Rob Shearman

2 4

Re: [PATCH 2/2] user32: Set WM_NOSIZE for windows smaller than SM_CXMINTRACK/SM_CYMINTRACK.
by Alexandre Julliard 10 Jul '08

10 Jul '08

"Lei Zhang" <thestig(a)google.com> writes: > I added more tests for this and also looked at the trace log from the > tests. My last patch was definitely wrong because it prevents the > window/client size from changing, whereas they do change on Windows. I > check for this in the tests now. > > I looked at the content of the WM_WINDOWPOSCHANGED messages, and I > noticed SWP_NOCLIENTSIZE was set for the cases where the window is too > small. So SWP_DoNCCalcSize seems like the right place to check for > this, and not clear SWP_NOCLIENTSIZE. You are still on the wrong track, you shouldn't mess with the SWP_* flags at all. What you have to do is figure out where the size limits should be enforced on the window; once you fix this, SetWindowPos will automatically get the right flags because the size will be clamped to the limit. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: regedit: Implement deleting multiple values (resend)
by John Klehm 10 Jul '08

10 Jul '08

On Thu, Jul 10, 2008 at 8:20 AM, Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> wrote: > Changelog: > Regedit: Implement deleting multiple values > > Changes from first send as suggested @ wine-devel: > - Use standard MessageBox instead of making the messagebox function from > edit.c non-static > - Real name in patch, no HTML Mail > Hello Andre, I would wait till tomorrow to see if AJ's scripts pick up your patch but usually a good indicator of how it came through the system can be seen by checking pipermail. http://www.winehq.org/pipermail/wine-patches/2008-July/057590.html is your latest resend. Clicking on the url at the bottom for the attachment yields a blank screen for me. This could be a sign that somehow the scripts on the backend of the mail server lost your patch due to encoding or how you attached it. Unfortunately I don't know which or exactly what the fix is so you might have to experiment. So you might have to ask on the list again and point out that piper mail didn't pick it up. The strange thing is your patch shows up in gmail inlined in the message just fine for me, which is why I suggest to wait and see if AJ's scripts can also pick it up. Best of luck, John

1 0

New winetricks 20080704: added firefox3, kde verbs (and a whole lot of other stuff)
by Dan Kegel 10 Jul '08

10 Jul '08

Another week, another winetricks. Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com Changes since May 23's wine-devel annoucement: ------------------------------------------------------------------------ r95 | daniel.r.kegel | 2008-07-04 07:46:03 -0700 (Fri, 04 Jul 2008) | 2 lines Added firefox3, kde ------------------------------------------------------------------------ r94 | daniel.r.kegel | 2008-06-27 11:29:19 -0700 (Fri, 27 Jun 2008) | 2 lines Simpler recipe for msls31, thanks to Steven Edwards. ------------------------------------------------------------------------ r93 | daniel.r.kegel | 2008-06-27 11:28:05 -0700 (Fri, 27 Jun 2008) | 2 lines Don't use obsolete command wineprefixcreate. ------------------------------------------------------------------------ r92 | daniel.r.kegel | 2008-06-27 04:41:49 -0700 (Fri, 27 Jun 2008) | 4 lines Grr. Looks like I never fixed the problem reported in http://www.winehq.org/pipermail/wine-users/2008-May/033957.html Fixed now; sets win2k while installing vcrun2005. ------------------------------------------------------------------------ r90 | daniel.r.kegel | 2008-06-22 03:56:48 -0700 (Sun, 22 Jun 2008) | 2 lines Update version. ------------------------------------------------------------------------ r89 | daniel.r.kegel | 2008-06-22 03:54:49 -0700 (Sun, 22 Jun 2008) | 7 lines Added visual j# 2.0 runtime, thanks to http://howto.landure.fr/gnu-linux/install-directx-9-0c-on-linux-using-wine for pointing out it is needed by Supreme Commander Fixed DirectX9 install, thanks to Ahmed for the patch ------------------------------------------------------------------------ r88 | daniel.r.kegel | 2008-06-22 03:15:27 -0700 (Sun, 22 Jun 2008) | 2 lines Hmm, the divx codec download location changed a bit? ------------------------------------------------------------------------ r75 | daniel.r.kegel | 2008-06-14 10:52:00 -0700 (Sat, 14 Jun 2008) | 2 lines Don't forget to register the ocx's ------------------------------------------------------------------------ r74 | daniel.r.kegel | 2008-06-14 10:39:34 -0700 (Sat, 14 Jun 2008) | 2 lines Updated version number ------------------------------------------------------------------------ r73 | daniel.r.kegel | 2008-06-14 10:39:07 -0700 (Sat, 14 Jun 2008) | 5 lines Use "MS" uniformly in front of choices that are Microsoft downloads. Add comctl32.ocx ------------------------------------------------------------------------ r72 | daniel.r.kegel | 2008-06-14 10:17:37 -0700 (Sat, 14 Jun 2008) | 2 lines Added autohotkey ------------------------------------------------------------------------ r71 | daniel.r.kegel | 2008-06-14 10:15:55 -0700 (Sat, 14 Jun 2008) | 2 lines Cosmetic changes to menu: make 1st column wider, make gui window wide enough ------------------------------------------------------------------------ r69 | austinenglish | 2008-06-09 08:59:44 -0700 (Mon, 09 Jun 2008) | 2 lines Restore winversion on dotnet20 ------------------------------------------------------------------------ r61 | daniel.r.kegel | 2008-05-29 11:51:46 -0700 (Thu, 29 May 2008) | 2 lines Add dirac 0.8 directshow filter, even though it's obsolete ------------------------------------------------------------------------ r60 | daniel.r.kegel | 2008-05-28 05:15:44 -0700 (Wed, 28 May 2008) | 3 lines Added divx verb to winetricks. Switched codecdemo to interactive, added sample files from jhepple.com ------------------------------------------------------------------------ r58 | daniel.r.kegel | 2008-05-27 18:06:46 -0700 (Tue, 27 May 2008) | 2 lines Add mpc (as a showcase for installed codecs) ------------------------------------------------------------------------ r57 | daniel.r.kegel | 2008-05-27 17:05:25 -0700 (Tue, 27 May 2008) | 2 lines Added vlc ------------------------------------------------------------------------ r56 | daniel.r.kegel | 2008-05-27 16:03:20 -0700 (Tue, 27 May 2008) | 2 lines Add gdiplus for quicktime ------------------------------------------------------------------------ r55 | daniel.r.kegel | 2008-05-27 15:49:17 -0700 (Tue, 27 May 2008) | 2 lines Echo what's going on in wmp10 (since we can't use try) ------------------------------------------------------------------------ r54 | daniel.r.kegel | 2008-05-27 13:55:30 -0700 (Tue, 27 May 2008) | 2 lines Added quicktime72 ------------------------------------------------------------------------ r53 | daniel.r.kegel | 2008-05-23 14:30:12 -0700 (Fri, 23 May 2008) | 3 lines Fix bug which broke multiple selections in gui. Thanks to Chad Sikorra for the bug report.

7 9

Feedback for "Regedit: Implement deleting multiple values"
by Andre Wisplinghoff 10 Jul '08

10 Jul '08

Hallo, thanks for your help. I just resend my patch, with these issues considered. The standard MessageBox function is now used. The localized message is read in framewnd.c and errors treated the same way as it was with the messagebox function in edit.c. Best Regards - Andre Wisplinghoff

1 0