June 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Use the exported name directly for a few more functions.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 3df16c0b70f734f5260bfde0f68239976d6a5842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3df16c0b70f734f5260bfde0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:08:00 2020 +0200 ntdll: Use the exported name directly for a few more functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 50 +++++++++++++++++++++++++------------------------- dlls/ntdll/ntdll.spec | 42 +++++++++++++++++++++--------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 0efb8f6afe..6960b52dcb 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -49,7 +49,7 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) /********************************************************************* * wine_get_version (NTDLL.@) */ -const char * CDECL NTDLL_wine_get_version(void) +const char * CDECL wine_get_version(void) { return unix_funcs->get_version(); } @@ -57,7 +57,7 @@ const char * CDECL NTDLL_wine_get_version(void) /********************************************************************* * wine_get_build_id (NTDLL.@) */ -const char * CDECL NTDLL_wine_get_build_id(void) +const char * CDECL wine_get_build_id(void) { return unix_funcs->get_build_id(); } @@ -65,7 +65,7 @@ const char * CDECL NTDLL_wine_get_build_id(void) /********************************************************************* * wine_get_host_version (NTDLL.@) */ -void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **release ) +void CDECL wine_get_host_version( const char **sysname, const char **release ) { return unix_funcs->get_host_version( sysname, release ); } @@ -73,7 +73,7 @@ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **relea /********************************************************************* * abs (NTDLL.@) */ -int CDECL NTDLL_abs( int i ) +int CDECL abs( int i ) { return i >= 0 ? i : -i; } @@ -81,7 +81,7 @@ int CDECL NTDLL_abs( int i ) /********************************************************************* * atan (NTDLL.@) */ -double CDECL NTDLL_atan( double d ) +double CDECL atan( double d ) { return unix_funcs->atan( d ); } @@ -89,7 +89,7 @@ double CDECL NTDLL_atan( double d ) /********************************************************************* * ceil (NTDLL.@) */ -double CDECL NTDLL_ceil( double d ) +double CDECL ceil( double d ) { return unix_funcs->ceil( d ); } @@ -97,7 +97,7 @@ double CDECL NTDLL_ceil( double d ) /********************************************************************* * cos (NTDLL.@) */ -double CDECL NTDLL_cos( double d ) +double CDECL cos( double d ) { return unix_funcs->cos( d ); } @@ -105,7 +105,7 @@ double CDECL NTDLL_cos( double d ) /********************************************************************* * fabs (NTDLL.@) */ -double CDECL NTDLL_fabs( double d ) +double CDECL fabs( double d ) { return unix_funcs->fabs( d ); } @@ -113,7 +113,7 @@ double CDECL NTDLL_fabs( double d ) /********************************************************************* * floor (NTDLL.@) */ -double CDECL NTDLL_floor( double d ) +double CDECL floor( double d ) { return unix_funcs->floor( d ); } @@ -121,7 +121,7 @@ double CDECL NTDLL_floor( double d ) /********************************************************************* * log (NTDLL.@) */ -double CDECL NTDLL_log( double d ) +double CDECL log( double d ) { return unix_funcs->log( d ); } @@ -129,7 +129,7 @@ double CDECL NTDLL_log( double d ) /********************************************************************* * pow (NTDLL.@) */ -double CDECL NTDLL_pow( double x, double y ) +double CDECL pow( double x, double y ) { return unix_funcs->pow( x, y ); } @@ -137,7 +137,7 @@ double CDECL NTDLL_pow( double x, double y ) /********************************************************************* * sin (NTDLL.@) */ -double CDECL NTDLL_sin( double d ) +double CDECL sin( double d ) { return unix_funcs->sin( d ); } @@ -145,7 +145,7 @@ double CDECL NTDLL_sin( double d ) /********************************************************************* * sqrt (NTDLL.@) */ -double CDECL NTDLL_sqrt( double d ) +double CDECL sqrt( double d ) { return unix_funcs->sqrt( d ); } @@ -153,7 +153,7 @@ double CDECL NTDLL_sqrt( double d ) /********************************************************************* * tan (NTDLL.@) */ -double CDECL NTDLL_tan( double d ) +double CDECL tan( double d ) { return unix_funcs->tan( d ); } @@ -169,52 +169,52 @@ double CDECL NTDLL_tan( double d ) /********************************************************************* * _CIcos (NTDLL.@) */ -double CDECL NTDLL__CIcos(void) +double CDECL _CIcos(void) { FPU_DOUBLE(x); - return NTDLL_cos(x); + return cos(x); } /********************************************************************* * _CIlog (NTDLL.@) */ -double CDECL NTDLL__CIlog(void) +double CDECL _CIlog(void) { FPU_DOUBLE(x); - return NTDLL_log(x); + return log(x); } /********************************************************************* * _CIpow (NTDLL.@) */ -double CDECL NTDLL__CIpow(void) +double CDECL _CIpow(void) { FPU_DOUBLES(x,y); - return NTDLL_pow(x,y); + return pow(x,y); } /********************************************************************* * _CIsin (NTDLL.@) */ -double CDECL NTDLL__CIsin(void) +double CDECL _CIsin(void) { FPU_DOUBLE(x); - return NTDLL_sin(x); + return sin(x); } /********************************************************************* * _CIsqrt (NTDLL.@) */ -double CDECL NTDLL__CIsqrt(void) +double CDECL _CIsqrt(void) { FPU_DOUBLE(x); - return NTDLL_sqrt(x); + return sqrt(x); } /********************************************************************* * _ftol (NTDLL.@) */ -LONGLONG CDECL NTDLL__ftol(void) +LONGLONG CDECL _ftol(void) { FPU_DOUBLE(x); return (LONGLONG)x; diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9009f02c45..0b1e91ddc9 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1417,11 +1417,11 @@ @ stub ZwWriteRequestData @ stdcall -private ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall -private ZwYieldExecution() NtYieldExecution -@ cdecl -private -arch=i386 _CIcos() NTDLL__CIcos -@ cdecl -private -arch=i386 _CIlog() NTDLL__CIlog -@ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow -@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin -@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt +@ cdecl -private -arch=i386 _CIcos() +@ cdecl -private -arch=i386 _CIlog() +@ cdecl -private -arch=i386 _CIpow() +@ cdecl -private -arch=i386 _CIsin() +@ cdecl -private -arch=i386 _CIsqrt() @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ cdecl -arch=arm,x86_64 -norelay __chkstk() @ cdecl __isascii(long) @@ -1442,7 +1442,7 @@ @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ cdecl -arch=i386 -norelay _chkstk() @ stub _fltused -@ cdecl -arch=i386 -ret64 _ftol() NTDLL__ftol +@ cdecl -arch=i386 -ret64 _ftol() @ cdecl _i64toa(int64 ptr long) @ cdecl _i64tow(int64 ptr long) @ cdecl _itoa(long ptr long) @@ -1482,15 +1482,15 @@ @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) @ cdecl _wtol(wstr) -@ cdecl abs(long) NTDLL_abs -@ cdecl atan(double) NTDLL_atan +@ cdecl abs(long) +@ cdecl atan(double) @ cdecl atoi(str) @ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) -@ cdecl ceil(double) NTDLL_ceil -@ cdecl cos(double) NTDLL_cos -@ cdecl fabs(double) NTDLL_fabs -@ cdecl floor(double) NTDLL_floor +@ cdecl ceil(double) +@ cdecl cos(double) +@ cdecl fabs(double) +@ cdecl floor(double) @ cdecl isalnum(long) @ cdecl isalpha(long) @ cdecl iscntrl(long) @@ -1508,20 +1508,20 @@ @ cdecl iswspace(long) @ cdecl iswxdigit(long) @ cdecl isxdigit(long) -@ cdecl labs(long) NTDLL_abs -@ cdecl log(double) NTDLL_log +@ cdecl labs(long) abs +@ cdecl log(double) @ cdecl mbstowcs(ptr str long) @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memmove(ptr ptr long) @ cdecl memset(ptr long long) -@ cdecl pow(double double) NTDLL_pow +@ cdecl pow(double double) @ cdecl qsort(ptr long long ptr) -@ cdecl sin(double) NTDLL_sin +@ cdecl sin(double) @ varargs sprintf(ptr str) NTDLL_sprintf @ varargs sprintf_s(ptr long str) -@ cdecl sqrt(double) NTDLL_sqrt +@ cdecl sqrt(double) @ varargs sscanf(str str) @ cdecl strcat(str str) @ cdecl strchr(str long) @@ -1541,7 +1541,7 @@ @ cdecl strtoul(str ptr long) @ varargs swprintf(ptr wstr) NTDLL_swprintf @ varargs swprintf_s(ptr long wstr) -@ cdecl tan(double) NTDLL_tan +@ cdecl tan(double) @ cdecl tolower(long) @ cdecl toupper(long) @ cdecl towlower(long) @@ -1595,9 +1595,9 @@ @ cdecl __wine_locked_recvmsg(long ptr long) # Version -@ cdecl wine_get_version() NTDLL_wine_get_version -@ cdecl wine_get_build_id() NTDLL_wine_get_build_id -@ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version +@ cdecl wine_get_version() +@ cdecl wine_get_build_id() +@ cdecl wine_get_host_version(ptr ptr) # Codepages @ cdecl __wine_get_unix_codepage()

1 0

Piotr Caban : msi: Remove ref_count from MSICOLUMNINFO.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 7200257d0428b1e9b4da72e8c4e39f9cf27455e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7200257d0428b1e9b4da72e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:25 2020 +0200 msi: Remove ref_count from MSICOLUMNINFO. 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/alter.c | 6 +++--- dlls/msi/table.c | 50 ++++++++++++++++---------------------------------- 2 files changed, 19 insertions(+), 37 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 5c5893c824..7922171ae2 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -147,6 +147,9 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) TRACE("%p %p\n", av, record); + if (av->colinfo) + return alter_add_column(av); + if (av->hold == 1) av->table->ops->add_ref(av->table); else if (av->hold == -1) @@ -156,9 +159,6 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) av->table = NULL; } - if (av->colinfo) - return alter_add_column(av); - return ERROR_SUCCESS; } diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 7fae4ad07a..c617110604 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -54,7 +54,6 @@ typedef struct tagMSICOLUMNINFO LPCWSTR colname; UINT type; UINT offset; - INT ref_count; BOOL temporary; MSICOLUMNHASHENTRY **hash_table; } MSICOLUMNINFO; @@ -80,14 +79,14 @@ static const WCHAR szNumber[] = {'N','u','m','b','e','r',0}; static const WCHAR szType[] = {'T','y','p','e',0}; static const MSICOLUMNINFO _Columns_cols[4] = { - { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, 0, NULL }, - { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, 0, NULL }, - { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, 0, NULL }, - { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, 0, NULL }, + { szColumns, 1, szTable, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, + { szColumns, 2, szNumber, MSITYPE_VALID | MSITYPE_KEY | 2, 2, 0, NULL }, + { szColumns, 3, szName, MSITYPE_VALID | MSITYPE_STRING | 64, 4, 0, NULL }, + { szColumns, 4, szType, MSITYPE_VALID | 2, 6, 0, NULL }, }; static const MSICOLUMNINFO _Tables_cols[1] = { - { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, 0, NULL }, + { szTables, 1, szName, MSITYPE_VALID | MSITYPE_STRING | MSITYPE_KEY | 64, 0, 0, NULL }, }; #define MAX_STREAM_NAME 0x1f @@ -694,7 +693,6 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF colinfo[col - 1].type = read_table_int( table->data, i, table->colinfo[3].offset, sizeof(USHORT) ) - (1 << 15); colinfo[col - 1].offset = 0; - colinfo[col - 1].ref_count = 0; colinfo[col - 1].hash_table = NULL; } n++; @@ -765,7 +763,6 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].colname = msi_string_lookup( db->strings, col_id, NULL ); table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; - table->colinfo[ i ].ref_count = 0; table->colinfo[ i ].hash_table = NULL; table->colinfo[ i ].temporary = col->temporary; } @@ -1949,16 +1946,8 @@ static UINT TABLE_delete( struct tagMSIVIEW *view ) static UINT TABLE_add_ref(struct tagMSIVIEW *view) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - UINT i; TRACE("%p %d\n", view, tv->table->ref_count); - - for (i = 0; i < tv->table->col_count; i++) - { - if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) - InterlockedIncrement(&tv->table->colinfo[i].ref_count); - } - return InterlockedIncrement(&tv->table->ref_count); } @@ -2022,25 +2011,25 @@ static UINT TABLE_release(struct tagMSIVIEW *view) TRACE("%p %d\n", view, ref); - for (i = tv->table->col_count - 1; i >= 0; i--) + ref = InterlockedDecrement(&tv->table->ref_count); + if (ref == 0) { - if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) + for (i = tv->table->col_count - 1; i >= 0; i--) { - ref = InterlockedDecrement(&tv->table->colinfo[i].ref_count); - if (ref == 0) + if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) { r = TABLE_remove_column(view, tv->table->colinfo[i].tablename, tv->table->colinfo[i].number); if (r != ERROR_SUCCESS) break; } + else + { + break; + } } - } - ref = InterlockedDecrement(&tv->table->ref_count); - if (ref == 0) - { - if (!tv->table->row_count) + if (!tv->table->col_count) { list_remove(&tv->table->entry); free_table(tv->table); @@ -2057,7 +2046,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSITABLE *msitable; MSIRECORD *rec; - UINT r, i; + UINT r; rec = MSI_CreateRecord(4); if (!rec) @@ -2078,14 +2067,7 @@ static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number goto done; msitable = find_cached_table(tv->db, table); - for (i = 0; i < msitable->col_count; i++) - { - if (!wcscmp( msitable->colinfo[i].colname, column )) - { - InterlockedIncrement(&msitable->colinfo[i].ref_count); - break; - } - } + InterlockedIncrement(&msitable->ref_count); done: msiobj_release(&rec->hdr);

1 0

Piotr Caban : msi: Fix adding temporary columns.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 15b47513a1926a103492e0774396119f57d2e8d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b47513a1926a103492e077… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:41 2020 +0200 msi: Fix adding temporary columns. 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/alter.c | 82 +--------------------------------------- dlls/msi/msipriv.h | 2 +- dlls/msi/table.c | 105 +++++++++++++++++++++++++++++++++++++++++----------- dlls/msi/tests/db.c | 10 ++++- 4 files changed, 95 insertions(+), 104 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 7922171ae2..78f1a3930c 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -61,85 +61,6 @@ static UINT ALTER_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return ERROR_FUNCTION_FAILED; } -static UINT ITERATE_columns(MSIRECORD *row, LPVOID param) -{ - (*(UINT *)param)++; - return ERROR_SUCCESS; -} - -static BOOL check_column_exists(MSIDATABASE *db, LPCWSTR table, LPCWSTR column) -{ - MSIQUERY *view; - MSIRECORD *rec; - UINT r; - - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','_','C','o','l','u','m','n','s','`',' ','W','H','E','R','E',' ', - '`','T','a','b','l','e','`','=','\'','%','s','\'',' ','A','N','D',' ', - '`','N','a','m','e','`','=','\'','%','s','\'',0 - }; - - r = MSI_OpenQuery(db, &view, query, table, column); - if (r != ERROR_SUCCESS) - return FALSE; - - r = MSI_ViewExecute(view, NULL); - if (r != ERROR_SUCCESS) - goto done; - - r = MSI_ViewFetch(view, &rec); - if (r == ERROR_SUCCESS) - msiobj_release(&rec->hdr); - -done: - msiobj_release(&view->hdr); - return (r == ERROR_SUCCESS); -} - -static UINT alter_add_column(MSIALTERVIEW *av) -{ - UINT r, colnum = 1; - MSIQUERY *view; - MSIVIEW *columns; - - static const WCHAR szColumns[] = {'_','C','o','l','u','m','n','s',0}; - static const WCHAR query[] = { - 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','_','C','o','l','u','m','n','s','`',' ','W','H','E','R','E',' ', - '`','T','a','b','l','e','`','=','\'','%','s','\'',' ','O','R','D','E','R',' ', - 'B','Y',' ','`','N','u','m','b','e','r','`',0 - }; - - r = TABLE_CreateView(av->db, szColumns, &columns); - if (r != ERROR_SUCCESS) - return r; - - if (check_column_exists(av->db, av->colinfo->table, av->colinfo->column)) - { - columns->ops->delete(columns); - return ERROR_BAD_QUERY_SYNTAX; - } - - r = MSI_OpenQuery(av->db, &view, query, av->colinfo->table, av->colinfo->column); - if (r == ERROR_SUCCESS) - { - r = MSI_IterateRecords(view, NULL, ITERATE_columns, &colnum); - msiobj_release(&view->hdr); - if (r != ERROR_SUCCESS) - { - columns->ops->delete(columns); - return r; - } - } - r = columns->ops->add_column(columns, av->colinfo->table, - colnum, av->colinfo->column, - av->colinfo->type, (av->hold == 1)); - - columns->ops->delete(columns); - return r; -} - static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIALTERVIEW *av = (MSIALTERVIEW*)view; @@ -148,7 +69,8 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) TRACE("%p %p\n", av, record); if (av->colinfo) - return alter_add_column(av); + return av->table->ops->add_column(av->table, av->colinfo->column, + av->colinfo->type, av->colinfo->temporary, av->hold == 1); if (av->hold == 1) av->table->ops->add_ref(av->table); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 71c6565080..6797ebe4bc 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -337,7 +337,7 @@ typedef struct tagMSIVIEWOPS /* * add_column - adds a column to the table */ - UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR table, UINT number, LPCWSTR column, UINT type, BOOL hold ); + UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL temporary, BOOL hold ); /* * sort - orders the table by columns diff --git a/dlls/msi/table.c b/dlls/msi/table.c index c617110604..5a1466592f 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -2040,38 +2040,99 @@ static UINT TABLE_release(struct tagMSIVIEW *view) return ref; } -static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR table, UINT number, - LPCWSTR column, UINT type, BOOL hold) +static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, + INT type, BOOL temporary, BOOL hold) { + UINT i, r, table_id, col_id, size, offset; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; - MSITABLE *msitable; - MSIRECORD *rec; - UINT r; + MSICOLUMNINFO *colinfo; - rec = MSI_CreateRecord(4); - if (!rec) - return ERROR_OUTOFMEMORY; + if (temporary && !hold && !tv->table->ref_count) + return ERROR_SUCCESS; - MSI_RecordSetStringW(rec, 1, table); - MSI_RecordSetInteger(rec, 2, number); - MSI_RecordSetStringW(rec, 3, column); - MSI_RecordSetInteger(rec, 4, type); + if (!temporary && tv->table->col_count && + tv->table->colinfo[tv->table->col_count-1].temporary) + return ERROR_BAD_QUERY_SYNTAX; + + for (i = 0; i < tv->table->col_count; i++) + { + if (!wcscmp(tv->table->colinfo[i].colname, column)) + return ERROR_BAD_QUERY_SYNTAX; + } - r = TABLE_insert_row(&tv->view, rec, -1, FALSE); + colinfo = msi_realloc(tv->table->colinfo, sizeof(*tv->table->colinfo) * (tv->table->col_count + 1)); + if (!colinfo) + return ERROR_OUTOFMEMORY; + tv->table->colinfo = colinfo; + + r = msi_string2id( tv->db->strings, tv->name, -1, &table_id ); if (r != ERROR_SUCCESS) - goto done; + return r; + col_id = msi_add_string( tv->db->strings, column, -1, !temporary ); - msi_update_table_columns(tv->db, table); + colinfo[tv->table->col_count].tablename = msi_string_lookup( tv->db->strings, table_id, NULL ); + colinfo[tv->table->col_count].number = tv->table->col_count + 1; + colinfo[tv->table->col_count].colname = msi_string_lookup( tv->db->strings, col_id, NULL ); + colinfo[tv->table->col_count].type = type; + colinfo[tv->table->col_count].offset = 0; + colinfo[tv->table->col_count].hash_table = NULL; + colinfo[tv->table->col_count].temporary = temporary; + tv->table->col_count++; - if (!hold) - goto done; + table_calc_column_offsets( tv->db, tv->table->colinfo, tv->table->col_count); - msitable = find_cached_table(tv->db, table); - InterlockedIncrement(&msitable->ref_count); + size = msi_table_get_row_size( tv->db, tv->table->colinfo, tv->table->col_count, LONG_STR_BYTES ); + offset = tv->table->colinfo[tv->table->col_count - 1].offset; + for (i = 0; i < tv->table->row_count; i++) + { + BYTE *data = msi_realloc( tv->table->data[i], size ); + if (!data) + { + tv->table->col_count--; + return ERROR_OUTOFMEMORY; + } -done: - msiobj_release(&rec->hdr); - return r; + tv->table->data[i] = data; + memset(data + offset, 0, size - offset); + } + + if (!temporary) + { + MSIVIEW *columns; + MSIRECORD *rec; + + rec = MSI_CreateRecord(4); + if (!rec) + { + tv->table->col_count--; + return ERROR_OUTOFMEMORY; + } + + MSI_RecordSetStringW(rec, 1, tv->name); + MSI_RecordSetInteger(rec, 2, tv->table->col_count); + MSI_RecordSetStringW(rec, 3, column); + MSI_RecordSetInteger(rec, 4, type); + + r = TABLE_CreateView(tv->db, szColumns, &columns); + if (r != ERROR_SUCCESS) + { + tv->table->col_count--; + msiobj_release(&rec->hdr); + return r; + } + + r = TABLE_insert_row(columns, rec, -1, FALSE); + columns->ops->delete(columns); + msiobj_release(&rec->hdr); + if (r != ERROR_SUCCESS) + { + tv->table->col_count--; + return r; + } + } + if (hold) + TABLE_add_ref(view); + return ERROR_SUCCESS; } static UINT TABLE_drop(struct tagMSIVIEW *view) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 22466548b1..3e1c551d38 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3950,7 +3950,7 @@ static void test_temporary_table(void) static void test_alter(void) { MSICONDITION cond; - MSIHANDLE hdb = 0; + MSIHANDLE hdb = 0, rec; const char *query; UINT r; @@ -4020,6 +4020,10 @@ static void test_alter(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + query = "SELECT * FROM `_Columns` WHERE `Table` = 'U' AND `Name` = 'C'"; + r = do_query(hdb, query, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + /* add column C again */ query = "ALTER TABLE `U` ADD `C` INTEGER"; r = run_query(hdb, 0, query); @@ -4037,6 +4041,10 @@ static void test_alter(void) r = run_query(hdb, 0, query); ok(r == ERROR_BAD_QUERY_SYNTAX, "Expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + query = "SELECT * FROM `_Columns` WHERE `Table` = 'U' AND `Name` = 'D'"; + r = do_query(hdb, query, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + query = "INSERT INTO `U` ( `A`, `B`, `C`, `D` ) VALUES ( 5, 6, 7, 8 )"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Nikolay Sivov : dxva2: Implement locking functionality in device manager.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 431324ba63dc06cbb570d2c2f15913661e704c24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=431324ba63dc06cbb570d2c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 12:35:59 2020 +0300 dxva2: Implement locking functionality in device manager. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 94 ++++++++++++++++++++++++++++++++++++++-- dlls/dxva2/tests/dxva2.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=431324ba63dc06cbb570…

1 0

Nikolay Sivov : evr: Add a stub for default presenter.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: f0aefcfce54acd642cf13b4d44326424e13eeb27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0aefcfce54acd642cf13b4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 30 16:34:00 2020 +0300 evr: Add a stub for default presenter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/Makefile.in | 3 +- dlls/evr/evr.spec | 2 +- dlls/evr/evr_classes.idl | 7 ++ dlls/evr/evr_private.h | 23 +++++ dlls/evr/main.c | 1 + dlls/evr/presenter.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 35 ++++++++ include/evr.idl | 1 + 8 files changed, 288 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0aefcfce54acd642cf1…

1 0

Piotr Caban : msi: Remove column_info.temporary field.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 76a2077c83048d8eead8ea0cbfafa70406c0cd88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a2077c83048d8eead8ea0c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:46 2020 +0200 msi: Remove column_info.temporary field. 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/alter.c | 2 +- dlls/msi/create.c | 2 +- dlls/msi/msipriv.h | 3 +-- dlls/msi/sql.y | 1 - dlls/msi/table.c | 5 +++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msi/alter.c b/dlls/msi/alter.c index 78f1a3930c..7d27211853 100644 --- a/dlls/msi/alter.c +++ b/dlls/msi/alter.c @@ -70,7 +70,7 @@ static UINT ALTER_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (av->colinfo) return av->table->ops->add_column(av->table, av->colinfo->column, - av->colinfo->type, av->colinfo->temporary, av->hold == 1); + av->colinfo->type, av->hold == 1); if (av->hold == 1) av->table->ops->add_ref(av->table); diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 94c62ec573..3d6c5189f2 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -181,7 +181,7 @@ UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, if (!col->table) col->table = table; - if( !col->temporary ) + if( !(col->type & MSITYPE_TEMPORARY) ) temp = FALSE; else if ( col->type & MSITYPE_KEY ) tempprim = TRUE; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6797ebe4bc..dbe833e613 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -222,7 +222,6 @@ typedef struct _column_info LPCWSTR table; LPCWSTR column; INT type; - BOOL temporary; struct expr *val; struct _column_info *next; } column_info; @@ -337,7 +336,7 @@ typedef struct tagMSIVIEWOPS /* * add_column - adds a column to the table */ - UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL temporary, BOOL hold ); + UINT (*add_column)( struct tagMSIVIEW *view, LPCWSTR column, INT type, BOOL hold ); /* * sort - orders the table by columns diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 8ffbcd4de5..7bdace7298 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -318,7 +318,6 @@ column_and_type: { $$ = $1; $$->type = ($2 | MSITYPE_VALID); - $$->temporary = $2 & MSITYPE_TEMPORARY ? TRUE : FALSE; } ; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 5a1466592f..3326958d94 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -764,7 +764,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->colinfo[ i ].type = col->type; table->colinfo[ i ].offset = 0; table->colinfo[ i ].hash_table = NULL; - table->colinfo[ i ].temporary = col->temporary; + table->colinfo[ i ].temporary = (col->type & MSITYPE_TEMPORARY) != 0; } table_calc_column_offsets( db, table->colinfo, table->col_count); @@ -2041,9 +2041,10 @@ static UINT TABLE_release(struct tagMSIVIEW *view) } static UINT TABLE_add_column(struct tagMSIVIEW *view, LPCWSTR column, - INT type, BOOL temporary, BOOL hold) + INT type, BOOL hold) { UINT i, r, table_id, col_id, size, offset; + BOOL temporary = type & MSITYPE_TEMPORARY; MSITABLEVIEW *tv = (MSITABLEVIEW*)view; MSICOLUMNINFO *colinfo;

1 0

Piotr Caban : msi: Add table existance tests for tables with temporary columns.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: cb9cb83cda01fa873667e11038d9bdd01428f059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9cb83cda01fa873667e110… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:35 2020 +0200 msi: Add table existance tests for tables with temporary columns. 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/tests/db.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index c49b5e6265..22466548b1 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3957,10 +3957,22 @@ static void test_alter(void) hdb = create_db(); ok( hdb, "failed to create db\n"); + query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "failed to add table\n"); + + query = "SELECT * FROM `T`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_BAD_QUERY_SYNTAX, "expected ERROR_BAD_QUERY_SYNTAX, got %d\n", r); + query = "CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"; r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "failed to add table\n"); + query = "SELECT * FROM `T`"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", r); + cond = MsiDatabaseIsTablePersistentA(hdb, "T"); ok( cond == MSICONDITION_FALSE, "wrong return condition\n");

1 0

Piotr Caban : msi: Fix table ref count on create.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 405486fbe6853c78744099fa1ebe07995e07a438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=405486fbe6853c78744099fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:20 2020 +0200 msi: Fix table ref count on create. 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/create.c | 2 +- dlls/msi/query.h | 2 +- dlls/msi/table.c | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/create.c b/dlls/msi/create.c index 6133159dce..94c62ec573 100644 --- a/dlls/msi/create.c +++ b/dlls/msi/create.c @@ -68,7 +68,7 @@ static UINT CREATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if (cv->bIsTemp && !cv->hold) return ERROR_SUCCESS; - return msi_create_table( cv->db, cv->name, cv->col_info, persist ); + return msi_create_table( cv->db, cv->name, cv->col_info, persist, cv->hold ); } static UINT CREATE_close( struct tagMSIVIEW *view ) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index c0144d3054..5e5f3906f4 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -149,7 +149,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent ) DECLSPEC_HIDDEN; + MSICONDITION persistent, BOOL hold ) DECLSPEC_HIDDEN; UINT msi_select_update( MSIVIEW *view, MSIRECORD *rec, UINT row ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index db4dd59f95..7fae4ad07a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -713,7 +713,7 @@ static UINT get_tablecolumns( MSIDATABASE *db, LPCWSTR szTableName, MSICOLUMNINF } UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, - MSICONDITION persistent ) + MSICONDITION persistent, BOOL hold ) { UINT r, nField; MSIVIEW *tv = NULL; @@ -733,7 +733,7 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, if( !table ) return ERROR_FUNCTION_FAILED; - table->ref_count = 1; + table->ref_count = 0; table->row_count = 0; table->data = NULL; table->data_persistent = NULL; @@ -742,6 +742,9 @@ UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, table->persistent = persistent; lstrcpyW( table->name, name ); + if( hold ) + table->ref_count++; + for( col = col_info; col; col = col->next ) table->col_count++;

1 0

Piotr Caban : msi: Support removing temporary columns in TABLE_remove_column.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 5d568279dc0b842206918ba87a955298e72973ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d568279dc0b842206918ba8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 30 05:40:06 2020 +0200 msi: Support removing temporary columns in TABLE_remove_column. 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 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index a413808e8a..db4dd59f95 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1966,6 +1966,20 @@ static UINT TABLE_remove_column(struct tagMSIVIEW *view, LPCWSTR table, UINT num MSIVIEW *columns = NULL; UINT row, r; + if (tv->table->col_count != number) + return ERROR_BAD_QUERY_SYNTAX; + + if (tv->table->colinfo[number-1].temporary) + { + UINT size = tv->table->colinfo[number-1].offset; + tv->table->col_count--; + tv->table->colinfo = msi_realloc( tv->table->colinfo, sizeof(*tv->table->colinfo) * tv->table->col_count ); + + for (row = 0; row < tv->table->row_count; row++) + tv->table->data[row] = msi_realloc( tv->table->data[row], size ); + return ERROR_SUCCESS; + } + rec = MSI_CreateRecord(2); if (!rec) return ERROR_OUTOFMEMORY; @@ -2000,11 +2014,12 @@ static UINT TABLE_release(struct tagMSIVIEW *view) { MSITABLEVIEW *tv = (MSITABLEVIEW*)view; INT ref = tv->table->ref_count; - UINT i, r; + UINT r; + INT i; TRACE("%p %d\n", view, ref); - for (i = 0; i < tv->table->col_count; i++) + for (i = tv->table->col_count - 1; i >= 0; i--) { if (tv->table->colinfo[i].type & MSITYPE_TEMPORARY) {

1 0

Alexandre Julliard : ntdll: Use the standard C library names for the printf functions.
by Alexandre Julliard June 30, 2020

June 30, 2020

Module: wine Branch: master Commit: 4478ba258e45559ac97353ab27951e84dd9865c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4478ba258e45559ac97353ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 30 12:04:42 2020 +0200 ntdll: Use the standard C library names for the printf functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 21 +++++++++------------ dlls/ntdll/atom.c | 2 +- dlls/ntdll/locale.c | 17 +++++++++-------- dlls/ntdll/ntdll.spec | 8 ++++---- dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/printf.c | 16 ++++++++-------- dlls/ntdll/process.c | 12 ++++++------ dlls/ntdll/rtl.c | 4 ++-- dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 13 +++++++------ 10 files changed, 47 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4478ba258e45559ac973…

1 0