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

Re: [1/3] configure.ac: fix libpthread detection on Haiku
by Alexandre Julliard 22 Jul '11

22 Jul '11

Damjan Jovanovic <damjan.jov(a)gmail.com> writes: > Changelog: > * configure.ac: fix libpthread detection on Haiku > > Haiku has a single library, libroot.so, for all POSIX functions. There > is no separate libc, libm, libpthread, etc. I'd suggest to file bugs with Haiku, they should provide compatibility libraries, that stuff is very much standard. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/3] programs: Add rule for cross-building modules.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Octavian Voicu <octavian.voicu(a)gmail.com> writes: > Allows cross-building modules similar to how tests are cross-built. > > For each module, a MODULE_cross.exe target is added to cross-build the module. > No other targets are affected. > > Cross-building doesn't work if the module uses libwine or the associated > includes. Currently only notepad_cross.exe can be built using this method, > but next patch makes it possible to also build winetest_cross.exe. > > [I always found it annoying that make crosstest only builds executables for > individual tests. This patch series makes it also build an executable for > winetest.] There's a reason for that. Tests are very limited in what they are allowed to use from Wine, but programs aren't. In particular you can't use any of the portability routines or configure check for cross builds. You really need a separate build tree to cross-compile programs. -- Alexandre Julliard julliard(a)winehq.org

2 3

Re: [2/3] winhttp: Implement IWinHttpRequest::get_ResponseBody.
by Jacek Caban 22 Jul '11

22 Jul '11

Hi Hans, On 07/22/11 16:00, Hans Leidekker wrote: > --- > dlls/winhttp/request.c | 13 +++++++++++-- > dlls/winhttp/tests/winhttp.c | 9 ++++++++- > 2 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c > index 0c4c726..a73be22 100644 > --- a/dlls/winhttp/request.c > +++ b/dlls/winhttp/request.c > @@ -2747,8 +2747,17 @@ static HRESULT WINAPI winhttp_request_get_ResponseBody( > IWinHttpRequest *iface, > VARIANT *body ) > { > - FIXME("\n"); > - return E_NOTIMPL; > + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); > + DWORD err; > + > + TRACE("%p, %p\n", request, body); > + > + if ((err = request_read_body( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); > + > + VariantInit( body ); > + V_VT( body ) = VT_ARRAY|VT_UI1; > + V_ARRAY( body ) = request->buffer; The caller is responsible for freeing the result, so it will destroy your internal data. I think you should create an array here and not use it to store the data internally. Also VariantInit call is not needed if you set both type and value of variant. Jacek

2 2

Re: urlmon: Added support for javascript URIs
by Marvin 22 Jul '11

22 Jul '11

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=12690 Your paranoid android. === WVISTAADM (32 bit uri) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: [PATCH 2/2] ntdll: Use swapping method to return . and .. as first entries.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Grazvydas Ignotas <notasas(a)gmail.com> writes: > @@ -1522,76 +1538,76 @@ static int read_directory_getdents( int fd, IO_STATUS_BLOCK *io, void *buffer, U > } > > io->u.Status = STATUS_SUCCESS; > + de = (KERNEL_DIRENT64 *)data; > > + /* read first 2 entries so we can handle "." and ".." */ > + lseek( fd, 0, SEEK_SET ); > res = getdents64( fd, data, size ); You should find a way to do this only when you do encounter '.' and '..', not on every call. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: winecfg: Add missing checking of HeapAlloc return values.
by Alexandre Julliard 22 Jul '11

22 Jul '11

Grazvydas Ignotas <notasas(a)gmail.com> writes: > --- > programs/winecfg/winecfg.c | 18 +++++++++++++----- > programs/winecfg/winecfg.h | 14 ++++++++++---- > 2 files changed, 23 insertions(+), 9 deletions(-) That sort of thing is not useful. It's going to crash a little later, and it's not something that's going to happen in winecfg anyway. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] comctl32: Send CBEM_DELETEITEM when CB_RESETCONTENT is received
by Nikolay Sivov 22 Jul '11

22 Jul '11

On 7/22/2011 06:59, Jay Yang wrote: > diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c > index 3402a71..4888519 100644 > --- a/dlls/comctl32/comboex.c > +++ b/dlls/comctl32/comboex.c > @@ -1557,6 +1557,11 @@ static void COMBOEX_ResetContent (COMBOEX_INFO *infoPtr) > > item = infoPtr->items; > while (item) { > + NMCOMBOBOXEXW nmcit; > + memset (&nmcit.ceItem, 0, sizeof(nmcit.ceItem)); > + nmcit.ceItem.mask=~0; > + COMBOEX_CopyItem (item,&nmcit.ceItem); > + COMBOEX_NotifyItem (infoPtr, CBEN_DELETEITEM,&nmcit); > next = item->next; > COMBOEX_FreeText (item); > Free (item); First of all no need for memset probably, and it's common rule I think (well for me at least) to avoid unneeded initialization. As we have message to delete a single item, it's probably time to think about factoring out item deletion helper (that sends notification too). Actually it seems strange for me that this control uses list to store item data, cause messages are clearly index based. So first thing I'd like to see with that is to change item storage to use DPA array as others controls do. But if you don't have time for that now, I could try to do it myself.

2 2

Re: [PATCH 1/2] comctl32: Add tests for CB_RESETCONTENT
by Nikolay Sivov 22 Jul '11

22 Jul '11

On 7/22/2011 06:59, Jay Yang wrote: > Tests that CBEM_DELETEITEM notifications are received when CB_RESETCONTENT is sent to a comboex control. > --- > dlls/comctl32/tests/comboex.c | 28 ++++++++++++++++++++++++++++ > 1 files changed, 28 insertions(+), 0 deletions(-) Better way to test that is to use message sequence test. Look at listview test to see how WM_NOTIFY/id pairs are logged.

1 0

Wininet set_cookie must handle not only <name>=<value> but also <name> = <value>
by Bruno Jesus 22 Jul '11

22 Jul '11

Hello, while running uTorrent 3 I see the following fixme several times: fixme:wininet:set_cookie Unknown additional option L"expires = Sat,23-Jul-2011 02:20:13 GMT" After searching the source code I realized the expires parameter is already implemented but wine finds the entry names only if there's no space between the parameter name and the equal sign, here is a small piece of wininet.c around line 440 and 470. ... static const WCHAR szExpires[] = {'e','x','p','i','r','e','s','=',0} ... else if (strncmpiW(ptr, szExpires, 8) == 0) ... After searching msdn I found this article with an example that uses spaces: http://msdn.microsoft.com/en-us/library/aa385326%28v=vs.85%29.aspx bReturn = InternetSetCookie(TEXT("http://www.adventure_works.com"), NULL, TEXT("TestData = Test; expires = Sat,01-Jan-2000 00:00:00 GMT")); Looks like the cookie above is valid. I also found this other article telling about the data format: http://msdn.microsoft.com/en-us/library/aa384321%28v=vs.85%29.aspx After reading parts of the cookies RFC I found this note: http://www.ietf.org/rfc/rfc2109.txt ... NOTE: The syntax above allows whitespace between the attribute and the = sign. ... The newer version of the cookie rfc has the very same note: http://www.ietf.org/rfc/rfc2965.txt Please, don't bother to answer if this was already noted and is to be fixed. Also sorry for not pointing a solution. I'll study more on this later but I can say in advance that windows xp sets the cookie correctly when there is the space. I guess I'll start by adding tests for this on the file tests/internet.c Best wishes, Bruno -- universe* god::bigbang (void); //and then it all began...

1 0

Re:
by Lucas Zawacki 21 Jul '11

21 Jul '11

Sorry, this is a duplicate for the [3/4] patch, you can disregard it. 2011/7/21 Lucas Fialho Zawacki <lfzawacki(a)gmail.com>: > --- > dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 59 insertions(+), 1 deletions(-) > > diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c > index b5c028c..2d8a818 100644 > --- a/dlls/dinput/joystick.c > +++ b/dlls/dinput/joystick.c > @@ -500,9 +500,67 @@ HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, > LPCWSTR lpszUserName, > DWORD dwFlags) > { > + JoystickGenericImpl *This = impl_from_IDirectInputDevice8W(iface); > + DIDATAFORMAT data_format; > + DIOBJECTDATAFORMAT *obj_df = NULL; > + int i, action = 0, num_actions = 0; > + unsigned int offset = 0; > + > FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); > > - return DI_NOEFFECT; > + if (This->base.acquired) return DIERR_ACQUIRED; > + > + data_format.dwSize = sizeof(data_format); > + data_format.dwObjSize = sizeof(DIOBJECTDATAFORMAT); > + data_format.dwFlags = DIDF_RELAXIS; > + data_format.dwDataSize = lpdiaf->dwDataSize; > + > + /* count the actions */ > + for (i=0; i < lpdiaf->dwNumActions; i++) > + if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) > + num_actions++; > + > + if (num_actions == 0) return DI_NOEFFECT; > + > + This->base.num_actions = num_actions; > + > + /* Construct the dataformat and actionmap */ > + obj_df = HeapAlloc(GetProcessHeap(), 0, sizeof(DIOBJECTDATAFORMAT)*num_actions); > + data_format.rgodf = (LPDIOBJECTDATAFORMAT)obj_df; > + data_format.dwNumObjs = num_actions; > + > + This->base.action_map = HeapAlloc(GetProcessHeap(), 0, sizeof(ActionMap)*num_actions); > + > + for (i = 0; i < lpdiaf->dwNumActions; i++) > + { > + if (IsEqualGUID(&This->base.guid, &lpdiaf->rgoAction[i].guidInstance)) > + { > + LPDIDATAFORMAT df = This->base.data_format.wine_df; > + DWORD inst = DIDFT_GETINSTANCE(lpdiaf->rgoAction[i].dwObjID); > + DWORD type = DIDFT_GETTYPE(lpdiaf->rgoAction[i].dwObjID); > + LPDIOBJECTDATAFORMAT obj; > + > + if (type == DIDFT_PSHBUTTON) type = DIDFT_BUTTON; > + if (type == DIDFT_RELAXIS) type = DIDFT_AXIS; > + > + obj = dataformat_to_odf_by_type(df, inst, type); > + > + memcpy(&obj_df[action], obj, df->dwObjSize); > + > + This->base.action_map[action].uAppData = lpdiaf->rgoAction[i].uAppData; > + This->base.action_map[action].offset = offset; > + obj_df[action].dwOfs = offset; > + offset += (type & DIDFT_BUTTON) ? 1 : 4; > + > + action++; > + } > + } > + > + IDirectInputDevice8_SetDataFormat(iface, &data_format); > + > + HeapFree(GetProcessHeap(), 0, obj_df); > + > + return IDirectInputDevice8WImpl_SetActionMap(iface, lpdiaf, lpszUserName, dwFlags); > } > > HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, > -- > 1.7.0.4 >

1 0