- wine-devel - winehq.org

Re: typo fixes - rebased - fixed
by Marvin 20 Apr '14

20 Apr '14

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=6447 Your paranoid android. === w7u (32 bit msg) === msg.c:12058: Test failed: unexpected hwnd 00070140 msg.c:12080: Test failed: bad time 3118c/3119c

1 0

Re: typo fixes - rebased - fixed
by Marvin 20 Apr '14

20 Apr '14

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=6446 Your paranoid android. === w2008s64 (32 bit moniker) === moniker: unhandled exception c0000005 at 004256A9 === w7u (32 bit moniker) === moniker: unhandled exception c0000005 at 004256A9 === w864 (32 bit moniker) === moniker: unhandled exception c0000005 at 004256A9 === w2008s64 (64 bit moniker) === moniker: unhandled exception c0000005 at 000000000042024A === w864 (64 bit moniker) === moniker: unhandled exception c0000005 at 000000000042024A

1 0

Re: typo fixes - rebased - fixed
by Nikolay Sivov 20 Apr '14

20 Apr '14

> - * INT oDefautlValue[nrargs]; > + * INT oDefaultlValue[nrargs]; This is wrong.

1 0

Re: [PATCH 10/10] vbscript/tests: Added tests for convert functions
by Marvin 19 Apr '14

19 Apr '14

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=6431 Your paranoid android. === w7u (32 bit run) === run.c:973: Test failed: api.vbs: L"CStr(CDate(1.5)) = 1899/12/31 12:00:00" run.c:973: Test failed: api.vbs: L"CStr(CDate(-1.5)) = 1899/12/29 12:00:00"

1 0

Re: mshtml: Added IHTMLTable::bgColor property implementation.
by Nikolay Sivov 19 Apr '14

19 Apr '14

On 4/6/2014 18:48, Zhenbo Li wrote: > try 2: > Don't free a string too early. > > --- > dlls/mshtml/htmltable.c | 41 +++++++++++++++++++++++++++++++++++++---- > dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 72 insertions(+), 4 deletions(-) > Also please check for variant_to_nscolor() return value.

2 1

Wine test week 2 - nice apparent progress
by Jeremy White 18 Apr '14

18 Apr '14

My script results are here: http://www.winehq.org/~jwhite/ebd5f96aea22.html We had a lot of tests that had failed on Windows 7 ultimate that we now skip; that has reduced the number of apparent failures on the new testbot machines down under 20. We've also had some nice work from folks like Dmitry (thanks!). I'll keep annotating the failures until they all have notes. I do have one that could use a sucker^H^H^H^H^H^Hvolunteer: http://test.winehq.org/data/ebd5f96aea22f4093d4ceb109bdead2657666c57/xp_new… I had asked Misha Koshelev (the apparent last person to meaningfully change those tests) if he wanted to look into it, but he's in the middle of a medical internship working brutal hours, so he demurred. Cheers, Jeremy

6 7

Re: [PATCH 1/6] d3d9: Retrieve the volume description from the container.
by Henri Verbeet 18 Apr '14

18 Apr '14

On 17 April 2014 15:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/d3d9/texture.c | 20 +++++++++++++------- > 1 file changed, 13 insertions(+), 7 deletions(-) > I suppose this works, but I don't think it's really necessary. At some point wined3d_texture_get_sub_resource() will go away of course, but I don't think there's a reason we can't e.g. have a wined3d_resource_get_sub_resource_desc(), or alternatively just store the information on d3d9 volume creation.

2 1

Re: [wined3d] Add DF16 and DF24 formats
by Henri Verbeet 18 Apr '14

18 Apr '14

On 18 April 2014 16:46, Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > + {WINED3DFMT_DF16, 0, 0, 0, 0, 16, 24, 8, 0, 0, 0, 0}, > + {WINED3DFMT_DF24, 0, 0, 0, 0, 24, 24, 8, 0, 0, 0, 0}, This is pretty much just wrong. > + {WINED3DFMT_DF16, GL_DEPTH24_STENCIL8_EXT, GL_DEPTH24_STENCIL8_EXT, 0, > + GL_DEPTH_STENCIL_EXT, GL_UNSIGNED_INT_24_8_EXT, 0, > + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING > + | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, WINED3DFMT_FLAG_STENCIL is suspicious here, since afaik these are depth only formats. Note that you can't expose these formats without also implementing "Fetch-4", since that's implied by DF24. See also http://developer.amd.com/wordpress/media/2012/10/Advanced-DX9-Capabilities-…. Does this patch help any application?

2 1

AW: [PATCH 2/2] user32: add tests for valid cbSize in GetMonitorInfoA
by siro＠das-labor.org 18 Apr '14

18 Apr '14

should I iterate over all possible values other than sizeof(MONITORINFO) and sizeof(MONITORINFOEXA)‎ ? Kind Regards, Patrick Rudolph Originalnachricht Von: Alexandre Julliard Gesendet: Freitag, 18. April 2014 13:47 An: Patrick Rudolph Cc: wine-devel(a)winehq.org Betreff: Re: [PATCH 2/2] user32: add tests for valid cbSize in GetMonitorInfoA Patrick Rudolph <siro(a)das-labor.org> writes: > @@ -362,6 +363,21 @@ static void test_monitors(void) > monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); > } > > + /* sanity check */ > + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); > + mi.cbSize = sizeof(mi); > + ret = pGetMonitorInfoA( monitor, &mi ); > + ok( ret, "GetMonitorInfo failed\n" ); > + > + miex.cbSize = sizeof(miex); > + ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miex ); > + ok( ret, "GetMonitorInfo failed\n" ); > + > + /* specify invalid cbSize */ > + mi.cbSize = 0xdeadbeef; > + ret = pGetMonitorInfoA( monitor, &mi ); > + ok( !ret, "GetMonitorInfo succeded\n" ); That's not a very convincing test. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [2/5] user32: Add test calling EndMenu from WM_ENTERMENULOOP.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Vincent Povirk <madewokherd(a)gmail.com> writes: > @@ -14525,6 +14582,7 @@ START_TEST(msg) > test_layered_window(); > test_TrackPopupMenu(); > test_TrackPopupMenuEmpty(); > + test_TrackPopupMenuAbort(); There's no need to write a separate function for each test, you could do them all as part of the main popup menu test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] user32: add tests for valid cbSize in GetMonitorInfoA
by Alexandre Julliard 18 Apr '14

18 Apr '14

Patrick Rudolph <siro(a)das-labor.org> writes: > @@ -362,6 +363,21 @@ static void test_monitors(void) > monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONULL ); > } > > + /* sanity check */ > + monitor = pMonitorFromRect( &rc, MONITOR_DEFAULTTONEAREST ); > + mi.cbSize = sizeof(mi); > + ret = pGetMonitorInfoA( monitor, &mi ); > + ok( ret, "GetMonitorInfo failed\n" ); > + > + miex.cbSize = sizeof(miex); > + ret = pGetMonitorInfoA( monitor, (LPMONITORINFO)&miex ); > + ok( ret, "GetMonitorInfo failed\n" ); > + > + /* specify invalid cbSize */ > + mi.cbSize = 0xdeadbeef; > + ret = pGetMonitorInfoA( monitor, &mi ); > + ok( !ret, "GetMonitorInfo succeded\n" ); That's not a very convincing test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32: Use CREATE_NEW_CONSOLE when SEE_MASK_NOCONSOLE is omitted.
by Alistair Leslie-Hughes 18 Apr '14

18 Apr '14

Hi Vincent, On 17/04/2014 7:11 AM, Vincent Povirk wrote: > MSDN specifically mentions that this flag is the opposite of > CREATE_NEW_CONSOLE: > http://msdn.microsoft.com/en-us/library/windows/desktop/bb759784%28v=vs.85%… > > I also wrote a test program (built with -mconsole), which uses > ShellExecuteEx to run cmd.exe. When running it from a command line on > windows, it creates a new console window for cmd.exe only when > SEE_MASK_NOCONSOLE is not in fMask. (If I compile with -mwindows, it > seems to create a new console window regardless of the value of the > flag or how I start it, which looks like another wine bug to me.) > I submitted a patch to do this but was reject since it causes the test to behave exactly like window. :( Look for "Correct create flags when SEE_MASK_NO_CONSOLE isn't specified" in January 2014 mailing lists. Best Regards Alistair Leslie-Hughes

2 5

Re: ole32/tests: Fix crashes in PropVariantClear tests under win2000 and XP.
by Marvin 17 Apr '14

17 Apr '14

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=6384 Your paranoid android. === w2008s64 (64 bit propvariant) === propvariant: unhandled exception c0000005 at 000007FEFF6093CE

1 0

Re: [PATCH 6/6] d3d9: Decouple d3d9 volumes from wined3d volumes.
by Stefan Dösinger 17 Apr '14

17 Apr '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fyi, doing the same for surfaces will take a while because a number of surface-related functions have to be moved out of the way first. If having a difference between volumes and surfaces is an issue skip this patch for now. Am 2014-04-17 15:47, schrieb Stefan Dösinger: > Releasing the partially created texture in case of an out of memory > error is a problem, see volumetexture_init. > > My choice to handle this would be to move the memory allocation into the > init function (and rename it), but a few years ago Henri has changed it > into the opposite direction everywhere. I'm open to other suggestions. > (And no, I don't like the idea of calculating the mipmap levels before > calling wined3d_texture_create.) > --- > dlls/d3d9/d3d9_private.h | 10 +++-- > dlls/d3d9/device.c | 15 +------ > dlls/d3d9/texture.c | 108 ++++++++++++++++++++++++++++++++--------------- > dlls/d3d9/volume.c | 30 ++----------- > 4 files changed, 85 insertions(+), 78 deletions(-) > > diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h > index 389cc95..2f59a2f 100644 > --- a/dlls/d3d9/d3d9_private.h > +++ b/dlls/d3d9/d3d9_private.h > @@ -184,14 +184,13 @@ struct d3d9_volume > { > IDirect3DVolume9 IDirect3DVolume9_iface; > struct d3d9_resource resource; > - struct wined3d_volume *wined3d_volume; > IUnknown *container; > IUnknown *forwardReference; > UINT level; > }; > > -void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, > - UINT level, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; > +void d3d9_volume_init(struct d3d9_volume *volume, UINT level) DECLSPEC_HIDDEN; > +void d3d9_volume_destroy(void *sub_resource) DECLSPEC_HIDDEN; > > struct d3d9_swapchain > { > @@ -251,6 +250,11 @@ struct d3d9_texture > struct d3d9_resource resource; > struct wined3d_texture *wined3d_texture; > IDirect3DDevice9Ex *parent_device; > + > + void **sub_resource; > + void (*sub_resource_destroy)(void *sub_resource); > + UINT level_count, sub_resource_count; > + BOOL error_cleanup; > }; > > HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *device, > diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c > index 84184ec..11e13c5 100644 > --- a/dlls/d3d9/device.c > +++ b/dlls/d3d9/device.c > @@ -3448,22 +3448,11 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * > void *container_parent, struct wined3d_volume *volume, UINT level, void **parent, > const struct wined3d_parent_ops **parent_ops) > { > - struct d3d9_volume *d3d_volume; > - > TRACE("device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.\n", > device_parent, container_parent, volume, parent, parent_ops); > > - if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume)))) > - return E_OUTOFMEMORY; > - > - volume_init(d3d_volume, volume, level, parent_ops); > - *parent = d3d_volume; > - TRACE("Created volume %p.\n", d3d_volume); > - > - d3d_volume->container = container_parent; > - > - IDirect3DVolume9_Release(&d3d_volume->IDirect3DVolume9_iface); > - d3d_volume->forwardReference = container_parent; > + *parent_ops = &d3d9_null_wined3d_parent_ops; > + *parent = container_parent; > > return D3D_OK; > } > diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c > index 7e8dd68..03c75fa 100644 > --- a/dlls/d3d9/texture.c > +++ b/dlls/d3d9/texture.c > @@ -1018,15 +1018,9 @@ static DWORD WINAPI d3d9_texture_3d_GetLOD(IDirect3DVolumeTexture9 *iface) > static DWORD WINAPI d3d9_texture_3d_GetLevelCount(IDirect3DVolumeTexture9 *iface) > { > struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); > - DWORD ret; > > TRACE("iface %p.\n", iface); > - > - wined3d_mutex_lock(); > - ret = wined3d_texture_get_level_count(texture->wined3d_texture); > - wined3d_mutex_unlock(); > - > - return ret; > + return texture->level_count; > } > > static HRESULT WINAPI d3d9_texture_3d_SetAutoGenFilterType(IDirect3DVolumeTexture9 *iface, > @@ -1073,55 +1067,48 @@ static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 > static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc) > { > struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); > - HRESULT hr = D3D_OK; > - DWORD level_count; > + struct wined3d_resource *resource = wined3d_texture_get_resource(texture->wined3d_texture); > + struct wined3d_resource_desc wined3d_desc; > > TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); > > - wined3d_mutex_lock(); > - level_count = wined3d_texture_get_level_count(texture->wined3d_texture); > - if (level >= level_count) > + if (level >= texture->level_count) > { > WARN("Invalid mipmap level specified, returning D3DERR_INVALIDCALL.\n"); > - hr = D3DERR_INVALIDCALL; > + return D3DERR_INVALIDCALL; > } > - else > - { > - struct wined3d_resource *resource = wined3d_texture_get_resource(texture->wined3d_texture); > - struct wined3d_resource_desc wined3d_desc; > > - wined3d_resource_get_desc(resource, &wined3d_desc); > - desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); > - desc->Type = D3DRTYPE_VOLUME; > - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; > - desc->Pool = wined3d_desc.pool; > - desc->Width = max(wined3d_desc.width >> level, 1); > - desc->Height = max(wined3d_desc.height >> level, 1); > - desc->Depth = max(wined3d_desc.depth >> level, 1); > - hr = D3D_OK; > - } > + wined3d_mutex_lock(); > + wined3d_resource_get_desc(resource, &wined3d_desc); > + desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); > + desc->Type = D3DRTYPE_VOLUME; > + desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; > + desc->Pool = wined3d_desc.pool; > + desc->Width = max(wined3d_desc.width >> level, 1); > + desc->Height = max(wined3d_desc.height >> level, 1); > + desc->Depth = max(wined3d_desc.depth >> level, 1); > wined3d_mutex_unlock(); > > - return hr; > + return D3D_OK; > } > > static HRESULT WINAPI d3d9_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture9 *iface, > UINT level, IDirect3DVolume9 **volume) > { > struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); > - struct wined3d_resource *sub_resource; > struct d3d9_volume *volume_impl; > > TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); > > wined3d_mutex_lock(); > - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) > + if (level >= texture->level_count) > { > + WARN("Invalid mipmap level specified, returning D3DERR_INVALIDCALL.\n"); > wined3d_mutex_unlock(); > return D3DERR_INVALIDCALL; > } > > - volume_impl = wined3d_resource_get_parent(sub_resource); > + volume_impl = texture->sub_resource[level]; > *volume = &volume_impl->IDirect3DVolume9_iface; > IDirect3DVolume9_AddRef(*volume); > wined3d_mutex_unlock(); > @@ -1234,9 +1221,18 @@ struct d3d9_texture *unsafe_impl_from_IDirect3DBaseTexture9(IDirect3DBaseTexture > > static void STDMETHODCALLTYPE d3d9_texture_wined3d_object_destroyed(void *parent) > { > + UINT i; > struct d3d9_texture *texture = parent; > d3d9_resource_cleanup(&texture->resource); > - HeapFree(GetProcessHeap(), 0, texture); > + > + if (texture->sub_resource) > + { > + for (i = 0; i < texture->sub_resource_count && texture->sub_resource[i]; i++) > + texture->sub_resource_destroy(texture->sub_resource[i]); > + HeapFree(GetProcessHeap(), 0, texture->sub_resource); > + } > + if (!texture->error_cleanup) > + HeapFree(GetProcessHeap(), 0, texture); > } > > static const struct wined3d_parent_ops d3d9_texture_wined3d_parent_ops = > @@ -1331,6 +1327,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev > { > struct wined3d_resource_desc desc; > HRESULT hr; > + DWORD i; > > texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl; > d3d9_resource_init(&texture->resource); > @@ -1350,15 +1347,56 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev > wined3d_mutex_lock(); > hr = wined3d_texture_create(device->wined3d_device, &desc, levels, 0, > texture, &d3d9_texture_wined3d_parent_ops, &texture->wined3d_texture); > - wined3d_mutex_unlock(); > if (FAILED(hr)) > { > WARN("Failed to create wined3d volume texture, hr %#x.\n", hr); > - return hr; > + goto error; > + } > + > + texture->level_count = wined3d_texture_get_level_count(texture->wined3d_texture); > + texture->sub_resource_count = texture->level_count; > + > + texture->sub_resource_destroy = d3d9_volume_destroy; > + texture->sub_resource = HeapAlloc(GetProcessHeap(), 0, > + sizeof(*texture->sub_resource) * texture->sub_resource_count); > + if (!texture->sub_resource) > + { > + hr = E_OUTOFMEMORY; > + goto error; > + } > + > + for (i = 0; i < texture->level_count; i++) > + { > + struct d3d9_volume *d3d9_volume; > + > + if (!(d3d9_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d9_volume)))) > + { > + hr = E_OUTOFMEMORY; > + goto error; > + } > + d3d9_volume_init(d3d9_volume, i); > + TRACE("Created volume %p.\n", d3d9_volume); > + > + d3d9_volume->container = (IUnknown *)&texture->IDirect3DBaseTexture9_iface; > + IDirect3DVolume9_Release(&d3d9_volume->IDirect3DVolume9_iface); > + d3d9_volume->forwardReference = d3d9_volume->container; > + texture->sub_resource[i] = d3d9_volume; > } > > texture->parent_device = &device->IDirect3DDevice9Ex_iface; > IDirect3DDevice9Ex_AddRef(texture->parent_device); > - > + wined3d_mutex_unlock(); > return D3D_OK; > + > +error: > + /* Once the wined3d texture is created there is no way to destroy it without running > + * d3d9_texture_wined3d_object_destroyed. The caller expects volumetexture_init not > + * to free texture in case of an error. */ > + if (texture->wined3d_texture) > + { > + texture->error_cleanup = TRUE; > + wined3d_texture_decref(texture->wined3d_texture); > + } > + wined3d_mutex_unlock(); > + return hr; > } > diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c > index 07f15ca..916a949 100644 > --- a/dlls/d3d9/volume.c > +++ b/dlls/d3d9/volume.c > @@ -63,13 +63,6 @@ static ULONG WINAPI d3d9_volume_AddRef(IDirect3DVolume9 *iface) > refcount = InterlockedIncrement(&volume->resource.refcount); > TRACE("%p increasing refcount to %u.\n", iface, refcount); > > - if (refcount == 1) > - { > - wined3d_mutex_lock(); > - wined3d_volume_incref(volume->wined3d_volume); > - wined3d_mutex_unlock(); > - } > - > return refcount; > } > > @@ -89,13 +82,6 @@ static ULONG WINAPI d3d9_volume_Release(IDirect3DVolume9 *iface) > refcount = InterlockedDecrement(&volume->resource.refcount); > TRACE("%p decreasing refcount to %u.\n", iface, refcount); > > - if (!refcount) > - { > - wined3d_mutex_lock(); > - wined3d_volume_decref(volume->wined3d_volume); > - wined3d_mutex_unlock(); > - } > - > return refcount; > } > > @@ -213,26 +199,16 @@ static const struct IDirect3DVolume9Vtbl d3d9_volume_vtbl = > d3d9_volume_UnlockBox, > }; > > -static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent) > +void d3d9_volume_destroy(void *sub_resource) > { > - struct d3d9_volume *volume = parent; > + struct d3d9_volume *volume = sub_resource; > d3d9_resource_cleanup(&volume->resource); > HeapFree(GetProcessHeap(), 0, volume); > } > > -static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops = > -{ > - volume_wined3d_object_destroyed, > -}; > - > -void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, > - UINT level, const struct wined3d_parent_ops **parent_ops) > +void d3d9_volume_init(struct d3d9_volume *volume, UINT level) > { > volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl; > d3d9_resource_init(&volume->resource); > - wined3d_volume_incref(wined3d_volume); > - volume->wined3d_volume = wined3d_volume; > volume->level = level; > - > - *parent_ops = &d3d9_volume_wined3d_parent_ops; > } > -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTT92RAAoJEN0/YqbEcdMwAe0P/2Nt/ZATqANNkVaY6o6BdknG qfw6wSQemhF3OvKX84aKSqdEdjOkHNqtQb9wHE1jEoGufkSO9VLINIOJRqa8M962 8cwg2fceNVlU148pwvdCYbkbvJofN0zqDT91IRTBfkKsoAo4Fcwo9fSzKp28gQQv KLBvcJksQ0DZNZAxHrjbGpu16xVinfTypVIa8KLrar4Ns+XPoYDikghKh7s+kSb6 Mvo5ZwmNTLYi6dLFblzjRV8ftLriN8gI6r4BxYoAotVTuN70FRG4ce+qs97Nwwe9 nAEfcSp752N5DQ2qLWiBZdaa/ZjX3y389hkaHB2uYz8RZH91hEecMgIV+6SzF4el SU5apNTF214x2SBKvGwL0jLRQ0J1QoEVbw2siwwyIS02id3yp19yekiEdOsfmq+4 CMaYdZSHHOBntcFNwz/TMli1y46ugTHWVPimVz1WGqNfWdxN1xyJX5YdIyRpIPC8 lzuzsobX9DyULFHAtrDz3RrBCMsztTFbag7bIAZ3ZbLLxEEMm0926eEQVBsGY1fZ uS5V6AKA8JLQ+OZfNCoZeiMASR70PfICoBpahld1rNo5NfjsB56P+h+kWWkP8l6q OOeXJgYYn3n40LndHl0EPk6EjXUqyUkZ9s1sPxcdgL6GD1iE9oRPHBmm2OC19+tF rswC/IHRuFD+4KHlR5OR =dY9X -----END PGP SIGNATURE-----

1 0

Re: riched20: Avoid releasing a non-existent interface.
by Nikolay Sivov 17 Apr '14

17 Apr '14

> - This->txtSel->reOle = NULL; > - ITextSelection_Release(&This->txtSel->ITextSelection_iface); > - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); > + if(This->txtSel) > + { > + This->txtSel->reOle = NULL; > + ITextSelection_Release(&This->txtSel->ITextSelection_iface); > + } > + if(This->clientSite) > + { > + This->clientSite->reOle = NULL; > + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); > + } > heap_fr This can't happen. > IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); > ULONG ref = InterlockedDecrement(&This->ref); > if (ref == 0) > + { > + if(This->reOle) > + This->reOle->clientSite = NULL; > heap_free(This); > + } > return ref; Why do you need this?

2 5

Invalid address for set breakpoint in winedbg
by Frédéric Delanoy 17 Apr '14

17 Apr '14

Hi. I'm setting a breakpoint in a wine test.so with winedbg, "br function_name" finds it, but when I hit (c)ontinue, I get an "Invalid address (0x... function_name) for breakpoint 1, disabling it". Any reason for this? FWIW, function_name is a non-static function I added in the testfile.c. Frédéric NB: winedbg in gdb mode doesn't give an error message, but otherwise exhibits the same behaviour

1 0

Re: [PATCH] atl: Added a typelib
by Jacek Caban 17 Apr '14

17 Apr '14

Hi Nikolay, On 04/17/14 11:22, Nikolay Sivov wrote: > +[ > + local, > + object, > + oleautomation, > + uuid(425b5af0-65f1-11d1-9611-0000f81e0d0d), > +] > +interface IDocHostUIHandlerDispatch : IDispatch Those interfaces should go to atliface.idl. Cheers, Jacek

1 0

Re: [4/5] user32: Our popup test window loses capture to itself.
by Marvin 16 Apr '14

16 Apr '14

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=6374 Your paranoid android. === w2000pro (32 bit win) === Failure running script in VM: network read timed out (wait2:ListSize:0/4) === w8 (32 bit win) === win.c:1159: Test failed: first call to SetShellWindow(hwnd1) win.c:1161: Test failed: wrong shell window: 000300F4 win.c:1198: Test failed: SetShellWindow(hwnd4) win.c:1200: Test failed: wrong shell window: 000300F4 - expected hwnd4 win.c:1203: Test failed: wrong next window for hwnd4: 00020080 - expected 0 win.c:1214: Test failed: wrong shell window: 000300F4 - expected hwnd4 win.c:1224: Test failed: wrong next window for hwnd4 after SetWindowPos(): 00020080 - expected 0

1 0

Re: [3/5] user32: Add a message test for popup menus on windows that have capture.
by Marvin 16 Apr '14

16 Apr '14

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=6373 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: [2/5] user32: Add test calling EndMenu from WM_ENTERMENULOOP.
by Marvin 16 Apr '14

16 Apr '14

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=6372 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: [PATCH 3/3] msvcr90: Share the source code with msvcrt (try2)
by Alexandre Julliard 16 Apr '14

16 Apr '14

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcr90/Makefile.in | 32 +- > dlls/msvcr90/msvcr90.c | 199 ---- > dlls/msvcr90/msvcr90.spec | 2418 > ++++++++++++++++++++++----------------------- > dlls/msvcrt/Makefile.in | 2 +- > dlls/msvcrt/main.c | 4 + > dlls/msvcrt/msvcrt.h | 1 + > 6 files changed, 1245 insertions(+), 1411 deletions(-) > delete mode 100644 dlls/msvcr90/msvcr90.c It's still broken: In file included from ../../../wine/dlls/msvcr90/../msvcrt/cpp.c:34:0: ../../../wine/dlls/msvcr90/../msvcrt/cxx.h:23:0: warning: "__thiscall" redefined [enabled by default] <built-in>:0:0: note: this is the location of the previous definition ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1026:32: error: conflicting types for ‘_splitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:48:70: note: previous declaration of ‘_splitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1126:32: error: conflicting types for ‘_wsplitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:57:70: note: previous declaration of ‘_wsplitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1423:32: error: conflicting types for ‘_makepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:44:70: note: previous declaration of ‘_makepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1527:32: error: conflicting types for ‘_wmakepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:53:70: note: previous declaration of ‘_wmakepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1701:32: error: conflicting types for ‘_searchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:46:70: note: previous declaration of ‘_searchenv_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1832:32: error: conflicting types for ‘_wsearchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:55:70: note: previous declaration of ‘_wsearchenv_s’ was here make[1]: *** [dir.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: imagehlp: Implement (parts of) BindImageEx (try 3)
by Bernhard Reiter 16 Apr '14

16 Apr '14

*ping* -------- Ursprüngliche Nachricht -------- Von: Bernhard Reiter <ockham(a)raz.or.at> Datum: An: wine-patches(a)winehq.org Betreff: imagehlp: Implement (parts of) BindImageEx (try 3) One more fix: Pass DllPath argument on to MapAndLoad.

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6332 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6332 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: user32: Fix DrawMenuBar test failures (try2)
by Marvin 16 Apr '14

16 Apr '14

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=6341 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [3/3] ole32: PropVariantClear should always reset contents of the passed in PROPVARIANT.
by Marvin 16 Apr '14

16 Apr '14

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=6360 Your paranoid android. === w2000pro (32 bit propvariant) === propvariant: unhandled exception c0000005 at 779DB8A8 === w8 (32 bit propvariant) === propvariant: unhandled exception c0000005 at 7527DF57

1 0

Re: [2/3] ole32/tests: Add more tests for PropVariantClear.
by Marvin 16 Apr '14

16 Apr '14

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=6359 Your paranoid android. === w2000pro (32 bit propvariant) === propvariant: unhandled exception c0000005 at 779DB8A8 === w8 (32 bit propvariant) === propvariant: unhandled exception c0000005 at 7527DF57

1 0

Re: kernel32: Add a workaround for broken apps that pass negative values to ReadConsole. Take 2.
by Marvin 16 Apr '14

16 Apr '14

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=6357 Your paranoid android. === w8 (32 bit console) === console.c:2573: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2580: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:2587: Test failed: expected ERROR_NOT_ENOUGH_MEMORY, got 998 console.c:1445: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1445: Test failed: [18] Expected output count to be 3735928559, got 2359244 console.c:1689: Test failed: [13] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [15] Expected output count to be 0, got 2359244 console.c:1689: Test failed: [18] Expected output count to be 3735928559, got 2359244

1 0

Re: user32: Fix DrawMenuBar test failures (try2)
by Marvin 16 Apr '14

16 Apr '14

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=6341 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: [PATCH 2/2] msvcr90: Share the source code with msvcrt
by Alexandre Julliard 16 Apr '14

16 Apr '14

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcr90/Makefile.in | 32 +- > dlls/msvcr90/msvcr90.c | 199 ---- > dlls/msvcr90/msvcr90.spec | 2418 > ++++++++++++++++++++++----------------------- > dlls/msvcrt/Makefile.in | 2 +- > dlls/msvcrt/main.c | 4 + > dlls/msvcrt/msvcrt.h | 1 + > 6 files changed, 1245 insertions(+), 1411 deletions(-) > delete mode 100644 dlls/msvcr90/msvcr90.c It doesn't build on Mingw: In file included from ../../../wine/dlls/msvcr90/../msvcrt/cpp.c:34:0: ../../../wine/dlls/msvcr90/../msvcrt/cxx.h:23:0: warning: "__thiscall" redefined [enabled by default] <built-in>:0:0: note: this is the location of the previous definition ../../../wine/dlls/msvcr90/../msvcrt/data.c:144:33: warning: ‘__p___argc’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:155:35: warning: ‘__p__pgmptr’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:160:36: warning: ‘__p__wpgmptr’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:191:32: warning: ‘_set_fmode’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:204:32: warning: ‘_get_fmode’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:246:36: warning: ‘__p___argv’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/data.c:251:46: warning: ‘__p___wargv’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] In file included from ../../../wine/dlls/msvcr90/../msvcrt/exit.c:21:0: ../../../wine/dlls/msvcr90/../msvcrt/msvcrt.h:993:41: warning: ‘_get_output_format’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1026:32: error: conflicting types for ‘_splitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:48:70: note: previous declaration of ‘_splitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1114:33: warning: ‘_splitpath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1126:32: error: conflicting types for ‘_wsplitpath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:57:70: note: previous declaration of ‘_wsplitpath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1208:33: warning: ‘_wsplitpath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1220:45: error: conflicting types for ‘_wfullpath’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/stdlib.h:572:71: note: previous declaration of ‘_wfullpath’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1274:35: warning: ‘_fullpath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1329:33: warning: ‘_makepath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1376:33: warning: ‘_wmakepath’ redeclared without dllimport attribute: previous dllimport ignored [-Wattributes] ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1423:32: error: conflicting types for ‘_makepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:44:70: note: previous declaration of ‘_makepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1527:32: error: conflicting types for ‘_wmakepath_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:53:70: note: previous declaration of ‘_wmakepath_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1701:32: error: conflicting types for ‘_searchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:46:70: note: previous declaration of ‘_searchenv_s’ was here ../../../wine/dlls/msvcr90/../msvcrt/dir.c:1832:32: error: conflicting types for ‘_wsearchenv_s’ /usr/lib/gcc/i686-w64-mingw32/4.6/../../../../i686-w64-mingw32/include/sec_api/stdlib_s.h:55:70: note: previous declaration of ‘_wsearchenv_s’ was here make[1]: *** [dir.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6332 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: user32: Fix DrawMenuBar test failures
by Marvin 16 Apr '14

16 Apr '14

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=6320 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: typo fixes - rebased
by Marvin 16 Apr '14

16 Apr '14

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=6325 Your paranoid android. === w2000pro (32 bit shlfileop) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: user32: Fix DrawMenuBar test failures
by Marvin 16 Apr '14

16 Apr '14

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=6320 Your paranoid android. === w2000pro (32 bit msg) === Failure running script in VM: network read timed out (wait2:ListSize:0/4)

1 0

Re: [2/2] kernel32: Add a workaround for broken apps that pass negative values to ReadConsole.
by Alexandre Julliard 15 Apr '14

15 Apr '14

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > --- > dlls/kernel32/console.c | 7 +++++++ > dlls/kernel32/tests/console.c | 6 ------ > 2 files changed, 7 insertions(+), 6 deletions(-) Still no good I'm afraid: ../../../../wine/tools/runtest -q -P wine -T ../../.. -M kernel32.dll -p kernel32_test.exe.so console && touch console.ok console.c:2581: Test failed: expected 0xdeadbeef, 0 make: *** [console.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Application for GSoC 2014 - riched20: implement ITextDocument::Range and ITextRange
by Jactry Zeng 15 Apr '14

15 Apr '14

Hello folks, I am Jactry Zeng, a junior who majoring in Electronic Science from China. And also a very fresh developer of Wine. My nickname in #winehackers is jactry. :) I would like to apply for this year's GSoC to work for Wine. I have entered Wine's GSoC last year. What I have work for is ITextDocument, I implemented some functions of it. I got some experience of Wine development and fixed some other bugs[0] of richedit during that time. I continued the work of ITextDocument after GSoC, I know there is still a lot of work worth to do. Such as ITextDocument::Range[1], which is used to get an ITextRange object of the content. And functions of ITextRange[2] are used to operate this range of text. Now in Wine, ITextRange was implemented mix with ITextSelection[3][4]. And ITextDocument::GetSelection[5] which is used to get an ITextSelection object is similar to ITextRange. In an easy way, we can implement ITextDocument::Range using some cast (I have a dirty hack in attachment). But I don't think it is a permanent solution. There are four parts in my plan: --- Part 0: Do some COM cleanup. --- Because ITextRange is implemented mix with ITextSelection now, so we should do some COM cleanup to create an ITextRange interface independently. And create a ITextSelection interface inherits from ITextRange. This is just the preparatory work for implementing ITextRange and I will begin this part before GSoC. ( So it is signed as part zore :b ) --- Part 1: Implement ITextDocument::Range. --- I will write more tests for ITextDocument::Range and ITextDocument::GetSelection first. Than try to implement ITextDocumen::Range. When this part is finished, bug 12458[6] and bug 18303[7] will benefit from it. --- Part 2: Implement functions of ITextRange --- In this part, I will try my best to implement some functions of ITextRange. I will write some tests for them first and than implement them. I think this is the hard part. And these functions will be implemented preferentially: GetText, GetDuplicate, GetStar, GetEnd, Copy, SetText. Because GetDuplicate and GetEnd were needed by bug 18303, and these functions seem was depend on the others. After these functions were implemented, I think bug 18303 will be fixed! ( Oh, this one of my pursues! ;) ) --- Part 3: Imporve all the code for being merged by upstream. --- This is the last part, I will improve all the patches for being merged by upstream, including what I did last year. After this part is finished, Wine will really has an initial implementation of ITextDocument and ITextRange. Maybe it will spend a lot of time, and I will continue this work after GSoC if I can't finish all of this part during GSoC. I think after all these are finished not only bug 18303 and bug 12458 will benefit from it, but also many other softwares. Because TOM interfaces are so important and be used frequently in real world applications. I appreciate for any comment. Thank you. :) attachments: dirty hack of ITextDocument::Range: dirty_hack.txt patch 0001: tests for ITextDocument_Range [0] http://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=author&am…<http://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=author&s=jactry> [1] http://msdn.microsoft.com/en-us/library/windows/desktop/bb774097(v=vs.85).a… [2] http://msdn.microsoft.com/en-us/library/windows/desktop/bb774058(v=vs.85).a… [3] http://msdn.microsoft.com/en-us/library/windows/desktop/bb774060(v=vs.85).a… [4] http://source.winehq.org/git/wine.git/blob/HEAD:/dlls/riched20/richole.c#l7… [5] http://msdn.microsoft.com/en-us/library/windows/desktop/bb774013(v=vs.85).a… [6] http://bugs.winehq.org/show_bug.cgi?id=12458 [7] http://bugs.winehq.org/show_bug.cgi?id=18303 -- Regards, Jactry Zeng

1 1

Re: user32: Fix DrawMenuBar test failures
by Alexandre Julliard 15 Apr '14

15 Apr '14

Piotr Caban <piotr(a)codeweavers.com> writes: > @@ -4819,6 +4819,8 @@ static void test_messages(void) > after_end_dialog = FALSE; > test_def_id = FALSE; > > + ok(SetCursorPos(109, 109), "SetCursorPos failed\n"); > + Please try to restore the cursor position after the test. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] d3d9/tests: Add a test for timestamp queries. (try 2)
by Henri Verbeet 15 Apr '14

15 Apr '14

On 14 April 2014 22:51, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); > + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); > + data_size = IDirect3DQuery9_GetDataSize(disjoint_query); ... > + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); > + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); > + data_size = IDirect3DQuery9_GetDataSize(query); I don't think this really works. Either creating these queries can legitimately fail and you need to handle those failures, or TIMESTAMPDISJOINT and TIMESTAMP are always supported if TIMESTAMPFREQ is, and D3DERR_NOTAVAILABLE is not a legitimate return value.

1 0

Re: [PATCH 3/5] wined3d: Add support for timestamp queries. (try 2)
by Henri Verbeet 15 Apr '14

15 Apr '14

On 14 April 2014 22:52, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > + D3DQUERYTYPE type; ... > + type = wined3d_query_get_type(query->wined3d_query); > + if (type == D3DQUERYTYPE_TIMESTAMPDISJOINT) > + ret = sizeof(BOOL); > + else > + ret = wined3d_query_get_data_size(query->wined3d_query); Strictly speaking wined3d_query_get_type() returns an enum wined3d_query_type. > + if (type == D3DQUERYTYPE_TIMESTAMPDISJOINT && data && size == sizeof(BOOL)) > + { > + struct wined3d_query_data_timestamp_disjoint data_disjoint; > + > + hr = wined3d_query_get_data(query->wined3d_query, &data_disjoint, sizeof(data_disjoint), flags); > + *(BOOL *)data = data_disjoint.disjoint; > + } > + else > + { > + hr = wined3d_query_get_data(query->wined3d_query, data, size, flags); > + } Does this do the right thing if an application were to pass sizeof(data_disjoint) as size? > + if (gl_info->supported[ARB_TIMER_QUERY]) > + { > + GL_EXTCALL(glGenQueriesARB(1, &query->id)); > + checkGLcall("glGenQueriesARB"); > + > + TRACE("Allocated timestamp query %u in context %p.\n", query->id, context); > + } > + else > + { > + WARN("Timestamp queries not supported, not allocating query id.\n"); > + query->id = 0; > + } This should never happen, so this should either be an ERR(), or just be removed. Though I'll grant that e.g. the occlusion query code has some room for improvement as well in that regard. > @@ -969,6 +1024,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) > GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); > } > > + if (gl_info->supported[ARB_TIMER_QUERY]) > + GL_EXTCALL(glDeleteQueriesARB(context->free_timestamp_query_count, context->free_timestamp_queries)); > + What about queries that are still on the context->timestamp_queries list? > +static HRESULT wined3d_timestamp_query_ops_get_data(struct wined3d_query *query, ... > + if (!gl_info->supported[ARB_TIMER_QUERY]) > + { > + WARN("%p timestamp queries not supported. Returning 0.\n", query); > + if (u64data) > + *u64data = 0; > + return S_OK; > + } ... > +static HRESULT wined3d_timestamp_query_ops_issue(struct wined3d_query *query, DWORD flags) ... > + if (gl_info->supported[ARB_TIMER_QUERY]) > + { ... > + } > + else > + { > + FIXME("%p timestamp queries not supported.\n", query); > + } Similar to above, the query should never have been created in these cases.

1 0

Re: typo fixes - rebased
by Nikolay Sivov 14 Apr '14

14 Apr '14

> diff --git a/ANNOUNCE b/ANNOUNCE It's generated, I don't think it makes sense to fix it. > ref = IHTMLLocation_Release(location); > - ok(!ref, "location chould be destroyed here\n"); > + ok(!ref, "location could be destroyed here\n"); Not exactly what it's supposed to mean. > -# @ stub RtlGetLengthWithoutTrailingPathSeperators > +# @ stub RtlGetLengthWithoutTrailingPathSeparators This is wrong. > -static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected, HRESULT expres ) > +static void test_Mod( int line, VARIANT *left, VARIANT *right, VARIANT *expected, HRESULT express ) Wrong too. > -#define NETWORKPLACESSHELLVIEWCOLUMNS sizeof(networkplaces_header)/sizeof(shvheader) > +#define NETWORKPLACCESSHELLVIEWCOLUMNS sizeof(networkplaces_header)/sizeof(shvheader) Network placcess hell view columns.

1 0

Re: wined3d: Add NVIDIA Geforce GTX 750 to device list. (try 2)
by Bruno Jesus 14 Apr '14

14 Apr '14

While you are at it, please if possible take a look at bugs: http://bugs.winehq.org/show_bug.cgi?id=35847 http://bugs.winehq.org/show_bug.cgi?id=32694 Best regards, Bruno

1 0

Re: [2/2] kernel32: Handle memory allocation failure in ReadConsoleA.
by Alexandre Julliard 14 Apr '14

14 Apr '14

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > @@ -2566,8 +2566,6 @@ static void test_ReadConsole(void) > ok(ret == INVALID_FILE_SIZE, "expected INVALID_FILE_SIZE, got %#x\n", ret); > ok(GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); > > -if (0) /* FIXME: uncomment once Wine doesn't hang forever */ > -{ It still hangs here on 64-bit. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] d3dx9: Copy the entire vector at once if there is no need of type conversions.
by Henri Verbeet 14 Apr '14

14 Apr '14

On 14 April 2014 19:32, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > @@ -740,6 +740,12 @@ static void set_vector(struct d3dx_parameter *param, const D3DXVECTOR4 *vector) > { > UINT i; > > + if (param->type == D3DXPT_FLOAT) > + { > + memcpy(param->data, vector, param->columns * sizeof(float)); > + return; > + } > + When called from d3dx9_base_effect_set_vector_array(), this is not quite optimal either.

1 0

Re: [PATCH 5/5] ddraw/tests: Try to make test_coop_level_mode_set() more reliable.
by Marvin 14 Apr '14

14 Apr '14

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=6316 Your paranoid android. === w2000pro (32 bit ddraw2) === The test timed out === w2000pro (32 bit ddraw1) === The test timed out === w2000pro (32 bit ddraw7) === The test timed out === w2000pro (32 bit ddraw4) === The test timed out

1 0

Re: [advapi32] add stub for GetTraceLoggerHandle (try 2)
by Nikolay Sivov 14 Apr '14

14 Apr '14

On 4/14/2014 12:11, Vijay Kiran Kamuju wrote: > +TRACEHANDLE WINAPI GetTraceLoggerHandle( PVOID lpBuffer ) > +{ > + FIXME("(%p) stub\n", lpBuffer); > + return ERROR_INVALID_PARAMETER; > +} It's still not fixed.

1 0

Re: [advapi32] add stub for GetTraceLoggerHandle (try 2)
by Dmitry Timoshkov 14 Apr '14

14 Apr '14

Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > +TRACEHANDLE WINAPI GetTraceLoggerHandle( PVOID lpBuffer ) > +{ > + FIXME("(%p) stub\n", lpBuffer); > + return ERROR_INVALID_PARAMETER; > +} What this API is supposed to return? -- Dmitry.

1 0

Re: typo fixes
by Nikolay Sivov 14 Apr '14

14 Apr '14

> +++ b/documentation/ChangeLog.ALPHA This file doesn't exist any more, so you need to rebase.

1 0

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