wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Piotr Caban : msi: Support ALTER TABLE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: ae6fd7b14792b932832da6f5d5088d500723c386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6fd7b14792b932832da6f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:57 2020 +0200 msi: Support ALTER TABLE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 6929bf2560..56d55d32cc 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2256,7 +2256,7 @@ static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *va { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - if (!tv->table) + if (!tv->table || col > tv->table->col_count) { *val = 0; return ERROR_SUCCESS; @@ -2268,7 +2268,7 @@ static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStre { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - if (!tv->table) + if (!tv->table || col > tv->table->col_count) { *stm = NULL; return ERROR_SUCCESS; @@ -2452,6 +2452,59 @@ static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) return r; } +static UINT TransformView_add_column( MSITABLEVIEW *tv, MSIRECORD *rec ) +{ + static const WCHAR query_pfx[] = + L"INSERT INTO `_TransformView` (`Table`, `Current`, `Column`, `Data`) VALUES ('"; + + WCHAR buf[256], *query = buf; + UINT i, p, len, r, qlen; + MSIQUERY *q; + + qlen = p = wcslen( query_pfx ); + for (i = 1; i <= 4; i++) + { + r = MSI_RecordGetStringW( rec, i, NULL, &len ); + if (r != ERROR_SUCCESS) + return r; + qlen += len + 3; /* strlen( "','" ) */ + } + + if (qlen > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + qlen = len; + if (!query) + return ERROR_OUTOFMEMORY; + } + + memcpy( query, query_pfx, p * sizeof(WCHAR) ); + for (i = 1; i <= 4; i++) + { + len = qlen - p; + MSI_RecordGetStringW( rec, i, query + p, &len ); + p += len; + query[p++] = '\''; + if (i != 4) + { + query[p++] = ','; + query[p++] = '\''; + } + } + query[p++] = ')'; + query[p++] = 0; + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; +} + static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; @@ -2459,6 +2512,9 @@ static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, B if (!wcscmp(tv->name, szTables)) return TransformView_create_table( tv, rec ); + if (!wcscmp(tv->name, szColumns)) + return TransformView_add_column( tv, rec ); + FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2492,6 +2548,9 @@ static UINT TransformView_get_column_info( MSIVIEW *view, UINT n, LPCWSTR *name, static UINT TransformView_delete( MSIVIEW *view ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + if (!tv->table || tv->columns != tv->table->colinfo) + msi_free( tv->columns ); return TABLE_delete( view ); } @@ -2520,8 +2579,15 @@ static const MSIVIEWOPS transform_view_ops = UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { - UINT r, name_len, size; + static const WCHAR query_pfx[] = L"SELECT `Column`, `Data`, `Current` FROM `_TransformView` WHERE `Table`='"; + static const WCHAR query_sfx[] = L"' AND `Row` IS NULL AND `Current` IS NOT NULL"; + + WCHAR buf[256], *query = buf; + UINT r, len, name_len, size, add_col; + MSICOLUMNINFO *colinfo; MSITABLEVIEW *tv; + MSIRECORD *rec; + MSIQUERY *q; name_len = wcslen( name ); @@ -2548,6 +2614,86 @@ UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIV } tv->view.ops = &transform_view_ops; + + len = ARRAY_SIZE(query_pfx) + name_len + ARRAY_SIZE(query_sfx) - 1; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + { + msi_free( tv ); + return ERROR_OUTOFMEMORY; + } + } + memcpy( query, query_pfx, ARRAY_SIZE(query_pfx) * sizeof(WCHAR) ); + len = ARRAY_SIZE(query_pfx) - 1; + memcpy( query + len, name, name_len * sizeof(WCHAR) ); + len += name_len; + memcpy( query + len, query_sfx, ARRAY_SIZE(query_sfx) * sizeof(WCHAR) ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + { + msi_free( tv ); + return r; + } + + r = MSI_ViewExecute( q, NULL ); + if (r != ERROR_SUCCESS) + { + msi_free( tv ); + return r; + } + + r = q->view->ops->get_dimensions( q->view, &add_col, NULL ); + if (r != ERROR_SUCCESS) + { + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + msi_free( tv ); + return r; + } + if (!add_col) + { + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + return ERROR_SUCCESS; + } + + colinfo = msi_alloc_zero( (add_col + tv->num_cols) * sizeof(*colinfo) ); + if (!colinfo) + { + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + msi_free( tv ); + return r; + } + + while (MSI_ViewFetch( q, &rec ) == ERROR_SUCCESS) + { + int name_len; + const WCHAR *name = msi_record_get_string( rec, 1, &name_len ); + const WCHAR *type = msi_record_get_string( rec, 2, NULL ); + UINT name_id, idx; + + idx = _wtoi( msi_record_get_string(rec, 3, NULL) ); + colinfo[idx - 1].number = idx; + colinfo[idx - 1].type = _wtoi( type ); + + r = msi_string2id( st, name, name_len, &name_id ); + if (r == ERROR_SUCCESS) + colinfo[idx - 1].colname = msi_string_lookup( st, name_id, NULL ); + else + ERR( "column name %s is not defined in strings table\n", wine_dbgstr_w(name) ); + } + MSI_ViewClose( q ); + msiobj_release( &q->hdr ); + + memcpy( colinfo, tv->columns, tv->num_cols * sizeof(*colinfo) ); + tv->columns = colinfo; + tv->num_cols += add_col; return ERROR_SUCCESS; }

1 0

Piotr Caban : msi: Support CREATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 7e4077fb6d77810e40e842e7557c03ab3abe0593 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4077fb6d77810e40e842e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:55 2020 +0200 msi: Support CREATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 9a839439e6..6929bf2560 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2254,11 +2254,25 @@ static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWS static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!tv->table) + { + *val = 0; + return ERROR_SUCCESS; + } return TABLE_fetch_int( view, row, col, val ); } static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!tv->table) + { + *stm = NULL; + return ERROR_SUCCESS; + } return TABLE_fetch_stream( view, row, col, stm ); } @@ -2403,8 +2417,48 @@ static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT return ERROR_SUCCESS; } +static UINT TransformView_create_table( MSITABLEVIEW *tv, MSIRECORD *rec ) +{ + static const WCHAR query_fmt[] = + L"INSERT INTO `_TransformView` (`Table`, `Column`) VALUES ('%s', 'CREATE')"; + + WCHAR buf[256], *query = buf; + const WCHAR *name; + MSIQUERY *q; + int len; + UINT r; + + name = msi_record_get_string( rec, 1, &len ); + if (!name) + return ERROR_INSTALL_TRANSFORM_FAILURE; + + len = _snwprintf( NULL, 0, query_fmt, name ) + 1; + if (len > ARRAY_SIZE(buf)) + { + query = msi_alloc( len * sizeof(WCHAR) ); + if (!query) + return ERROR_OUTOFMEMORY; + } + swprintf( query, len, query_fmt, name ); + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + return r; + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + return r; +} + static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) { + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + + if (!wcscmp(tv->name, szTables)) + return TransformView_create_table( tv, rec ); + FIXME("\n"); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -2466,15 +2520,23 @@ static const MSIVIEWOPS transform_view_ops = UINT TransformView_Create( MSIDATABASE *db, string_table *st, LPCWSTR name, MSIVIEW **view ) { + UINT r, name_len, size; MSITABLEVIEW *tv; - UINT r; + + name_len = wcslen( name ); r = TABLE_CreateView( db, name, view ); if (r == ERROR_INVALID_PARAMETER) { /* table does not exist */ - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + size = FIELD_OFFSET( MSITABLEVIEW, name[name_len + 1] ); + tv = msi_alloc_zero( size ); + if (!tv) + return ERROR_OUTOFMEMORY; + + tv->db = db; + memcpy( tv->name, name, name_len * sizeof(WCHAR) ); + *view = (MSIVIEW*)tv; } else if (r != ERROR_SUCCESS) { @@ -2912,7 +2974,10 @@ static UINT msi_table_load_transform( MSIDATABASE *db, IStorage *stg, if (TRACE_ON(msidb)) dump_record( rec ); - r = msi_table_find_row( tv, rec, &row, NULL ); + if (tv->table) + r = msi_table_find_row( tv, rec, &row, NULL ); + else + r = ERROR_FUNCTION_FAILED; if (r == ERROR_SUCCESS) { if (!mask)

1 0

Piotr Caban : msi: Support UPDATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 6e7303a7006538d3df1a09e13f5a5f469098b35f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7303a7006538d3df1a09e1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:48 2020 +0200 msi: Support UPDATE when MSITRANSFORM_ERROR_VIEWTRANSFORM flag is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 173 insertions(+), 10 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index ff61f2f682..9a839439e6 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2188,6 +2188,38 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) return ERROR_SUCCESS; } +static WCHAR* create_key_string(MSITABLEVIEW *tv, MSIRECORD *rec) +{ + DWORD i, p, len, key_len = 0; + WCHAR *key; + + for (i = 0; i < tv->num_cols; i++) + { + if (!(tv->columns[i].type & MSITYPE_KEY)) + continue; + if (MSI_RecordGetStringW( rec, i+1, NULL, &len ) == ERROR_SUCCESS) + key_len += len; + key_len++; + } + + key = msi_alloc( key_len * sizeof(WCHAR) ); + if(!key) + return NULL; + + p = 0; + for (i = 0; i < tv->num_cols; i++) + { + if (!(tv->columns[i].type & MSITYPE_KEY)) + continue; + if (p) + key[p++] = '\t'; + len = key_len - p; + if (MSI_RecordGetStringW( rec, i+1, key + p, &len ) == ERROR_SUCCESS) + p += len; + } + return key; +} + static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) { UINT p = 0, l, i, r; @@ -2222,20 +2254,153 @@ static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWS static UINT TransformView_fetch_int( MSIVIEW *view, UINT row, UINT col, UINT *val ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_fetch_int( view, row, col, val ); } static UINT TransformView_fetch_stream( MSIVIEW *view, UINT row, UINT col, IStream **stm ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_fetch_stream( view, row, col, stm ); } static UINT TransformView_set_row( MSIVIEW *view, UINT row, MSIRECORD *rec, UINT mask ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + static const WCHAR query_pfx[] = + L"INSERT INTO `_TransformView` (`Table`, `Column`, `Row`, `Data`, `Current`) VALUES ('"; + + MSITABLEVIEW *tv = (MSITABLEVIEW*)view; + WCHAR buf[256], *query = buf; + MSIRECORD *old_rec; + MSIQUERY *q; + WCHAR *key; + UINT i, p, r, len, qlen; + + if (!wcscmp( tv->name, szColumns )) + { + ERR( "trying to modify existing column\n" ); + return ERROR_INSTALL_TRANSFORM_FAILURE; + } + + if (!wcscmp( tv->name, szTables )) + { + ERR( "trying to modify existing table\n" ); + return ERROR_INSTALL_TRANSFORM_FAILURE; + } + + key = create_key_string( tv, rec ); + if (!key) + return ERROR_OUTOFMEMORY; + + r = msi_view_get_row( tv->db, view, row, &old_rec ); + if (r != ERROR_SUCCESS) + old_rec = NULL; + + for (i = 0; i < tv->num_cols; i++) + { + if (!(mask & (1 << i))) + continue; + if (tv->columns[i].type & MSITYPE_KEY) + continue; + + qlen = p = wcslen( query_pfx ); + qlen += wcslen( tv->name ) + 3; /* strlen("','") */ + qlen += wcslen( tv->columns[i].colname ) + 3; + qlen += wcslen( key ) + 3; + if (MSITYPE_IS_BINARY( tv->columns[i].type )) + r = msi_record_stream_name( tv, rec, NULL, &len ); + else + r = MSI_RecordGetStringW( rec, i + 1, NULL, &len ); + if (r != ERROR_SUCCESS) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + qlen += len + 3; + if (old_rec && (r = MSI_RecordGetStringW( old_rec, i+1, NULL, &len ))) + { + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + qlen += len + 3; /* strlen("')") + 1 */ + + if (qlen > ARRAY_SIZE(buf)) + { + query = msi_alloc( qlen * sizeof(WCHAR) ); + if (!query) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return ERROR_OUTOFMEMORY; + } + } + + memcpy( query, query_pfx, p * sizeof(WCHAR) ); + len = wcslen( tv->name ); + memcpy( query + p, tv->name, len * sizeof(WCHAR) ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + len = wcslen( tv->columns[i].colname ); + memcpy( query + p, tv->columns[i].colname, len * sizeof(WCHAR) ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + len = wcslen( key ); + memcpy( query + p, key, len * sizeof(WCHAR) ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + len = qlen - p; + if (MSITYPE_IS_BINARY( tv->columns[i].type )) + msi_record_stream_name( tv, rec, query + p, &len ); + else + MSI_RecordGetStringW( rec, i + 1, query + p, &len ); + p += len; + query[p++] = '\''; + query[p++] = ','; + query[p++] = '\''; + if (old_rec) + { + len = qlen - p; + MSI_RecordGetStringW( old_rec, i + 1, query + p, &len ); + p += len; + } + query[p++] = '\''; + query[p++] = ')'; + query[p++] = 0; + + r = MSI_DatabaseOpenViewW( tv->db, query, &q ); + if (query != buf) + msi_free( query ); + if (r != ERROR_SUCCESS) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + + r = MSI_ViewExecute( q, NULL ); + msiobj_release( &q->hdr ); + if (r != ERROR_SUCCESS) + { + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return r; + } + } + + if (old_rec) + msiobj_release( &old_rec->hdr ); + msi_free( key ); + return ERROR_SUCCESS; } static UINT TransformView_insert_row( MSIVIEW *view, MSIRECORD *rec, UINT row, BOOL temporary ) @@ -2262,15 +2427,13 @@ static UINT TransformView_close( MSIVIEW *view ) static UINT TransformView_get_dimensions( MSIVIEW *view, UINT *rows, UINT *cols ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_get_dimensions( view, rows, cols ); } static UINT TransformView_get_column_info( MSIVIEW *view, UINT n, LPCWSTR *name, UINT *type, BOOL *temporary, LPCWSTR *table_name ) { - FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + return TABLE_get_column_info( view, n, name, type, temporary, table_name ); } static UINT TransformView_delete( MSIVIEW *view )

1 0

Piotr Caban : msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 8bc835b4517728fac8ff8a9cfa5e59b843e9a8df URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc835b4517728fac8ff8a9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:43 2020 +0200 msi: Add stub support for MSITRANSFORM_ERROR_VIEWTRANSFORM flag in MsiApplyTransform. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- dlls/msi/msiquery.c | 4 +- dlls/msi/patch.c | 2 +- dlls/msi/table.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 161 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc835b4517728fac8ff…

1 0

Piotr Caban : msi: Introduce msi_record_stream_name helper.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 5fc68884adec547a5343e8713e8727282b5aa25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc68884adec547a5343e871… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:39 2020 +0200 msi: Introduce msi_record_stream_name helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/table.c | 93 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 46 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c0ffa99e1d..f0c36b0013 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2188,6 +2188,38 @@ UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view ) return ERROR_SUCCESS; } +static UINT msi_record_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR name, UINT *len ) +{ + UINT p = 0, l, i, r; + + l = wcslen( tv->name ); + if (name && *len > l) + memcpy(name, tv->name, l * sizeof(WCHAR)); + p += l; + + for ( i = 0; i < tv->num_cols; i++ ) + { + if (!(tv->columns[i].type & MSITYPE_KEY)) + continue; + + if (name && *len > p + 1) + name[p] = '.'; + p++; + + l = (*len > p ? *len - p : 0); + r = MSI_RecordGetStringW( rec, i + 1, name ? name + p : NULL, &l ); + if (r != ERROR_SUCCESS) + return r; + p += l; + } + + if (name && *len > p) + name[p] = 0; + + *len = p; + return ERROR_SUCCESS; +} + UINT MSI_CommitTables( MSIDATABASE *db ) { UINT r, bytes_per_strref; @@ -2252,61 +2284,30 @@ static UINT read_raw_int(const BYTE *data, UINT col, UINT bytes) static UINT msi_record_encoded_stream_name( const MSITABLEVIEW *tv, MSIRECORD *rec, LPWSTR *pstname ) { - LPWSTR stname = NULL, sval, p; - DWORD len; - UINT i, r; + UINT r, len; + WCHAR *name; TRACE("%p %p\n", tv, rec); - len = lstrlenW( tv->name ) + 1; - stname = msi_alloc( len*sizeof(WCHAR) ); - if ( !stname ) - { - r = ERROR_OUTOFMEMORY; - goto err; - } + r = msi_record_stream_name( tv, rec, NULL, &len ); + if (r != ERROR_SUCCESS) + return r; + len++; - lstrcpyW( stname, tv->name ); + name = msi_alloc( len * sizeof(WCHAR) ); + if (!name) + return ERROR_OUTOFMEMORY; - for ( i = 0; i < tv->num_cols; i++ ) + r = msi_record_stream_name( tv, rec, name, &len ); + if (r != ERROR_SUCCESS) { - if ( tv->columns[i].type & MSITYPE_KEY ) - { - sval = msi_dup_record_field( rec, i + 1 ); - if ( !sval ) - { - r = ERROR_OUTOFMEMORY; - goto err; - } - - len += lstrlenW( szDot ) + lstrlenW ( sval ); - p = msi_realloc ( stname, len*sizeof(WCHAR) ); - if ( !p ) - { - r = ERROR_OUTOFMEMORY; - msi_free(sval); - goto err; - } - stname = p; - - lstrcatW( stname, szDot ); - lstrcatW( stname, sval ); - - msi_free( sval ); - } - else - continue; + msi_free( name ); + return r; } - *pstname = encode_streamname( FALSE, stname ); - msi_free( stname ); - + *pstname = encode_streamname( FALSE, name ); + msi_free( name ); return ERROR_SUCCESS; - -err: - msi_free ( stname ); - *pstname = NULL; - return r; } static MSIRECORD *msi_get_transform_record( const MSITABLEVIEW *tv, const string_table *st,

1 0

Piotr Caban : include: Add MSITRANSFORM_ERROR enum definition.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 57b870007dddd86c6772ce1707148ec7ad8bd8db URL: https://source.winehq.org/git/wine.git/?a=commit;h=57b870007dddd86c6772ce17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 25 20:08:35 2020 +0200 include: Add MSITRANSFORM_ERROR enum definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msiquery.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msiquery.h b/include/msiquery.h index a1f3c6c9fd..7f5e4c903a 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -145,6 +145,17 @@ typedef enum tagMSIDBSTATE MSIDBSTATE_WRITE = 1 } MSIDBSTATE; +typedef enum tagMSITRANSFORM_ERROR +{ + MSITRANSFORM_ERROR_ADDEXISTINGROW = 0x00000001, + MSITRANSFORM_ERROR_DELMISSINGROW = 0x00000002, + MSITRANSFORM_ERROR_ADDEXISTINGTABLE = 0x00000004, + MSITRANSFORM_ERROR_DELMISSINGTABLE = 0x00000008, + MSITRANSFORM_ERROR_UPDATEMISSINGROW = 0x00000010, + MSITRANSFORM_ERROR_CHANGECODEPAGE = 0x00000020, + MSITRANSFORM_ERROR_VIEWTRANSFORM = 0x00000100 +} MSITRANSFORM_ERROR; + typedef enum tagMSITRANSFORM_VALIDATE { MSITRANSFORM_VALIDATE_LANGUAGE = 0x00000001,

1 0

Alexandre Julliard : ntdll: Fix some stdcall/cdecl calling convention mismatches.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: 8b36885973466ca96d049445521faf8483cf8d7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b36885973466ca96d049445… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 20:40:00 2020 +0200 ntdll: Fix some stdcall/cdecl calling convention mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/relay.c | 6 +++--- dlls/ntdll/resource.c | 2 +- dlls/ntdll/rtl.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index acccf08881..72aeb9eab4 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -395,7 +395,7 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne } extern LONGLONG WINAPI relay_call( struct relay_descr *descr, unsigned int idx ); -__ASM_GLOBAL_FUNC( relay_call, +__ASM_STDCALL_FUNC( relay_call, 8, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -414,7 +414,7 @@ __ASM_GLOBAL_FUNC( relay_call, "pushl %esi\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("relay_trace_entry") "\n\t" + "call " __ASM_STDCALL("relay_trace_entry",16) "\n\t" /* copy the arguments*/ "movzwl -16(%ebp),%ecx\n\t" /* number of args */ "jecxz 1f\n\t" @@ -441,7 +441,7 @@ __ASM_GLOBAL_FUNC( relay_call, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("relay_trace_exit") "\n\t" + "call " __ASM_STDCALL("relay_trace_exit",20) "\n\t" /* restore return value and return */ "leal -12(%ebp),%esp\n\t" "movl %esi,%eax\n\t" diff --git a/dlls/ntdll/resource.c b/dlls/ntdll/resource.c index 13b6812808..9dd2f745b6 100644 --- a/dlls/ntdll/resource.c +++ b/dlls/ntdll/resource.c @@ -367,7 +367,7 @@ __ASM_STDCALL_FUNC( LdrAccessResource, 16, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" - "call " __ASM_NAME("access_resource") "\n\t" + "call " __ASM_STDCALL("access_resource",16) "\n\t" "leave\n\t" "ret $16" ) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 4a4a7b31de..caf00ecdb1 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -439,7 +439,7 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM /****************************************************************************** * RtlEnumerateGenericTableWithoutSplaying [NTDLL.@] */ -void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) +void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *previous) { static int warn_once; @@ -451,7 +451,7 @@ void * RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, void *p /****************************************************************************** * RtlNumberGenericTableElements [NTDLL.@] */ -ULONG RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) +ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) { FIXME("(%p) stub!\n", table); return 0;

1 0

Alexandre Julliard : ntdll: Use Windows APIs to handle the dll overrides variable.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: dde38fda6eacf453cb48f75b7579647ceb75e9fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=dde38fda6eacf453cb48f75b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 19:38:29 2020 +0200 ntdll: Use Windows APIs to handle the dll overrides variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loadorder.c | 40 ++++++++++++++++++++-------------------- dlls/ntdll/unix/env.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index dad5d915da..6e4a502e75 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -27,6 +27,8 @@ #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" #include "ntdll_misc.h" @@ -181,7 +183,7 @@ static void add_load_order( const module_loadorder_t *plo ) if(!env_list.order) { MESSAGE("Virtual memory exhausted\n"); - exit(1); + NtTerminateProcess( GetCurrentProcess(), 1 ); } } env_list.order[i].loadorder = plo->loadorder; @@ -225,29 +227,28 @@ static void add_load_order_set( WCHAR *entry ) */ static void init_load_order(void) { - const char *order = getenv( "WINEDLLOVERRIDES" ); - UNICODE_STRING strW; - WCHAR *entry, *next; + static const WCHAR winedlloverridesW[] = {'W','I','N','E','D','L','L','O','V','E','R','R','I','D','E','S',0}; + WCHAR *entry, *next, *order; + SIZE_T len = 1024; + NTSTATUS status; init_done = TRUE; - if (!order) return; - if (!strcmp( order, "help" )) + for (;;) { - MESSAGE( "Syntax:\n" - " WINEDLLOVERRIDES=\"entry;entry;entry...\"\n" - " where each entry is of the form:\n" - " module[,module...]={native|builtin}[,{b|n}]\n" - "\n" - " Only the first letter of the override (native or builtin)\n" - " is significant.\n\n" - "Example:\n" - " WINEDLLOVERRIDES=\"comdlg32=n,b;shell32,shlwapi=b\"\n" ); - exit(0); + order = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + status = RtlQueryEnvironmentVariable( NULL, winedlloverridesW, wcslen(winedlloverridesW), + order, len - 1, &len ); + if (!status) + { + order[len] = 0; + break; + } + RtlFreeHeap( GetProcessHeap(), 0, order ); + if (status != STATUS_BUFFER_TOO_SMALL) return; } - RtlCreateUnicodeStringFromAsciiz( &strW, order ); - entry = strW.Buffer; + entry = order; while (*entry) { while (*entry == ';') entry++; @@ -263,8 +264,7 @@ static void init_load_order(void) if (env_list.count) qsort(env_list.order, env_list.count, sizeof(env_list.order[0]), cmp_sort_func); - /* Note: we don't free the Unicode string because the - * stored module names point inside it */ + /* note: we don't free the string because the stored module names point inside it */ } diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index d90990c092..7bf57a228f 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -802,6 +802,17 @@ void init_environment( int argc, char *argv[], char *envp[] ) } +static const char overrides_help_message[] = + "Syntax:\n" + " WINEDLLOVERRIDES=\"entry;entry;entry...\"\n" + " where each entry is of the form:\n" + " module[,module...]={native|builtin}[,{b|n}]\n" + "\n" + " Only the first letter of the override (native or builtin)\n" + " is significant.\n\n" + "Example:\n" + " WINEDLLOVERRIDES=\"comdlg32=n,b;shell32,shlwapi=b\"\n"; + /************************************************************************* * get_initial_environment * @@ -822,6 +833,11 @@ NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *siz { if (is_special_env_var( str + 4 )) str += 4; else if (!strncmp( str, "WINEPRELOADRESERVE=", 19 )) continue; /* skip it */ + else if (!strcmp( str, "WINEDLLOVERRIDES=help" )) + { + MESSAGE( overrides_help_message ); + exit(0); + } } else if (is_special_env_var( str )) continue; /* skip it */ @@ -842,7 +858,21 @@ NTSTATUS CDECL get_initial_environment( WCHAR **wargv[], WCHAR *env, SIZE_T *siz /* append a variable to the environment */ -static void append_env( WCHAR *env, SIZE_T *pos, const char *name, const WCHAR *value ) +static void append_envA( WCHAR *env, SIZE_T *pos, const char *name, const char *value ) +{ + SIZE_T i = *pos; + + while (*name) env[i++] = (unsigned char)*name++; + if (value) + { + env[i++] = '='; + i += ntdll_umbstowcs( value, strlen(value), env + i, strlen(value) ); + } + env[i++] = 0; + *pos = i; +} + +static void append_envW( WCHAR *env, SIZE_T *pos, const char *name, const WCHAR *value ) { SIZE_T i = *pos; @@ -862,12 +892,12 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char UNICODE_STRING nt_name; ANSI_STRING unix_name; - if (!path) append_env( env, pos, name, NULL ); + if (!path) append_envW( env, pos, name, NULL ); else { RtlInitAnsiString( &unix_name, path ); if (unix_to_nt_file_name( &unix_name, &nt_name )) return; - append_env( env, pos, name, nt_name.Buffer ); + append_envW( env, pos, name, nt_name.Buffer ); RtlFreeUnicodeString( &nt_name ); } } @@ -880,19 +910,20 @@ static void add_path_var( WCHAR *env, SIZE_T *pos, const char *name, const char */ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) { + const char *overrides = getenv( "WINEDLLOVERRIDES" ); SIZE_T alloc, pos = 0; WCHAR *buffer; DWORD i; - WCHAR buf[256]; char dlldir[22]; NTSTATUS status = STATUS_SUCCESS; - alloc = 20 * 6; /* 6 variable names */ + alloc = 20 * 7; /* 7 variable names */ if (data_dir) alloc += strlen( data_dir ) + 9; if (home_dir) alloc += strlen( home_dir ) + 9; if (build_dir) alloc += strlen( build_dir ) + 9; if (config_dir) alloc += strlen( config_dir ) + 9; if (user_name) alloc += strlen( user_name ); + if (overrides) alloc += strlen( overrides ); for (i = 0; dll_paths[i]; i++) alloc += 20 + strlen( dll_paths[i] ) + 9; if (!(buffer = malloc( alloc * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; @@ -907,9 +938,9 @@ NTSTATUS CDECL get_dynamic_environment( WCHAR *env, SIZE_T *size ) add_path_var( buffer, &pos, dlldir, dll_paths[i] ); } sprintf( dlldir, "WINEDLLDIR%u", i ); - append_env( buffer, &pos, dlldir, NULL ); - ntdll_umbstowcs( user_name, strlen(user_name) + 1, buf, ARRAY_SIZE(buf) ); - append_env( buffer, &pos, "WINEUSERNAME", buf ); + append_envW( buffer, &pos, dlldir, NULL ); + append_envA( buffer, &pos, "WINEUSERNAME", user_name ); + append_envA( buffer, &pos, "WINEDLLOVERRIDES", overrides ); assert( pos <= alloc ); if (pos < *size)

1 0

Alexandre Julliard : ntdll: Move the math functions to the Unix library.
by Alexandre Julliard 26 Jun '20

26 Jun '20

Module: wine Branch: master Commit: e60591919850a79a483ec3c138fce96f8e1edb57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e60591919850a79a483ec3c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 09:12:11 2020 +0200 ntdll: Move the math functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 30 +++++++++++------------------- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 23 +++++++++++++++++++++++ dlls/ntdll/unixlib.h | 14 +++++++++++++- 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 362c68e5e0..4e2175b89b 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -77,15 +77,7 @@ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **relea */ int CDECL NTDLL_abs( int i ) { - return abs( i ); -} - -/********************************************************************* - * labs (NTDLL.@) - */ -LONG CDECL NTDLL_labs( LONG i ) -{ - return labs( i ); + return i >= 0 ? i : -i; } /********************************************************************* @@ -93,7 +85,7 @@ LONG CDECL NTDLL_labs( LONG i ) */ double CDECL NTDLL_atan( double d ) { - return atan( d ); + return unix_funcs->atan( d ); } /********************************************************************* @@ -101,7 +93,7 @@ double CDECL NTDLL_atan( double d ) */ double CDECL NTDLL_ceil( double d ) { - return ceil( d ); + return unix_funcs->ceil( d ); } /********************************************************************* @@ -109,7 +101,7 @@ double CDECL NTDLL_ceil( double d ) */ double CDECL NTDLL_cos( double d ) { - return cos( d ); + return unix_funcs->cos( d ); } /********************************************************************* @@ -117,7 +109,7 @@ double CDECL NTDLL_cos( double d ) */ double CDECL NTDLL_fabs( double d ) { - return fabs( d ); + return unix_funcs->fabs( d ); } /********************************************************************* @@ -125,7 +117,7 @@ double CDECL NTDLL_fabs( double d ) */ double CDECL NTDLL_floor( double d ) { - return floor( d ); + return unix_funcs->floor( d ); } /********************************************************************* @@ -133,7 +125,7 @@ double CDECL NTDLL_floor( double d ) */ double CDECL NTDLL_log( double d ) { - return log( d ); + return unix_funcs->log( d ); } /********************************************************************* @@ -141,7 +133,7 @@ double CDECL NTDLL_log( double d ) */ double CDECL NTDLL_pow( double x, double y ) { - return pow( x, y ); + return unix_funcs->pow( x, y ); } /********************************************************************* @@ -149,7 +141,7 @@ double CDECL NTDLL_pow( double x, double y ) */ double CDECL NTDLL_sin( double d ) { - return sin( d ); + return unix_funcs->sin( d ); } /********************************************************************* @@ -157,7 +149,7 @@ double CDECL NTDLL_sin( double d ) */ double CDECL NTDLL_sqrt( double d ) { - return sqrt( d ); + return unix_funcs->sqrt( d ); } /********************************************************************* @@ -165,7 +157,7 @@ double CDECL NTDLL_sqrt( double d ) */ double CDECL NTDLL_tan( double d ) { - return tan( d ); + return unix_funcs->tan( d ); } #if defined(__GNUC__) && defined(__i386__) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0b0d458796..913d6cacc4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1508,7 +1508,7 @@ @ cdecl iswspace(long) NTDLL_iswspace @ cdecl iswxdigit(long) NTDLL_iswxdigit @ cdecl isxdigit(long) NTDLL_isxdigit -@ cdecl labs(long) NTDLL_labs +@ cdecl labs(long) NTDLL_abs @ cdecl log(double) NTDLL_log @ cdecl mbstowcs(ptr str long) NTDLL_mbstowcs @ cdecl memchr(ptr long long) NTDLL_memchr diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 68018b49fb..be71498343 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1331,6 +1331,19 @@ ULONG_PTR get_image_address(void) } +/* math function wrappers */ +static double CDECL ntdll_atan( double d ) { return atan( d ); } +static double CDECL ntdll_ceil( double d ) { return ceil( d ); } +static double CDECL ntdll_cos( double d ) { return cos( d ); } +static double CDECL ntdll_fabs( double d ) { return fabs( d ); } +static double CDECL ntdll_floor( double d ) { return floor( d ); } +static double CDECL ntdll_log( double d ) { return log( d ); } +static double CDECL ntdll_pow( double x, double y ) { return pow( x, y ); } +static double CDECL ntdll_sin( double d ) { return sin( d ); } +static double CDECL ntdll_sqrt( double d ) { return sqrt( d ); } +static double CDECL ntdll_tan( double d ) { return tan( d ); } + + /*********************************************************************** * unix_funcs */ @@ -1466,6 +1479,16 @@ static struct unix_funcs unix_funcs = fast_RtlSleepConditionVariableSRW, fast_RtlSleepConditionVariableCS, fast_RtlWakeConditionVariable, + ntdll_atan, + ntdll_ceil, + ntdll_cos, + ntdll_fabs, + ntdll_floor, + ntdll_log, + ntdll_pow, + ntdll_sin, + ntdll_sqrt, + ntdll_tan, get_initial_environment, get_dynamic_environment, get_initial_directory, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 62117eabb6..cec36b58c0 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -29,7 +29,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 63 +#define NTDLL_UNIXLIB_VERSION 64 struct unix_funcs { @@ -285,6 +285,18 @@ struct unix_funcs const LARGE_INTEGER *timeout ); NTSTATUS (CDECL *fast_RtlWakeConditionVariable)( RTL_CONDITION_VARIABLE *variable, int count ); + /* math functions */ + double (CDECL *atan)( double d ); + double (CDECL *ceil)( double d ); + double (CDECL *cos)( double d ); + double (CDECL *fabs)( double d ); + double (CDECL *floor)( double d ); + double (CDECL *log)( double d ); + double (CDECL *pow)( double x, double y ); + double (CDECL *sin)( double d ); + double (CDECL *sqrt)( double d ); + double (CDECL *tan)( double d ); + /* environment functions */ NTSTATUS (CDECL *get_initial_environment)( WCHAR **wargv[], WCHAR *env, SIZE_T *size ); NTSTATUS (CDECL *get_dynamic_environment)( WCHAR *env, SIZE_T *size );

1 0

Brendan Shanks : api-ms-win-core-namedpipe-ansi-l1-1-0: Add stub dll.
by Alexandre Julliard 25 Jun '20

25 Jun '20

Module: wine Branch: master Commit: fe4379eb19a201d45bc0d2d51270db133fd23a77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe4379eb19a201d45bc0d2d5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Jun 25 10:21:51 2020 -0700 api-ms-win-core-namedpipe-ansi-l1-1-0: Add stub dll. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-namedpipe-ansi-l1-1-0.spec | 3 +++ 4 files changed, 7 insertions(+) diff --git a/configure b/configure index 106ce1625b..ee0439425a 100755 --- a/configure +++ b/configure @@ -987,6 +987,7 @@ enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_memory_l1_1_2 enable_api_ms_win_core_memory_l1_1_4 enable_api_ms_win_core_misc_l1_1_0 +enable_api_ms_win_core_namedpipe_ansi_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_namespace_l1_1_0 @@ -20317,6 +20318,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-1 enable_api_ms_win_cor wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l1_1_2 wine_fn_config_makefile dlls/api-ms-win-core-memory-l1-1-4 enable_api_ms_win_core_memory_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-ansi-l1-1-0 enable_api_ms_win_core_namedpipe_ansi_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-namespace-l1-1-0 enable_api_ms_win_core_namespace_l1_1_0 diff --git a/configure.ac b/configure.ac index a78610c649..3c03bad292 100644 --- a/configure.ac +++ b/configure.ac @@ -2903,6 +2903,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-memory-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-misc-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-ansi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-namespace-l1-1-0) diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in new file mode 100644 index 0000000000..6a86fa59ec --- /dev/null +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-namedpipe-ansi-l1-1-0.dll diff --git a/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec new file mode 100644 index 0000000000..d1e0b146dc --- /dev/null +++ b/dlls/api-ms-win-core-namedpipe-ansi-l1-1-0/api-ms-win-core-namedpipe-ansi-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub GetNamedPipeClientComputerNameA +@ stdcall GetNamedPipeHandleStateA(long ptr ptr ptr ptr str long) kernel32.GetNamedPipeHandleStateA +@ stdcall WaitNamedPipeA (str long) kernel32.WaitNamedPipeA

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2020