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

Re: kernel32: Treat empty locale name as LANG_INVARIANT.
by Alexandre Julliard June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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 June 9, 2015

June 9, 2015

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

Re: [3/3] advapi32/tests: Add preliminary event tracing tests.
by Nikolay Sivov June 9, 2015

June 9, 2015

On 08.06.2015 6:56, Zebediah Figura wrote: > + /* test ERROR_DISK_FULL */ > + properties->MaximumFileSize = 1000000000000; /* 1 EB */ > + SetLastError(0xdeadbeef); > + ret = StartTraceA(&handle, sessionname, properties); > + todo_wine > + { > + ok(ret != ERROR_SUCCESS, "Expected failure\n"); > + ok(GetLastError() == ERROR_DISK_FULL, "Expected ERROR_DISK_FULL, got %d\n", GetLastError()); > + } > + properties->MaximumFileSize = 0; Patches look fine to me, but I have to ask - is it possible that this test will actually try to write that much?

2 2

Re: gdiplus: Implement trivial case of GdipCreateRegionRgnData for empty and infinite regions
by Vincent Povirk June 9, 2015

June 9, 2015

+ if (region_header->magic != VERSION_MAGIC) + return InvalidParameter; We should probably accept 0xdbc01002 as well here.

2 1

Re: [1/4] msvcirt: Add implementation of streambuf::allocate (try 2, resend)
by Piotr Caban June 8, 2015

June 8, 2015

On 06/08/15 15:56, Iván Matellanes wrote: > + ok(sb.ebuf - sb.base == 512 , "wrong reserve area size, expected 512 got %d\n", sb.ebuf - sb.base); > + ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %d\n", sb2.ebuf - sb2.base); This will produce warning on 64-bit build. You can e.g. display both pointers in error message. Sorry for not spotting it earlier, Piotr

1 0

Wineconf proposal: discuss 64-bit?
by Josh DuBois June 8, 2015

June 8, 2015

I'm wondering whether it would be useful to discuss 64-bit support in Wine at wineconf this year. I'm interested in feedback on whether it's a useful topic. With games in particular, 64-bit seems to be becoming a more common requirement, especially with newer DirectX 11 games (which may start running in wine ... sometime). I guess the basics work on Intel Linux. Several issues remain, however: - OS X support: compiler toolchains are an issue, there are problems with thread-local storage. - ARM support: I think Andre H. believes that 64-bit will be hard to support on ARM. As far as I know there aren't yet a lot of real-world use-cases for that, but there are certainly a lot of ARM chips around nowdays and maybe Windows 10 will start appearing on ARM devices. - MSI: I think there are MSI limitations which prevent some 64-bit apps from installing (e.g., bug 29941) . I think this blocks 64-bit MS Office. - Mono / .NET ? - Other ... ? It might be that there's not a great deal to do at wineconf other than catalog the issues. If it's worth a short (not an hour - maybe if we have some 10-15 minute segments) discussion while everyone is in the same place, I'd be happy to try and catalog them.

2 2

Re: [5/7] qmgr: Implement IBackgroundCopyJob::Cancel.
by Jacek Caban June 8, 2015

June 8, 2015

Hi Hans, On 06/08/15 14:32, Hans Leidekker wrote: > --- > dlls/qmgr/file.c | 1 + > dlls/qmgr/job.c | 33 +++++++++++++++++++++++++++++++-- > 2 files changed, 32 insertions(+), 2 deletions(-) I don't know qmgr, but shouldn't it result in IBinding::Abort() call on underlying binding object? Jacek

2 2

Wineconf talk proposal: Wine and Valgrind
by Austin English June 8, 2015

June 8, 2015

Howdy all, If anyone is interested, I can give a presentation on Wine/Valgrind, i.e. current status, major outstanding issues on either side, issues found/fixed, etc. Please let me know if you'd be interested. -Austin

2 1

Re: [PATCH 1/2] d3dx9_36: Implemented D3DXSaveVolumeToFile including DDS files
by Nikolay Sivov June 8, 2015

June 8, 2015

On 08.06.2015 10:01, Sergey Isakov wrote: > It is hard to distill what part of codes comes from where. My patches depends on previous patches and so they must be included too. > OK, all copylefts must be included if I will know how to do this. > If Christian Costa will say what to do I will do this. Sure, let's hear his opinion. > > On 08.06.2015, at 9:43, Nikolay Sivov wrote: > >> On 07.06.2015 23:02, Sergey Isakov wrote: >>> I decided to improve builtin d3dx9_36 library with support of more file >>> formats, texture formats, volume textures. >> >> It's not your work though, it looks to me like 3 or so patches from Christian Costa squashed together. Why didn't you mention it? >

3 3

Re: xaudio2_7: Implement IXaudio2 interface as stub (try 4)
by Jacek Caban June 8, 2015

June 8, 2015

Hi Guillaume, On 06/08/15 10:06, Guillaume Charifi wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=26808 > > --- > dlls/xaudio2_7/Makefile.in | 2 > dlls/xaudio2_7/xaudio_dll.c | 300 > ++++++++++++++++++++++++++++++++++++- > dlls/xaudio2_7/xaudio_classes.idl | 28 +++ > 3 files changed, 319 insertions(+), 11 deletions(-) > > > xaudio_2.7.dll.IXAudio2_stub.patch > > > diff --git a/dlls/xaudio2_7/Makefile.in b/dlls/xaudio2_7/Makefile.in > index 853d1d6..6bdf362 100644 > --- a/dlls/xaudio2_7/Makefile.in > +++ b/dlls/xaudio2_7/Makefile.in > @@ -3,3 +3,5 @@ IMPORTS = advapi32 kernel32 ole32 user32 uuid > > C_SRCS = \ > xaudio_dll.c > + > +IDL_SRCS = xaudio_classes.idl Adding registration IDL deserves a separated patch. > diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c > index c8b7904..07c4780 100644 > --- a/dlls/xaudio2_7/xaudio_dll.c > +++ b/dlls/xaudio2_7/xaudio_dll.c > @@ -30,12 +30,15 @@ > #include "wine/debug.h" > #include <propsys.h> > #include "initguid.h" > + > #include "xaudio2.h" > > WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); > > static HINSTANCE instance; > > +static HRESULT XAudio2_create(IUnknown *pUnkOuter, LPVOID *ppObj); > + > BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > { > TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); > @@ -52,35 +55,310 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > return TRUE; > } > > -HRESULT WINAPI DllCanUnloadNow(void) > +typedef struct { > + IClassFactory IClassFactory_iface; > + HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); Please avoid using LP* types. This should be void**, but using IUnknown** would be even better. > +} IClassFactoryImpl; > + > +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) > { > - return S_FALSE; > + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); > +} > + > +static HRESULT WINAPI XAudio2CF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) > +{ > + if(IsEqualGUID(riid, &IID_IUnknown) > + || IsEqualGUID(riid, &IID_IClassFactory)) > + { > + IClassFactory_AddRef(iface); > + *ppobj = iface; > + return S_OK; > + } > + > + *ppobj = NULL; > + WARN("(%p)->(%s, %p): interface not found\n", iface, debugstr_guid(riid), ppobj); > + return E_NOINTERFACE; > +} > + > +static ULONG WINAPI XAudio2CF_AddRef(IClassFactory *iface) > +{ > + return 2; > +} > + > +static ULONG WINAPI XAudio2CF_Release(IClassFactory *iface) > +{ > + return 1; > } > > +static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, > + REFIID riid, void **ppobj) > +{ > + IClassFactoryImpl *This = impl_from_IClassFactory(iface); > + HRESULT hr; > + LPUNKNOWN punk; Same here, use IUnknown* instead. > + > + TRACE("(%p)->(%p,%s,%p)\n", This, pOuter, debugstr_guid(riid), ppobj); > + > + *ppobj = NULL; > + hr = This->pfnCreateInstance(pOuter, (LPVOID *) &punk); > + if (FAILED(hr)) > + return hr; > + > + hr = IUnknown_QueryInterface(punk, riid, ppobj); > + IUnknown_Release(punk); > + return hr; > +} > + > +static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) > +{ > + IClassFactoryImpl *This = impl_from_IClassFactory(iface); > + FIXME("(%p)->(%d): stub!\n", This, dolock); > + return S_OK; > +} > + > +static const IClassFactoryVtbl XAudio2CF_Vtbl = > +{ > + XAudio2CF_QueryInterface, > + XAudio2CF_AddRef, > + XAudio2CF_Release, > + XAudio2CF_CreateInstance, > + XAudio2CF_LockServer > +}; > + > +static IClassFactoryImpl xaudio2_cf = { { &XAudio2CF_Vtbl }, XAudio2_create }; > + > HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) > { > + IClassFactory *factory = NULL; > + > TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); > > - if (ppv == NULL) { > - WARN("invalid parameter\n"); > - return E_INVALIDARG; > + if(IsEqualGUID(rclsid, &CLSID_XAudio2)) { > + factory = &xaudio2_cf.IClassFactory_iface; How about simply return IClassFactory_QueryInterface(...) here? > } > + if(!factory) return CLASS_E_CLASSNOTAVAILABLE; > > - *ppv = NULL; > + return IClassFactory_QueryInterface(factory, riid, ppv); > +} > > - WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid), > - debugstr_guid(riid), ppv); > - return CLASS_E_CLASSNOTAVAILABLE; > +HRESULT WINAPI DllCanUnloadNow(void) > +{ > + return S_FALSE; > } > > HRESULT WINAPI DllRegisterServer(void) > { > TRACE("\n"); > - return __wine_register_resources( instance ); > + return __wine_register_resources(instance); > } > > HRESULT WINAPI DllUnregisterServer(void) > { > TRACE("\n"); > - return __wine_unregister_resources( instance ); > + return __wine_unregister_resources(instance); > +} > + > +typedef struct { > + IXAudio2 IXAudio2Impl_iface; > + LONG ref; > +} IXAudio2Impl; > + > +static inline IXAudio2Impl *impl_from_IXAudio2(IXAudio2 *iface) > +{ > + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2Impl_iface); > } > + > +static const struct IXAudio2Vtbl XAudio2_Vtbl; This is not needed. Please move XAudio2_create below the vtbl. > +HRESULT XAudio2_create(IUnknown *pUnkOuter, LPVOID *ppObj) > +{ > + IXAudio2Impl* object; > + > + TRACE("(%p, %p)\n", pUnkOuter, ppObj); > + > + if(pUnkOuter) > + return CLASS_E_NOAGGREGATION; > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IXAudio2Impl)); > + if(!object) > + return E_OUTOFMEMORY; > + > + object->IXAudio2Impl_iface.lpVtbl = &XAudio2_Vtbl; > + object->ref = 1; > + > + *ppObj = object; You shouldn't assign object type here, even if the pointer is the same ans interface. Use &object->IXAudio2Impl_iface instead. > + > + return S_OK; > +} > + > +/*** IUnknown methods ***/ > +static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) > +{ > + IXAudio2Impl *This = impl_from_IXAudio2(iface); > + > + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); > + > + if(IsEqualGUID(riid, &IID_IUnknown) || > + IsEqualGUID(riid, &IID_IXAudio2)) > + { > + IXAudio2_AddRef(iface); > + *ppvObject = iface; > + return S_OK; > + } > + > + ERR("(%p)->(%s,%p), not found\n", This,debugstr_guid(riid), ppvObject); This should be FIXME instead (or WARN, it depends on how likely apps are to call it with an interface that shouldn't be implemented). Also, QI is expected to set ppvObject to NULL on error. Thanks, Jacek

1 0

Re: dlls/winsta: add initial winsta.h (try 2)
by Alexandre Julliard June 8, 2015

June 8, 2015

Austin English <austinenglish(a)gmail.com> writes: > updated TS_ALL_PROCESSES_INFO to one from > https://msdn.microsoft.com/en-us/library/cc248681.aspx Looks like you forgot that part. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: Fail properly for unsupported classes in GetFileInformationByHandleEx
by Marvin June 8, 2015

June 8, 2015

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

2 1

Re: [3/3] advapi32/tests: Add preliminary event tracing tests.
by Marvin June 8, 2015

June 8, 2015

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=13996 Your paranoid android. === w2000pro (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wxppro (32 bit eventlog) === eventlog.c:687: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2003std (32 bit eventlog) === eventlog.c:687: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wvistau64 (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w2008s64 (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w7u (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === w8 (32 bit eventlog) === eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got 87 eventlog.c:779: Test failed: Expected ERROR_BAD_PATHNAME, got 87 eventlog.c:791: Test failed: Expected ERROR_DISK_FULL, got 87 eventlog.c:798: Test failed: Expected success eventlog.c:806: Test failed: Expected ERROR_ALREADY_EXISTS, got 87 === wvistau64 (64 bit eventlog) === eventlog.c:695: Test failed: Expected failure eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got -559038737 eventlog.c:755: Test failed: Expected ERROR_INVALID_PARAMETER, got 183 eventlog.c:798: Test failed: Expected success === w2008s64 (64 bit eventlog) === eventlog.c:695: Test failed: Expected failure eventlog.c:696: Test failed: Expected ERROR_BAD_LENGTH, got -559038737 eventlog.c:755: Test failed: Expected ERROR_INVALID_PARAMETER, got 183 eventlog.c:798: Test failed: Expected success

1 0

Re: inetcpl: implement default page button (resend)
by Alexandre Julliard June 8, 2015

June 8, 2015

Jared Smudde <computerwhiz02(a)hotmail.com> writes: > @@ -35,6 +35,7 @@ > WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); > > static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; > +static const WCHAR default_home[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; This should come from the registry. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/4] msvcirt: Add implementation of streambuf::allocate
by Piotr Caban June 8, 2015

June 8, 2015

On 06/07/15 20:54, Iván Matellanes wrote: > + return CALL_VTBL_FUNC(this, 40, int, (streambuf*), (this)); The code will be easier to read if you define call_streambuf_doallocate macro and use it here. It would be also nice to change order of allocate and doallocate functions. Cheers, Piotr

1 0

Re: [PATCH 2/2] d3dx9_36: Implement triangle filter when create textures
by Nikolay Sivov June 8, 2015

June 8, 2015

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.

1 0

Re: [PATCH 1/2] d3dx9_36: Implemented D3DXSaveVolumeToFile including DDS files
by Nikolay Sivov June 8, 2015

June 8, 2015

On 07.06.2015 23:02, Sergey Isakov wrote: > I decided to improve builtin d3dx9_36 library with support of more file > formats, texture formats, volume textures. It's not your work though, it looks to me like 3 or so patches from Christian Costa squashed together. Why didn't you mention it?

1 0

Re: [1/3] ws2_32: Fix uninitialized memory access in do_poll (Coverity).
by Nikolay Sivov June 7, 2015

June 7, 2015

On 30.05.2015 18:20, Sebastian Lackner wrote: > --- > dlls/ws2_32/socket.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) I guess it fixes a warning, but timeout == 0 means no timeout and you don't need a timestamp. select() is the only user of it, and it has this: --- if (ws_timeout) timeout = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; ret = do_poll(pollfds, count, timeout); --- so probably 0 value should be handled differently within a loop, or need to have a separate case that call poll() once and return right away.

1 0

programs/regsvr32: Do not set wsCommandLine multiple times
by Hugh McMaster June 7, 2015

June 7, 2015

Please disregard this patch. The functionality is still needed.

1 0

Re: include: Convert vfw.h to vfw.idl.
by Nikolay Sivov June 7, 2015

June 7, 2015

Hi, I see it went to pending, so let me suggest something. We need this idl mostly for automated proxy/stub generation and registration, right? Maybe we could introduce an idl that contains interfaces only and not all regular header stuff that vfw.h is made of. I would probably work to duplicate interfaces locally at dll level, and leave header alone.

2 1

Wineconf: workshop(s)?
by Marcus Meissner June 7, 2015

June 7, 2015

Hi, I am wondering if it makes sense to hold a workshop / hack session and how to. As we seem to be accustomed to working as single developers this is a bit hard, also "making good use of available time" is a factor. Do we have scenarios where some hours of short term working together would benefit us? - We had regression triaging some years ago which was working okish I think, but might not have been the best use of time. - We also had a "make all tests green on my laptop" shared activity, which was also a bit useful. - Bug triaging is not really a team activity, although if its necessary we could just force everyone present to do it for some hours. - other things? Ciao, Marcus

2 1

Re: inetcpl: implement default page button (try 2)
by Andrew Eikum June 5, 2015

June 5, 2015

Wine doesn't use the L string prefix, because unfortunately some compilers don't support it. Your previous patch has been marked Pending: <http://source.winehq.org/patches/>. I'd wait for another commit release cycle on Monday to see if that changes. Andrew On Fri, Jun 05, 2015 at 12:59:17PM -0500, Jared Smudde wrote: > This patch implements the button default page to set back the default homepage is the user changes the homepage. > --- >

1 0

Re: odbccp32: Add a trace message to functions
by Nikolay Sivov June 5, 2015

June 5, 2015

> @@ -281,7 +281,7 @@ BOOL WINAPI SQLGetAvailableDriversW(LPCWSTR lpszInfFile, LPWSTR lpszBuf, > WORD cbBufMax, WORD *pcbBufOut) > { > clear_errors(); > - FIXME("\n"); > + FIXME("%s %s %d %p\n", debugstr_w(lpszInfFile), debugstr_w(lpszBuf), cbBufMax, pcbBufOut); This is wrong, because lpszBuf is out parameter. > @@ -370,6 +374,9 @@ BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax, > int size_wbuf = cbBufMax; > LPWSTR wbuf; > WORD size_used; > + > + TRACE("%s %d %p\n", debugstr_a(lpszBuf), cbBufMax, pcbBufOut); > + Same here. > @@ -397,7 +404,9 @@ int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, > LPCWSTR lpszFilename) > { > clear_errors(); > - FIXME("\n"); > + FIXME("%s %s %s %p %d %s\n", debugstr_w(lpszSection), debugstr_w(lpszEntry), > + debugstr_w(lpszDefault), RetBuffer, cbRetBuffer, > + debugstr_w(lpszFilename)); > SetLastError(ERROR_CALL_NOT_IMPLEMENTED); And here.

1 0

Wine 64 bit
by Kevin Davies June 5, 2015

June 5, 2015

Hello, Where would you find information on wine64 status for running 64 bit windows software under OSX. These days a lot of Windows programs are going 64bit to make use of the available memory. Its becoming necessary to have this capability. Many thanks Kevin

13 31

Re: [PATCH 2/5] d3d9/tests: Add more tests for point size. (v3)
by Marvin June 4, 2015

June 4, 2015

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=13876 Your paranoid android. === w8 (32 bit visual) === visual.c:10525: Test failed: Got unexpected color 0x00ff0000 (case 5, 3, size 0). visual.c:10525: Test failed: Got unexpected color 0x00ff0000 (case 7, 3, size 0). visual.c:10525: Test failed: Got unexpected color 0x00ff0000 (case 9, 3, size 0).

1 0

CSMT status?
by Forest June 4, 2015

June 4, 2015

Can anyone offer a status update on D3D command stream multithreading? I've been packaging Stefan Dösinger's CSMT work, with over 500 people using my last release, and several asking when I'll build a new one. I don't know what to tell them, because his github repo hasn't been updated in half a year, and he hasn't responded to the email I sent him last week. It's starting to look like this excellent work has been abandoned. Pherhaps I missed an announcement? Has it already been integrated into mainline wine? Is there some other plan for it?

4 3

Re: inetcpl.cpl: implement default page button
by Andrew Eikum June 4, 2015

June 4, 2015

Hi Jared, On Wed, Jun 03, 2015 at 08:29:03AM -0500, Jared Smudde wrote: > @@ -186,6 +186,10 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) > case MAKEWPARAM(IDC_HOME_BLANK, BN_CLICKED): > SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); > break; > + > + case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): This file is indented with spaces. Please don't introduce tabs or use whitespace at the end of a line. Thanks! Andrew

1 0

programs/regsvr32 patches
by Hugh McMaster June 4, 2015

June 4, 2015

Excuse me, I've looked through patches 111564-111568 and have only found one minor issue. In patch 111565 I forgot to include ctype.h for tolower(). Was there a problem with the input comparison handling, or something else? The changes to the input handling make conversion to unicode much easier and cleaner. I realise that patch 111565 looks complex, but it's just the indenting. -- Hugh McMaster

1 1

Re: [PATCH] riched20: Fix link notification conditions and add tests.
by Nikolay Sivov June 4, 2015

June 4, 2015

On 04.06.2015 9:34, Alex Henrie wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=35949 > --- > dlls/riched20/editor.c | 13 +++- > dlls/riched20/tests/editor.c | 178 +++++++++++++++++++++++++++++++++++++++---- > 2 files changed, 172 insertions(+), 19 deletions(-) > Looks good to me.

1 0

Re: ntdll/tests: Properly mark test failures with todo_wine.
by Alexandre Julliard June 4, 2015

June 4, 2015

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -353,14 +353,18 @@ static void test_NtQueryDirectoryFile_case(void) > mask.Length = mask.MaximumLength = lstrlenW(testmask) * sizeof(WCHAR); > pNtQueryDirectoryFile(dirh, NULL, NULL, NULL, &io, data, data_size, > FileBothDirectoryInformation, TRUE, &mask, FALSE); > + todo_wine > ok(U(io).Status == STATUS_SUCCESS, "failed to query directory; status %x\n", U(io).Status); > data_len = io.Information; > + todo_wine > ok(data_len >= sizeof(FILE_BOTH_DIRECTORY_INFORMATION), "not enough data in directory\n"); > > name = dir_info->FileName; > name_len = dir_info->FileNameLength / sizeof(WCHAR); > > + todo_wine > ok(name_len == testfile_len, "unexpected filename length %u\n", name_len); > + todo_wine I don't see any failure here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: TestBot job 13726 results: [PATCH 2/2] d3d9/test: implemented tests for UpdateTexture method
by Sergey Isakov June 4, 2015

June 4, 2015

It may mean that Win8 contains a bug. Use Windows Update. On 01 июня 2015 г., at 3:05, Marvin <testbot(a)winehq.org> wrote: > VM Status Number of test failures > build completed > w2000pro completed 0 > wxppro completed 0 > w2003std completed 0 > wvistau64 completed 0 > w2008s64 completed 0 > w7u completed 0 > w8 completed 3 > wvistau64 completed 0 > w2008s64 completed 0 > > === build (build) === > No build failures found > > === w2000pro (32 bit visual) === > No test failures found > > === wxppro (32 bit visual) === > No test failures found > > === w2003std (32 bit visual) === > No test failures found > > === wvistau64 (32 bit visual) === > No test failures found > > === w2008s64 (32 bit visual) === > No test failures found > > === w7u (32 bit visual) === > No test failures found > > === w8 (32 bit visual) === > > d3d9: > visual.c:18560: Test failed: Unexpected result on update texture, hr 0, should fail, case 0, 8. > visual.c:18560: Test failed: Unexpected result on update texture, hr 0, should fail, case 1, 8. > visual.c:18560: Test failed: Unexpected result on update texture, hr 0, should fail, case 2, 8. > > === wvistau64 (64 bit visual) === > No test failures found > > === w2008s64 (64 bit visual) === > No test failures found<build.log><w2000pro.log><wxppro.log><w2003std.log><wvistau64.log><w2008s64.log><w7u.log><w8.log><wvistau64.log><w2008s64.log>

1 0

Re: wbemprox: Treat \r as whitespace.
by Marvin June 4, 2015

June 4, 2015

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=13841 Your paranoid android. === wvistau64 (64 bit query) === The test timed out

2 1

Re: shlwapi: Fix error handling in IUnknown_GetClassID (Coverity)
by Marvin June 3, 2015

June 3, 2015

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=13825 Your paranoid android. === w2000pro (32 bit ordinal) === ordinal.c:3225: Test failed: got wrong clsid {cccccccc-cccc-cccc-cccc-cccccccccccc} === wxppro (32 bit ordinal) === ordinal.c:3225: Test failed: got wrong clsid {cccccccc-cccc-cccc-cccc-cccccccccccc} === w2003std (32 bit ordinal) === ordinal.c:3225: Test failed: got wrong clsid {cccccccc-cccc-cccc-cccc-cccccccccccc}

1 0

Re: [PATCH 2/5] wined3d: Clamp per-vertex point size in vertex shaders.
by Henri Verbeet June 3, 2015

June 3, 2015

On 2 June 2015 at 16:39, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -6711,7 +6721,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const > WORD map = vshader->reg_maps.input_registers; > struct wined3d_string_buffer *tmp_name = string_buffer_get(&priv->string_buffers); > > - reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, gl_info); > + reorder_shader_id = generate_param_reorder_function(priv, vshader, pshader, > + state->gl_primitive_type == GL_POINTS && vshader->reg_maps.point_size, gl_info); This works because "state->gl_primitive_type == GL_POINTS" is mirrored in struct vs_compile_args, but it isn't necessarily very obvious or pretty.

2 2

Re: [PATCH 3/5] wined3d: Handle point sprites with PS 3.0.
by Henri Verbeet June 3, 2015

June 3, 2015

On 2 June 2015 at 16:39, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) > + shader_addline(buffer, "ps_in[%u].xy = vec2(gl_PointCoord.x, gl_PointCoord.y);\n", input->register_idx); Why not "ps_in[%u].xy = gl_PointCoord.xy;\n"? Also, do the z and w components have a defined value?

2 1

Re: [1/2] msvcirt: Add initial implementation of streambuf (try 3)
by Piotr Caban June 3, 2015

June 3, 2015

On 06/03/15 13:50, Iván Matellanes wrote: > +DEFINE_RTTI_DATA0(streambuf, 0, ".?AVstreambuf@@") You need to call init_streambuf_rtti function to initialize RTTI in 64-bit case. Cheers, Piotr

1 0

Re: [1/2] msvcirt: Add initial implementation of streambuf (try 2)
by Piotr Caban June 3, 2015

June 3, 2015

On 06/02/15 18:20, Iván Matellanes wrote: > +/* ?seekoff(a)streambuf@@UAEJJW4seek_dir(a)ios@@H(a)Z */ > +/* ?seekoff(a)streambuf@@UEAAJJW4seek_dir(a)ios@@H(a)Z */ > +DEFINE_THISCALL_WRAPPER(streambuf_seekoff, 16) > +long __thiscall streambuf_seekoff(streambuf *this, long offset, int dir, int mode) > +{ > + FIXME("(%p %ld %d %d): stub\n", this, offset, dir, mode); > + return EOF; > +} You can't use long type here, please use LONG instead (it's used also in some other functions). Thanks, Piotr

1 0

Re: include: add initial winsta.h
by Austin English June 3, 2015

June 3, 2015

On Tue, May 26, 2015 at 10:21 PM, Austin English <austinenglish(a)gmail.com> wrote: > -- > -Austin Patch has been pending for several days, is there something I can do to improve it? Nikolay asked in #winehackers where this came from, it's on MSDN: https://msdn.microsoft.com/en-us/library/cc248871.aspx and also in Process Hacker's source: http://processhacker.sourceforge.net/doc/winsta_8h_source.html -- -Austin

2 4

Re: [PATCH 5/5] d3d8/tests: Port the point size test to D3D8.
by Marvin June 2, 2015

June 2, 2015

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=13782 Your paranoid android. === w8 (32 bit visual) === visual.c:6788: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 0, 3, size 0). visual.c:6788: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 1, 3, size 0). visual.c:6788: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 2, 3, size 0). visual.c:6788: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 3, 3, size 0). visual.c:6788: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 4, 7, size 0).

1 0

Re: [PATCH 4/5] d3d9/tests: Add more tests for point size.
by Marvin June 2, 2015

June 2, 2015

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=13781 Your paranoid android. === w8 (32 bit visual) === visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 0, 3, size 0). visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 1, 3, size 0). visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 2, 3, size 0). visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 3, 3, size 0). visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x00000000 (case 4, 3, size 0). visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x0000ff00 (case 5, 7, size 0). visual.c:10462: Test failed: Expected color 0x0000ffff, got 0x00000000 (case 6, 7, size 0).

1 0

Re: [2/2] msvcirt/tests: Add initial tests for streambuf (try 2)
by Marvin June 2, 2015

June 2, 2015

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=13771 Your paranoid android. === wvistau64 (64 bit msvcirt) === No test summary line found === w2008s64 (64 bit msvcirt) === No test summary line found

1 0

Re: [PATCH 1/3] ntdll: Implemenent ObjectTypeInformation class support in NtQueryObject.
by Nikolay Sivov June 2, 2015

June 2, 2015

On 01.06.2015 12:52, Qian Hong wrote: > Hi, > > This patch fixed QQ crashing on recent Wine. Thanks Sebastian for > improving my patch. > Tested with wine-staging for weeks. > > --- > dlls/ntdll/om.c | 64 > +++++++++++++++++++++++++++++++++++++++++++++++++++ > dlls/ntdll/tests/om.c | 28 +++++++++++----------- > server/directory.c | 5 ---- > server/handle.c | 18 +++++++++++++++ > server/object.h | 5 ++++ > server/protocol.def | 9 ++++++++ > 6 files changed, 110 insertions(+), 19 deletions(-) > > + if (!(status = server_get_unix_name( handle, &unix_name ))) > + { > + static const WCHAR type_fileW[] = {'F','i','l','e','\0'}; > + int type_size = sizeof(type_fileW); > + > + if (len < sizeof(*p)) > + status = STATUS_INFO_LENGTH_MISMATCH; > + else if (len < sizeof(*p) + type_size) > + status = STATUS_BUFFER_OVERFLOW; > + else > + { > + p->TypeName.Buffer = (WCHAR *)(p + 1); > + p->TypeName.Length = type_size - sizeof(WCHAR); > + p->TypeName.MaximumLength = type_size; > + memcpy( p->TypeName.Buffer, type_fileW, type_size ); > + > + } > + if (used_len) *used_len = sizeof(*p) + type_size; > + RtlFreeAnsiString( &unix_name ); > + break; > + } Why do you need a separate server call/special case for files?

2 1