May 2016 - Wine-devel - list.winehq.org

Re: [PATCH 3/7] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v6 resend)
by Henri Verbeet 20 May '16

20 May '16

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 583dbec..1f57058 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1705,6 +1705,11 @@ static void test_Texture(void) > TRUE, 2 * sizeof(DWORD), NULL, NULL, > 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, 0, NULL > }, *d3drm_img = NULL; > + D3DRMIMAGE testimg = { Formatting. (Yeah, the existing test is like that as well.) > + 0, 0, 0, 0, 0, > + TRUE, 0, (void *)0xcafebabe, NULL, > + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL > + }; > DWORD pixel[4] = { 20000, 30000, 10000, 0 }; > DWORD size; > CHAR cname[64] = {0}; > @@ -1853,22 +1858,95 @@ static void test_Texture(void) > ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u, ref4 = %u.\n", ref1, ref4); > > /* InitFromImage tests */ > - d3drm_img = NULL; > + > + /* Tests for validation of D3DRMIMAGE struct */ > + hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); Line length. > + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface (hr = %x).\n", hr); It's not a huge issue, but %#x, please.

1 0

Re: [PATCH 2/7] d3drm: Introduce d3drm_texture_destroy helper (v4 resend).
by Henri Verbeet 20 May '16

20 May '16

On 19 May 2016 at 12:55, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -44,6 +44,14 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); > } > > +static void d3drm_texture_destroy(struct d3drm_texture *texture) > +{ > + TRACE("texture %p is being destroyed.\n", texture); > +···· Trailing whitespace.

1 0

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture. (v3)
by Henri Verbeet 20 May '16

20 May '16

On 19 May 2016 at 13:00, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, > const char *filename, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, &CLSID_CDirect3DRMTexture, NULL, > + &IID_IDirect3DRMTexture, (void **)texture))) > return hr; > > - *texture = &object->IDirect3DRMTexture_iface; > - > return D3DRM_OK; > } Actually, after thinking it through for a bit, I don't think you need to use CreateObject() here at all. You can just add an extra parameter to d3drm_texture_create() in patch 3/7 and avoid going through all the COM stuff. (Of course at that point you'll also notice load_mesh_data() is broken...) > @@ -857,17 +855,19 @@ static HRESULT WINAPI d3drm2_CreateUserVisual(IDirect3DRM2 *iface, > static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, > const char *filename, IDirect3DRMTexture2 **texture) > { > - struct d3drm_texture *object; > + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); > + IDirect3DRMTexture3 *texture3; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM3_LoadTexture(&d3drm->IDirect3DRM3_iface, filename, &texture3))) > return hr; This change isn't necessarily wrong, but it's something different from what the rest of the patch does. Note that if things were ordered so that the newest version of the interface came first, you could call d3drm3_LoadTexture() here directly. The file is the way it is of course, but perhaps we should consider fixing that at some point.

1 0

Re: [PATCH] dwrite: Resolve BNs and embedding and override formatting characters to preceding level
by Marvin 20 May '16

20 May '16

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=23120 Your paranoid android. === wvistau64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w2008s64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7u (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7pro64 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w8 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w864 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w1064 (32 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === wvistau64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w2008s64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w7pro64 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w864 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057 === w1064 (64 bit analyzer) === analyzer.c:2238: Test failed: got 0x80070057

1 0

Re: dnsapi: add DnsGetCacheDataTable stub
by Hans Leidekker 20 May '16

20 May '16

On Thu, 2016-05-19 at 23:27 -0500, Austin English wrote: > +typedef int (*DNS_GET_CACHE_DATA_TABLE)(PDNSCACHEENTRY); You don't need this. > +DNS_GET_CACHE_DATA_TABLE WINAPI DnsGetCacheDataTable( DNSCACHEENTRY *cache ) > +{ > + FIXME( "(%p) stub\n", cache); > + return ERROR_SUCCESS; > +} It should probably return DNS_STATUS and the parameter might actually be DNSCACHEENTRY **. Some tests would be helpful here.

1 0

Re: user32: Also change rcUpdate when scrolling by more than the window size.
by Marvin 19 May '16

19 May '16

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=23115 Your paranoid android. === wvistau64 (32 bit win) === win.c:8207: Test failed: WindowFromPoint returned 00040170, expected 000201FC win.c:8214: Test failed: WindowFromPoint returned 000601BA, expected 000301FA

1 0

[PATCH] local debugging help
by Fabian Maurer 19 May '16

19 May '16

Please ignore my patch 122481 dubbed "local debugging help", I sent that by mistake.

1 0

Re: [PATCH 07/11] wininet: Removed maximum URL length assumption from get_proxy_autoconfig_url.
by Sebastian Lackner 19 May '16

19 May '16

On 17.05.2016 19:16, Jacek Caban wrote: > Also use correct encoding. > > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/internet.c | 33 +++++++++++++++++++-------------- > 1 file changed, 19 insertions(+), 14 deletions(-) > > > > 0007-wininet-Removed-maximum-URL-length-assumption-from-ge.diff > > > diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c > index 371c3d0..78bea7c 100644 > --- a/dlls/wininet/internet.c > +++ b/dlls/wininet/internet.c > @@ -2307,13 +2307,14 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer, > return res == ERROR_SUCCESS; > } > > -static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) > +static WCHAR *get_proxy_autoconfig_url(void) > { > #if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 > > CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); > + WCHAR *ret = NULL; > + SIZE_T len; > const void *ref; > - BOOL ret = FALSE; > > if (!settings) return FALSE; > > @@ -2322,16 +2323,20 @@ static BOOL get_proxy_autoconfig_url( char *buf, DWORD buflen ) > CFRelease( settings ); > return FALSE; You forgot to replace FALSE -> NULL at a couple of places in this patch.

2 1

Re: [PATCH 1/7] d3drm: Use CreateObject in IDirect3DRM*::LoadTexture. (v2)
by Aaryaman Vasishta 19 May '16

19 May '16

On Thu, May 19, 2016 at 4:25 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > v2: Thunk 2->3 for LoadTexture. > > Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> > --- > dlls/d3drm/d3drm.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c > index edb46df..bc16b6f 100644 > --- a/dlls/d3drm/d3drm.c > +++ b/dlls/d3drm/d3drm.c > @@ -413,16 +413,13 @@ static HRESULT WINAPI > d3drm1_CreateUserVisual(IDirect3DRM *iface, > static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, > const char *filename, IDirect3DRMTexture **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > FIXME("iface %p, filename %s, texture %p stub!\n", iface, > debugstr_a(filename), texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (FAILED(hr = IDirect3DRM_CreateObject(iface, > &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void > **)texture))) > return hr; > This line is too long, I'm resending v3 of this patch. Cheers, Aaryaman

1 0

Re: [v2 PATCH] user32/scroll: Move GetDCEx to stop DC leak
by Alexandre Julliard 19 May '16

19 May '16

Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> writes: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/user32/scroll.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Since it can't happen there's no leak to fix. You could replace the return by an assert(0) if you want to make it clearer. -- Alexandre Julliard julliard(a)winehq.org

1 0