wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmapFromWicBitmap().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 4e73cd517aa7da918962811c3a6dd891b7119c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e73cd517aa7da918962811c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:14 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateBitmapFromWicBitmap(). --- dlls/d2d1/render_target.c | 84 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 2c501ef..4a69fce 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -20,6 +20,7 @@ #include "wine/port.h" #include "d2d1_private.h" +#include "wincodec.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); @@ -201,10 +202,89 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderT static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface, IWICBitmapSource *bitmap_source, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - FIXME("iface %p, bitmap_source %p, desc %p, bitmap %p stub!\n", + D2D1_BITMAP_PROPERTIES bitmap_desc; + unsigned int bpp, data_size; + D2D1_SIZE_U size; + WICRect rect; + UINT32 pitch; + HRESULT hr; + void *data; + + TRACE("iface %p, bitmap_source %p, desc %p, bitmap %p.\n", iface, bitmap_source, desc, bitmap); - return E_NOTIMPL; + if (FAILED(hr = IWICBitmapSource_GetSize(bitmap_source, &size.width, &size.height))) + { + WARN("Failed to get bitmap size, hr %#x.\n", hr); + return hr; + } + + if (!desc) + { + bitmap_desc.pixelFormat.format = DXGI_FORMAT_UNKNOWN; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + bitmap_desc.dpiX = 0.0f; + bitmap_desc.dpiY = 0.0f; + } + else + { + bitmap_desc = *desc; + } + + if (bitmap_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) + { + WICPixelFormatGUID wic_format; + + if (FAILED(hr = IWICBitmapSource_GetPixelFormat(bitmap_source, &wic_format))) + { + WARN("Failed to get bitmap format, hr %#x.\n", hr); + return hr; + } + + if (IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppPBGRA) + || IsEqualGUID(&wic_format, &GUID_WICPixelFormat32bppBGR)) + { + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + } + else + { + WARN("Unsupported WIC bitmap format %s.\n", debugstr_guid(&wic_format)); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + } + + switch (bitmap_desc.pixelFormat.format) + { + case DXGI_FORMAT_B8G8R8A8_UNORM: + bpp = 4; + break; + + default: + FIXME("Unhandled format %#x.\n", bitmap_desc.pixelFormat.format); + return D2DERR_UNSUPPORTED_PIXEL_FORMAT; + } + + pitch = ((bpp * size.width) + 15) & ~15; + data_size = pitch * size.height; + if (!(data = HeapAlloc(GetProcessHeap(), 0, data_size))) + return E_OUTOFMEMORY; + + rect.X = 0; + rect.Y = 0; + rect.Width = size.width; + rect.Height = size.height; + if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data))) + { + WARN("Failed to copy bitmap pixels, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, data); + return hr; + } + + hr = d2d_d3d_render_target_CreateBitmap(iface, size, data, pitch, &bitmap_desc, bitmap); + + HeapFree(GetProcessHeap(), 0, data); + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateSharedBitmap(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateBitmap().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: 76dd63e4225f0f206ef62044f92283f31f526b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dd63e4225f0f206ef62044f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:13 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateBitmap(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/bitmap.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 9 +++ dlls/d2d1/render_target.c | 14 +++- 4 files changed, 183 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 6c27e22..1e829da 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = d2d1 IMPORTS = d3d10_1 dxguid uuid C_SRCS = \ + bitmap.c \ brush.c \ factory.c \ mesh.c \ diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c new file mode 100644 index 0000000..10c4296 --- /dev/null +++ b/dlls/d2d1/bitmap.c @@ -0,0 +1,161 @@ +/* + * Copyright 2014 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 "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_bitmap *impl_from_ID2D1Bitmap(ID2D1Bitmap *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Bitmap) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Bitmap_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_bitmap_AddRef(ID2D1Bitmap *iface) +{ + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + ULONG refcount = InterlockedIncrement(&bitmap->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) +{ + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface); + ULONG refcount = InterlockedDecrement(&bitmap->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, bitmap); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_bitmap_GetFactory(ID2D1Bitmap *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_bitmap_GetSize(ID2D1Bitmap *iface, D2D1_SIZE_F *size) +{ + FIXME("iface %p, size %p stub!\n", iface, size); + + size->width = 0.0f; + size->height = 0.0f; + return size; +} + +static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_bitmap_GetPixelSize(ID2D1Bitmap *iface, D2D1_SIZE_U *pixel_size) +{ + FIXME("iface %p, pixel_size %p stub!\n", iface, pixel_size); + + pixel_size->width = 0; + pixel_size->height = 0; + return pixel_size; +} + +static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitmap *iface, D2D1_PIXEL_FORMAT *format) +{ + FIXME("iface %p stub!\n", iface); + + format->format = DXGI_FORMAT_UNKNOWN; + format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + return format; +} + +static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y) +{ + FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); + + *dpi_x = 96.0f; + *dpi_y = 96.0f; +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, + const D2D1_POINT_2U *dst_point, ID2D1Bitmap *bitmap, const D2D1_RECT_U *src_rect) +{ + FIXME("iface %p, dst_point %p, bitmap %p, src_rect %p stub!\n", iface, dst_point, bitmap, src_rect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromRenderTarget(ID2D1Bitmap *iface, + const D2D1_POINT_2U *dst_point, ID2D1RenderTarget *render_target, const D2D1_RECT_U *src_rect) +{ + FIXME("iface %p, dst_point %p, render_target %p, src_rect %p stub!", iface, dst_point, render_target, src_rect); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap *iface, + const D2D1_RECT_U *dst_rect, const void *src_data, UINT32 pitch) +{ + FIXME("iface %p, dst_rect %p, src_data %p, pitch %u stub!\n", iface, dst_rect, src_data, pitch); + + return E_NOTIMPL; +} + +static const struct ID2D1BitmapVtbl d2d_bitmap_vtbl = +{ + d2d_bitmap_QueryInterface, + d2d_bitmap_AddRef, + d2d_bitmap_Release, + d2d_bitmap_GetFactory, + d2d_bitmap_GetSize, + d2d_bitmap_GetPixelSize, + d2d_bitmap_GetPixelFormat, + d2d_bitmap_GetDpi, + d2d_bitmap_CopyFromBitmap, + d2d_bitmap_CopyFromRenderTarget, + d2d_bitmap_CopyFromMemory, +}; + +void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data, + UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) +{ + FIXME("Ignoring bitmap properties.\n"); + + bitmap->ID2D1Bitmap_iface.lpVtbl = &d2d_bitmap_vtbl; + bitmap->refcount = 1; +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0b8cf2b..7c7956b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -115,4 +115,13 @@ struct d2d_mesh void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; +struct d2d_bitmap +{ + ID2D1Bitmap ID2D1Bitmap_iface; + LONG refcount; +}; + +void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data, + UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 8a55890..2c501ef 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -182,10 +182,20 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetFactory(ID2D1RenderTarget static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmap(ID2D1RenderTarget *iface, D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES *desc, ID2D1Bitmap **bitmap) { - FIXME("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p stub!\n", + struct d2d_bitmap *object; + + TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", iface, size.width, size.height, src_data, pitch, desc, bitmap); - return E_NOTIMPL; + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_bitmap_init(object, size, src_data, pitch, desc); + + TRACE("Created bitmap %p.\n", object); + *bitmap = &object->ID2D1Bitmap_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapFromWicBitmap(ID2D1RenderTarget *iface,

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateMesh().
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: be415203c7e25a38d0f5a248ae1683208dd06671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be415203c7e25a38d0f5a248a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 16 10:44:12 2014 +0200 d2d1: Implement d2d_d3d_render_target_CreateMesh(). --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 8 ++++ dlls/d2d1/mesh.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 14 ++++++- 4 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 60072ca..6c27e22 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -5,6 +5,7 @@ IMPORTS = d3d10_1 dxguid uuid C_SRCS = \ brush.c \ factory.c \ + mesh.c \ render_target.c \ stroke.c \ wic_render_target.c diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4ee4ab0..0b8cf2b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -107,4 +107,12 @@ struct d2d_stroke_style void d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_mesh +{ + ID2D1Mesh ID2D1Mesh_iface; + LONG refcount; +}; + +void d2d_mesh_init(struct d2d_mesh *mesh) DECLSPEC_HIDDEN; + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c new file mode 100644 index 0000000..b566382 --- /dev/null +++ b/dlls/d2d1/mesh.c @@ -0,0 +1,100 @@ +/* + * Copyright 2014 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 "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_mesh *impl_from_ID2D1Mesh(ID2D1Mesh *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_mesh, ID2D1Mesh_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_mesh_QueryInterface(ID2D1Mesh *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Mesh) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Mesh_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_mesh_AddRef(ID2D1Mesh *iface) +{ + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + ULONG refcount = InterlockedIncrement(&mesh->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) +{ + struct d2d_mesh *mesh = impl_from_ID2D1Mesh(iface); + ULONG refcount = InterlockedDecrement(&mesh->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + HeapFree(GetProcessHeap(), 0, mesh); + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_mesh_GetFactory(ID2D1Mesh *iface, ID2D1Factory **factory) +{ + FIXME("iface %p, factory %p stub!\n", iface, factory); + + *factory = NULL; +} + +static HRESULT STDMETHODCALLTYPE d2d_mesh_Open(ID2D1Mesh *iface, ID2D1TessellationSink **sink) +{ + FIXME("iface %p, sink %p stub!\n", iface, sink); + + return E_NOTIMPL; +} + +static const struct ID2D1MeshVtbl d2d_mesh_vtbl = +{ + d2d_mesh_QueryInterface, + d2d_mesh_AddRef, + d2d_mesh_Release, + d2d_mesh_GetFactory, + d2d_mesh_Open, +}; + +void d2d_mesh_init(struct d2d_mesh *mesh) +{ + mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; + mesh->refcount = 1; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4d69697..8a55890 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -304,9 +304,19 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) { - FIXME("iface %p, mesh %p stub!\n", iface, mesh); + struct d2d_mesh *object; - return E_NOTIMPL; + TRACE("iface %p, mesh %p.\n", iface, mesh); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + d2d_mesh_init(object); + + TRACE("Created mesh %p.\n", object); + *mesh = &object->ID2D1Mesh_iface; + + return S_OK; } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface,

1 0

Jacek Caban : oleacc: Added CAccPropServices stub implementation.
by Alexandre Julliard 16 Sep '14

16 Sep '14

Module: wine Branch: master Commit: c5af3d912bdd406a4a37cf9543d723e905aa7390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5af3d912bdd406a4a37cf954… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 15 21:36:59 2014 +0200 oleacc: Added CAccPropServices stub implementation. --- dlls/oleacc/Makefile.in | 1 + dlls/oleacc/main.c | 6 -- dlls/oleacc/propservice.c | 257 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/oleacc/tests/main.c | 16 +++ 4 files changed, 274 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5af3d912bdd406a4a37c…

1 0

Hugh McMaster : user32: Fix spelling in a comment.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 0fa8ae7b5280d3acad2c3221f72d91dea9c17f12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa8ae7b5280d3acad2c3221f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Sep 15 19:24:10 2014 +1000 user32: Fix spelling in a comment. --- dlls/user32/win.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c9660be..73cad0c 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2602,9 +2602,9 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * SetWindowLong() alters one of a window's attributes or sets a 32-bit (long) * value in a window's extra memory. * - * The _hwnd_ parameter specifies the window. is the handle to a - * window that has extra memory. The _newval_ parameter contains the - * new attribute or extra memory value. If positive, the _offset_ + * The _hwnd_ parameter specifies the handle to a window that + * has extra memory. The _newval_ parameter contains the new + * attribute or extra memory value. If positive, the _offset_ * parameter is the byte-addressed location in the window's extra * memory to set. If negative, _offset_ specifies the window * attribute to set, and should be one of the following values: @@ -2615,7 +2615,7 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval * * GWLP_WNDPROC Pointer to the window's window procedure. * - * GWLP_HINSTANCE The window's pplication instance handle. + * GWLP_HINSTANCE The window's application instance handle. * * GWLP_ID The window's identifier. *

1 0

Jactry Zeng : riched20: Implement ITextSelection::GetChar.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 329252f88b6dc2d93df8f7b0320418b504182639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=329252f88b6dc2d93df8f7b03… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 00:13:51 2014 +0800 riched20: Implement ITextSelection::GetChar. --- dlls/riched20/richole.c | 9 ++++++-- dlls/riched20/tests/richole.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 6a00016..963368f 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1569,11 +1569,16 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR bstr) static HRESULT WINAPI ITextSelection_fnGetChar(ITextSelection *me, LONG *pch) { ITextSelectionImpl *This = impl_from_ITextSelection(me); + ME_Cursor *start = NULL, *end = NULL; + if (!This->reOle) return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; - FIXME("not implemented\n"); - return E_NOTIMPL; + ME_GetSelection(This->reOle->editor, &start, &end); + return range_GetChar(This->reOle->editor, start, pch); } static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f85de2d..2e9b45a 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -583,6 +583,54 @@ static void test_ITextRange_GetChar(void) release_interfaces(&w, &reOle, &txtDoc, NULL); } +static void test_ITextSelection_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextSelection *txtSel = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + create_interfaces(&w, &reOle, &txtDoc, &txtSel); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + + first = 0, lim = 4; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 0, lim = 0; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + + first = 12, lim = 12; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + first = 13, lim = 13; + SendMessageA(w, EM_SETSEL, first, lim); + pch = 0xdeadbeef; + hres = ITextSelection_GetChar(txtSel, &pch); + ok(hres == S_OK, "ITextSelection_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + + hres = ITextSelection_GetChar(txtSel, NULL); + ok(hres == E_INVALIDARG, "ITextSelection_GetChar\n"); + + release_interfaces(&w, &reOle, &txtDoc, &txtSel); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -593,6 +641,7 @@ START_TEST(richole) test_Interfaces(); test_ITextDocument_Open(); test_ITextSelection_GetText(); + test_ITextSelection_GetChar(); test_ITextDocument_Range(); test_ITextRange_GetChar(); }

1 0

Jactry Zeng : riched20: Implement ITextRange::GetChar.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 0aa433438d520df0bc2f3ec65589dbe7311405f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa433438d520df0bc2f3ec65… Author: Jactry Zeng <wine(a)jactry.com> Date: Tue Sep 16 00:13:30 2014 +0800 riched20: Implement ITextRange::GetChar. --- dlls/riched20/richole.c | 19 +++++++++++-- dlls/riched20/tests/richole.c | 66 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 194f471..6a00016 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -567,14 +567,29 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR bstr) return E_NOTIMPL; } +static HRESULT range_GetChar(ME_TextEditor *editor, ME_Cursor *cursor, LONG *pch) +{ + WCHAR wch[2]; + + ME_GetTextW(editor, wch, 1, cursor, 1, FALSE, cursor->pRun->next->type == diTextEnd); + *pch = wch[0]; + + return S_OK; +} + static HRESULT WINAPI ITextRange_fnGetChar(ITextRange *me, LONG *pch) { ITextRangeImpl *This = impl_from_ITextRange(me); + ME_Cursor cursor; + if (!This->reOle) return CO_E_RELEASED; + TRACE("%p\n", pch); + if (!pch) + return E_INVALIDARG; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + ME_CursorFromCharOfs(This->reOle->editor, This->start, &cursor); + return range_GetChar(This->reOle->editor, &cursor, pch); } static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index f56a14a..f85de2d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -518,6 +518,71 @@ static void test_ITextDocument_Range(void) ITextRange_Release(txtRge); } +static void test_ITextRange_GetChar(void) +{ + HWND w; + IRichEditOle *reOle = NULL; + ITextDocument *txtDoc = NULL; + ITextRange *txtRge = NULL; + HRESULT hres; + LONG pch = 0xdeadbeef; + int first, lim; + static const CHAR test_text1[] = "TestSomeText"; + + first = 0, lim = 4; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 0, lim = 0; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == 'T', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 12, lim = 12; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + first = 13, lim = 13; + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + ITextDocument_Range(txtDoc, first, lim, &txtRge); + pch = 0xdeadbeef; + hres = ITextRange_GetChar(txtRge, &pch); + ok(hres == S_OK, "ITextRange_GetChar\n"); + ok(pch == '\r', "got wrong char: %c\n", pch); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); + + create_interfaces(&w, &reOle, &txtDoc, NULL); + SendMessageA(w, WM_SETTEXT, 0, (LPARAM)test_text1); + first = 12, lim = 12; + ITextDocument_Range(txtDoc, first, lim, &txtRge); + hres = ITextRange_GetChar(txtRge, NULL); + ok(hres == E_INVALIDARG, "ITextRange_GetChar\n"); + ITextRange_Release(txtRge); + release_interfaces(&w, &reOle, &txtDoc, NULL); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -529,4 +594,5 @@ START_TEST(richole) test_ITextDocument_Open(); test_ITextSelection_GetText(); test_ITextDocument_Range(); + test_ITextRange_GetChar(); }

1 0

Michael Müller : bcrypt: Add semi-stub for BCryptGetFipsAlgorithmMode.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: f808da266b4c9192602a929a3298c0631944b8a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f808da266b4c9192602a929a3… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Aug 16 00:18:06 2014 +0200 bcrypt: Add semi-stub for BCryptGetFipsAlgorithmMode. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 11 +++++++++++ dlls/bcrypt/tests/bcrypt.c | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 3b154f5..83cdbea 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -27,7 +27,7 @@ @ stdcall BCryptGenRandom(ptr ptr long long) @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey -@ stub BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetFipsAlgorithmMode(ptr) @ stub BCryptGetProperty @ stub BCryptHashData @ stub BCryptImportKey diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 5ccb9f1..35a640a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -97,3 +97,14 @@ NTSTATUS WINAPI BCryptCloseAlgorithmProvider(BCRYPT_ALG_HANDLE algorithm, DWORD return STATUS_NOT_IMPLEMENTED; } + +NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) +{ + FIXME("%p - semi-stub\n", enabled); + + if (!enabled) + return STATUS_INVALID_PARAMETER; + + *enabled = FALSE; + return STATUS_SUCCESS; +} diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 288e745..9e659d6 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -27,6 +27,7 @@ static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE hAlgorithm, PUCHAR pbBuffer, ULONG cbBuffer, ULONG dwFlags); +static NTSTATUS (WINAPI *pBCryptGetFipsAlgorithmMode)(BOOLEAN *enabled); static BOOL Init(void) { @@ -38,6 +39,7 @@ static BOOL Init(void) } pBCryptGenRandom = (void *)GetProcAddress(hbcrypt, "BCryptGenRandom"); + pBCryptGetFipsAlgorithmMode = (void *)GetProcAddress(hbcrypt, "BCryptGetFipsAlgorithmMode"); return TRUE; } @@ -78,10 +80,29 @@ static void test_BCryptGenRandom(void) ok(memcmp(buffer, buffer + 8, 8), "Expected a random number, got 0\n"); } +static void test_BCryptGetFipsAlgorithmMode(void) +{ + NTSTATUS ret; + BOOLEAN enabled; + + if (!pBCryptGetFipsAlgorithmMode) + { + win_skip("BCryptGetFipsAlgorithmMode is not available\n"); + return; + } + + ret = pBCryptGetFipsAlgorithmMode(&enabled); + ok(ret == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%x\n", ret); + + ret = pBCryptGetFipsAlgorithmMode(NULL); + ok(ret == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got 0x%x\n", ret); +} + START_TEST(bcrypt) { if (!Init()) return; test_BCryptGenRandom(); + test_BCryptGetFipsAlgorithmMode(); }

1 0

Hans Leidekker : rsaenh: Fix typos in SHA-384/SHA-512 OIDs.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 2884053a28959a5950bafabb387fc9c96f625cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=2884053a28959a5950bafabb3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 15 16:37:26 2014 +0200 rsaenh: Fix typos in SHA-384/SHA-512 OIDs. --- dlls/rsaenh/rsaenh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index fa9071d..7123ffb 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -248,7 +248,7 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_AES_256, 256,256, 256,0, 8,"AES-256", 39,"Advanced Encryption Standard (AES-256)"}, {CALG_SHA, 160,160, 160,CRYPT_FLAG_SIGNING, 6,"SHA-1", 30,"Secure Hash Algorithm (SHA-1)"}, {CALG_SHA_256, 256,256, 256,CRYPT_FLAG_SIGNING, 6,"SHA-256", 30,"Secure Hash Algorithm (SHA-256)"}, - {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-284)"}, + {CALG_SHA_384, 384,384, 384,CRYPT_FLAG_SIGNING, 6,"SHA-384", 30,"Secure Hash Algorithm (SHA-384)"}, {CALG_SHA_512, 512,512, 512,CRYPT_FLAG_SIGNING, 6,"SHA-512", 30,"Secure Hash Algorithm (SHA-512)"}, {CALG_MD2, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD2", 23,"Message Digest 2 (MD2)"}, {CALG_MD4, 128,128, 128,CRYPT_FLAG_SIGNING, 4,"MD4", 23,"Message Digest 4 (MD4)"}, @@ -1483,10 +1483,10 @@ static BOOL build_hash_signature(BYTE *pbSignature, DWORD dwLen, ALG_ID aiAlgid, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05, 0x00, 0x04, 0x20 } }, { CALG_SHA_384, 19, { 0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, - 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05, 0x00, 0x04, 0x30 } }, - { CALG_SHA_384, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, - 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, + { CALG_SHA_512, 19, { 0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86, + 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05, 0x00, 0x04, 0x40 } }, { CALG_SSL3_SHAMD5, 0, { 0 } }, { 0, 0, { 0 } }

1 0

Hans Leidekker : winhttp: Verify the async parameter type in IWinHttpRequest::Open.
by Alexandre Julliard 15 Sep '14

15 Sep '14

Module: wine Branch: master Commit: 0b366dca3c05121204ab751ac597ccb45af262a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b366dca3c05121204ab751ac… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Sep 15 16:36:44 2014 +0200 winhttp: Verify the async parameter type in IWinHttpRequest::Open. --- dlls/winhttp/request.c | 2 +- dlls/winhttp/tests/winhttp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1f9b4aa..d497d7a 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2992,7 +2992,7 @@ static HRESULT WINAPI winhttp_request_Open( path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; + if (V_VT( &async ) == VT_BOOL && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 51fcc86..27fb212 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2561,6 +2561,8 @@ static void test_IWinHttpRequest(void) method = SysAllocString( method1W ); SysFreeString( url ); url = SysAllocString( url1W ); + V_VT( &async ) = VT_ERROR; + V_ERROR( &async ) = DISP_E_PARAMNOTFOUND; hr = IWinHttpRequest_Open( req, method, url, async ); ok( hr == S_OK, "got %08x\n", hr );

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2014