June 2015 - Wine-devel - list.winehq.org

Re: kernel32: Treat empty locale name as LANG_INVARIANT.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Jacek Caban <jacek(a)codeweavers.com> writes: > --- > dlls/kernel32/locale.c | 7 +++++++ > dlls/kernel32/tests/locale.c | 6 ++++-- > 2 files changed, 11 insertions(+), 2 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so locale && touch locale.ok locale.c:2421: Test failed: Expected lcid = 0x7F, got 0000047f, error -559038737 make: *** [locale.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [6/7] qmgr: Add support for Basic authentication.
by Jacek Caban 09 Jun '15

09 Jun '15

Hi Hans, On 06/08/15 14:32, Hans Leidekker wrote: > static HRESULT WINAPI http_negotiate_BeginningTransaction( > IHttpNegotiate *iface, LPCWSTR url, LPCWSTR headers, DWORD reserved, LPWSTR *add_headers) > { > DLBindStatusCallback *callback = impl_from_IHttpNegotiate(iface); > - FIXME("(%p)->(%s %s %u %p)\n", callback, debugstr_w(url), debugstr_w(headers), reserved, add_headers); > - return E_NOTIMPL; > + BackgroundCopyJobImpl *job = callback->file->owner; > + WCHAR *str, *auth_header; > + DWORD len; > + > + TRACE("(%p)->(%s %s %d %p)\n", callback, debugstr_w(url), debugstr_w(headers), reserved, add_headers); > + > + if ((auth_header = build_auth_header(&job->http_options.creds))) > + { > + if (!job->http_options.headers) > + { > + *add_headers = auth_header; > + return S_OK; > + } > + else > + { > + len = strlenW(auth_header) + strlenW(job->http_options.headers); > + if (!(str = CoTaskMemAlloc((len + 1) * sizeof(WCHAR)))) > + { > + CoTaskMemFree(auth_header); > + return E_OUTOFMEMORY; > + } > + strcpyW(str, auth_header); > + strcatW(str, job->http_options.headers); > + CoTaskMemFree(auth_header); > + *add_headers = str; > + return S_OK; > + } > + } > + else if (job->http_options.headers) > + { > + if (!(*add_headers = co_strdupW(job->http_options.headers))) return E_OUTOFMEMORY; > + return S_OK; > + } > + > + *add_headers = NULL; > + return S_OK; It doesn't sound like a good idea to manually handle that here. We should most likely use IAuthenticate (although it's not yet supported in urlmon). Jacek

2 6

Re: [wine-tools] patches: Add a "Staging" status.
by Austin English 09 Jun '15

09 Jun '15

On Fri, Jun 5, 2015 at 11:30 AM, Michael Stefaniuc <mstefani(a)redhat.de> wrote: > --- > patches/expire | 1 + > patches/patches.css | 1 + > patches/update | 2 ++ > 3 files changed, 4 insertions(+) > > diff --git a/patches/expire b/patches/expire > index f143ab1..3cf75e6 100755 > --- a/patches/expire > +++ b/patches/expire > @@ -37,6 +37,7 @@ my %status_expiry = > "split" => 7, > "depend" => 7, > "sequence" => 7, > + "staging" => 30, > "superseded" => 1, > "testcase" => 7, > "testfail" => 7, > diff --git a/patches/patches.css b/patches/patches.css > index 745ec75..5746057 100644 > --- a/patches/patches.css > +++ b/patches/patches.css > @@ -154,6 +154,7 @@ tr.odd { background-color: #f8e8e8; } > .sequence, .sequence :link, .sequence :visited { color: #e08000; } > .deferred, .deferred :link, .deferred :visited { color: #e08000; } > .testcase, .testcase :link, .testcase :visited { color: #e08000; } > +.staging, .staging :link, .staging :visited { color: #e08000; } > .other, .other :link, .other :visited { color: #e08000; } > .applyfail, .applyfail :link, .applyfail :visited { color: red; } > .buildfail, .buildfail :link, .buildfail :visited { color: red; } > diff --git a/patches/update b/patches/update > index 4ccc910..335af0b 100755 > --- a/patches/update > +++ b/patches/update > @@ -40,6 +40,7 @@ my %status_descr = > "depend" => "Dependency", > "superseded" => "Superseded", > "sequence" => "Bad sequence", > + "staging" => "Staging", > "testcase" => "Needs tests", > "testfail" => "Test failure", > ); > @@ -57,6 +58,7 @@ my @legend = > "<li>Someone else fixed the problem already.</li></ul>" ], > [ "testcase", "<ul><li>You need to write some test cases demonstrating that the patch is correct.</li></ul>" ], > [ "deferred", "<ul><li>The patch is deferred because of code freeze for an upcoming release. Either resend after the release, make the patch less intrusive, or make a convincing argument that it needs to be included in the release.</li></ul>" ], > + [ "staging", "<ul><li>The patch needs more work or wider testing. Please get it in over Wine Staging.</li></ul>" ], > [ "other", "<ul><li>The patch belongs to another WineHQ project (website, appdb, etc.) and will be applied by the respective maintainer.</li></ul>" ], > [ "applyfail", "<ul><li>The patch got mangled in transit.</li>" . > "<li>It's not relative to the latest git.</li>" . > -- > 2.4.2 I'm not sure we want to encourage wine-stating from Upstream (I'm not convinced either way), but in any case, the grammar seems wrong to me as a native speaker, how about: "The patch needs more work or wider testing. Please try to get into Wine-Staging." or something similar? -- -Austin

5 4

Re: odbccp32: Implement SQLGetPrivateProfileString
by Nikolay Sivov 09 Jun '15

09 Jun '15

On 09.06.2015 13:00, Alistair Leslie-Hughes wrote: > @@ -415,12 +416,56 @@ int WINAPI SQLGetPrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, > LPCSTR lpszDefault, LPCSTR RetBuffer, int cbRetBuffer, > LPCSTR lpszFilename) I turns out our definition is wrong, PSDK uses LPSTR/LPWSTR for output buffer. Fixing that (including header of course) will fix casts that you had to use to cast const away. Also I think we want SQLGetPrivateProfileStringW to be implemented first, and forward SQLGetPrivateProfileString to it, unless there's a reason not to do that, like differences in behavior that some tests reveal.

1 0

Re: [PATCH 1/2] mshtml: Implement IHTMLXMLHttpRequestFactory as a stub.
by Jacek Caban 09 Jun '15

09 Jun '15

Hi Zhenbo, On 06/08/15 17:04, Zhenbo Li wrote: > --- a/dlls/mshtml/htmlwindow.c > +++ b/dlls/mshtml/htmlwindow.c > @@ -1965,8 +1965,23 @@ static HRESULT WINAPI HTMLWindow5_put_XMLHttpRequest(IHTMLWindow5 *iface, VARIAN > static HRESULT WINAPI HTMLWindow5_get_XMLHttpRequest(IHTMLWindow5 *iface, VARIANT *p) > { > HTMLWindow *This = impl_from_IHTMLWindow5(iface); > - FIXME("(%p)->(%p)\n", This, p); > - return E_NOTIMPL; > + HTMLInnerWindow *window = This->inner_window; > + > + TRACE("(%p)->(%p)\n", This, p); > + > + if(!window->xml_factory) { > + HRESULT hres; > + > + hres = HTMLXMLHttpRequestFactory_Create(window, &window->xml_factory); > + if(FAILED(hres)) > + return hres; > + } This instance will be leaked. You need to release it when HTMLInnerWindow is freed. Cheers, Jacek

1 0

Re: [1/2] xaudio2_7: Implement IXaudio2 interface as stub (try 5)
by Jacek Caban 09 Jun '15

09 Jun '15

Hi Guillaume, On 06/09/15 10:46, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=26808 > > Thanks Jacek, I applied most of your tips (except those I was unable to understand how they was related to the code) It looks better now, but: > +static HRESULT WINAPI XAudio2CF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) > +{ > + return IClassFactory_QueryInterface(iface, riid, ppobj); > +} Why did you change it? This can't work, it will cause infinite recursion when called. Cheers, Jacek

1 0

Re: [PATCH] advapi32: test and fix ChangeServiceConfig2 when given a zero length or a null description (try 2) (was: succeed
by Marvin 09 Jun '15

09 Jun '15

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=14026 Your paranoid android. === w7u (32 bit service) === service.c:1421: Test failed: Active services mismatch 1 service.c:1422: Test failed: Inactive services mismatch 4294967295

2 1

Re: [PATCH 2/2] d3dx9_36: Implement triangle filter when create textures
by Matteo Bruni 09 Jun '15

09 Jun '15

2015-06-09 10:49 GMT+02:00 Sergey Isakov <isakov-sl(a)bk.ru>: > This algo just tested long ago. > May be it can be rewritten to float point math but it requires additional efforts. > > It does differ from MS algo because it is my algo not related to MS. > > Manually observe? I did this and sent a picture. Can't imagine what should be done with tests suit. The test I mentioned is not meant for the Wine test suite (even though it would be nice to have some kind of Wine test eventually). You would write a standalone application (or hack something in the d3dx9 tests, it might be easier) along the lines of what I described and run it against native d3dx9_36.dll, ideally on Windows. You'd save the filtered images and eyeball them to try to figure out what's the filtering algorithm used by MS. I have no idea whether it will be doable in practice or not but it seems worth a try.

2 1

Re: kernel32/tests: Some tests for invalid classes in SetFileInformationByHandle()
by Marvin 09 Jun '15

09 Jun '15

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=14013 Your paranoid android. === wvistau64 (32 bit file) === file.c:446: Test failed: attributes of file "testfile.xxx" are 0x0820 === wvistau64 (64 bit file) === file.c:446: Test failed: attributes of file "testfile.xxx" are 0x0820

2 1

Re: [PATCH 2/2] d3dx9_36: Implement triangle filter when create textures
by Nikolay Sivov 09 Jun '15

09 Jun '15

On 08.06.2015 10:02, Sergey Isakov wrote: > > On 08.06.2015, at 9:48, Nikolay Sivov wrote: > >> On 07.06.2015 23:13, Sergey Isakov wrote: >>> It is probably not triangle filter but works with similar result so I place it in appropriate places. >>> As well load surface and volume works with DXTn textures now. External conversion is a stub. >>> The best test will be graphical. See two sscreenshots: textures made by DxTex.exe (from DirectXSDK), one with point filter, second with triangle filter my version. >>> PS. About copyright. It is my mathematics. (c)Isakov S.L. >>> >> >>> +#ifdef DXTN_COMPESSION_SUPPORTED >>> + switch (format) >>> + { >>> + case D3DFMT_DXT1: >>> + if (!wined3d_dxtn_supported()) return NULL; >>> + return encode ? wined3d_dxt1_encode : wined3d_dxt1_decode; >> >> This diff is not against wine-git tree, there's no wined3d_dxtn_supported() funtion in wine. > > So why this is a stub. > Sure, this diff against wine-git tree recent version. > You mean that's why it's #ifdefed? I don't know if we need this part, that can't be even built, as it's not clear how DXTN_COMPRESSION_SUPPORTED is supposed to be defined and where; but I leave this to actual wined3d devs to respond. P.S. please CC wine-devel next time you reply.

4 4