May 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10: Validate the base offset in parse_fx10_body() (AFL) .
by Alexandre Julliard May 27, 2016

May 27, 2016

Module: wine Branch: master Commit: 200bfa97a8f86cea9197b1c6a6f5a26225ecaca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200bfa97a8f86cea9197b1c6a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 26 19:36:56 2016 +0200 d3d10: Validate the base offset in parse_fx10_body() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2eb0680..2adbc08 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2104,10 +2104,17 @@ static void d3d10_effect_type_destroy(struct wine_rb_entry *entry, void *context static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD data_size) { - const char *ptr = data + e->index_offset; + const char *ptr; unsigned int i; HRESULT hr; + if (e->index_offset >= data_size) + { + WARN("Invalid index offset %#x (data size %#x).\n", e->index_offset, data_size); + return E_FAIL; + } + ptr = data + e->index_offset; + if (!(e->local_buffers = d3d10_calloc(e->local_buffer_count, sizeof(*e->local_buffers)))) { ERR("Failed to allocate local buffer memory.\n");

1 0

Andrey Gusev : user32: Fix a typo in comment.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: a0c651cd7cf83c9fac6b8776de2d54a731fc4b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c651cd7cf83c9fac6b8776d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:11:57 2016 +0300 user32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/uitools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index efaf356..9a0fff9 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -718,7 +718,7 @@ static BOOL UITOOLS95_DFC_ButtonPush(HDC dc, LPRECT r, UINT uFlags) /************************************************************************ - * UITOOLS_DFC_ButtonChcek + * UITOOLS_DFC_ButtonCheck * * Draw a check/3state button coming from DrawFrameControl() *

1 0

Andrey Gusev : msi/tests: Fix a typo in comment.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 8260eabb86eda24125979969629c87229ce21488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8260eabb86eda241259799696… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 26 18:07:53 2016 +0300 msi/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7dd878a..9c1fcba 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -8068,7 +8068,7 @@ static void test_dbmerge(void) r = run_query(href, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - /* column sting types don't match exactly */ + /* column string types don't match exactly */ r = MsiDatabaseMergeA(hdb, href, "MergeErrors"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Paul Gofman : d3dx9: Add is_param_type_sampler() helper function.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: dca016d7dce0c7e5323281b975d195cdfb5ac40d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca016d7dce0c7e5323281b97… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 23 13:40:55 2016 +0300 d3dx9: Add is_param_type_sampler() helper function. 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/d3dx9_private.h | 7 +++++++ dlls/d3dx9_36/effect.c | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index a0e62f1..9938d83 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -108,6 +108,13 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) +{ + return type == D3DXPT_SAMPLER + || type == D3DXPT_SAMPLER1D || type == D3DXPT_SAMPLER2D + || type == D3DXPT_SAMPLER3D || type == D3DXPT_SAMPLERCUBE; +} + struct d3dx_parameter; enum pres_reg_tables diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index da7de54..7d5e612 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1326,9 +1326,7 @@ static HRESULT d3dx9_base_effect_set_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -1391,9 +1389,7 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base, } /* samplers don't touch data */ - if (param->class == D3DXPC_OBJECT && (param->type == D3DXPT_SAMPLER - || param->type == D3DXPT_SAMPLER1D || param->type == D3DXPT_SAMPLER2D - || param->type == D3DXPT_SAMPLER3D || param->type == D3DXPT_SAMPLERCUBE)) + if (param->class == D3DXPC_OBJECT && is_param_type_sampler(param->type)) { TRACE("Sampler: returning E_FAIL\n"); return E_FAIL; @@ -2743,9 +2739,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct ret = D3D_OK; for (i = 0; i < parameters_count; ++i) { - if (params[i] && params[i]->class == D3DXPC_OBJECT && (params[i]->type == D3DXPT_SAMPLER - || params[i]->type == D3DXPT_SAMPLER1D || params[i]->type == D3DXPT_SAMPLER2D - || params[i]->type == D3DXPT_SAMPLER3D || params[i]->type == D3DXPT_SAMPLERCUBE)) + if (params[i] && params[i]->class == D3DXPC_OBJECT && is_param_type_sampler(params[i]->type)) { struct d3dx_sampler *sampler;

1 0

Jacek Caban : mshtml: Improved FIXMEs about unimplemented events.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 8abd37637af36c6f969de1f5a6244f279a72decf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abd37637af36c6f969de1f5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 26 16:15:55 2016 +0200 mshtml: Improved FIXMEs about unimplemented events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7abd727..67c8460 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3732,7 +3732,7 @@ static HRESULT WINAPI HTMLElement4_put_onmousewheel(IHTMLElement4 *iface, VARIAN { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_MOUSEWHEEL, &v); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 27b6c39..43e742f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -173,6 +173,7 @@ typedef struct { #define EVENT_BIND_TO_BODY 0x0008 #define EVENT_CANCELABLE 0x0010 #define EVENT_HASDEFAULTHANDLERS 0x0020 +#define EVENT_FIXME 0x0040 static const event_info_t event_info[] = { {abortW, onabortW, EVENTT_NONE, DISPID_EVMETH_ONABORT, @@ -226,7 +227,7 @@ static const event_info_t event_info[] = { {mouseupW, onmouseupW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {mousewheelW, onmousewheelW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEWHEEL, - 0}, + EVENT_FIXME}, {pasteW, onpasteW, EVENTT_NONE, DISPID_EVMETH_ONPASTE, EVENT_CANCELABLE}, {readystatechangeW, onreadystatechangeW, EVENTT_NONE, DISPID_EVMETH_ONREADYSTATECHANGE, @@ -1416,6 +1417,9 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, { event_target_t *data; + if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + remove_event_handler(event_target, eid); if(!disp) return S_OK; @@ -1518,6 +1522,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI return S_OK; } + if(event_info[eid].flags & EVENT_FIXME) + FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); + data = get_event_target_data(event_target, TRUE); if(!data) return E_OUTOFMEMORY;

1 0

Józef Kucia : wined3d: Use immutable storage for 3D textures.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 4f9642d0e90b941e0316137523dbf12588c4bccc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9642d0e90b941e031613752… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:28 2016 +0200 wined3d: Use immutable storage for 3D textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 26ddda7..bdb8807 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2072,24 +2072,35 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { - unsigned int sub_count = texture->level_count * texture->layer_count; const struct wined3d_format *format = texture->resource.format; + GLenum internal = srgb ? format->glGammaInternal : format->glInternal; + unsigned int sub_count = texture->level_count * texture->layer_count; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i; wined3d_texture_bind_and_dirtify(texture, context, srgb); - for (i = 0; i < sub_count; ++i) + if (wined3d_texture_use_immutable_storage(texture, gl_info)) { - struct wined3d_volume *volume = texture->sub_resources[i].u.volume; + GL_EXTCALL(glTexStorage3D(GL_TEXTURE_3D, texture->level_count, internal, + wined3d_texture_get_level_width(texture, 0), + wined3d_texture_get_level_height(texture, 0), + wined3d_texture_get_level_depth(texture, 0))); + checkGLcall("glTexStorage3D"); + } + else + { + for (i = 0; i < sub_count; ++i) + { + struct wined3d_volume *volume = texture->sub_resources[i].u.volume; - GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, - srgb ? format->glGammaInternal : format->glInternal, - wined3d_texture_get_level_width(texture, volume->texture_level), - wined3d_texture_get_level_height(texture, volume->texture_level), - wined3d_texture_get_level_depth(texture, volume->texture_level), - 0, format->glFormat, format->glType, NULL)); - checkGLcall("glTexImage3D"); + GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, internal, + wined3d_texture_get_level_width(texture, volume->texture_level), + wined3d_texture_get_level_height(texture, volume->texture_level), + wined3d_texture_get_level_depth(texture, volume->texture_level), + 0, format->glFormat, format->glType, NULL)); + checkGLcall("glTexImage3D"); + } } }

1 0

Józef Kucia : wined3d: Add ARB_texture_storage extension.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 266528e244da3ddfa4f5efd59ea5cc1e4fdafc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=266528e244da3ddfa4f5efd59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:26 2016 +0200 wined3d: Add ARB_texture_storage extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e1438d3..140c6a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,6 +156,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, + {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, @@ -2691,6 +2692,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_storage */ + USE_GL_FUNC(glTexStorage1D) + USE_GL_FUNC(glTexStorage2D) + USE_GL_FUNC(glTexStorage3D) /* GL_ARB_timer_query */ USE_GL_FUNC(glQueryCounter) USE_GL_FUNC(glGetQueryObjectui64v) @@ -3515,6 +3520,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, @@ -3773,6 +3779,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; } + if (gl_info->supported[ARB_TEXTURE_STORAGE] && gl_info->supported[APPLE_YCBCR_422]) + { + /* AFAIK APPLE_ycbcr_422 is only available in legacy contexts so we shouldn't ever hit this. */ + FIXME("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); + gl_info->supported[APPLE_YCBCR_422] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 356ee7c..46df6ee 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -92,6 +92,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, + ARB_TEXTURE_STORAGE, ARB_TEXTURE_SWIZZLE, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT,

1 0

Józef Kucia : wined3d: Simplify match_apple().
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 1cf142e6e7d46c0dacfe2f9f021bad36ecaad37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf142e6e7d46c0dacfe2f9f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:24 2016 +0200 wined3d: Simplify match_apple(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4de3990..e1438d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -517,11 +517,7 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, const char *gl_re * * This test has been moved into wined3d_guess_gl_vendor() */ - if (gl_vendor == GL_VENDOR_APPLE) - { - return TRUE; - } - return FALSE; + return gl_vendor == GL_VENDOR_APPLE; } /* Context activation is done by the caller. */ @@ -1634,7 +1630,6 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, const char *gl_vendor_string, const char *gl_renderer) { - /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to * detect the Apple OpenGL implementation to apply some extension fixups afterwards. @@ -1646,8 +1641,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So * the chance that other implementations support them is rather small since Win32 QuickTime uses * DirectDraw, not OpenGL. */ - if (gl_info->supported[APPLE_FENCE] - && gl_info->supported[APPLE_YCBCR_422]) + if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; if (strstr(gl_vendor_string, "NVIDIA"))

1 0

Hans Leidekker : webservices: Implement WsDecodeUrl.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 24bdad63e4c94a671367b7885ff341185143a7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24bdad63e4c94a671367b7885… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 26 10:56:47 2016 +0200 webservices: Implement WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/url.c | 194 +++++++++++++++++++++++++++++++++ dlls/webservices/url.c | 214 +++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 67 ++++++++++++ 6 files changed, 478 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24bdad63e4c94a671367b…

1 0

Alex Henrie : ncrypt: Add stub dll.
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 084827e90154f3c534d50979f606c88f997ee669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084827e90154f3c534d50979f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 25 23:21:09 2016 -0600 ncrypt: Add stub dll. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ncrypt/Makefile.in | 4 ++ dlls/ncrypt/main.c | 45 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 ++ 6 files changed, 194 insertions(+) diff --git a/configure b/configure index 5abf6ae..c1d1bf8 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_msxml2 enable_msxml3 enable_msxml4 enable_msxml6 +enable_ncrypt enable_nddeapi enable_ndis_sys enable_netapi32 @@ -17882,6 +17883,7 @@ wine_fn_config_dll msxml3 enable_msxml3 clean wine_fn_config_test dlls/msxml3/tests msxml3_test clean wine_fn_config_dll msxml4 enable_msxml4 clean wine_fn_config_dll msxml6 enable_msxml6 clean +wine_fn_config_dll ncrypt enable_ncrypt wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll ndis.sys enable_ndis_sys wine_fn_config_dll netapi32 enable_netapi32 implib diff --git a/configure.ac b/configure.ac index f25c965..e42e35d 100644 --- a/configure.ac +++ b/configure.ac @@ -3129,6 +3129,7 @@ WINE_CONFIG_DLL(msxml3,,[clean]) WINE_CONFIG_TEST(dlls/msxml3/tests,[clean]) WINE_CONFIG_DLL(msxml4,,[clean]) WINE_CONFIG_DLL(msxml6,,[clean]) +WINE_CONFIG_DLL(ncrypt) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(ndis.sys) WINE_CONFIG_DLL(netapi32,,[implib]) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in new file mode 100644 index 0000000..d54b921 --- /dev/null +++ b/dlls/ncrypt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = ncrypt.dll + +C_SRCS = \ + main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c new file mode 100644 index 0000000..9c09600 --- /dev/null +++ b/dlls/ncrypt/main.c @@ -0,0 +1,45 @@ +/* + * New cryptographic library (ncrypt.dll) + * + * Copyright 2016 Alex Henrie + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec new file mode 100644 index 0000000..1322f1e --- /dev/null +++ b/dlls/ncrypt/ncrypt.spec @@ -0,0 +1,138 @@ +@ stub BCryptAddContextFunction +@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider +@ stub BCryptConfigureContext +@ stub BCryptConfigureContextFunction +@ stub BCryptCreateContext +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeleteContext +@ stub BCryptDeriveKey +@ stub BCryptDeriveKeyCapi +@ stub BCryptDeriveKeyPBKDF2 +@ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms +@ stub BCryptEnumContextFunctionProviders +@ stub BCryptEnumContextFunctions +@ stub BCryptEnumContexts +@ stub BCryptEnumProviders +@ stub BCryptEnumRegisteredProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash +@ stub BCryptFreeBuffer +@ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash +@ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider +@ stub BCryptQueryContextConfiguration +@ stub BCryptQueryContextFunctionConfiguration +@ stub BCryptQueryContextFunctionProperty +@ stub BCryptQueryProviderRegistration +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptRegisterProvider +@ stub BCryptRemoveContextFunction +@ stub BCryptRemoveContextFunctionProvider +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetAuditingInterface +@ stub BCryptSetContextFunctionProperty +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptUnregisterProvider +@ stub BCryptVerifySignature +@ stub GetIsolationServerInterface +@ stub GetKeyStorageInterface +@ stub GetSChannelInterface +@ stub NCryptCloseKeyProtector +@ stub NCryptCloseProtectionDescriptor +@ stub NCryptCreateClaim +@ stub NCryptCreatePersistedKey +@ stub NCryptCreateProtectionDescriptor +@ stub NCryptDecrypt +@ stub NCryptDeleteKey +@ stub NCryptDeriveKey +@ stub NCryptDuplicateKeyProtectorHandle +@ stub NCryptEncrypt +@ stub NCryptEnumAlgorithms +@ stub NCryptEnumKeys +@ stub NCryptEnumStorageProviders +@ stub NCryptExportKey +@ stub NCryptFinalizeKey +@ stub NCryptFreeBuffer +@ stub NCryptFreeObject +@ stub NCryptGetProperty +@ stub NCryptGetProtectionDescriptorInfo +@ stub NCryptImportKey +@ stub NCryptIsAlgSupported +@ stub NCryptIsKeyHandle +@ stub NCryptKeyDerivation +@ stub NCryptNotifyChangeKey +@ stub NCryptOpenKey +@ stub NCryptOpenKeyProtector +@ stub NCryptOpenStorageProvider +@ stub NCryptProtectKey +@ stub NCryptProtectSecret +@ stub NCryptQueryProtectionDescriptorName +@ stub NCryptRegisterProtectionDescriptorName +@ stub NCryptSecretAgreement +@ stub NCryptSetAuditingInterface +@ stub NCryptSetProperty +@ stub NCryptSignHash +@ stub NCryptStreamClose +@ stub NCryptStreamOpenToProtect +@ stub NCryptStreamOpenToUnprotect +@ stub NCryptStreamOpenToUnprotectEx +@ stub NCryptStreamUpdate +@ stub NCryptTranslateHandle +@ stub NCryptUnprotectKey +@ stub NCryptUnprotectSecret +@ stub NCryptVerifyClaim +@ stub NCryptVerifySignature +@ stub SslChangeNotify +@ stub SslComputeClientAuthHash +@ stub SslComputeEapKeyBlock +@ stub SslComputeFinishedHash +@ stub SslComputeSessionHash +@ stub SslCreateClientAuthHash +@ stub SslCreateEphemeralKey +@ stub SslCreateHandshakeHash +@ stub SslDecrementProviderReferenceCount +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslEnumCipherSuites +@ stub SslEnumEccCurves +@ stub SslEnumProtocolProviders +@ stub SslExportKey +@ stub SslExportKeyingMaterial +@ stub SslFreeBuffer +@ stub SslFreeObject +@ stub SslGenerateMasterKey +@ stub SslGeneratePreMasterKey +@ stub SslGenerateSessionKeys +@ stub SslGetCipherSuitePRFHashAlgorithm +@ stub SslGetKeyProperty +@ stub SslGetProviderProperty +@ stub SslHashHandshake +@ stub SslImportKey +@ stub SslImportMasterKey +@ stub SslIncrementProviderReferenceCount +@ stub SslLookupCipherLengths +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenPrivateKey +@ stub SslOpenProvider +@ stub SslSignHash +@ stub SslVerifySignature diff --git a/tools/make_specfiles b/tools/make_specfiles index 774687e..feb65b4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -289,6 +289,10 @@ my @dll_groups = "sfc_os", "sfc", ], + [ + "bcrypt", + "ncrypt", + ], ); my $update_flags = 0;

1 0