March 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : advapi32/tests: GetTokenInformation apparently needs a dword-aligned buffer.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: ec1d6aa617bc44f09c8a988712c7f9f8935634ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1d6aa617bc44f09c8a98871… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 4 11:47:20 2009 +0100 advapi32/tests: GetTokenInformation apparently needs a dword-aligned buffer. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1d5a769..e82167a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1196,7 +1196,7 @@ static void test_token_attr(void) ok(ret, "OpenProcessToken failed with error %d\n", GetLastError()); if (ret) { - BYTE buf[1024]; + DWORD buf[256]; /* GetTokenInformation wants a dword-aligned buffer */ Size = sizeof(buf); ret = GetTokenInformation(Token, TokenUser,(void*)buf, Size, &Size); ok(ret, "GetTokenInformation failed with error %d\n", GetLastError());

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle_put_textDecoration.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: f7a6c512a0c7a7fd103ddc83ddec44ebfddcad33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a6c512a0c7a7fd103ddc83d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Mar 1 20:26:59 2009 +1100 mshtml: Implement IHTMLStyle_put_textDecoration. --- dlls/mshtml/htmlstyle.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a7eff56..90ff089 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -924,8 +924,18 @@ static HRESULT WINAPI HTMLStyle_get_letterSpacing(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_textDecoration(IHTMLStyle *iface, BSTR v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + /* textDecoration can only be one of the following */ + if(!v || strcmpiW(styleNone, v) == 0 || strcmpiW(valUnderline, v) == 0 || + strcmpiW(valOverline, v) == 0 || strcmpiW(valLineThrough, v) == 0 || + strcmpiW(valBlink, v) == 0) + { + return set_style_attr(This, STYLEID_TEXT_DECORATION , v, 0); + } + + return E_INVALIDARG; } static HRESULT WINAPI HTMLStyle_get_textDecoration(IHTMLStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c0fb009..6674024 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2798,6 +2798,48 @@ static void test_default_style(IHTMLStyle *style) hres = IHTMLStyle_put_textDecorationBlink(style, VARIANT_FALSE); ok(hres == S_OK, "textDecorationBlink failed: %08x\n", hres); + hres = IHTMLStyle_get_textDecoration(style, &sDefault); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + + str = a2bstr("invalid"); + hres = IHTMLStyle_put_textDecoration(style, str); + ok(hres == E_INVALIDARG, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("none"); + hres = IHTMLStyle_put_textDecoration(style, str); + ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("underline"); + hres = IHTMLStyle_put_textDecoration(style, str); + ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("overline"); + hres = IHTMLStyle_put_textDecoration(style, str); + ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("line-through"); + hres = IHTMLStyle_put_textDecoration(style, str); + ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); + + str = a2bstr("blink"); + hres = IHTMLStyle_put_textDecoration(style, str); + ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_textDecoration(style, &str); + ok(hres == S_OK, "get_textDecoration failed: %08x\n", hres); + ok(!strcmp_wa(str, "blink"), "str != blink\n"); + SysFreeString(str); + + hres = IHTMLStyle_put_textDecoration(style, sDefault); + ok(hres == S_OK, "put_textDecoration failed: %08x\n", hres); + SysFreeString(sDefault); + hres = IHTMLStyle_get_posWidth(style, NULL); ok(hres == E_POINTER, "get_posWidth failed: %08x\n", hres);

1 0

Henri Verbeet : wined3d: Use flags for shader_glsl_get_sample_function().
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 703ef0de02df3f4f5f9541425b16e580373e2c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=703ef0de02df3f4f5f9541425… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 4 07:07:38 2009 +0100 wined3d: Use flags for shader_glsl_get_sample_function(). Having three BOOL parameters looks a bit awkward. --- dlls/wined3d/glsl_shader.c | 59 +++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=703ef0de02df3f4f5f954…

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10InputLayout implementation.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 03fae2179fd724555c40ef0ec35b4ae063fe7ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fae2179fd724555c40ef0ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 4 07:07:38 2009 +0100 d3d10core: Add a stub ID3D10InputLayout implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/d3d10core_private.h | 8 +++ dlls/d3d10core/device.c | 16 +++++- dlls/d3d10core/inputlayout.c | 118 ++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 80f0def..7c96d29 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ buffer.c \ d3d10core_main.c \ device.c \ + inputlayout.c \ texture2d.c \ utils.c \ view.c diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a05f773..c5e919d 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -89,6 +89,14 @@ struct d3d10_rendertarget_view D3D10_RENDER_TARGET_VIEW_DESC desc; }; +/* ID3D10InputLayout */ +extern const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl; +struct d3d10_input_layout +{ + const struct ID3D10InputLayoutVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 4f0fb31..1d18c3f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -894,12 +894,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if const D3D10_INPUT_ELEMENT_DESC *element_descs, UINT element_count, const void *shader_byte_code, SIZE_T shader_byte_code_length, ID3D10InputLayout **input_layout) { + struct d3d10_input_layout *object; + FIXME("iface %p, element_descs %p, element_count %u, shader_byte_code %p," "\tshader_byte_code_length %lu, input_layout %p stub!\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); - return E_NOTIMPL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 input layout object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_input_layout_vtbl; + object->refcount = 1; + + *input_layout = (ID3D10InputLayout *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *iface, diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c new file mode 100644 index 0000000..034a642 --- /dev/null +++ b/dlls/d3d10core/inputlayout.c @@ -0,0 +1,118 @@ +/* + * 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_input_layout_QueryInterface(ID3D10InputLayout *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10InputLayout) + || 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_input_layout_AddRef(ID3D10InputLayout *iface) +{ + struct d3d10_input_layout *This = (struct d3d10_input_layout *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_input_layout_Release(ID3D10InputLayout *iface) +{ + struct d3d10_input_layout *This = (struct d3d10_input_layout *)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_input_layout_GetDevice(ID3D10InputLayout *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_input_layout_GetPrivateData(ID3D10InputLayout *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_input_layout_SetPrivateData(ID3D10InputLayout *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_input_layout_SetPrivateDataInterface(ID3D10InputLayout *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +const struct ID3D10InputLayoutVtbl d3d10_input_layout_vtbl = +{ + /* IUnknown methods */ + d3d10_input_layout_QueryInterface, + d3d10_input_layout_AddRef, + d3d10_input_layout_Release, + /* ID3D10DeviceChild methods */ + d3d10_input_layout_GetDevice, + d3d10_input_layout_GetPrivateData, + d3d10_input_layout_SetPrivateData, + d3d10_input_layout_SetPrivateDataInterface, +};

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10VertexShader implementation.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 7eb634976da1f2f491216c8b86d47c7edd05c5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eb634976da1f2f491216c8b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 4 07:07:38 2009 +0100 d3d10core: Add a stub ID3D10VertexShader implementation. --- dlls/d3d10core/Makefile.in | 1 + dlls/d3d10core/d3d10core_private.h | 8 +++ dlls/d3d10core/device.c | 16 +++++- dlls/d3d10core/shader.c | 118 ++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 7c96d29..e94d442 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ d3d10core_main.c \ device.c \ inputlayout.c \ + shader.c \ texture2d.c \ utils.c \ view.c diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index c5e919d..6426523 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -97,6 +97,14 @@ struct d3d10_input_layout LONG refcount; }; +/* ID3D10VertexShader */ +extern const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl; +struct d3d10_vertex_shader +{ + const struct ID3D10VertexShaderVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1d18c3f..a8b7759 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -919,10 +919,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10VertexShader **shader) { + struct d3d10_vertex_shader *object; + FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", iface, byte_code, byte_code_length, shader); - return E_NOTIMPL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 vertex shader object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_vertex_shader_vtbl; + object->refcount = 1; + + *shader = (ID3D10VertexShader *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device *iface, diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c new file mode 100644 index 0000000..79e8b9b --- /dev/null +++ b/dlls/d3d10core/shader.c @@ -0,0 +1,118 @@ +/* + * 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_vertex_shader_QueryInterface(ID3D10VertexShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10VertexShader) + || 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_vertex_shader_AddRef(ID3D10VertexShader *iface) +{ + struct d3d10_vertex_shader *This = (struct d3d10_vertex_shader *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *iface) +{ + struct d3d10_vertex_shader *This = (struct d3d10_vertex_shader *)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_vertex_shader_GetDevice(ID3D10VertexShader *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *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_vertex_shader_SetPrivateData(ID3D10VertexShader *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_vertex_shader_SetPrivateDataInterface(ID3D10VertexShader *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = +{ + /* IUnknown methods */ + d3d10_vertex_shader_QueryInterface, + d3d10_vertex_shader_AddRef, + d3d10_vertex_shader_Release, + /* ID3D10DeviceChild methods */ + d3d10_vertex_shader_GetDevice, + d3d10_vertex_shader_GetPrivateData, + d3d10_vertex_shader_SetPrivateData, + d3d10_vertex_shader_SetPrivateDataInterface, +};

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10GeometryShader implementation.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 972221f5eafc7e16052f16d3798087bb5f429ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972221f5eafc7e16052f16d37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 4 07:07:38 2009 +0100 d3d10core: Add a stub ID3D10GeometryShader implementation. --- dlls/d3d10core/d3d10core_private.h | 8 +++ dlls/d3d10core/device.c | 16 ++++++- dlls/d3d10core/shader.c | 93 ++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 6426523..e375068 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -105,6 +105,14 @@ struct d3d10_vertex_shader LONG refcount; }; +/* ID3D10GeometryShader */ +extern const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl; +struct d3d10_geometry_shader +{ + const struct ID3D10GeometryShaderVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index a8b7759..0f66f79 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -942,10 +942,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader) { + struct d3d10_geometry_shader *object; + FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", iface, byte_code, byte_code_length, shader); - return E_NOTIMPL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 geometry shader object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_geometry_shader_vtbl; + object->refcount = 1; + + *shader = (ID3D10GeometryShader *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutput(ID3D10Device *iface, diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 79e8b9b..01def34 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -116,3 +116,96 @@ const struct ID3D10VertexShaderVtbl d3d10_vertex_shader_vtbl = d3d10_vertex_shader_SetPrivateData, d3d10_vertex_shader_SetPrivateDataInterface, }; + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_QueryInterface(ID3D10GeometryShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10GeometryShader) + || 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_geometry_shader_AddRef(ID3D10GeometryShader *iface) +{ + struct d3d10_geometry_shader *This = (struct d3d10_geometry_shader *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShader *iface) +{ + struct d3d10_geometry_shader *This = (struct d3d10_geometry_shader *)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_geometry_shader_GetDevice(ID3D10GeometryShader *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10GeometryShader *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_geometry_shader_SetPrivateData(ID3D10GeometryShader *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_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = +{ + /* IUnknown methods */ + d3d10_geometry_shader_QueryInterface, + d3d10_geometry_shader_AddRef, + d3d10_geometry_shader_Release, + /* ID3D10DeviceChild methods */ + d3d10_geometry_shader_GetDevice, + d3d10_geometry_shader_GetPrivateData, + d3d10_geometry_shader_SetPrivateData, + d3d10_geometry_shader_SetPrivateDataInterface, +};

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10PixelShader implementation.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 53239a9aa21ccbc39fb13c97a4abb025526227b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53239a9aa21ccbc39fb13c97a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 4 07:07:38 2009 +0100 d3d10core: Add a stub ID3D10PixelShader implementation. --- dlls/d3d10core/d3d10core_private.h | 8 +++ dlls/d3d10core/device.c | 16 ++++++- dlls/d3d10core/shader.c | 93 ++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index e375068..9703821 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -113,6 +113,14 @@ struct d3d10_geometry_shader LONG refcount; }; +/* ID3D10PixelShader */ +extern const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl; +struct d3d10_pixel_shader +{ + const struct ID3D10PixelShaderVtbl *vtbl; + LONG refcount; +}; + /* Layered device */ enum dxgi_device_layer_id { diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0f66f79..689de3e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -977,10 +977,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10PixelShader **shader) { + struct d3d10_pixel_shader *object; + FIXME("iface %p, byte_code %p, byte_code_length %lu, shader %p stub!\n", iface, byte_code, byte_code_length, shader); - return E_NOTIMPL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate D3D10 pixel shader object memory\n"); + return E_OUTOFMEMORY; + } + + object->vtbl = &d3d10_pixel_shader_vtbl; + object->refcount = 1; + + *shader = (ID3D10PixelShader *)object; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *iface, diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 01def34..b614779 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -209,3 +209,96 @@ const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = d3d10_geometry_shader_SetPrivateData, d3d10_geometry_shader_SetPrivateDataInterface, }; + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D10PixelShader) + || 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_pixel_shader_AddRef(ID3D10PixelShader *iface) +{ + struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface; + ULONG refcount = InterlockedIncrement(&This->refcount); + + TRACE("%p increasing refcount to %u\n", This, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) +{ + struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)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_pixel_shader_GetDevice(ID3D10PixelShader *iface, ID3D10Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_GetPrivateData(ID3D10PixelShader *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_pixel_shader_SetPrivateData(ID3D10PixelShader *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_pixel_shader_SetPrivateDataInterface(ID3D10PixelShader *iface, + REFGUID guid, const IUnknown *data) +{ + FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + + return E_NOTIMPL; +} + +const struct ID3D10PixelShaderVtbl d3d10_pixel_shader_vtbl = +{ + /* IUnknown methods */ + d3d10_pixel_shader_QueryInterface, + d3d10_pixel_shader_AddRef, + d3d10_pixel_shader_Release, + /* ID3D10DeviceChild methods */ + d3d10_pixel_shader_GetDevice, + d3d10_pixel_shader_GetPrivateData, + d3d10_pixel_shader_SetPrivateData, + d3d10_pixel_shader_SetPrivateDataInterface, +};

1 0

Andrew Talbot : comdlg32: Fix a typo.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: 7b1c326016d0f4b864d94f6cc1eef10b138b48a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1c326016d0f4b864d94f6cc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 3 21:14:04 2009 +0000 comdlg32: Fix a typo. --- dlls/comdlg32/printdlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 318c82b..6726c6a 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3412,8 +3412,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) */ static LRESULT CALLBACK pagesetup_margin_editproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - switch(msg) - case WM_CHAR: + if (msg == WM_CHAR) { WCHAR decimal = get_decimal_sep(); WCHAR wc = (WCHAR)wparam;

1 0

Michael Stefaniuc : mlang: Silence some Win64 compile warnings.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: f75f4e431f580b89b4800fb5f03120cff92c82b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75f4e431f580b89b4800fb5f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 3 23:56:31 2009 +0100 mlang: Silence some Win64 compile warnings. If the flag TCI_SRCFONTSIG is not set then the first argument passed to TranslateCharsetInfo is just a DWORD that needs to be marshalled over a pointer. --- dlls/mlang/mlang.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index f9c3f8e..6f79f0b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1954,7 +1954,7 @@ static HRESULT WINAPI fnIMLangFontLink_CodePageToCodePages( TRACE("(%p) Seeking %u\n",This, uCodePage); - rc = TranslateCharsetInfo((DWORD*)uCodePage, &cs, TCI_SRCCODEPAGE); + rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uCodePage, &cs, TCI_SRCCODEPAGE); if (rc) { @@ -1985,8 +1985,9 @@ static HRESULT WINAPI fnIMLangFontLink_CodePagesToCodePage( *puCodePage = 0x00000000; - rc = TranslateCharsetInfo((DWORD*)uDefaultCodePage, &cs, TCI_SRCCODEPAGE); - + rc = TranslateCharsetInfo((DWORD*)(DWORD_PTR)uDefaultCodePage, &cs, + TCI_SRCCODEPAGE); + if (rc && (dwCodePages & cs.fs.fsCsb[0])) { TRACE("Found Default Codepage\n"); @@ -2592,7 +2593,8 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF { CHARSETINFO csi; - if (TranslateCharsetInfo((DWORD *)ml_data->family_codepage, &csi, TCI_SRCCODEPAGE)) + if (TranslateCharsetInfo((DWORD*)(DWORD_PTR)ml_data->family_codepage, &csi, + TCI_SRCCODEPAGE)) mime_cp_info->bGDICharset = csi.ciCharset; else mime_cp_info->bGDICharset = DEFAULT_CHARSET;

1 0

Michael Stefaniuc : winedos: Remove superfluous pointer casts.
by Alexandre Julliard 04 Mar '09

04 Mar '09

Module: wine Branch: master Commit: c6be3fea107157dfb876675f54a449852f803b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6be3fea107157dfb876675f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 4 10:41:06 2009 +0100 winedos: Remove superfluous pointer casts. --- dlls/winedos/dosaspi.c | 2 +- dlls/winedos/int10.c | 2 +- dlls/winedos/int21.c | 23 ++++++++++------------- dlls/winedos/int31.c | 10 ++++------ dlls/winedos/int33.c | 2 +- dlls/winedos/module.c | 8 ++++---- dlls/winedos/relay.c | 2 +- dlls/winedos/xms.c | 2 +- 8 files changed, 23 insertions(+), 28 deletions(-) diff --git a/dlls/winedos/dosaspi.c b/dlls/winedos/dosaspi.c index 988e776..9125d53 100644 --- a/dlls/winedos/dosaspi.c +++ b/dlls/winedos/dosaspi.c @@ -196,7 +196,7 @@ static void WINAPI ASPI_DOS_func(CONTEXT86 *context) */ void WINAPI DOSVM_ASPIHandler( CONTEXT86 *context ) { - FARPROC16 *p = (FARPROC16 *)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); + FARPROC16 *p = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); TRACE("DOS ASPI opening\n"); if ((CX_reg(context) == 4) || (CX_reg(context) == 5)) { diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index d49eef1..a0b82ed 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -1249,7 +1249,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context ) BYTE *pt; TRACE("Set Block of DAC registers\n"); - pt = (BYTE*)CTX_SEG_OFF_TO_LIN(context,context->SegEs,context->Edx); + pt = CTX_SEG_OFF_TO_LIN(context,context->SegEs,context->Edx); for (i=0;i<CX_reg(context);i++) { paldat.peRed = (*(pt+i*3+0)) << 2; diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 140885c..0c7967f 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -1213,8 +1213,8 @@ static BYTE *INT21_GetCurrentDTA( CONTEXT86 *context ) TDB *pTask = GlobalLock16(GetCurrentTask()); /* FIXME: This assumes DTA was set correctly! */ - return (BYTE *)CTX_SEG_OFF_TO_LIN( context, SELECTOROF(pTask->dta), - (DWORD)OFFSETOF(pTask->dta) ); + return CTX_SEG_OFF_TO_LIN( context, SELECTOROF(pTask->dta), + OFFSETOF(pTask->dta) ); } @@ -1978,9 +1978,8 @@ static void INT21_ExtendedCountryInformation( CONTEXT86 *context ) case 0xa1: /* CAPITALIZE COUNTED FILENAME STRING */ TRACE("Convert string to uppercase with length\n"); { - char *ptr = (char *)CTX_SEG_OFF_TO_LIN( context, - context->SegDs, - context->Edx ); + char *ptr = CTX_SEG_OFF_TO_LIN( context, context->SegDs, + context->Edx ); WORD len = CX_reg(context); while (len--) { *ptr = toupper(*ptr); ptr++; } } @@ -3117,9 +3116,8 @@ static void INT21_LongFilename( CONTEXT86 *context ) MultiByteToWideChar(CP_OEMCP, 0, pathA, -1, pathW, MAX_PATH); handle = FindFirstFileW(pathW, &dataW); - - dataA = (WIN32_FIND_DATAA *)CTX_SEG_OFF_TO_LIN(context, context->SegEs, - context->Edi); + + dataA = CTX_SEG_OFF_TO_LIN(context, context->SegEs, context->Edi); if (handle != INVALID_HANDLE_VALUE && (h16 = GlobalAlloc16(GMEM_MOVEABLE, sizeof(handle)))) { @@ -3148,8 +3146,7 @@ static void INT21_LongFilename( CONTEXT86 *context ) TRACE("LONG FILENAME - FIND NEXT MATCHING FILE for handle %d\n", BX_reg(context)); - dataA = (WIN32_FIND_DATAA *)CTX_SEG_OFF_TO_LIN(context, context->SegEs, - context->Edi); + dataA = CTX_SEG_OFF_TO_LIN(context, context->SegEs, context->Edi); if (h16 != INVALID_HANDLE_VALUE16 && (ptr = GlobalLock16( h16 ))) { @@ -3817,7 +3814,7 @@ static int INT21_FindFirst( CONTEXT86 *context ) WCHAR maskW[12], pathW[MAX_PATH]; static const WCHAR wildcardW[] = {'*','.','*',0}; - path = (const char *)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); + path = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); MultiByteToWideChar(CP_OEMCP, 0, path, -1, pathW, MAX_PATH); p = strrchrW( pathW, '\\'); @@ -3987,7 +3984,7 @@ static int INT21_FindNext( CONTEXT86 *context ) */ static int INT21_FindFirstFCB( CONTEXT86 *context ) { - BYTE *fcb = (BYTE *)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); + BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; int drive; WCHAR p[] = {' ',':',}; @@ -4011,7 +4008,7 @@ static int INT21_FindFirstFCB( CONTEXT86 *context ) */ static int INT21_FindNextFCB( CONTEXT86 *context ) { - BYTE *fcb = (BYTE *)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); + BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx); FINDFILE_FCB *pFCB; LPBYTE pResult = INT21_GetCurrentDTA(context); DOS_DIRENTRY_LAYOUT *ddl; diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index a2d806a..e555e97 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -1004,9 +1004,8 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) case 0x000b: /* Get descriptor */ TRACE( "get descriptor (0x%04x)\n", BX_reg(context) ); { - LDT_ENTRY *entry = (LDT_ENTRY*)CTX_SEG_OFF_TO_LIN( context, - context->SegEs, - context->Edi ); + LDT_ENTRY *entry = CTX_SEG_OFF_TO_LIN( context, context->SegEs, + context->Edi ); wine_ldt_get_entry( BX_reg(context), entry ); } break; @@ -1014,9 +1013,8 @@ void WINAPI DOSVM_Int31Handler( CONTEXT86 *context ) case 0x000c: /* Set descriptor */ TRACE( "set descriptor (0x%04x)\n", BX_reg(context) ); { - LDT_ENTRY *entry = (LDT_ENTRY*)CTX_SEG_OFF_TO_LIN( context, - context->SegEs, - context->Edi ); + LDT_ENTRY *entry = CTX_SEG_OFF_TO_LIN( context, context->SegEs, + context->Edi ); wine_ldt_set_entry( BX_reg(context), entry ); } break; diff --git a/dlls/winedos/int33.c b/dlls/winedos/int33.c index 70bb478..d72f0d8 100644 --- a/dlls/winedos/int33.c +++ b/dlls/winedos/int33.c @@ -201,7 +201,7 @@ typedef struct { static void MouseRelay(CONTEXT86 *context,void *mdata) { - MCALLDATA *data = (MCALLDATA *)mdata; + MCALLDATA *data = mdata; CONTEXT86 ctx = *context; if (!ISV86(&ctx)) diff --git a/dlls/winedos/module.c b/dlls/winedos/module.c index 0aa389f..a88aa0c 100644 --- a/dlls/winedos/module.c +++ b/dlls/winedos/module.c @@ -460,7 +460,7 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para WORD fullCmdLength; LPBYTE psp_start = (LPBYTE)((DWORD)DOSVM_psp << 4); PDB16 *psp = (PDB16 *)psp_start; - ExecBlock *blk = (ExecBlock *)paramblk; + ExecBlock *blk = paramblk; LPBYTE cmdline = PTR_REAL_TO_LIN(SELECTOROF(blk->cmdline),OFFSETOF(blk->cmdline)); LPBYTE envblock = PTR_REAL_TO_LIN(psp->environment, 0); int cmdLength = cmdline[0]; @@ -530,7 +530,7 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para /* MZ_LoadImage created a new PSP and loaded new values into it, * let's work on the new values now */ LPBYTE psp_start = (LPBYTE)((DWORD)DOSVM_psp << 4); - ExecBlock *blk = (ExecBlock *)paramblk; + ExecBlock *blk = paramblk; LPBYTE cmdline = PTR_REAL_TO_LIN(SELECTOROF(blk->cmdline),OFFSETOF(blk->cmdline)); /* First character contains the length of the command line. */ @@ -547,7 +547,7 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para */ LPBYTE stack; init_sp -= 2; - stack = (LPBYTE) CTX_SEG_OFF_TO_LIN(context, init_ss, init_sp); + stack = CTX_SEG_OFF_TO_LIN(context, init_ss, init_sp); /* FIXME: push AX correctly */ stack[0] = 0x00; /* push AL */ stack[1] = 0x00; /* push AH */ @@ -570,7 +570,7 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para break; case 3: /* load overlay */ { - OverlayBlock *blk = (OverlayBlock *)paramblk; + OverlayBlock *blk = paramblk; ret = MZ_DoLoadImage( hFile, filename, blk, 0); } break; diff --git a/dlls/winedos/relay.c b/dlls/winedos/relay.c index 9f6692c..39978fa 100644 --- a/dlls/winedos/relay.c +++ b/dlls/winedos/relay.c @@ -108,7 +108,7 @@ static void __stdcall RELAY_RelayStub( DOSRELAY proc, { if (proc) { - CONTEXT86 *context = (CONTEXT86*)ctx86; + CONTEXT86 *context = ctx86; RELAY_Stack16 *stack = RELAY_GetPointer( context->Esp ); DWORD old_seg_cs = context->SegCs; diff --git a/dlls/winedos/xms.c b/dlls/winedos/xms.c index a19ea26..0b39ca6 100644 --- a/dlls/winedos/xms.c +++ b/dlls/winedos/xms.c @@ -53,7 +53,7 @@ typedef struct { static BYTE * XMS_Offset( MOVEOFS *ofs ) { if (ofs->Handle) return (BYTE*)GlobalLock16(ofs->Handle)+ofs->Offset; - else return (BYTE*)PTR_REAL_TO_LIN(SELECTOROF(ofs->Offset),OFFSETOF(ofs->Offset)); + else return PTR_REAL_TO_LIN(SELECTOROF(ofs->Offset),OFFSETOF(ofs->Offset)); } /**********************************************************************

1 0