January 2019 - Wine-commits

Józef Kucia : d3d9: Use wined3d_bit_scan() instead of open-coding it.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 39876236e83005cdc80b41a74c46defb255c5e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39876236e83005cdc80b41a7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 25 09:46:54 2019 +0100 d3d9: Use wined3d_bit_scan() instead of open-coding it. 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/d3d9/device.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 067ea2b..ed1fedf 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2732,8 +2732,7 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) ERR("Failed to get stream source.\n"); @@ -3111,8 +3110,7 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, i, &wined3d_buffer, &offset, &stride))) @@ -3130,8 +3128,7 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, map = device->sysmem_vb; while (map) { - i = ffs(map) - 1; - map ^= 1u << i; + i = wined3d_bit_scan(&map); if (FAILED(wined3d_device_get_stream_source(device->wined3d_device, i, &wined3d_buffer, &offset, &stride)))

1 0

Gijs Vermeulen : msvcp: Set correct error code on non-existing path in _Open_dir.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 64aba27f6a99becb61a879d713bae39397920134 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64aba27f6a99becb61a879d7… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jan 25 17:51:40 2019 +0100 msvcp: Set correct error code on non-existing path in _Open_dir. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- dlls/msvcp90/ios.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index ac38aa6..6d72f9f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1837,7 +1837,7 @@ static void test_tr2_sys__dir_operation(void) result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); ok(result_handle == NULL, "tr2_sys__Open_dir(): expect: NULL, got %p\n", result_handle); - todo_wine ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 229741a..1bae2b9 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -983,7 +983,7 @@ static void test_dir_operation(void) result_handle = file; result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); ok(result_handle == NULL, "_Open_dir(): expect: NULL, got %p\n", result_handle); - todo_wine ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); + ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect: 0xdeadbeef, got %d\n", type); ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index bf7eea2..32bd2e7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14983,7 +14983,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { - *err_code = GetLastError(); + *err_code = ERROR_BAD_PATHNAME; return NULL; } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) {

1 0

Gijs Vermeulen : msvcp: Set target to null on error in _Open_dir.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: b51cee00a7bfdfb44d88f500eceb9d1c5fd8193a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51cee00a7bfdfb44d88f500… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jan 25 17:51:41 2019 +0100 msvcp: Set target to null on error in _Open_dir. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 8 ++++---- dlls/msvcp140/tests/msvcp140.c | 8 ++++---- dlls/msvcp90/ios.c | 6 ++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 6d72f9f..534c015 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1792,7 +1792,7 @@ static void test_tr2_sys__dir_operation(void) while(lstrlenA(longer_path) < MAX_PATH-1) strcat(longer_path, "s"); ok(lstrlenA(longer_path) == MAX_PATH-1, "tr2_sys__Open_dir(): expect MAX_PATH, got %d\n", lstrlenA(longer_path)); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_tr2_sys__Open_dir(first_file_name, longer_path, &err, &type); @@ -1801,7 +1801,7 @@ static void test_tr2_sys__dir_operation(void) ok(err == ERROR_BAD_PATHNAME, "tr2_sys__Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "tr2_sys__Open_dir(): expect 0xdeadbeef, got %d\n", type); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); memset(dest, 0, MAX_PATH); err = type = 0xdeadbeef; result_handle = NULL; @@ -1832,7 +1832,7 @@ static void test_tr2_sys__dir_operation(void) ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); err = type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "not_exist", &err, &type); @@ -1842,7 +1842,7 @@ static void test_tr2_sys__dir_operation(void) ok(!*first_file_name, "tr2_sys__Open_dir(): expect: 0, got %s\n", first_file_name); CreateDirectoryA("empty_dir", NULL); - memset(first_file_name, 0, MAX_PATH); + memset(first_file_name, 0xff, MAX_PATH); err = type = 0xdeadbeef; result_handle = file; result_handle = p_tr2_sys__Open_dir(first_file_name, "empty_dir", &err, &type); diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1bae2b9..b2bdafa 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -938,7 +938,7 @@ static void test_dir_operation(void) wcscat(longer_path, backslashW); while(lstrlenW(longer_path) < MAX_PATH-1) wcscat(longer_path, sW); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); type = err = 0xdeadbeef; result_handle = NULL; result_handle = p_Open_dir(first_file_name, longer_path, &err, &type); @@ -947,7 +947,7 @@ static void test_dir_operation(void) ok(err == ERROR_BAD_PATHNAME, "_Open_dir(): expect: ERROR_BAD_PATHNAME, got %d\n", err); ok((int)type == 0xdeadbeef, "_Open_dir(): expect 0xdeadbeef, got %d\n", type); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); memset(dest, 0, sizeof(dest)); err = type = 0xdeadbeef; result_handle = NULL; @@ -978,7 +978,7 @@ static void test_dir_operation(void) ok(num_of_sub_dir == 1, "found sub_dir %d times\n", num_of_sub_dir); ok(num_of_other_files == 0, "found %d other files\n", num_of_other_files); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; result_handle = p_Open_dir(first_file_name, not_existW, &err, &type); @@ -988,7 +988,7 @@ static void test_dir_operation(void) ok(!*first_file_name, "_Open_dir(): expect: 0, got %s\n", wine_dbgstr_w(first_file_name)); CreateDirectoryW(empty_dirW, NULL); - memset(first_file_name, 0, sizeof(first_file_name)); + memset(first_file_name, 0xff, sizeof(first_file_name)); err = type = 0xdeadbeef; result_handle = file; result_handle = p_Open_dir(first_file_name, empty_dirW, &err, &type); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 32bd2e7..743e4ca 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14976,6 +14976,7 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); if(wcslen(dest) > MAX_PATH - 3) { *err_code = ERROR_BAD_PATHNAME; + *target = '\0'; return NULL; } wcscpy(temppath, dest); @@ -14984,12 +14985,14 @@ void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { *err_code = ERROR_BAD_PATHNAME; + *target = '\0'; return NULL; } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; + *target = '\0'; FindClose(handle); return NULL; } @@ -15023,8 +15026,7 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e handle = tr2_sys__Open_dir_wchar(target_w, dest ? dest_w : NULL, err_code, type); - if (handle) - WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); return handle; }

1 0

Zebediah Figura : msi/tests: Use check_record() in more places.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: fe23e015278e318f9642c67384887f865e5f2ed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe23e015278e318f9642c673… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 10:13:50 2019 -0600 msi/tests: Use check_record() in more places. 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/tests/db.c | 644 +++++++--------------------------------------------- 1 file changed, 76 insertions(+), 568 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe23e015278e318f9642…

1 0

Zebediah Figura : msi: Get rid of the find_matching_rows() view operation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: ced768f2ec163e25b7e1cf54a87f4b01369a846e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced768f2ec163e25b7e1cf54… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:30 2019 -0600 msi: Get rid of the find_matching_rows() view operation. It was introduced in 9f487ba1d as part of an optimization, but ceased to be used in a52c2bf94. 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 | 9 ------ dlls/msi/create.c | 1 - dlls/msi/delete.c | 10 ------- dlls/msi/distinct.c | 22 --------------- dlls/msi/drop.c | 1 - dlls/msi/insert.c | 10 ------- dlls/msi/msipriv.h | 13 --------- dlls/msi/select.c | 20 -------------- dlls/msi/storages.c | 30 -------------------- dlls/msi/streams.c | 30 -------------------- dlls/msi/table.c | 80 ----------------------------------------------------- dlls/msi/update.c | 9 ------ dlls/msi/where.c | 31 --------------------- 13 files changed, 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ced768f2ec163e25b7e1…

1 0

Zebediah Figura : msi: Get rid of the remove_column() view operation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: c2810f40a0af6496cfbb7d87685e2e018befd43b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2810f40a0af6496cfbb7d87… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:31 2019 -0600 msi: Get rid of the remove_column() view operation. It was added to the structure, rather unnecessarily, by ccef56f2c. 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 | 5 ----- dlls/msi/select.c | 1 - dlls/msi/storages.c | 1 - dlls/msi/streams.c | 1 - dlls/msi/table.c | 1 - dlls/msi/update.c | 1 - dlls/msi/where.c | 1 - 13 files changed, 17 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 8899c44..011a2dc 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -240,7 +240,6 @@ static const MSIVIEWOPS alter_ops = NULL, NULL, NULL, - NULL, }; UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 0a60066..dd4739d 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -141,7 +141,6 @@ static const MSIVIEWOPS create_ops = NULL, NULL, NULL, - NULL, }; static UINT check_columns( const column_info *col_info ) diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 4ed5384..4681151 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -183,7 +183,6 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, - NULL, }; UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) diff --git a/dlls/msi/distinct.c b/dlls/msi/distinct.c index ff292f1..b1945a1 100644 --- a/dlls/msi/distinct.c +++ b/dlls/msi/distinct.c @@ -266,7 +266,6 @@ static const MSIVIEWOPS distinct_ops = NULL, NULL, NULL, - NULL, }; UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) diff --git a/dlls/msi/drop.c b/dlls/msi/drop.c index 41dbc8d..3179f14 100644 --- a/dlls/msi/drop.c +++ b/dlls/msi/drop.c @@ -111,7 +111,6 @@ static const MSIVIEWOPS drop_ops = NULL, NULL, NULL, - NULL, }; UINT DROP_CreateView(MSIDATABASE *db, MSIVIEW **view, LPCWSTR name) diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index 0ae0cdc..a5333c9 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -337,7 +337,6 @@ static const MSIVIEWOPS insert_ops = NULL, NULL, NULL, - NULL, }; static UINT count_column_info( const column_info *ci ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 420fe43..d05ad0e 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -317,11 +317,6 @@ typedef struct tagMSIVIEWOPS UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number, LPCWSTR column, UINT type, BOOL hold ); /* - * remove_column - removes the column represented by table name and column number from the table - */ - UINT (*remove_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number ); - - /* * sort - orders the table by columns */ UINT (*sort)( struct tagMSIVIEW *view, column_info *columns ); diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 70d2c32..8bd4509 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -350,7 +350,6 @@ static const MSIVIEWOPS select_ops = NULL, NULL, NULL, - NULL, }; static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name, diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index f0b960d..9d262b7 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -434,7 +434,6 @@ static const MSIVIEWOPS storages_ops = NULL, NULL, NULL, - NULL, }; static INT add_storages_to_table(MSISTORAGESVIEW *sv) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index e542d78..37b8cb3 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -356,7 +356,6 @@ static const MSIVIEWOPS streams_ops = NULL, NULL, NULL, - NULL, }; static HRESULT open_stream( MSIDATABASE *db, const WCHAR *name, IStream **stream ) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e24b0bd..4a06334 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2072,7 +2072,6 @@ static const MSIVIEWOPS table_ops = TABLE_add_ref, TABLE_release, TABLE_add_column, - TABLE_remove_column, NULL, TABLE_drop, }; diff --git a/dlls/msi/update.c b/dlls/msi/update.c index ed81447..ff4e1ab 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -213,7 +213,6 @@ static const MSIVIEWOPS update_ops = NULL, NULL, NULL, - NULL, }; UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, diff --git a/dlls/msi/where.c b/dlls/msi/where.c index b493bda..6c08471 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -1081,7 +1081,6 @@ static const MSIVIEWOPS where_ops = NULL, NULL, NULL, - NULL, WHERE_sort, NULL, };

1 0

Zebediah Figura : msi: Use a BOOL to track string persistence.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: a7f455b97fdd0ef07a15b66eea63f82522ff4f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f455b97fdd0ef07a15b66e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:32 2019 -0600 msi: Use a BOOL to track string persistence. 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/msipriv.h | 8 +------- dlls/msi/storages.c | 2 +- dlls/msi/streams.c | 4 ++-- dlls/msi/string.c | 18 +++++++++--------- dlls/msi/table.c | 8 +++----- 5 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index d05ad0e..1cbeae4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -742,13 +742,7 @@ extern UINT msi_commit_streams( MSIDATABASE *db ) DECLSPEC_HIDDEN; /* string table functions */ -enum StringPersistence -{ - StringPersistent = 0, - StringNonPersistent = 1 -}; - -extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) DECLSPEC_HIDDEN; +extern BOOL msi_add_string( string_table *st, const WCHAR *data, int len, BOOL persistent ) DECLSPEC_HIDDEN; extern UINT msi_string2id( const string_table *st, const WCHAR *data, int len, UINT *id ) DECLSPEC_HIDDEN; extern VOID msi_destroy_stringtable( string_table *st ) DECLSPEC_HIDDEN; extern const WCHAR *msi_string_lookup( const string_table *st, UINT id, int *len ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/storages.c b/dlls/msi/storages.c index 9d262b7..4379ae2 100644 --- a/dlls/msi/storages.c +++ b/dlls/msi/storages.c @@ -77,7 +77,7 @@ static STORAGE *create_storage(MSISTORAGESVIEW *sv, LPCWSTR name, IStorage *stg) if (!storage) return NULL; - storage->str_index = msi_add_string(sv->db->strings, name, -1, StringNonPersistent); + storage->str_index = msi_add_string(sv->db->strings, name, -1, FALSE); storage->storage = stg; if (storage->storage) diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index 37b8cb3..fc9f715 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -127,7 +127,7 @@ static UINT STREAMS_set_row(struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, U const WCHAR *name = MSI_RecordGetString( rec, 1 ); if (!name) return ERROR_INVALID_PARAMETER; - sv->db->streams[row].str_index = msi_add_string( sv->db->strings, name, -1, StringNonPersistent ); + sv->db->streams[row].str_index = msi_add_string( sv->db->strings, name, -1, FALSE ); } if (mask & 2) { @@ -399,7 +399,7 @@ static UINT append_stream( MSIDATABASE *db, const WCHAR *name, IStream *stream ) if (!streams_resize_table( db, db->num_streams + 1 )) return ERROR_OUTOFMEMORY; - db->streams[i].str_index = msi_add_string( db->strings, name, -1, StringNonPersistent ); + db->streams[i].str_index = msi_add_string( db->strings, name, -1, FALSE ); db->streams[i].stream = stream; db->num_streams++; diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 7383fdd..9dec32d 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -209,9 +209,9 @@ static void insert_string_sorted( string_table *st, UINT string_id ) } static void set_st_entry( string_table *st, UINT n, WCHAR *str, int len, USHORT refcount, - enum StringPersistence persistence ) + BOOL persistent ) { - if (persistence == StringPersistent) + if (persistent) { st->strings[n].persistent_refcount = refcount; st->strings[n].nonpersistent_refcount = 0; @@ -257,7 +257,7 @@ static UINT string2id( const string_table *st, const char *buffer, UINT *id ) return r; } -static int add_string( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, enum StringPersistence persistence ) +static int add_string( string_table *st, UINT n, const char *data, UINT len, USHORT refcount, BOOL persistent ) { LPWSTR str; int sz; @@ -274,7 +274,7 @@ static int add_string( string_table *st, UINT n, const char *data, UINT len, USH { if (string2id( st, data, &n ) == ERROR_SUCCESS) { - if (persistence == StringPersistent) + if (persistent) st->strings[n].persistent_refcount += refcount; else st->strings[n].nonpersistent_refcount += refcount; @@ -299,11 +299,11 @@ static int add_string( string_table *st, UINT n, const char *data, UINT len, USH MultiByteToWideChar( st->codepage, 0, data, len, str, sz ); str[sz] = 0; - set_st_entry( st, n, str, sz, refcount, persistence ); + set_st_entry( st, n, str, sz, refcount, persistent ); return n; } -int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPersistence persistence ) +int msi_add_string( string_table *st, const WCHAR *data, int len, BOOL persistent ) { UINT n; LPWSTR str; @@ -318,7 +318,7 @@ int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPer if (msi_string2id( st, data, len, &n) == ERROR_SUCCESS ) { - if (persistence == StringPersistent) + if (persistent) st->strings[n].persistent_refcount++; else st->strings[n].nonpersistent_refcount++; @@ -338,7 +338,7 @@ int msi_add_string( string_table *st, const WCHAR *data, int len, enum StringPer memcpy( str, data, len*sizeof(WCHAR) ); str[len] = 0; - set_st_entry( st, n, str, len, 1, persistence ); + set_st_entry( st, n, str, len, 1, persistent ); return n; } @@ -545,7 +545,7 @@ string_table *msi_load_string_table( IStorage *stg, UINT *bytes_per_strref ) break; } - r = add_string( st, n, data+offset, len, refs, StringPersistent ); + r = add_string( st, n, data+offset, len, refs, TRUE ); if( r != n ) ERR("Failed to add string %d\n", n ); n++; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 4a06334..dfa4469 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -716,7 +716,6 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, MSICONDITION persistent ) { - enum StringPersistence string_persistence = (persistent) ? StringPersistent : StringNonPersistent; UINT r, nField; MSIVIEW *tv = NULL; MSIRECORD *rec = NULL; @@ -756,8 +755,8 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, for( i = 0, col = col_info; col; i++, col = col->next ) { - UINT table_id = msi_add_string( db->strings, col->table, -1, string_persistence ); - UINT col_id = msi_add_string( db->strings, col->column, -1, string_persistence ); + UINT table_id = msi_add_string( db->strings, col->table, -1, persistent ); + UINT col_id = msi_add_string( db->strings, col->column, -1, persistent ); table->colinfo[ i ].tablename = msi_string_lookup( db->strings, table_id, NULL ); table->colinfo[ i ].number = i + 1; @@ -1385,8 +1384,7 @@ static UINT TABLE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI { int len; const WCHAR *sval = msi_record_get_string( rec, i + 1, &len ); - val = msi_add_string( tv->db->strings, sval, len, - persistent ? StringPersistent : StringNonPersistent ); + val = msi_add_string( tv->db->strings, sval, len, persistent ); } else {

1 0

Zebediah Figura : msi: Use 0-indexed row numbers in the modify() view operation.
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 8aefa871ad3fcd28b8bc7e5b79f2e661dbab9435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aefa871ad3fcd28b8bc7e5b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 24 00:07:33 2019 -0600 msi: Use 0-indexed row numbers in the modify() view operation. For consistency with other operations. 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 | 2 +- dlls/msi/select.c | 2 +- dlls/msi/table.c | 4 ++-- dlls/msi/where.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index db5660a..30c4f65 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -696,7 +696,7 @@ UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) if ( mode == MSIMODIFY_UPDATE && rec->cookie != (UINT64)(ULONG_PTR)query ) return ERROR_FUNCTION_FAILED; - r = view->ops->modify( view, mode, rec, query->row ); + r = view->ops->modify( view, mode, rec, query->row - 1 ); if (mode == MSIMODIFY_DELETE && r == ERROR_SUCCESS) query->row--; diff --git a/dlls/msi/select.c b/dlls/msi/select.c index 8bd4509..e17cbbb 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -253,7 +253,7 @@ static UINT msi_select_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) if (r != ERROR_SUCCESS) return r; - r = sv->table->ops->get_row(sv->table, row - 1, &mod); + r = sv->table->ops->get_row(sv->table, row, &mod); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dfa4469..b507268 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1731,7 +1731,7 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) } /* the row cannot be changed */ - if (row != new_row + 1) + if (row != new_row) return ERROR_FUNCTION_FAILED; return TABLE_set_row(view, new_row, rec, (1 << tv->num_cols) - 1); @@ -1769,7 +1769,7 @@ static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro MSIRECORD *curr; UINT r, i, count; - r = TABLE_get_row(view, row - 1, &curr); + r = TABLE_get_row(view, row, &curr); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 6c08471..234ba5e 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -944,8 +944,8 @@ static UINT WHERE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, { UINT *rows; - if (find_row(wv, row - 1, &rows) == ERROR_SUCCESS) - row = rows[0] + 1; + if (find_row(wv, row, &rows) == ERROR_SUCCESS) + row = rows[0]; else row = -1;

1 0

Sven Baars : windowscodecs: Fix a memory leak (Valgrind).
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 1f132865ec21a644071a04558c116e73c3a62a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f132865ec21a644071a0455… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:48 2019 +0100 windowscodecs: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 7050c95..faffeae 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -620,7 +620,6 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p if (setjmp(jmpbuf)) { ppng_destroy_read_struct(&This->png_ptr, &This->info_ptr, &This->end_info); - HeapFree(GetProcessHeap(), 0, row_pointers); This->png_ptr = NULL; hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; goto end; @@ -816,6 +815,9 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p end: LeaveCriticalSection(&This->lock); + if (row_pointers) + HeapFree(GetProcessHeap(), 0, row_pointers); + return hr; }

1 0

Sven Baars : gdiplus: Fix a memory leak on error path (Valgrind).
by Alexandre Julliard 25 Jan '19

25 Jan '19

Module: wine Branch: master Commit: 85630593b87a031f9858a5bcadaed9621ef326bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=85630593b87a031f9858a5bc… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Jan 24 11:59:47 2019 +0100 gdiplus: Fix a memory leak on error path (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2e844cf..8a136ef 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3570,7 +3570,11 @@ static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICB if (FAILED(hr)) return hresult_to_status(hr); hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad); - if (FAILED(hr)) return hresult_to_status(hr); + if (FAILED(hr)) + { + IWICBitmapDecoder_Release(*decoder); + return hresult_to_status(hr); + } return Ok; }

1 0