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

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_convert_format().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: fea913351dba469405a65b8a3e0205fe0673b7e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea913351dba469405a65b8a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:53 2016 +0100 wined3d: Pass a texture and sub-resource index to surface_convert_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 49 ++++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 779febf..b136ecb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1974,61 +1974,59 @@ static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_fo return NULL; } -static struct wined3d_texture *surface_convert_format(struct wined3d_surface *source, enum wined3d_format_id to_fmt) +static struct wined3d_texture *surface_convert_format(struct wined3d_texture *src_texture, + unsigned int sub_resource_idx, enum wined3d_format_id format) { struct wined3d_map_desc src_map, dst_map; const struct d3dfmt_converter_desc *conv; - struct wined3d_texture *ret = NULL; + struct wined3d_texture *dst_texture; struct wined3d_resource_desc desc; - struct wined3d_surface *dst; - conv = find_converter(source->resource.format->id, to_fmt); - if (!conv) + if (!(conv = find_converter(src_texture->resource.format->id, format))) { FIXME("Cannot find a conversion function from format %s to %s.\n", - debug_d3dformat(source->resource.format->id), debug_d3dformat(to_fmt)); + debug_d3dformat(src_texture->resource.format->id), debug_d3dformat(format)); return NULL; } /* FIXME: Multisampled conversion? */ - wined3d_resource_get_desc(&source->resource, &desc); + wined3d_resource_get_desc(src_texture->sub_resources[sub_resource_idx].resource, &desc); desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; - desc.format = to_fmt; + desc.format = format; desc.usage = 0; desc.pool = WINED3D_POOL_SCRATCH; - if (FAILED(wined3d_texture_create(source->resource.device, &desc, 1, + if (FAILED(wined3d_texture_create(src_texture->resource.device, &desc, 1, WINED3D_TEXTURE_CREATE_MAPPABLE | WINED3D_TEXTURE_CREATE_DISCARD, - NULL, NULL, &wined3d_null_parent_ops, &ret))) + NULL, NULL, &wined3d_null_parent_ops, &dst_texture))) { - ERR("Failed to create a destination surface for conversion.\n"); + ERR("Failed to create a destination texture for conversion.\n"); return NULL; } - dst = surface_from_resource(wined3d_texture_get_sub_resource(ret, 0)); memset(&src_map, 0, sizeof(src_map)); memset(&dst_map, 0, sizeof(dst_map)); - if (FAILED(wined3d_surface_map(source, &src_map, NULL, WINED3D_MAP_READONLY))) + if (FAILED(wined3d_resource_map(&src_texture->resource, sub_resource_idx, + &src_map, NULL, WINED3D_MAP_READONLY))) { - ERR("Failed to lock the source surface.\n"); - wined3d_texture_decref(ret); + ERR("Failed to map the source texture.\n"); + wined3d_texture_decref(dst_texture); return NULL; } - if (FAILED(wined3d_surface_map(dst, &dst_map, NULL, 0))) + if (FAILED(wined3d_resource_map(&dst_texture->resource, 0, &dst_map, NULL, 0))) { - ERR("Failed to lock the destination surface.\n"); - wined3d_surface_unmap(source); - wined3d_texture_decref(ret); + ERR("Failed to map the destination texture.\n"); + wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); + wined3d_texture_decref(dst_texture); return NULL; } - conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, - source->resource.width, source->resource.height); + conv->convert(src_map.data, dst_map.data, src_map.row_pitch, dst_map.row_pitch, desc.width, desc.height); - wined3d_surface_unmap(dst); - wined3d_surface_unmap(source); + wined3d_resource_unmap(&dst_texture->resource, 0); + wined3d_resource_unmap(&src_texture->resource, sub_resource_idx); - return ret; + return dst_texture; } static HRESULT _Blt_ColorFill(BYTE *buf, unsigned int width, unsigned int height, @@ -4137,7 +4135,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { if (dst_surface->resource.format->id != src_surface->resource.format->id) { - if (!(src_texture = surface_convert_format(src_surface, dst_format->id))) + if (!(src_texture = surface_convert_format(src_surface->container, + surface_get_sub_resource_idx(src_surface), dst_format->id))) { /* The conv function writes a FIXME */ WARN("Cannot convert source surface format to dest format.\n");

1 0

Henri Verbeet : wined3d: Pass textures and sub-resource indices to surface_cpu_blt().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 9f17f922070c271c2ea1435382e0eb495ce2545d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f17f922070c271c2ea143538… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 7 17:05:54 2016 +0100 wined3d: Pass textures and sub-resource indices to surface_cpu_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 188 ++++++++++++++++++++++++++----------------------- 1 file changed, 98 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f17f922070c271c2ea14…

1 0

Stefan Dösinger : wined3d: Call wined3d_surface_prepare() in surface_load_sysmem().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 0771244873ed06c272446e15fff9f2f6727395e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0771244873ed06c272446e15f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 7 17:05:55 2016 +0100 wined3d: Call wined3d_surface_prepare() in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++------ dlls/wined3d/texture.c | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d77cd3c..814d4ab 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1020,7 +1020,6 @@ static void surface_unload(struct wined3d_resource *resource) } else { - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } @@ -2194,11 +2193,11 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ gl_info = context->gl_info; } - wined3d_surface_prepare(surface, context, surface->resource.map_binding); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", wined3d_debug_location(surface->resource.map_binding)); + wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_validate_location(surface, surface->resource.map_binding); } else @@ -3463,6 +3462,8 @@ static void surface_load_sysmem(struct wined3d_surface *surface, { const struct wined3d_gl_info *gl_info = context->gl_info; + wined3d_surface_prepare(surface, context, dst_location); + if (surface->locations & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); @@ -3578,7 +3579,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3589,7 +3589,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); } } @@ -3598,7 +3597,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ - surface_prepare_system_memory(surface); surface_load_location(surface, context, WINED3D_LOCATION_SYSMEM); } @@ -3625,7 +3623,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, else surface->resource.map_binding = WINED3D_LOCATION_SYSMEM; - wined3d_surface_prepare(surface, context, surface->resource.map_binding); surface_load_location(surface, context, surface->resource.map_binding); wined3d_texture_remove_buffer_object(texture, surface_get_sub_resource_idx(surface), gl_info); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5a7c16..71ce472 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -853,7 +853,6 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub struct wined3d_context *context; context = context_acquire(surface->container->resource.device, NULL); - wined3d_surface_prepare(surface, context, sub_resource->map_binding); surface_load_location(surface, context, sub_resource->map_binding); context_release(context); surface_invalidate_location(surface, ~sub_resource->map_binding);

1 0

Nikolay Sivov : include: Added IDWriteFactory3 method definitions.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 39958094b93cac9c16498dc1536493cc503a4df9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39958094b93cac9c16498dc15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 21:43:58 2016 +0300 include: Added IDWriteFactory3 method definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 967cd95..b69f29a 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -21,6 +21,7 @@ import "dwrite_2.idl"; interface IDWriteFontFaceReference; interface IDWriteFontFace3; interface IDWriteFontSet; +interface IDWriteFontSetBuilder; interface IDWriteFontDownloadQueue; typedef enum DWRITE_LOCALITY @@ -260,4 +261,50 @@ interface IDWriteTextLayout3 : IDWriteTextLayout2 ] interface IDWriteFactory3 : IDWriteFactory2 { + HRESULT CreateGlyphRunAnalysis( + DWRITE_GLYPH_RUN const *run, + DWRITE_MATRIX const *transform, + DWRITE_RENDERING_MODE1 rendering_mode, + DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GRID_FIT_MODE gridfit_mode, + DWRITE_TEXT_ANTIALIAS_MODE antialias_mode, + FLOAT origin_x, + FLOAT origin_y, + IDWriteGlyphRunAnalysis **analysis); + + HRESULT CreateCustomRenderingParams( + FLOAT gamma, + FLOAT enhanced_contrast, + FLOAT grayscale_enhanced_contrast, + FLOAT cleartype_level, + DWRITE_PIXEL_GEOMETRY pixel_geometry, + DWRITE_RENDERING_MODE1 rendering_mode, + DWRITE_GRID_FIT_MODE gridfit_mode, + IDWriteRenderingParams3 **params); + + HRESULT CreateFontFaceReference( + WCHAR const *path, + FILETIME const *writetime, + UINT32 index, + DWRITE_FONT_SIMULATIONS simulations, + IDWriteFontFaceReference **reference); + + HRESULT CreateFontFaceReference_( + IDWriteFontFile *file, + UINT32 index, + DWRITE_FONT_SIMULATIONS simulations, + IDWriteFontFaceReference **reference); + + HRESULT GetSystemFontSet(IDWriteFontSet **fontset); + HRESULT CreateFontSetBuilder(IDWriteFontSetBuilder **builder); + HRESULT CreateFontCollectionFromFontSet( + IDWriteFontSet *fontset, + IDWriteFontCollection1 **collection); + + HRESULT GetSystemFontCollection( + BOOL include_downloadable, + IDWriteFontCollection1 **collection, + BOOL check_for_updates); + + HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); }

1 0

Nikolay Sivov : notepad: Make sure to use large enough buffer when composing window title ( Coverity).
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: ba5e12ae8332246d64d0f3b2827ff3d5e7b6c760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5e12ae8332246d64d0f3b28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 22:04:25 2016 +0300 notepad: Make sure to use large enough buffer when composing window title (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/notepad/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index 1ea2ef9..94301b8 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -101,9 +101,9 @@ VOID ShowLastError(void) */ void UpdateWindowCaption(void) { - WCHAR szCaption[MAX_STRING_LEN]; - WCHAR szNotepad[MAX_STRING_LEN]; static const WCHAR hyphenW[] = { ' ','-',' ',0 }; + WCHAR szNotepad[64]; + WCHAR szCaption[ARRAY_SIZE(Globals.szFileTitle) + ARRAY_SIZE(hyphenW) + ARRAY_SIZE(szNotepad)]; if (Globals.szFileTitle[0] != '\0') lstrcpyW(szCaption, Globals.szFileTitle);

1 0

Nikolay Sivov : oleview: Fix buffer length passed to Reg* functions ( Coverity).
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 3db8af259cee7e8d57d45aaea9bb9a2c1d88b0a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db8af259cee7e8d57d45aaea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 7 23:02:24 2016 +0300 oleview: Fix buffer length passed to Reg* functions (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/details.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index 49d3dc4..b194f6f 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -51,8 +51,8 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad while(TRUE) { - lenName = sizeof(WCHAR[MAX_LOAD_STRING])/sizeof(WCHAR); - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + lenName = sizeof(wszName)/sizeof(WCHAR); + lenData = sizeof(wszData); retEnum = RegEnumValueW(hKey, i, wszName, &lenName, NULL, &valType, (LPBYTE)wszData, &lenData); @@ -100,8 +100,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad tvis.hParent = TVI_ROOT; tvis.hParent = TreeView_InsertItemW(details.hReg, &tvis); - lenName = sizeof(WCHAR[MAX_LOAD_STRING]); - + lenName = sizeof(wszName); RegQueryValueW(hCurKey, NULL, wszName, (LONG *)&lenName); RegCloseKey(hCurKey); @@ -116,13 +115,12 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad } i=-1; - lenName = sizeof(WCHAR[MAX_LOAD_STRING]); while(TRUE) { i++; - if(RegEnumKeyW(hKey, i, wszName, lenName) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, wszName, sizeof(wszName)/sizeof(WCHAR)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, wszName, &hCurKey) != ERROR_SUCCESS) continue; @@ -131,8 +129,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad if(addings && !memcmp(wszName, wszProgID, sizeof(WCHAR[7]))) { - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); - + lenData = sizeof(wszData); RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData); RegCloseKey(hCurKey); @@ -149,7 +146,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegOpenKeyW(HKEY_CLASSES_ROOT, wszCLSID, &hCurKey); - lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + lenName = sizeof(wszName); RegQueryValueW(hCurKey, NULL, wszName, (LONG *)&lenName); tvis.hParent = TVI_ROOT; @@ -171,14 +168,13 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad } else if(addings && !memcmp(wszName, wszTypeLib, sizeof(WCHAR[8]))) { - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); - + lenData = sizeof(wszData); RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData); RegCloseKey(hCurKey); RegOpenKeyW(HKEY_CLASSES_ROOT, wszTypeLib, &hCurKey); - lenName = sizeof(WCHAR[MAX_LOAD_STRING]); + lenName = sizeof(wszName); RegQueryValueW(hCurKey, NULL, wszName, (LONG *)&lenName); tvis.hParent = TVI_ROOT;

1 0

Paul Gofman : d3dx9: IsParameterUsed stub should return TRUE.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: ea13805e8365f1b9af15bc9ab10d6569b649bc34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea13805e8365f1b9af15bc9ab… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Sat Mar 5 21:26:54 2016 +0300 d3dx9: IsParameterUsed stub should return TRUE. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4be6e4b..ae09cdf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3486,7 +3486,7 @@ static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDL FIXME("(%p)->(%p, %p): stub\n", This, parameter, technique); - return FALSE; + return TRUE; } static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DWORD flags)

1 0

Matteo Bruni : d3dx9: Trace the parameter passed to IsParameterUsed().
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 9bfacd24d2f613e0d0b7c2a007f8d8e8e620e0f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfacd24d2f613e0d0b7c2a00… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 7 23:07:04 2016 +0100 d3dx9: Trace the parameter passed to IsParameterUsed(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ae09cdf..a374d90 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3482,9 +3482,11 @@ static HRESULT WINAPI ID3DXEffectImpl_FindNextValidTechnique(ID3DXEffect* iface, static BOOL WINAPI ID3DXEffectImpl_IsParameterUsed(ID3DXEffect* iface, D3DXHANDLE parameter, D3DXHANDLE technique) { - struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXEffectImpl *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); - FIXME("(%p)->(%p, %p): stub\n", This, parameter, technique); + FIXME("iface %p, parameter %p, technique %p stub.\n", iface, parameter, technique); + TRACE("param %p (%s).\n", param, param ? debugstr_a(param->name) : ""); return TRUE; }

1 0

Patrick Armstrong : bcrypt: Implement MD5 algorithm and add tests.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: 8bd3e4cc2e38f7655cc1badcf0aa3ff8c4974a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bd3e4cc2e38f7655cc1badcf… Author: Patrick Armstrong <pat(a)triplefox.com> Date: Mon Mar 7 19:45:27 2016 -0800 bcrypt: Implement MD5 algorithm and add tests. Signed-off-by: Patrick Armstrong <pat(a)oldpatricka.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 27 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++ include/bcrypt.h | 1 + 3 files changed, 102 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ede37e3..957efdd 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -174,6 +174,7 @@ struct object enum alg_id { + ALG_ID_MD5, ALG_ID_SHA1, ALG_ID_SHA256, ALG_ID_SHA384, @@ -184,6 +185,7 @@ static const struct { ULONG hash_length; const WCHAR *alg_name; } alg_props[] = { + /* ALG_ID_MD5 */ { 16, BCRYPT_MD5_ALGORITHM }, /* ALG_ID_SHA1 */ { 20, BCRYPT_SHA1_ALGORITHM }, /* ALG_ID_SHA256 */ { 32, BCRYPT_SHA256_ALGORITHM }, /* ALG_ID_SHA384 */ { 48, BCRYPT_SHA384_ALGORITHM }, @@ -211,6 +213,7 @@ NTSTATUS WINAPI BCryptOpenAlgorithmProvider( BCRYPT_ALG_HANDLE *handle, LPCWSTR } if (!strcmpW( id, BCRYPT_SHA1_ALGORITHM )) alg_id = ALG_ID_SHA1; + else if (!strcmpW( id, BCRYPT_MD5_ALGORITHM )) alg_id = ALG_ID_MD5; else if (!strcmpW( id, BCRYPT_SHA256_ALGORITHM )) alg_id = ALG_ID_SHA256; else if (!strcmpW( id, BCRYPT_SHA384_ALGORITHM )) alg_id = ALG_ID_SHA384; else if (!strcmpW( id, BCRYPT_SHA512_ALGORITHM )) alg_id = ALG_ID_SHA512; @@ -262,6 +265,7 @@ struct hash enum alg_id alg_id; union { + CC_MD5_CTX md5_ctx; CC_SHA1_CTX sha1_ctx; CC_SHA256_CTX sha256_ctx; CC_SHA512_CTX sha512_ctx; @@ -272,6 +276,9 @@ static NTSTATUS hash_init( struct hash *hash ) { switch (hash->alg_id) { + case ALG_ID_MD5: + CC_MD5_Init( &hash->u.md5_ctx ); + break; case ALG_ID_SHA1: CC_SHA1_Init( &hash->u.sha1_ctx ); break; @@ -299,6 +306,10 @@ static NTSTATUS hash_update( struct hash *hash, UCHAR *input, ULONG size ) { switch (hash->alg_id) { + case ALG_ID_MD5: + CC_MD5_Update( &hash->u.md5_ctx, input, size ); + break; + case ALG_ID_SHA1: CC_SHA1_Update( &hash->u.sha1_ctx, input, size ); break; @@ -326,6 +337,10 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) { switch (hash->alg_id) { + case ALG_ID_MD5: + CC_MD5_Final( output, &hash->u.md5_ctx ); + break; + case ALG_ID_SHA1: CC_SHA1_Final( output, &hash->u.sha1_ctx ); break; @@ -364,6 +379,9 @@ static NTSTATUS hash_init( struct hash *hash ) switch (hash->alg_id) { + case ALG_ID_MD5: + alg = GNUTLS_DIG_MD5; + break; case ALG_ID_SHA1: alg = GNUTLS_DIG_SHA1; break; @@ -426,6 +444,7 @@ static NTSTATUS hash_finish( struct hash *hash, UCHAR *output, ULONG size ) } #endif +#define OBJECT_LENGTH_MD5 274 #define OBJECT_LENGTH_SHA1 278 #define OBJECT_LENGTH_SHA256 286 #define OBJECT_LENGTH_SHA384 382 @@ -467,6 +486,14 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, switch (id) { + case ALG_ID_MD5: + if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) + { + value = OBJECT_LENGTH_MD5; + break; + } + FIXME( "unsupported md5 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; case ALG_ID_SHA1: if (!strcmpW( prop, BCRYPT_OBJECT_LENGTH )) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 2613a07..bcb287b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -404,6 +404,79 @@ static void test_sha512(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_md5(void) +{ + static const char expected[] = + "e2a3e68d23ce348b8f68b3079de3d4c9"; + BCRYPT_ALG_HANDLE alg; + BCRYPT_HASH_HANDLE hash; + UCHAR buf[512], md5[16]; + ULONG size, len; + char str[65]; + NTSTATUS ret; + + alg = NULL; + ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_MD5_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(alg != NULL, "alg not set\n"); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(NULL, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, NULL, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), NULL, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, NULL, sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, 0, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(len == 0xdeadbeef, "got %u\n", len); + ok(size == sizeof(len), "got %u\n", size); + + len = size = 0xdeadbeef; + ret = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len , sizeof(len), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(len != 0xdeadbeef, "len not set\n"); + ok(size == sizeof(len), "got %u\n", size); + + test_hash_length(alg, 16); + test_alg_name(alg, "MD5"); + + hash = NULL; + len = sizeof(buf); + ret = BCryptCreateHash(alg, &hash, buf, len, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(hash != NULL, "hash not set\n"); + + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + test_hash_length(hash, 16); + test_alg_name(hash, "MD5"); + + memset(md5, 0, sizeof(md5)); + ret = BCryptFinishHash(hash, md5, sizeof(md5), 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + format_hash( md5, sizeof(md5), str ); + ok(!strcmp(str, expected), "got %s\n", str); + + ret = BCryptDestroyHash(hash); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = BCryptCloseAlgorithmProvider(alg, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + START_TEST(bcrypt) { test_BCryptGenRandom(); @@ -412,4 +485,5 @@ START_TEST(bcrypt) test_sha256(); test_sha384(); test_sha512(); + test_md5(); } diff --git a/include/bcrypt.h b/include/bcrypt.h index 30988be..3cd14d2 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -63,6 +63,7 @@ typedef LONG NTSTATUS; #define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','l','a','t','f','o','r','m',' ','C','r','y','p','t','o',' ','P','r','o','v','i','d','e','r',0} +#define BCRYPT_MD5_ALGORITHM (const WCHAR []){'M','D','5',0} #define BCRYPT_SHA1_ALGORITHM (const WCHAR []){'S','H','A','1',0} #define BCRYPT_SHA256_ALGORITHM (const WCHAR []){'S','H','A','2','5','6',0} #define BCRYPT_SHA384_ALGORITHM (const WCHAR []){'S','H','A','3','8','4',0}

1 0

Michael Stefaniuc : dbghelp: Use CONTAINING_RECORD instead of reimplementing it.
by Alexandre Julliard 08 Mar '16

08 Mar '16

Module: wine Branch: master Commit: c8ab4004ad986583bcd22b53e8bc55bf5d8d9c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ab4004ad986583bcd22b53e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 8 11:44:26 2016 +0100 dbghelp: Use CONTAINING_RECORD instead of reimplementing it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 3 --- dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/macho_module.c | 2 +- dlls/dbghelp/msc.c | 10 +++++----- dlls/dbghelp/pe_module.c | 2 +- dlls/dbghelp/symbol.c | 8 ++++---- dlls/dbghelp/type.c | 2 +- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 98bd363..53d1377 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -112,9 +112,6 @@ void hash_table_iter_init(const struct hash_table* ht, struct hash_table_iter* hti, const char* name) DECLSPEC_HIDDEN; void* hash_table_iter_up(struct hash_table_iter* hti) DECLSPEC_HIDDEN; -#define GET_ENTRY(__i, __t, __f) \ - ((__t*)((char*)(__i) - FIELD_OFFSET(__t,__f))) - extern unsigned dbghelp_options DECLSPEC_HIDDEN; /* some more Wine extensions */ diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b176143..6428955 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -659,7 +659,7 @@ static void elf_finish_stabs_info(struct module* module, const struct hash_table hash_table_iter_init(&module->ht_symbols, &hti, NULL); while ((ptr = hash_table_iter_up(&hti))) { - sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + sym = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); switch (sym->symt.tag) { case SymTagFunction: diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1f5d446..01fa300 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -920,7 +920,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt hash_table_iter_init(&module->ht_symbols, &hti_modules, ste->ht_elt.name); while ((ptr = hash_table_iter_up(&hti_modules))) { - sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + sym = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); if (strcmp(sym->hash_elt.name, ste->ht_elt.name)) continue; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 2c1f03b..f17d91e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1025,7 +1025,7 @@ static struct symt* codeview_add_type_struct(struct codeview_type_parse* ctp, hash_table_iter_init(&ctp->module->ht_types, &hti, name); while ((ptr = hash_table_iter_up(&hti))) { - type = GET_ENTRY(ptr, struct symt_ht, hash_elt); + type = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); if (type->symt.tag == SymTagUDT && type->hash_elt.name && !strcmp(type->hash_elt.name, name)) @@ -2982,9 +2982,9 @@ static BOOL pev_get_val(struct pevaluator* pev, const char* str, DWORD_PTR* val hash_table_iter_init(&pev->values, &hti, str); while ((ptr = hash_table_iter_up(&hti))) { - if (!strcmp(GET_ENTRY(ptr, struct zvalue, elt)->elt.name, str)) + if (!strcmp(CONTAINING_RECORD(ptr, struct zvalue, elt)->elt.name, str)) { - *val = GET_ENTRY(ptr, struct zvalue, elt)->value; + *val = CONTAINING_RECORD(ptr, struct zvalue, elt)->value; return TRUE; } } @@ -3037,9 +3037,9 @@ static BOOL pev_set_value(struct pevaluator* pev, const char* name, DWORD_PTR v hash_table_iter_init(&pev->values, &hti, name); while ((ptr = hash_table_iter_up(&hti))) { - if (!strcmp(GET_ENTRY(ptr, struct zvalue, elt)->elt.name, name)) + if (!strcmp(CONTAINING_RECORD(ptr, struct zvalue, elt)->elt.name, name)) { - GET_ENTRY(ptr, struct zvalue, elt)->value = val; + CONTAINING_RECORD(ptr, struct zvalue, elt)->value = val; break; } } diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index b52d47e..e7255f8 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -369,7 +369,7 @@ static BOOL pe_locate_with_coff_symbol_table(struct module* module) hash_table_iter_init(&module->ht_symbols, &hti, name); while ((ptr = hash_table_iter_up(&hti))) { - sym = GET_ENTRY(ptr, struct symt_data, hash_elt); + sym = CONTAINING_RECORD(ptr, struct symt_data, hash_elt); if (sym->symt.tag == SymTagData && (sym->kind == DataIsGlobal || sym->kind == DataIsFileStatic) && sym->u.var.kind == loc_absolute && diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 7569a58..efcf7b6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -422,7 +422,7 @@ struct symt_block* symt_close_func_block(struct module* module, if (pc) block->size = func->address + pc - block->address; return (block->container->tag == SymTagBlock) ? - GET_ENTRY(block->container, struct symt_block, symt) : NULL; + CONTAINING_RECORD(block->container, struct symt_block, symt) : NULL; } struct symt_hierarchy_point* symt_add_function_point(struct module* module, @@ -741,7 +741,7 @@ static BOOL symt_enum_module(struct module_pair* pair, const WCHAR* match, hash_table_iter_init(&pair->effective->ht_symbols, &hti, NULL); while ((ptr = hash_table_iter_up(&hti))) { - sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + sym = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); nameW = symt_get_nameW(&sym->symt); ret = SymMatchStringW(nameW, match, FALSE); HeapFree(GetProcessHeap(), 0, nameW); @@ -1329,7 +1329,7 @@ static BOOL find_name(struct process* pcs, struct module* module, const char* na hash_table_iter_init(&pair.effective->ht_symbols, &hti, name); while ((ptr = hash_table_iter_up(&hti))) { - sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + sym = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); if (!strcmp(sym->hash_elt.name, name)) { @@ -2148,7 +2148,7 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, { unsigned int i; - sym = GET_ENTRY(ptr, struct symt_ht, hash_elt); + sym = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); if (sym->symt.tag != SymTagFunction) continue; sci.FileName[0] = '\0'; diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index c0ffaa0..6ccbc9a 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -170,7 +170,7 @@ static struct symt* symt_find_type_by_name(const struct module* module, hash_table_iter_init(&module->ht_types, &hti, typename); while ((ptr = hash_table_iter_up(&hti))) { - type = GET_ENTRY(ptr, struct symt_ht, hash_elt); + type = CONTAINING_RECORD(ptr, struct symt_ht, hash_elt); if ((sym_tag == SymTagNull || type->symt.tag == sym_tag) && type->hash_elt.name && !strcmp(type->hash_elt.name, typename))

1 0