April 2012 - Wine-Commits - list.winehq.org

Andrew Eikum : winealsa.drv: Use device GUIDs as keys.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 027623a0077182da4ec29f03e4a79173d81cc088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=027623a0077182da4ec29f03e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 3 13:47:59 2012 -0500 winealsa.drv: Use device GUIDs as keys. --- dlls/winealsa.drv/mmdevdrv.c | 226 ++++++++++++++++++++++++++++++++++-------- 1 files changed, 186 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=027623a0077182da4ec29…

1 0

Andrew Eikum : wineoss.drv: Use device GUIDs as keys.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: f63267db80fcfb31d3f0c06979df60b95e00a053 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63267db80fcfb31d3f0c0697… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 3 14:05:20 2012 -0500 wineoss.drv: Use device GUIDs as keys. --- dlls/wineoss.drv/mmdevdrv.c | 204 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 169 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63267db80fcfb31d3f0c…

1 0

Christian Costa : amstream: Add CLSID_AMAudioData implementation.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 0f8553b5d4411b324f8116547d1202620f618531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8553b5d4411b324f8116547… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 3 17:51:07 2012 +0200 amstream: Add CLSID_AMAudioData implementation. --- dlls/amstream/Makefile.in | 1 + dlls/amstream/amstream_classes.idl | 7 ++ dlls/amstream/amstream_private.h | 2 + dlls/amstream/audiodata.c | 157 ++++++++++++++++++++++++++++++++++++ dlls/amstream/main.c | 1 + dlls/amstream/tests/amstream.c | 2 +- 6 files changed, 169 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 3353a38..35cfae1 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = strmiids strmbase uuid ole32 advapi32 C_SRCS = \ amstream.c \ + audiodata.c \ main.c \ mediastream.c \ mediastreamfilter.c diff --git a/dlls/amstream/amstream_classes.idl b/dlls/amstream/amstream_classes.idl index 701275d..064ce00 100644 --- a/dlls/amstream/amstream_classes.idl +++ b/dlls/amstream/amstream_classes.idl @@ -38,3 +38,10 @@ coclass AMDirectDrawStream { interface IAMMultiMediaStream; } uuid(49c47ce5-9ba4-11d0-8212-00c04fc32c45) ] coclass AMMultiMediaStream { interface IAMMultiMediaStream; } + +[ + helpstring("AuStream Class"), + threading(both), + uuid(f2468580-af8a-11d0-8212-00c04fc32c45) +] +coclass AMAudioData { interface IAudioData; } diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 69fd23f..e40c409 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -30,8 +30,10 @@ #include "winuser.h" #include "dshow.h" #include "mmstream.h" +#include "austream.h" HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c new file mode 100644 index 0000000..7d3c38a --- /dev/null +++ b/dlls/amstream/audiodata.c @@ -0,0 +1,157 @@ +/* + * Implementation of IAudioData Interface + * + * Copyright 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#define COBJMACROS + +#include "winbase.h" +#include "amstream_private.h" + +#include "amstream.h" + +WINE_DEFAULT_DEBUG_CHANNEL(amstream); + +typedef struct { + IAudioData IAudioData_iface; + LONG ref; +} AMAudioDataImpl; + +static inline AMAudioDataImpl *impl_from_IAudioData(IAudioData *iface) +{ + return CONTAINING_RECORD(iface, AMAudioDataImpl, IAudioData_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMemoryData) || + IsEqualGUID(riid, &IID_IAudioData)) + { + IUnknown_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAudioDataImpl_AddRef(IAudioData* iface) +{ + AMAudioDataImpl *This = impl_from_IAudioData(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, This->ref); + + return ref; +} + +static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) +{ + AMAudioDataImpl *This = impl_from_IAudioData(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IMemoryData methods ***/ +static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BYTE *data, DWORD flags) +{ + FIXME("(%p)->(%u,%p,%x): stub\n", iface, size, data, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioDataImpl_GetInfo(IAudioData* iface, DWORD *length, BYTE **data, DWORD *actual_data) +{ + FIXME("(%p)->(%p,%p,%p): stub\n", iface, length, data, actual_data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_valid) +{ + FIXME("(%p)->(%u): stub\n", iface, data_valid); + + return E_NOTIMPL; +} + +/*** IAudioData methods ***/ +static HRESULT WINAPI IAudioDataImpl_GetFormat(IAudioData* iface, WAVEFORMATEX *wave_format_current) +{ + FIXME("(%p)->(%p): stub\n", iface, wave_format_current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioDataImpl_SetFormat(IAudioData* iface, const WAVEFORMATEX *wave_format) +{ + FIXME("(%p)->(%p): stub\n", iface, wave_format); + + return E_NOTIMPL; +} + +static const struct IAudioDataVtbl AudioData_Vtbl = +{ + /*** IUnknown methods ***/ + IAudioDataImpl_QueryInterface, + IAudioDataImpl_AddRef, + IAudioDataImpl_Release, + /*** IMemoryData methods ***/ + IAudioDataImpl_SetBuffer, + IAudioDataImpl_GetInfo, + IAudioDataImpl_SetActual, + /*** IAudioData methods ***/ + IAudioDataImpl_GetFormat, + IAudioDataImpl_SetFormat +}; + +HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + AMAudioDataImpl *object; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; + object->ref = 1; + + *ppObj = &object->IAudioData_iface; + + return S_OK; +} diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 9f23974..79142e5 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -75,6 +75,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_AMMultiMediaStream, AM_create }, { &CLSID_AMDirectDrawStream, AM_create }, + { &CLSID_AMAudioData, AMAudioData_create }, { &CLSID_MediaStreamFilter, MediaStreamFilter_create } }; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 39add30..87bbcc7 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -334,7 +334,7 @@ static void test_media_streams(void) { IAudioData* audio_data = NULL; hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); - todo_wine ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); todo_wine ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr);

1 0

Henri Verbeet : ntdll: Use the copy of the section headers for applying memory protections as well in map_image ().
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: f1651e9208f51dcc8ebf599e8675bbf869541130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1651e9208f51dcc8ebf599e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 3 21:15:11 2012 +0200 ntdll: Use the copy of the section headers for applying memory protections as well in map_image(). --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 450a1fb..7c2b1a9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1348,7 +1348,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz VIRTUAL_SetProt( view, ptr, ROUND_SIZE( 0, header_size ), VPROT_COMMITTED | VPROT_READ ); - sec = (IMAGE_SECTION_HEADER*)((char *)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader); + sec = sections; for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { SIZE_T size;

1 0

Henri Verbeet : ddraw: Replace an ERR in IDirect3DDeviceImpl_7_QueryInterface() with a WARN.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: cd8508a915bd57bfa4a59b76c05a0f0987a4dcd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8508a915bd57bfa4a59b76c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 3 21:15:13 2012 +0200 ddraw: Replace an ERR in IDirect3DDeviceImpl_7_QueryInterface() with a WARN. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b656ab0..2f4b728 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -190,7 +190,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, /* Unknown interface */ else { - ERR("(%p)->(%s, %p): No interface found\n", This, debugstr_guid(refiid), obj); + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(refiid)); return E_NOINTERFACE; }

1 0

Christian Costa : amstream: Implement IAMMultiMediaStreamImpl_SetState.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 27c4ad3bec1229020ab38ab5b45f0969204192ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c4ad3bec1229020ab38ab5b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 3 07:53:50 2012 +0200 amstream: Implement IAMMultiMediaStreamImpl_SetState. --- dlls/amstream/amstream.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 1366cdb..150f412 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -184,13 +184,19 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetState(IAMMultiMediaStream* ifac return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE NewState) +static HRESULT WINAPI IAMMultiMediaStreamImpl_SetState(IAMMultiMediaStream* iface, STREAM_STATE new_state) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); + HRESULT hr = E_INVALIDARG; - FIXME("(%p/%p)->() stub!\n", This, iface); + TRACE("(%p/%p)->(%u)\n", This, iface, new_state); - return E_NOTIMPL; + if (STREAMSTATE_RUN) + hr = IMediaControl_Run(This->media_control); + else if (STREAMSTATE_STOP) + hr = IMediaControl_Stop(This->media_control); + + return hr; } static HRESULT WINAPI IAMMultiMediaStreamImpl_GetTime(IAMMultiMediaStream* iface, STREAM_TIME* pCurrentTime)

1 0

Henri Verbeet : ddraw: Remove some interfaces from IDirect3DDeviceImpl_7_QueryInterface().
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 1a98c339cab03f1465725e6952db99001e1b0717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a98c339cab03f1465725e695… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 3 21:15:14 2012 +0200 ddraw: Remove some interfaces from IDirect3DDeviceImpl_7_QueryInterface(). --- dlls/ddraw/device.c | 44 -------------------------------------------- 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 2f4b728..a1daa3f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -117,50 +117,6 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, *obj = iface; } - /* Check DirectDraw Interfaces. */ - else if( IsEqualGUID( &IID_IDirectDraw7, refiid ) ) - { - *obj = &This->ddraw->IDirectDraw7_iface; - TRACE("(%p) Returning IDirectDraw7 interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirectDraw4, refiid ) ) - { - *obj = &This->ddraw->IDirectDraw4_iface; - TRACE("(%p) Returning IDirectDraw4 interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirectDraw2, refiid ) ) - { - *obj = &This->ddraw->IDirectDraw2_iface; - TRACE("(%p) Returning IDirectDraw2 interface at %p\n", This, *obj); - } - else if( IsEqualGUID( &IID_IDirectDraw, refiid ) ) - { - *obj = &This->ddraw->IDirectDraw_iface; - TRACE("(%p) Returning IDirectDraw interface at %p\n", This, *obj); - } - - /* Direct3D */ - else if ( IsEqualGUID( &IID_IDirect3D , refiid ) ) - { - *obj = &This->ddraw->IDirect3D_iface; - TRACE("(%p) Returning IDirect3D interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3D2 , refiid ) ) - { - *obj = &This->ddraw->IDirect3D2_iface; - TRACE("(%p) Returning IDirect3D2 interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3D3 , refiid ) ) - { - *obj = &This->ddraw->IDirect3D3_iface; - TRACE("(%p) Returning IDirect3D3 interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3D7 , refiid ) ) - { - *obj = &This->ddraw->IDirect3D7_iface; - TRACE("(%p) Returning IDirect3D7 interface at %p\n", This, *obj); - } - /* Direct3DDevice */ else if ( IsEqualGUID( &IID_IDirect3DDevice , refiid ) ) {

1 0

Henri Verbeet : ddraw: Keep track of the ddraw version used to create a device.
by Alexandre Julliard April 4, 2012

April 4, 2012

Module: wine Branch: master Commit: 4f91eb3fe125f80fe148ba2ad74deeeb6ccd78d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f91eb3fe125f80fe148ba2ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 3 21:15:12 2012 +0200 ddraw: Keep track of the ddraw version used to create a device. This also obsoletes the "from_surface" device field. --- dlls/ddraw/ddraw.c | 74 +++++++++++++------------------------------ dlls/ddraw/ddraw_private.h | 8 ++-- dlls/ddraw/device.c | 50 ++++++++++++++++++++++++++++- dlls/ddraw/surface.c | 12 +++---- 4 files changed, 80 insertions(+), 64 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0df790f..9d68fc9 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4426,50 +4426,17 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - *device = NULL; - - /* Fail device creation if non-opengl surfaces are used. */ - if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) - { - ERR("The application wants to create a Direct3D device, but non-opengl surfaces are set in the registry.\n"); - ERR("Please set the surface implementation to opengl or autodetection to allow 3D rendering.\n"); - - /* We only hit this path if a default surface is set in the registry. Incorrect autodetection - * is caught in CreateSurface or QueryInterface. */ - wined3d_mutex_unlock(); - return DDERR_NO3D; - } - - if (ddraw->d3ddevice) - { - FIXME("Only one Direct3D device per DirectDraw object supported.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; - } - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + hr = d3d_device_create(ddraw, target, 7, &object); + if (SUCCEEDED(hr)) + *device = &object->IDirect3DDevice7_iface; + else { - ERR("Failed to allocate device memory.\n"); - wined3d_mutex_unlock(); - return DDERR_OUTOFMEMORY; + WARN("Failed to create device, hr %#x.\n", hr); + *device = NULL; } - - hr = d3d_device_init(object, ddraw, target); - if (FAILED(hr)) - { - WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - wined3d_mutex_unlock(); - return hr; - } - - TRACE("Created device %p.\n", object); - *device = &object->IDirect3DDevice7_iface; - wined3d_mutex_unlock(); - return D3D_OK; + return hr; } static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, @@ -4477,22 +4444,25 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, { struct ddraw_surface *surface_impl = unsafe_impl_from_IDirectDrawSurface4(surface); struct ddraw *ddraw = impl_from_IDirect3D3(iface); - IDirect3DDevice7 *device7; IDirect3DDeviceImpl *device_impl; HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p, outer_unknown %p.\n", iface, debugstr_guid(riid), surface, device, outer_unknown); - if (outer_unknown) return CLASS_E_NOAGGREGATION; + if (outer_unknown) + return CLASS_E_NOAGGREGATION; - hr = d3d7_CreateDevice(&ddraw->IDirect3D7_iface, riid, - surface_impl ? &surface_impl->IDirectDrawSurface7_iface : NULL, device ? &device7 : NULL); + wined3d_mutex_lock(); + hr = d3d_device_create(ddraw, surface_impl, 3, &device_impl); if (SUCCEEDED(hr)) - { - device_impl = impl_from_IDirect3DDevice7(device7); *device = &device_impl->IDirect3DDevice3_iface; + else + { + WARN("Failed to create device, hr %#x.\n", hr); + *device = NULL; } + wined3d_mutex_unlock(); return hr; } @@ -4502,20 +4472,22 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, { struct ddraw_surface *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface); struct ddraw *ddraw = impl_from_IDirect3D2(iface); - IDirect3DDevice7 *device7; IDirect3DDeviceImpl *device_impl; HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); - hr = d3d7_CreateDevice(&ddraw->IDirect3D7_iface, riid, - surface_impl ? &surface_impl->IDirectDrawSurface7_iface : NULL, device ? &device7 : NULL); + wined3d_mutex_lock(); + hr = d3d_device_create(ddraw, surface_impl, 2, &device_impl); if (SUCCEEDED(hr)) - { - device_impl = impl_from_IDirect3DDevice7(device7); *device = &device_impl->IDirect3DDevice2_iface; + else + { + WARN("Failed to create device, hr %#x.\n", hr); + *device = NULL; } + wined3d_mutex_unlock(); return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index fa0f144..d7873e8 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -278,7 +278,8 @@ struct IDirect3DDeviceImpl IDirect3DDevice3 IDirect3DDevice3_iface; IDirect3DDevice2 IDirect3DDevice2_iface; IDirect3DDevice IDirect3DDevice_iface; - LONG ref; + LONG ref; + UINT version; /* Other object connections */ struct wined3d_device *wined3d_device; @@ -293,7 +294,6 @@ struct IDirect3DDeviceImpl /* Required to keep track which of two available texture blending modes in d3ddevice3 is used */ BOOL legacyTextureBlending; - BOOL from_surface; D3DMATRIX legacy_projection; D3DMATRIX legacy_clipspace; @@ -315,8 +315,8 @@ struct IDirect3DDeviceImpl D3DMATRIXHANDLE world, proj, view; }; -HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, - struct ddraw_surface *target) DECLSPEC_HIDDEN; +HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, + UINT version, IDirect3DDeviceImpl **device) DECLSPEC_HIDDEN; /* The IID */ extern const GUID IID_D3DDEVICE_WineD3D DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 8f65dc5..b656ab0 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -33,6 +33,7 @@ #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +WINE_DECLARE_DEBUG_CHANNEL(winediag); /* The device ID */ const GUID IID_D3DDEVICE_WineD3D = { @@ -180,7 +181,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, } /* DirectDrawSurface */ - else if (IsEqualGUID(&IID_IDirectDrawSurface, refiid) && This->from_surface) + else if (IsEqualGUID(&IID_IDirectDrawSurface, refiid) && This->version == 1) { *obj = &This->target->IDirectDrawSurface_iface; TRACE("Returning IDirectDrawSurface interface %p.\n", *obj); @@ -7015,7 +7016,8 @@ enum wined3d_depth_buffer_type IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DD return WINED3D_ZB_TRUE; } -HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, struct ddraw_surface *target) +static HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, + struct ddraw_surface *target, UINT version) { static const D3DMATRIX ident = { @@ -7035,6 +7037,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, struct device->IDirect3DDevice2_iface.lpVtbl = &d3d_device2_vtbl; device->IDirect3DDevice_iface.lpVtbl = &d3d_device1_vtbl; device->ref = 1; + device->version = version; device->ddraw = ddraw; device->target = target; list_init(&device->viewport_list); @@ -7092,3 +7095,46 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, struct ddraw *ddraw, struct return D3D_OK; } + +HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, + UINT version, IDirect3DDeviceImpl **device) +{ + IDirect3DDeviceImpl *object; + HRESULT hr; + + TRACE("ddraw %p, target %p, version %u, device %p.\n", ddraw, target, version, device); + + if (DefaultSurfaceType != WINED3D_SURFACE_TYPE_OPENGL) + { + ERR_(winediag)("The application wants to create a Direct3D device, " + "but the current DirectDrawRenderer does not support this.\n"); + + return DDERR_NO3D; + } + + if (ddraw->d3ddevice) + { + FIXME("Only one Direct3D device per DirectDraw object supported.\n"); + return DDERR_INVALIDPARAMS; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate device memory.\n"); + return DDERR_OUTOFMEMORY; + } + + hr = d3d_device_init(object, ddraw, target, version); + if (FAILED(hr)) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created device %p.\n", object); + *device = object; + + return D3D_OK; +} diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d5b57c0..1d614ac 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -204,21 +204,19 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, || IsEqualGUID(riid, &IID_IDirect3DHALDevice) || IsEqualGUID(riid, &IID_IDirect3DRGBDevice)) { - IDirect3DDeviceImpl *device_impl; - IDirect3DDevice7 *device; + IDirect3DDeviceImpl *device; HRESULT hr; - hr = IDirect3D7_CreateDevice(&This->ddraw->IDirect3D7_iface, riid, - &This->IDirectDrawSurface7_iface, &device); + wined3d_mutex_lock(); + hr = d3d_device_create(This->ddraw, This, 1, &device); + wined3d_mutex_unlock(); if (FAILED(hr)) { WARN("Failed to create device, hr %#x.\n", hr); return hr; } - device_impl = impl_from_IDirect3DDevice7(device); - device_impl->from_surface = TRUE; - *obj = &device_impl->IDirect3DDevice_iface; + *obj = &device->IDirect3DDevice_iface; return S_OK; }

1 0

Piotr Caban : wininet: Correctly set next hash table offset.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: 39bc1faa8fb1ad891572b60a0714c34214e02d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=39bc1faa8fb1ad891572b60a0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 3 16:45:07 2012 +0200 wininet: Correctly set next hash table offset. --- dlls/wininet/urlcache.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 762a09d..9e1f779 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1323,7 +1323,7 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, DWORD key = URLCache_HashKey(lpszUrl); DWORD offset = (key & (HASHTABLE_NUM_ENTRIES-1)) * HASHTABLE_BLOCKSIZE; - HASH_CACHEFILE_ENTRY * pHashEntry; + HASH_CACHEFILE_ENTRY * pHashEntry, *pHashPrev = NULL; DWORD dwHashTableNumber = 0; DWORD error; @@ -1334,6 +1334,8 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, pHashEntry = URLCache_HashEntryFromOffset(pHeader, pHashEntry->dwAddressNext)) { int i; + pHashPrev = pHashEntry; + if (pHashEntry->dwHashTableNumber != dwHashTableNumber++) { ERR("not right hash table number (%d) expected %d\n", pHashEntry->dwHashTableNumber, dwHashTableNumber); @@ -1357,7 +1359,7 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, } } } - error = URLCache_CreateHashTable(pHeader, pHashEntry, &pHashEntry); + error = URLCache_CreateHashTable(pHeader, pHashPrev, &pHashEntry); if (error != ERROR_SUCCESS) return error;

1 0

Piotr Caban : wininet: Set uninitialized memmory to 0xdeadbeef in cache files.
by Alexandre Julliard April 3, 2012

April 3, 2012

Module: wine Branch: master Commit: e4ad164f6e2b66c26a96c83b593e2b8684369459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ad164f6e2b66c26a96c83b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 3 16:46:07 2012 +0200 wininet: Set uninitialized memmory to 0xdeadbeef in cache files. --- dlls/wininet/urlcache.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 3a404c8..f5fcf10 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -811,6 +811,8 @@ static BOOL URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlock for (index = 0; index < dwBlocksNeeded; index++) URLCache_Allocation_BlockAllocate(AllocationTable, dwBlockNumber + index); *ppEntry = (CACHEFILE_ENTRY *)((LPBYTE)pHeader + ENTRY_START_OFFSET + dwBlockNumber * BLOCKSIZE); + for (index = 0; index < dwBlocksNeeded * BLOCKSIZE / sizeof(DWORD); index++) + ((DWORD*)*ppEntry)[index] = 0xdeadbeef; (*ppEntry)->dwBlocksUsed = dwBlocksNeeded; return TRUE; } @@ -1398,6 +1400,7 @@ static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ pHeader->dwOffsetFirstHashTable = dwOffset; (*ppHash)->CacheFileEntry.dwSignature = HASH_SIGNATURE; (*ppHash)->CacheFileEntry.dwBlocksUsed = 0x20; + (*ppHash)->dwAddressNext = 0; (*ppHash)->dwHashTableNumber = pPrevHash ? pPrevHash->dwHashTableNumber + 1 : 0; for (i = 0; i < HASHTABLE_SIZE; i++) {

1 0