wine-devel May 2016

wine-devel@winehq.org

41 participants
185 discussions

Re: dbghelp: add EnumerateLoadedModulesEx/EnumerateLoadedModulesExW stubs
by Nikolay Sivov 12 May '16

12 May '16

On 12.05.2016 0:32, Austin English wrote: > For https://bugs.winehq.org/show_bug.cgi?id=40614 > > @ stdcall EnumerateLoadedModules(long ptr ptr) > @ stdcall EnumerateLoadedModules64(long ptr ptr) > -@ stub EnumerateLoadedModulesEx > -@ stub EnumerateLoadedModulesExW > +@ stdcall EnumerateLoadedModulesEx(ptr ptr ptr) > +@ stdcall EnumerateLoadedModulesExW(ptr ptr ptr) For historical reasons first argument is usually made 'long', not that it matters. > +BOOL WINAPI EnumerateLoadedModulesExW(HANDLE process, > + PENUMLOADED_MODULES_CALLBACK64 callback, > + void *context) This prototype is wrong. Are those calls any different from EnumerateLoadedModulesW64/EnumerateLoadedModules64? It looks like we could simply forward to existing calls. Also please update headers.

1 0

Re: [PATCH] Use todo_wine_if() in tests.
by Jacek Caban 12 May '16

12 May '16

Commit message should specify the module. Other than that: Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

1 0

Re: [PATCH 3/6] d3drm: Implement IDirect3DRM*_CreateTexture. (v4)
by Henri Verbeet 11 May '16

11 May '16

On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -1152,15 +1156,21 @@ static HRESULT WINAPI d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM > static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, > D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) > { > - struct d3drm_texture *object; > HRESULT hr; > > - FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); > + TRACE("iface %p, image %p, texture %p.\n", iface, image, texture); > > - if (FAILED(hr = d3drm_texture_create(&object))) > + if (!d3drm_validate_image(image)) > + return D3DRMERR_BADVALUE; Why do you need the d3drm_validate_image() call? Purely for the error code?

2 5

Re: [PATCH 2/6] d3drm: Implement IDirect3DRMTexture{2-3}_InitFromImage. (v4)
by Henri Verbeet 11 May '16

11 May '16

On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > @@ -46,10 +46,27 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex > > void d3drm_texture_destroy(struct d3drm_texture *texture) > { > + if (texture->image) > + IDirect3DRM_Release(texture->d3drm); > d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); It's somewhat hypothetical, but it seems safer to release the IDirect3DRM interface after the d3drm_object_cleanup() call, in case there are callbacks that (implicitly) depend on the Direct3DRM object still existing. (E.g., is it possible to call IDirect3DRMObject2::GetDirect3DRM() on textures?) > HeapFree(GetProcessHeap(), 0, texture); > } > > +BOOL d3drm_validate_image(D3DRMIMAGE *image) > +{ > + if (!image > + || !image->red_mask > + || !image->green_mask > + || !image->blue_mask > + || !image->buffer1 > + || !(image->rgb || (image->palette && image->palette_size))) > + { > + return FALSE; > + } > + > + return TRUE; > +} Like d3drm_texture_destroy(), you're not using this outside texture.c.

2 1

Re: [PATCH 1/6] d3drm: Introduce d3drm_texture_destroy helper (v2).
by Henri Verbeet 11 May '16

11 May '16

On 11 May 2016 at 16:43, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > +void d3drm_texture_destroy(struct d3drm_texture *texture) > +{ > + d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); > + HeapFree(GetProcessHeap(), 0, texture); > +} You're not using d3drm_texture_destroy() outside texture.c, so you don't need the declaration in d3drm_private.h, and this should just be static.

2 1

Re: [PATCH] wined3d: Add missing WINED3DUSAGE flags to debug_d3dusage
by Henri Verbeet 11 May '16

11 May '16

On 11 May 2016 at 08:15, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/wined3d/utils.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index e2e3ec9..69c5b3b 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -3572,9 +3572,23 @@ const char *debug_d3dusage(DWORD usage) > WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICTED_CONTENT); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_LEGACYBUMPMAP); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_FILTER); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBREAD); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_SRGBWRITE); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_VERTEXTEXTURE); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_QUERY_WRAPANDMIP); > #undef WINED3DUSAGE_TO_STR > if (usage) FIXME("Unrecognized usage flag(s) %#x\n", usage); > That's better, but now buf[] is too small to contain all the flags, and debug_d3dusagequery() is redundant.

1 0

Re: [PATCH] d3d11/test: Test for ID3D11InfoQueue interface
by Henri Verbeet 11 May '16

11 May '16

On 11 May 2016 at 08:15, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > @@ -6795,7 +6802,8 @@ static void test_getdc(void) > START_TEST(d3d11) > { > test_create_device(); > - test_device_interfaces(); > + test_device_interfaces(0); > + test_device_interfaces(D3D11_CREATE_DEVICE_DEBUG); I think it makes more sense to just handle this inside test_device_interfaces(). Note that d3d10 has an equivalent interface.

1 0

Re: [PATCH] Use todo_wine_if() in tests.
by Marvin 11 May '16

11 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=22950 Your paranoid android. === w8 (32 bit capture) === capture.c:181: Test failed: Position 1015 expected 0 capture.c:231: Test failed: Position 2167 expected 1463 capture.c:262: Test failed: Position 2167 expected 1463 capture.c:324: Test failed: Position 3255 gap 1344 capture.c:348: Test failed: Position 4343 expected 3703 capture.c:373: Test failed: Position 4791 expected 4151 === w864 (32 bit capture) === capture.c:181: Test failed: Position 1079 expected 0 capture.c:231: Test failed: Position 2167 expected 1527 capture.c:262: Test failed: Position 2167 expected 1527 capture.c:324: Test failed: Position 3127 gap 1152 capture.c:328: Test failed: GCP 13888 vs. BufferSize 21996 capture.c:348: Test failed: Position 4215 expected 3575 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 5303 expected 4023 capture.c:374: Test failed: flags 1 === w1064 (32 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 6391 expected 5111 capture.c:374: Test failed: flags 1 === w1064 (64 bit capture) === capture.c:181: Test failed: Position 1143 expected 0 capture.c:231: Test failed: Position 2167 expected 1591 capture.c:262: Test failed: Position 2167 expected 1591 capture.c:324: Test failed: Position 4215 gap 2176 capture.c:328: Test failed: GCP 11648 vs. BufferSize 21996 capture.c:348: Test failed: Position 5303 expected 4663 capture.c:349: Test failed: flags 1 capture.c:373: Test failed: Position 7287 expected 5111 capture.c:374: Test failed: flags 1

1 0

Re: fusion: Clear all memory for the pathname in test_assembly_name_props_line.
by André Hentschel 10 May '16

10 May '16

Am 08.05.2016 um 22:09 schrieb Gerald Pfeifer: > str is declared WCHAR str[MAX_PATH], so we need to account for > the size of WCHAR when clearing memory. > > Gerald > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/fusion/tests/asmname.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c > index e415c3a9..8962630 100644 > --- a/dlls/fusion/tests/asmname.c > +++ b/dlls/fusion/tests/asmname.c > @@ -358,7 +358,7 @@ static void test_assembly_name_props_line(IAssemblyName *name, > to_widechar(expect, vals[i].val); > > size = MAX_PATH; > - ZeroMemory(str, MAX_PATH); > + ZeroMemory(str, MAX_PATH*sizeof(WCHAR)); why not sizeof(str)?

1 0

Re: [v2] riched20: Properly clear all of a buffer of type WCHAR. WCHAR.
by Huw Davies 10 May '16

10 May '16

On 10 May 2016, at 12:53, Gerald Pfeifer <gerald(a)pfeifer.com> wrote: > > Per Huw's preference (when I offered an alternate approach), this now > properly clears this buffer (which is of type WCHAR, so MAX_BUF_LEN > fell short). > > Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> > --- > dlls/riched20/tests/editor.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c > index ae9c0a5..3678b95 100644 > --- a/dlls/riched20/tests/editor.c > +++ b/dlls/riched20/tests/editor.c > @@ -3822,7 +3822,7 @@ static void test_EM_SETTEXTEX(void) > getText.flags = GT_DEFAULT; > getText.lpDefaultChar = NULL; > getText.lpUsedDefChar = NULL; > - memset(buf, 0, MAX_BUF_LEN); > + memset(buf, 0, sizeof buf); > SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); > ok(lstrcmpW(buf, TestItem2) == 0, > "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n”); I’d prefer "sizeof(buf)", since that’s what’s used further down this function (and in most other places in Wine for that matter). Huw. > @@ -3837,7 +3837,7 @@ static void test_EM_SETTEXTEX(void) > getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ > getText.lpDefaultChar = NULL; > getText.lpUsedDefChar = NULL; > - memset(buf, 0, MAX_BUF_LEN); > + memset(buf, 0, sizeof buf); > SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); > ok(lstrcmpW(buf, TestItem1) == 0, > "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); > -- > 2.8.1

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel May 2016