January 2019 - Wine-commits

Sven Baars : dinput: Free the device after a callback (Valgrind).
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: cf1b9fe2c7b78b1d5ad02d0bd56de263f8d1dd06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf1b9fe2c7b78b1d5ad02d0b… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 29 00:11:00 2019 +0100 dinput: Free the device after a callback (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 7074704..54777da 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1104,10 +1104,12 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( if (lpCallback(&didevis[i], lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { + IDirectInputDevice_Release(lpdid); HeapFree(GetProcessHeap(), 0, didevis); HeapFree(GetProcessHeap(), 0, username_w); return DI_OK; } + IDirectInputDevice_Release(lpdid); } HeapFree(GetProcessHeap(), 0, didevis); @@ -1130,9 +1132,11 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( if (lpCallback(&didevi, lpdid, callbackFlags, --remain, pvRef) == DIENUM_STOP) { + IDirectInputDevice_Release(lpdid); HeapFree(GetProcessHeap(), 0, username_w); return DI_OK; } + IDirectInputDevice_Release(lpdid); } }

1 0

Sven Baars : strmbase: Fix some memory leaks (Valgrind).
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: c7f51d85ecf0ee63a3c4a818c3c1c9727562b0a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f51d85ecf0ee63a3c4a818… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue Jan 29 20:28:58 2019 +0100 strmbase: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 9 ++++++--- dlls/strmbase/renderer.c | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 91c0ddc..1ad4d3b 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -264,14 +264,17 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) CoTaskMemFree(This->enumMediaDetails.pMediaTypes); i = 0; - while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) i++; + while (This->enumMediaFunction(This->basePin, i, &amt) == S_OK) + { + FreeMediaType(&amt); + i++; + } This->enumMediaDetails.cMediaTypes = i; This->enumMediaDetails.pMediaTypes = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * i); for (i = 0; i < This->enumMediaDetails.cMediaTypes; i++) { - This->enumMediaFunction(This->basePin, i,&amt); - if (FAILED(CopyMediaType(&This->enumMediaDetails.pMediaTypes[i], &amt))) + if (FAILED(This->enumMediaFunction(This->basePin, i, &This->enumMediaDetails.pMediaTypes[i]))) { while (i--) FreeMediaType(&This->enumMediaDetails.pMediaTypes[i]); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index c06661c..3d5e4b5 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -346,6 +346,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp { return VFW_E_TYPE_NOT_ACCEPTED; } + DeleteMediaType(pmt); } This->pMediaSample = pSample;

1 0

Michael Stefaniuc : wineandroid.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: a1c756510d9cdfc8a1f0cb4a53f997b8bae45937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c756510d9cdfc8a1f0cb4a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:03 2019 +0100 wineandroid.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 861b216..eb05aaf 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -1176,9 +1176,9 @@ static int get_cursor_system_id( const ICONINFOEXW *info ) if (info->szResName[0]) return 0; /* only integer resources are supported here */ if (!(module = GetModuleHandleW( info->szModName ))) return 0; - for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) return 0; + if (i == ARRAY_SIZE( module_cursors )) return 0; cursors = module_cursors[i].cursors; for (i = 0; cursors[i].id; i++)

1 0

Michael Stefaniuc : regedit: Remove redundant NULL check before heap_free( ).
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 73a997c6ba14a68457beaf6f968c40d47c656b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=73a997c6ba14a68457beaf6f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:06 2019 +0100 regedit: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 4ef99ec..28402dc 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -731,11 +731,8 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) { WCHAR *val_name = pos, *p; - if (parser->value_name) - { - heap_free(parser->value_name); - parser->value_name = NULL; - } + heap_free(parser->value_name); + parser->value_name = NULL; if (!REGPROC_unescape_string(val_name, &p)) goto invalid;

1 0

Michael Stefaniuc : reg: Remove redundant NULL check before heap_free().
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: cd8eb2445ef98617862d474321795eee47247b3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8eb2445ef98617862d4743… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:07 2019 +0100 reg: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/import.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index 779ea28..3e3ad11 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -645,11 +645,8 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) { WCHAR *val_name = pos, *p; - if (parser->value_name) - { - heap_free(parser->value_name); - parser->value_name = NULL; - } + heap_free(parser->value_name); + parser->value_name = NULL; if (!unescape_string(val_name, &p)) goto invalid;

1 0

Michael Stefaniuc : strmbase: Remove redundant NULL check before CoTaskMemFree().
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 78a8445a2a4a6f225386a8a9781e961d2c5517a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78a8445a2a4a6f225386a8a9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Jan 29 20:38:09 2019 +0100 strmbase: Remove redundant NULL check before CoTaskMemFree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/mediatype.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 1ad4d3b..cd8e909 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -45,11 +45,8 @@ HRESULT WINAPI CopyMediaType(AM_MEDIA_TYPE *dest, const AM_MEDIA_TYPE *src) void WINAPI FreeMediaType(AM_MEDIA_TYPE * pMediaType) { - if (pMediaType->pbFormat) - { - CoTaskMemFree(pMediaType->pbFormat); - pMediaType->pbFormat = NULL; - } + CoTaskMemFree(pMediaType->pbFormat); + pMediaType->pbFormat = NULL; if (pMediaType->pUnk) { IUnknown_Release(pMediaType->pUnk);

1 0

Hans Leidekker : crypt32: Initial implementation of PFXImportCertStore.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 226fd5cb2345f65f520e765251706b6ea83802e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=226fd5cb2345f65f520e7652… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 28 15:38:38 2019 +0100 crypt32: Initial implementation of PFXImportCertStore. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/Makefile.in | 2 + dlls/crypt32/crypt32_private.h | 3 + dlls/crypt32/decode.c | 14 --- dlls/crypt32/encode.c | 14 --- dlls/crypt32/main.c | 6 + dlls/crypt32/pfx.c | 238 +++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/store.c | 264 +++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 12 +- 8 files changed, 523 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=226fd5cb2345f65f520e…

1 0

Zebediah Figura : msi: Support setting streams in msi_select_update().
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 044c1dd23b307a0b7f2188855d5bf6e479cefd5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=044c1dd23b307a0b7f218885… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 22:11:08 2019 -0600 msi: Support setting streams in msi_select_update(). 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/alter.c | 1 + dlls/msi/create.c | 1 + dlls/msi/delete.c | 1 + dlls/msi/distinct.c | 1 + dlls/msi/drop.c | 1 + dlls/msi/insert.c | 1 + dlls/msi/msipriv.h | 7 +++++++ dlls/msi/select.c | 7 +++++-- dlls/msi/storages.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msi/streams.c | 14 ++++++++++++++ dlls/msi/table.c | 17 +++++++++++++++++ dlls/msi/update.c | 1 + dlls/msi/where.c | 21 +++++++++++++++++++++ 13 files changed, 112 insertions(+), 2 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index d1a481e..5c5893c 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -221,6 +221,7 @@ static const MSIVIEWOPS alter_ops = NULL, NULL, NULL, + NULL, ALTER_execute, ALTER_close, ALTER_get_dimensions, diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 3c00b70..2777954 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -131,6 +131,7 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, + NULL, CREATE_execute, CREATE_close, CREATE_get_dimensions, diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index e2e0e34..81bd9d7 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -173,6 +173,7 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, + NULL, DELETE_execute, DELETE_close, DELETE_get_dimensions, diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index 5bd5bf8..e102adb 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -256,6 +256,7 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, + NULL, DISTINCT_execute, DISTINCT_close, DISTINCT_get_dimensions, diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 60a9202..89fac9d 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -101,6 +101,7 @@ static const MSIVIEWOPS drop_ops = NULL, NULL, NULL, + NULL, DROP_execute, DROP_close, DROP_get_dimensions, diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index ed913c0..f1185ee 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -327,6 +327,7 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, + NULL, INSERT_execute, INSERT_close, INSERT_get_dimensions, diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 3ff5ac2..e4d2a62 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -257,6 +257,13 @@ typedef struct tagMSIVIEWOPS UINT (*set_string)( struct tagMSIVIEW *view, UINT row, UINT col, const WCHAR *val, int len ); /* + * set_stream - set the stream value at {row, col} + * This function has undefined behaviour if the column does not contain + * streams. + */ + UINT (*set_stream)( struct tagMSIVIEW *view, UINT row, UINT col, IStream *stream ); + + /* * set_row - sets values in a row as specified by mask * * Similar semantics to fetch_int diff --git a/dlls/msi/select.c b/dlls/msi/select.c index c6e7b20..9d3d887 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -234,6 +234,7 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; UINT r, i, col, type, val; + IStream *stream; LPCWSTR str; for (i = 0; i < sv->num_cols; i++) @@ -249,8 +250,9 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) if (MSITYPE_IS_BINARY(type)) { - ERR("Cannot modify binary data!\n"); - return ERROR_FUNCTION_FAILED; + if (MSI_RecordGetIStream(rec, i + 1, &stream)) + return ERROR_FUNCTION_FAILED; + r = sv->table->ops->set_stream(sv->table, row, col, stream); } else if (type & MSITYPE_STRING) { @@ -311,6 +313,7 @@ static const MSIVIEWOPS select_ops = SELECT_fetch_stream, NULL, NULL, + NULL, SELECT_set_row, SELECT_insert_row, NULL, diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 76a0e2e..521b6e8 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -153,6 +153,46 @@ done: return hr; } +static UINT STORAGES_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream ) +{ + MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; + IStorage *stg, *substg, *prev; + const WCHAR *name; + HRESULT hr; + UINT r; + + TRACE("view %p, row %u, col %u, stream %p.\n", view, row, col, stream); + + if ((r = stream_to_storage(stream, &stg))) + return r; + + name = msi_string_lookup(sv->db->strings, sv->storages[row].str_index, NULL); + + hr = IStorage_CreateStorage(sv->db->storage, name, + STGM_WRITE | STGM_SHARE_EXCLUSIVE, + 0, 0, &substg); + if (FAILED(hr)) + { + IStorage_Release(stg); + return ERROR_FUNCTION_FAILED; + } + + hr = IStorage_CopyTo(stg, 0, NULL, NULL, substg); + if (FAILED(hr)) + { + IStorage_Release(substg); + IStorage_Release(stg); + return ERROR_FUNCTION_FAILED; + } + IStorage_Release(substg); + + prev = sv->storages[row].storage; + sv->storages[row].storage = stg; + if (prev) IStorage_Release(prev); + + return ERROR_SUCCESS; +} + static UINT STORAGES_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTORAGESVIEW *sv = (MSISTORAGESVIEW *)view; @@ -404,6 +444,7 @@ static const MSIVIEWOPS storages_ops = STORAGES_fetch_stream, NULL, STORAGES_set_string, + STORAGES_set_stream, STORAGES_set_row, STORAGES_insert_row, STORAGES_delete_row, diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 2d458ad..bc02fb2 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -110,6 +110,19 @@ static UINT STREAMS_set_string( struct tagMSIVIEW *view, UINT row, UINT col, con return ERROR_FUNCTION_FAILED; } +static UINT STREAMS_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream ) +{ + MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; + IStream *prev; + + TRACE("view %p, row %u, col %u, stream %p.\n", view, row, col, stream); + + prev = sv->db->streams[row].stream; + IStream_AddRef(sv->db->streams[row].stream = stream); + if (prev) IStream_Release(prev); + return ERROR_SUCCESS; +} + static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask) { MSISTREAMSVIEW *sv = (MSISTREAMSVIEW *)view; @@ -340,6 +353,7 @@ static const MSIVIEWOPS streams_ops = STREAMS_fetch_stream, NULL, STREAMS_set_string, + STREAMS_set_stream, STREAMS_set_row, STREAMS_insert_row, STREAMS_delete_row, diff --git a/dlls/msi/table.c b/dlls/msi/table.c index f26ab9f..a2b83e2 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1357,6 +1357,22 @@ done: return r; } +static UINT TABLE_set_stream( MSIVIEW *view, UINT row, UINT col, IStream *stream ) +{ + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + WCHAR *name; + UINT r; + + TRACE("row %u, col %u, stream %p.\n", row, col, stream); + + if ((r = get_stream_name( tv, row - 1, &name ))) + return r; + + r = add_stream( tv->db, name, stream ); + msi_free( name ); + return r; +} + static UINT get_table_value_from_record( MSITABLEVIEW *tv, MSIRECORD *rec, UINT iField, UINT *pvalue ) { MSICOLUMNINFO columninfo; @@ -2126,6 +2142,7 @@ static const MSIVIEWOPS table_ops = TABLE_fetch_stream, TABLE_set_int, TABLE_set_string, + TABLE_set_stream, TABLE_set_row, TABLE_insert_row, TABLE_delete_row, diff --git a/dlls/msi/update.c b/dlls/msi/update.c index af629d2..e61342d 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -204,6 +204,7 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, + NULL, UPDATE_execute, UPDATE_close, UPDATE_get_dimensions, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index eaadac4..66de85b 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -299,6 +299,26 @@ static UINT WHERE_set_string(struct tagMSIVIEW *view, UINT row, UINT col, const return table->view->ops->set_string(table->view, rows[table->table_index], col, val, len); } +static UINT WHERE_set_stream(MSIVIEW *view, UINT row, UINT col, IStream *stream) +{ + MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; + JOINTABLE *table; + UINT *rows; + UINT r; + + TRACE("view %p, row %u, col %u, stream %p.\n", wv, row, col, stream); + + r = find_row(wv, row, &rows); + if (r != ERROR_SUCCESS) + return r; + + table = find_table(wv, col, &col); + if (!table) + return ERROR_FUNCTION_FAILED; + + return table->view->ops->set_stream(table->view, rows[table->table_index], col, stream); +} + static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { MSIWHEREVIEW *wv = (MSIWHEREVIEW*)view; @@ -1098,6 +1118,7 @@ static const MSIVIEWOPS where_ops = WHERE_fetch_stream, WHERE_set_int, WHERE_set_string, + WHERE_set_stream, WHERE_set_row, NULL, WHERE_delete_row,

1 0

Zebediah Figura : msi: Implement UPDATE queries using msi_select_update().
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 40a08f8362c191b51db07a483c4f41fa61158c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a08f8362c191b51db07a48… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 22:11:09 2019 -0600 msi: Implement UPDATE queries using msi_select_update(). 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/query.h | 2 ++ dlls/msi/select.c | 2 +- dlls/msi/update.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 063fbb9..d79c14f 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -151,4 +151,6 @@ MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, MSICONDITION persistent ) DECLSPEC_HIDDEN; +UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; + #endif /* __WINE_MSI_QUERY_H */ diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 9d3d887..ef16e5d 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -230,7 +230,7 @@ static UINT SELECT_get_column_info( struct tagMSIVIEW *view, UINT n, LPCWSTR *na type, temporary, table_name ); } -static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) +UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row) { MSISELECTVIEW *sv = (MSISELECTVIEW*)view; UINT r, i, col, type, val; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index e61342d..4aa0344 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -113,7 +113,7 @@ static UINT UPDATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) for ( i=0; i<row_count; i++ ) { - r = wv->ops->set_row( wv, i, values, (1 << col_count) - 1 ); + r = msi_select_update( wv, values, i ); if (r != ERROR_SUCCESS) break; }

1 0

Zebediah Figura : msi: Factor out msi_view_refresh_row().
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 31628cee6e2ba63a1a08672d89ccd8d10836bf7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=31628cee6e2ba63a1a08672d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 28 22:11:10 2019 -0600 msi: Factor out msi_view_refresh_row(). 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/msiquery.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 30c4f65..bea08c2 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -287,7 +287,7 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb, return ret; } -UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) +UINT msi_view_refresh_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD *rec) { UINT row_count = 0, col_count = 0, i, ival, ret, type; @@ -300,13 +300,6 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (!col_count) return ERROR_INVALID_PARAMETER; - if (row >= row_count) - return ERROR_NO_MORE_ITEMS; - - *rec = MSI_CreateRecord(col_count); - if (!*rec) - return ERROR_FUNCTION_FAILED; - for (i = 1; i <= col_count; i++) { ret = view->ops->get_column_info(view, i, NULL, &type, NULL, NULL); @@ -323,7 +316,7 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) ret = view->ops->fetch_stream(view, row, i, &stm); if ((ret == ERROR_SUCCESS) && stm) { - MSI_RecordSetIStream(*rec, i, stm); + MSI_RecordSetIStream(rec, i, stm); IStream_Release(stm); } else @@ -342,28 +335,48 @@ UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) if (! (type & MSITYPE_VALID)) ERR("Invalid type!\n"); - /* check if it's nul (0) - if so, don't set anything */ - if (!ival) - continue; - if (type & MSITYPE_STRING) { int len; - const WCHAR *sval = msi_string_lookup( db->strings, ival, &len ); - msi_record_set_string( *rec, i, sval, len ); + const WCHAR *sval = msi_string_lookup(db->strings, ival, &len); + msi_record_set_string(rec, i, sval, len); } else { if ((type & MSI_DATASIZEMASK) == 2) - MSI_RecordSetInteger(*rec, i, ival - (1<<15)); + MSI_RecordSetInteger(rec, i, ival ? ival - (1<<15) : MSI_NULL_INTEGER); else - MSI_RecordSetInteger(*rec, i, ival - (1u<<31)); + MSI_RecordSetInteger(rec, i, ival - (1u<<31)); } } return ERROR_SUCCESS; } +UINT msi_view_get_row(MSIDATABASE *db, MSIVIEW *view, UINT row, MSIRECORD **rec) +{ + UINT row_count = 0, col_count = 0, r; + MSIRECORD *object; + + TRACE("view %p, row %u, rec %p.\n", view, row, rec); + + if ((r = view->ops->get_dimensions(view, &row_count, &col_count))) + return r; + + if (row >= row_count) + return ERROR_NO_MORE_ITEMS; + + if (!(object = MSI_CreateRecord( col_count ))) + return ERROR_OUTOFMEMORY; + + if ((r = msi_view_refresh_row(db, view, row, object))) + msiobj_release( &object->hdr ); + else + *rec = object; + + return r; +} + UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) { MSIVIEW *view;

1 0