wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Andrew Eikum : mmdevapi: Indicate data flow direction in IMMDevice:: GetId result.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 06c1f255f8eda03b8749420bc81f4fbd2655afdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c1f255f8eda03b8749420bc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 14:16:47 2012 -0500 mmdevapi: Indicate data flow direction in IMMDevice::GetId result. --- dlls/mmdevapi/devenum.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 501ea4c..866aa06 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -629,7 +629,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) MMDevice *This = impl_from_IMMDevice(iface); WCHAR *str; GUID *id = &This->devguid; - static const WCHAR formatW[] = { '{','0','.','0','.','0','.','0','0','0','0','0','0','0','0','}','.', + static const WCHAR formatW[] = { '{','0','.','0','.','%','u','.','0','0','0','0','0','0','0','0','}','.', '{','%','0','8','X','-','%','0','4','X','-', '%','0','4','X','-','%','0','2','X','%','0','2','X','-', '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', @@ -641,7 +641,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) *itemid = str = CoTaskMemAlloc(56 * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; - wsprintfW( str, formatW, id->Data1, id->Data2, id->Data3, + wsprintfW( str, formatW, This->flow, id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); TRACE("returning %s\n", wine_dbgstr_w(str));

1 0

Andrew Eikum : winmm: Support DRV_QUERYDEVICEINTERFACE in waveXxxMessage.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: d022cc1ddfecd7c8a942ea29d18e0cdb0fe5a5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d022cc1ddfecd7c8a942ea29d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 14:16:44 2012 -0500 winmm: Support DRV_QUERYDEVICEINTERFACE in waveXxxMessage. --- dlls/winmm/tests/wave.c | 4 +- dlls/winmm/waveform.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8a070b3..111dd1c 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -919,8 +919,8 @@ static void wave_out_test_device(UINT_PTR device) nameA=NULL; rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0); - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALPARAM || - rc==MMSYSERR_NOTSUPPORTED, + ok(rc==MMSYSERR_NOERROR || broken(rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_NOTSUPPORTED), "waveOutMessage(%s): failed to get interface size, rc=%s\n", dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index c7d3118..d4dc9aa 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -169,6 +169,13 @@ typedef struct _WINMM_ControlDetails { DWORD flags; } WINMM_ControlDetails; +typedef struct _WINMM_QueryInterfaceInfo { + BOOL is_out; + UINT index; + WCHAR *str; + UINT *len_bytes; +} WINMM_QueryInterfaceInfo; + static LRESULT WOD_Open(WINMM_OpenInfo *info); static LRESULT WOD_Close(HWAVEOUT hwave); static LRESULT WID_Open(WINMM_OpenInfo *info); @@ -2014,6 +2021,92 @@ static LRESULT MXD_SetControlDetails(WINMM_ControlDetails *details) return MMSYSERR_NOERROR; } +static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) +{ + WINMM_MMDevice *mmdevice; + IMMDevice *device; + IPropertyStore *ps; + PROPVARIANT pv; + DWORD len_bytes; + HRESULT hr; + + static const PROPERTYKEY deviceinterface_key = { + {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 + }; + + if(WINMM_IsMapper(info->index)){ + if(info->str){ + if(*info->len_bytes < sizeof(WCHAR)) + return MMSYSERR_INVALPARAM; + *info->str = 0; + }else + *info->len_bytes = sizeof(WCHAR); + return MMSYSERR_NOERROR; + } + + if(info->is_out){ + if(info->index >= g_outmmdevices_count) + return MMSYSERR_INVALHANDLE; + + mmdevice = &g_out_mmdevices[info->index]; + }else{ + if(info->index >= g_inmmdevices_count) + return MMSYSERR_INVALHANDLE; + + mmdevice = &g_in_mmdevices[info->index]; + } + + hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, + &device); + if(FAILED(hr)){ + WARN("Device %s unavailable: %08x\n", wine_dbgstr_w(mmdevice->dev_id), hr); + return MMSYSERR_ERROR; + } + + hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); + if(FAILED(hr)){ + WARN("OpenPropertyStore failed: %08x\n", hr); + IMMDevice_Release(device); + return MMSYSERR_ERROR; + } + + PropVariantInit(&pv); + hr = IPropertyStore_GetValue(ps, &deviceinterface_key, &pv); + if(FAILED(hr)){ + WARN("GetValue failed: %08x\n", hr); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + return MMSYSERR_ERROR; + } + if(pv.vt != VT_LPWSTR){ + WARN("Got unexpected property type: %u\n", pv.vt); + PropVariantClear(&pv); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + return MMSYSERR_ERROR; + } + + len_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + + if(info->str){ + if(len_bytes > *info->len_bytes){ + PropVariantClear(&pv); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + return MMSYSERR_INVALPARAM; + } + + memcpy(info->str, pv.u.pwszVal, len_bytes); + }else + *info->len_bytes = len_bytes; + + PropVariantClear(&pv); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + + return MMSYSERR_NOERROR; +} + static LRESULT CALLBACK WINMM_DevicesMsgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -2030,6 +2123,9 @@ static LRESULT CALLBACK WINMM_DevicesMsgProc(HWND hwnd, UINT msg, WPARAM wparam, return MXD_GetControlDetails((WINMM_ControlDetails*)wparam); case MXDM_SETCONTROLDETAILS: return MXD_SetControlDetails((WINMM_ControlDetails*)wparam); + case DRV_QUERYDEVICEINTERFACESIZE: + case DRV_QUERYDEVICEINTERFACE: + return DRV_QueryDeviceInterface((WINMM_QueryInterfaceInfo*)wparam); } return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -2781,6 +2877,21 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, return MMSYSERR_NOERROR; } +static UINT get_device_interface(UINT msg, BOOL is_out, UINT index, WCHAR *out, ULONG *out_len) +{ + WINMM_QueryInterfaceInfo info; + + if(!WINMM_StartDevicesThread()) + return MMSYSERR_ERROR; + + info.is_out = is_out; + info.index = index; + info.str = out; + info.len_bytes = out_len; + + return SendMessageW(g_devices_hwnd, msg, (DWORD_PTR)&info, 0); +} + /************************************************************************** * waveOutMessage [WINMM.@] */ @@ -2795,6 +2906,15 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, (DWORD_PTR*)dwParam1, TRUE); case DRV_QUERYFUNCTIONINSTANCEID: return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); + case DRV_QUERYDEVICEINTERFACESIZE: + return get_device_interface(DRV_QUERYDEVICEINTERFACESIZE, TRUE, HandleToULong(hWaveOut), + NULL, (ULONG*)dwParam1); + case DRV_QUERYDEVICEINTERFACE: + { + ULONG size = dwParam2; + return get_device_interface(DRV_QUERYDEVICEINTERFACE, TRUE, HandleToULong(hWaveOut), + (WCHAR*)dwParam1, &size); + } case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: @@ -3185,6 +3305,15 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, (DWORD_PTR*)dwParam1, FALSE); case DRV_QUERYFUNCTIONINSTANCEID: return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); + case DRV_QUERYDEVICEINTERFACESIZE: + return get_device_interface(DRV_QUERYDEVICEINTERFACESIZE, FALSE, HandleToULong(hWaveIn), + NULL, (ULONG*)dwParam1); + case DRV_QUERYDEVICEINTERFACE: + { + ULONG size = dwParam2; + return get_device_interface(DRV_QUERYDEVICEINTERFACE, FALSE, HandleToULong(hWaveIn), + (WCHAR*)dwParam1, &size); + } case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET:

1 0

Andrew Eikum : mmdevapi: Store device interface in registry.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: e6638bd86f6f5d3666ef71efea0d2214dd84ab9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6638bd86f6f5d3666ef71efe… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 14:16:40 2012 -0500 mmdevapi: Store device interface in registry. --- dlls/mmdevapi/devenum.c | 9 +++++++++ dlls/mmdevapi/tests/propstore.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b41bfa5..501ea4c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -268,6 +268,10 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st WCHAR guidstr[39]; DWORD i; + static const PROPERTYKEY deviceinterface_key = { + {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 + }; + for (i = 0; i < MMDevice_count; ++i) { MMDevice *device = MMDevice_head[i]; @@ -319,10 +323,15 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &keyprop, NULL)) { PROPVARIANT pv; + pv.vt = VT_LPWSTR; pv.u.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); + + pv.u.pwszVal = guidstr; + MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); + RegCloseKey(keyprop); } RegCloseKey(key); diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index a16dee1..482e439 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -64,6 +64,23 @@ static void test_propertystore(IPropertyStore *store) ok(pv.vt == VT_EMPTY, "Key should not be found\n"); } +static void test_deviceinterface(IPropertyStore *store) +{ + HRESULT hr; + PROPVARIANT pv; + + static const PROPERTYKEY deviceinterface_key = { + {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 + }; + + pv.vt = VT_EMPTY; + hr = IPropertyStore_GetValue(store, &deviceinterface_key, &pv); + ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); + trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); + CoTaskMemFree(pv.u.pwszVal); +} + START_TEST(propstore) { HRESULT hr; @@ -109,6 +126,7 @@ START_TEST(propstore) if (store) { test_propertystore(store); + test_deviceinterface(store); IPropertyStore_Release(store); } IMMDevice_Release(dev);

1 0

Andrew Eikum : dmusic: Check correct return code.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 9c79ba8a04d0a7a1721a2090c31d6e7629efd746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c79ba8a04d0a7a1721a2090c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 13:00:16 2012 -0500 dmusic: Check correct return code. --- dlls/dmusic/dmusic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index ba12f98..ef3143f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) - IDirectMusicSynth8_GetPortCaps(synth, port_caps); + hr = IDirectMusicSynth8_GetPortCaps(synth, port_caps); if (SUCCEEDED(hr)) TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); if (synth)

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXSpriteImpl_QueryInterface( ).
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 45c7b47b065c5f5876e96e7d1e130292fa626625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c7b47b065c5f5876e96e7d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:38 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXSpriteImpl_QueryInterface(). --- dlls/d3dx9_36/sprite.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index d81e13f..a8cbb53 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -69,17 +69,21 @@ static inline ID3DXSpriteImpl *impl_from_ID3DXSprite(ID3DXSprite *iface) return CONTAINING_RECORD(iface, ID3DXSpriteImpl, ID3DXSprite_iface); } -static HRESULT WINAPI ID3DXSpriteImpl_QueryInterface(ID3DXSprite *iface, REFIID riid, void **object) +static HRESULT WINAPI ID3DXSpriteImpl_QueryInterface(ID3DXSprite *iface, REFIID riid, void **out) { - ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); - if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXSprite)) { + if (IsEqualGUID(riid, &IID_ID3DXSprite) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *object=This; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p): not found\n", iface, debugstr_guid(riid), *object); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : dxgi: Don' t return a pointer to the implementation in dxgi_surface_inner_QueryInterface ().
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 719eeea2ae2f0b43b246ba7576f0d8d65e2ef71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=719eeea2ae2f0b43b246ba757… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:37 2012 +0200 dxgi: Don't return a pointer to the implementation in dxgi_surface_inner_QueryInterface(). --- dlls/dxgi/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4a5ea02..374832b 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -43,7 +43,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *ifa || IsEqualGUID(riid, &IID_IUnknown)) { IDXGISurface_AddRef(&This->IDXGISurface_iface); - *object = This; + *object = &This->IDXGISurface_iface; return S_OK; }

1 0

Henri Verbeet : ddraw/tests: Add some QueryInterface() tests for devices.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 9804ebcd9e63b460a905f48a4265b2b05e828124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9804ebcd9e63b460a905f48a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:36 2012 +0200 ddraw/tests: Add some QueryInterface() tests for devices. --- dlls/ddraw/tests/ddraw1.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 67 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 67 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9804ebcd9e63b460a905f…

1 0

Henri Verbeet : ddraw: Version 1 devices are aggregated by the surface that created them.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: cf30899f1afa304860e44b6e5f960464ffd6667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf30899f1afa304860e44b6e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:35 2012 +0200 ddraw: Version 1 devices are aggregated by the surface that created them. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/device.c | 268 +++++++++++++++++++++++-------------------- dlls/ddraw/surface.c | 24 +++-- dlls/ddraw/tests/d3d.c | 1 - 5 files changed, 165 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf30899f1afa304860e44…

1 0

Henri Verbeet : ddraw: Fix querying device interfaces in IDirect3DDeviceImpl_7_QueryInterface().
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: e13de0adf85a9cca97864885dfeda5a1ef156a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13de0adf85a9cca97864885d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:34 2012 +0200 ddraw: Fix querying device interfaces in IDirect3DDeviceImpl_7_QueryInterface(). Version 7 devices can only return the version 7 interface. The other versions can only return earlier interfaces. --- dlls/ddraw/device.c | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a1daa3f..e766940 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -117,33 +117,19 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, *obj = iface; } - /* Direct3DDevice */ - else if ( IsEqualGUID( &IID_IDirect3DDevice , refiid ) ) + if (This->version == 7) { - *obj = &This->IDirect3DDevice_iface; - TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3DDevice2 , refiid ) ) { - *obj = &This->IDirect3DDevice2_iface; - TRACE("(%p) Returning IDirect3DDevice2 interface at %p\n", This, *obj); + if (IsEqualGUID(&IID_IDirect3DDevice7, refiid)) + *obj = iface; } - else if ( IsEqualGUID( &IID_IDirect3DDevice3 , refiid ) ) { + else if (IsEqualGUID(&IID_IDirect3DDevice3, refiid) && This->version == 3) *obj = &This->IDirect3DDevice3_iface; - TRACE("(%p) Returning IDirect3DDevice3 interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3DDevice7 , refiid ) ) { - *obj = &This->IDirect3DDevice7_iface; - TRACE("(%p) Returning IDirect3DDevice7 interface at %p\n", This, *obj); - } - - /* DirectDrawSurface */ + else if (IsEqualGUID(&IID_IDirect3DDevice2, refiid) && This->version >= 2) + *obj = &This->IDirect3DDevice2_iface; + else if (IsEqualGUID(&IID_IDirect3DDevice, refiid)) + *obj = &This->IDirect3DDevice_iface; else if (IsEqualGUID(&IID_IDirectDrawSurface, refiid) && This->version == 1) - { *obj = &This->target->IDirectDrawSurface_iface; - TRACE("Returning IDirectDrawSurface interface %p.\n", *obj); - } - - /* Unknown interface */ else { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(refiid));

1 0

Erich Hoover : ntdll: Fix section header heap deadlock.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 48174b6d1eee8f6f5a8abd38668bad23f7a7762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48174b6d1eee8f6f5a8abd386… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Apr 5 10:36:33 2012 -0600 ntdll: Fix section header heap deadlock. --- dlls/ntdll/virtual.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7c2b1a9..d67f2d5 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1122,7 +1122,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - IMAGE_SECTION_HEADER *sec, *sections = NULL; + IMAGE_SECTION_HEADER sections[96]; + IMAGE_SECTION_HEADER *sec; IMAGE_DATA_DIRECTORY *imports; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; @@ -1168,15 +1169,10 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) goto error; header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; + if (nt->FileHeader.NumberOfSections > sizeof(sections)/sizeof(*sections)) goto error; if (header_start + sizeof(*sections) * nt->FileHeader.NumberOfSections > header_end) goto error; /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, * copying the headers into local memory is necessary to properly load such applications. */ - sections = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*sections) * nt->FileHeader.NumberOfSections); - if (!sections) - { - status = STATUS_NO_MEMORY; - goto error; - } memcpy(sections, header_start, sizeof(*sections) * nt->FileHeader.NumberOfSections); sec = sections; @@ -1374,7 +1370,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } done: - RtlFreeHeap( GetProcessHeap(), 0, sections ); view->mapping = dup_mapping; view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1387,7 +1382,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz return STATUS_SUCCESS; error: - RtlFreeHeap( GetProcessHeap(), 0, sections ); if (view) delete_view( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); if (dup_mapping) NtClose( dup_mapping );

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
72
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 April 2012