May 2014 - Wine-Devel - list.winehq.org

Re: [1/2] dpnet: Add IDirectPlay8Client tests
by Stefan Dösinger May 7, 2014

May 7, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-05-05 08:46, schrieb Alistair Leslie-Hughes: > +static IDirectPlay8Client* client = NULL; > ... > + hr = CoCreateInstance(&CLSID_DirectPlay8Client, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Client, (void **)&client); > + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); > ... > + hr = IDirectPlay8Client_Close(client, 0); > + ok(hr == S_OK, "IDirectPlay8Client_Close failed with %x\n", hr); Please avoid such dependencies between different tests. If creating and releasing the client is something that every test has to do you can add helper functions for this task. > + for (i=0;i<items;i++) > + { > + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); > + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); > + > + serv_prov_info++; > + } > + > + serv_prov_info -= items; /* set pointer back */ > + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); You could use serv_prov_info as an array instead of doing the pointer arithmentic twice. E.g. trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); > + hr = IDirectPlay8Client_EnumHosts(client, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); > + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Client_EnumServiceProviders failed with 0x%08x\n", hr); > + todo_wine ok(async, "No Handle returned\n"); > + > + hr = IDirectPlay8Client_CancelAsyncOperation(client, async, 0); > + ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); Are you sure that this always returns DPNSUCCESS_PENDING? Couldn't it also return a result instantly? Overall I don't see the point in this test at the moment. As it is now it doesn't say much. This is just an opinion though, I'll leave the decision up to you. > + todo_wine ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); Out of curiosity, do you have any idea where this value comes from? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTaTX9AAoJEN0/YqbEcdMwB6AP/jd1T0OLGPXO3pgF9boIHp6i yQTDCgf7Wq8zKJuxDZtOzfGzVbYqVeN8TDx9c3oD3RSru9bBIJ9Bjeu3hKqvL2Qo 4JRJZyQn665RymbKo/S9ivXBHmd9cuh4tfdTxHU7n0nVXICCNDniBxfAwr2HkkeB iyvMe8Ga3SPVCL+33XZAniPPFnfnEYkaqU42CTUUK2hlYyzb4bScihgdrUqoX36k RtvK2UKxOBT5E9nd0VIS/b8fF4uXFIzD7M6oEuzLObXL6XGsRNl2mtMpZ0ztlFpy PIF1AbFyK4tQA3obsTSWUVJVlQFLCurvqg2klLogewdyVy4wE4h0/oOCRCPhuVbR baJf0by5ZC4Os4YIZIzN0OOy0N3A+bMQI1VdvQTuMPwF+dYk268p0t77SN6F2gfa ts9MyQxYrhrao3+oI4Hw2ouYUxIYj+WxNSVCb01TjUrMVOMAeD1Ksttbk1g5ADdZ +DbV9CWuOhISjXh5OT8ToH0FxrImrby3FDyX/UFf2KPzwzKoX2kNyjtSHguPIOko 3jOnuVh8HsD7jX0sQqMMkdwsESdfTCwIHXLhbE4C08yxsu8ByNhFHme3oX4EcyPf oHRUA+w8Yr8rr+wSU1fpPEb79ZnMn5xfR7xZQKzX5af0ICta6k3UjtSeAuE6P1xX HFJrTsoKGibhnm6z2wZH =sF7u -----END PGP SIGNATURE-----

2 1

Re: [PATCH 2/2] gdi32: Report unsubstituted font face names.
by Marvin May 7, 2014

May 7, 2014

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 https://testbot.winehq.org/JobDetails.pl?Key=6860 Your paranoid android. === wvistau64 (32 bit font) === The test timed out

1 0

Testbot returning 500 - Internal server error message
by Bruno Jesus May 7, 2014

May 7, 2014

Hi all. While trying to upload a test in the command line parameter input the server returned a 500 error. Then I went back to the index and it's working but clicking on any test key will result in the error message as well. This may be an intermittent failure and I'm reporting it just to check because I don't recall any scheduled maintenance emails. Example: https://newtestbot.winehq.org/JobDetails.pl?Key=6858 Best regards, Bruno

2 1

Re: setupapi: SetupDiGetClassDevsExW should ignore DIGCF_ALLCLASSES if class set
by Nikolay Sivov May 6, 2014

May 6, 2014

Is it possible to add a test for that?

2 1

Wine talk at Linuxwochen Österreich
by Stefan Dösinger May 6, 2014

May 6, 2014

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I will give a talk about Wine gaming at Linuxwochen Österreich later this week: When: Friday, May 9th, 15:00 Where: FH Technikum Wien, HS 2.01, Vienna See http://www.linuxwochen.at/ and https://cfp.linuxwochen.at/en/LWW14/public/events/154 for more details Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTaQLIAAoJEN0/YqbEcdMwscQP/2OuAs1Z2MSrYNlXH4CJngDQ 0rqb4aCf32Yy5iVJ6XRbIkfPxrA+CpeX1fwCPpx1rGjJM9djQ1RnbQDb1dafCbYg 4qHJeMooZ9zbqB/6rUV9q2xk8E3Bnhi5RptBnwtEljUWCOTbCbTtevr5BjLbM/Dk Si4S2gFSkGCHyNFupxaIFGOseew3zLNSkFvqV4Pr/eX+j0GIT78t6CyqtFB/Vpvs nMBptteZSlwmvJ5Z9bX7ruUus9+Az2Q17UV4c0tN+x5xsLD6QpoJWocFyO/7SYy9 HTa6QWwDF+AWOiCkP3TdPz1U/bNcEzSEGpDcFaQNLABGFhVm3rpgsqoBwJln2BDH Ig0+pG7jQSaYm1qK6Y5Sx58rVTDXizWmr2QfGkqh3ZmaOBBXTqudtPbZ5lrCmk50 xtbwqymo/vLXaU5FbgY83VvDip3oCBwny+E8R+O/rL20h5bkLNnn5doU3Kt2GTKU c3eohbg/qAlBzxG0UrtSQdiNYeItABaFYvhAkg11g8y0yjiZYdiGHMz4cgUMaVoe qDR0DLLEFGqTqYvhs5+fiK09EjABSpTVSnuGwsX0zRphgLZqsBWvg/O7G3pCwZ4Y MamqhvKBXhS6sQVjyDujuqNvSon3IEcomPz/BazbzZjuqfMU8IdP2lk7CizfvBvM dX/IsNZR6MKxhDVHtfEB =F/a5 -----END PGP SIGNATURE-----

1 0

Re: setupapi: SetupDiGetClassDevsExW should ignore DIGCF_ALLCLASSES if class set
by Henri Verbeet May 6, 2014

May 6, 2014

On 6 May 2014 16:05, Mark Harmstone <hellas(a)burntcomma.com> wrote: > + if (flags & DIGCF_ALLCLASSES && class) > + flags -= DIGCF_ALLCLASSES; This works, of course, but the usual way to do that kind of thing would be "if (class) flags &= ~DIGCF_ALLCLASSES;"

1 0

Re: [PATCH] gdi32: Report unsubstituted font face names.
by Alexandre Julliard May 6, 2014

May 6, 2014

Alex Henrie <alexhenrie24(a)gmail.com> writes: > @@ -5805,12 +5810,13 @@ static BOOL freetype_EnumFonts( PHYSDEV dev, LPLOGFONTW plf, FONTENUMPROCW proc, > GDI_CheckNotLock(); > EnterCriticalSection( &freetype_cs ); > if(plf->lfFaceName[0]) { > - FontSubst *psub; > - psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); > + FontSubst *psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); > + WCHAR *unsubstitutedFaceName = NULL; > > if(psub) { > TRACE("substituting %s -> %s\n", debugstr_w(plf->lfFaceName), > debugstr_w(psub->to.name)); > + unsubstitutedFaceName = plf->lfFaceName; > lf = *plf; > strcpyW(lf.lfFaceName, psub->to.name); > plf = &lf; This could be seriously simplified then. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 3/5] server: Add socket-side support for the interface change notification object (resend).
by Alexandre Julliard May 6, 2014

May 6, 2014

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > This patch adds an async queue, list object, and interface change > object to the socket object in order to support interface change > notification objects (fully implemented in part 4). A significant > deviation from previous versions of this patch is that errors are > passed up from each routine so that it is easier to ensure that all > possible errors are properly reported. I believe that this is the > server style comment AJ had on IRC, but some clarification would be > appreciated. No, that's not how error handling works in the server. The functions that fail set last error and then you propagate that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] server: Add delayed processing for socket-specific ioctl() (resend).
by Alexandre Julliard May 6, 2014

May 6, 2014

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > @@ -523,17 +523,32 @@ obj_handle_t sock_ioctl( struct fd *fd, ioctl_code_t code, const async_data_t *a > int blocking, const void *data, data_size_t size ) > { > struct sock *sock = get_fd_user( fd ); > + obj_handle_t wait_handle = 0; > + async_data_t new_data; > + int error; > > assert( sock->obj.ops == &sock_ops ); > > + if (blocking) > + { > + if (!(wait_handle = alloc_wait_event( current->process ))) return 0; > + new_data = *async_data; > + new_data.event = wait_handle; > + async_data = &new_data; > + } > switch(code) > { > case WS_SIO_ADDRESS_LIST_CHANGE: > /* intentional fallthrough, not yet supported */ > default: > - set_error( STATUS_NOT_SUPPORTED ); > - return 0; > + error = STATUS_NOT_SUPPORTED; > + break; > } > + set_error( error ); > + if (error == STATUS_PENDING) > + return wait_handle; > + close_handle( current->process, wait_handle ); > + return 0; You should be doing that only as needed. It doesn't make sense to allocate a handle for unknown ioctls. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/3] winex11.drv: copy and paste files to/from X11 apps (try 2)
by Alexandre Julliard May 6, 2014

May 6, 2014

Damjan Jovanovic <damjan.jov(a)gmail.com> writes: > /************************************************************************** > + * X11DRV_CLIPBOARD_ExportHDROP > + * > + * Export CF_HDROP format to text/uri-list. > + */ > +static HANDLE X11DRV_CLIPBOARD_ExportHDROP(Display *display, Window requestor, Atom aTarget, > + Atom rprop, LPWINE_CLIPDATA lpdata, LPDWORD lpBytes) > +{ > + HDROP hDrop; > + UINT i; > + UINT numFiles; > + UINT totalSize = 0; > + HGLOBAL hClipData = NULL; > + char *text_uri_list = NULL; > + char *next; > + BOOLEAN succeeded = FALSE; > + > + *lpBytes = 0; > + > + if (!X11DRV_CLIPBOARD_RenderFormat(display, lpdata)) > + { > + ERR("Failed to export %04x format\n", lpdata->wFormatID); > + return 0; > + } > + > + hDrop = (HDROP) lpdata->hData; > + numFiles = DragQueryFileW(hDrop, 0xFFFFFFFF, NULL, 0); > + > + for (i = 0; i < numFiles; i++) > + { > + UINT dosFilenameSize; > + WCHAR *dosFilename; > + succeeded = FALSE; > + dosFilenameSize = 1 + DragQueryFileW(hDrop, i, NULL, 0); > + dosFilename = HeapAlloc(GetProcessHeap(), 0, dosFilenameSize*sizeof(WCHAR)); > + if (dosFilename) > + { > + char *unixFilename; > + DragQueryFileW(hDrop, i, dosFilename, dosFilenameSize); > + unixFilename = wine_get_unix_file_name(dosFilename); > + if (unixFilename) > + { > + totalSize += 8 + /* file:/// */ > + 3*(lstrlenA(unixFilename) - 1); /* "%xy" per char except first '/' */ > + succeeded = TRUE; > + HeapFree(GetProcessHeap(), 0, unixFilename); > + } > + HeapFree(GetProcessHeap(), 0, dosFilename); > + } > + if (!succeeded) > + { > + ERR("out of memory\n"); > + goto end; > + } > + } > + totalSize += 2 * numFiles; /* "\r\n" */ > + hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, totalSize); > + if (hClipData == NULL) > + { > + ERR("out of memory\n"); > + succeeded = FALSE; > + goto end; > + } > + text_uri_list = (char*) GlobalLock(hClipData); > + next = text_uri_list; > + for (i = 0; i < numFiles; i++) > + { > + UINT dosFilenameSize; > + WCHAR *dosFilename; > + succeeded = FALSE; > + dosFilenameSize = 1 + DragQueryFileW(hDrop, i, NULL, 0); > + dosFilename = HeapAlloc(GetProcessHeap(), 0, dosFilenameSize*sizeof(WCHAR)); > + if (dosFilename) > + { > + char *unixFilename; > + DragQueryFileW(hDrop, i, dosFilename, dosFilenameSize); > + unixFilename = wine_get_unix_file_name(dosFilename); > + if (unixFilename) > + { > + static const char *hex_table = "0123456789abcdef"; > + UINT u; > + *next++ = 'f'; > + *next++ = 'i'; > + *next++ = 'l'; > + *next++ = 'e'; > + *next++ = ':'; > + *next++ = '/'; > + *next++ = '/'; > + *next++ = '/'; > + /* URL encode everything - unnecessary, but easier/lighter than linking in shlwapi, and can't hurt */ > + for (u = 1; unixFilename[u]; u++) { > + *next++ = '%'; > + *next++ = hex_table[unixFilename[u] >> 4]; > + *next++ = hex_table[unixFilename[u] & 0xf]; > + } > + *next++ = '\r'; > + *next++ = '\n'; > + succeeded = TRUE; > + HeapFree(GetProcessHeap(), 0, unixFilename); > + } > + HeapFree(GetProcessHeap(), 0, dosFilename); > + } > + if (!succeeded) > + { > + ERR("out of memory\n"); > + goto end; > + } > + } > + > +end: > + if (succeeded) > + { > + GlobalUnlock(hClipData); > + *lpBytes = GlobalSize(hClipData); > + return hClipData; > + } > + else > + { > + if (text_uri_list) > + GlobalUnlock(hClipData); > + GlobalFree(hClipData); > + *lpBytes = 0; > + return 0; > + } > +} That's unnecessarily complicated and inefficient. You don't need to retrieve the file name 4 times, or to convert every filename to Unix twice. -- Alexandre Julliard julliard(a)winehq.org

1 0