wine-commits November 2010

wine-commits@winehq.org

2 participants
866 discussions

Aric Stewart : winegstreamer: 4 buffers is insufficient for some mpeg streams.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 9dc2c5cf0b5d04eb7f5a6a5990aee87bc5c5e8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dc2c5cf0b5d04eb7f5a6a599… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 9 09:44:41 2010 -0600 winegstreamer: 4 buffers is insufficient for some mpeg streams. --- dlls/winegstreamer/gstdemux.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6c37a27..d26f853 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1504,7 +1504,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, if (!This->pin.pConnectedTo) { ALLOCATOR_PROPERTIES props; - props.cBuffers = 4; + props.cBuffers = 8; props.cbBuffer = 16384; props.cbAlign = 1; props.cbPrefix = 0;

1 0

Matteo Bruni : d3dx9: Implement D3DXCreateVolumeTexture.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: b4a90b0fe860785b98089c9d7ce20e3bff143379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a90b0fe860785b98089c9d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 8 23:00:45 2010 +0100 d3dx9: Implement D3DXCreateVolumeTexture. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index c20e2f9..efe28c5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -106,7 +106,7 @@ @ stub D3DXCreateTextureGutterHelper @ stub D3DXCreateTextureShader @ stub D3DXCreateTorus -@ stub D3DXCreateVolumeTexture +@ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) @ stub D3DXCreateVolumeTextureFromFileA @ stub D3DXCreateVolumeTextureFromFileExA @ stub D3DXCreateVolumeTextureFromFileExW diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index b191a34..04422e5 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -905,3 +905,34 @@ HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device, return IDirect3DDevice9_CreateCubeTexture(device, size, miplevels, usage, format, pool, texture, NULL); } + +HRESULT WINAPI D3DXCreateVolumeTexture(LPDIRECT3DDEVICE9 device, + UINT width, + UINT height, + UINT depth, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + LPDIRECT3DVOLUMETEXTURE9 *texture) +{ + HRESULT hr; + + TRACE("(%p, %u, %u, %u, %u, %#x, %#x, %#x, %p)\n", device, width, height, depth, + miplevels, usage, format, pool, texture); + + if (!device || !texture) + return D3DERR_INVALIDCALL; + + hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, + &miplevels, usage, &format, pool); + + if (FAILED(hr)) + { + TRACE("D3DXCheckVolumeTextureRequirements failed\n"); + return hr; + } + + return IDirect3DDevice9_CreateVolumeTexture(device, width, height, depth, miplevels, + usage, format, pool, texture, NULL); +}

1 0

Matteo Bruni : d3dx9: Implement D3DXCheckVolumeTextureRequirements.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: c1843c8779e9cfecfb38520f6cb435b05829151e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1843c8779e9cfecfb38520f6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 8 19:56:15 2010 +0100 d3dx9: Implement D3DXCheckVolumeTextureRequirements. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/tests/texture.c | 109 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 74 ++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 50bf64d..c20e2f9 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -7,7 +7,7 @@ @ stdcall D3DXCheckCubeTextureRequirements(ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckTextureRequirements(ptr ptr ptr ptr long ptr ptr) @ stdcall D3DXCheckVersion(long long) -@ stub D3DXCheckVolumeTextureRequirements +@ stdcall D3DXCheckVolumeTextureRequirements(ptr ptr ptr ptr ptr long ptr ptr) @ stub D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr float) @ stdcall D3DXColorAdjustSaturation(ptr ptr float) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 73f13d7..177b4c7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -278,6 +278,114 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) ok(format == D3DFMT_X8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_X8R8G8B8); } +static void test_D3DXCheckVolumeTextureRequirements(IDirect3DDevice9 *device) +{ + UINT width, height, depth, mipmaps; + D3DFORMAT format; + D3DCAPS9 caps; + HRESULT hr; + + IDirect3DDevice9_GetDeviceCaps(device, &caps); + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + { + skip("No volume textures support\n"); + return; + } + + /* general tests */ + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXCheckVolumeTextureRequirements(NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, NULL, D3DPOOL_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* width, height, depth */ + width = height = depth = D3DX_DEFAULT; + hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 256, "Returned width %d, expected %d\n", width, 256); + ok(height == 256, "Returned height %d, expected %d\n", height, 256); + ok(depth == 1, "Returned depth %d, expected %d\n", depth, 1); + + width = D3DX_DEFAULT; + hr = D3DXCheckVolumeTextureRequirements(device, &width, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 256, "Returned width %d, expected %d\n", width, 256); + + width = D3DX_DEFAULT; height = 0; depth = 0; + hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 1, "Returned width %d, expected %d\n", width, 1); + ok(height == 1, "Returned height %d, expected %d\n", height, 1); + ok(depth == 1, "Returned height %d, expected %d\n", depth, 1); + + width = 0; height = 0; depth = 0; + hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 1, "Returned width %d, expected %d\n", width, 1); + ok(height == 1, "Returned height %d, expected %d\n", height, 1); + ok(depth == 1, "Returned height %d, expected %d\n", depth, 1); + + width = 0; + hr = D3DXCheckVolumeTextureRequirements(device, &width, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 1, "Returned width %d, expected %d\n", width, 1); + + width = 0xFFFFFFFE; + hr = D3DXCheckVolumeTextureRequirements(device, &width, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == caps.MaxVolumeExtent, "Returned width %d, expected %d\n", width, caps.MaxVolumeExtent); + + /* format */ + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + + format = D3DFMT_UNKNOWN; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); + + format = D3DX_DEFAULT; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_A8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_A8R8G8B8); + + format = D3DFMT_R8G8B8; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, NULL, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(format == D3DFMT_X8R8G8B8, "Returned format %u, expected %u\n", format, D3DFMT_X8R8G8B8); + + /* mipmaps */ + if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)) + { + skip("No volume textures mipmapping support\n"); + return; + } + + width = height = depth = 64; + mipmaps = 9; + hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 7, "Returned mipmaps %d, expected %d\n", mipmaps, 7); + + width = 284; + height = 143; + depth = 55; + mipmaps = 20; + hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 10, "Returned mipmaps %d, expected %d\n", mipmaps, 10); + + mipmaps = 0; + hr = D3DXCheckVolumeTextureRequirements(device, NULL, NULL, NULL, &mipmaps, 0, NULL, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckVolumeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(mipmaps == 9, "Returned mipmaps %d, expected %d\n", mipmaps, 9); +} + static void test_D3DXCreateTexture(IDirect3DDevice9 *device) { IDirect3DTexture9 *texture; @@ -581,6 +689,7 @@ START_TEST(texture) test_D3DXCheckTextureRequirements(device); test_D3DXCheckCubeTextureRequirements(device); + test_D3DXCheckVolumeTextureRequirements(device); test_D3DXCreateTexture(device); test_D3DXFilterTexture(device); diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 42d52d7..b191a34 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -383,6 +383,80 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(LPDIRECT3DDEVICE9 device, return hr; } +HRESULT WINAPI D3DXCheckVolumeTextureRequirements(LPDIRECT3DDEVICE9 device, + UINT *width, + UINT *height, + UINT *depth, + UINT *miplevels, + DWORD usage, + D3DFORMAT *format, + D3DPOOL pool) +{ + D3DCAPS9 caps; + UINT w = width ? *width : D3DX_DEFAULT; + UINT h = height ? *height : D3DX_DEFAULT; + UINT d = (depth && *depth) ? *depth : 1; + HRESULT hr; + + TRACE("(%p, %p, %p, %p, %p, %u, %p, %u)\n", device, width, height, depth, miplevels, + usage, format, pool); + + if (!device || FAILED(IDirect3DDevice9_GetDeviceCaps(device, &caps))) + return D3DERR_INVALIDCALL; + + if (!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) + return D3DERR_NOTAVAILABLE; + + hr = D3DXCheckTextureRequirements(device, &w, &h, NULL, usage, format, pool); + if (d == D3DX_DEFAULT) + d = 1; + + /* ensure width/height is power of 2 */ + if ((caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) && + (!is_pow2(w) || !is_pow2(h) || !is_pow2(d))) + { + w = make_pow2(w); + h = make_pow2(h); + d = make_pow2(d); + } + + if (w > caps.MaxVolumeExtent) + w = caps.MaxVolumeExtent; + if (h > caps.MaxVolumeExtent) + h = caps.MaxVolumeExtent; + if (d > caps.MaxVolumeExtent) + d = caps.MaxVolumeExtent; + + if (miplevels) + { + if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP)) + *miplevels = 1; + else + { + UINT max_mipmaps = 1; + UINT max_dimen = max(max(w, h), d); + + while (max_dimen > 1) + { + max_dimen >>= 1; + max_mipmaps++; + } + + if (*miplevels == 0 || *miplevels > max_mipmaps) + *miplevels = max_mipmaps; + } + } + + if (width) + *width = w; + if (height) + *height = h; + if (depth) + *depth = d; + + return hr; +} + HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, UINT width, UINT height,

1 0

Matteo Bruni : d3dx9: Skip D3DXCheckCubeTextureRequirement test if not supported.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 363d180a54f0c785875d17c8816b2edbc5476a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d180a54f0c785875d17c88… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 8 19:56:28 2010 +0100 d3dx9: Skip D3DXCheckCubeTextureRequirement test if not supported. --- dlls/d3dx9_36/tests/texture.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 2d020fd..73f13d7 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -200,6 +200,12 @@ static void test_D3DXCheckCubeTextureRequirements(IDirect3DDevice9 *device) IDirect3DDevice9_GetDeviceCaps(device, &caps); + if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("No cube textures support\n"); + return; + } + /* general tests */ hr = D3DXCheckCubeTextureRequirements(device, NULL, NULL, 0, NULL, D3DPOOL_DEFAULT); ok(hr == D3D_OK, "D3DXCheckCubeTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK);

1 0

Maarten Lankhorst : winegstreamer: Clarify FIXME.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 76a976d049ee5f57d02aab6cf3988228bde7f3dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a976d049ee5f57d02aab6cf… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 16:18:30 2010 +0100 winegstreamer: Clarify FIXME. --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 4f053f7..6c37a27 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -888,7 +888,8 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI This->gstfilter = gst_element_factory_make("decodebin2", NULL); if (!This->gstfilter) { - FIXME("Could not make source filter, are gstreamer-plugins-* installed?\n"); + FIXME("Could not make source filter, are gstreamer-plugins-* installed for %u bits?\n", + 8 * (int)sizeof(void*)); return E_FAIL; } g_signal_connect(This->gstfilter, "new-decoded-pad", G_CALLBACK(existing_new_pad), This);

1 0

Maarten Lankhorst : winegstreamer: Fix GSTInPin_EnumMediaTypes.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 4cbce245930e20f4f200496e15dbc68ae4323f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbce245930e20f4f200496e1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 16:13:57 2010 +0100 winegstreamer: Fix GSTInPin_EnumMediaTypes. --- dlls/winegstreamer/gstdemux.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3dabcc6..4f053f7 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1643,6 +1643,15 @@ static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID return E_NOINTERFACE; } +static HRESULT WINAPI GSTInPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) +{ + BasePin *This = (BasePin *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); + + return EnumMediaTypes_Construct(This, BasePinImpl_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); +} + static const IPinVtbl GST_InputPin_Vtbl = { GSTInPin_QueryInterface, BasePinImpl_AddRef, @@ -1656,7 +1665,7 @@ static const IPinVtbl GST_InputPin_Vtbl = { BasePinImpl_QueryDirection, BasePinImpl_QueryId, GSTInPin_QueryAccept, - BasePinImpl_EnumMediaTypes, + GSTInPin_EnumMediaTypes, BasePinImpl_QueryInternalConnections, GSTInPin_EndOfStream, GSTInPin_BeginFlush,

1 0

Maarten Lankhorst : quartz: Fix PullPin_EnumMediaTypes.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 27c120cf583f44b6ab5632f60be089420d8c71b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c120cf583f44b6ab5632f60… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 16:13:56 2010 +0100 quartz: Fix PullPin_EnumMediaTypes. --- dlls/quartz/parser.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index f60bd23..cf4a260 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -761,6 +761,15 @@ static HRESULT WINAPI Parser_PullPin_ReceiveConnection(IPin * iface, IPin * pRec return hr; } +static HRESULT WINAPI Parser_PullPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes **ppEnum) +{ + BasePin *This = (BasePin *)iface; + + TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); + + return EnumMediaTypes_Construct(This, BasePinImpl_GetMediaType, BasePinImpl_GetMediaTypeVersion, ppEnum); +} + static const IPinVtbl Parser_InputPin_Vtbl = { PullPin_QueryInterface, @@ -775,7 +784,7 @@ static const IPinVtbl Parser_InputPin_Vtbl = BasePinImpl_QueryDirection, BasePinImpl_QueryId, PullPin_QueryAccept, - BasePinImpl_EnumMediaTypes, + Parser_PullPin_EnumMediaTypes, BasePinImpl_QueryInternalConnections, PullPin_EndOfStream, PullPin_BeginFlush,

1 0

Maarten Lankhorst : winegstreamer: Send EOS on exiting thread.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: ccc8141b8298d48ca25fcc0cced3e58b0600314f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccc8141b8298d48ca25fcc0cc… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Nov 7 16:13:55 2010 +0100 winegstreamer: Send EOS on exiting thread. --- dlls/winegstreamer/gstdemux.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d94c69a..3dabcc6 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -411,11 +411,13 @@ static void release_sample(void *data) { } static DWORD CALLBACK push_data(LPVOID iface) { + LONGLONG maxlen, curlen; GSTImpl *This = iface; IMediaSample *buf; DWORD_PTR user; HRESULT hr; + IAsyncReader_Length(This->pInputPin.pReader, &maxlen, &curlen); TRACE("Starting..\n"); for (;;) { REFERENCE_TIME tStart, tStop; @@ -428,7 +430,11 @@ static DWORD CALLBACK push_data(LPVOID iface) { if (FAILED(hr)) break; + if (This->nextofs >= maxlen) + break; len = IMediaSample_GetSize(buf); + if (This->nextofs + len > maxlen) + len = maxlen - This->nextofs; tStart = MEDIATIME_FROM_BYTES(This->nextofs); tStop = tStart + MEDIATIME_FROM_BYTES(len); @@ -451,7 +457,7 @@ static DWORD CALLBACK push_data(LPVOID iface) { gstbuf = gst_app_buffer_new(data, IMediaSample_GetActualDataLength(buf), release_sample, buf); if (!gstbuf) { IMediaSample_Release(buf); - return S_OK; + break; } gstbuf->duration = gstbuf->timestamp = -1; ret = gst_pad_push(This->my_src, gstbuf); @@ -469,6 +475,8 @@ static DWORD CALLBACK push_data(LPVOID iface) { break; } + gst_pad_push_event(This->my_src, gst_event_new_eos()); + TRACE("Almost stopping.. %08x\n", hr); do { IAsyncReader_WaitForNext(This->pInputPin.pReader, 0, &buf, &user); @@ -1447,6 +1455,8 @@ static HRESULT GST_RemoveOutputPins(GSTImpl *This) { GSTOutPin **ppOldPins = This->ppPins; TRACE("(%p)\n", This); + if (!This->gstfilter) + return S_OK; gst_element_set_state(This->gstfilter, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink); This->my_src = This->their_sink = NULL;

1 0

Jacek Caban : mshtml: Added execScript tests.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 6c35f1356b08c684be9269c19d63782ee82a05a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c35f1356b08c684be9269c19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 9 13:36:39 2010 +0100 mshtml: Added execScript tests. --- dlls/mshtml/tests/jstest.html | 6 +++ dlls/mshtml/tests/script.c | 82 +++++++++++++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 3363c5a..b977ad3 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -31,6 +31,8 @@ function test_select_index() { ok(s[2] === null, "s[2] = " + s[2]); } +var globalVar = false; + function runTest() { obj = new Object(); ok(obj === window.obj, "obj !== window.obj"); @@ -41,6 +43,10 @@ function runTest() { test_removeAttribute(document.body); test_select_index(); + var r = window.execScript("globalVar = true;"); + ok(r === undefined, "execScript returned " + r); + ok(globalVar === true, "globalVar = " + globalVar); + external.reportSuccess(); } </script> diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 23f1ab8..4da0df7 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -113,7 +113,8 @@ DEFINE_EXPECT(SetScriptState_STARTED); DEFINE_EXPECT(SetScriptState_CONNECTED); DEFINE_EXPECT(SetScriptState_DISCONNECTED); DEFINE_EXPECT(AddNamedItem); -DEFINE_EXPECT(ParseScriptText); +DEFINE_EXPECT(ParseScriptText_script); +DEFINE_EXPECT(ParseScriptText_execScript); DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); DEFINE_EXPECT(script_divid_d); @@ -423,7 +424,7 @@ static HRESULT WINAPI scriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_FAIL; } - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return E_NOTIMPL; } @@ -1732,10 +1733,7 @@ static void test_global_id(void) VariantClear(&var); } -static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, - LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, - LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, - DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) +static void test_script_run(void) { IDispatchEx *document, *dispex; IHTMLWindow2 *window; @@ -1752,8 +1750,6 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR funcW[] = {'f','u','n','c',0}; - CHECK_EXPECT(ParseScriptText); - SET_EXPECT(GetScriptDispatch); tmp = SysAllocString(documentW); @@ -1943,8 +1939,38 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac test_global_id(); test_security(); +} - return S_OK; +static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, + LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, + LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, + DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) +{ + ok(!punkContext, "punkContext = %p\n", punkContext); + ok(pvarResult != NULL, "pvarResult == NULL\n"); + ok(pexcepinfo != NULL, "pexcepinfo == NULL\n"); + + if(!strcmp_wa(pstrCode, "execScript call")) { + CHECK_EXPECT(ParseScriptText_execScript); + ok(!pstrItemName, "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!strcmp_wa(pstrDelimiter, "\""), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(dwFlags == SCRIPTTEXT_ISVISIBLE, "dwFlags = %x\n", dwFlags); + + V_VT(pvarResult) = VT_I4; + V_I4(pvarResult) = 10; + return S_OK; + }else if(!strcmp_wa(pstrCode, "simple script")) { + CHECK_EXPECT(ParseScriptText_script); + ok(!strcmp_wa(pstrItemName, "window"), "pstrItemName = %s\n", wine_dbgstr_w(pstrItemName)); + ok(!strcmp_wa(pstrDelimiter, "</SCRIPT>"), "pstrDelimiter = %s\n", wine_dbgstr_w(pstrDelimiter)); + ok(dwFlags == (SCRIPTTEXT_ISVISIBLE|SCRIPTTEXT_HOSTMANAGESSOURCE), "dwFlags = %x\n", dwFlags); + + test_script_run(); + return S_OK; + } + + ok(0, "unexpected script %s\n", wine_dbgstr_w(pstrCode)); + return E_FAIL; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -2265,6 +2291,38 @@ static const char simple_script_str[] = "<script language=\"TestScript\">simple script</script>" "</body></html>"; +static void test_exec_script(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + BSTR code, lang; + VARIANT v; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + code = a2bstr("execScript call"); + lang = a2bstr("TestScript"); + + SET_EXPECT(ParseScriptText_execScript); + hres = IHTMLWindow2_execScript(window, code, lang, &v); + ok(hres == S_OK, "execScript failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 10, "V_I4(v) = %d\n", V_I4(&v)); + CHECK_CALLED(ParseScriptText_execScript); + SysFreeString(lang); + + lang = a2bstr("invalid"); + V_VT(&v) = 100; + hres = IHTMLWindow2_execScript(window, code, lang, &v); + ok(hres == CO_E_CLASSSTRING, "execScript failed: %08x, expected CO_E_CLASSSTRING\n", hres); + ok(V_VT(&v) == 100, "V_VT(v) = %d\n", V_VT(&v)); + SysFreeString(lang); + SysFreeString(code); + + IHTMLWindow2_Release(window); +} + static void test_simple_script(void) { IHTMLDocument2 *doc; @@ -2284,7 +2342,7 @@ static void test_simple_script(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(AddNamedItem); SET_EXPECT(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ - SET_EXPECT(ParseScriptText); + SET_EXPECT(ParseScriptText_script); SET_EXPECT(SetScriptState_CONNECTED); load_doc(doc, simple_script_str); @@ -2300,9 +2358,11 @@ static void test_simple_script(void) CHECK_CALLED(SetScriptState_STARTED); CHECK_CALLED(AddNamedItem); CHECK_CALLED_BROKEN(SetProperty_ABBREVIATE_GLOBALNAME_RESOLUTION); /* IE8 */ - CHECK_CALLED(ParseScriptText); + CHECK_CALLED(ParseScriptText_script); CHECK_CALLED(SetScriptState_CONNECTED); + test_exec_script(doc); + if(site) IActiveScriptSite_Release(site); if(window_dispex)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::execScript implementation.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: e560a2246f756468ce75f92962d0aa00f4936698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e560a2246f756468ce75f9296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 9 13:36:24 2010 +0100 mshtml: Added IHTMLWindow2::execScript implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/script.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 1ba1101..d406997 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1140,8 +1140,10 @@ static HRESULT WINAPI HTMLWindow2_execScript(IHTMLWindow2 *iface, BSTR scode, BS VARIANT *pvarRet) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(scode), debugstr_w(language), pvarRet); - return E_NOTIMPL; + + TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(scode), debugstr_w(language), pvarRet); + + return exec_script(This, scode, language, pvarRet); } static HRESULT WINAPI HTMLWindow2_toString(IHTMLWindow2 *iface, BSTR *String) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d9dd563..a909943 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -856,6 +856,7 @@ void release_script_hosts(HTMLWindow*); void connect_scripts(HTMLWindow*); void doc_insert_script(HTMLWindow*,nsIDOMHTMLScriptElement*); IDispatch *script_parse_event(HTMLWindow*,LPCWSTR); +HRESULT exec_script(HTMLWindow*,const WCHAR*,const WCHAR*,VARIANT*); void set_script_mode(HTMLWindow*,SCRIPTMODE); BOOL find_global_prop(HTMLWindow*,BSTR,DWORD,ScriptHost**,DISPID*); IDispatch *get_script_disp(ScriptHost*); diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 0b78e17..4d50e36 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -874,6 +874,42 @@ IDispatch *script_parse_event(HTMLWindow *window, LPCWSTR text) return disp; } +HRESULT exec_script(HTMLWindow *window, const WCHAR *code, const WCHAR *lang, VARIANT *ret) +{ + ScriptHost *script_host; + EXCEPINFO ei; + GUID guid; + HRESULT hres; + + static const WCHAR delimW[] = {'"',0}; + + if(!get_guid_from_language(lang, &guid)) { + WARN("Could not find script GUID\n"); + return CO_E_CLASSSTRING; + } + + script_host = get_script_host(window, &guid); + if(!script_host) { + FIXME("No script host\n"); + return E_FAIL; + } + + if(!script_host->parse) { + FIXME("script_host->parse == NULL\n"); + return E_FAIL; + } + + memset(&ei, 0, sizeof(ei)); + TRACE(">>>\n"); + hres = IActiveScriptParse64_ParseScriptText(script_host->parse, code, NULL, NULL, delimW, 0, 0, SCRIPTTEXT_ISVISIBLE, ret, &ei); + if(SUCCEEDED(hres)) + TRACE("<<<\n"); + else + WARN("<<< %08x\n", hres); + + return hres; +} + IDispatch *get_script_disp(ScriptHost *script_host) { IDispatch *disp;

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
87
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-commits November 2010