wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Henri Verbeet : d3d10core: Add a stub ID3D10SamplerState implementation.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 6d6d8eb1d8b4d57dc9de0c4ff3f95622e8939de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6d8eb1d8b4d57dc9de0c4ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 30 20:11:36 2009 +0100 d3d10core: Add a stub ID3D10SamplerState implementation. --- dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 ++++++++- dlls/d3d10core/state.c | 111 ++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 3ee143c..e68754f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -207,6 +207,15 @@ struct d3d10_rasterizer_state HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +/* ID3D10SamplerState */ +struct d3d10_sampler_state +{ + const struct ID3D10SamplerStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 2537d1f..de623bc 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -985,9 +985,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *iface, const D3D10_SAMPLER_DESC *desc, ID3D10SamplerState **sampler_state) { - FIXME("iface %p, desc %p, sampler_state %p stub!\n", iface, desc, sampler_state); + struct d3d10_sampler_state *object; + HRESULT hr; - return E_NOTIMPL; + FIXME("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 sampler state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_sampler_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize sampler state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created sampler state %p.\n", object); + *sampler_state = (ID3D10SamplerState *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 6c35f4b..e0468c3 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -245,3 +245,114 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) return S_OK; } + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_QueryInterface(ID3D10SamplerState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10SamplerState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *iface) +{ + struct d3d10_sampler_state *This = (struct d3d10_sampler_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) +{ + struct d3d10_sampler_state *This = (struct d3d10_sampler_state *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateData(ID3D10SamplerState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3D10SamplerState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10SamplerState methods */ + +static void STDMETHODCALLTYPE d3d10_sampler_state_GetDesc(ID3D10SamplerState *iface, + D3D10_SAMPLER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = +{ + /* IUnknown methods */ + d3d10_sampler_state_QueryInterface, + d3d10_sampler_state_AddRef, + d3d10_sampler_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_sampler_state_GetDevice, + d3d10_sampler_state_GetPrivateData, + d3d10_sampler_state_SetPrivateData, + d3d10_sampler_state_SetPrivateDataInterface, + /* ID3D10SamplerState methods */ + d3d10_sampler_state_GetDesc, +}; + +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) +{ + state->vtbl = &d3d10_sampler_state_vtbl; + state->refcount = 1; + + return S_OK; +}

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10RasterizerState implementation.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 4b341c252cdf3929c956f21e447639e1d5ab94d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b341c252cdf3929c956f21e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 30 20:11:35 2009 +0100 d3d10core: Add a stub ID3D10RasterizerState implementation. --- dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 ++++++++- dlls/d3d10core/state.c | 111 ++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index fd62766..3ee143c 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -198,6 +198,15 @@ struct d3d10_depthstencil_state HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DECLSPEC_HIDDEN; +/* ID3D10RasterizerState */ +struct d3d10_rasterizer_state +{ + const struct ID3D10RasterizerStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 51c9603..2537d1f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -956,9 +956,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device *iface, const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { - FIXME("iface %p, desc %p, rasterizer_state %p stub!\n", iface, desc, rasterizer_state); + struct d3d10_rasterizer_state *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 rasterizer state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_rasterizer_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rasterizer state %p.\n", object); + *rasterizer_state = (ID3D10RasterizerState *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index af712c3..6c35f4b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -134,3 +134,114 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) return S_OK; } + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10RasterizerState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10RasterizerState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) +{ + struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) +{ + struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10RasterizerState methods */ + +static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, + D3D10_RASTERIZER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = +{ + /* IUnknown methods */ + d3d10_rasterizer_state_QueryInterface, + d3d10_rasterizer_state_AddRef, + d3d10_rasterizer_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_rasterizer_state_GetDevice, + d3d10_rasterizer_state_GetPrivateData, + d3d10_rasterizer_state_SetPrivateData, + d3d10_rasterizer_state_SetPrivateDataInterface, + /* ID3D10RasterizerState methods */ + d3d10_rasterizer_state_GetDesc, +}; + +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) +{ + state->vtbl = &d3d10_rasterizer_state_vtbl; + state->refcount = 1; + + return S_OK; +}

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10DepthStencilState implementation.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: d7589589a9537ff9e6167cddebc813a1313c5347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7589589a9537ff9e6167cdde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 30 20:11:34 2009 +0100 d3d10core: Add a stub ID3D10DepthStencilState implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 ++++++- dlls/d3d10core/state.c | 136 ++++++++++++++++++++++++++++++++++++ 4 files changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index e94d442..fe61293 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -12,6 +12,7 @@ C_SRCS = \ device.c \ inputlayout.c \ shader.c \ + state.c \ texture2d.c \ utils.c \ view.c diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a895b51..fd62766 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -189,6 +189,15 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; +/* ID3D10DepthStencilState */ +struct d3d10_depthstencil_state +{ + const struct ID3D10DepthStencilStateVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DECLSPEC_HIDDEN; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 32df03c..51c9603 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -927,9 +927,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Device *iface, const D3D10_DEPTH_STENCIL_DESC *desc, ID3D10DepthStencilState **depth_stencil_state) { - FIXME("iface %p, desc %p, depth_stencil_state %p stub!\n", iface, desc, depth_stencil_state); + struct d3d10_depthstencil_state *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, depth_stencil_state %p.\n", iface, desc, depth_stencil_state); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 depthstencil state object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_depthstencil_state_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created depthstencil state %p.\n", object); + *depth_stencil_state = (ID3D10DepthStencilState *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device *iface, diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c new file mode 100644 index 0000000..af712c3 --- /dev/null +++ b/dlls/d3d10core/state.c @@ -0,0 +1,136 @@ +/* + * Copyright 2009 Henri Verbeet for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "config.h" +#include "wine/port.h" + +#include "d3d10core_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10DepthStencilState *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10DepthStencilState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStencilState *iface) +{ + struct d3d10_depthstencil_state *This = (struct d3d10_depthstencil_state *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStencilState *iface) +{ + struct d3d10_depthstencil_state *This = (struct d3d10_depthstencil_state *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDevice(ID3D10DepthStencilState *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_GetPrivateData(ID3D10DepthStencilState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateData(ID3D10DepthStencilState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_SetPrivateDataInterface(ID3D10DepthStencilState *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10DepthStencilState methods */ + +static void STDMETHODCALLTYPE d3d10_depthstencil_state_GetDesc(ID3D10DepthStencilState *iface, + D3D10_DEPTH_STENCIL_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = +{ + /* IUnknown methods */ + d3d10_depthstencil_state_QueryInterface, + d3d10_depthstencil_state_AddRef, + d3d10_depthstencil_state_Release, + /* ID3D10DeviceChild methods */ + d3d10_depthstencil_state_GetDevice, + d3d10_depthstencil_state_GetPrivateData, + d3d10_depthstencil_state_SetPrivateData, + d3d10_depthstencil_state_SetPrivateDataInterface, + /* ID3D10DepthStencilState methods */ + d3d10_depthstencil_state_GetDesc, +}; + +HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) +{ + state->vtbl = &d3d10_depthstencil_state_vtbl; + state->refcount = 1; + + return S_OK; +}

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10ShaderResourceView implementation.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 6075f5716897ba0880da1b80bc63eec94600e076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6075f5716897ba0880da1b80b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 30 20:11:33 2009 +0100 d3d10core: Add a stub ID3D10ShaderResourceView implementation. --- dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 +++++++- dlls/d3d10core/view.c | 123 ++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4f6754e..a895b51 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -129,6 +129,15 @@ struct d3d10_rendertarget_view HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struct d3d10_device *device, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc) DECLSPEC_HIDDEN; +/* ID3D10ShaderResourceView */ +struct d3d10_shader_resource_view +{ + const struct ID3D10ShaderResourceViewVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view) DECLSPEC_HIDDEN; + /* ID3D10InputLayout */ struct d3d10_input_layout { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 6a6ffa6..32df03c 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -694,9 +694,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device *ifac static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device *iface, ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d10_shader_resource_view *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 shader resource view object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_shader_resource_view_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize shader resource view, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created shader resource view %p.\n", object); + *view = (ID3D10ShaderResourceView *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device *iface, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 9e45284..63bc01e 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -472,3 +472,126 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return S_OK; } + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) +{ + struct d3d10_shader_resource_view *This = (struct d3d10_shader_resource_view *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) +{ + struct d3d10_shader_resource_view *This = (struct d3d10_shader_resource_view *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface, + ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateData(ID3D10ShaderResourceView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_SetPrivateDataInterface(ID3D10ShaderResourceView *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10View methods */ + +static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10ShaderResourceView *iface, + ID3D10Resource **resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +/* ID3D10ShaderResourceView methods */ + +static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderResourceView *iface, + D3D10_SHADER_RESOURCE_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl = +{ + /* IUnknown methods */ + d3d10_shader_resource_view_QueryInterface, + d3d10_shader_resource_view_AddRef, + d3d10_shader_resource_view_Release, + /* ID3D10DeviceChild methods */ + d3d10_shader_resource_view_GetDevice, + d3d10_shader_resource_view_GetPrivateData, + d3d10_shader_resource_view_SetPrivateData, + d3d10_shader_resource_view_SetPrivateDataInterface, + /* ID3D10View methods */ + d3d10_shader_resource_view_GetResource, + /* ID3D10ShaderResourceView methods */ + d3d10_shader_resource_view_GetDesc, +}; + +HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view) +{ + view->vtbl = &d3d10_shader_resource_view_vtbl; + view->refcount = 1; + + return S_OK; +}

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10DepthStencilView implementation .
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 4bb4bad11aeef7593c3f0eb358d017c7b880793d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bb4bad11aeef7593c3f0eb35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 30 20:11:32 2009 +0100 d3d10core: Add a stub ID3D10DepthStencilView implementation. --- dlls/d3d10core/d3d10core_private.h | 9 +++ dlls/d3d10core/device.c | 25 +++++++- dlls/d3d10core/view.c | 122 ++++++++++++++++++++++++++++++++++++ 3 files changed, 154 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 4f1fe84..4f6754e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -107,6 +107,15 @@ struct d3d10_buffer HRESULT d3d10_buffer_init(struct d3d10_buffer *buffer, struct d3d10_device *device, const D3D10_BUFFER_DESC *desc, const D3D10_SUBRESOURCE_DATA *data) DECLSPEC_HIDDEN; +/* ID3D10DepthStencilView */ +struct d3d10_depthstencil_view +{ + const struct ID3D10DepthStencilViewVtbl *vtbl; + LONG refcount; +}; + +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) DECLSPEC_HIDDEN; + /* ID3D10RenderTargetView */ struct d3d10_rendertarget_view { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index fae1d8f..6a6ffa6 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -731,9 +731,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Device *iface, ID3D10Resource *resource, const D3D10_DEPTH_STENCIL_VIEW_DESC *desc, ID3D10DepthStencilView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d10_depthstencil_view *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 depthstencil view object memory.\n"); + return E_OUTOFMEMORY; + } + + hr = d3d10_depthstencil_view_init(object); + if (FAILED(hr)) + { + WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created depthstencil view %p.\n", object); + *view = (ID3D10DepthStencilView *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *iface, diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index d1d24eb..9e45284 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -166,6 +166,128 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 /* IUnknown methods */ +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_QueryInterface(ID3D10DepthStencilView *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10DepthStencilView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_AddRef(ID3D10DepthStencilView *iface) +{ + struct d3d10_depthstencil_view *This = (struct d3d10_depthstencil_view *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u.\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_depthstencil_view_Release(ID3D10DepthStencilView *iface) +{ + struct d3d10_depthstencil_view *This = (struct d3d10_depthstencil_view *)iface; + ULONG refcount = InterlockedDecrement(&This->refcount); + + TRACE("%p decreasing refcount to %u.\n", This, refcount); + + if (!refcount) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return refcount; +} + +/* ID3D10DeviceChild methods */ + +static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStencilView *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10DepthStencilView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + iface, debugstr_guid(guid), data_size, data); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface(ID3D10DepthStencilView *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +/* ID3D10View methods */ + +static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetResource(ID3D10DepthStencilView *iface, + ID3D10Resource **resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +/* ID3D10DepthStencilView methods */ + +static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDesc(ID3D10DepthStencilView *iface, + D3D10_DEPTH_STENCIL_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D10DepthStencilViewVtbl d3d10_depthstencil_view_vtbl = +{ + /* IUnknown methods */ + d3d10_depthstencil_view_QueryInterface, + d3d10_depthstencil_view_AddRef, + d3d10_depthstencil_view_Release, + /* ID3D10DeviceChild methods */ + d3d10_depthstencil_view_GetDevice, + d3d10_depthstencil_view_GetPrivateData, + d3d10_depthstencil_view_SetPrivateData, + d3d10_depthstencil_view_SetPrivateDataInterface, + /* ID3D10View methods */ + d3d10_depthstencil_view_GetResource, + /* ID3D10DepthStencilView methods */ + d3d10_depthstencil_view_GetDesc, +}; + +HRESULT d3d10_depthstencil_view_init(struct d3d10_depthstencil_view *view) +{ + view->vtbl = &d3d10_depthstencil_view_vtbl; + view->refcount = 1; + + return S_OK; +} + +/* IUnknown methods */ + static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_QueryInterface(ID3D10RenderTargetView *iface, REFIID riid, void **object) {

1 0

Juan Lang : crypt32: Add support for the CRYPT_STRING_NOCRLF flag to CryptBinaryToStringA/W.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: fc0aff0d2e326ba3e162a7fe91a47a7b87aebf62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc0aff0d2e326ba3e162a7fe9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 29 15:43:37 2009 -0700 crypt32: Add support for the CRYPT_STRING_NOCRLF flag to CryptBinaryToStringA/W. --- dlls/crypt32/base64.c | 70 ++++++++++++++++++++++++++++++++----------------- include/wincrypt.h | 1 + 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index d542db1..4a6504a 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -99,7 +99,8 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; - needed += (needed / 64 + 1) * strlen(sep); + if (sep) + needed += (needed / 64 + 1) * strlen(sep); if (needed > *out_len) { @@ -116,7 +117,7 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, i = 0; while (div > 0) { - if (i && i % 64 == 0) + if (sep && i && i % 64 == 0) { strcpy(ptr, sep); ptr += strlen(sep); @@ -162,7 +163,8 @@ static LONG encodeBase64A(const BYTE *in_buf, int in_len, LPCSTR sep, *ptr++ = '='; break; } - strcpy(ptr, sep); + if (sep) + strcpy(ptr, sep); return ERROR_SUCCESS; } @@ -172,14 +174,16 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { static const char crlf[] = "\r\n", lf[] = "\n"; BOOL ret = TRUE; - LPCSTR header = NULL, trailer = NULL, sep = NULL; + LPCSTR header = NULL, trailer = NULL, sep; DWORD charsNeeded; if (dwFlags & CRYPT_STRING_NOCR) sep = lf; + else if (dwFlags & CRYPT_STRING_NOCRLF) + sep = NULL; else sep = crlf; - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BASE64: /* no header or footer */ @@ -200,7 +204,8 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, charsNeeded = 0; encodeBase64A(pbBinary, cbBinary, sep, NULL, &charsNeeded); - charsNeeded += strlen(sep); + if (sep) + charsNeeded += strlen(sep); if (header) charsNeeded += strlen(header) + strlen(sep); if (trailer) @@ -214,8 +219,11 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { strcpy(ptr, header); ptr += strlen(ptr); - strcpy(ptr, sep); - ptr += strlen(sep); + if (sep) + { + strcpy(ptr, sep); + ptr += strlen(sep); + } } encodeBase64A(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -223,8 +231,11 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary, { strcpy(ptr, trailer); ptr += strlen(ptr); - strcpy(ptr, sep); - ptr += strlen(sep); + if (sep) + { + strcpy(ptr, sep); + ptr += strlen(sep); + } } *pcchString = charsNeeded - 1; } @@ -258,7 +269,7 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, return FALSE; } - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BINARY: encoder = EncodeBinaryToBinaryA; @@ -273,7 +284,7 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: - FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff); + FIXME("Unimplemented type %d\n", dwFlags & 0x0fffffff); /* fall through */ default: SetLastError(ERROR_INVALID_PARAMETER); @@ -293,7 +304,8 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); needed = bytes + pad_bytes + 1; - needed += (needed / 64 + 1) * strlenW(sep); + if (sep) + needed += (needed / 64 + 1) * strlenW(sep); if (needed > *out_len) { @@ -310,7 +322,7 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, i = 0; while (div > 0) { - if (i && i % 64 == 0) + if (sep && i && i % 64 == 0) { strcpyW(ptr, sep); ptr += strlenW(sep); @@ -356,7 +368,8 @@ static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, *ptr++ = '='; break; } - strcpyW(ptr, sep); + if (sep) + strcpyW(ptr, sep); return ERROR_SUCCESS; } @@ -366,14 +379,16 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }; BOOL ret = TRUE; - LPCWSTR header = NULL, trailer = NULL, sep = NULL; + LPCWSTR header = NULL, trailer = NULL, sep; DWORD charsNeeded; if (dwFlags & CRYPT_STRING_NOCR) sep = lf; + else if (dwFlags & CRYPT_STRING_NOCRLF) + sep = NULL; else sep = crlf; - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BASE64: /* no header or footer */ @@ -394,7 +409,8 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, charsNeeded = 0; encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded); - charsNeeded += strlenW(sep); + if (sep) + charsNeeded += strlenW(sep); if (header) charsNeeded += strlenW(header) + strlenW(sep); if (trailer) @@ -408,8 +424,11 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { strcpyW(ptr, header); ptr += strlenW(ptr); - strcpyW(ptr, sep); - ptr += strlenW(sep); + if (sep) + { + strcpyW(ptr, sep); + ptr += strlenW(sep); + } } encodeBase64W(pbBinary, cbBinary, sep, ptr, &size); ptr += size - 1; @@ -417,8 +436,11 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary, { strcpyW(ptr, trailer); ptr += strlenW(ptr); - strcpyW(ptr, sep); - ptr += strlenW(sep); + if (sep) + { + strcpyW(ptr, sep); + ptr += strlenW(sep); + } } *pcchString = charsNeeded - 1; } @@ -452,7 +474,7 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, return FALSE; } - switch (dwFlags & 0x7fffffff) + switch (dwFlags & 0x0fffffff) { case CRYPT_STRING_BASE64: case CRYPT_STRING_BASE64HEADER: @@ -465,7 +487,7 @@ BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, case CRYPT_STRING_HEXASCII: case CRYPT_STRING_HEXADDR: case CRYPT_STRING_HEXASCIIADDR: - FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff); + FIXME("Unimplemented type %d\n", dwFlags & 0x0fffffff); /* fall through */ default: SetLastError(ERROR_INVALID_PARAMETER); diff --git a/include/wincrypt.h b/include/wincrypt.h index 56a0155..e9fbef0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2750,6 +2750,7 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CRYPT_STRING_BASE64X509CRLHEADER 0x00000009 #define CRYPT_STRING_HEXADDR 0x0000000a #define CRYPT_STRING_HEXASCIIADDR 0x0000000b +#define CRYPT_STRING_NOCRLF 0x40000000 #define CRYPT_STRING_NOCR 0x80000000 /* OIDs */

1 0

Juan Lang : crypt32: Partially implement CryptBinaryToStringW.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 2d5ac92d9a6878785158301b90ace6a6d05ad1a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5ac92d9a6878785158301b9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 29 15:13:29 2009 -0700 crypt32: Partially implement CryptBinaryToStringW. --- dlls/crypt32/base64.c | 194 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 2 +- 2 files changed, 195 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 17e05d9..d542db1 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -60,6 +60,8 @@ static const char b64[] = typedef BOOL (*BinaryToStringAFunc)(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString); +typedef BOOL (*BinaryToStringWFunc)(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString); static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, DWORD *pcchString) @@ -280,6 +282,198 @@ BOOL WINAPI CryptBinaryToStringA(const BYTE *pbBinary, return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); } +static LONG encodeBase64W(const BYTE *in_buf, int in_len, LPCWSTR sep, + WCHAR* out_buf, DWORD *out_len) +{ + int div, i; + const BYTE *d = in_buf; + int bytes = (in_len*8 + 5)/6, pad_bytes = (bytes % 4) ? 4 - (bytes % 4) : 0; + DWORD needed; + LPWSTR ptr; + + TRACE("bytes is %d, pad bytes is %d\n", bytes, pad_bytes); + needed = bytes + pad_bytes + 1; + needed += (needed / 64 + 1) * strlenW(sep); + + if (needed > *out_len) + { + *out_len = needed; + return ERROR_INSUFFICIENT_BUFFER; + } + else + *out_len = needed; + + /* Three bytes of input give 4 chars of output */ + div = in_len / 3; + + ptr = out_buf; + i = 0; + while (div > 0) + { + if (i && i % 64 == 0) + { + strcpyW(ptr, sep); + ptr += strlenW(sep); + } + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte and the first 4 + * bits of the second byte */ + *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + /* third char is the last 4 bits of the second byte and the first 2 + * bits of the third byte */ + *ptr++ = b64[ ((d[1] << 2) & 0x3c) | (d[2] >> 6 & 0x03)]; + /* fourth char is the remaining 6 bits of the third byte */ + *ptr++ = b64[ d[2] & 0x3f]; + i += 4; + d += 3; + div--; + } + + switch(pad_bytes) + { + case 1: + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte and the first 4 + * bits of the second byte */ + *ptr++ = b64[ ((d[0] << 4) & 0x30) | (d[1] >> 4 & 0x0f)]; + /* third char is the last 4 bits of the second byte padded with + * two zeroes */ + *ptr++ = b64[ ((d[1] << 2) & 0x3c) ]; + /* fourth char is a = to indicate one byte of padding */ + *ptr++ = '='; + break; + case 2: + /* first char is the first 6 bits of the first byte*/ + *ptr++ = b64[ ( d[0] >> 2) & 0x3f ]; + /* second char is the last 2 bits of the first byte padded with + * four zeroes*/ + *ptr++ = b64[ ((d[0] << 4) & 0x30)]; + /* third char is = to indicate padding */ + *ptr++ = '='; + /* fourth char is = to indicate padding */ + *ptr++ = '='; + break; + } + strcpyW(ptr, sep); + + return ERROR_SUCCESS; +} + +static BOOL BinaryToBase64W(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) +{ + static const WCHAR crlf[] = { '\r','\n',0 }, lf[] = { '\n',0 }; + BOOL ret = TRUE; + LPCWSTR header = NULL, trailer = NULL, sep = NULL; + DWORD charsNeeded; + + if (dwFlags & CRYPT_STRING_NOCR) + sep = lf; + else + sep = crlf; + switch (dwFlags & 0x7fffffff) + { + case CRYPT_STRING_BASE64: + /* no header or footer */ + break; + case CRYPT_STRING_BASE64HEADER: + header = CERT_HEADER_W; + trailer = CERT_TRAILER_W; + break; + case CRYPT_STRING_BASE64REQUESTHEADER: + header = CERT_REQUEST_HEADER_W; + trailer = CERT_REQUEST_TRAILER_W; + break; + case CRYPT_STRING_BASE64X509CRLHEADER: + header = X509_HEADER_W; + trailer = X509_TRAILER_W; + break; + } + + charsNeeded = 0; + encodeBase64W(pbBinary, cbBinary, sep, NULL, &charsNeeded); + charsNeeded += strlenW(sep); + if (header) + charsNeeded += strlenW(header) + strlenW(sep); + if (trailer) + charsNeeded += strlenW(trailer) + strlenW(sep); + if (charsNeeded <= *pcchString) + { + LPWSTR ptr = pszString; + DWORD size = charsNeeded; + + if (header) + { + strcpyW(ptr, header); + ptr += strlenW(ptr); + strcpyW(ptr, sep); + ptr += strlenW(sep); + } + encodeBase64W(pbBinary, cbBinary, sep, ptr, &size); + ptr += size - 1; + if (trailer) + { + strcpyW(ptr, trailer); + ptr += strlenW(ptr); + strcpyW(ptr, sep); + ptr += strlenW(sep); + } + *pcchString = charsNeeded - 1; + } + else if (pszString) + { + *pcchString = charsNeeded; + SetLastError(ERROR_INSUFFICIENT_BUFFER); + ret = FALSE; + } + else + *pcchString = charsNeeded; + return ret; +} + +BOOL WINAPI CryptBinaryToStringW(const BYTE *pbBinary, + DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, DWORD *pcchString) +{ + BinaryToStringWFunc encoder = NULL; + + TRACE("(%p, %d, %08x, %p, %p)\n", pbBinary, cbBinary, dwFlags, pszString, + pcchString); + + if (!pbBinary) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + if (!pcchString) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (dwFlags & 0x7fffffff) + { + case CRYPT_STRING_BASE64: + case CRYPT_STRING_BASE64HEADER: + case CRYPT_STRING_BASE64REQUESTHEADER: + case CRYPT_STRING_BASE64X509CRLHEADER: + encoder = BinaryToBase64W; + break; + case CRYPT_STRING_BINARY: + case CRYPT_STRING_HEX: + case CRYPT_STRING_HEXASCII: + case CRYPT_STRING_HEXADDR: + case CRYPT_STRING_HEXASCIIADDR: + FIXME("Unimplemented type %d\n", dwFlags & 0x7fffffff); + /* fall through */ + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + return encoder(pbBinary, cbBinary, dwFlags, pszString, pcchString); +} + static inline BYTE decodeBase64Byte(int c) { BYTE ret; diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 534bee7..bcab030 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -98,7 +98,7 @@ @ stdcall CertVerifyValidityNesting(ptr ptr) @ stdcall CreateFileU(wstr long long ptr long long ptr) kernel32.CreateFileW @ stdcall CryptBinaryToStringA(ptr long long ptr ptr) -@ stub CryptBinaryToStringW # (ptr long long ptr ptr) +@ stdcall CryptBinaryToStringW(ptr long long ptr ptr) @ stdcall CryptStringToBinaryA(str long long ptr ptr ptr ptr) @ stdcall CryptStringToBinaryW (wstr long long ptr ptr ptr ptr) @ stdcall CryptAcquireContextU(ptr wstr wstr long long) advapi32.CryptAcquireContextW

1 0

Alexandre Julliard : setupx: Use the correct field index for string substitutions.
by Alexandre Julliard 03 Nov '09

03 Nov '09

Module: wine Branch: master Commit: 50bc161eb2b06cf9f2fbe09c311848d6f347fe1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bc161eb2b06cf9f2fbe09c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 30 19:42:44 2009 +0100 setupx: Use the correct field index for string substitutions. --- dlls/setupx.dll16/infparse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupx.dll16/infparse.c b/dlls/setupx.dll16/infparse.c index d6cbed0..0fbc25d 100644 --- a/dlls/setupx.dll16/infparse.c +++ b/dlls/setupx.dll16/infparse.c @@ -115,7 +115,7 @@ static const char *get_string_subst( HINF hinf, const char *str, unsigned int *l buffer[*len] = 0; if (SetupFindFirstLineA( hinf, "Strings", buffer, &context ) && - SetupGetStringFieldA( &context, 0, subst, MAX_INF_STRING_LENGTH, NULL )) + SetupGetStringFieldA( &context, 1, subst, MAX_INF_STRING_LENGTH, NULL )) { *len = strlen( subst ); return subst;

1 0

Łukasz Wojniłowicz : Add Ubuntu 9. 10 instructions to Polish download page. It would be better if someone would update all language files instead only english ones .
by Jeremy Newman 02 Nov '09

02 Nov '09

Module: website Branch: master Commit: 2f4ff992b1650064a8d98000bdc54c5699e2ab66 URL: http://source.winehq.org/git/website.git/?a=commit;h=2f4ff992b1650064a8d980… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Nov 2 20:44:41 2009 +0100 Add Ubuntu 9.10 instructions to Polish download page. It would be better if someone would update all language files instead only english ones. --- templates/pl/download.template | 2 +- templates/pl/download/deb.template | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/templates/pl/download.template b/templates/pl/download.template index 91f380d..6fa59be 100644 --- a/templates/pl/download.template +++ b/templates/pl/download.template @@ -57,7 +57,7 @@ <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binare i źródłowe paczki .deb dla Ubuntu Hardy (8.04), Intrepid (8.10), i Jaunty (9.04) + binare i źródłowe paczki .deb dla Ubuntu Karmic (9.10), Ubuntu Hardy (8.04), Intrepid (8.10), i Jaunty (9.04) <td><a href="mailto:scott@open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/pl/download/deb.template b/templates/pl/download/deb.template index 5409a17..b4469b4 100644 --- a/templates/pl/download/deb.template +++ b/templates/pl/download/deb.template @@ -32,6 +32,8 @@ działa, to nie musisz używać paczek beta. Następnie, wklej jedną z poniższych linijek zależnie od wersji twojego systemu. +Dla Ubuntu Karmic (9.10): +ppa:ubuntu-wine/ppa Dla Ubuntu Jaunty (9.04): deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" Dla Ubuntu Intrepid (8.10): @@ -44,12 +46,15 @@ działa, to nie musisz używać paczek beta. Po dodaniu repozytorium, potrzebujesz również dodać klucz do tego repozytorium do twojej systemowej listy zaufanych kluczy. -<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Pobierz +Dla Ubuntu 9.04 i wcześniejszych, +<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Pobierz i zapisz klucz Scotta Ritchiego</a> (prawy przycisk myszy -> zapisz jako) na pulpicie. Następnie przejdź na zakładkę Uwierzytelnianie , kliknij Zaimportuj plik klucza..., i wybierz plik klucza, którego właśnie zapisałeś (Scott Ritchie.gpg). Możesz usunąć ten plik po wykonaniu tego kroku. <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> +<h2>Instalowanie Wine:</h2> + Kliknij zamknij, aby zakończyć, a potem uaktualnij dane o paczkach w momencie pytania. Jeżeli masz zainstalowane Wine to systemowy menadżer aktualizacji poinformuje cię o najnowszym wydaniu Wine

1 0

Scott Ritchie : Add Ubuntu 9.10 instructions to download page
by Jeremy Newman 02 Nov '09

02 Nov '09

Module: website Branch: master Commit: 9c1edcfb0ddb1fba0e2342bb2163f6daf5c566a5 URL: http://source.winehq.org/git/website.git/?a=commit;h=9c1edcfb0ddb1fba0e2342… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sat Oct 31 08:54:59 2009 -0700 Add Ubuntu 9.10 instructions to download page Thank you! >From 9e25c4f744031a7073cf7cc46d106ef54324459e Mon Sep 17 00:00:00 2001 From: Scott Ritchie <scott(a)scott-laptop.(none)> Date: Sat, 31 Oct 2009 08:46:23 -0700 Subject: [lostwages]Add Ubuntu 9.10 instructions to download page --- templates/en/download.template | 2 +- templates/en/download/deb.template | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 9697da8..3c40998 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -61,7 +61,7 @@ requested in exchange for hosting the Wine web site. <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/download/deb">Ubuntu</a> - binary and source .debs for Ubuntu Hardy (8.04), Intrepid (8.10), and Jaunty (9.04) + binary and source .debs for Ubuntu Karmic (9.10), Jaunty (9.04), Intrepid (8.10), and Hardy (8.04) <td><a href="mailto:scott@open-vote.org">Scott Ritchie</a></td> </tr> diff --git a/templates/en/download/deb.template b/templates/en/download/deb.template index 18972d9..6f44d0a 100644 --- a/templates/en/download/deb.template +++ b/templates/en/download/deb.template @@ -32,6 +32,8 @@ Party Software tab and click Add. Then, copy and paste one of the lines below depending on which version you are running. +For Ubuntu Karmic (9.10): +ppa:ubuntu-wine/ppa For Ubuntu Jaunty (9.04): deb http://wine.budgetdedicated.com/apt jaunty main #WineHQ - Ubuntu 9.04 "Jaunty Jackalope" For Ubuntu Intrepid (8.10): @@ -39,12 +41,13 @@ version you are running. For Ubuntu Hardy (8.04): deb http://wine.budgetdedicated.com/apt hardy main #WineHQ - Ubuntu 8.04 "Hardy Heron" -<h2>Trusting the WineHQ APT Repository and installing Wine:</h2> +<h2>Trusting the WineHQ APT Repository:</h2> After adding the repository, you also need to add the key for the repository -to your system's list of trusted keys. +to your system's list of trusted keys. Ubuntu 9.10 users may skip this step. -<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">Download +For Ubuntu 9.04 and earlier, +<a href="http://wine.budgetdedicated.com/apt/Scott%20Ritchie.gpg">download and save Scott Ritchie's key</a> (right click -> save as) to your desktop. Then open the Authentication tab, click import key file, and select the key file you just saved (Scott Ritchie.gpg). It is safe to @@ -52,6 +55,8 @@ delete this file after doing this step. <img src="{$root}/images/distro/ubuntu-softwaresources2.png" width="531" height="509" alt="System->Administration->Software Sources->Authentication" border="0"> +<h2>Installing Wine:</h2> + Click close to finish, and then reload the package information when prompted. If you have Wine installed, the system's update manager will now inform you of the latest Wine beta release and prompt you to upgrade. If you

1 0

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 November 2009