November 2010 - Wine-Commits

Aric Stewart : winegstreamer: 4 buffers is insufficient for some mpeg streams.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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

Maarten Lankhorst : winegstreamer: Clarify FIXME.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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

Matteo Bruni : d3dx9: Implement D3DXCheckVolumeTextureRequirements.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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

Maarten Lankhorst : winegstreamer: Fix GSTInPin_EnumMediaTypes.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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 Nov. 9, 2010

Nov. 9, 2010

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 Nov. 9, 2010

Nov. 9, 2010

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

Matteo Bruni : d3dx9: Skip D3DXCheckCubeTextureRequirement test if not supported.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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

Matteo Bruni : d3dx9: Implement D3DXCreateVolumeTexture.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

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

Henri Verbeet : d3d9/tests: Specify width and height when changing the display orientation.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

Module: wine Branch: master Commit: 6ae987ea9867b87a90398dcb95f742159ee831bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae987ea9867b87a90398dcb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 9 11:38:41 2010 +0100 d3d9/tests: Specify width and height when changing the display orientation. This appears to be required on Windows 7, or perhaps depends on the video driver. --- dlls/d3d9/tests/d3d9ex.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 090ecfc..0058ead 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -268,9 +268,12 @@ static void test_get_adapter_displaymode_ex(void) memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - startmode.dmFields = DM_DISPLAYORIENTATION; - S2(U1(startmode)).dmDisplayOrientation = DMDO_180; + retval = pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); + ok(retval, "Failed to retrieve current display mode, retval %d.\n", retval); + if (!retval) goto out; + startmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; + S2(U1(startmode)).dmDisplayOrientation = DMDO_180; retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); if(retval == DISP_CHANGE_BADMODE)

1 0

Thomas Mullaly : urlmon: Improve IUri support of res URIs.
by Alexandre Julliard Nov. 9, 2010

Nov. 9, 2010

Module: wine Branch: master Commit: dffc9d312e78b6d7eb0e58e8b8062e5f695b0af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffc9d312e78b6d7eb0e58e8b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Nov 7 11:09:49 2010 -0500 urlmon: Improve IUri support of res URIs. --- dlls/urlmon/tests/uri.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 24 +++++++--- 2 files changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cd6e57c..b11a3a0 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -3849,6 +3849,110 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_HTTP,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* For res URIs the host is everything up until the first '/'. */ + { "res://C:\\dir\\file.exe/DATA/test.html", 0, S_OK, FALSE, + { + {"res://C:\\dir\\file.exe/DATA/test.html",S_OK,FALSE}, + {"C:\\dir\\file.exe",S_OK,FALSE}, + {"res://C:\\dir\\file.exe/DATA/test.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"C:\\dir\\file.exe",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/DATA/test.html",S_OK,FALSE}, + {"/DATA/test.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://C:\\dir\\file.exe/DATA/test.html",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Res URI can contain a '|' in the host name. */ + { "res://c:\\di|r\\file.exe/test", 0, S_OK, FALSE, + { + {"res://c:\\di|r\\file.exe/test",S_OK,FALSE}, + {"c:\\di|r\\file.exe",S_OK,FALSE}, + {"res://c:\\di|r\\file.exe/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\di|r\\file.exe",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/test",S_OK,FALSE}, + {"/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://c:\\di|r\\file.exe/test",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE}, + } + }, + /* Res URIs can have invalid percent encoded values. */ + { "res://c:\\dir%xx\\file.exe/test", 0, S_OK, FALSE, + { + {"res://c:\\dir%xx\\file.exe/test",S_OK,FALSE}, + {"c:\\dir%xx\\file.exe",S_OK,FALSE}, + {"res://c:\\dir%xx\\file.exe/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\dir%xx\\file.exe",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/test",S_OK,FALSE}, + {"/test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://c:\\dir%xx\\file.exe/test",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, + /* Res doesn't get forbidden characters percent encoded in it's path. */ + { "res://c:\\test/tes<|>t", 0, S_OK, FALSE, + { + {"res://c:\\test/tes<|>t",S_OK,FALSE}, + {"c:\\test",S_OK,FALSE}, + {"res://c:\\test/tes<|>t",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE}, + {"c:\\test",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"/tes<|>t",S_OK,FALSE}, + {"/tes<|>t",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"res://c:\\test/tes<|>t",S_OK,FALSE}, + {"res",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_RES,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; @@ -3913,7 +4017,14 @@ static const invalid_uri invalid_uri_tests[] = { {"file://c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, {"file:c:\\test<test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, {"file:c:\\test>test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, - {"file:c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE} + {"file:c:\\test\"test",Uri_CREATE_FILE_USE_DOS_PATH,FALSE}, + /* res URIs aren't allowed to have forbidden dos path characters in the + * hostname. + */ + {"res://c:\\te<st\\test/test",0,FALSE}, + {"res://c:\\te>st\\test/test",0,FALSE}, + {"res://c:\\te\"st\\test/test",0,FALSE}, + {"res://c:\\test/te%xxst",0,FALSE} }; typedef struct _uri_equality { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 97268a7..6e4ed06 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -1552,8 +1552,11 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags) static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWORD extras) { const BOOL has_start_bracket = **ptr == '['; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; + const BOOL is_res = data->scheme_type == URL_SCHEME_RES; BOOL inside_brackets = has_start_bracket; - BOOL ignore_col = extras & IGNORE_PORT_DELIMITER; + + /* res URIs don't have ports. */ + BOOL ignore_col = (extras & IGNORE_PORT_DELIMITER) || is_res; /* We have to be careful with file schemes. */ if(data->scheme_type == URL_SCHEME_FILE) { @@ -1575,7 +1578,11 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO data->host = *ptr; - while(!is_auth_delim(**ptr, known_scheme)) { + /* For res URIs, everything before the first '/' is + * considered the host. + */ + while((!is_res && !is_auth_delim(**ptr, known_scheme)) || + (is_res && **ptr && **ptr != '/')) { if(**ptr == ':' && !ignore_col) { /* We can ignore ':' if were inside brackets.*/ if(!inside_brackets) { @@ -1599,7 +1606,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO break; } } - } else if(**ptr == '%' && known_scheme) { + } else if(**ptr == '%' && (known_scheme && !is_res)) { /* Has to be a legit % encoded value. */ if(!check_pct_encoded(ptr)) { *ptr = data->host; @@ -1607,6 +1614,10 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO return FALSE; } else continue; + } else if(is_res && is_forbidden_dos_path_char(**ptr)) { + *ptr = data->host; + data->host = NULL; + return FALSE; } else if(**ptr == ']') inside_brackets = FALSE; else if(**ptr == '[') @@ -1631,7 +1642,7 @@ static BOOL parse_reg_name(const WCHAR **ptr, parse_data *data, DWORD flags, DWO data->host_len = *ptr - data->host; /* If the host is empty, then it's an unknown host type. */ - if(data->host_len == 0) + if(data->host_len == 0 || is_res) data->host_type = Uri_HOST_UNKNOWN; else data->host_type = Uri_HOST_DNS; @@ -2913,6 +2924,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; + const BOOL is_res = data->scheme_type == URL_SCHEME_RES; BOOL escape_pct = FALSE; @@ -2961,7 +2973,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, } for(; ptr < data->path+data->path_len; ++ptr) { - if(*ptr == '%') { + if(*ptr == '%' && !is_res) { const WCHAR *tmp = ptr; WCHAR val; @@ -3004,7 +3016,7 @@ static BOOL canonicalize_path_hierarchical(const parse_data *data, Uri *uri, uri->canon_uri[uri->canon_len] = '/'; ++uri->canon_len; } - } else if(known_scheme && !is_unreserved(*ptr) && !is_reserved(*ptr) && + } else if(known_scheme && !is_res && !is_unreserved(*ptr) && !is_reserved(*ptr) && (!(flags & Uri_CREATE_NO_ENCODE_FORBIDDEN_CHARACTERS) || is_file)) { if(is_file && (flags & Uri_CREATE_FILE_USE_DOS_PATH)) { /* Don't escape the character. */

1 0