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

Christian Costa : amstream: Implement IAMMultiMediaStreamImpl_SetState.
by Alexandre Julliard 04 Apr '12

04 Apr '12

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 : ntdll: Free the correct section headers copy in map_image() .
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 31eff0665477699c41248c9d47d6eaa062d435d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31eff0665477699c41248c9d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 3 21:15:10 2012 +0200 ntdll: Free the correct section headers copy in map_image(). --- dlls/ntdll/virtual.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5271d18..450a1fb 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1122,7 +1122,7 @@ 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 = NULL; + IMAGE_SECTION_HEADER *sec, *sections = NULL; IMAGE_DATA_DIRECTORY *imports; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; @@ -1168,16 +1168,17 @@ 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 (header_start + sizeof(*sec) * nt->FileHeader.NumberOfSections > header_end) 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. */ - sec = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*sec) * nt->FileHeader.NumberOfSections); - if (!sec) + sections = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*sections) * nt->FileHeader.NumberOfSections); + if (!sections) { status = STATUS_NO_MEMORY; goto error; } - memcpy(sec, header_start, sizeof(*sec) * nt->FileHeader.NumberOfSections); + memcpy(sections, header_start, sizeof(*sections) * nt->FileHeader.NumberOfSections); + sec = sections; imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; if (!imports->Size || !imports->VirtualAddress) imports = NULL; @@ -1373,7 +1374,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } done: - RtlFreeHeap( GetProcessHeap(), 0, sec ); + RtlFreeHeap( GetProcessHeap(), 0, sections ); view->mapping = dup_mapping; view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1386,7 +1387,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz return STATUS_SUCCESS; error: - RtlFreeHeap( GetProcessHeap(), 0, sec ); + RtlFreeHeap( GetProcessHeap(), 0, sections ); if (view) delete_view( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); if (dup_mapping) NtClose( dup_mapping );

1 0

Henri Verbeet : ntdll: Use the copy of the section headers for applying memory protections as well in map_image ().
by Alexandre Julliard 04 Apr '12

04 Apr '12

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: Keep track of the ddraw version used to create a device.
by Alexandre Julliard 04 Apr '12

04 Apr '12

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

Henri Verbeet : ddraw: Replace an ERR in IDirect3DDeviceImpl_7_QueryInterface() with a WARN.
by Alexandre Julliard 04 Apr '12

04 Apr '12

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

Henri Verbeet : ddraw: Remove some interfaces from IDirect3DDeviceImpl_7_QueryInterface().
by Alexandre Julliard 04 Apr '12

04 Apr '12

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

Andrew Eikum : winealsa.drv: Use device GUIDs as keys.
by Alexandre Julliard 04 Apr '12

04 Apr '12

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 04 Apr '12

04 Apr '12

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

Huw Davies : wineps: Free the output string from the correct heap.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: 1432b3141ae8d8a0e9f37a6e785174a7542a31fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1432b3141ae8d8a0e9f37a6e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 15:25:50 2012 +0100 wineps: Free the output string from the correct heap. --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index c6a4488..4057bdd 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -412,7 +412,7 @@ static BOOL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n"); HeapFree( PSDRV_Heap, 0, physDev->Devmode ); - HeapFree( PSDRV_Heap, 0, physDev->job.output ); + HeapFree( GetProcessHeap(), 0, physDev->job.output ); HeapFree( PSDRV_Heap, 0, physDev ); return TRUE;

1 0

Huw Davies : wineps: Move some structs to the process heap.
by Alexandre Julliard 03 Apr '12

03 Apr '12

Module: wine Branch: master Commit: c9ddabad2227226e7795f30dc45c6a49784e3488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ddabad2227226e7795f30dc… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 3 15:25:51 2012 +0100 wineps: Move some structs to the process heap. --- dlls/wineps.drv/init.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 4057bdd..a927338 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -275,11 +275,11 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) /*********************************************************** * DEVMODEdupWtoA * - * Creates an ascii copy of supplied devmode on heap + * Creates an ascii copy of supplied devmode on the process heap * * Copied from dlls/winspool/info.c until full unicodification */ -static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) +static LPDEVMODEA DEVMODEdupWtoA( const DEVMODEW *dmW ) { LPDEVMODEA dmA; DWORD size; @@ -290,7 +290,7 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) if(!dmW) return NULL; Formname = (dmW->dmSize > off_formname); size = dmW->dmSize - CCHDEVICENAME - (Formname ? CCHFORMNAME : 0); - dmA = HeapAlloc(heap, HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra); + dmA = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size + dmW->dmDriverExtra ); WideCharToMultiByte(CP_ACP, 0, dmW->dmDeviceName, -1, (LPSTR)dmA->dmDeviceName, CCHDEVICENAME, NULL, NULL); if(!Formname) { @@ -315,13 +315,13 @@ static PSDRV_PDEVICE *create_psdrv_physdev( PRINTERINFO *pi ) { PSDRV_PDEVICE *physDev; - physDev = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*physDev) ); + physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ); if (!physDev) return NULL; - physDev->Devmode = HeapAlloc( PSDRV_Heap, 0, sizeof(PSDRV_DEVMODEA) ); + physDev->Devmode = HeapAlloc( GetProcessHeap(), 0, sizeof(PSDRV_DEVMODEA) ); if (!physDev->Devmode) { - HeapFree( PSDRV_Heap, 0, physDev ); + HeapFree( GetProcessHeap(), 0, physDev ); return NULL; } @@ -370,9 +370,9 @@ static BOOL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR driver, LPCWSTR device, if (output && *output) physDev->job.output = strdupW( output ); if(initData) { - DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, initData); + DEVMODEA *devmodeA = DEVMODEdupWtoA( initData ); PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODEA *)devmodeA, pi); - HeapFree(PSDRV_Heap, 0, devmodeA); + HeapFree( GetProcessHeap(), 0, devmodeA ); } PSDRV_UpdateDevCaps(physDev); @@ -411,9 +411,9 @@ static BOOL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n"); - HeapFree( PSDRV_Heap, 0, physDev->Devmode ); + HeapFree( GetProcessHeap(), 0, physDev->Devmode ); HeapFree( GetProcessHeap(), 0, physDev->job.output ); - HeapFree( PSDRV_Heap, 0, physDev ); + HeapFree( GetProcessHeap(), 0, physDev ); return TRUE; } @@ -427,9 +427,9 @@ static HDC PSDRV_ResetDC( PHYSDEV dev, const DEVMODEW *lpInitData ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); if(lpInitData) { - DEVMODEA *devmodeA = DEVMODEdupWtoA(PSDRV_Heap, lpInitData); + DEVMODEA *devmodeA = DEVMODEdupWtoA( lpInitData ); PSDRV_MergeDevmodes(physDev->Devmode, (PSDRV_DEVMODEA *)devmodeA, physDev->pi); - HeapFree(PSDRV_Heap, 0, devmodeA); + HeapFree( GetProcessHeap(), 0, devmodeA ); PSDRV_UpdateDevCaps(physDev); } return dev->hdc;

1 0