March 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Move legacy texture image unit range allocation to wined3d_gl_limits_get_texture_unit_range ().
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: d89ee7aaaafb46c0e0067085b27b50c65a12fc94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89ee7aaaafb46c0e0067085b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Mar 13 11:57:21 2017 +0100 wined3d: Move legacy texture image unit range allocation to wined3d_gl_limits_get_texture_unit_range(). 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/context.c | 18 ++++-------------- dlls/wined3d/glsl_shader.c | 23 +++++------------------ dlls/wined3d/utils.c | 24 +++++++++++++++++++++++- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a423fac..8059461 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3385,23 +3385,13 @@ static void context_bind_shader_resources(struct wined3d_context *context, static void context_bind_graphics_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) { - unsigned int i; + unsigned int i, base_idx, count; - static const struct + for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) { - enum wined3d_shader_type type; - unsigned int base_idx; - unsigned int count; + wined3d_gl_limits_get_texture_unit_range(&context->gl_info->limits, i, &base_idx, &count); + context_bind_shader_resources(context, state, i, base_idx, count); } - shader_types[] = - { - {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, - {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, - }; - - for (i = 0; i < ARRAY_SIZE(shader_types); ++i) - context_bind_shader_resources(context, state, shader_types[i].type, - shader_types[i].base_idx, shader_types[i].count); } static void context_load_unordered_access_resources(struct wined3d_context *context, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 16cf6b0..f82d861 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -592,26 +592,13 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, static void shader_glsl_load_graphics_samplers(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, const DWORD *tex_unit_map, GLuint program_id) { - const char *prefix; - unsigned int i; - - static const struct - { - enum wined3d_shader_type type; - unsigned int base_idx; - unsigned int count; - } - sampler_info[] = - { - {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, - {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, - }; + unsigned int i, base_idx, count; - for (i = 0; i < ARRAY_SIZE(sampler_info); ++i) + for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) { - prefix = shader_glsl_get_prefix(sampler_info[i].type); - shader_glsl_load_samplers(gl_info, priv, prefix, - sampler_info[i].base_idx, sampler_info[i].count, tex_unit_map, program_id); + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, i, &base_idx, &count); + shader_glsl_load_samplers(gl_info, priv, shader_glsl_get_prefix(i), + base_idx, count, tex_unit_map, program_id); } } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 04317f1..b1cda46 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5994,10 +5994,32 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) { + static const struct + { + enum wined3d_shader_type type; + unsigned int base_idx; + unsigned int count; + } + legacy_sampler_info[] = + { + {WINED3D_SHADER_TYPE_PIXEL, 0, MAX_FRAGMENT_SAMPLERS}, + {WINED3D_SHADER_TYPE_VERTEX, MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(legacy_sampler_info); ++i) + { + if (legacy_sampler_info[i].type == shader_type) + { + *base = legacy_sampler_info[i].base_idx; + *count = legacy_sampler_info[i].count; + return; + } + } + if (shader_type != WINED3D_SHADER_TYPE_COMPUTE) { *base = *count = 0; - ERR("Unhandled shader type %#x.\n", shader_type); return; }

1 0

Francois Gouget : ntdll/tests: A spelling fix in an ok() message.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 5a2aa5e1d91b1053e5ac5c29e6ea98851bf6f4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2aa5e1d91b1053e5ac5c29e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Mar 12 20:46:28 2017 +0100 ntdll/tests: A spelling fix in an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 091142a..a228d50 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4408,7 +4408,7 @@ static void test_ioctl(void) NTSTATUS status; file = create_temp_file(FILE_FLAG_OVERLAPPED); - ok(file != INVALID_HANDLE_VALUE, "coult not create temp file\n"); + ok(file != INVALID_HANDLE_VALUE, "could not create temp file\n"); SetEvent(event); status = pNtFsControlFile(file, event, NULL, NULL, &iosb, 0xdeadbeef, 0, 0, 0, 0);

1 0

Nikolay Sivov : comdlg32: Take nMaxFile into account when converting A->W.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: a44a6083784e6b78ef636e73548321cef06b381a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44a6083784e6b78ef636e735… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 12 21:18:40 2017 +0300 comdlg32: Take nMaxFile into account when converting A->W. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 0c9f34a..305ac62 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -383,18 +383,26 @@ static void init_filedlg_infoW(OPENFILENAMEW *ofn, FileOpenDlgInfos *info) static void init_filedlg_infoA(OPENFILENAMEA *ofn, FileOpenDlgInfos *info) { OPENFILENAMEW ofnW; + int len; ofnW = *(OPENFILENAMEW *)ofn; ofnW.lpstrInitialDir = heap_strdupAtoW(ofn->lpstrInitialDir); - ofnW.lpstrFile = heap_strdupAtoW(ofn->lpstrFile); ofnW.lpstrDefExt = heap_strdupAtoW(ofn->lpstrDefExt); ofnW.lpstrTitle = heap_strdupAtoW(ofn->lpstrTitle); + if (ofn->lpstrFile) + { + len = MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFile, ofn->nMaxFile, NULL, 0); + ofnW.lpstrFile = MemAlloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ofn->lpstrFile, ofn->nMaxFile, ofnW.lpstrFile, len); + ofnW.nMaxFile = len; + } + if (ofn->lpstrFilter) { - int n, len; LPCSTR s; + int n; /* filter is a list... title\0ext\0......\0\0 */ s = ofn->lpstrFilter;

1 0

Nikolay Sivov : xmllite/reader: Enter error state on parsing error.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: ec9e05c27cd14b148ac63ed0dde11615e3a1ccac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9e05c27cd14b148ac63ed0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 13 12:27:54 2017 +0300 xmllite/reader: Enter error state on parsing error. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 31 +++++++++++++++++++++++++------ dlls/xmllite/tests/reader.c | 23 +++++++++++++++-------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b5088e8..6379b70 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -264,6 +264,7 @@ typedef struct xmlreaderinput *input; IMalloc *imalloc; XmlReadState state; + HRESULT error; /* error set on XmlReadState_Error */ XmlReaderInternalState instate; XmlReaderResumeState resumestate; XmlNodeType nodetype; @@ -2821,19 +2822,37 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) { xmlreader *This = impl_from_IXmlReader(iface); XmlNodeType oldtype = This->nodetype; + XmlNodeType type; HRESULT hr; TRACE("(%p)->(%p)\n", This, nodetype); - if (This->state == XmlReadState_Closed) return S_FALSE; + if (!nodetype) + nodetype = &type; - hr = reader_parse_nextnode(This); - if (oldtype == XmlNodeType_None && This->nodetype != oldtype) - This->state = XmlReadState_Interactive; + switch (This->state) + { + case XmlReadState_Closed: + hr = S_FALSE; + break; + case XmlReadState_Error: + hr = This->error; + break; + default: + hr = reader_parse_nextnode(This); + if (SUCCEEDED(hr) && oldtype == XmlNodeType_None && This->nodetype != oldtype) + This->state = XmlReadState_Interactive; + + if (FAILED(hr)) + { + This->state = XmlReadState_Error; + This->nodetype = XmlNodeType_None; + This->error = hr; + } + } TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); - if (nodetype) - *nodetype = This->nodetype; + *nodetype = This->nodetype; return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index e66b9e4..d225ab3 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1559,8 +1559,8 @@ static void test_read_element(void) type = XmlNodeType_Element; hr = IXmlReader_Read(reader, &type); ok(hr == WC_E_ELEMENTMATCH, "got %08x\n", hr); -todo_wine ok(type == XmlNodeType_None, "got %d\n", type); + TEST_READER_STATE(reader, XmlReadState_Error); IStream_Release(stream); @@ -2369,6 +2369,7 @@ static void test_max_element_depth(void) "</c>" "</b>" "</a>"; + XmlNodeType nodetype; unsigned int count; IXmlReader *reader; IStream *stream; @@ -2401,20 +2402,19 @@ static void test_max_element_depth(void) hr = IXmlReader_Read(reader, NULL); ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); -todo_wine { +todo_wine TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); -} + hr = IXmlReader_SetProperty(reader, XmlReaderProperty_MaxElementDepth, 10); ok(hr == S_OK, "got %08x\n", hr); hr = IXmlReader_Read(reader, NULL); -todo_wine { ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); +todo_wine TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); -} IStream_Release(stream); /* test if stepping into attributes enforces depth limit too */ @@ -2444,13 +2444,20 @@ todo_wine { TEST_DEPTH(reader, 2); TEST_READER_STATE(reader, XmlReadState_Interactive); - hr = IXmlReader_Read(reader, NULL); + nodetype = 123; + hr = IXmlReader_Read(reader, &nodetype); ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); -todo_wine { + nodetype = 123; + hr = IXmlReader_Read(reader, &nodetype); + ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); + +todo_wine TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); -} + IStream_Release(stream); /* set max depth to 0, this disables depth limit */

1 0

Nikolay Sivov : xmllite/reader: Reset reader nesting depth on error.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 876de4a73d62cfb5e2806a8dfdff76d5c48a0614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=876de4a73d62cfb5e2806a8df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 13 12:27:55 2017 +0300 xmllite/reader: Reset reader nesting depth on error. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 1 + dlls/xmllite/tests/reader.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6379b70..41a6fb8 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2847,6 +2847,7 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) { This->state = XmlReadState_Error; This->nodetype = XmlNodeType_None; + This->depth = 0; This->error = hr; } } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d225ab3..8660bb8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2402,7 +2402,6 @@ static void test_max_element_depth(void) hr = IXmlReader_Read(reader, NULL); ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); -todo_wine TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); @@ -2412,7 +2411,6 @@ todo_wine hr = IXmlReader_Read(reader, NULL); ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); -todo_wine TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error); IStream_Release(stream); @@ -2454,7 +2452,6 @@ todo_wine ok(hr == SC_E_MAXELEMENTDEPTH, "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "got node type %d\n", nodetype); -todo_wine TEST_DEPTH2(reader, 0, 2); TEST_READER_STATE(reader, XmlReadState_Error);

1 0

Ken Thomases : wineps.drv: Set the AP_D_InputSlot CUPS option if no input slot is specified.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: 485840bc2dfc6d510b22684764eaea3659af5063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485840bc2dfc6d510b2268476… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 12 17:12:59 2017 -0500 wineps.drv: Set the AP_D_InputSlot CUPS option if no input slot is specified. This overrides a default InputSlot value specified or derived from the PPD and allows the tray to be auto-selected based on the media. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/ps.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineps.drv/ps.c b/dlls/wineps.drv/ps.c index a01346e..972609d 100644 --- a/dlls/wineps.drv/ps.c +++ b/dlls/wineps.drv/ps.c @@ -50,6 +50,7 @@ static const char *cups_duplexes[3] = }; static const char cups_collate_false[] = "%cupsJobTicket: collate=false\n"; static const char cups_collate_true[] = "%cupsJobTicket: collate=true\n"; +static const char cups_ap_d_inputslot[] = "%cupsJobTicket: AP_D_InputSlot=\n"; /* intentionally empty value */ static const char psheader[] = /* title llx lly urx ury orientation */ "%%%%Creator: Wine PostScript Driver\n" @@ -375,6 +376,10 @@ static void write_cups_job_ticket( PHYSDEV dev, const struct ticket_info *info ) write_spool( dev, cups_collate_true, sizeof(cups_collate_true) - 1 ); } } + + if (!(physDev->Devmode->dmPublic.dmFields & DM_DEFAULTSOURCE) || + physDev->Devmode->dmPublic.u1.s1.dmDefaultSource == DMBIN_AUTO) + write_spool( dev, cups_ap_d_inputslot, sizeof(cups_ap_d_inputslot) - 1 ); } INT PSDRV_WriteHeader( PHYSDEV dev, LPCWSTR title )

1 0

Alex Henrie : crypt32/tests: Print an error if CertOpenStore fails.
by Alexandre Julliard March 13, 2017

March 13, 2017

Module: wine Branch: master Commit: d7f68cb5f4d75d634730993a527d48d63069afaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f68cb5f4d75d634730993a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Mar 9 23:03:50 2017 -0700 crypt32/tests: Print an error if CertOpenStore fails. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/crl.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/crl.c b/dlls/crypt32/tests/crl.c index 9515c38..c350b20 100644 --- a/dlls/crypt32/tests/crl.c +++ b/dlls/crypt32/tests/crl.c @@ -148,6 +148,7 @@ static void testAddCRL(void) BOOL ret; DWORD GLE; + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (!store) return; /* Bad CRL encoding type */ @@ -425,21 +426,24 @@ static const BYTE rootSignedCRL[] = { static void testFindCRL(void) { - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, - CERT_STORE_CREATE_NEW_FLAG, NULL); + HCERTSTORE store; PCCRL_CONTEXT context; PCCERT_CONTEXT cert, endCert, rootCert; CRL_FIND_ISSUED_FOR_PARA issuedForPara = { NULL, NULL }; DWORD count, revoked_count; BOOL ret; - if (!store) return; if (!pCertFindCRLInStore || !pCertFindCertificateInCRL) { win_skip("CertFindCRLInStore or CertFindCertificateInCRL not available\n"); return; } + store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + if (!store) return; + ret = CertAddEncodedCRLToStore(store, X509_ASN_ENCODING, signedCRL, sizeof(signedCRL), CERT_STORE_ADD_ALWAYS, NULL); ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); @@ -783,6 +787,7 @@ static void testGetCRLFromStore(void) DWORD flags; BOOL ret; + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); if (!store) return; /* Crash

1 0

Sebastian Lackner : bcrypt: Remove a FIXME which no longer applies.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: b26d89b54a8c42bc71cb2c9b968d15ef4073378e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26d89b54a8c42bc71cb2c9b9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:36:31 2017 +0100 bcrypt: Remove a FIXME which no longer applies. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index b188479..80d7ddb 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -527,7 +527,6 @@ NTSTATUS WINAPI BCryptCreateHash( BCRYPT_ALG_HANDLE algorithm, BCRYPT_HASH_HANDL end: if (status != STATUS_SUCCESS) { - /* FIXME: call hash_finish to release resources */ HeapFree( GetProcessHeap(), 0, hash ); return status; }

1 0

Sebastian Lackner : bcrypt: Return error when requesting BCRYPT_HASH_LENGTH for unsupported object.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: eecb068ac0a9f6e380c521b69a27ea43840a35dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eecb068ac0a9f6e380c521b69… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 15:34:08 2017 +0100 bcrypt: Return error when requesting BCRYPT_HASH_LENGTH for unsupported object. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 ++ dlls/bcrypt/tests/bcrypt.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ae64627..561b459 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -404,6 +404,8 @@ static NTSTATUS generic_alg_property( enum alg_id id, const WCHAR *prop, UCHAR * if (!strcmpW( prop, BCRYPT_HASH_LENGTH )) { + if (!alg_props[id].hash_length) + return STATUS_NOT_SUPPORTED; *ret_size = sizeof(ULONG); if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 422f2cf..864c2c8 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -763,6 +763,10 @@ static void test_rng(void) ret = pBCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + len = size = 0xdeadbeef; + ret = pBCryptGetProperty(alg, BCRYPT_HASH_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %08x\n", ret); + test_alg_name(alg, "RNG"); memset(buf, 0, 16);

1 0

Sebastian Lackner : vcomp/tests: Use ULL macro to define 64-bit constants.
by Alexandre Julliard March 10, 2017

March 10, 2017

Module: wine Branch: master Commit: 375e5f50a87454875a6120c461a481f4832b734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=375e5f50a87454875a6120c46… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 10 14:31:15 2017 +0100 vcomp/tests: Use ULL macro to define 64-bit constants. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 100 ++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=375e5f50a87454875a612…

1 0