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

Nikolay Sivov : xmllite/reader: Implement MoveToAttributeByName().
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: be5679108ca4890f0e06578bc49ababe1353dffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5679108ca4890f0e06578bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 21 15:00:03 2017 +0300 xmllite/reader: Implement MoveToAttributeByName(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 185 ++++++++++++++++++++++++++++---------------- dlls/xmllite/tests/reader.c | 85 ++++++++++++++++++++ 2 files changed, 204 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be5679108ca4890f0e065…

1 0

Jacek Caban : rsaenh: Do not use stack variables out of frame (Coverity).
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 14ac2f60297917bee8fcb860241302c52ec9e1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ac2f60297917bee8fcb8602… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 21 15:36:31 2017 +0200 rsaenh: Do not use stack variables out of frame (Coverity). Based on patch by Marcus Meissner. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 69c7f80..1dfc896 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -50,52 +50,48 @@ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); BOOL init_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext) { - const WCHAR *algid = NULL; + BCRYPT_ALG_HANDLE provider; + NTSTATUS status; switch (aiAlgid) { case CALG_MD2: md2_init(&pHashContext->md2); - break; + return TRUE; case CALG_MD4: MD4Init(&pHashContext->md4); - break; + return TRUE; case CALG_MD5: MD5Init(&pHashContext->md5); - break; + return TRUE; case CALG_SHA: A_SHAInit(&pHashContext->sha); - break; + return TRUE; case CALG_SHA_256: - algid = BCRYPT_SHA256_ALGORITHM; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA256_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); break; case CALG_SHA_384: - algid = BCRYPT_SHA384_ALGORITHM; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA384_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); break; case CALG_SHA_512: - algid = BCRYPT_SHA512_ALGORITHM; + status = BCryptOpenAlgorithmProvider(&provider, BCRYPT_SHA512_ALGORITHM, MS_PRIMITIVE_PROVIDER, 0); break; - } - if (algid) - { - BCRYPT_ALG_HANDLE provider; - NTSTATUS status; + default: + return TRUE; + } - status = BCryptOpenAlgorithmProvider(&provider, algid, MS_PRIMITIVE_PROVIDER, 0); - if (status) return FALSE; + if (status) return FALSE; - status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); - BCryptCloseAlgorithmProvider(provider, 0); - if (status) return FALSE; - } - return TRUE; + status = BCryptCreateHash(provider, &pHashContext->bcrypt_hash, NULL, 0, NULL, 0, 0); + BCryptCloseAlgorithmProvider(provider, 0); + return !status; } BOOL update_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, const BYTE *pbData,

1 0

Alistair Leslie-Hughes : include: Support all version of BackgroundCopyManager from bits.h.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 8ef2d4ea836d5fdaa440e8ffc5a6e7bb3efbb057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef2d4ea836d5fdaa440e8ffc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 21 01:34:01 2017 +0000 include: Support all version of BackgroundCopyManager from bits.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bits1_5.idl | 2 ++ include/bits2_0.idl | 5 +++++ include/bits2_5.idl | 2 ++ 3 files changed, 9 insertions(+) diff --git a/include/bits1_5.idl b/include/bits1_5.idl index 274a7de..5937ce0 100644 --- a/include/bits1_5.idl +++ b/include/bits1_5.idl @@ -86,3 +86,5 @@ interface IBackgroundCopyJob2 : IBackgroundCopyJob HRESULT SetCredentials(BG_AUTH_CREDENTIALS *cred); HRESULT RemoveCredentials(BG_AUTH_TARGET target, BG_AUTH_SCHEME scheme); } + +cpp_quote("#include \"bits2_0.h\"") diff --git a/include/bits2_0.idl b/include/bits2_0.idl index efe6dde..1d17c38 100644 --- a/include/bits2_0.idl +++ b/include/bits2_0.idl @@ -32,11 +32,14 @@ cpp_quote("#define BG_COPY_FILE_ALL 15") cpp_quote("#define BG_LENGTH_TO_EOF (UINT64)(-1)") +cpp_quote("#ifndef _BG_FILE_RANGE_DEFINED") +cpp_quote("#define _BG_FILE_RANGE_DEFINED") typedef struct _BG_FILE_RANGE { UINT64 InitialOffset; UINT64 Length; } BG_FILE_RANGE; +cpp_quote("#endif") [ uuid(443c8934-90ff-48ed-bcde-26f5c7450042), @@ -93,3 +96,5 @@ library BackgroundCopyManager2_0 interface IBackgroundCopyJob3; interface IBackgroundCopyFile2; } + +cpp_quote("#include \"bits2_5.h\"") diff --git a/include/bits2_5.idl b/include/bits2_5.idl index 29ea75c..c58dc8a 100644 --- a/include/bits2_5.idl +++ b/include/bits2_5.idl @@ -98,3 +98,5 @@ library BackgroundCopyManager2_5 interface IBackgroundCopyCallback; interface IBackgroundCopyJobHttpOptions; } + +cpp_quote("#include \"bits3_0.h\"")

1 0

Nikolay Sivov : xmllite/reader: Added a helper for setting current attribute cursor.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: b06dd7d804950ceb8fdc420453b08914bc559172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06dd7d804950ceb8fdc42045… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 21 15:00:04 2017 +0300 xmllite/reader: Added a helper for setting current attribute cursor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0a3d21c..ac0fe33 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2951,6 +2951,15 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static void reader_set_current_attribute(xmlreader *reader, struct attribute *attr) +{ + reader->attr = attr; + reader->chunk_read_off = 0; + reader_set_strvalue(reader, StringValue_Prefix, &attr->prefix); + reader_set_strvalue(reader, StringValue_QualifiedName, &attr->qname); + reader_set_strvalue(reader, StringValue_Value, &attr->value); +} + static HRESULT reader_move_to_first_attribute(xmlreader *reader) { if (!reader->attr_count) @@ -2959,11 +2968,7 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) if (!reader->attr) reader_inc_depth(reader); - reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); - reader->chunk_read_off = 0; - reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); - reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); - reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); + reader_set_current_attribute(reader, LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry)); return S_OK; } @@ -2991,13 +2996,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) next = list_next(&This->attrs, &This->attr->entry); if (next) - { - This->attr = LIST_ENTRY(next, struct attribute, entry); - This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - } + reader_set_current_attribute(This, LIST_ENTRY(next, struct attribute, entry)); return next ? S_OK : S_FALSE; } @@ -3096,11 +3095,7 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, if (name_len == target_name_len && uri_len == target_uri_len && !strcmpW(name, local_name) && !strcmpW(uri, namespace_uri)) { - This->attr = attr; - This->chunk_read_off = 0; - reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); - reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); + reader_set_current_attribute(This, attr); return S_OK; } }

1 0

Hugh McMaster : reg: Account for sizeof(WCHAR) when resizing the value name buffer during the query operation.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 90da210cb0a007d4d7e8d419461c3e86c363cadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=90da210cb0a007d4d7e8d4194… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jul 21 08:47:15 2017 +0000 reg: Account for sizeof(WCHAR) when resizing the value name buffer during the query operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a6927d0..573c750 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -769,7 +769,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) else { max_value_len *= 2; - value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len); + value_name = HeapReAlloc(GetProcessHeap(), 0, value_name, max_value_len * sizeof(WCHAR)); } } else break;

1 0

Józef Kucia : d3d11: Fix race condition in d3d_blend_state_create().
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: f83159d90bda496ded992ecca9d479414bb46e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83159d90bda496ded992ecca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 20 14:10:58 2017 +0200 d3d11: Fix race condition in d3d_blend_state_create(). Spotted by Kimmo Myllyvirta. 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/d3d11/state.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 39768c5..be687f3 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -67,6 +67,12 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_AddRef(ID3D11BlendState *iface) return refcount; } +static void d3d_blend_state_cleanup(struct d3d_blend_state *state) +{ + wined3d_private_store_cleanup(&state->private_store); + ID3D11Device_Release(state->device); +} + static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface) { struct d3d_blend_state *state = impl_from_ID3D11BlendState(iface); @@ -79,8 +85,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->blend_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); + d3d_blend_state_cleanup(state); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); } @@ -289,19 +294,9 @@ static HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_de state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; state->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; - wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); state->desc = *desc; - if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) - { - ERR("Failed to insert blend state entry.\n"); - wined3d_private_store_cleanup(&state->private_store); - wined3d_mutex_unlock(); - return E_FAIL; - } - wined3d_mutex_unlock(); - state->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(state->device); @@ -361,18 +356,31 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC return S_OK; } - wined3d_mutex_unlock(); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + { + wined3d_mutex_unlock(); return E_OUTOFMEMORY; + } if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); return hr; } + if (wine_rb_put(&device->blend_states, desc, &object->entry) == -1) + { + ERR("Failed to insert blend state entry.\n"); + d3d_blend_state_cleanup(object); + HeapFree(GetProcessHeap(), 0, object); + wined3d_mutex_unlock(); + return E_FAIL; + } + wined3d_mutex_unlock(); + TRACE("Created blend state %p.\n", object); *state = object;

1 0

Zebediah Figura : msi: Send the dialog created message in dialog_create().
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 39c2ff0283204d6e714917a56f8538292ff62f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39c2ff0283204d6e714917a56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:15 2017 -0500 msi: Send the dialog created message in dialog_create(). It should be sent before the message loop, and it should also be sent for dialogs spawned with control events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index a5b839d..c4a94f1 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3918,6 +3918,8 @@ static BOOL dialog_register_class( void ) static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_dialog *parent, control_event_handler event_handler ) { + static const WCHAR szDialogCreated[] = + {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; MSIRECORD *rec = NULL; msi_dialog *dialog; @@ -3949,6 +3951,13 @@ static msi_dialog *dialog_create( MSIPACKAGE *package, const WCHAR *name, msi_di dialog->control_cancel = strdupW( MSI_RecordGetString( rec, 10 ) ); msiobj_release( &rec->hdr ); + rec = MSI_CreateRecord(2); + if (!rec) return NULL; + MSI_RecordSetStringW(rec, 1, name); + MSI_RecordSetStringW(rec, 2, szDialogCreated); + MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, rec); + msiobj_release(&rec->hdr); + return dialog; } @@ -4603,17 +4612,6 @@ UINT ACTION_DialogBox( MSIPACKAGE *package, const WCHAR *dialog ) msi_free( name ); } if (r == ERROR_IO_PENDING) r = ERROR_SUCCESS; - if (r == ERROR_SUCCESS) - { - static const WCHAR szDialogCreated[] = - {'D','i','a','l','o','g',' ','c','r','e','a','t','e','d',0}; - MSIRECORD *row = MSI_CreateRecord(2); - if (!row) return ERROR_OUTOFMEMORY; - MSI_RecordSetStringW(row, 1, dialog); - MSI_RecordSetStringW(row, 2, szDialogCreated); - MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONSTART, row); - msiobj_release(&row->hdr); - } return r; }

1 0

Zebediah Figura : msi: Don' t queue a parent dialog to be shown in EndDialog.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 14f865e14fc6f290d392c6c847d2841dcc6ba96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f865e14fc6f290d392c6c84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:14 2017 -0500 msi: Don't queue a parent dialog to be shown in EndDialog. When using "Return", the parent dialog already exists, so there is no need to do this. Moreover, if the parent dialog is queued, a subsequent "Exit" would not properly exit the parent dialog. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 6b57606..a5b839d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -4381,12 +4381,7 @@ static UINT event_end_dialog( msi_dialog *dialog, const WCHAR *argument ) else if (!strcmpW( argument, ignoreW )) dialog->package->CurrentInstallState = ERROR_SUCCESS; else if (!strcmpW( argument, returnW )) - { - msi_dialog *parent = dialog->parent; - msi_free( dialog->package->next_dialog ); - dialog->package->next_dialog = (parent) ? strdupW( parent->name ) : NULL; dialog->package->CurrentInstallState = ERROR_SUCCESS; - } else { ERR("Unknown argument string %s\n", debugstr_w(argument));

1 0

Zebediah Figura : msi: Process ShowDialog/ EndDialog after all other control events.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: 8826584b1d728e1f43dab67f9d6aaa7940f18ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8826584b1d728e1f43dab67f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:13 2017 -0500 msi: Process ShowDialog/EndDialog after all other control events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/dialog.c | 45 +++++++++++-- dlls/msi/tests/package.c | 165 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 199 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8826584b1d728e1f43dab…

1 0

Zebediah Figura : msi: Avoid a null pointer dereference.
by Alexandre Julliard July 21, 2017

July 21, 2017

Module: wine Branch: master Commit: b4c39f4e7c9d8b20afb615f00f1013b7fec69b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c39f4e7c9d8b20afb615f00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:11 2017 -0500 msi: Avoid a null pointer dereference. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 5 +++++ dlls/msi/tests/db.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 34f8d04..85e8306 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -778,6 +778,11 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) lstrcatW( path, file ); data = msi_read_text_archive( path, &len ); + if (!data) + { + msi_free(path); + return ERROR_FUNCTION_FAILED; + } ptr = data; msi_parse_line( &ptr, &columns, &num_columns, &len ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 278b45f..4ea1f10 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2369,6 +2369,12 @@ static void test_msiimport(void) r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDatabaseImportA(hdb, CURR_DIR, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "nonexistent"); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + r = add_table_to_db(hdb, test_data); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0