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

Henri Verbeet : d3d8: Introduce a separate function for swapchain creation.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 79dc34613149c2f72e1d32e88682b7d83fe710d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dc34613149c2f72e1d32e88… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:45:59 2012 +0200 d3d8: Introduce a separate function for swapchain creation. --- dlls/d3d8/d3d8_private.h | 4 +- dlls/d3d8/device.c | 65 +++++---------------------------------------- dlls/d3d8/swapchain.c | 27 ++++++++++++++++++- 3 files changed, 36 insertions(+), 60 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 583258a..af47e16 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -186,8 +186,8 @@ struct d3d8_swapchain IDirect3DDevice8 *parent_device; }; -HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, - struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; +HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapchain_desc *desc, + struct d3d8_swapchain **swapchain) DECLSPEC_HIDDEN; struct d3d8_surface { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6e47041..2ec1369 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -511,13 +511,6 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - ERR("Failed to allocate swapchain memory.\n"); - return E_OUTOFMEMORY; - } - desc.backbuffer_width = present_parameters->BackBufferWidth; desc.backbuffer_height = present_parameters->BackBufferHeight; desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); @@ -534,7 +527,8 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if desc.swap_interval = present_parameters->FullScreen_PresentationInterval; desc.auto_restore_display_mode = TRUE; - hr = swapchain_init(object, device, &desc); + if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) + *swapchain = &object->IDirect3DSwapChain8_iface; present_parameters->BackBufferWidth = desc.backbuffer_width; present_parameters->BackBufferHeight = desc.backbuffer_height; @@ -550,16 +544,6 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; present_parameters->FullScreen_PresentationInterval = desc.swap_interval; - if (FAILED(hr)) - { - WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } - - TRACE("Created swapchain %p.\n", object); - *swapchain = &object->IDirect3DSwapChain8_iface; - return D3D_OK; } @@ -605,7 +589,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, swapchain_desc.backbuffer_width = present_parameters->BackBufferWidth; swapchain_desc.backbuffer_height = present_parameters->BackBufferHeight; swapchain_desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - swapchain_desc.backbuffer_count = present_parameters->BackBufferCount; + swapchain_desc.backbuffer_count = max(1, present_parameters->BackBufferCount); swapchain_desc.multisample_type = present_parameters->MultiSampleType; swapchain_desc.multisample_quality = 0; /* d3d9 only */ swapchain_desc.swap_effect = present_parameters->SwapEffect; @@ -2982,54 +2966,21 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **swapchain) { struct d3d8_device *device = device_from_device_parent(device_parent); - D3DPRESENT_PARAMETERS local_parameters; - IDirect3DSwapChain8 *d3d_swapchain; + struct d3d8_swapchain *d3d_swapchain; HRESULT hr; TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - /* Copy the presentation parameters */ - local_parameters.BackBufferWidth = desc->backbuffer_width; - local_parameters.BackBufferHeight = desc->backbuffer_height; - local_parameters.BackBufferFormat = d3dformat_from_wined3dformat(desc->backbuffer_format); - local_parameters.BackBufferCount = desc->backbuffer_count; - local_parameters.MultiSampleType = desc->multisample_type; - local_parameters.SwapEffect = desc->swap_effect; - local_parameters.hDeviceWindow = desc->device_window; - local_parameters.Windowed = desc->windowed; - local_parameters.EnableAutoDepthStencil = desc->enable_auto_depth_stencil; - local_parameters.AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc->auto_depth_stencil_format); - local_parameters.Flags = desc->flags; - local_parameters.FullScreen_RefreshRateInHz = desc->refresh_rate; - local_parameters.FullScreen_PresentationInterval = desc->swap_interval; - - hr = IDirect3DDevice8_CreateAdditionalSwapChain(&device->IDirect3DDevice8_iface, - &local_parameters, &d3d_swapchain); - if (FAILED(hr)) + if (FAILED(hr = d3d8_swapchain_create(device, desc, &d3d_swapchain))) { WARN("Failed to create swapchain, hr %#x.\n", hr); *swapchain = NULL; return hr; } - *swapchain = ((struct d3d8_swapchain *)d3d_swapchain)->wined3d_swapchain; + *swapchain = d3d_swapchain->wined3d_swapchain; wined3d_swapchain_incref(*swapchain); - IDirect3DSwapChain8_Release(d3d_swapchain); - - /* Copy back the presentation parameters */ - desc->backbuffer_width = local_parameters.BackBufferWidth; - desc->backbuffer_height = local_parameters.BackBufferHeight; - desc->backbuffer_format = wined3dformat_from_d3dformat(local_parameters.BackBufferFormat); - desc->backbuffer_count = local_parameters.BackBufferCount; - desc->multisample_type = local_parameters.MultiSampleType; - desc->swap_effect = local_parameters.SwapEffect; - desc->device_window = local_parameters.hDeviceWindow; - desc->windowed = local_parameters.Windowed; - desc->enable_auto_depth_stencil = local_parameters.EnableAutoDepthStencil; - desc->auto_depth_stencil_format = wined3dformat_from_d3dformat(local_parameters.AutoDepthStencilFormat); - desc->flags = local_parameters.Flags; - desc->refresh_rate = local_parameters.FullScreen_RefreshRateInHz; - desc->swap_interval = local_parameters.FullScreen_PresentationInterval; + IDirect3DSwapChain8_Release(&d3d_swapchain->IDirect3DSwapChain8_iface); return hr; } @@ -3121,7 +3072,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine swapchain_desc.backbuffer_width = parameters->BackBufferWidth; swapchain_desc.backbuffer_height = parameters->BackBufferHeight; swapchain_desc.backbuffer_format = wined3dformat_from_d3dformat(parameters->BackBufferFormat); - swapchain_desc.backbuffer_count = parameters->BackBufferCount; + swapchain_desc.backbuffer_count = max(1, parameters->BackBufferCount); swapchain_desc.multisample_type = parameters->MultiSampleType; swapchain_desc.multisample_quality = 0; /* d3d9 only */ swapchain_desc.swap_effect = parameters->SwapEffect; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 02c7fff..0410fb8 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -149,7 +149,7 @@ static const struct wined3d_parent_ops d3d8_swapchain_wined3d_parent_ops = d3d8_swapchain_wined3d_object_released, }; -HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, +static HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, struct wined3d_swapchain_desc *desc) { HRESULT hr; @@ -174,3 +174,28 @@ HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *dev return D3D_OK; } + +HRESULT d3d8_swapchain_create(struct d3d8_device *device, struct wined3d_swapchain_desc *desc, + struct d3d8_swapchain **swapchain) +{ + struct d3d8_swapchain *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + ERR("Failed to allocate swapchain memory.\n"); + return E_OUTOFMEMORY; + } + + if (FAILED(hr = swapchain_init(object, device, desc))) + { + WARN("Failed to initialize swapchain, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created swapchain %p.\n", object); + *swapchain = object; + + return D3D_OK; +}

1 0

Henri Verbeet : d3d8: Pass a wined3d_swapchain_desc structure to swapchain_init().
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 9e0d03e65346e06212649792f88b7d319a76c2ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0d03e65346e06212649792f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:45:58 2012 +0200 d3d8: Pass a wined3d_swapchain_desc structure to swapchain_init(). --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 34 +++++++++++++++++++++++++++++++++- dlls/d3d8/swapchain.c | 35 ++--------------------------------- 3 files changed, 36 insertions(+), 35 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 13fb707..583258a 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -187,7 +187,7 @@ struct d3d8_swapchain }; HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, - D3DPRESENT_PARAMETERS *present_parameters) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; struct d3d8_surface { diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d5fd32a..6e47041 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -504,6 +504,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if D3DPRESENT_PARAMETERS *present_parameters, IDirect3DSwapChain8 **swapchain) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_swapchain_desc desc; struct d3d8_swapchain *object; HRESULT hr; @@ -517,7 +518,38 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if return E_OUTOFMEMORY; } - hr = swapchain_init(object, device, present_parameters); + desc.backbuffer_width = present_parameters->BackBufferWidth; + desc.backbuffer_height = present_parameters->BackBufferHeight; + desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); + desc.backbuffer_count = max(1, present_parameters->BackBufferCount); + desc.multisample_type = present_parameters->MultiSampleType; + desc.multisample_quality = 0; /* d3d9 only */ + desc.swap_effect = present_parameters->SwapEffect; + desc.device_window = present_parameters->hDeviceWindow; + desc.windowed = present_parameters->Windowed; + desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; + desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); + desc.flags = present_parameters->Flags; + desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; + desc.swap_interval = present_parameters->FullScreen_PresentationInterval; + desc.auto_restore_display_mode = TRUE; + + hr = swapchain_init(object, device, &desc); + + present_parameters->BackBufferWidth = desc.backbuffer_width; + present_parameters->BackBufferHeight = desc.backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); + present_parameters->BackBufferCount = desc.backbuffer_count; + present_parameters->MultiSampleType = desc.multisample_type; + present_parameters->SwapEffect = desc.swap_effect; + present_parameters->hDeviceWindow = desc.device_window; + present_parameters->Windowed = desc.windowed; + present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; + present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); + present_parameters->Flags = desc.flags; + present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; + present_parameters->FullScreen_PresentationInterval = desc.swap_interval; + if (FAILED(hr)) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 44719d5..02c7fff 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -150,50 +150,19 @@ static const struct wined3d_parent_ops d3d8_swapchain_wined3d_parent_ops = }; HRESULT swapchain_init(struct d3d8_swapchain *swapchain, struct d3d8_device *device, - D3DPRESENT_PARAMETERS *present_parameters) + struct wined3d_swapchain_desc *desc) { - struct wined3d_swapchain_desc desc; HRESULT hr; swapchain->refcount = 1; swapchain->IDirect3DSwapChain8_iface.lpVtbl = &d3d8_swapchain_vtbl; - desc.backbuffer_width = present_parameters->BackBufferWidth; - desc.backbuffer_height = present_parameters->BackBufferHeight; - desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - desc.multisample_type = present_parameters->MultiSampleType; - desc.multisample_quality = 0; /* d3d9 only */ - desc.swap_effect = present_parameters->SwapEffect; - desc.device_window = present_parameters->hDeviceWindow; - desc.windowed = present_parameters->Windowed; - desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - desc.flags = present_parameters->Flags; - desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - desc.swap_interval = present_parameters->FullScreen_PresentationInterval; - desc.auto_restore_display_mode = TRUE; - wined3d_mutex_lock(); - hr = wined3d_swapchain_create(device->wined3d_device, &desc, + hr = wined3d_swapchain_create(device->wined3d_device, desc, WINED3D_SURFACE_TYPE_OPENGL, swapchain, &d3d8_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain); wined3d_mutex_unlock(); - present_parameters->BackBufferWidth = desc.backbuffer_width; - present_parameters->BackBufferHeight = desc.backbuffer_height; - present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - present_parameters->BackBufferCount = desc.backbuffer_count; - present_parameters->MultiSampleType = desc.multisample_type; - present_parameters->SwapEffect = desc.swap_effect; - present_parameters->hDeviceWindow = desc.device_window; - present_parameters->Windowed = desc.windowed; - present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - present_parameters->Flags = desc.flags; - present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - present_parameters->FullScreen_PresentationInterval = desc.swap_interval; - if (FAILED(hr)) { WARN("Failed to create wined3d swapchain, hr %#x.\n", hr);

1 0

Henri Verbeet : d3d9: Implement d3d9_EnumAdapterModesEx().
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: e97dc9f33d152bb0cbaca145dcda3c5158eac252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97dc9f33d152bb0cbaca145d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 2 14:45:56 2012 +0200 d3d9: Implement d3d9_EnumAdapterModesEx(). --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 27 ++++++++++++++++++++++++--- dlls/ddraw/ddraw.c | 4 ++-- dlls/dxgi/output.c | 3 ++- dlls/wined3d/directx.c | 18 +++++++++++++++--- include/wine/wined3d.h | 3 ++- 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 19575b1..89c2fcc 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -174,7 +174,8 @@ static HRESULT WINAPI d3d8_EnumAdapterModes(IDirect3D8 *iface, UINT adapter, UIN iface, adapter, mode_idx, mode); wined3d_mutex_lock(); - hr = wined3d_enum_adapter_modes(d3d8->wined3d, adapter, WINED3DFMT_UNKNOWN, mode_idx, &wined3d_mode); + hr = wined3d_enum_adapter_modes(d3d8->wined3d, adapter, WINED3DFMT_UNKNOWN, + WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 02b2360..3cb979f 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -186,7 +186,7 @@ static HRESULT WINAPI d3d9_EnumAdapterModes(IDirect3D9Ex *iface, UINT adapter, wined3d_mutex_lock(); hr = wined3d_enum_adapter_modes(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(format), - mode_idx, &wined3d_mode); + WINED3D_SCANLINE_ORDERING_UNKNOWN, mode_idx, &wined3d_mode); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -497,10 +497,31 @@ static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode) { - FIXME("iface %p, adapter %u, filter %p, mode_idx %u, mode %p stub!\n", + struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + struct wined3d_display_mode wined3d_mode; + HRESULT hr; + + TRACE("iface %p, adapter %u, filter %p, mode_idx %u, mode %p.\n", iface, adapter, filter, mode_idx, mode); - return E_NOTIMPL; + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + hr = wined3d_enum_adapter_modes(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(filter->Format), + filter->ScanLineOrdering, mode_idx, &wined3d_mode); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + { + mode->Width = wined3d_mode.width; + mode->Height = wined3d_mode.height; + mode->RefreshRate = wined3d_mode.refresh_rate; + mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); + mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + } + + return hr; } static HRESULT WINAPI d3d9_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1628e20..356d726 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2221,8 +2221,8 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) { modenum = 0; - while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, - checkFormatList[fmt], modenum++, &mode) == WINED3D_OK) + while (wined3d_enum_adapter_modes(ddraw->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], + WINED3D_SCANLINE_ORDERING_UNKNOWN, modenum++, &mode) == WINED3D_OK) { PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); if (DDSD) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 4876507..4cdd06b 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -164,7 +164,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa struct wined3d_display_mode mode; HRESULT hr; - hr = wined3d_enum_adapter_modes(wined3d, This->adapter->ordinal, wined3d_format, i, &mode); + hr = wined3d_enum_adapter_modes(wined3d, This->adapter->ordinal, wined3d_format, + WINED3D_SCANLINE_ORDERING_UNKNOWN, i, &mode); if (FAILED(hr)) { WARN("EnumAdapterModes failed, hr %#x.\n", hr); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index aef06af..381eae7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2945,7 +2945,8 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT mode_idx, struct wined3d_display_mode *mode) + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, + UINT mode_idx, struct wined3d_display_mode *mode) { const struct wined3d_adapter *adapter; const struct wined3d_format *format; @@ -2954,8 +2955,8 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada UINT i = 0; int j = 0; - TRACE("wined3d %p, adapter_idx %u, format %s, mode_idx %u, mode %p.\n", - wined3d, adapter_idx, debug_d3dformat(format_id), mode_idx, mode); + TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x, mode_idx %u, mode %p.\n", + wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering, mode_idx, mode); if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; @@ -2975,6 +2976,17 @@ HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT ada return WINED3DERR_INVALIDCALL; } + if (m.dmFields & DM_DISPLAYFLAGS) + { + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE + && (m.u2.dmDisplayFlags & DM_INTERLACED)) + continue; + + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED + && !(m.u2.dmDisplayFlags & DM_INTERLACED)) + continue; + } + if (format_id == WINED3DFMT_UNKNOWN) { /* This is for d3d8, do not enumerate P8 here. */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f346455..b85b257 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2037,7 +2037,8 @@ HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT ad struct wined3d * __cdecl wined3d_create(UINT version, DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id, UINT mode_idx, struct wined3d_display_mode *mode); + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering, + UINT mode_idx, struct wined3d_display_mode *mode); UINT __cdecl wined3d_get_adapter_count(const struct wined3d *wined3d); HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, UINT adapter_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Huw Davies : wineps: Add support for printing fake italic fonts.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: bb1740a42e0a4b0522bc32f65a017934788931df URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1740a42e0a4b0522bc32f65… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 2 13:42:16 2012 +0100 wineps: Add support for printing fake italic fonts. --- dlls/wineps.drv/builtin.c | 2 +- dlls/wineps.drv/download.c | 21 ++++++++++++++++++++- dlls/wineps.drv/ps.c | 44 +++++++++++++++++++++++++++++++++++--------- dlls/wineps.drv/psdrv.h | 3 ++- 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index 7fc23cf..873a473 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -238,7 +238,7 @@ BOOL PSDRV_WriteSetBuiltinFont(PHYSDEV dev) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); return PSDRV_WriteSetFont(dev, physDev->font.fontinfo.Builtin.afm->FontName, - physDev->font.size, physDev->font.escapement); + physDev->font.size, physDev->font.escapement, FALSE); } BOOL PSDRV_WriteBuiltinGlyphShow(PHYSDEV dev, LPCWSTR str, INT count) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 6af4841..6b87172 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -239,6 +239,24 @@ static inline float ps_round(float f) { return (f > 0) ? (f + 0.5) : (f - 0.5); } + +static BOOL is_fake_italic( HDC hdc ) +{ + TEXTMETRICW tm; + BYTE head[54]; /* the head table is 54 bytes long */ + WORD mac_style; + + GetTextMetricsW( hdc, &tm ); + if (!tm.tmItalic) return FALSE; + + if (GetFontData( hdc, MS_MAKE_TAG('h','e','a','d'), 0, head, sizeof(head) ) == GDI_ERROR) + return FALSE; + + mac_style = GET_BE_WORD( head + 44 ); + TRACE( "mac style %04x\n", mac_style ); + return !(mac_style & 2); +} + /**************************************************************************** * PSDRV_WriteSetDownloadFont * @@ -328,7 +346,8 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev) } - PSDRV_WriteSetFont(dev, ps_name, physDev->font.size, physDev->font.escapement); + PSDRV_WriteSetFont(dev, ps_name, physDev->font.size, physDev->font.escapement, + is_fake_italic( dev->hdc )); HeapFree(GetProcessHeap(), 0, ps_name); HeapFree(GetProcessHeap(), 0, potm); diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index 2e7597a..b6bbe7a 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -129,11 +129,23 @@ static const char psrectangle[] = /* x, y, width, height, -width */ static const char psglyphshow[] = /* glyph name */ "/%s glyphshow\n"; -static const char pssetfont[] = /* fontname, xx_scale, xy_scale, yx_scale, yy_scale, escapement */ -"/%s findfont\n" -"[%d %d %d %d 0 0]\n" +static const char psfindfont[] = /* fontname */ +"/%s findfont\n"; + +static const char psfakeitalic[] = +"[1 0 0.25 1 0 0]\n"; + +static const char pssizematrix[] = +"[%d %d %d %d 0 0]\n"; + +static const char psconcat[] = +"matrix concatmatrix\n"; + +static const char psrotatefont[] = /* escapement */ "%d 10 div matrix rotate\n" -"matrix concatmatrix\n" +"matrix concatmatrix\n"; + +static const char pssetfont[] = "makefont setfont\n"; static const char pssetline[] = /* width, join, endcap */ @@ -554,22 +566,36 @@ BOOL PSDRV_WriteCurveTo(PHYSDEV dev, POINT pts[3]) return PSDRV_WriteSpool(dev, buf, strlen(buf)); } - -BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement) +BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, BOOL fake_italic) { char *buf; - buf = HeapAlloc( GetProcessHeap(), 0, sizeof(pssetfont) + strlen(name) + 40 ); + buf = HeapAlloc( GetProcessHeap(), 0, strlen(name) + 256 ); if(!buf) { WARN("HeapAlloc failed\n"); return FALSE; } - sprintf(buf, pssetfont, name, size.xx, size.xy, size.yx, size.yy, -escapement); + sprintf( buf, psfindfont, name ); + PSDRV_WriteSpool( dev, buf, strlen(buf) ); - PSDRV_WriteSpool(dev, buf, strlen(buf)); + if (fake_italic) PSDRV_WriteSpool( dev, psfakeitalic, sizeof(psfakeitalic) - 1 ); + + sprintf( buf, pssizematrix, size.xx, size.xy, size.yx, size.yy ); + PSDRV_WriteSpool( dev, buf, strlen(buf) ); + + if (fake_italic) PSDRV_WriteSpool( dev, psconcat, sizeof(psconcat) - 1 ); + + if (escapement) + { + sprintf( buf, psrotatefont, -escapement ); + PSDRV_WriteSpool( dev, buf, strlen(buf) ); + } + + PSDRV_WriteSpool( dev, pssetfont, sizeof(pssetfont) - 1 ); HeapFree( GetProcessHeap(), 0, buf ); + return TRUE; } diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 42ace2d..52f84e7 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -489,7 +489,8 @@ extern BOOL PSDRV_WriteLineTo(PHYSDEV dev, INT x, INT y) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteStroke(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRectangle(PHYSDEV dev, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteRRectangle(PHYSDEV dev, INT x, INT y, INT width, INT height) DECLSPEC_HIDDEN; -extern BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement) DECLSPEC_HIDDEN; +extern BOOL PSDRV_WriteSetFont(PHYSDEV dev, const char *name, matrix size, INT escapement, + BOOL fake_italic) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteGlyphShow(PHYSDEV dev, LPCSTR g_name) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteSetPen(PHYSDEV dev) DECLSPEC_HIDDEN; extern BOOL PSDRV_WriteArc(PHYSDEV dev, INT x, INT y, INT w, INT h,

1 0

Alexandre Julliard : wined3d: Get WGL extension definitions from wglext.h.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 8f80159d407dc8d1c5af6f3ed00397b45adb1678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f80159d407dc8d1c5af6f3ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 14:19:06 2012 +0200 wined3d: Get WGL extension definitions from wglext.h. --- dlls/wined3d/wined3d_gl.h | 92 ++++----------------------------------------- 1 files changed, 8 insertions(+), 84 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index b8e2195..4e58971 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3693,86 +3693,10 @@ typedef void (WINE_GLAPI *PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, #define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 #endif -/* WGL_ARB_extensions_string */ -typedef const char *(WINAPI *WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC hdc); - -/* WGL_ARB_multisample */ -#ifndef WGL_ARB_multisample -#define WGL_ARB_multisample 1 -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 -#endif - -/* WGL_ARB_pixel_format */ -#ifndef WGL_ARB_pixel_format -#define WGL_ARB_pixel_format 1 -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_DRAW_TO_BITMAP_ARB 0x2002 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_NEED_PALETTE_ARB 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 -#define WGL_SWAP_METHOD_ARB 0x2007 -#define WGL_NUMBER_OVERLAYS_ARB 0x2008 -#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 -#define WGL_TRANSPARENT_ARB 0x200a -#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 -#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 -#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 -#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203a -#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203b -#define WGL_SHARE_DEPTH_ARB 0x200c -#define WGL_SHARE_STENCIL_ARB 0x200d -#define WGL_SHARE_ACCUM_ARB 0x200e -#define WGL_SUPPORT_GDI_ARB 0x200f -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_RED_SHIFT_ARB 0x2016 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_GREEN_SHIFT_ARB 0x2018 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_BLUE_SHIFT_ARB 0x201a -#define WGL_ALPHA_BITS_ARB 0x201b -#define WGL_ALPHA_SHIFT_ARB 0x201c -#define WGL_ACCUM_BITS_ARB 0x201d -#define WGL_ACCUM_RED_BITS_ARB 0x201e -#define WGL_ACCUM_GREEN_BITS_ARB 0x201f -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 -#define WGL_SWAP_EXCHANGE_ARB 0x2028 -#define WGL_SWAP_COPY_ARB 0x2029 -#define WGL_SWAP_UNDEFINED_ARB 0x202a -#define WGL_TYPE_RGBA_ARB 0x202b -#define WGL_TYPE_COLORINDEX_ARB 0x202c -#endif -typedef BOOL (WINAPI *WINED3D_PFNWGLGETPIXELFORMATATTRIBIVARBPROC)(HDC hdc, int iPixelFormat, - int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -typedef BOOL (WINAPI *WINED3D_PFNWGLGETPIXELFORMATATTRIBFVARBPROC)(HDC hdc, int iPixelFormat, - int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI *WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC)(HDC hdc, const int *piAttribIList, - const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); - -/* WGL_ARB_pixel_format_float */ -#ifndef WGL_ARB_pixel_format_float -#define WGL_ARB_pixel_format_float 1 -#define WGL_TYPE_RGBA_FLOAT_ARB 0x21a0 -#endif +#include "wine/wglext.h" /* WGL_WINE_pixel_format_passthrough */ -typedef BOOL (WINAPI *WINED3D_PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); - -typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); +typedef BOOL (WINAPI *PFNWGLSETPIXELFORMATWINE)(HDC hdc, int iPixelFormat); #define GL_EXT_FUNCS_GEN \ /* GL_APPLE_fence */ \ @@ -4515,11 +4439,11 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); glFinalCombinerInputNV, NV_REGISTER_COMBINERS, NULL) \ #define WGL_EXT_FUNCS_GEN \ - USE_GL_FUNC(WINED3D_PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLGETPIXELFORMATATTRIBFVARBPROC, wglGetPixelFormatAttribfvARB, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) \ - USE_GL_FUNC(WINED3D_PFNWGLSWAPINTERVALEXTPROC, wglSwapIntervalEXT, 0, NULL) + USE_GL_FUNC(PFNWGLGETEXTENSIONSSTRINGARBPROC, wglGetExtensionsStringARB, 0, NULL) \ + USE_GL_FUNC(PFNWGLGETPIXELFORMATATTRIBIVARBPROC, wglGetPixelFormatAttribivARB, 0, NULL) \ + USE_GL_FUNC(PFNWGLGETPIXELFORMATATTRIBFVARBPROC, wglGetPixelFormatAttribfvARB, 0, NULL) \ + USE_GL_FUNC(PFNWGLCHOOSEPIXELFORMATARBPROC, wglChoosePixelFormatARB, 0, NULL) \ + USE_GL_FUNC(PFNWGLSETPIXELFORMATWINE, wglSetPixelFormatWINE, 0, NULL) \ + USE_GL_FUNC(PFNWGLSWAPINTERVALEXTPROC, wglSwapIntervalEXT, 0, NULL) #endif /* __WINE_WINED3D_GL */

1 0

Alexandre Julliard : winex11: Replace wgl.h by the official wglext. h from the OpenGL registry.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 39819d1e8b421d9031b1c4db667338300a4b00d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39819d1e8b421d9031b1c4db6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 2 13:42:03 2012 +0200 winex11: Replace wgl.h by the official wglext.h from the OpenGL registry. --- dlls/winex11.drv/opengl.c | 74 ++-- include/wine/wgl.h | 178 --------- include/wine/wglext.h | 943 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 974 insertions(+), 221 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39819d1e8b421d9031b1c…

1 0

Alexandre Julliard : winex11: Move GLX definitions out of wgl.h.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 19fcc230d016e9db93cb8400918f673266468ada URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fcc230d016e9db93cb84009… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 26 21:57:46 2012 +0200 winex11: Move GLX definitions out of wgl.h. --- dlls/winex11.drv/opengl.c | 68 ++++++++++++++++++++++++++++++++++++++------ include/wine/wgl.h | 62 +--------------------------------------- 2 files changed, 60 insertions(+), 70 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b351750..3abb8a5 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); #ifdef SONAME_LIBGL WINE_DECLARE_DEBUG_CHANNEL(winediag); +WINE_DECLARE_DEBUG_CHANNEL(fps); #undef APIENTRY #undef CALLBACK @@ -59,8 +60,6 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); # include <GL/glx.h> #endif -#include "wine/wgl.h" - #undef APIENTRY #undef CALLBACK #undef WINAPI @@ -70,8 +69,57 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINAPI __stdcall #define APIENTRY WINAPI +#include "wine/wgl.h" + +/* For compatibility with old Mesa headers */ +#ifndef GLX_SAMPLE_BUFFERS_ARB +# define GLX_SAMPLE_BUFFERS_ARB 100000 +#endif +#ifndef GLX_SAMPLES_ARB +# define GLX_SAMPLES_ARB 100001 +#endif +#ifndef GL_TEXTURE_CUBE_MAP +# define GL_TEXTURE_CUBE_MAP 0x8513 +#endif +#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT +# define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 +#endif +#ifndef GLX_EXT_fbconfig_packed_float +# define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 +# define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008 +#endif +#ifndef GLX_ARB_create_context +# define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 +# define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 +# define GLX_CONTEXT_FLAGS_ARB 0x2094 +#endif +#ifndef GLX_ARB_create_context_profile +# define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 +#endif +/** GLX_ATI_pixel_format_float */ +#define GLX_RGBA_FLOAT_ATI_BIT 0x00000100 +/** GLX_ARB_pixel_format_float */ +#define GLX_RGBA_FLOAT_BIT 0x00000004 +#define GLX_RGBA_FLOAT_TYPE 0x20B9 +/** GL_NV_float_buffer */ +#define GL_FLOAT_R_NV 0x8880 +#define GL_FLOAT_RG_NV 0x8881 +#define GL_FLOAT_RGB_NV 0x8882 +#define GL_FLOAT_RGBA_NV 0x8883 +#define GL_FLOAT_R16_NV 0x8884 +#define GL_FLOAT_R32_NV 0x8885 +#define GL_FLOAT_RG16_NV 0x8886 +#define GL_FLOAT_RG32_NV 0x8887 +#define GL_FLOAT_RGB16_NV 0x8888 +#define GL_FLOAT_RGB32_NV 0x8889 +#define GL_FLOAT_RGBA16_NV 0x888A +#define GL_FLOAT_RGBA32_NV 0x888B +#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C +#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D +#define GL_FLOAT_RGBA_MODE_NV 0x888E +/** GLX_NV_float_buffer */ +#define GLX_FLOAT_COMPONENTS_NV 0x20B0 -WINE_DECLARE_DEBUG_CHANNEL(fps); typedef struct wine_glextension { const char *extName; @@ -2137,7 +2185,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, goto create_failed; /* unexpected error */ } TRACE("->(%p)\n", object); - return object; + return (HPBUFFERARB)object; create_failed: HeapFree(GetProcessHeap(), 0, object); @@ -2152,7 +2200,7 @@ create_failed: */ static GLboolean WINAPI X11DRV_wglDestroyPbufferARB(HPBUFFERARB hPbuffer) { - Wine_GLPBuffer* object = hPbuffer; + Wine_GLPBuffer* object = (Wine_GLPBuffer *)hPbuffer; TRACE("(%p)\n", hPbuffer); if (NULL == object) { SetLastError(ERROR_INVALID_HANDLE); @@ -2173,7 +2221,7 @@ static GLboolean WINAPI X11DRV_wglDestroyPbufferARB(HPBUFFERARB hPbuffer) static HDC WINAPI X11DRV_wglGetPbufferDCARB(HPBUFFERARB hPbuffer) { struct x11drv_escape_set_drawable escape; - Wine_GLPBuffer* object = hPbuffer; + Wine_GLPBuffer* object = (Wine_GLPBuffer *)hPbuffer; HDC hdc; if (NULL == object) { @@ -2206,7 +2254,7 @@ static HDC WINAPI X11DRV_wglGetPbufferDCARB(HPBUFFERARB hPbuffer) */ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAttribute, int *piValue) { - Wine_GLPBuffer* object = hPbuffer; + Wine_GLPBuffer* object = (Wine_GLPBuffer *)hPbuffer; TRACE("(%p, 0x%x, %p)\n", hPbuffer, iAttribute, piValue); if (NULL == object) { SetLastError(ERROR_INVALID_HANDLE); @@ -2314,7 +2362,7 @@ static int WINAPI X11DRV_wglReleasePbufferDCARB(HPBUFFERARB hPbuffer, HDC hdc) */ static GLboolean WINAPI X11DRV_wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, const int *piAttribList) { - Wine_GLPBuffer* object = hPbuffer; + Wine_GLPBuffer* object = (Wine_GLPBuffer *)hPbuffer; GLboolean ret = GL_FALSE; WARN("(%p, %p): alpha-testing, report any problem\n", hPbuffer, piAttribList); @@ -2729,7 +2777,7 @@ static GLboolean WINAPI X11DRV_wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelF */ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) { - Wine_GLPBuffer* object = hPbuffer; + Wine_GLPBuffer* object = (Wine_GLPBuffer *)hPbuffer; GLboolean ret = GL_FALSE; TRACE("(%p, %d)\n", hPbuffer, iBuffer); @@ -2792,7 +2840,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf */ static GLboolean WINAPI X11DRV_wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int iBuffer) { - Wine_GLPBuffer* object = hPbuffer; + Wine_GLPBuffer* object = (Wine_GLPBuffer *)hPbuffer; GLboolean ret = GL_FALSE; TRACE("(%p, %d)\n", hPbuffer, iBuffer); diff --git a/include/wine/wgl.h b/include/wine/wgl.h index 1ac9e6a..2e619d8 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -20,18 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* For compatibility with old Mesa headers */ -#ifndef GLX_SAMPLE_BUFFERS_ARB -# define GLX_SAMPLE_BUFFERS_ARB 100000 -#endif -#ifndef GLX_SAMPLES_ARB -# define GLX_SAMPLES_ARB 100001 -#endif -#ifndef GL_TEXTURE_CUBE_MAP -# define GL_TEXTURE_CUBE_MAP 0x8513 -#endif - -#define HPBUFFERARB void * +DECLARE_HANDLE(HPBUFFERARB); +DECLARE_HANDLE(HPBUFFEREXT); #define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 #define WGL_DRAW_TO_WINDOW_ARB 0x2001 @@ -163,35 +153,11 @@ #define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 #define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 #define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 -/** GL_NV_float_buffer */ -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E - /** WGL_EXT_framebuffer_sRGB */ #define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 -#ifndef GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT -# define GLX_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20B2 -#endif /* WGL_EXT_pixel_format_packed_float */ #define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 -#ifndef GLX_EXT_fbconfig_packed_float -#define GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT 0x20B1 -#define GLX_RGBA_UNSIGNED_FLOAT_BIT_EXT 0x00000008 -#endif /** WGL_ARB_create_context */ #define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 @@ -205,32 +171,8 @@ #define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #define ERROR_INVALID_VERSION_ARB 0x2095 #define ERROR_INVALID_PROFILE_ARB 0x2096 -#ifndef GLX_ARB_create_context -#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 -#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 -#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define GLX_CONTEXT_FLAGS_ARB 0x2094 -#endif -#ifndef GLX_ARB_create_context_profile -#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 -#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 -#endif /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float */ #define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 -#define GL_RGBA_FLOAT_MODE_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -/** GLX_ATI_pixel_format_float */ -#define GLX_RGBA_FLOAT_ATI_BIT 0x00000100 -/** GLX_ARB_pixel_format_float */ -#define GLX_RGBA_FLOAT_BIT 0x00000004 -#define GLX_RGBA_FLOAT_TYPE 0x20B9 -/** GLX_NV_float_buffer */ -#define GLX_FLOAT_COMPONENTS_NV 0x20B0

1 0

Józef Kucia : d3dx9: Forward D3DXCreateVolumeTextureFromFile functions to D3DXCreateVolumeTextureFromFileInMemoryEx .
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: fde802a04da79cece313d9cb4a6b672839849191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde802a04da79cece313d9cb4… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:17:02 2012 +0200 d3dx9: Forward D3DXCreateVolumeTextureFromFile functions to D3DXCreateVolumeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 8 +- dlls/d3dx9_36/texture.c | 138 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index fbfa5f1..33038ca 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -107,12 +107,12 @@ @ stub D3DXCreateTextureShader(ptr ptr) @ stub D3DXCreateTorus(ptr long long long long ptr ptr) @ stdcall D3DXCreateVolumeTexture(ptr long long long long long long long ptr) -@ stub D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) -@ stub D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExW(ptr long ptr long long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f439913..91f97c2 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -977,6 +977,144 @@ HRESULT WINAPI D3DXCreateVolumeTexture(LPDIRECT3DDEVICE9 device, usage, format, pool, texture, NULL); } +HRESULT WINAPI D3DXCreateVolumeTextureFromFileA(IDirect3DDevice9 *device, + const char *filename, + IDirect3DVolumeTexture9 **volume_texture) +{ + int len; + HRESULT hr; + void *data; + DWORD data_size; + WCHAR *filenameW; + + TRACE("(%p, %s, %p): relay\n", + device, debugstr_a(filename), volume_texture); + + if (!filename) return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filenameW) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = map_view_of_file(filenameW, &data, &data_size); + HeapFree(GetProcessHeap(), 0, filenameW); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, data, data_size, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, volume_texture); + + UnmapViewOfFile(data); + return hr; +} + +HRESULT WINAPI D3DXCreateVolumeTextureFromFileW(IDirect3DDevice9 *device, + const WCHAR *filename, + IDirect3DVolumeTexture9 **volume_texture) +{ + HRESULT hr; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %p): relay\n", + device, debugstr_w(filename), volume_texture); + + if (!filename) return D3DERR_INVALIDCALL; + + hr = map_view_of_file(filename, &data, &data_size); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, data, data_size, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, volume_texture); + + UnmapViewOfFile(data); + return hr; +} + +HRESULT WINAPI D3DXCreateVolumeTextureFromFileExA(IDirect3DDevice9 *device, + const char *filename, + UINT width, + UINT height, + UINT depth, + UINT mip_levels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mip_filter, + D3DCOLOR color_key, + D3DXIMAGE_INFO *src_info, + PALETTEENTRY *palette, + IDirect3DVolumeTexture9 **volume_texture) +{ + int len; + HRESULT hr; + WCHAR *filenameW; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %u, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): relay\n", + device, debugstr_a(filename), width, height, depth, mip_levels, + usage, format, pool, filter, mip_filter, color_key, src_info, + palette, volume_texture); + + if (!filename) return D3DERR_INVALIDCALL; + + len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); + filenameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!filenameW) return E_OUTOFMEMORY; + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, len); + + hr = map_view_of_file(filenameW, &data, &data_size); + HeapFree(GetProcessHeap(), 0, filenameW); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, data, data_size, width, height, depth, + mip_levels, usage, format, pool, filter, mip_filter, color_key, src_info, palette, + volume_texture); + + UnmapViewOfFile(data); + return hr; +} + +HRESULT WINAPI D3DXCreateVolumeTextureFromFileExW(IDirect3DDevice9 *device, + const WCHAR *filename, + UINT width, + UINT height, + UINT depth, + UINT mip_levels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mip_filter, + D3DCOLOR color_key, + D3DXIMAGE_INFO *src_info, + PALETTEENTRY *palette, + IDirect3DVolumeTexture9 **volume_texture) +{ + HRESULT hr; + void *data; + DWORD data_size; + + TRACE("(%p, %s, %u, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p): relay\n", + device, debugstr_w(filename), width, height, depth, mip_levels, + usage, format, pool, filter, mip_filter, color_key, src_info, + palette, volume_texture); + + if (!filename) return D3DERR_INVALIDCALL; + + hr = map_view_of_file(filename, &data, &data_size); + if (FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXCreateVolumeTextureFromFileInMemoryEx(device, data, data_size, width, height, depth, + mip_levels, usage, format, pool, filter, mip_filter, color_key, src_info, palette, + volume_texture); + + UnmapViewOfFile(data); + return hr; +} + HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *device, const void *data, UINT data_size,

1 0

Józef Kucia : d3dx9: Implement D3DXLoadVolumeFromMemory.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: ee44f33e85655c16c68ec7debf3e0702d1d040d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee44f33e85655c16c68ec7deb… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jun 29 14:16:58 2012 +0200 d3dx9: Implement D3DXLoadVolumeFromMemory. --- dlls/d3dx9_36/volume.c | 129 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 116 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 1eae9f4..c008070 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -21,20 +21,123 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -HRESULT WINAPI D3DXLoadVolumeFromMemory(LPDIRECT3DVOLUME9 destvolume, - CONST PALETTEENTRY* destpalette, - CONST D3DBOX* destbox, - LPCVOID srcmemory, - D3DFORMAT srcformat, - UINT srcrowpitch, - UINT srcslicepitch, - CONST PALETTEENTRY* srcpalette, - CONST D3DBOX* srcbox, +HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, + const PALETTEENTRY *dst_palette, + const D3DBOX *dst_box, + const void *src_memory, + D3DFORMAT src_format, + UINT src_row_pitch, + UINT src_slice_pitch, + const PALETTEENTRY *src_palette, + const D3DBOX *src_box, DWORD filter, - D3DCOLOR colorkey) + D3DCOLOR color_key) { - FIXME("(%p, %p, %p, %p, %x, %u, %u, %p, %p, %x, %x): stub\n", destvolume, destpalette, destbox, srcmemory, srcformat, - srcrowpitch, srcslicepitch, srcpalette, srcbox, filter, colorkey); + HRESULT hr; + D3DVOLUME_DESC desc; + D3DLOCKED_BOX locked_box; + UINT dst_width, dst_height, dst_depth; + UINT src_width, src_height, src_depth; + const PixelFormatDesc *src_format_desc, *dst_format_desc; - return E_NOTIMPL; + TRACE("(%p, %p, %p, %p, %#x, %u, %u, %p, %p, %x, %x)\n", dst_volume, dst_palette, dst_box, + src_memory, src_format, src_row_pitch, src_slice_pitch, src_palette, src_box, + filter, color_key); + + if (!dst_volume || !src_memory || !src_box) return D3DERR_INVALIDCALL; + + if (src_format == D3DFMT_UNKNOWN + || src_box->Left >= src_box->Right + || src_box->Top >= src_box->Bottom + || src_box->Front >= src_box->Back) + return E_FAIL; + + if (filter == D3DX_DEFAULT) + filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER; + + IDirect3DVolume9_GetDesc(dst_volume, &desc); + + src_width = src_box->Right - src_box->Left; + src_height = src_box->Bottom - src_box->Top; + src_depth = src_box->Back - src_box->Front; + + if (!dst_box) + { + dst_width = desc.Width; + dst_height = desc.Height; + dst_depth = desc.Depth; + } + else + { + if (dst_box->Left >= dst_box->Right || dst_box->Right > desc.Width) + return D3DERR_INVALIDCALL; + if (dst_box->Top >= dst_box->Bottom || dst_box->Bottom > desc.Height) + return D3DERR_INVALIDCALL; + if (dst_box->Front >= dst_box->Back || dst_box->Back > desc.Depth) + return D3DERR_INVALIDCALL; + + dst_width = dst_box->Right - dst_box->Left; + dst_height = dst_box->Bottom - dst_box->Top; + dst_depth = dst_box->Back - dst_box->Front; + } + + src_format_desc = get_format_info(src_format); + if (src_format_desc->type == FORMAT_UNKNOWN) + return E_NOTIMPL; + + dst_format_desc = get_format_info(desc.Format); + if (dst_format_desc->type == FORMAT_UNKNOWN) + return E_NOTIMPL; + + if (desc.Format == src_format + && dst_width == src_width && dst_height == src_height && dst_depth == src_depth) + { + UINT row, slice; + BYTE *dst_addr; + const BYTE *src_addr; + UINT row_block_count = (src_width + src_format_desc->block_width - 1) / src_format_desc->block_width; + UINT row_count = (src_height + src_format_desc->block_height - 1) / src_format_desc->block_height; + + if (src_box->Left & (src_format_desc->block_width - 1) + || src_box->Top & (src_format_desc->block_height - 1) + || (src_box->Right & (src_format_desc->block_width - 1) + && src_width != desc.Width) + || (src_box->Bottom & (src_format_desc->block_height - 1) + && src_height != desc.Height)) + { + FIXME("Source box (%u, %u, %u, %u) is misaligned\n", + src_box->Left, src_box->Top, src_box->Right, src_box->Bottom); + return E_NOTIMPL; + } + + hr = IDirect3DVolume9_LockBox(dst_volume, &locked_box, dst_box, 0); + if (FAILED(hr)) return hr; + + for (slice = 0; slice < src_depth; slice++) + { + src_addr = src_memory; + src_addr += (src_box->Front + slice) * src_slice_pitch; + src_addr += (src_box->Top / src_format_desc->block_height) * src_row_pitch; + src_addr += (src_box->Left / src_format_desc->block_width) * src_format_desc->block_byte_count; + + dst_addr = locked_box.pBits; + dst_addr += slice * locked_box.SlicePitch; + + for (row = 0; row < row_count; row++) + { + memcpy(dst_addr, src_addr, row_block_count * src_format_desc->block_byte_count); + src_addr += src_row_pitch; + dst_addr += locked_box.RowPitch; + } + } + + IDirect3DVolume9_UnlockBox(dst_volume); + } + else + { + FIXME("Stretching or format conversion not implemented\n"); + return E_NOTIMPL; + } + + return D3D_OK; }

1 0

Michael Stefaniuc : quartz: COM cleanup for IAMFilterMiscFlags in NullRenderer.
by Alexandre Julliard July 2, 2012

July 2, 2012

Module: wine Branch: master Commit: 3501cb7b12c7ac6fb5dbe3abba87aec3c4183810 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3501cb7b12c7ac6fb5dbe3abb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 2 01:00:40 2012 +0200 quartz: COM cleanup for IAMFilterMiscFlags in NullRenderer. --- dlls/quartz/nullrenderer.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 5d2680f..d3b04ce 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -50,7 +50,7 @@ typedef struct NullRendererImpl BaseRenderer renderer; const IUnknownVtbl * IInner_vtbl; - const IAMFilterMiscFlagsVtbl *IAMFilterMiscFlags_vtbl; + IAMFilterMiscFlags IAMFilterMiscFlags_iface; IUnknown * pUnkOuter; BOOL bUnkOuterValid; @@ -104,7 +104,7 @@ HRESULT NullRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) pNullRenderer->bUnkOuterValid = FALSE; pNullRenderer->bAggregatable = FALSE; pNullRenderer->IInner_vtbl = &IInner_VTable; - pNullRenderer->IAMFilterMiscFlags_vtbl = &IAMFilterMiscFlags_Vtbl; + pNullRenderer->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; hr = BaseRenderer_Init(&pNullRenderer->renderer, &NullRenderer_Vtbl, pUnkOuter, &CLSID_NullRenderer, (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable); @@ -132,7 +132,7 @@ static HRESULT WINAPI NullRendererInner_QueryInterface(IUnknown * iface, REFIID if (IsEqualIID(riid, &IID_IUnknown)) *ppv = &This->IInner_vtbl; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) - *ppv = &This->IAMFilterMiscFlags_vtbl; + *ppv = &This->IAMFilterMiscFlags_iface; else { HRESULT hr; @@ -248,26 +248,32 @@ static const IBaseFilterVtbl NullRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo }; -static NullRendererImpl *from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) { - return (NullRendererImpl*)((char*)iface - offsetof(NullRendererImpl, IAMFilterMiscFlags_vtbl)); +static NullRendererImpl *impl_from_IAMFilterMiscFlags(IAMFilterMiscFlags *iface) +{ + return CONTAINING_RECORD(iface, NullRendererImpl, IAMFilterMiscFlags_iface); } -static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, void **ppv) { - NullRendererImpl *This = from_IAMFilterMiscFlags(iface); +static HRESULT WINAPI AMFilterMiscFlags_QueryInterface(IAMFilterMiscFlags *iface, REFIID riid, + void **ppv) +{ + NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_QueryInterface((IUnknown*)This, riid, ppv); } -static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) { - NullRendererImpl *This = from_IAMFilterMiscFlags(iface); +static ULONG WINAPI AMFilterMiscFlags_AddRef(IAMFilterMiscFlags *iface) +{ + NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_AddRef((IUnknown*)This); } -static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) { - NullRendererImpl *This = from_IAMFilterMiscFlags(iface); +static ULONG WINAPI AMFilterMiscFlags_Release(IAMFilterMiscFlags *iface) +{ + NullRendererImpl *This = impl_from_IAMFilterMiscFlags(iface); return IUnknown_Release((IUnknown*)This); } -static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) { +static ULONG WINAPI AMFilterMiscFlags_GetMiscFlags(IAMFilterMiscFlags *iface) +{ return AM_FILTER_MISC_FLAGS_IS_RENDERER; }

1 0